diff --git a/grep-3.3.tar.xz b/grep-3.3.tar.xz deleted file mode 100644 index 973a1ec..0000000 --- a/grep-3.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b960541c499619efd6afe1fa795402e4733c8e11ebf9fafccc0bb4bccdc5b514 -size 1473056 diff --git a/grep-3.3.tar.xz.sig b/grep-3.3.tar.xz.sig deleted file mode 100644 index 716fdd7..0000000 --- a/grep-3.3.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEFV0/xQDINEhtHupnf9n8ywAL7u4FAlwcbqcACgkQf9n8ywAL -7u4Rlg//f78LJFKAZAl75xkCV7nApC+fpQb4tlBtmRKDR0MLJYZ6v4Zlrs2hnKqh -lKj+d+dvLnf/2qhlqfzFqyr9IGBy8UZ4F4lK6v23cr2kEvzS+EY8VQU9sd5qcDnW -Ety57aUle8FPoh3CAs5hV8KP5pXUtyjQfaXa9uI+FrhcwWB4c5Hw9BfgJOXvT22Z -AlP9SkE1xI72bRjqWnUWPM9EWXfnvfSxZ8rZ0+gHWAGVubR3K/Zp1K7boMRXoR7O -5vB5CeFkkUH3SZF4y2BwmejF364QESX9CvfmRDKpYlqfMwnc/c1UXhiNqAuFL21X -2bLEIjGzEAKEYpQMJaGz+Ni7PiUAiF6nXiFNqU0sB0SSHR/g/VQJGNfmc06vNf9e -qiHHs9s1rED0BxxhgZD/mRaF9gRhYgMXDaGx2ZhQYLWN8Tb45IZ0YcCxpG9Ca3TJ -6hprW+oFnoaYm1HARn1nFK+gX2bgBuilL5iujvJ0qT6DkRMoFD59o32F+FjN/ZyG -1ucJFsD4jmXJmKF9t7opJvyk4dGuGpuvJpRjy60sB4YvMmiPISj2tm392qDta/dw -+XZB5AzdISrvhbEf/I6W0acQJNagb03BdP9cNQi7Lz2GcHfQmq5yTT3gm/0+nI0D -qbV+h/IMigzGtKxmcyvijtkVkReE9NpgB0GYCgjSi6MB3uXrc1w= -=hTsC ------END PGP SIGNATURE----- diff --git a/grep-3.4.tar.xz b/grep-3.4.tar.xz new file mode 100644 index 0000000..1defa24 --- /dev/null +++ b/grep-3.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58e6751c41a7c25bfc6e9363a41786cff3ba5709cf11d5ad903cf7cce31cc3fb +size 1555820 diff --git a/grep-3.4.tar.xz.sig b/grep-3.4.tar.xz.sig new file mode 100644 index 0000000..e8aaf73 --- /dev/null +++ b/grep-3.4.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEFV0/xQDINEhtHupnf9n8ywAL7u4FAl4OYGEACgkQf9n8ywAL +7u42JA//fv7efypNdYbN+m03SWmtQi08K9vpbkj1OzMYSDleRcA4U5lndNvHcFO1 +wO5Rjl6Sm1uKfY9rh4+2l48CsfizUSzx7wKhT/1S609u0rNBnDKPFnjtq3QWJ6Pj +S1ZZL9DLA/5wYXVVVOPKH2h1gn77Oz5xcZVUF9BJ43wPtl/8ULJI0Mu96a0bOCHC +3h8OKUTGTRGritaXXcZkrFdd2lbVUEDInHCxKh2nVYbKAKd8hBw5bPad6YB+MZk3 +auDdsjFSffGHYAC+V/I7CF/Fu+Q6FPKMWBWYg5H0bttRgki/Sw5y+GZd0yEb7WvW +aLM/5a2ZWq0SdAkcoMur2bwvhkqQdX5VA+5uayOu+ixopanNQ1iFAuZPnbyQQjlh +4FmjCh6FiFjLNQm4vSw4xVhjD6nNsW4Ux3nVscQhlBsRrhYbbYMZi+J8KE8WUDze +1bv84frHt+WDQAhzdKn7v4nL0U5iNCA0Ekj5hLZemo+aCAWZ3F0SGBoUf1daU6xb +ArZY3A9AfeWIUaom7oNAthwksv+wi3kgqXTzcsE61oFxi42EBlYIQRyGm6Ye0i8R +V0nyJC5cGsf7VEPNzjWaxszcDWCeMWr+XrBmxZr5VVlqBm+g2Pgeda1mQFWzixL0 ++SPdJTalvcNOwqRsCTP/9pqieOL/KHl5A6eh0f0ejkpayuw+5oY= +=vRMd +-----END PGP SIGNATURE----- diff --git a/grep.changes b/grep.changes index 6f9e903..c356cf5 100644 --- a/grep.changes +++ b/grep.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Tue Jan 21 10:57:16 UTC 2020 - Andreas Schwab + +- Switch back to system regex to avoid undefined behaviour + +------------------------------------------------------------------- +Sun Jan 5 10:59:44 UTC 2020 - Andreas Stieger + +- grep 3.4: + * new --no-ignore-case option causes grep to observe case + distinctions, overriding any previous -i (--ignore-case) option + * '.' no longer matches some invalid byte sequences in UTF-8 locales + * grep -Fw can no longer false match in non-UTF-8 multibyte locales + * The exit status of 'grep -L' is no longer incorrect when standard + output is /dev/null + * fix some performance bugs +- drop test-pcre-jitstack.diff + ------------------------------------------------------------------- Thu Sep 19 11:49:29 UTC 2019 - Ludwig Nussel diff --git a/grep.spec b/grep.spec index 02ad36b..9914ec7 100644 --- a/grep.spec +++ b/grep.spec @@ -1,7 +1,7 @@ # # spec file for package grep # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,16 +17,15 @@ Name: grep -Version: 3.3 +Version: 3.4 Release: 0 Summary: Print lines matching a pattern License: GPL-3.0-or-later Group: Productivity/Text/Utilities -Url: https://www.gnu.org/software/grep/ +URL: https://www.gnu.org/software/grep/ Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz Source2: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig Source3: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=grep&download=1#/%{name}.keyring -Patch0: test-pcre-jitstack.diff BuildRequires: fdupes BuildRequires: makeinfo BuildRequires: pcre-devel @@ -42,11 +41,11 @@ match to a specified pattern. By default, grep prints the matching lines. %prep %setup -q -%patch0 -p1 %build %configure \ --disable-silent-rules \ + --without-included-regex \ %{nil} %if 0%{?do_profiling} make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate} -fno-profile-values" diff --git a/test-pcre-jitstack.diff b/test-pcre-jitstack.diff deleted file mode 100644 index e567c69..0000000 --- a/test-pcre-jitstack.diff +++ /dev/null @@ -1,32 +0,0 @@ -From 64d7da63575bc6cb0bbcf7ac5ed81d51ea2a3a74 Mon Sep 17 00:00:00 2001 -From: Jim Meyering -Date: Sun, 17 Feb 2019 17:47:30 -0800 -Subject: [PATCH] tests: avoid false positive upon stack overflow - -* tests/pcre-jitstack: Don't let a stack overflow evoke a false -failure. This test is to ensure there is no internal PCRE error. -Reported by Andres Schwab in http://bugs.gnu.org/34370 ---- - tests/pcre-jitstack | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/tests/pcre-jitstack b/tests/pcre-jitstack -index a6c9c21..8f738f0 100755 ---- a/tests/pcre-jitstack -+++ b/tests/pcre-jitstack -@@ -52,8 +52,11 @@ if test $? != 1; then - - # Rerun that same test, but now with no limit on stack size: - (ulimit -s unlimited; -- returns_ 1 env LC_ALL=C grep -P -n '^([/](?!/)|[^/])*~/.*' pcrejit.txt) \ -+ returns_ 1 env LC_ALL=C grep -P -n '^([/](?!/)|[^/])*~/.*' pcrejit.txt 2> err) \ - || fail=1 -+ -+ # If that failed due to stack overflow, don't cry foul. -+ test $fail = 1 && grep -q 'stack overflow' err && fail=0 - fi - - Exit $fail --- -2.20.1.2.gb21ebb671b -