Accepting request 106218 from Base:System

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/106218
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/findutils?expand=0&rev=34

findutils-4.4.2-updatedb.patch

@@ -1,7 +1,8 @@
-diff -aur findutils-4.5.10.orig/doc/find.texi findutils-4.5.10/doc/find.texi
+Index: doc/find.texi
---- findutils-4.5.10.orig/doc/find.texi	2012-01-16 15:29:59.649039029 -0500
+===================================================================
-+++ findutils-4.5.10/doc/find.texi	2012-01-16 15:45:10.098656840 -0500
+--- doc/find.texi.orig	2012-02-13 14:27:58.223123360 +0100
-@@ -3482,7 +3482,7 @@
++++ doc/find.texi	2012-02-13 14:27:58.231123165 +0100
+@@ -3486,7 +3486,7 @@ Default is none.
  @item --prunepaths='@var{path}@dots{}'
  Directories to omit from the database, which would otherwise be
  included.  The environment variable @code{PRUNEPATHS} also sets this
@@ -10,10 +11,11 @@ diff -aur findutils-4.5.10.orig/doc/find.texi findutils-4.5.10/doc/find.texi
  used as regular expressions (with @code{find ... -regex}, so you need
  to specify these paths in the same way that @code{find} will encounter
  them.  This means for example that the paths must not include trailing
-diff -aur findutils-4.5.10.orig/locate/updatedb.1 findutils-4.5.10/locate/updatedb.1
+Index: locate/updatedb.1
---- findutils-4.5.10.orig/locate/updatedb.1	2012-01-16 15:31:03.240244029 -0500
+===================================================================
-+++ findutils-4.5.10/locate/updatedb.1	2012-01-16 15:45:37.745311211 -0500
+--- locate/updatedb.1.orig	2011-04-04 00:53:12.000000000 +0200
-@@ -75,8 +75,7 @@
++++ locate/updatedb.1	2012-02-13 14:27:58.232123141 +0100
+@@ -75,8 +75,7 @@ Default is \fInfs NFS proc\fP.
  .TP
  .B \-\-output=\fIdbfile\fP
  The database file to build.
@@ -23,7 +25,7 @@ diff -aur findutils-4.5.10.orig/locate/updatedb.1 findutils-4.5.10/locate/update
  .TP
  .B \-\-localuser=\fIuser\fP
  The user to search non-network directories as, using \fBsu\fP(1).
-@@ -85,7 +84,7 @@
+@@ -85,7 +84,7 @@ You can also use the environment variabl
  .TP
  .B \-\-netuser=\fIuser\fP
  The user to search network directories as, using \fBsu\fP(1).
@@ -32,10 +34,11 @@ diff -aur findutils-4.5.10.orig/locate/updatedb.1 findutils-4.5.10/locate/update
  You can also use the environment variable \fBNETUSER\fP to set this user.
  .TP
  .B \-\-old\-format
-diff -aur findutils-4.5.10.orig/locate/updatedb.sh findutils-4.5.10/locate/updatedb.sh
+Index: locate/updatedb.sh
---- findutils-4.5.10.orig/locate/updatedb.sh	2012-01-16 15:32:52.071883446 -0500
+===================================================================
-+++ findutils-4.5.10/locate/updatedb.sh	2012-01-16 15:45:56.037082532 -0500
+--- locate/updatedb.sh.orig	2011-04-04 00:53:12.000000000 +0200
-@@ -158,7 +158,7 @@
++++ locate/updatedb.sh	2012-02-13 14:28:48.445898801 +0100
+@@ -158,7 +158,7 @@ select_shell() {
  : ${NETPATHS=}
  
  # Directories to not put in the database, which would otherwise be.
@@ -44,7 +47,7 @@ diff -aur findutils-4.5.10.orig/locate/updatedb.sh findutils-4.5.10/locate/updat
  
  # Trailing slashes result in regex items that are never matched, which
  # is not what the user will expect.   Therefore we now reject such
-@@ -188,7 +188,7 @@
+@@ -188,7 +188,7 @@ fi
  export TMPDIR
  
  # The user to search network directories as.
@@ -53,7 +56,7 @@ diff -aur findutils-4.5.10.orig/locate/updatedb.sh findutils-4.5.10/locate/updat
  
  # The directory containing the subprograms.
  if test -n "$LIBEXECDIR" ; then
-@@ -228,10 +228,10 @@
+@@ -228,7 +228,7 @@ done
  
  PATH=/bin:/usr/bin:${BINDIR}; export PATH
  
@@ -61,28 +64,25 @@ diff -aur findutils-4.5.10.orig/locate/updatedb.sh findutils-4.5.10/locate/updat
 +: ${PRUNEFS="nfs NFS proc afs smbfs autofs iso9660 ncpfs coda devpts ftpfs devfs mfs sysfs shfs cifs 9P"}
  
  if test -n "$PRUNEFS"; then
--prunefs_exp=`echo $PRUNEFS |sed -e 's/\([^ ][^ ]*\)/-o -fstype \1/g' \
+ prunefs_exp=`echo $PRUNEFS |sed -e 's/\([^ ][^ ]*\)/-o -fstype \1/g' \
-+prunefs_exp=`echo $PRUNEFS |sed -e 's/\([^ ][^ ]*\)/-fstype \1 -o/g' \
+@@ -252,13 +252,12 @@ if test -n "$SEARCHPATHS"; then
-  -e 's/-o //' -e 's/$/ -o/'`
+     # : A1
- else
-   prunefs_exp=''
-@@ -253,12 +253,13 @@
      su $LOCALUSER `select_shell $LOCALUSER` -c \
      "$find $SEARCHPATHS $FINDOPTIONS \
-      \\( $prunefs_exp \
+-     \\( $prunefs_exp \
 -     -type d -regex '$PRUNEREGEX' \\) -prune -o $print_option"
 +     -type d \\( $prunefs_exp -regex '$PRUNEREGEX' \\) -prune \
 +     -o $print_option"
    else
      # : A2
      $find $SEARCHPATHS $FINDOPTIONS \
-      \( $prunefs_exp \
+-     \( $prunefs_exp \
 -     -type d -regex "$PRUNEREGEX" \) -prune -o $print_option
 +     -type d \( $prunefs_exp -regex "$PRUNEREGEX" \) -prune -o $print_option
    fi
  fi
  
-@@ -322,12 +323,14 @@
+@@ -322,12 +321,14 @@ if test -n "$SEARCHPATHS"; then
      su $LOCALUSER `select_shell $LOCALUSER` -c \
      "$find $SEARCHPATHS $FINDOPTIONS \
       \( $prunefs_exp \

findutils-4.5.10-prune_unknown.patch

@@ -1,6 +1,8 @@
---- locate/updatedb.sh.orig	2012-01-16 19:04:21.074917128 -0500
+Index: locate/updatedb.sh
-+++ locate/updatedb.sh	2012-01-16 19:05:02.438400012 -0500
+===================================================================
-@@ -228,7 +228,7 @@
+--- locate/updatedb.sh.orig	2012-02-13 14:29:16.754208481 +0100
++++ locate/updatedb.sh	2012-02-13 14:29:43.317560656 +0100
+@@ -228,7 +228,7 @@ done
  
  PATH=/bin:/usr/bin:${BINDIR}; export PATH
  
@@ -8,4 +10,4 @@
 +: ${PRUNEFS="nfs NFS proc afs smbfs autofs iso9660 ncpfs coda devpts ftpfs devfs mfs sysfs shfs cifs 9P unknown"}
  
  if test -n "$PRUNEFS"; then
- prunefs_exp=`echo $PRUNEFS |sed -e 's/\([^ ][^ ]*\)/-fstype \1 -o/g' \
+ prunefs_exp=`echo $PRUNEFS |sed -e 's/\([^ ][^ ]*\)/-o -fstype \1/g' \

findutils-4.5.10-updatedb_ignore_nfsv4.patch

@@ -1,11 +1,13 @@
---- locate/updatedb.sh.orig	2012-01-16 19:06:44.632122416 -0500
+Index: locate/updatedb.sh
-+++ locate/updatedb.sh	2012-01-16 19:07:19.338688523 -0500
+===================================================================
-@@ -228,7 +228,7 @@
+--- locate/updatedb.sh.orig	2012-02-13 14:30:01.105126826 +0100
++++ locate/updatedb.sh	2012-02-13 14:30:17.708721842 +0100
+@@ -228,7 +228,7 @@ done
  
  PATH=/bin:/usr/bin:${BINDIR}; export PATH
  
 -: ${PRUNEFS="nfs NFS proc afs smbfs autofs iso9660 ncpfs coda devpts ftpfs devfs mfs sysfs shfs cifs 9P unknown"}
-+: ${PRUNEFS="nfs nfs4 NFS proc afs smbfs autofs iso9660 ncpfs coda devpts ftpfs devfs mfs sysfs shfs cifs 9P unknown"}
++: ${PRUNEFS="nfs nfsv4 NFS proc afs smbfs autofs iso9660 ncpfs coda devpts ftpfs devfs mfs sysfs shfs cifs 9P unknown"}
  
  if test -n "$PRUNEFS"; then
- prunefs_exp=`echo $PRUNEFS |sed -e 's/\([^ ][^ ]*\)/-fstype \1 -o/g' \
+ prunefs_exp=`echo $PRUNEFS |sed -e 's/\([^ ][^ ]*\)/-o -fstype \1/g' \

findutils.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Feb 13 14:19:23 CET 2012 - pth@suse.de
+
+- Fix updatedb to work again (bnc#746610).
+
 -------------------------------------------------------------------
 Sat Feb  4 23:27:05 UTC 2012 - rschweikert@suse.com
 

findutils.spec

@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
 Name:           findutils
 Url:            http://www.gnu.org/software/findutils/
 Version:        4.5.10
@@ -78,7 +77,7 @@ switching on the computer.
 %setup -q
 %patch0
 %patch1 -p1
-%patch2 -p1
+%patch2
 %patch3
 %patch4