Accepting request 399366 from Base:System

- sv-bug-48030-find-exec-plus-does-not-pass-all-arguments.patch: Add upstream patch to fix https://savannah.gnu.org/bugs/?48030 OBS-URL: https://build.opensuse.org/request/show/399366 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/findutils?expand=0&rev=56
2016-06-05 12:17:50 +00:00 · 2016-06-05 12:17:50 +00:00 · aad48dff07
commit aad48dff07
parent ee8c366b0a e74308e2da
3 changed files with 269 additions and 0 deletions
--- a/findutils.changes
+++ b/findutils.changes
@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 31 00:01:05 UTC 2016 - mail@bernhard-voelker.de
+
+- sv-bug-48030-find-exec-plus-does-not-pass-all-arguments.patch:
+  Add upstream patch to fix https://savannah.gnu.org/bugs/?48030
+
 -------------------------------------------------------------------
 Mon Jan 11 22:25:09 UTC 2016 - mail@bernhard-voelker.de

--- a/findutils.spec
+++ b/findutils.spec
@ -34,6 +34,9 @@ Source0:        http://ftp.gnu.org/pub/gnu/%{name}/%{name}-%{version}.tar.gz
 # adds a new option -xautofs to find to not descend into directories on autofs file systems
 Patch0:         findutils-4.4.2-xautofs.patch

+# Upstream patch, to be removed with version 4.7.0.
+Patch100:       sv-bug-48030-find-exec-plus-does-not-pass-all-arguments.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # BuildRequire dejagnu for 'runtest' to execute all tests.
 BuildRequires:  dejagnu
@ -63,6 +66,7 @@ useful for finding things on your system.
 %prep
 %setup -q
 %patch0
+%patch100

 %build
 %if 0%{?qemu_user_space_build}
@ -76,6 +80,13 @@ export DEFAULT_ARG_SIZE="(31u * 1024u)"
 make %{?_smp_mflags}

 %check
+if [ "%{version}" != '4.6.0' ]; then
+  echo "ERROR: remove this if-else-fi block from the spec file with findutils version >4.6.0." >&2
+  exit 1
+else
+  # Make the test script added with 'sv-48030*.patch' executable.
+  chmod +x find/testsuite/sv-48030-exec-plus-bug.sh
+fi
 make check \
  || { cat tests/test-suite.log; exit 1; }

