From 231fb6e34a6bcab27d1d2b88278c580da63b8e13dc7cb0bd3d23836bf89215d0 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Wed, 4 Apr 2012 17:17:36 +0000 Subject: [PATCH 1/4] - Version 2.6.1.136 OBS-URL: https://build.opensuse.org/package/show/devel:tools/patch?expand=0&rev=27 --- patch-2.6.1.116-33c4.tar.bz2 | 3 --- patch-2.6.1.136-31a7.tar.xz | 3 +++ patch.changes | 5 +++++ patch.spec | 8 ++++---- 4 files changed, 12 insertions(+), 7 deletions(-) delete mode 100644 patch-2.6.1.116-33c4.tar.bz2 create mode 100644 patch-2.6.1.136-31a7.tar.xz diff --git a/patch-2.6.1.116-33c4.tar.bz2 b/patch-2.6.1.116-33c4.tar.bz2 deleted file mode 100644 index 1c3fa05..0000000 --- a/patch-2.6.1.116-33c4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e5b94b2d636b0fa73272736ae961fadb380fe4c5122ac43d1507d9c24ad1a4cb -size 660941 diff --git a/patch-2.6.1.136-31a7.tar.xz b/patch-2.6.1.136-31a7.tar.xz new file mode 100644 index 0000000..1f762e0 --- /dev/null +++ b/patch-2.6.1.136-31a7.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b96b00ba3ff5b2a146863240f152ec5ab9177de4ce8aec593ba86f36797480ac +size 608932 diff --git a/patch.changes b/patch.changes index 083623b..11ab866 100644 --- a/patch.changes +++ b/patch.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 4 19:03:25 CEST 2012 - jdelvare@suse.de + +- Version 2.6.1.136 + ------------------------------------------------------------------- Wed Oct 5 12:33:53 UTC 2011 - uli@suse.com diff --git a/patch.spec b/patch.spec index 2e58ac9..f11549f 100644 --- a/patch.spec +++ b/patch.spec @@ -18,19 +18,19 @@ # norootforbuild Url: ftp://alpha.gnu.org/gnu/diffutils/ -%define hash -33c4 +%define hash -31a7 Name: patch -License: GPLv3+ +License: GPL-3.0+ Group: Productivity/Text/Utilities AutoReqProv: on # 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 +Source: ftp://alpha.gnu.org/gnu/patch/patch-%version%hash.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description From edf85115791e8d7c8485afec4c32a055dd206d98220bff7c6e054a73d7cd7e35 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Wed, 4 Apr 2012 18:41:46 +0000 Subject: [PATCH 2/4] Add missing BuildRequires. OBS-URL: https://build.opensuse.org/package/show/devel:tools/patch?expand=0&rev=28 --- patch.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/patch.spec b/patch.spec index f11549f..e8cd4eb 100644 --- a/patch.spec +++ b/patch.spec @@ -32,6 +32,7 @@ Release: 1 Summary: GNU patch Source: ftp://alpha.gnu.org/gnu/patch/patch-%version%hash.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: xz %description The GNU patch program is used to apply diffs between original and From 32ed207b6202e41cbb61d29b7cc44e048b66d4edddfef96448e4486fc23bfa88 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Thu, 5 Apr 2012 08:25:04 +0000 Subject: [PATCH 3/4] xz isn't available in SLE11 SP1 and older, so stick to bzip2 for now. OBS-URL: https://build.opensuse.org/package/show/devel:tools/patch?expand=0&rev=29 --- patch-2.6.1.136-31a7.tar.bz2 | 3 +++ patch-2.6.1.136-31a7.tar.xz | 3 --- patch.spec | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) create mode 100644 patch-2.6.1.136-31a7.tar.bz2 delete mode 100644 patch-2.6.1.136-31a7.tar.xz diff --git a/patch-2.6.1.136-31a7.tar.bz2 b/patch-2.6.1.136-31a7.tar.bz2 new file mode 100644 index 0000000..4860e6d --- /dev/null +++ b/patch-2.6.1.136-31a7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a20be53db3610f050dcac8b3f3e1e638c0a722e118a3443b205bb23e24fff7e5 +size 705888 diff --git a/patch-2.6.1.136-31a7.tar.xz b/patch-2.6.1.136-31a7.tar.xz deleted file mode 100644 index 1f762e0..0000000 --- a/patch-2.6.1.136-31a7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b96b00ba3ff5b2a146863240f152ec5ab9177de4ce8aec593ba86f36797480ac -size 608932 diff --git a/patch.spec b/patch.spec index e8cd4eb..b8d60a3 100644 --- a/patch.spec +++ b/patch.spec @@ -30,9 +30,8 @@ Conflicts: patchutils < 0.3.2 Version: 2.6.1.136 Release: 1 Summary: GNU patch -Source: ftp://alpha.gnu.org/gnu/patch/patch-%version%hash.tar.xz +Source: ftp://alpha.gnu.org/gnu/patch/patch-%version%hash.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: xz %description The GNU patch program is used to apply diffs between original and From 0a622f8d7fa55ef7a83945b5645b38e62bf2db1f126bbe843163b90758b611aa Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Fri, 6 Apr 2012 12:24:18 +0000 Subject: [PATCH 4/4] - patch-revert-e0f70752.patch: Revert broken upstream commit (bnc#755136). OBS-URL: https://build.opensuse.org/package/show/devel:tools/patch?expand=0&rev=30 --- patch-revert-e0f70752.patch | 64 +++++++++++++++++++++++++++++++++++++ patch.changes | 6 ++++ patch.spec | 2 ++ 3 files changed, 72 insertions(+) create mode 100644 patch-revert-e0f70752.patch diff --git a/patch-revert-e0f70752.patch b/patch-revert-e0f70752.patch new file mode 100644 index 0000000..a0b7180 --- /dev/null +++ b/patch-revert-e0f70752.patch @@ -0,0 +1,64 @@ +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: $?' < d.diff <