Thanks for spotting this! I applied the attached patch.
From a8bf8974443289631d0c377020ea4a1b594355df Mon Sep 17 00:00:00 2001 From: James Youngman <[email protected]> Date: Thu, 5 Mar 2009 10:37:11 +0000 Subject: [PATCH] Fix Savannah bug #25764, duplicate entry for proc in PRUNEFS. To: [email protected]
Fix Savannah bug #25764, duplicate entry for proc in PRUNEFS. * locate/updatedb.sh (PRUNEFS): Remove duplicate entry for proc. * locate/Makefile.am (updatedb): add dependency on Makefile, and add a comment explaining why updatedb is generated by make, not configure. * NEWS: Mention this bugfix. Signed-off-by: James Youngman <[email protected]> --- ChangeLog | 9 +++++++++ NEWS | 2 ++ locate/Makefile.am | 5 ++++- locate/updatedb.sh | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index cfacd78..199ea8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2009-03-05 James Youngman <[email protected]> + + Fix Savannah bug #25764, duplicate entry for proc in PRUNEFS. + * locate/updatedb.sh (PRUNEFS): Remove duplicate entry for proc. + * locate/Makefile.am (updatedb): add dependency on Makefile, and + add a comment explaining why updatedb is generated by make, not + configure. + * NEWS: Mention this bugfix. + 2009-03-04 James Youngman <[email protected]> Upgrade to gnulib version 86a37c05846ff3772afd1300f135866dd1d271c6. diff --git a/NEWS b/NEWS index 1c6adca..9fc5875 100644 --- a/NEWS +++ b/NEWS @@ -14,6 +14,8 @@ minutes. ** Bug Fixes +#25764: remove duplicate entry for 'proc' in updatedb's $PRUNEFS. + #25359: find -H wrongly behaves like -L sometimes; this bug affects only filesystems which populate d_type and affects -type and -printf %y. This does not affect the default behaviour of find or find -P. diff --git a/locate/Makefile.am b/locate/Makefile.am index 0f031c7..12b7b84 100644 --- a/locate/Makefile.am +++ b/locate/Makefile.am @@ -24,7 +24,10 @@ LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a $(LIB_CLOSE) $(LIBINTL) $(PROGRAMS) $(LIBPROGRAMS): ../lib/libfind.a ../gnulib/lib/libgnulib.a -updatedb: updatedb.sh +# We generate updatedb from the Makefile rather than with AC_OUTPUT in +# configure.ac in order to allow the user better control of what goes +# into it by setting Makefile variables. +updatedb: updatedb.sh Makefile rm -f $@ find=`echo find|sed '$(transform)'`; \ frcode=`echo frcode|sed '$(transform)'`; \ diff --git a/locate/updatedb.sh b/locate/updatedb.sh index df170e0..fd736ee 100644 --- a/locate/updatedb.sh +++ b/locate/updatedb.sh @@ -228,7 +228,7 @@ done PATH=/bin:/usr/bin:${BINDIR}; export PATH -: ${PRUNEFS="nfs NFS proc afs proc smbfs autofs iso9660 ncpfs coda devpts ftpfs devfs mfs sysfs shfs"} +: ${PRUNEFS="nfs NFS proc afs smbfs autofs iso9660 ncpfs coda devpts ftpfs devfs mfs sysfs shfs"} if test -n "$PRUNEFS"; then prunefs_exp=`echo $PRUNEFS |sed -e 's/\([^ ][^ ]*\)/-o -fstype \1/g' \ -- 1.5.6.5
