From d96df970c93c5d2119d52b5056f86598ecc34d68de9429600757726c6c288fe8 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 6 Mar 2023 09:00:51 +0000 Subject: [PATCH 1/2] Accepting request 1069487 from home:AndreasStieger:branches:Base:System GNU grep 3.9 OBS-URL: https://build.opensuse.org/request/show/1069487 OBS-URL: https://build.opensuse.org/package/show/Base:System/grep?expand=0&rev=129 --- efgrep-warning.patch | 9 --------- grep-3.8.tar.xz | 3 --- grep-3.8.tar.xz.sig | 16 ---------------- grep-3.9.tar.xz | 3 +++ grep-3.9.tar.xz.sig | 16 ++++++++++++++++ grep.changes | 16 ++++++++++++++++ grep.spec | 4 ++-- 7 files changed, 37 insertions(+), 30 deletions(-) delete mode 100644 efgrep-warning.patch delete mode 100644 grep-3.8.tar.xz delete mode 100644 grep-3.8.tar.xz.sig create mode 100644 grep-3.9.tar.xz create mode 100644 grep-3.9.tar.xz.sig diff --git a/efgrep-warning.patch b/efgrep-warning.patch deleted file mode 100644 index 6782a69..0000000 --- a/efgrep-warning.patch +++ /dev/null @@ -1,9 +0,0 @@ -Index: grep-3.8/src/egrep.sh -=================================================================== ---- grep-3.8.orig/src/egrep.sh -+++ grep-3.8/src/egrep.sh -@@ -1,4 +1,2 @@ - #!@SHELL@ --cmd=${0##*/} --echo "$cmd: warning: $cmd is obsolescent; using @grep@ @option@" >&2 - exec @grep@ @option@ "$@" diff --git a/grep-3.8.tar.xz b/grep-3.8.tar.xz deleted file mode 100644 index d25c17c..0000000 --- a/grep-3.8.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:498d7cc1b4fb081904d87343febb73475cf771e424fb7e6141aff66013abc382 -size 1709536 diff --git a/grep-3.8.tar.xz.sig b/grep-3.8.tar.xz.sig deleted file mode 100644 index f118d40..0000000 --- a/grep-3.8.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEFV0/xQDINEhtHupnf9n8ywAL7u4FAmMTAOUACgkQf9n8ywAL -7u5kYQ/+NBv0xMQhdJastXBXKd6Dr1DVssV72M5OwhvnULPyE8oP8SrdH3G7jjtE -Ymjb+7pVKUr+4NtJbIMPXrJeJOWSEMmOiHCYEo1S7y+NfNEqh/DH+bPK66x+Tywo -LLB8z0KIEh1PY+qXBIsdVpWaODHhMmFBk/8nbvWvXRON2pI24oxhE67ctd+sOYeD -v1krRFDBv04Ow1Jvoclc7iJ+y2xZtAE0V6xwGMscqUvReC/wiYMmLED9RBXVX5G6 -tJtJzdXbuLjs4qALHXYW/nN32UeKZG+fAPaX96uYBNBkSg/UjXJNrfxsl2GgXI2d -PYlZwQ3scth7TUnn7yrbbb/PR3rQnqVmzPP5lv2tKePwrQ7m6Z4ClhTU/AQo2baH -UbCzbW1drBYrql4MUzNefB+L1C8SGLJRuV8YHPqhjBS9kFn495UB1b8uzq0qof1m -lmc34dUzqY0m7BWMt++V4rDkeHVLgoSUP8wZmtcnj96u8qRiNBeWhENgykf2dUqg -eYtFOGKqMuUGfQOY7BLkCe63YxQLSZpUxNstMh5pTY88XiZE1kb11sOIspED4PZJ -V0bwDTC73Ka0U1GHpYA4tyPVIowrYUhVSx0Rp3YDqufpe4vbT8D4kolWlt3Mp6ha -gWhlYEZ4N/HSjumFSDIbaWEdopWnTeo4rEhiCKfs8lxOtvwen/Y= -=kYhb ------END PGP SIGNATURE----- diff --git a/grep-3.9.tar.xz b/grep-3.9.tar.xz new file mode 100644 index 0000000..fe005fd --- /dev/null +++ b/grep-3.9.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:abcd11409ee23d4caf35feb422e53bbac867014cfeed313bb5f488aca170b599 +size 1680380 diff --git a/grep-3.9.tar.xz.sig b/grep-3.9.tar.xz.sig new file mode 100644 index 0000000..356a408 --- /dev/null +++ b/grep-3.9.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEFV0/xQDINEhtHupnf9n8ywAL7u4FAmQEtm8ACgkQf9n8ywAL +7u4DnA//QKCaPYQzUu8D7SZLsSd/iPJI8itO6BlA7p3o0BiOtthE1VjugBEYEskw +4Tbew7Kd1NEQJE4a+fV0bMPr0AOPXXcvrA1eg5vZTCcc4i6QX7lwDY2ARr1tE5nG +22Uu5rAGfseUQKzDiJiGB1ljaoncj5hd1K5BRk0h2BJ4nmfHIxoSXaeOWojMjtTA +pdx2A+vl8YlWLH4p8qsUGtUXf9ugo5GQg3ZOcxIe0ljTPVBnCuq9fu59b4U9nBwF +ALY8dXDEZxrrDpj2pxLbLGM50IQ/824muM4v+kpDMkMREuOvlJ4FrQca3s0szzPa +G8OglZOdWFdN4EMkgShY055AT7hIipXJrl++c6c7pcDn2FnLak3Z2xGLkj8WeQ0Y +6uHMKKe6wEiVY8frV6/sFWX5n+7suUqqhjOnrI6ctmI7ISE+hQLiVbyluSX1kBNy +S2vMF9Dj1Y4FTKSC0A/xa7chZmUs8s5xmRqxhJA9jWzVRELeWhA1uiw/T02d5CwG +EMTDNwQUkpszrRL6d9pqAZCIF19g891AsI1S0Itb9rnVfGIz/4IDoaYC70qc6mbv +ovUhtRA39Gl0l+6zgC5BwmwCxebCJ6cXT5BpYftoP65TJRqJ18UQx5ys1ySiDSAk +s4klJlTIppcKyJTr4Mi5c4p7CsSSqNif7GNZEPGNs9d6Wx/6sWc= +=9X+8 +-----END PGP SIGNATURE----- diff --git a/grep.changes b/grep.changes index b3816f4..524c2b0 100644 --- a/grep.changes +++ b/grep.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Sun Mar 5 20:55:49 UTC 2023 - Andreas Stieger + +- GNU grep 3.9: + * With -P, some non-ASCII UTF8 characters were not recognized as + word-constituent due to our omission of the PCRE2_UCP flag. + E.g., given f(){ echo Perú|LC_ALL=en_US.UTF-8 grep -Po "$1"; } + and this command, echo $(f 'r\w'):$(f '.\b'), before it would + print ":r". After the fix, it prints the correct results: "rú:ú". + * When given multiple patterns the last of which has a back- + reference, grep no longer sometimes mistakenly matches lines in + some cases. +- The long obsolete egrep and fgrep commands again issue a friendly + message asking for users to convert to grep -E and grep -F. All + openSUSE package builds are fixed - drop efgrep-warning.patch + ------------------------------------------------------------------- Tue Dec 27 12:25:45 UTC 2022 - Ludwig Nussel diff --git a/grep.spec b/grep.spec index 8c48c9c..84b3167 100644 --- a/grep.spec +++ b/grep.spec @@ -17,7 +17,7 @@ Name: grep -Version: 3.8 +Version: 3.9 Release: 0 Summary: Print lines matching a pattern License: GPL-3.0-or-later @@ -29,10 +29,10 @@ Source2: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig Source3: %{name}.keyring Source4: profile.sh Source5: %{name}-rpmlintrc -Patch0: efgrep-warning.patch BuildRequires: fdupes BuildRequires: glibc-locale BuildRequires: makeinfo +BuildRequires: pkgconfig BuildRequires: pkgconfig(libpcre2-8) Provides: base:%{_bindir}/grep From 0399a5ce73e2920b71bad607f9dac24684149dbac575811dbc66189798a3d5e8 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mon, 6 Mar 2023 10:18:56 +0000 Subject: [PATCH 2/2] Accepting request 1069578 from home:Andreas_Schwab:Factory - Update to grep 3.9 * When given multiple patterns the last of which has a back-reference, grep no longer sometimes mistakenly matches lines in some cases OBS-URL: https://build.opensuse.org/request/show/1069578 OBS-URL: https://build.opensuse.org/package/show/Base:System/grep?expand=0&rev=130 --- efgrep-warning.patch | 9 +++++++++ grep.changes | 15 ++++----------- grep.spec | 3 +-- 3 files changed, 14 insertions(+), 13 deletions(-) create mode 100644 efgrep-warning.patch diff --git a/efgrep-warning.patch b/efgrep-warning.patch new file mode 100644 index 0000000..6782a69 --- /dev/null +++ b/efgrep-warning.patch @@ -0,0 +1,9 @@ +Index: grep-3.8/src/egrep.sh +=================================================================== +--- grep-3.8.orig/src/egrep.sh ++++ grep-3.8/src/egrep.sh +@@ -1,4 +1,2 @@ + #!@SHELL@ +-cmd=${0##*/} +-echo "$cmd: warning: $cmd is obsolescent; using @grep@ @option@" >&2 + exec @grep@ @option@ "$@" diff --git a/grep.changes b/grep.changes index 524c2b0..7fb37f6 100644 --- a/grep.changes +++ b/grep.changes @@ -1,18 +1,11 @@ ------------------------------------------------------------------- -Sun Mar 5 20:55:49 UTC 2023 - Andreas Stieger +Mon Mar 6 09:28:35 UTC 2023 - Andreas Schwab -- GNU grep 3.9: +- Update to grep 3.9 * With -P, some non-ASCII UTF8 characters were not recognized as word-constituent due to our omission of the PCRE2_UCP flag. - E.g., given f(){ echo Perú|LC_ALL=en_US.UTF-8 grep -Po "$1"; } - and this command, echo $(f 'r\w'):$(f '.\b'), before it would - print ":r". After the fix, it prints the correct results: "rú:ú". - * When given multiple patterns the last of which has a back- - reference, grep no longer sometimes mistakenly matches lines in - some cases. -- The long obsolete egrep and fgrep commands again issue a friendly - message asking for users to convert to grep -E and grep -F. All - openSUSE package builds are fixed - drop efgrep-warning.patch + * When given multiple patterns the last of which has a back-reference, + grep no longer sometimes mistakenly matches lines in some cases ------------------------------------------------------------------- Tue Dec 27 12:25:45 UTC 2022 - Ludwig Nussel diff --git a/grep.spec b/grep.spec index 84b3167..055570d 100644 --- a/grep.spec +++ b/grep.spec @@ -29,10 +29,10 @@ Source2: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig Source3: %{name}.keyring Source4: profile.sh Source5: %{name}-rpmlintrc +Patch0: efgrep-warning.patch BuildRequires: fdupes BuildRequires: glibc-locale BuildRequires: makeinfo -BuildRequires: pkgconfig BuildRequires: pkgconfig(libpcre2-8) Provides: base:%{_bindir}/grep @@ -65,7 +65,6 @@ echo exit 77 > tests/pcre-jitstack echo exit 77 > gnulib-tests/test-c-stack.sh echo 'int main() { return 77; }' > gnulib-tests/test-sigsegv-catch-stackoverflow1.c echo 'int main() { return 77; }' > gnulib-tests/test-sigsegv-catch-stackoverflow2.c -echo 'int main() { return 77; }' > gnulib-tests/test-free.c %endif %make_build check