Hello community, here is the log from the commit of package findutils for openSUSE:13.1 checked in at 2013-10-24 14:40:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/findutils (Old) and /work/SRC/openSUSE:13.1/.findutils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "findutils" Changes: -------- --- /work/SRC/openSUSE:13.1/findutils/findutils.changes 2013-09-23 10:51:01.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.findutils.new/findutils.changes 2013-10-24 14:40:38.000000000 +0200 @@ -1,0 +2,48 @@ +Thu Oct 24 11:47:17 CEST 2013 - pth@suse.de + +- Fix spelling of the btrfs snapshot directory (bnc#847240). + +------------------------------------------------------------------- +Thu Sep 26 15:45:16 UTC 2013 - schwab@suse.de + +- Conditionalize the qemu arg size workaround on %qemu_user_space_build + +------------------------------------------------------------------- +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" + +------------------------------------------------------------------- Old: ---- findutils-4.5.10-prune_unknown.patch findutils-4.5.10-updatedb_ignore_nfsv4.patch findutils-4.5.10-use_proc_mounts.patch findutils-4.5.10.tar.gz findutils-init_stat_buf.patch findutils-stdio.in.patch New: ---- findutils-4.5.12.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ findutils.spec ++++++ --- /var/tmp/diff_new_pack.V4i2LH/_old 2013-10-24 14:40:38.000000000 +0200 +++ /var/tmp/diff_new_pack.V4i2LH/_new 2013-10-24 14:40:38.000000000 +0200 @@ -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 @@ 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 -Patch2: 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 +Patch0: findutils-4.4.2-xautofs.patch +Patch1: findutils-4.4.2-updatedb.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,23 +72,17 @@ %prep %setup -q %patch0 -%patch1 -p1 -%patch2 -%patch3 -%patch4 -%patch6 -p1 -%patch7 +%patch1 %build -%ifarch %arm armv5tel armv7l armv7el armv5el +%if 0%{?qemu_user_space_build} # this is a workaround for a qemu-user bug, we hit. A qemu patch is being discussed, but for now ... export DEFAULT_ARG_SIZE="(31u * 1024u)" %endif %configure \ --libexecdir=%{_libdir}/find \ --localstatedir=/var/lib \ - --without-included-regex \ - --enable-d_type-optimisation + --without-included-regex make %{?_smp_mflags} %check @@ -104,8 +92,6 @@ %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 @@ /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 ++++++ findutils-4.4.2-updatedb.patch ++++++ --- /var/tmp/diff_new_pack.V4i2LH/_old 2013-10-24 14:40:38.000000000 +0200 +++ /var/tmp/diff_new_pack.V4i2LH/_new 2013-10-24 14:40:38.000000000 +0200 @@ -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 2012-02-13 14:27:58.231123165 +0100 -@@ -3486,7 +3486,7 @@ Default is none. +--- doc/find.texi.orig ++++ doc/find.texi +@@ -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 @@ 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 2012-02-13 14:27:58.232123141 +0100 +--- locate/updatedb.1.orig ++++ 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 @@ .B \-\-old\-format Index: locate/updatedb.sh =================================================================== ---- locate/updatedb.sh.orig 2011-04-04 00:53:12.000000000 +0200 -+++ locate/updatedb.sh 2012-02-13 14:28:48.445898801 +0100 -@@ -158,7 +158,7 @@ select_shell() { - : ${NETPATHS=} +--- locate/updatedb.sh.orig ++++ locate/updatedb.sh +@@ -165,6 +165,7 @@ select_shell() { + /sfs + /tmp + /usr/tmp ++/var/spool + /var/tmp + "} - # Directories to not put in the database, which would otherwise be. --: ${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 +@@ -196,7 +197,7 @@ fi export TMPDIR # The user to search network directories as. @@ -56,46 +61,11 @@ # The directory containing the subprograms. if test -n "$LIBEXECDIR" ; then -@@ -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"} -+: ${PRUNEFS="nfs NFS proc afs smbfs autofs iso9660 ncpfs coda devpts ftpfs devfs mfs sysfs shfs cifs 9P"} +@@ -273,6 +274,7 @@ proc + shfs + smbfs + sysfs ++unknown + "} 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 ++++++ --- /var/tmp/diff_new_pack.V4i2LH/_old 2013-10-24 14:40:38.000000000 +0200 +++ /var/tmp/diff_new_pack.V4i2LH/_new 2013-10-24 14:40:38.000000000 +0200 @@ -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 -+++ findutils-4.5.10/doc/find.texi 2012-01-16 15:54:30.683648566 -0500 -@@ -1440,6 +1440,10 @@ +--- + doc/find.texi | 4 ++++ + find/defs.h | 3 +++ + 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 @@ @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 ---- 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 -@@ -561,6 +561,9 @@ +Index: find/defs.h +=================================================================== +--- find/defs.h.orig ++++ find/defs.h +@@ -557,6 +557,9 @@ struct options /* If true, don't cross filesystem boundaries. */ bool stay_on_filesystem; @@ -25,10 +36,11 @@ /* 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 ---- 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 -@@ -460,6 +460,9 @@ +Index: find/find.1 +=================================================================== +--- find/find.1.orig ++++ find/find.1 +@@ -461,6 +461,9 @@ if standard input is a tty, and to .B \-nowarn otherwise. @@ -38,10 +50,11 @@ .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 ---- 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 -@@ -485,6 +485,12 @@ +Index: find/ftsfind.c +=================================================================== +--- find/ftsfind.c.orig ++++ find/ftsfind.c +@@ -485,6 +485,12 @@ consider_visiting (FTS *p, FTSENT *ent) } } @@ -54,10 +67,11 @@ 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 ---- 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 -@@ -151,6 +151,7 @@ +Index: find/parser.c +=================================================================== +--- find/parser.c.orig ++++ 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 @@ 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 @@ 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 @@ 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 ---- 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 -@@ -1006,6 +1006,7 @@ +Index: find/util.c +=================================================================== +--- find/util.c.orig ++++ 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.tar.gz -> findutils-4.5.12.tar.gz ++++++ ++++ 406045 lines of diff (skipped) ++++++ sysconfig.locate ++++++ --- /var/tmp/diff_new_pack.V4i2LH/_old 2013-10-24 14:40:39.000000000 +0200 +++ /var/tmp/diff_new_pack.V4i2LH/_new 2013-10-24 14:40:39.000000000 +0200 @@ -33,12 +33,12 @@ UPDATEDB_NETPATHS="" ## Type: string -## Default: "/mnt /cdrom /tmp /usr/tmp /var/tmp /var/spool /proc /media /sys /.snapshot" +## Default: "/mnt /cdrom /tmp /usr/tmp /var/tmp /var/spool /proc /media /sys /.snapshots" # # uptdatedb can skip directories for its database. The following parameter # says which ones. # -UPDATEDB_PRUNEPATHS="/mnt /cdrom /tmp /usr/tmp /var/tmp /var/spool /proc /media /sys /.snapshot /var/run/media" +UPDATEDB_PRUNEPATHS="/mnt /cdrom /tmp /usr/tmp /var/tmp /var/spool /proc /media /sys /.snapshots /var/run/media" ## Type: string("",nobody) ## Default: "" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org