diff --git a/backport-grep-bug-backref-in-last-of-multiple-patter.patch b/backport-grep-bug-backref-in-last-of-multiple-patter.patch deleted file mode 100644 index 114208ba4030282745144075495c46fed6739fcd..0000000000000000000000000000000000000000 --- a/backport-grep-bug-backref-in-last-of-multiple-patter.patch +++ /dev/null @@ -1,67 +0,0 @@ -From b061d24916fb9a14da37a3f2a05cb80dc65cfd38 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Mon, 5 Dec 2022 14:16:45 -0800 -Subject: [PATCH] backport: grep: bug backref in last of multiple patterns - ---- - src/dfasearch.c | 25 ++++++++++++------------- - tests/backref | 8 ++++++++ - 2 files changed, 20 insertions(+), 13 deletions(-) - -diff --git a/src/dfasearch.c b/src/dfasearch.c -index d6afa8d..2d0e861 100644 ---- a/src/dfasearch.c -+++ b/src/dfasearch.c -@@ -267,20 +267,19 @@ GEAcompile (char *pattern, size_t size, reg_syntax_t syntax_bits, - if (compilation_failed) - exit (EXIT_TROUBLE); - -- if (prev <= patlim) -+ if (patlim < prev) -+ buflen--; -+ else if (pattern < prev) - { -- if (pattern < prev) -- { -- idx_t prevlen = patlim - prev; -- buf = xirealloc (buf, buflen + prevlen); -- memcpy (buf + buflen, prev, prevlen); -- buflen += prevlen; -- } -- else -- { -- buf = pattern; -- buflen = size; -- } -+ idx_t prevlen = patlim - prev; -+ buf = xirealloc (buf, buflen + prevlen); -+ memcpy (buf + buflen, prev, prevlen); -+ buflen += prevlen; -+ } -+ else -+ { -+ buf = pattern; -+ buflen = size; - } - - /* In the match_words and match_lines cases, we use a different pattern -diff --git a/tests/backref b/tests/backref -index 947981b..5cc3060 100755 ---- a/tests/backref -+++ b/tests/backref -@@ -43,4 +43,12 @@ if test $? -ne 2 ; then - failures=1 - fi - -+# https://bugs.gnu.org/36148#13 -+echo 'Total failed: 2 (1 ignored)' | -+ grep -e '^Total failed: 0$' -e '^Total failed: \([0-9]*\) (\1 ignored)$' -+if test $? -ne 1 ; then -+ echo "Backref: Multiple -e test, test #5 failed" -+ failures=1 -+fi -+ - Exit $failures --- -2.30.1 (Apple Git-130) - diff --git a/grep-3.11.tar.xz b/grep-3.11.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..f1ea6baa49fdb8304206119a4eabb5c425dcd4ae Binary files /dev/null and b/grep-3.11.tar.xz differ diff --git a/grep-3.8.tar.xz b/grep-3.8.tar.xz deleted file mode 100644 index 8c237eecef6652f89bc7a0eabee95c55b3b7fb5a..0000000000000000000000000000000000000000 Binary files a/grep-3.8.tar.xz and /dev/null differ diff --git a/grep.spec b/grep.spec index 99bf576331572db929787d13b409a468b0c0eb9f..a08f9c4936290c5b29f2ef0ab06fed876c25e18b 100644 --- a/grep.spec +++ b/grep.spec @@ -1,5 +1,5 @@ Name: grep -Version: 3.8 +Version: 3.11 Release: 1 Summary: A string search utility License: GPLv3+ @@ -9,7 +9,7 @@ Source1: color_grep.sh Source2: colorgrep.csh Source3: grepconf.sh -Patch6000: backport-grep-bug-backref-in-last-of-multiple-patter.patch + BuildRequires: gcc pcre2-devel texinfo gettext libsigsegv-devel automake Provides: /bin/egrep /bin/fgrep /bin/grep bundled(gnulib)