From 0a622f8d7fa55ef7a83945b5645b38e62bf2db1f126bbe843163b90758b611aa Mon Sep 17 00:00:00 2001
From: Jean Delvare <jdelvare@suse.com>
Date: Fri, 6 Apr 2012 12:24:18 +0000
Subject: [PATCH] - 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: $?' <<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
diff --git a/patch.changes b/patch.changes
index 11ab866..23c57bd 100644
--- a/patch.changes
+++ b/patch.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Apr  6 14:22:12 CEST 2012 - jdelvare@suse.de
+
+- patch-revert-e0f70752.patch: Revert broken upstream commit
+  (bnc#755136).
+
 -------------------------------------------------------------------
 Wed Apr  4 19:03:25 CEST 2012 - jdelvare@suse.de
 
diff --git a/patch.spec b/patch.spec
index b8d60a3..77442d9 100644
--- a/patch.spec
+++ b/patch.spec
@@ -31,6 +31,7 @@ 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 @@ Authors:
 
 %prep
 %setup -q -n patch-%version%hash
+%patch1 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -Wall -O2 -pipe"