From 675c8879e862d4f5b3a4b81b391febf30cc8f67d704428d16e1c332e69b1da6d Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 14 Mar 2012 10:21:46 +0000 Subject: [PATCH] Accepting request 109178 from home:tabraham1:branches:Base:System update to 2.11 OBS-URL: https://build.opensuse.org/request/show/109178 OBS-URL: https://build.opensuse.org/package/show/Base:System/grep?expand=0&rev=22 --- fix-testsuite.diff | 30 ------------------- grep-2.11.tar.bz2 | 3 ++ grep-2.9.tar.bz2 | 3 -- grep.changes | 72 ++++++++++++++++++++++++++++++++++++++++++++++ grep.spec | 10 +++---- 5 files changed, 80 insertions(+), 38 deletions(-) delete mode 100644 fix-testsuite.diff create mode 100644 grep-2.11.tar.bz2 delete mode 100644 grep-2.9.tar.bz2 diff --git a/fix-testsuite.diff b/fix-testsuite.diff deleted file mode 100644 index c05b1af..0000000 --- a/fix-testsuite.diff +++ /dev/null @@ -1,30 +0,0 @@ ---- tests/reversed-range-endpoints -+++ tests/reversed-range-endpoints -@@ -11,7 +11,7 @@ - test $? = 2 || fail=1 - - # Remove "program_name: " prefix from actual output. -- sed 's/^[a-z]*: //' out > k && mv k out -+ sed 's/^[^ ]*: //' out > k && mv k out - - compare out exp || fail=1 - done ---- tests/warn-char-classes -+++ tests/warn-char-classes -@@ -5,13 +5,15 @@ - echo f > x || framework_failure_ - echo b >> x || framework_failure_ - echo h >> x || framework_failure_ --printf 'grep: character class syntax is [[:space:]], not [:space:]\n' \ -+printf 'character class syntax is [[:space:]], not [:space:]\n' \ - > exp-err || framework_failure_ - - # basic cases - - grep '[:space:]' x 2> err - test $? = 2 || fail=1 -+# Remove "program_name: " prefix from actual output. -+sed 's/^[^ ]*: //' err > k && mv k err - compare err exp-err || fail=1 - - grep '[[:space:]]' x 2> err diff --git a/grep-2.11.tar.bz2 b/grep-2.11.tar.bz2 new file mode 100644 index 0000000..814ab22 --- /dev/null +++ b/grep-2.11.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53a7db59d704c4d1f1cb857e5b883e4787ea16649580a0c325e71cb1242b165e +size 1495175 diff --git a/grep-2.9.tar.bz2 b/grep-2.9.tar.bz2 deleted file mode 100644 index 86f6a3d..0000000 --- a/grep-2.9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c7e1fabf8bb600b19f367d8040ed7a32f4c7612e0477ed994cb35d1216223de1 -size 1414132 diff --git a/grep.changes b/grep.changes index 353301b..da834f8 100644 --- a/grep.changes +++ b/grep.changes @@ -1,3 +1,75 @@ +------------------------------------------------------------------- +Tue Mar 13 18:18:23 UTC 2012 - tabraham@novell.com + +- Update to 2.11: + * grep no longer dumps core on lines whose lengths do not fit in + 'int'. (e.g., lines longer than 2 GiB on a typical 64-bit host). + Instead, grep either works as expected, or reports an error. + An error can occur if not enough main memory is available, or if + the GNU C library's regular expression functions cannot handle + such long lines. [bug present since "the beginning"] + * The -m, -A, -B, and -C options no longer mishandle context line + counts that do not fit in 'int'. Also, grep -c's counts are now + limited by the type 'intmax_t' (typically less than 2**63) rather + than 'int' (typically less than 2**31). + * grep no longer silently suppresses errors when reading a directory + as if it were a text file. For example, "grep x ." now reports a + read error on most systems; formerly, it ignored the error. + [bug introduced in grep-2.5] + * grep now exits with status 2 if a directory loop is found, instead + of possibly exiting with status 0 or 1. [bug introduced in + grep-2.3] + * The -s option now suppresses certain input error diagnostics that + it formerly failed to suppress. These include errors when closing + the input, when lseeking the input, and when the input is also the + output. [bug introduced in grep-2.4] + * On POSIX systems, commands like "grep PAT < FILE >> FILE" now report + an error instead of looping. [bug present since "the beginning"] + * The --include, --exclude, and --exclude-dir options now handle + command-line arguments more consistently. --include and --exclude + apply only to non-directories and --exclude-dir applies only to + directories. "-" (standard input) is never excluded, since it is + not a file name. [bug introduced in grep-2.5] + * grep no longer rejects "grep -qr . > out", i.e., when run with -q + and an input file is the same as the output file, since with -q + grep generates no output, so there is no risk of infinite loop or + of an output-affecting race condition. Thus, the use of the + following options also disables the input-equals-output failure: + --max-count=N (-m) (for N >= 2) + --files-with-matches (-l) + --files-without-match (-L) + [bug introduced in grep-2.10] + * grep no longer emits an error message and quits on MS-Windows when + invoked with the -r option. + * grep no longer misinterprets some alternations involving anchors + (^, $, \< \> \B, \b). For example, grep -E "(^|\B)a" no + longer reports a match for the string "x a". [bug present since + "the beginning"] + * If no file operand is given, and a command-line -r or equivalent + option is given, grep now searches the working directory. Formerly + grep ignored the -r and searched standard input nonrecursively. + An -r found in GREP_OPTIONS does not have this new effect. + * grep now supports color highlighting of matches on MS-Windows. + * Use of the --mmap option now elicits a warning. It has been a no-op + since March of 2010. + * grep no longer diagnoses write errors repeatedly; it exits after + diagnosing the first write error. This is better behavior when + writing to a dangling pipe. + * Syntax errors in GREP_COLORS are now ignored, instead of sometimes + eliciting warnings. This is more consistent with programs that + (e.g.) ignore errors in termcap entries. + +- changes from 2.10: + * grep no longer mishandles high-bit-set pattern bytes on systems + where "char" is a signed type. [bug appears to affect only + MS-Windows] + * On POSIX systems, grep now rejects a command like + "grep -r pattern . > out", in which the output file is also one + of the inputs, because it can result in an "infinite" disk-filling + loop. [bug present since "the beginning"] + +- removed fix-testsuite.diff obsoleted by this release + ------------------------------------------------------------------- Sat Feb 4 15:53:38 UTC 2012 - rschweikert@suse.com diff --git a/grep.spec b/grep.spec index 845a13c..5e8d807 100644 --- a/grep.spec +++ b/grep.spec @@ -15,6 +15,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: grep BuildRequires: automake BuildRequires: pcre-devel @@ -24,14 +26,13 @@ BuildRequires: pcre Url: http://www.gnu.org/software/grep/ Provides: base:/usr/bin/grep PreReq: %{install_info_prereq} -Version: 2.9 +Version: 2.11 Release: 0 Summary: Print lines matching a pattern License: GPL-3.0+ Group: Productivity/Text/Utilities Source: grep-%{version}.tar.bz2 -Patch0: fix-testsuite.diff -Patch1: grep-ppc-fix.patch +Patch0: grep-ppc-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -44,11 +45,10 @@ By default, grep prints the matching lines. %if 0%{?suse_version} < 1120 echo "ac_cv_search_pcre_compile=\${ac_cv_search_pcre_compile=%{_libdir}/libpcre.a}" >config.cache %endif -%patch0 # If you platform Long Double and Double to not match as expected %ifarch ppc ppc64 -%patch1 -p1 +%patch0 -p1 %endif %build