From 8384b324228800bfbeeb084639466d414ea23544 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Wed, 5 Apr 2023 15:44:09 +0000 Subject: grep: upgrade 3.9 -> 3.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is to announce grep-3.10, a stable release, fixing a bug with -P and \d. TL;DR, grep-3.9 would do this: $ LC_ALL=en_US.UTF-8 grep -P '\d' <<< ٠١٢٣٤٥٦٧٨٩ ٠١٢٣٤٥٦٧٨٩ It should print nothing, like it has always done. For more detail, see https://lists.gnu.org/r/bug-grep/2023-03/msg00005.html Thanks to Paul Eggert for catching the \D variant and to Bruno Haible for assiduously tending gnulib and for testing grep on so many different systems. There have been 12 commits by 2 people in the 17 days since 3.9. (From OE-Core rev: 7ac3bcf228ceb4b56f82c65941b95a276d7d3b95) Signed-off-by: Denys Dmytriyenko Signed-off-by: Richard Purdie --- meta/recipes-extended/grep/grep_3.10.bb | 46 +++++++++++++++++++++++++++++++++ meta/recipes-extended/grep/grep_3.9.bb | 46 --------------------------------- 2 files changed, 46 insertions(+), 46 deletions(-) create mode 100644 meta/recipes-extended/grep/grep_3.10.bb delete mode 100644 meta/recipes-extended/grep/grep_3.9.bb diff --git a/meta/recipes-extended/grep/grep_3.10.bb b/meta/recipes-extended/grep/grep_3.10.bb new file mode 100644 index 0000000000..33fd64d27e --- /dev/null +++ b/meta/recipes-extended/grep/grep_3.10.bb @@ -0,0 +1,46 @@ +SUMMARY = "GNU grep utility" +HOMEPAGE = "http://savannah.gnu.org/projects/grep/" +DESCRIPTION = "Grep searches one or more input files for lines containing a match to a specified pattern. By default, grep prints the matching lines." +BUGTRACKER = "http://savannah.gnu.org/bugs/?group=grep" +SECTION = "console/utils" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" + +SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz" + +SRC_URI[sha256sum] = "24efa5b595fb5a7100879b51b8868a0bb87a71c183d02c4c602633b88af6855b" + +inherit autotools gettext texinfo pkgconfig + +# Fix "Argument list too long" error when len(TMPDIR) = 410 +acpaths = "-I ./m4" + +do_configure:prepend () { + sed -i -e '1s,#!@SHELL@,#!/bin/sh,' ${S}/src/egrep.sh + rm -f ${S}/m4/init.m4 +} + +do_install () { + autotools_do_install + if [ "${base_bindir}" != "${bindir}" ]; then + install -d ${D}${base_bindir} + mv ${D}${bindir}/grep ${D}${base_bindir}/grep + mv ${D}${bindir}/egrep ${D}${base_bindir}/egrep + mv ${D}${bindir}/fgrep ${D}${base_bindir}/fgrep + rmdir ${D}${bindir}/ + fi +} + +inherit update-alternatives + +PACKAGECONFIG ??= "pcre" +PACKAGECONFIG[pcre] = "--enable-perl-regexp,--disable-perl-regexp,libpcre2" + +ALTERNATIVE_PRIORITY = "100" + +ALTERNATIVE:${PN} = "grep egrep fgrep" +ALTERNATIVE_LINK_NAME[grep] = "${base_bindir}/grep" +ALTERNATIVE_LINK_NAME[egrep] = "${base_bindir}/egrep" +ALTERNATIVE_LINK_NAME[fgrep] = "${base_bindir}/fgrep" + +BBCLASSEXTEND = "nativesdk" diff --git a/meta/recipes-extended/grep/grep_3.9.bb b/meta/recipes-extended/grep/grep_3.9.bb deleted file mode 100644 index 3c39a5fb56..0000000000 --- a/meta/recipes-extended/grep/grep_3.9.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "GNU grep utility" -HOMEPAGE = "http://savannah.gnu.org/projects/grep/" -DESCRIPTION = "Grep searches one or more input files for lines containing a match to a specified pattern. By default, grep prints the matching lines." -BUGTRACKER = "http://savannah.gnu.org/bugs/?group=grep" -SECTION = "console/utils" -LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" - -SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz" - -SRC_URI[sha256sum] = "abcd11409ee23d4caf35feb422e53bbac867014cfeed313bb5f488aca170b599" - -inherit autotools gettext texinfo pkgconfig - -# Fix "Argument list too long" error when len(TMPDIR) = 410 -acpaths = "-I ./m4" - -do_configure:prepend () { - sed -i -e '1s,#!@SHELL@,#!/bin/sh,' ${S}/src/egrep.sh - rm -f ${S}/m4/init.m4 -} - -do_install () { - autotools_do_install - if [ "${base_bindir}" != "${bindir}" ]; then - install -d ${D}${base_bindir} - mv ${D}${bindir}/grep ${D}${base_bindir}/grep - mv ${D}${bindir}/egrep ${D}${base_bindir}/egrep - mv ${D}${bindir}/fgrep ${D}${base_bindir}/fgrep - rmdir ${D}${bindir}/ - fi -} - -inherit update-alternatives - -PACKAGECONFIG ??= "pcre" -PACKAGECONFIG[pcre] = "--enable-perl-regexp,--disable-perl-regexp,libpcre2" - -ALTERNATIVE_PRIORITY = "100" - -ALTERNATIVE:${PN} = "grep egrep fgrep" -ALTERNATIVE_LINK_NAME[grep] = "${base_bindir}/grep" -ALTERNATIVE_LINK_NAME[egrep] = "${base_bindir}/egrep" -ALTERNATIVE_LINK_NAME[fgrep] = "${base_bindir}/fgrep" - -BBCLASSEXTEND = "nativesdk" -- cgit v1.2.3-54-g00ecf