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 | 7 +++++++ NEWS | 2 ++ locate/Makefile.am | 5 ++++- locate/updatedb.sh | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 291116f..3e1bb7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,13 @@ 2009-04-10 James Youngman <[email protected]> + Backport fix from 4.5. for 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. + * NEWS: Moved some of the bug fix comments for the 4.4.1 release out of "Documentation Enhancements" into "Bug Fixes". They'd ended up in the wrong section when I resolved an earlier merge diff --git a/NEWS b/NEWS index 3dd4483..c544aae 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,8 @@ versions of the AIX C compiler), find's regular expression implementation fails to support case-insensitive regular expression matching, causing -iregex to behave like -regex. This is now fixed. +#25764: remove duplicate entry for 'proc' in updatedb's $PRUNEFS. + #25154: Allow compilation with C compilers that don't allow declarations to follow statements. diff --git a/locate/Makefile.am b/locate/Makefile.am index fd9f1f5..e7e4c1e 100644 --- a/locate/Makefile.am +++ b/locate/Makefile.am @@ -23,7 +23,10 @@ LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ $(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 9f4e4d9..7fc374f 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
