Accepting request 200285 from home:bernhard-voelker:branches:Base:System

- Remove patches:
  - findutils-4.5.10-use_proc_mounts.patch:
    /etc/mtab is a link to /proc/self/mounts nowadays.
  - findutils-4.5.10-prune_unknown.patch:
    merge patch into findutils-4.4.2-updatedb.patch.
  - findutils-4.5.10-updatedb_ignore_nfsv4.patch:
    fixed upstream.
  - findutils-stdio.in.patch:
    fixed upstream (in included gnulib).
  - findutils-init_stat_buf.patch:
    fixed upstream.

- Refresh other patches:
  - findutils-4.4.2-updatedb.patch:
    refresh with changes from the above, removed patch.
  - findutils-4.4.2-xautofs.patch:
    refresh, and added -xautofs in find's usage text.

- Adapt findutils.spec:
  - Version bump.
  - Remove above removed patches.
  - Add BuildRequires for makeinfo.
  - configure call: remove --enable-d_type-optimization
    option because turned on by default since 4.2.15.
  - Do not remove oldfind's man page in %install.
  - Add oldfind's binary and man page in %files.

- Update to 4.5.12
  See /usr/share/doc/packages/findutils/NEWS,
  section "Major changes in release 4.5.12, 2013-09-22"

- Update to 4.5.11 (2013-02-02)
  See /usr/share/doc/packages/findutils/NEWS,
  section "Major changes in release 4.5.11, 2013-02-02"

OBS-URL: https://build.opensuse.org/request/show/200285
OBS-URL: https://build.opensuse.org/package/show/Base:System/findutils?expand=0&rev=46

findutils-4.4.2-updatedb.patch

@@ -1,8 +1,14 @@
+---
+ doc/find.texi      |    2 +-
+ locate/updatedb.1  |    5 ++---
+ locate/updatedb.sh |    1 +
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
 Index: doc/find.texi
 ===================================================================
---- doc/find.texi.orig	2012-02-13 14:27:58.223123360 +0100
+--- doc/find.texi.orig
-+++ doc/find.texi	2012-02-13 14:27:58.231123165 +0100
++++ doc/find.texi
-@@ -3486,7 +3486,7 @@ Default is none.
+@@ -3587,7 +3587,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
@@ -13,15 +19,15 @@ Index: doc/find.texi
  them.  This means for example that the paths must not include trailing
 Index: locate/updatedb.1
 ===================================================================
---- locate/updatedb.1.orig	2011-04-04 00:53:12.000000000 +0200
+--- locate/updatedb.1.orig
-+++ locate/updatedb.1	2012-02-13 14:27:58.232123141 +0100
++++ locate/updatedb.1
 @@ -75,8 +75,7 @@ Default is \fInfs NFS proc\fP.
  .TP
  .B \-\-output=\fIdbfile\fP
  The database file to build.
 -Default is system-dependent.  In Debian GNU/Linux, the default
 -is /var/cache/locate/locatedb.
-+Default is  /var/lib/locatedb.
++Default is /var/lib/locatedb.
  .TP
  .B \-\-localuser=\fIuser\fP
  The user to search non-network directories as, using \fBsu\fP(1).
@@ -36,18 +42,17 @@ Index: locate/updatedb.1
  .B \-\-old\-format
 Index: locate/updatedb.sh
 ===================================================================
