From 90931682f782a004394837ab40557a3a2d54d18e3deadbbb3d5113d0269d7718 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mon, 7 Jan 2019 15:05:24 +0000 Subject: [PATCH] Accepting request 663377 from home:Andreas_Schwab:Factory - Update to grep 3.3 ** Changes in behavior * The --files-without-match (-L) option now causes grep to succeed when a file is listed, instead of when a line is selected. ** Improvements * An over-30x performance improvement when many 'or'd expressions share a common prefix, thanks to improvements in gnulib's dfa.c * An additional 3-23% speed-up when searching large files, via increased initial buffer size. * grep now diagnoses stack overflow - remove-backref-alt-test.patch: remove OBS-URL: https://build.opensuse.org/request/show/663377 OBS-URL: https://build.opensuse.org/package/show/Base:System/grep?expand=0&rev=91 --- grep-3.1.tar.xz | 3 --- grep-3.1.tar.xz.sig | 16 ---------------- grep-3.3.tar.xz | 3 +++ grep-3.3.tar.xz.sig | 16 ++++++++++++++++ grep.changes | 15 +++++++++++++++ grep.keyring | 5 ----- grep.spec | 10 ++++------ remove-backref-alt-test.patch | 24 ------------------------ 8 files changed, 38 insertions(+), 54 deletions(-) delete mode 100644 grep-3.1.tar.xz delete mode 100644 grep-3.1.tar.xz.sig create mode 100644 grep-3.3.tar.xz create mode 100644 grep-3.3.tar.xz.sig delete mode 100644 remove-backref-alt-test.patch diff --git a/grep-3.1.tar.xz b/grep-3.1.tar.xz deleted file mode 100644 index 0e91b30..0000000 --- a/grep-3.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:db625c7ab3bb3ee757b3926a5cfa8d9e1c3991ad24707a83dde8a5ef2bf7a07e -size 1370880 diff --git a/grep-3.1.tar.xz.sig b/grep-3.1.tar.xz.sig deleted file mode 100644 index 866e068..0000000 --- a/grep-3.1.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEFV0/xQDINEhtHupnf9n8ywAL7u4FAllZVmwACgkQf9n8ywAL -7u4xhA//XVPhqEAX90n4sj+iH5KzWOD5g6Sg+Yac6QlCv4t9wlacl+bFsD3tyzBV -RU4yumS4PRONSsQKcFgdwv8/8hGLzq/LthKLN4hOWG28EOJGYPBSqloq+/wNtRLO -6L96aU+D/S/IyREkvIxl/aRnX+3itw4dw7GIrAUi2Mv+yZ5922KmLwwAz57VxWVy -aIU+tznzXWmnXguuIU4xkNd9ZO1veC6FgVaaFdonIwqDSUcN1grk2uwEtNu9V1uZ -PNdxoOJJErrkVmxi4V+nf2DAa15JchKzcdc8r5Ot8C/hPvjf6pDdvs6MdJvnQq/1 -ihxwpts2IeVdAi7Ww6S6/injfMdiU2PAVDYjS4GTV8OKfsIkjkbtt4GMLlIvSG9Q -VHnlSVJKG79Ms81cciHpA9vUt7nqsbJTov+xNgj+IUSRtvOy92xHUA1RsqGcUS4k -IS4J2wzx1TInh3OetK/7AAKQ1Q+xUdIqVUe60bvVX4Bw3Gjdpausvwa2Q8jqIxjM -fu7zLdUtdToYJLFc/YlQvZjvn9LmrlSQmkiZurBr+EGPEB2lhZveIlkmGY/RX7LN -7VIKCKGZZ4tIMzKTyANetDa8NavSfjRlM4E8X2/qn+1SJaNzk6ggOSfdu6+GLLcW -Mjm+Fsf99/EzJ5+fk0aUdVkrmsASY0EdetxAQfPhdaHtcv+u9HM= -=lqPi ------END PGP SIGNATURE----- diff --git a/grep-3.3.tar.xz b/grep-3.3.tar.xz new file mode 100644 index 0000000..973a1ec --- /dev/null +++ b/grep-3.3.tar.xz @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..716fdd7 --- /dev/null +++ b/grep-3.3.tar.xz.sig @@ -0,0 +1,16 @@ +-----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.changes b/grep.changes index 9e8c0bc..eca51f6 100644 --- a/grep.changes +++ b/grep.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Jan 7 11:53:21 UTC 2019 - schwab@suse.de + +- Update to grep 3.3 + ** Changes in behavior + * The --files-without-match (-L) option now causes grep to succeed + when a file is listed, instead of when a line is selected. + ** Improvements + * An over-30x performance improvement when many 'or'd expressions + share a common prefix, thanks to improvements in gnulib's dfa.c + * An additional 3-23% speed-up when searching large files, via + increased initial buffer size. + * grep now diagnoses stack overflow +- remove-backref-alt-test.patch: remove + ------------------------------------------------------------------- Tue Aug 7 07:08:30 UTC 2018 - schwab@suse.de diff --git a/grep.keyring b/grep.keyring index 3190db4..85ef760 100644 --- a/grep.keyring +++ b/grep.keyring @@ -540,7 +540,6 @@ TXO1rAMObwCgxLu3MlxSxL8WW5qt+hUGvNt+514= =Ala3 -----END PGP PUBLIC KEY BLOCK----- - -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.4.10 (GNU/Linux) @@ -913,7 +912,6 @@ KLEPtgs1HkI= =5dqZ -----END PGP PUBLIC KEY BLOCK----- - -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1 @@ -967,6 +965,3 @@ W1qcD8s= =eykL -----END PGP PUBLIC KEY BLOCK----- - - - diff --git a/grep.spec b/grep.spec index ab6fa47..aac82e3 100644 --- a/grep.spec +++ b/grep.spec @@ -1,7 +1,7 @@ # # spec file for package grep # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,12 +12,12 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: grep -Version: 3.1 +Version: 3.3 Release: 0 Summary: Print lines matching a pattern License: GPL-3.0-or-later @@ -26,7 +26,6 @@ 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: remove-backref-alt-test.patch BuildRequires: fdupes BuildRequires: makeinfo BuildRequires: pcre-devel @@ -43,12 +42,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" # do not run profiling in parallel for reproducible builds (boo#1040589) diff --git a/remove-backref-alt-test.patch b/remove-backref-alt-test.patch deleted file mode 100644 index 339f227..0000000 --- a/remove-backref-alt-test.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: grep-3.1/tests/Makefile.am -=================================================================== ---- grep-3.1.orig/tests/Makefile.am -+++ grep-3.1/tests/Makefile.am -@@ -63,7 +63,6 @@ endif - - TESTS = \ - backref \ -- backref-alt \ - backref-multibyte-slow \ - backref-word \ - backslash-s-and-repetition-operators \ -Index: grep-3.1/tests/Makefile.in -=================================================================== ---- grep-3.1.orig/tests/Makefile.in -+++ grep-3.1/tests/Makefile.in -@@ -1411,7 +1411,6 @@ LDADD = ../lib/libgreputils.a $(LIBINTL) - XFAIL_TESTS = triple-backref $(am__append_1) $(am__append_2) - TESTS = \ - backref \ -- backref-alt \ - backref-multibyte-slow \ - backref-word \ - backslash-s-and-repetition-operators \