findutils-4.1.20 patches

Zack Winkles winkie at linuxfromscratch.org
Sun Feb 8 13:38:05 PST 2004


Submitted By: Zack Winkles <winkie at linuxfromscratch.org>
Date: 2004-02-08
Initial Package Version: 4.1.20
Origin: Debian findutils_4.1.20-3.diff.gz
Description: Fix missing newlines in usage for locate(1) and xargs(1).

diff -Naur findutils-4.1.20.orig/locate/locate.c findutils-4.1.20/locate/locate.c
--- findutils-4.1.20.orig/locate/locate.c	2003-05-26 09:39:54.000000000 -0400
+++ findutils-4.1.20/locate/locate.c	2004-02-08 16:31:28.583216968 -0500
@@ -482,7 +482,7 @@
 Usage: %s [-d path | --database=path] [-e | --existing]\n\
       [-i | --ignore-case] [--version] [--help] pattern...\n"),
 	   program_name);
-  fputs (_("\nReport bugs to <bug-findutils at gnu.org>."), stream);
+  fputs (_("\nReport bugs to <bug-findutils at gnu.org>.\n"), stream);
   exit (status);
 }
 
diff -Naur findutils-4.1.20.orig/xargs/xargs.c findutils-4.1.20/xargs/xargs.c
--- findutils-4.1.20.orig/xargs/xargs.c	2003-05-26 09:39:14.000000000 -0400
+++ findutils-4.1.20/xargs/xargs.c	2004-02-08 16:31:28.584216816 -0500
@@ -933,6 +933,6 @@
        [--max-args=max-args] [--no-run-if-empty] [--version] [--help]\n\
        [command [initial-arguments]]\n"),
 	   program_name);
-  fputs (_("\nReport bugs to <bug-findutils at gnu.org>."), stream);
+  fputs (_("\nReport bugs to <bug-findutils at gnu.org>.\n"), stream);
   exit (status);
 }
-------------- next part --------------
Submitted By: Zack Winkles <winkie at linuxfromscratch.org>
Date: 2004-02-08
Initial Package Version: 4.1.20
Origin: Debian findutils_4.1.20-3.diff.gz
Description: updatedb(1) silently fails when --localuser specifies and
	user without a valid login shell.

diff -Naur findutils-4.1.20.orig/locate/updatedb.sh findutils-4.1.20/locate/updatedb.sh
--- findutils-4.1.20.orig/locate/updatedb.sh	2003-05-24 14:36:25.000000000 -0400
+++ findutils-4.1.20/locate/updatedb.sh	2004-02-08 16:32:11.467697536 -0500
@@ -53,6 +53,9 @@
 # You can set these in the environment, or use command-line options,
 # to override their defaults:
 
+# Shell to use
+: ${SHELL="/bin/sh"}
+
 # Non-network directories to put in the database.
 : ${SEARCHPATHS="/"}
 
@@ -117,7 +120,7 @@
 {
 if test -n "$SEARCHPATHS"; then
   if [ "$LOCALUSER" != "" ]; then
-    su $LOCALUSER -c \
+    su $LOCALUSER -s $SHELL -c \
     "$find $SEARCHPATHS \
      \\( $prunefs_exp \
      -type d -regex '$PRUNEREGEX' \\) -prune -o -print"
@@ -170,7 +173,7 @@
 {
 if test -n "$SEARCHPATHS"; then
   if [ "$LOCALUSER" != "" ]; then
-    su $LOCALUSER -c \
+    su $LOCALUSER -s $SHELL -c \
     "$find $SEARCHPATHS \
      \( $prunefs_exp \
      -type d -regex '$PRUNEREGEX' \) -prune -o -print"


More information about the patches mailing list