SHA256
3
0
forked from pool/grep

Accepting request 392948 from Base:System

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/392948
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grep?expand=0&rev=58
This commit is contained in:
Dominique Leuenberger 2016-04-30 21:22:53 +00:00 committed by Git OBS Bridge
commit c73c4a355d
7 changed files with 101 additions and 48 deletions

View File

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

View File

@ -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-----

3
grep-2.25.tar.xz Normal file
View File

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

16
grep-2.25.tar.xz.sig Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABCgAGBQJXGa9dAAoJEH/Z/MsAC+7uZ2AP/1VzI9ru6ocGwxXpF0KT9FIR
opE4A1iKi2lX2dOQZjlB7Xth7osxdKpLTClhVcUseQT06uLXETQdjZcx8wZPSXdM
Sd5ine2EuJ2RzKluaMXXGipl99/0hG4/Ga1CsTh+eRpwZ3AUvKShI4HMZbqJaTlv
yk2p7OkMg8Pv/CxoChKuEBxUi5m3tGf1KIQ0W51RQ47PSyIEGqNsOZqtjftZJtA8
7Nqbry2TFCz5v74zEQseZloeYwI1oGoIecZHNj6DsJSv0YyP1noWFVNb+xxCD7YY
aJSGVSfE4/4C+QHt/9xRGl+rE+NpW3vZaibcdQf6uhVCxFN9/HNRz6og5SolVygx
g2bIyh3znQcRfPsqIglZjloU68dC5r0EQXfVXOYt1+QkInB+OnzhKN8nvf0hry8b
HOef7MrBQ+YrvG6+j/aWU/d1bdEATgiJAAmBWWighdT7RewDDlDq4w88NwpxtebZ
MaWDp/JW0w4akC75GFyS/uln3RxNOFT8j3ssAUhCVEJun6gLtRL/TEnGPtI4x4/w
5mGN6qoTJMt/2DnpxovRXT2gHjs9I/0l3iTbeUebFUio6MQp4nfXhVxCBf/jmyeM
1L4qw8ldA3lIlNCHcNOJZxqowVUPSz9MFHF9pEDAHOpPuSCQuXIUIBhswcUp3K7F
Bg3C9W/xRDOdhCRJU2go
=m4Hl
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,74 @@
-------------------------------------------------------------------
Fri Apr 22 13:49:18 UTC 2016 - astieger@suse.com
- grep 2.25:
* In the C or POSIX locale, grep now treats all bytes as valid
characters even if the C runtime library says otherwise.
( Fixes yast2-users and other build failures - boo#966780 )
* grep -oz now uses null bytes, not newlines, to terminate output
lines.
* grep now outputs details more consistently when reporting a
write error.
-------------------------------------------------------------------
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
- 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

View File

@ -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.25
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

View File

@ -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 c222c02..2c9d080 100755
--- a/tests/long-pattern-perf
+++ b/tests/long-pattern-perf
@@ -20,6 +20,11 @@
fail=0
Index: grep-2.24/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_
+# 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