diff --git a/grep-2.27.tar.xz b/grep-2.27.tar.xz deleted file mode 100644 index b825429..0000000 --- a/grep-2.27.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ad4cc44d23074a1c3a8baae8fbafff2a8c60f38a9a6108f985eef6fbee6dcaeb -size 1360388 diff --git a/grep-2.27.tar.xz.sig b/grep-2.27.tar.xz.sig deleted file mode 100644 index e0924d3..0000000 --- a/grep-2.27.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIcBAABCgAGBQJYR7gOAAoJEH/Z/MsAC+7uoLoQAKmn4wZ1zPIx96/OpN3sops+ -pKp3riM64qtJvZJTanRAn4a56QfN+eE/jXM8GVXohOXMAYIgh1XG/ppnvaDdjf9D -Z9zIshWwv+nxVTfnIqWYbtMrZuaNJjwwwh0Sq9LkvmOqA8+FjWFgy4t0gO9eueUl -RdZBvRF9g8CnkX2K0mqJ7el90h/Xhx2RLHJd+DF1ctV0GGqiDDCAf416hko1i2LI -B+ZbF4h7rvzEU1IBKbUcsiZ2XAGa8E5Y1NQyuVhsYeruq0M9dICaogycByI6xEIA -Xn/DBkDbxyCGcGZngJ5CNfz+RDkcpJHOFkvdu75hx8ovxlfp3xhKjE2c4xDK77gq -hkriS2FmyGPHzxIielN3u1B9OSikQOjksf2zyK517vX1cy8LpOrr0UckrsPAX/j6 -dDNYHzH8yvr7X7OQwxe5XnZPp1q0GVT4JrPHaigEiAAH0/sUz+nQHNwXrjsPeDoa -+nMIMEJWbbkadoRbVvf09fLojw+/FI/Esp/sUxtA7tLe2bIXckRWMaLOpj+wsVKA -23qdgZcBKLMPQvVtP8DtjXAAOl8xUiDQxJszq5TYW5eiaxNDGoUxiV1KEOkA0UlJ -XqT5EJ5fwtw+NDah1ycHvbNfpZDqy5KkR9BeLu0xpgY01yvQIoeJIcQc6F7NNGe3 -Glafozmm0qscj3HCc6mT -=VoV8 ------END PGP SIGNATURE----- diff --git a/grep-2.28.tar.xz b/grep-2.28.tar.xz new file mode 100644 index 0000000..194c9c7 --- /dev/null +++ b/grep-2.28.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3bad4c23eeb8dfa2fa84cdbe368398f75fdcd54bde411db83b9ef7fba5b60185 +size 1374532 diff --git a/grep-2.28.tar.xz.sig b/grep-2.28.tar.xz.sig new file mode 100644 index 0000000..29d35b3 --- /dev/null +++ b/grep-2.28.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIcBAABCgAGBQJYmSDLAAoJEH/Z/MsAC+7uvbUQAJU2OZdODROLbVVoU/VgAzmt +Ldy+krs0zmCx3oi9ZrDPCqeBTMibwyHXK4jwT8NJs+eiKw610hpTGjS6Zv8qcq1V +Ca6TNa1Pn969llF4T5A/t/HZdBZdvWgxlO1UTcRmlXIKCtnHjC1kkd6Jxz2EtNdS +npgxKBNAExhWlrbuc4xOX4qpl+jTTP6iNUG8QPFOOCQT5NcDYhecinPDWqRMCWHU +gzitw8szTT28b3UzspgH6f390rVDFc/OFLy9ET4zbH5IXi8XqkKlStpPmWcu1CoW +Fm3ej03LvgGqc4wDjbwl/TNrV0YgUYvMH11EpAc9uOTpx9hUKwtGeR5SXG8XDrN1 +kaZR2bxIXZ3XdJbQG9Mj4oIowhf+aaVujrOU51i7YisHXIogsQBAR/s8UjpqsS7b +PJQQv3YZO8czujI7WNbSAY9P/X1yIBODPg4Ude8/fn4hRnUhrBN0NMsWhFp1bp6z +esLDRoOnrxRU3jA57y1JxxAvVQgl6zpjMM+IV/g6SeT/vErHJ/9lNggJyw+ZwP3l +Qdu2X4mTK6mxqXFyuJaZRA2bsxTna5jt0zT3k40ulniJlrPXf+JEBgX4VqvSUc5j +eq1VINQnu8jkHXLXOBXGczqsh/0qaDVtqoDrTsc7jbdjDjcVpDZAqd7edmSVtEsX +k76sQQCLEEYsHUWFkbgI +=AMbj +-----END PGP SIGNATURE----- diff --git a/grep.changes b/grep.changes index c807cbc..26fd64c 100644 --- a/grep.changes +++ b/grep.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Feb 8 09:56:26 UTC 2017 - mpluskal@suse.com + +- Update to version 2.28: + * Improve performance for -E or -G pattern lists that are easily + converted to -F format. + * Fix performance regression with multiple patterns. + * When standard output is /dev/null, grep no longer fails when + standard input is a file in the Linux /proc file system, or when + standard input is a pipe and standard output is in append mode. + * When grep -Fo finds matches of differing length, it could + mistakenly print a shorter one. Now it prints a longest one. +- Drop upstreamed proc-lseek-glitch.patch + ------------------------------------------------------------------- Mon Dec 12 16:51:24 UTC 2016 - schwab@suse.de diff --git a/grep.keyring b/grep.keyring index fc3c5f8..3190db4 100644 Binary files a/grep.keyring and b/grep.keyring differ diff --git a/grep.spec b/grep.spec index 64c5160..2188915 100644 --- a/grep.spec +++ b/grep.spec @@ -1,7 +1,7 @@ # # spec file for package grep # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -17,7 +17,7 @@ Name: grep -Version: 2.27 +Version: 2.28 Release: 0 Summary: Print lines matching a pattern License: GPL-3.0+ @@ -26,7 +26,6 @@ Url: http://www.gnu.org/software/grep/ 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 -Patch1: proc-lseek-glitch.patch BuildRequires: makeinfo BuildRequires: pcre-devel BuildRequires: xz @@ -45,7 +44,6 @@ the matching lines. %prep %setup -q -%patch1 -p1 %if 0%{?suse_version} < 1120 echo "ac_cv_search_pcre_compile=\${ac_cv_search_pcre_compile=%{_libdir}/libpcre.a}" >config.cache %endif diff --git a/proc-lseek-glitch.patch b/proc-lseek-glitch.patch deleted file mode 100644 index e337685..0000000 --- a/proc-lseek-glitch.patch +++ /dev/null @@ -1,45 +0,0 @@ -Index: grep-2.27/src/grep.c -=================================================================== ---- grep-2.27.orig/src/grep.c -+++ grep-2.27/src/grep.c -@@ -1758,29 +1758,17 @@ drain_input (int fd, struct stat const * - static void - finalize_input (int fd, struct stat const *st, bool ineof) - { -- if (fd != STDIN_FILENO) -- return; -- -- if (outleft) -- { -- if (ineof) -- return; -- if (seek_failed) -- { -- if (drain_input (fd, st)) -- return; -- } -- else if (0 <= lseek (fd, 0, SEEK_END)) -- return; -- } -- else -- { -- if (seek_failed || bufoffset == after_last_match -- || 0 <= lseek (fd, after_last_match, SEEK_SET)) -- return; -- } -- -- suppressible_error (errno); -+ if (fd == STDIN_FILENO -+ && (outleft -+ ? (!ineof -+ && (seek_failed -+ || (lseek (fd, 0, SEEK_END) < 0 -+ /* Linux proc file system has EINVAL (Bug#25180). */ -+ && errno != EINVAL)) -+ && ! drain_input (fd, st)) -+ : (bufoffset != after_last_match && !seek_failed -+ && lseek (fd, after_last_match, SEEK_SET) < 0))) -+ suppressible_error (errno); - } - - static bool