---- locate/updatedb.sh.orig	2011-04-04 00:53:12.000000000 +0200
+--- locate/updatedb.sh.orig
-+++ locate/updatedb.sh	2012-02-13 14:28:48.445898801 +0100
++++ locate/updatedb.sh
-@@ -158,7 +158,7 @@ select_shell() {
+@@ -165,6 +165,7 @@ select_shell() {
- : ${NETPATHS=}
+ /sfs
+ /tmp
+ /usr/tmp
++/var/spool
+ /var/tmp
+ "}
  
- # Directories to not put in the database, which would otherwise be.
+@@ -196,7 +197,7 @@ fi
--: ${PRUNEPATHS="/tmp /usr/tmp /var/tmp /afs /amd /sfs /proc"}
-+: ${PRUNEPATHS="/tmp /usr/tmp /var/tmp /afs /amd /sfs /proc /var/spool"}
- 
- # 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 @@ fi
  export TMPDIR
  
  # The user to search network directories as.
@@ -56,46 +61,11 @@ Index: locate/updatedb.sh
  
  # The directory containing the subprograms.
  if test -n "$LIBEXECDIR" ; then
-@@ -228,7 +228,7 @@ done
+@@ -273,6 +274,7 @@ proc
- 
+ shfs
- PATH=/bin:/usr/bin:${BINDIR}; export PATH
+ smbfs
- 
+ sysfs
--: ${PRUNEFS="nfs NFS proc afs smbfs autofs iso9660 ncpfs coda devpts ftpfs devfs mfs sysfs shfs"}
++unknown
-+: ${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' \
-@@ -252,13 +252,12 @@ if test -n "$SEARCHPATHS"; then
-     # : A1
-     su $LOCALUSER `select_shell $LOCALUSER` -c \
-     "$find $SEARCHPATHS $FINDOPTIONS \
--     \\( $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 \
--     -type d -regex "$PRUNEREGEX" \) -prune -o $print_option
-+     -type d \( $prunefs_exp -regex "$PRUNEREGEX" \) -prune -o $print_option
-   fi
- fi
- 
-@@ -322,12 +321,14 @@ if test -n "$SEARCHPATHS"; then
-     su $LOCALUSER `select_shell $LOCALUSER` -c \
-     "$find $SEARCHPATHS $FINDOPTIONS \
-      \( $prunefs_exp \
--     -type d -regex '$PRUNEREGEX' \) -prune -o $print_option" || exit $?
-+     -type d \( $prunefs_exp -regex '$PRUNEREGEX' \) -prune \
-+     -o $print_option" || exit $?
-   else
-     # : A6
-     $find $SEARCHPATHS $FINDOPTIONS \
-      \( $prunefs_exp \
--     -type d -regex "$PRUNEREGEX" \) -prune -o $print_option || exit $?
-+     -type d \( $prunefs_exp -regex "$PRUNEREGEX" \) -prune \
-+     -o $print_option || exit $?
-   fi
- fi
- 

findutils-4.4.2-xautofs.patch

@@ -1,7 +1,17 @@
-diff -aur findutils-4.5.10.orig/doc/find.texi findutils-4.5.10/doc/find.texi
+---
---- findutils-4.5.10.orig/doc/find.texi	2012-01-16 15:29:59.649039029 -0500
+ doc/find.texi  |    4 ++++
-+++ findutils-4.5.10/doc/find.texi	2012-01-16 15:54:30.683648566 -0500
+ find/defs.h    |    3 +++
-@@ -1440,6 +1440,10 @@
+ find/find.1    |    3 +++
+ find/ftsfind.c |    6 ++++++
+ find/parser.c  |   14 +++++++++++++-
+ find/util.c    |    1 +
+ 6 files changed, 30 insertions(+), 1 deletion(-)
+
+Index: doc/find.texi
+===================================================================
+--- doc/find.texi.orig
++++ doc/find.texi
+@@ -1438,6 +1438,10 @@ them.
  There are two ways to avoid searching certain filesystems.  One way is
  to tell @code{find} to only search one filesystem:
  
@@ -12,10 +22,11 @@ diff -aur findutils-4.5.10.orig/doc/find.texi findutils-4.5.10/doc/find.texi
  @deffn Option -xdev
  @deffnx Option -mount
  Don't descend directories on other filesystems.  These options are
-diff -aur findutils-4.5.10.orig/find/defs.h findutils-4.5.10/find/defs.h
+Index: find/defs.h
---- findutils-4.5.10.orig/find/defs.h	2011-04-03 18:53:11.000000000 -0400
+===================================================================
-+++ findutils-4.5.10/find/defs.h	2012-01-16 15:56:13.473363517 -0500
+--- find/defs.h.orig
-@@ -561,6 +561,9 @@
++++ find/defs.h
+@@ -557,6 +557,9 @@ struct options
    /* If true, don't cross filesystem boundaries. */
    bool stay_on_filesystem;
  
@@ -25,10 +36,11 @@ diff -aur findutils-4.5.10.orig/find/defs.h findutils-4.5.10/find/defs.h
    /* If true, we ignore the problem where we find that a directory entry
     * no longer exists by the time we get around to processing it.
     */
-diff -aur findutils-4.5.10.orig/find/find.1 findutils-4.5.10/find/find.1
+Index: find/find.1
---- findutils-4.5.10.orig/find/find.1	2011-04-03 18:53:11.000000000 -0400
+===================================================================
-+++ findutils-4.5.10/find/find.1	2012-01-16 15:57:07.003694295 -0500
+--- find/find.1.orig
-@@ -460,6 +460,9 @@
++++ find/find.1
+@@ -461,6 +461,9 @@ if standard input is a tty, and to
  .B \-nowarn
  otherwise.
  
@@ -38,10 +50,11 @@ diff -aur findutils-4.5.10.orig/find/find.1 findutils-4.5.10/find/find.1
  .IP \-xdev
  Don't descend directories on other filesystems.
  
-diff -aur findutils-4.5.10.orig/find/ftsfind.c findutils-4.5.10/find/ftsfind.c
+Index: find/ftsfind.c
---- findutils-4.5.10.orig/find/ftsfind.c	2011-04-03 18:53:11.000000000 -0400
+===================================================================
-+++ findutils-4.5.10/find/ftsfind.c	2012-01-16 16:00:05.103467741 -0500
+--- find/ftsfind.c.orig
-@@ -485,6 +485,12 @@
++++ find/ftsfind.c
+@@ -485,6 +485,12 @@ consider_visiting (FTS *p, FTSENT *ent)
  	}
      }
  
@@ -54,10 +67,11 @@ diff -aur findutils-4.5.10.orig/find/ftsfind.c findutils-4.5.10/find/ftsfind.c
    if ( (ent->fts_info == FTS_D) && !options.do_dir_first )
      {
        /* this is the preorder visit, but user said -depth */
-diff -aur findutils-4.5.10.orig/find/parser.c findutils-4.5.10/find/parser.c
+Index: find/parser.c
---- findutils-4.5.10.orig/find/parser.c	2011-04-03 18:53:11.000000000 -0400
+===================================================================
-+++ findutils-4.5.10/find/parser.c	2012-01-16 16:05:32.208378367 -0500
+--- find/parser.c.orig
-@@ -151,6 +151,7 @@
++++ find/parser.c
+@@ -146,6 +146,7 @@ static bool parse_user          (const s
  static bool parse_version       (const struct parser_table*, char *argv[], int *arg_ptr);
  static bool parse_wholename     (const struct parser_table*, char *argv[], int *arg_ptr);
  static bool parse_xdev          (const struct parser_table*, char *argv[], int *arg_ptr);
@@ -65,7 +79,7 @@ diff -aur findutils-4.5.10.orig/find/parser.c findutils-4.5.10/find/parser.c
  static bool parse_ignore_race   (const struct parser_table*, char *argv[], int *arg_ptr);
  static bool parse_noignore_race (const struct parser_table*, char *argv[], int *arg_ptr);
  static bool parse_warn          (const struct parser_table*, char *argv[], int *arg_ptr);
-@@ -325,6 +326,7 @@
+@@ -306,6 +307,7 @@ static struct parser_table const parse_t
    PARSE_TEST_NP    ("wholename",             wholename), /* GNU, replaced -path, but anyway -path will soon be in POSIX */
    {ARG_TEST,       "writable",               parse_accesscheck, pred_writable}, /* GNU, 4.3.0+ */
    PARSE_OPTION     ("xdev",                  xdev), /* POSIX */
@@ -73,7 +87,16 @@ diff -aur findutils-4.5.10.orig/find/parser.c findutils-4.5.10/find/parser.c
    PARSE_TEST       ("xtype",                 xtype),	     /* GNU */
  #ifdef UNIMPLEMENTED_UNIX
    /* It's pretty ugly for find to know about archive formats.
-@@ -2800,6 +2802,16 @@
+@@ -1230,7 +1232,7 @@ operators (decreasing precedence; -and i
+ positional options (always true): -daystart -follow -regextype\n\n\
+ normal options (always true, specified before other expressions):\n\
+       -depth --help -maxdepth LEVELS -mindepth LEVELS -mount -noleaf\n\
+-      --version -xdev -ignore_readdir_race -noignore_readdir_race\n"));
++      --version -xdev -xautofs -ignore_readdir_race -noignore_readdir_race\n"));
+   puts (_("\
+ tests (N can be +N or -N or N): -amin N -anewer FILE -atime N -cmin N\n\
+       -cnewer FILE -ctime N -empty -false -fstype TYPE -gid N -group NAME\n\
+@@ -2736,6 +2738,16 @@ parse_xdev (const struct parser_table* e
  }
  
  static bool
@@ -90,10 +113,11 @@ diff -aur findutils-4.5.10.orig/find/parser.c findutils-4.5.10/find/parser.c
  parse_ignore_race (const struct parser_table* entry, char **argv, int *arg_ptr)
  {
    options.ignore_readdir_race = true;
-diff -aur findutils-4.5.10.orig/find/util.c findutils-4.5.10/find/util.c
+Index: find/util.c
---- findutils-4.5.10.orig/find/util.c	2011-04-03 18:53:11.000000000 -0400
+===================================================================
-+++ findutils-4.5.10/find/util.c	2012-01-16 16:06:17.309814520 -0500
+--- find/util.c.orig
-@@ -1006,6 +1006,7 @@
++++ find/util.c
+@@ -1010,6 +1010,7 @@ set_option_defaults (struct options *p)
  
    p->full_days = false;
    p->stay_on_filesystem = false;

findutils-4.5.10-prune_unknown.patch

@@ -1,13 +0,0 @@
-Index: locate/updatedb.sh
-===================================================================
---- 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
- 
--: ${PRUNEFS="nfs NFS proc afs smbfs autofs iso9660 ncpfs coda devpts ftpfs devfs mfs sysfs shfs cifs 9P"}
-+: ${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/\([^ ][^ ]*\)/-o -fstype \1/g' \

findutils-4.5.10-updatedb_ignore_nfsv4.patch

@@ -1,13 +0,0 @@
-Index: locate/updatedb.sh
-===================================================================
---- 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"}
- 
- if test -n "$PRUNEFS"; then
- prunefs_exp=`echo $PRUNEFS |sed -e 's/\([^ ][^ ]*\)/-o -fstype \1/g' \

findutils-4.5.10-use_proc_mounts.patch

@@ -1,14 +0,0 @@
---- gnulib/lib/mountlist.c.orig	2012-01-16 15:24:39.982035415 -0500
-+++ gnulib/lib/mountlist.c	2012-01-16 15:26:14.587852681 -0500
-@@ -71,6 +71,11 @@
- # endif
- #endif
- 
-+#if defined __linux__
-+#  undef MOUNTED
-+#  define MOUNTED "/proc/mounts"
-+#endif
-+
- #ifdef MOUNTED_GETMNTINFO       /* 4.4BSD.  */
- # include <sys/mount.h>
- #endif

findutils-4.5.10.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fe24bbce55ac8f136080e01c03e7ae8b5ab395550625c25860efcbbe0641af76
-size 2745375

findutils-4.5.12.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:df859eebad68c216204363f163c0e4200208ce7348f3658564a120e32e4f63de
+size 3236073

findutils-init_stat_buf.patch

@@ -1,28 +0,0 @@
-From: Philipp Thomas <pth@suse.de>
-Date: 2012-11-13 11:58:38+01:00
-Subject: Find by inode fails because of uninitialized structure
-References: bnc#780928
-Upstream: http://savannah.gnu.org/bugs/?37683
-
-stat_buf in find.c(process_path) wasn't initialized and always contained the
-inode no.  of the first file.  util.c(get_info) then thought it already
-had the inode information and the following comparison in pred.c(pred_inum) in
-fails of cause.
-
-
----
- find/find.c |    1 +
- 1 file changed, 1 insertion(+)
-
-Index: find/find.c
-===================================================================
---- find/find.c.orig	2011-04-04 00:53:11.000000000 +0200
-+++ find/find.c	2012-11-13 11:57:46.161844128 +0100
-@@ -1131,6 +1131,7 @@ process_path (char *pathname, char *name
- 
-   eval_tree = get_eval_tree ();
-   /* Assume it is a non-directory initially. */
-+  memset(&stat_buf,'\0',sizeof(stat_buf));
-   stat_buf.st_mode = 0;
-   state.rel_pathname = name;
-   state.type = 0;

findutils-stdio.in.patch

@@ -1,16 +0,0 @@
-Index: findutils-4.5.10/gnulib/lib/stdio.in.h
-===================================================================
---- findutils-4.5.10.orig/gnulib/lib/stdio.in.h
-+++ findutils-4.5.10/gnulib/lib/stdio.in.h
-@@ -178,9 +178,10 @@ _GL_WARN_ON_USE (fflush, "fflush is not
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
-+#if HAVE_RAW_DECL_GETS
- #undef gets
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
--
-+#endif
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)

findutils.changes

@@ -1,3 +1,41 @@
+-------------------------------------------------------------------
+Mon Sep 23 23:17:08 UTC 2013 - mail@bernhard-voelker.de
+
+- Remove patches:
+  - findutils-4.5.10-use_proc_mounts.patch:
+    /etc/mtab is a link to /proc/self/mounts nowadays.
+  - findutils-4.5.10-prune_unknown.patch:
+    merge patch into findutils-4.4.2-updatedb.patch.
+  - findutils-4.5.10-updatedb_ignore_nfsv4.patch:
+    fixed upstream.
+  - findutils-stdio.in.patch:
+    fixed upstream (in included gnulib).
+  - findutils-init_stat_buf.patch:
+    fixed upstream.
+
+- Refresh other patches:
+  - findutils-4.4.2-updatedb.patch:
+    refresh with changes from the above, removed patch.
+  - findutils-4.4.2-xautofs.patch:
+    refresh, and added -xautofs in find's usage text.
+
+- Adapt findutils.spec:
+  - Version bump.
+  - Remove above removed patches.
+  - Add BuildRequires for makeinfo.
+  - configure call: remove --enable-d_type-optimization
+    option because turned on by default since 4.2.15.
+  - Do not remove oldfind's man page in %install.
+  - Add oldfind's binary and man page in %files.
+
+- Update to 4.5.12
+  See /usr/share/doc/packages/findutils/NEWS,
+  section "Major changes in release 4.5.12, 2013-09-22"
+
+- Update to 4.5.11 (2013-02-02)
+  See /usr/share/doc/packages/findutils/NEWS,
+  section "Major changes in release 4.5.11, 2013-02-02"
+
 -------------------------------------------------------------------
 Tue Apr 23 12:24:12 CEST 2013 - pth@suse.de
 

findutils.spec

@@ -18,7 +18,7 @@
 
 Name:           findutils
 Url:            http://www.gnu.org/software/findutils/
-Version:        4.5.10
+Version:        4.5.12
 Release:        0
 Summary:        The GNU versions of find utilities (find and xargs)
 License:        GPL-3.0+
@@ -26,20 +26,14 @@ Group:          Productivity/File utilities
 Source:         http://alpha.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
 Source1:        sysconfig.locate
 Source2:        cron.daily.updatedb
-# Use /proc/mounts instead of /etc/mtab as autofs entries are only
-# listed in the kernels >= 2.6.32
-Patch0:         findutils-4.5.10-use_proc_mounts.patch
 # adds a new option -xautofs to find to not descend into directories on autofs file systems
-Patch1:         findutils-4.4.2-xautofs.patch
+Patch0:         findutils-4.4.2-xautofs.patch
-Patch2:         findutils-4.4.2-updatedb.patch
+Patch1:         findutils-4.4.2-updatedb.patch
-Patch3:         findutils-4.5.10-prune_unknown.patch
-Patch4:         findutils-4.5.10-updatedb_ignore_nfsv4.patch
-Patch6:         findutils-stdio.in.patch
-Patch7:         findutils-init_stat_buf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} > 1100
 BuildRequires:  libselinux-devel
 %endif
+BuildRequires:  makeinfo
 Provides:       find = %{version}
 Obsoletes:      find < %{version}
 Requires(post):  %{install_info_prereq}
@@ -78,12 +72,7 @@ switching on the computer.
 %prep
 %setup -q
 %patch0
-%patch1 -p1
+%patch1
-%patch2
-%patch3
-%patch4
-%patch6 -p1
-%patch7
 
 %build
 %ifarch %arm armv5tel armv7l armv7el armv5el
@@ -93,8 +82,7 @@ export DEFAULT_ARG_SIZE="(31u * 1024u)"
 %configure \
   --libexecdir=%{_libdir}/find \
   --localstatedir=/var/lib \
-  --without-included-regex \
+  --without-included-regex
-  --enable-d_type-optimisation
 make %{?_smp_mflags}
 
 %check
@@ -104,8 +92,6 @@ make check
 %make_install
 install -D -m 644 %{SOURCE1} %{buildroot}/var/adm/fillup-templates/sysconfig.locate
 install -D -m 755 %{SOURCE2} %{buildroot}/etc/cron.daily/suse-updatedb
-rm -f %{buildroot}%{_bindir}/oldfind
-rm -f %{buildroot}%{_bindir}/ftsfind
 rm -f %{buildroot}%{_infodir}/find-maint*
 %find_lang %{name}
 #UsrMerge
@@ -129,9 +115,11 @@ ln -sf %{_bindir}/find %{buildroot}/bin
 /bin/find
 #UsrMerge
 %{_bindir}/find
+%{_bindir}/oldfind
 %{_bindir}/xargs
 %doc %{_infodir}/find.info*.gz
 %doc %{_mandir}/man1/find.1.gz
+%doc %{_mandir}/man1/oldfind.1.gz
 %doc %{_mandir}/man1/xargs.1.gz
 
 %files lang -f %{name}.lang