[patch/f12/master] Fixed argument type for --get (bug #553624).
Tim Waugh
twaugh at fedoraproject.org
Fri Aug 6 16:21:19 UTC 2010
commit d15ffc545d548bdb1fe024ecb7db97506b48d6e1
Author: Tim Waugh <twaugh at redhat.com>
Date: Fri Aug 6 17:08:49 2010 +0100
Fixed argument type for --get (bug #553624).
(cherry picked from commit 322e73af7aa60ce6d737ce1e4736d4a41e4d5b10)
patch-get-arg.patch | 12 ++++++++++++
patch.spec | 9 ++++++++-
2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/patch-get-arg.patch b/patch-get-arg.patch
new file mode 100644
index 0000000..45f3bc8
--- /dev/null
+++ b/patch-get-arg.patch
@@ -0,0 +1,12 @@
+diff -up patch-2.6.1/src/patch.c.get-arg patch-2.6.1/src/patch.c
+--- patch-2.6.1/src/patch.c.get-arg 2010-07-27 18:05:26.217150510 +0100
++++ patch-2.6.1/src/patch.c 2010-07-27 18:05:47.464150892 +0100
+@@ -558,7 +558,7 @@ static struct option const longopts[] =
+ {"remove-empty-files", no_argument, NULL, 'E'},
+ {"force", no_argument, NULL, 'f'},
+ {"fuzz", required_argument, NULL, 'F'},
+- {"get", no_argument, NULL, 'g'},
++ {"get", required_argument, NULL, 'g'},
+ {"input", required_argument, NULL, 'i'},
+ {"ignore-whitespace", no_argument, NULL, 'l'},
+ #ifdef ENABLE_MERGE
diff --git a/patch.spec b/patch.spec
index f175c74..d1afe6a 100644
--- a/patch.spec
+++ b/patch.spec
@@ -1,12 +1,13 @@
Summary: Utility for modifying/upgrading files
Name: patch
Version: 2.6.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
URL: http://www.gnu.org/software/patch/patch.html
Group: Development/Tools
Source: ftp://ftp.gnu.org/gnu/patch/patch-%{version}.tar.xz
Patch1: patch-2.5.4-sigsegv.patch
+Patch2: patch-get-arg.patch
Patch100: patch-selinux.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,6 +30,9 @@ applications.
# Avoid segfault.
%patch1 -p1 -b .sigsegv
+# Fixed argument type for --get (bug #553624).
+%patch2 -p1 -b .get-arg
+
# SELinux support.
%patch100 -p1 -b .selinux
@@ -57,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/*/*
%changelog
+* Fri Aug 6 2010 Tim Waugh <twaugh at redhat.com> 2.6.1-3
+- Fixed argument type for --get (bug #553624).
+
* Fri Aug 6 2010 Tim Waugh <twaugh at redhat.com>
- Added comments for all patches.
- Ship COPYING file.
More information about the scm-commits
mailing list