grep: update to 3.8.

* patch out problematic warnings in egrep and fgrep
This commit is contained in:
Michal Vasilek 2022-09-18 13:30:30 +02:00 committed by Leah Neukirchen
parent b5f97a3f2d
commit ef5ffe4d69
3 changed files with 13 additions and 25 deletions

View File

@ -0,0 +1,10 @@
since 3.8, egrep and fgrep print a warning which can cause many issues with
programs not expecting this behaviour
--- a/src/egrep.sh
+++ b/src/egrep.sh
@@ -1,4 +1,3 @@
#!@SHELL@
cmd=${0##*/}
-echo "$cmd: warning: $cmd is obsolescent; using @grep@ @option@" >&2
exec @grep@ @option@ "$@"

View File

@ -1,14 +0,0 @@
--- a/lib/sigsegv.c
+++ b/lib/sigsegv.c
@@ -221,8 +221,10 @@ int libsigsegv_version = LIBSIGSEGV_VERSION;
/* both should be equivalent */
# if 0
# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1]
-# else
+# elif defined(__GLIBC__)
# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1]
+# else
+# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gregs[1]
# endif
# endif

View File

@ -1,22 +1,14 @@
# Template file for 'grep'
pkgname=grep
version=3.7
version=3.8
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="pcre-devel"
makedepends="pcre2-devel"
checkdepends="perl"
short_desc="GNU grep utility"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/grep/"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
checksum=5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c
pre_check() {
case "$XBPS_TARGET_MACHINE" in
*-musl)
# Disable locale tests that fail on musl
sed -i '/test-localename$(EXEEXT)/d' gnulib-tests/Makefile
esac
}
checksum=498d7cc1b4fb081904d87343febb73475cf771e424fb7e6141aff66013abc382