Accepting request 357841 from home:pluskalm:branches:Base:System

- Update to 2.23
- Update info handling scriplets

OBS-URL: https://build.opensuse.org/request/show/357841
OBS-URL: https://build.opensuse.org/package/show/Base:System/grep?expand=0&rev=67

grep-2.22.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ca91d22f017bfcb503d4bc3b44295491c89a33a3df0c3d8b8614f2d3831836eb
-size 1297864

grep-2.22.tar.xz.sig

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIcBAABCgAGBQJWNsXCAAoJEH/Z/MsAC+7uciYQAJAjh3YMRjNnDZIgfcXi2Ker
-LPdXK0fxhujHjlbgy0XK3GeAvdOcve8lq/g4Y5jqudF77t24LmwTEmp+ZBvPd0hC
-7v2qy6KgbjDlho4D6moWghLZzQuzTtFPQ19pU9FDuUsmwh8ZftKKjowJSPXdfv8p
-l7xFefyflnU9CZinmoD7cvbZxtNatrLUJ1ubWNtIL6M1vqMKUhygbmivqrr0m1kt
-6cxaTF4FOgfie5VjaDLYAYPmIX7JiAJMUtfIksZNmCF1UhcD6Ux9Cy4pZaEotrhJ
-/B07Xh3/ol4h1P93k2julYCkQiZkfdn/xl9cXZbw4vHfwR9ri7uAe0JoVejRjj19
-rVsyQJK8ia6myYdAHogNhH82Y/00QhpN/ENf3H/534B+eDXV+P/ZnnebGwviZ2OT
-hbWUJNgPkMy6nR/e++vGm6Giv97PcJcbWJ0hhDxtpJZHePcFkkd7BxHfo4UkGD5L
-3TSxlPcwGtrJdlBBlRuQaclBzhmTDsgQ43/e0ffXzVNx6D2KbsQq92Ep6SNQHfeb
-CPYKc/WbLqZ+JYI5zXT1nqYlIOuv9Q7m590vuwbs0bV2Cgk0XVf8C6QglegzK6jN
-Stmv54kaF0BAjXTnPGFFnpc5g2OkLrqBgsIjEfg5wuhft8qKFQZ2As/ZuwrJvdv2
-duC+qmM+cb/kX79E3HAy
-=y59/
------END PGP SIGNATURE-----

grep-2.23.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:54fc478ee1ce17780109820ef30730c9e18715a949f7d5c6afc673adb2a56ecf
+size 1317488

grep-2.23.tar.xz.sig

@@ -0,0 +1,16 @@
+-----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-----

grep.changes

@@ -1,3 +1,41 @@
+-------------------------------------------------------------------
+Fri Feb  5 08:01:46 UTC 2016 - mpluskal@suse.com
+
+- Update to 2.23
+  * Binary files are now less likely to generate diagnostics and 
+    more likely to yield text matches.  grep now reports "Binary 
+    file FOO matches" and suppresses further output instead of 
+    outputting a line containing an encoding error; hence grep can 
+    now report matching text before a later binary match.  
+    Formerly, grep reported FOO to be binary when it found an 
+    encoding error in FOO before generating output for FOO, which 
+    meant it never reported both matching text and matching binary 
+    data; this was less useful for searching text containing 
+    encoding errors in non-matching lines. [bug introduced in 
+    grep-2.21]
+  * grep -c no longer stops counting when finding binary data. 
+    [bug introduced in grep-2.21]
+  * grep no longer outputs encoding errors in unibyte locales. For 
+    example, if the byte '\x81' is not a valid character in a
+    unibyte locale, grep treats the byte as binary data. [bug 
+    introduced in grep-2.21]
+  * grep -oP is no longer susceptible to an infinite loop when 
+    processing invalid UTF8 just before a match. [bug introduced in 
+    grep-2.22]
+  * --exclude and related options are now matched against trailing 
+    parts of command-line arguments, not against the entire
+    arguments. This partly reverts the --exclude-related change 
+    in 2.22. [bug introduced in grep-2.22]
+  * --line-buffer is no longer ineffective when combined with -l. 
+    [bug introduced in grep-2.5]
+  * -xw is now equivalent to -x more consistently, with -P and 
+    with backrefs.  [bug only partially fixed in grep-2.19]
+- Update info handling scriplets 
+  * move from postun to preun
+  * add dependeny for preun
+- Refresh partially upstreamed patch
+  * testsuite.patch
+
 -------------------------------------------------------------------
 Thu Nov 26 13:22:50 UTC 2015 - schwab@suse.de
 

grep.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package grep
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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.22
+Version:        2.23
 Release:        0
 Summary:        Print lines matching a pattern
 License:        GPL-3.0+
@@ -31,6 +31,7 @@ BuildRequires:  makeinfo
 BuildRequires:  pcre-devel
 BuildRequires:  xz
 Requires(pre):  %{install_info_prereq}
+Requires(preun): %{install_info_prereq}
 Provides:       base:%{_bindir}/grep
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} < 1120
@@ -84,7 +85,7 @@ ln -sf %{_bindir}/grep %{buildroot}/bin/grep
 %post
 %install_info --info-dir=%{_infodir} %{_infodir}/grep.info.gz
 
-%postun
+%preun
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/grep.info.gz
 
 %files -f %{name}.lang

testsuite.patch

@@ -17,13 +17,13 @@ and by Andreas Schwab in http://debbugs.gnu.org/21812.
  tests/mb-non-UTF8-performance | 5 +++++
  2 files changed, 10 insertions(+)
 
-diff --git a/tests/long-pattern-perf b/tests/long-pattern-perf
+Index: grep-2.23/tests/long-pattern-perf
-index c222c02..2c9d080 100755
+===================================================================
---- a/tests/long-pattern-perf
+--- grep-2.23.orig/tests/long-pattern-perf
-+++ b/tests/long-pattern-perf
++++ grep-2.23/tests/long-pattern-perf
-@@ -20,6 +20,11 @@
+@@ -25,6 +25,11 @@ fail=0
- 
+ # "expensive", making it less likely to be run by regular users.
- fail=0
+ expensive_
  
 +# This test is susceptible to failure due to differences in
 +# system load during the two test runs, so we'll mark it as
@@ -33,22 +33,3 @@ index c222c02..2c9d080 100755
  echo x > in || framework_failure_
  # We could use seq -s '' (avoiding the tr filter), but I
  # suspect some version of seq does not honor that option.
-diff --git a/tests/mb-non-UTF8-performance b/tests/mb-non-UTF8-performance
-index 228361d..9bd5d39 100755
---- a/tests/mb-non-UTF8-performance
-+++ b/tests/mb-non-UTF8-performance
-@@ -22,6 +22,11 @@
- 
- fail=0
- 
-+# This test is susceptible to failure due to differences in
-+# system load during the two test runs, so we'll mark it as
-+# "expensive", making it less likely to be run by regular users.
-+expensive_
-+
- # Make this large enough so that even on high-end systems
- # it incurs at least 5-10ms of user time.
- yes $(printf '%078d' 0) | head -400000 > in || framework_failure_
--- 
-2.6.3
-