diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-04-19 04:47:10 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-04-19 04:47:10 +0000 |
| commit | 3731cee90abb5e8bff9b8737b5dfcce894b399cd (patch) | |
| tree | 73d7f200dbe8c1c457b1667559de0a3996ebd583 /sys-apps/slocate/files | |
| parent | better digests (diff) | |
| download | gentoo-2-3731cee90abb5e8bff9b8737b5dfcce894b399cd.tar.gz gentoo-2-3731cee90abb5e8bff9b8737b5dfcce894b399cd.tar.bz2 gentoo-2-3731cee90abb5e8bff9b8737b5dfcce894b399cd.zip | |
Version bump 130286 by F. Steinel.
(Portage version: 2.1_pre9)
Diffstat (limited to 'sys-apps/slocate/files')
| -rw-r--r-- | sys-apps/slocate/files/digest-slocate-3.1 | 3 | ||||
| -rw-r--r-- | sys-apps/slocate/files/slocate-3.1-build.patch | 52 | ||||
| -rw-r--r-- | sys-apps/slocate/files/slocate-3.1-incompat-warning.patch | 13 |
3 files changed, 68 insertions, 0 deletions
diff --git a/sys-apps/slocate/files/digest-slocate-3.1 b/sys-apps/slocate/files/digest-slocate-3.1 new file mode 100644 index 000000000000..fae5f81751c0 --- /dev/null +++ b/sys-apps/slocate/files/digest-slocate-3.1 @@ -0,0 +1,3 @@ +MD5 908e6949d959ae7b686c10bb76b35bf3 slocate-3.1.tar.gz 37748 +RMD160 d3b1e818cc35ce8e87ec1b0764f6b2145a319e13 slocate-3.1.tar.gz 37748 +SHA256 6abec68ab50fa743739fb78a5063c295ae2f7d04d2e538f7c3108120e49a3266 slocate-3.1.tar.gz 37748 diff --git a/sys-apps/slocate/files/slocate-3.1-build.patch b/sys-apps/slocate/files/slocate-3.1-build.patch new file mode 100644 index 000000000000..98f5ea113231 --- /dev/null +++ b/sys-apps/slocate/files/slocate-3.1-build.patch @@ -0,0 +1,52 @@ +--- src/slocate.h ++++ src/slocate.h +@@ -35,20 +35,11 @@ + #define MTAB_FILE "/etc/mtab" + #define UPDATEDB_FILE "/etc/updatedb.conf" + +-/* More fitting paths for FreeBSD -matt */ +-#if defined(__FreeBSD__) +-# define DEFAULT_DB "/var/db/slocate/slocate.db" +-# define DEFAULT_DB_DIR "/var/db/slocate/" +-#elif defined(__SunOS__) +-# define DEFAULT_DB "/var/db/slocate/slocate.db" +-# define DEFAULT_DB_DIR "/var/db/slocate/" +-#else +-# define DEFAULT_DB "/var/lib/slocate/slocate.db" +-# define DEFAULT_DB_DIR "/var/lib/slocate/" +-#endif ++#define DEFAULT_DB "/var/lib/slocate/slocate.db" ++#define DEFAULT_DB_DIR "/var/lib/slocate/" + + #define DB_UID 0 +-#define DB_GROUP "slocate" ++#define DB_GROUP "locate" + #define DB_MODE 00640 + + #define SLOC_ESC -0x80 +--- src/Makefile ++++ src/Makefile +@@ -1,16 +1,18 @@ + OBJS=slocate.o cmds.o conf.o utils.o + HEADERS=slocate.h cmds.h conf.h utils.h + +-CFLAGS=-Wall -Wshadow +-CFLAGS+=-O2 ++CFLAGS+=-Wall -Wshadow ++#CFLAGS+=-O2 + #CFLAGS+=-g3 + #LDFLAGS+=-lefence + + PROG=slocate +-CC=gcc ++CC?=gcc + +-all: $(OBJS) $(MOD_OBJS) +- $(CC) $(LDFLAGS) -o $(PROG) $(OBJS) $(MOD_OBJS) ++all: $(PROG) ++ ++$(PROG): $(OBJS) $(MOD_OBJS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(OBJS) $(MOD_OBJS) + + %.o: %.c $(HEADERS) + $(CC) -c $(CFLAGS) -o $@ $< diff --git a/sys-apps/slocate/files/slocate-3.1-incompat-warning.patch b/sys-apps/slocate/files/slocate-3.1-incompat-warning.patch new file mode 100644 index 000000000000..158a10a0477b --- /dev/null +++ b/sys-apps/slocate/files/slocate-3.1-incompat-warning.patch @@ -0,0 +1,13 @@ +slocate-2.x databases are incompat with slocate-3.x + +--- src/slocate.c ++++ src/slocate.c +@@ -435,7 +435,7 @@ + * cancelling the + */ + len = path_len+code_num; + if (len <= 0) { +- if (!report_error(g_data, FATAL, "set_path_head: path_head len <= 0: %d\n", len)) ++ if (!report_error(g_data, FATAL, "set_path_head: path_head len <= 0: %d\nPerhaps your database is still the old format and you need to run `updatedb` ?\n", len)) + goto EXIT; + } + if (!(path_head = realloc(path_head, (sizeof(char) * (len+1))))) { |