OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Feb-2005 20:21:43
Branch: HEAD Handle: 2005021119214200
Modified files:
openpkg-src/findutils findutils.patch
Log:
Make sure the TMPDIR is not overwritten in updatedb. Submitted by Bill
Campbell.
Summary:
Revision Changes Path
1.4 +23 -6 openpkg-src/findutils/findutils.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/findutils/findutils.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 findutils.patch
--- openpkg-src/findutils/findutils.patch 11 Feb 2005 08:08:12 -0000
1.3
+++ openpkg-src/findutils/findutils.patch 11 Feb 2005 19:21:42 -0000
1.4
@@ -1,7 +1,24 @@
Index: locate/updatedb.sh
---- locate/updatedb.sh.orig 2005-02-11 08:51:54 +0100
-+++ locate/updatedb.sh 2005-02-11 08:52:57 +0100
-@@ -166,7 +166,7 @@
+--- locate/updatedb.sh.orig 2005-01-29 18:34:23 +0100
++++ locate/updatedb.sh 2005-02-11 20:20:27 +0100
+@@ -108,6 +108,7 @@
+ : [EMAIL PROTECTED]@}
+
+ # Directory to hold intermediate files.
++if [ ".$TMPDIR" = . ]; then
+ if test -d /var/tmp; then
+ : ${TMPDIR=/var/tmp}
+ elif test -d /usr/tmp; then
+@@ -115,7 +116,7 @@
+ else
+ : ${TMPDIR=/tmp}
+ fi
+-export TMPDIR
++fi
+
+ # The user to search network directories as.
+ : ${NETUSER=daemon}
+@@ -166,7 +167,7 @@
if test -n "$SEARCHPATHS"; then
if [ "$LOCALUSER" != "" ]; then
# : A1
@@ -10,7 +27,7 @@
"$find $SEARCHPATHS $FINDOPTIONS \
\\( $prunefs_exp \
-type d -regex '$PRUNEREGEX' \\) -prune -o $print_option"
-@@ -182,7 +182,7 @@
+@@ -182,7 +183,7 @@
myuid=`getuid`
if [ "$myuid" = 0 ]; then
# : A3
@@ -19,7 +36,7 @@
"$find $NETPATHS $FINDOPTIONS \\( -type d -regex '$PRUNEREGEX' -prune
\\) -o $print_option" ||
exit $?
else
-@@ -236,7 +236,7 @@
+@@ -236,7 +237,7 @@
if test -n "$SEARCHPATHS"; then
if [ "$LOCALUSER" != "" ]; then
# : A5
@@ -28,7 +45,7 @@
"$find $SEARCHPATHS $FINDOPTIONS \
\( $prunefs_exp \
-type d -regex '$PRUNEREGEX' \) -prune -o $print_option" || exit $?
-@@ -252,7 +252,7 @@
+@@ -252,7 +253,7 @@
myuid=`getuid`
if [ "$myuid" = 0 ]; then
# : A7
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
