Hello community, here is the log from the commit of package patch for openSUSE:Factory checked in at 2012-04-12 09:44:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/patch (Old) and /work/SRC/openSUSE:Factory/.patch.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "patch", Maintainer is "agr...@novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/patch/patch.changes 2011-10-06 16:45:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.patch.new/patch.changes 2012-04-12 09:45:00.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Apr 6 14:22:12 CEST 2012 - jdelv...@suse.de + +- patch-revert-e0f70752.patch: Revert broken upstream commit + (bnc#755136). + +------------------------------------------------------------------- +Wed Apr 4 19:03:25 CEST 2012 - jdelv...@suse.de + +- Version 2.6.1.136 + +------------------------------------------------------------------- Old: ---- patch-2.6.1.116-33c4.tar.bz2 New: ---- patch-2.6.1.136-31a7.tar.bz2 patch-revert-e0f70752.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patch.spec ++++++ --- /var/tmp/diff_new_pack.HhTCf6/_old 2012-04-12 09:45:01.000000000 +0200 +++ /var/tmp/diff_new_pack.HhTCf6/_new 2012-04-12 09:45:01.000000000 +0200 @@ -18,7 +18,7 @@ # norootforbuild Url: ftp://alpha.gnu.org/gnu/diffutils/ -%define hash -33c4 +%define hash -31a7 Name: patch License: GPL-3.0+ @@ -27,10 +27,11 @@ # See bnc#662957. The fix for CVE-2010-4651 breaks the way interdiff was # invoking patch, so interdiff had to be fixed too. Conflicts: patchutils < 0.3.2 -Version: 2.6.1.116 +Version: 2.6.1.136 Release: 1 Summary: GNU patch Source: ftp://alpha.gnu.org/gnu/patch/patch-%version%hash.tar.bz2 +Patch1: patch-revert-e0f70752.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -46,6 +47,7 @@ %prep %setup -q -n patch-%version%hash +%patch1 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -Wall -O2 -pipe" ++++++ patch-2.6.1.116-33c4.tar.bz2 -> patch-2.6.1.136-31a7.tar.bz2 ++++++ ++++ 49311 lines of diff (skipped) ++++++ patch-revert-e0f70752.patch ++++++ References: bnc#755136 Revert upstream commit e0f707523cab26f74ec23f4a20a27add8702ed5b. --- patch-2.6.1.136-31a7.orig/src/pch.c +++ patch-2.6.1.136-31a7/src/pch.c @@ -379,18 +379,11 @@ skip_hex_digits (char const *str) static bool name_is_valid (char const *name) { - static char const *bad[2]; - char const *n; - - if (bad[0] && ! strcmp (bad[0], name)) - return false; - if (bad[1] && ! strcmp (bad[1], name)) - return false; + const char *n = name; if (IS_ABSOLUTE_FILE_NAME (name)) { say ("Ignoring potentially dangerous file name %s\n", quotearg (name)); - bad[!! bad[0]] = name; return false; } for (n = name; *n; ) @@ -398,7 +391,6 @@ name_is_valid (char const *name) if (*n == '.' && *++n == '.' && ( ! *++n || ISSLASH (*n))) { say ("Ignoring potentially dangerous file name %s\n", quotearg (name)); - bad[!! bad[0]] = name; return false; } while (*n && ! ISSLASH (*n)) --- patch-2.6.1.136-31a7.orig/tests/bad-filenames +++ patch-2.6.1.136-31a7/tests/bad-filenames @@ -114,27 +114,3 @@ echo 1 > g check 'patch -f -p1 --dry-run < d.diff || echo status: $?' <<EOF patching file g EOF - -mkdir d -cd d -cat > d.diff <<EOF ---- ../h -+++ ../h -@@ -0,0 +1 @@ -+x -EOF - -touch ../h -check 'patch -f -p0 < d.diff || echo status: $?' <<EOF -Ignoring potentially dangerous file name ../h -can't find file to patch at input line 3 -Perhaps you used the wrong -p or --strip option? -The text leading up to this was: --------------------------- -|--- ../h -|+++ ../h --------------------------- -No file to patch. Skipping patch. -1 out of 1 hunk ignored -status: 1 -EOF -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
