From 54133e0b9e095352fd56bcfd918f7d4effe61ae1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 18 Sep 2022 13:30:30 +0200
Subject: [PATCH] grep: update to 3.8.

* patch out problematic warnings in egrep and fgrep
---
 srcpkgs/grep/patches/efgrep-remove-warning.patch | 10 ++++++++++
 srcpkgs/grep/patches/ppc-musl.patch              | 14 --------------
 srcpkgs/grep/template                            | 14 +++-----------
 3 files changed, 13 insertions(+), 25 deletions(-)
 create mode 100644 srcpkgs/grep/patches/efgrep-remove-warning.patch
 delete mode 100644 srcpkgs/grep/patches/ppc-musl.patch

diff --git a/srcpkgs/grep/patches/efgrep-remove-warning.patch b/srcpkgs/grep/patches/efgrep-remove-warning.patch
new file mode 100644
index 000000000000..6371301688f0
--- /dev/null
+++ b/srcpkgs/grep/patches/efgrep-remove-warning.patch
@@ -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@ "$@"
diff --git a/srcpkgs/grep/patches/ppc-musl.patch b/srcpkgs/grep/patches/ppc-musl.patch
deleted file mode 100644
index 6ba37f233591..000000000000
--- a/srcpkgs/grep/patches/ppc-musl.patch
+++ /dev/null
@@ -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
- 
diff --git a/srcpkgs/grep/template b/srcpkgs/grep/template
index 7bab5c9c28e6..d659425a0bee 100644
--- a/srcpkgs/grep/template
+++ b/srcpkgs/grep/template
@@ -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