From c28a39f12cc4e6d979c9791cb2e6613e2d7a25e6f4432ac6b0e635119b4c9d02 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Fri, 11 Mar 2016 09:44:11 +0000 Subject: [PATCH] Accepting request 369903 from home:pluskalm:branches:Base:System - Update to 2.24 OBS-URL: https://build.opensuse.org/request/show/369903 OBS-URL: https://build.opensuse.org/package/show/Base:System/grep?expand=0&rev=68 --- grep-2.23.tar.xz | 3 --- grep-2.23.tar.xz.sig | 16 ---------------- grep-2.24.tar.xz | 3 +++ grep-2.24.tar.xz.sig | 16 ++++++++++++++++ grep.changes | 21 +++++++++++++++++++++ grep.spec | 2 +- testsuite.patch | 6 +++--- 7 files changed, 44 insertions(+), 23 deletions(-) delete mode 100644 grep-2.23.tar.xz delete mode 100644 grep-2.23.tar.xz.sig create mode 100644 grep-2.24.tar.xz create mode 100644 grep-2.24.tar.xz.sig diff --git a/grep-2.23.tar.xz b/grep-2.23.tar.xz deleted file mode 100644 index b636adb..0000000 --- a/grep-2.23.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:54fc478ee1ce17780109820ef30730c9e18715a949f7d5c6afc673adb2a56ecf -size 1317488 diff --git a/grep-2.23.tar.xz.sig b/grep-2.23.tar.xz.sig deleted file mode 100644 index e5f20d4..0000000 --- a/grep-2.23.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIcBAABCgAGBQJWs+3eAAoJEH/Z/MsAC+7uVBIP+wSMLsfqbHqDocHMlW6Ielzj -JkzLzk39iMLOm9liHBS3T82KJ3qRGt5j8ZR57G62k48pBmpj7AOcjC36QScmmbXt -zR859DgkfHJOqRZcIAvAtPiLIzG3BdKetlkqJXvimI+3uhbKWYHQPUa2f+hca9b7 -XGOk6+rM5JVRWoMNBt2mSminN6q/LPJuGhNKdj6hjnbAdL2Hmb0zBqERLvI9HbFg -lOvo7/+Pt/8SQtZWFOpRKR1m+Z24vQkxjAZYEYT+/zQzhtd3HyZCY8grWL1qs/H1 -jf5Bpvacqrz8M6UolXLuNADwJcv4zM1iGdCEcIfUWB6NpkPgdiq7eFpP77/XBK/k -am3zaaDMiaWXVSm15HzdkerJUr1JWIE3GS1pdmQxaWLi+v56+SV5rhoTpPVHUybI -wtByDBOuLGU0u7i1VuxvnTZDdVUjzboxxNOTcGeMlXATSMNTKrvPc4bJ4FzmjlKP -VyxmhizlNQJxgzO3Tm44O+Y5kcSXMajVLqPKHP/4zvEhf9AwG2acvVYz63R0PMUT -sf5CYUaWLgRQX43oSFT21/jcr6eqxL2nL7kQZZWG3dmYc9g6zZH/rzmxp6Na9wxP -Vb1hx/a4nQqGQGZ3X8l7f905WAWVDICIf6/n0JObbLmcvzHqo32nHutrpwPYGMKa -zBMzkto2mNn6vYjhVG4U -=O4wh ------END PGP SIGNATURE----- diff --git a/grep-2.24.tar.xz b/grep-2.24.tar.xz new file mode 100644 index 0000000..793d873 --- /dev/null +++ b/grep-2.24.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f248beb9098c5aab94d2fdd03b5a21d705e5ba8a3ce4d8c9f607a670498eec14 +size 1321680 diff --git a/grep-2.24.tar.xz.sig b/grep-2.24.tar.xz.sig new file mode 100644 index 0000000..a174adc --- /dev/null +++ b/grep-2.24.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIcBAABCgAGBQJW4lqKAAoJEH/Z/MsAC+7uEwsP/jGbw3waOnJb7U3OIBEApGXR +0jaPfj3Fa7yubDvqqqobt0Xv/jjgu5tPuimPNSFfyS9VBVmhYIafV1FEBPktPzso +AC/QHj+DORkLBSxfRsbfcrZfIHoUzM+I97Ifh0JMmnsknaLpnVFBoCs/NPoC3MCP +SF3EbYw+h6INAAIwpvzp5NXWUYLEmpusHdRZCYMFTEbA1tkHA4rqRReLgD2eTS4z +NH4NhEJsZ7+0KdBEAnleI0NhPxCd1ntXhPYdRl7xl4uJMHLOQSD54L1Fog4fOfFv +0gBiHbGaDEbaD/VF5ugmS8+UYlUpKCCqZ1Yeg2mWPsE9qjH8qFvldN8fjUQbpU1N +Ktqi2/1Qnsc8BV+TQrOusjq8wci5zvlAHkI4TISWVzdhVkdG4dFY9sPdEr9prgll +RLw2yG65trFgrEKzq3nklXSLbjV0mtt+p/x17JuZQG3qjpQeuIm7BfGRSwjLtSmk +9BYocNvPcb5F/T01VnwYfDkL6iq4pqLmMkv/S1SkpjQGQPa53rvfpL6ZEWRf8/wF +OgOz69nN1Sdif8KK3S0Ve6lVtVM3tAtbNi39SbOoWyk/eV/FecF8Lf0PZnkM7ouu +DPzRiFVCNpuPnV5ye+FyS01xixd4gm0eCi3r+N18UEixARpSLkAXWKn6zIopaN8r +/i7b4h79wlf3TpumEOzg +=LlRc +-----END PGP SIGNATURE----- diff --git a/grep.changes b/grep.changes index dda536b..9202247 100644 --- a/grep.changes +++ b/grep.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Fri Mar 11 09:30:02 UTC 2016 - mpluskal@suse.com + +- Update to 2.24 + * grep -z would match strings it should not. To trigger the bug, + you'd have to use a regular expression including an anchor + (^ or $) and a feature like a range or a backreference, causing + grep to forego its DFA matcher and resort to using re_search. + With a multibyte locale, that matcher could mistakenly match a + string containing a newline. For example, this command: + printf 'a\nb\0' | LC_ALL=en_US.utf-8 grep -z '^[a-b]*b' + would mistakenly match and print all four input bytes. After + the fix, there is no match, as expected. + [bug introduced in grep-2.7] + * grep -Pz now diagnoses attempts to use patterns containing ^ + and $, instead of mishandling these patterns. This problem + seems to be inherent to the PCRE API; removing this limitation + is on PCRE's maint/README wish list. Patterns can continue to + match literal ^ and $ by escaping them with \ (now needed even + inside [...]). [bug introduced in grep-2.5] + ------------------------------------------------------------------- Fri Feb 5 08:01:46 UTC 2016 - mpluskal@suse.com diff --git a/grep.spec b/grep.spec index f833a41..a0623b4 100644 --- a/grep.spec +++ b/grep.spec @@ -17,7 +17,7 @@ Name: grep -Version: 2.23 +Version: 2.24 Release: 0 Summary: Print lines matching a pattern License: GPL-3.0+ diff --git a/testsuite.patch b/testsuite.patch index d130a1b..5513cf3 100644 --- a/testsuite.patch +++ b/testsuite.patch @@ -17,10 +17,10 @@ and by Andreas Schwab in http://debbugs.gnu.org/21812. tests/mb-non-UTF8-performance | 5 +++++ 2 files changed, 10 insertions(+) -Index: grep-2.23/tests/long-pattern-perf +Index: grep-2.24/tests/long-pattern-perf =================================================================== ---- grep-2.23.orig/tests/long-pattern-perf -+++ grep-2.23/tests/long-pattern-perf +--- grep-2.24.orig/tests/long-pattern-perf ++++ grep-2.24/tests/long-pattern-perf @@ -25,6 +25,11 @@ fail=0 # "expensive", making it less likely to be run by regular users. expensive_