From 873f1112d9b9e9c0b8fdc6d5b42a7eca984342ba65165743bfbc3c1036fb6989 Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Fri, 2 Jul 2010 08:21:11 +0000 Subject: [PATCH 1/4] Accepting request 42404 from home:jengelh:smp Copy from home:jengelh:smp/patch via accept of submit request 42404 revision 2. Request was accepted with message: reviewed ok. OBS-URL: https://build.opensuse.org/request/show/42404 OBS-URL: https://build.opensuse.org/package/show/devel:tools/patch?expand=0&rev=20 --- patch.changes | 5 +++++ patch.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/patch.changes b/patch.changes index 4042885..7b5cba1 100644 --- a/patch.changes +++ b/patch.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 2 06:57:49 UTC 2010 - jengelh@medozas.de + +- Use %_smp_mflags + ------------------------------------------------------------------- Wed May 5 01:28:12 CEST 2010 - agruen@suse.de diff --git a/patch.spec b/patch.spec index d22ff60..054da69 100644 --- a/patch.spec +++ b/patch.spec @@ -49,7 +49,7 @@ Authors: %build CFLAGS="$RPM_OPT_FLAGS -Wall -O2 -pipe" \ ./configure --prefix=%{_prefix} -make %{?jobs:-j%jobs} %{verbose:V=1}; +make %{?_smp_mflags} %{verbose:V=1}; %check make check %{verbose:V=1} From f47cd05101880852e5e8977241ac4976088b7326a7fc241abefe3a2604254e39 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 27 Sep 2010 13:51:15 +0000 Subject: [PATCH 2/4] Accepting request 49168 from devel:tools checked in (request 49168) OBS-URL: https://build.opensuse.org/request/show/49168 OBS-URL: https://build.opensuse.org/package/show/devel:tools/patch?expand=0&rev=21 --- patch.changes | 5 ----- patch.spec | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/patch.changes b/patch.changes index 7b5cba1..4042885 100644 --- a/patch.changes +++ b/patch.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Fri Jul 2 06:57:49 UTC 2010 - jengelh@medozas.de - -- Use %_smp_mflags - ------------------------------------------------------------------- Wed May 5 01:28:12 CEST 2010 - agruen@suse.de diff --git a/patch.spec b/patch.spec index 054da69..d22ff60 100644 --- a/patch.spec +++ b/patch.spec @@ -49,7 +49,7 @@ Authors: %build CFLAGS="$RPM_OPT_FLAGS -Wall -O2 -pipe" \ ./configure --prefix=%{_prefix} -make %{?_smp_mflags} %{verbose:V=1}; +make %{?jobs:-j%jobs} %{verbose:V=1}; %check make check %{verbose:V=1} From 4a75e4b044ed711ca873ae68e1cfa70e40f28aa8a2351e032bb15c09fe9c2f84 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Mon, 4 Apr 2011 13:15:18 +0000 Subject: [PATCH 3/4] - Version 2.6.1.116: + Patch now ignores destination file names that are absolute or that contain a component of ".." (CVE-2010-4651, bnc#662957). - Drop unified-reject-files-compat.diff. Compatibility has been provided for the past 18 months, hopefully nobody is relying on it any longer. OBS-URL: https://build.opensuse.org/package/show/devel:tools/patch?expand=0&rev=22 --- patch-2.6.1.116-33c4.tar.bz2 | 3 +++ patch-2.6.1.81-5b68.tar.bz2 | 3 --- patch.changes | 15 +++++++++++++++ patch.spec | 13 ++++++------- unified-reject-files-compat.diff | 24 ------------------------ 5 files changed, 24 insertions(+), 34 deletions(-) create mode 100644 patch-2.6.1.116-33c4.tar.bz2 delete mode 100644 patch-2.6.1.81-5b68.tar.bz2 delete mode 100644 unified-reject-files-compat.diff diff --git a/patch-2.6.1.116-33c4.tar.bz2 b/patch-2.6.1.116-33c4.tar.bz2 new file mode 100644 index 0000000..1c3fa05 --- /dev/null +++ b/patch-2.6.1.116-33c4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e5b94b2d636b0fa73272736ae961fadb380fe4c5122ac43d1507d9c24ad1a4cb +size 660941 diff --git a/patch-2.6.1.81-5b68.tar.bz2 b/patch-2.6.1.81-5b68.tar.bz2 deleted file mode 100644 index f7ac3a3..0000000 --- a/patch-2.6.1.81-5b68.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:43c52e50a87c3d6895fed2dbdb33a021f77320ce0688de37bceba58e9b000d74 -size 593415 diff --git a/patch.changes b/patch.changes index 4042885..5c7e525 100644 --- a/patch.changes +++ b/patch.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Apr 4 15:11:04 CEST 2011 - jdelvare@suse.de + +- Version 2.6.1.116: + + Patch now ignores destination file names that are absolute or + that contain a component of ".." (CVE-2010-4651, bnc#662957). +- Drop unified-reject-files-compat.diff. Compatibility has been + provided for the past 18 months, hopefully nobody is relying on + it any longer. + +------------------------------------------------------------------- +Fri Jul 2 06:57:49 UTC 2010 - jengelh@medozas.de + +- Use %_smp_mflags + ------------------------------------------------------------------- Wed May 5 01:28:12 CEST 2010 - agruen@suse.de diff --git a/patch.spec b/patch.spec index d22ff60..ccd272f 100644 --- a/patch.spec +++ b/patch.spec @@ -1,7 +1,7 @@ # -# spec file for package patch (Version 2.6.1.81) +# spec file for package patch (Version 2.6.1.116) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,17 +18,17 @@ # norootforbuild Url: ftp://alpha.gnu.org/gnu/diffutils/ -%define hash -5b68 +%define hash -33c4 Name: patch License: GPLv3+ Group: Productivity/Text/Utilities AutoReqProv: on -Version: 2.6.1.81 +Conflicts: patchutils < 0.3.2 +Version: 2.6.1.116 Release: 1 Summary: GNU patch Source: ftp://alpha.gnu.org/gnu/patch/patch-%version%hash.tar.bz2 -Patch: unified-reject-files-compat.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -44,12 +44,11 @@ Authors: %prep %setup -q -n patch-%version%hash -%patch -p1 %build CFLAGS="$RPM_OPT_FLAGS -Wall -O2 -pipe" \ ./configure --prefix=%{_prefix} -make %{?jobs:-j%jobs} %{verbose:V=1}; +make %{?_smp_mflags} %{verbose:V=1}; %check make check %{verbose:V=1} diff --git a/unified-reject-files-compat.diff b/unified-reject-files-compat.diff deleted file mode 100644 index 343bf24..0000000 --- a/unified-reject-files-compat.diff +++ /dev/null @@ -1,24 +0,0 @@ -Index: patch-2.6.1.64-4762/src/patch.c -=================================================================== ---- patch-2.6.1.64-4762.orig/src/patch.c -+++ patch-2.6.1.64-4762/src/patch.c -@@ -622,6 +622,7 @@ static struct option const longopts[] = - {"posix", no_argument, NULL, CHAR_MAX + 7}, - {"quoting-style", required_argument, NULL, CHAR_MAX + 8}, - {"reject-format", required_argument, NULL, CHAR_MAX + 9}, -+ {"unified-reject-files", no_argument, NULL, CHAR_MAX + 1001}, - {NULL, no_argument, NULL, 0} - }; - -@@ -902,6 +903,11 @@ get_some_switches (void) - else - usage (stderr, 2); - break; -+ case CHAR_MAX + 1001: -+ say ("warning: the `--unified-reject-files' option is obsolete; use " -+ "`--reject-format=unified' instead\n"); -+ reject_format = UNI_DIFF; -+ break; - default: - usage (stderr, 2); - } From cffc447f94aac266fa5262737a39acaabf0a764dfd1b96ef247e1aaa4bf5f5fa Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Mon, 4 Apr 2011 15:31:57 +0000 Subject: [PATCH 4/4] Document the conflict with patchutils < 0.3.2. OBS-URL: https://build.opensuse.org/package/show/devel:tools/patch?expand=0&rev=23 --- patch.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patch.spec b/patch.spec index ccd272f..53d1af8 100644 --- a/patch.spec +++ b/patch.spec @@ -24,6 +24,8 @@ Name: patch License: GPLv3+ 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 Release: 1