pool/patch
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 113094 from devel:tools

Browse Source 
- Revert broken upstream commit (bnc#755136).
- Update to a less ancient alpha snapshot.

OBS-URL: https://build.opensuse.org/request/show/113094
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patch?expand=0&rev=30
This commit is contained in:
Stephan Kulow 2012-04-12 07:44:52 +00:00 committed by Git OBS Bridge
commit 744f4fc71c
5 changed files with 82 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
patch-2.6.1.116-33c4.tar.bz2
View File

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

3
patch-2.6.1.136-31a7.tar.bz2 Normal file
View File

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

64
patch-revert-e0f70752.patch Normal file
View File

@ -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

11
patch.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
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
- Version 2.6.1.136
-------------------------------------------------------------------
Wed Oct 5 12:33:53 UTC 2011 - uli@suse.com

6
patch.spec
View File

@ -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 @@ 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
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"