- 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

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e5b94b2d636b0fa73272736ae961fadb380fe4c5122ac43d1507d9c24ad1a4cb
+size 660941

patch-2.6.1.81-5b68.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:43c52e50a87c3d6895fed2dbdb33a021f77320ce0688de37bceba58e9b000d74
-size 593415

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
 

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}

unified-reject-files-compat.diff

@@ -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);
- 	}