--- a/sv-bug-48030-find-exec-plus-does-not-pass-all-arguments.patch
+++ b/sv-bug-48030-find-exec-plus-does-not-pass-all-arguments.patch
@ -0,0 +1,252 @@
+Upstream patch, to be removed with findutils-4.7.0
+
+http://git.sv.gnu.org/cgit/findutils.git/commit/?id=8cdc9767e3
+
+Differences to upstream patch:
+- Fix conflict in NEWS
+- Reference new test script in Makefile.in rather than in Makefile.am
+  to avoid automake machinery.
+
+----------------------------------------------------------------------
+From d15e640fc76f8b931549f79f2edc86d5e552e8bf Mon Sep 17 00:00:00 2001
+From: Bernhard Voelker <mail@bernhard-voelker.de>
+Date: Tue, 31 May 2016 00:31:50 +0200
+Subject: [PATCH] Fix bug #48030: find: -exec + does not pass all arguments in
+ certain cases
+
+When the -exec arguments buffer (usually 128k) is full and the given
+command has been executed with all that arguments, find(1) missed to
+execute the command yet another time if only 1 another file would have
+to be processed.
+Both find(1), i.e., nowadays FTS-version, and oldfind are affected.
+This bug was present since the implementation of '-exec +' in 2005,
+see commit FINDUTILS_4_2_11-1-25-gf0a6ac6.
+
+* lib/buildcmd.c (bc_push_arg): Move the assignment to set 'state->todo'
+to 1 down after the immediate execution which resets that flag.
+* find/testsuite/sv-48030-exec-plus-bug.sh: Add a test.
+* find/testsuite/Makefile.in (test_shell_progs): Reference the test.
+* NEWS (Bug Fixes): Mention the fix.
+
+Reported by Joe Philip Ninan <indiajoe@gmail.com> in
+https://savannah.gnu.org/bugs/?48030
+---
+ NEWS                                     |   12 ++
+ find/testsuite/Makefile.am               |    3 
+ find/testsuite/sv-48030-exec-plus-bug.sh |  143 +++++++++++++++++++++++++++++++
+ lib/buildcmd.c                           |   10 +-
+ 4 files changed, 162 insertions(+), 6 deletions(-)
+ create mode 100755 find/testsuite/sv-48030-exec-plus-bug.sh
+
+Index: NEWS
+===================================================================
+--- NEWS.orig
+++ NEWS
+@@ -1,5 +1,17 @@
+ GNU findutils NEWS - User visible changes.      -*- outline -*- (allout)
+ 
+* openSUSE downstream changes
+
+** Bug Fixes
+
+Savannah bug
+#48030: find -exec + does not pass all arguments for certain specific filename
+        lengths.  After the internal (usually 128k) buffer is full and find(1)
+        executed the given command with these arguments, it would miss to run
+        the command yet another time if only one other file argument has to be
+        processed.  Bug introduced in FINDUTILS-4.2.12.
+
+
+ * Major changes in release 4.6.0, 2015-12-28
+ 
+ ** Stable Release
+Index: find/testsuite/sv-48030-exec-plus-bug.sh
+===================================================================
+--- /dev/null
+++ find/testsuite/sv-48030-exec-plus-bug.sh
+@@ -0,0 +1,143 @@
+#! /bin/sh
+# Copyright (C) 2016 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# This test verifies that find invokes the given command for the
+# multiple-argument sytax '-exec CMD {} +'.  Between FINDUTILS-4.2.12
+# and v4.6.0, find(1) would have failed to execute CMD another time
+# if there was only one last single file argument.
+
+testname="$(basename $0)"
+
+. "${srcdir}"/binary_locations.sh
+
+die() {
+  echo "$@" >&2
+  exit 1
+}
+
+# This is used to simplify checking of the return value
+# which is useful when ensuring a command fails as desired.
+# I.e., just doing `command ... &&fail=1` will not catch
+# a segfault in command for example.  With this helper you
+# instead check an explicit exit code like
+#   returns_ 1 command ... || fail
+returns_ () {
+  # Disable tracing so it doesn't interfere with stderr of the wrapped command
+  { set +x; } 2>/dev/null
+
+  local exp_exit="$1"
+  shift
+  "$@"
+  test $? -eq $exp_exit && ret_=0 || ret_=1
+
+  set -x
+  { return $ret_; } 2>/dev/null
+}
+
+# Define the nicest compare available (borrowed from gnulib).
+if diff_out_=`exec 2>/dev/null; diff -u "$0" "$0" < /dev/null` \
+   && diff -u Makefile "$0" 2>/dev/null | grep '^[+]#!' >/dev/null; then
+  # diff accepts the -u option and does not (like AIX 7 'diff') produce an
+  # extra space on column 1 of every content line.
+  if test -z "$diff_out_"; then
+    compare () { diff -u "$@"; }
+  else
+    compare ()
+    {
+      if diff -u "$@" > diff.out; then
+        # No differences were found, but Solaris 'diff' produces output
+        # "No differences encountered". Hide this output.
+        rm -f diff.out
+        true
+      else
+        cat diff.out
+        rm -f diff.out
+        false
+      fi
+    }
+  fi
+elif diff_out_=`exec 2>/dev/null; diff -c "$0" "$0" < /dev/null`; then
+  if test -z "$diff_out_"; then
+    compare () { diff -c "$@"; }
+  else
+    compare ()
+    {
+      if diff -c "$@" > diff.out; then
+        # No differences were found, but AIX and HP-UX 'diff' produce output
+        # "No differences encountered" or "There are no differences between the
+        # files.". Hide this output.
+        rm -f diff.out
+        true
+      else
+        cat diff.out
+        rm -f diff.out
+        false
+      fi
+    }
+  fi
+elif cmp -s /dev/null /dev/null 2>/dev/null; then
+  compare () { cmp -s "$@"; }
+else
+  compare () { cmp "$@"; }
+fi
+
+DIR='RashuBug'
+# Name of the CMD to execute: the file name must be 6 characters long
+# (to trigger the bug in combination with the test files).
+CMD='tstcmd'
+
+# Create test files.
+make_test_data() {
+  # Create the CMD script and check that it works.
+  mkdir "$DIR" 'bin' \
+    && echo 'printf "%s\n" "$@"' > "bin/$CMD" \
+    && chmod +x "bin/$CMD" \
+    && PATH="$PWD/bin:$PATH" \
+    && [ $( "${ftsfind}" bin -maxdepth 0 -exec "$CMD" '{}' + ) = 'bin' ] \
+    || return 1
+
+  # Create expected output file - also used for creating the test data.
+  { seq -f "${DIR}/abcdefghijklmnopqrstuv%04g" 901 &&
+    seq -f "${DIR}/abcdefghijklmnopqrstu%04g" 902 3719
+  } > exp2 \
+    && LC_ALL=C sort exp2 > exp \
+    && rm exp2 \
+    || return 1
+
+  # Create test files, and check if test data has been created correctly.
+  xargs touch < exp \
+    && [ -f "${DIR}/abcdefghijklmnopqrstu3719" ] \
+    && [ 3719 = $( "${ftsfind}" "$DIR" -type f | wc -l ) ] \
+    || return 1
+}
+
+set -x
+tmpdir="$(mktemp -d)" \
+  && cd "$tmpdir" \
+  && make_test_data "${tmpdir}" \
+  || die "FAIL: failed to set up the test in ${tmpdir}"
+
+fail=0
+for exe in "${ftsfind}" "${oldfind}"; do
+  "$exe" "$DIR" -type f -exec "$CMD" '{}' + > out || fail=1
+  LC_ALL=C sort out > out2 || fail=1
+  compare exp out2 || fail=1
+done
+
+cd ..
+rm -rf "${tmpdir}" || exit 1
+exit $fail
+Index: lib/buildcmd.c
+===================================================================
+--- lib/buildcmd.c.orig
+++ lib/buildcmd.c
+@@ -356,11 +356,6 @@ bc_push_arg (struct buildcmd_control *ct
+ 
+   assert (arg != NULL);
+ 
+-  if (!initial_args)
+-    {
+-      state->todo = 1;
+-    }
+-
+   if (!terminate)
+     {
+       if (state->cmd_argv_chars + len + pfxlen > ctl->arg_max)
+@@ -380,6 +375,11 @@ bc_push_arg (struct buildcmd_control *ct
+             bc_do_exec (ctl, state);
+     }
+ 
+  if (!initial_args)
+    {
+      state->todo = 1;
+    }
+
+   if (state->cmd_argc >= state->cmd_argv_alloc)
+     {
+       /* XXX: we could use extendbuf() here. */
+Index: find/testsuite/Makefile.in
+===================================================================
+--- find/testsuite/Makefile.in.orig
+++ find/testsuite/Makefile.in
+@@ -2004,7 +2004,8 @@ test_escapechars.sh \
+ test_escape_c.sh \
+ test_inode.sh \
+ sv-34079.sh \
+-sv-34976-execdir-fd-leak.sh
+sv-34976-execdir-fd-leak.sh \
+sv-48030-exec-plus-bug.sh
+ 
+ EXTRA_DIST = $(EXTRA_DIST_EXP) $(EXTRA_DIST_XO) $(EXTRA_DIST_GOLDEN) \
+ 	$(test_shell_progs) binary_locations.sh checklists.py