diff --git a/gnulib-perl522.patch b/gnulib-perl522.patch new file mode 100644 index 0000000..e15505b --- /dev/null +++ b/gnulib-perl522.patch @@ -0,0 +1,15 @@ +Subject: http://comments.gmane.org/gmane.comp.lib.gnulib.bugs/35272 + +Index: grep-2.21/build-aux/update-copyright +=================================================================== +--- grep-2.21.orig/build-aux/update-copyright ++++ grep-2.21/build-aux/update-copyright +@@ -124,7 +124,7 @@ use strict; + use warnings; + + my $copyright_re = 'Copyright'; +-my $circle_c_re = '(?:\([cC]\)|@copyright{}|©)'; ++my $circle_c_re = '(?:\([cC]\)|@copyright\{}|©)'; + my $holder = $ENV{UPDATE_COPYRIGHT_HOLDER}; + $holder ||= 'Free Software Foundation, Inc.'; + my $prefix_max = 5; diff --git a/grep.changes b/grep.changes index 4097d16..bed1ced 100644 --- a/grep.changes +++ b/grep.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 6 10:10:12 UTC 2015 - coolo@suse.com + +- add gnulib-perl522.patch from gnulib.bugs + ------------------------------------------------------------------- Mon Jan 26 10:46:13 UTC 2015 - schwab@suse.de diff --git a/grep.spec b/grep.spec index f588257..74ac806 100644 --- a/grep.spec +++ b/grep.spec @@ -27,6 +27,8 @@ Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz Source2: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig Source3: http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=grep&download=1#/%{name}.keyring Patch0: grep-F-heap-overrun.patch +# PATCH-FIX-UPSTREAM http://comments.gmane.org/gmane.comp.lib.gnulib.bugs/35272 +Patch1: gnulib-perl522.patch BuildRequires: makeinfo BuildRequires: pcre-devel BuildRequires: xz @@ -45,6 +47,7 @@ the matching lines. %prep %setup -q %patch0 -p1 +%patch1 -p1 chmod +x tests/kwset-abuse %if 0%{?suse_version} < 1120 echo "ac_cv_search_pcre_compile=\${ac_cv_search_pcre_compile=%{_libdir}/libpcre.a}" >config.cache