[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 14/19] Fix Savannah bug #25764, duplicate entry for proc in PRUNE
From: |
James Youngman |
Subject: |
[PATCH 14/19] Fix Savannah bug #25764, duplicate entry for proc in PRUNEFS. |
Date: |
Fri, 10 Apr 2009 23:53:11 +0100 |
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 <address@hidden>
---
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 <address@hidden>
+ 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
- [PATCH 04/19] Fixed Savannah bug #23663, crash in some locales for find -printf '%AX', (continued)
- [PATCH 04/19] Fixed Savannah bug #23663, crash in some locales for find -printf '%AX', James Youngman, 2009/04/10
- [PATCH 05/19] Fix bug #23996 (integer overflow when parsing "-used 3")., James Youngman, 2009/04/10
- [PATCH 06/19] Moved bugfixes in the NEWS file out of "Documentation Enhancements" into "Bug Fixes"., James Youngman, 2009/04/10
- [PATCH 07/19] Fix Savannah bug #24283, find-4.5.2 -printf %TY causes NULL pointer dereference, James Youngman, 2009/04/10
- [PATCH 08/19] Typo fix from Jim Meyering <address@hidden>, James Youngman, 2009/04/10
- [PATCH 09/19] fix a typo in a comment, James Youngman, 2009/04/10
- [PATCH 10/19] find: avoid using undefined statbuf, James Youngman, 2009/04/10
- [PATCH 11/19] find: Fix -regexptype parse specification bug: declare as POSOPT., James Youngman, 2009/04/10
- [PATCH 12/19] find: avoid warning about unused local, remove unnecessary include., James Youngman, 2009/04/10
- [PATCH 13/19] Really apply Jim's earlier patch., James Youngman, 2009/04/10
- [PATCH 14/19] Fix Savannah bug #25764, duplicate entry for proc in PRUNEFS.,
James Youngman <=
- [PATCH 15/19] Provide more detailed help on how to work with the git sources., James Youngman, 2009/04/10
- [PATCH 16/19] Ignore 'compile', James Youngman, 2009/04/10
- [PATCH 17/19] Change suffix for non-release versions from -CVS to -git., James Youngman, 2009/04/10
- [PATCH 18/19] clean tool-versions.txt for 'make distclean', James Youngman, 2009/04/10
- [PATCH 19/19] Remove unused Debian files; the Debian package doesn't use them., James Youngman, 2009/04/10