From 5d9ffc28fc6a0d99338cac0b020e3eac486bccfc Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Fri, 31 Mar 2023 01:43:34 -0500
Subject: system/grep: Update to 3.10

---
 system/grep/APKBUILD                                       | 12 +++++-------
 system/grep/gnulib-tests-dont-require-gpg-passphrase.patch |  2 +-
 system/grep/musl-ppc32.patch                               | 12 ------------
 3 files changed, 6 insertions(+), 20 deletions(-)
 delete mode 100644 system/grep/musl-ppc32.patch

diff --git a/system/grep/APKBUILD b/system/grep/APKBUILD
index dd6ef54a6..67b6356b2 100644
--- a/system/grep/APKBUILD
+++ b/system/grep/APKBUILD
@@ -2,8 +2,8 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=grep
-pkgver=3.7
-pkgrel=1
+pkgver=3.10
+pkgrel=0
 pkgdesc="Pattern matching utilities"
 url="https://www.gnu.org/software/grep/grep.html"
 arch="all"
@@ -15,7 +15,6 @@ subpackages="$pkgname-doc $pkgname-lang"
 source="https://mirrors.kernel.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz
 	gnulib-tests-dont-require-gpg-passphrase.patch
 	fix-tests.patch
-	musl-ppc32.patch
 	"
 
 build() {
@@ -41,7 +40,6 @@ package() {
 	rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
 }
 
-sha512sums="e9e45dcd40af8367f819f2b93c5e1b4e98a251a9aa251841fa67a875380fae52cfa27c68c6dbdd6a4dde1b1017ee0f6b9833ef6dd6e419d32d71b6df5e972b82  grep-3.7.tar.xz
-fd97fccd661befc558b3afb3e32c82dd2cef511a05e6129d49540599297c1b59ab1f109e63a12f585a2348c26c28fb98330c348829d1fe61cf8149d0dd1c989c  gnulib-tests-dont-require-gpg-passphrase.patch
-9ba6b01c0c74933299afb469dadd2ea0c7e24befa34c691671a576063e32a1f0c735541e5e2bb0073d8afd814790909f7f895827aa8a2fbacdfcae380a7bcb11  fix-tests.patch
-203765b90acf7fffaf8da9906e8d772ff81e074bf6585e35c713df107e9537c0a915013a327b3f770cc06c3a85f5ef55d6be32bbfdf6ce91a1aa1d4ac47e8ef3  musl-ppc32.patch"
+sha512sums="865e8f3fd7afc68f1a52f5e1e1ee05fb9c6d6182201efb0dbdf6075347b0b1d2bf0784537a8f8dd4fb050d523f7a1d2fb5b9c3e3245087d0e6cc12d6e9d3961b  grep-3.10.tar.xz
+7e4bc1da5de16a036e00fef6d9387b701bbe447d21d77cc3fc28a73e0364c972dec7cdcd70a176ef339b221fad92e7feccbb1e20f3f7b114a3585b8551770de5  gnulib-tests-dont-require-gpg-passphrase.patch
+9ba6b01c0c74933299afb469dadd2ea0c7e24befa34c691671a576063e32a1f0c735541e5e2bb0073d8afd814790909f7f895827aa8a2fbacdfcae380a7bcb11  fix-tests.patch"
diff --git a/system/grep/gnulib-tests-dont-require-gpg-passphrase.patch b/system/grep/gnulib-tests-dont-require-gpg-passphrase.patch
index b64993187..a1ec3b54f 100644
--- a/system/grep/gnulib-tests-dont-require-gpg-passphrase.patch
+++ b/system/grep/gnulib-tests-dont-require-gpg-passphrase.patch
@@ -1,6 +1,6 @@
 --- grep-3.1/gnulib-tests/test-vc-list-files-git.sh.old	2018-01-03 18:36:29.000000000 -0600
 +++ grep-3.1/gnulib-tests/test-vc-list-files-git.sh	2018-06-18 21:57:08.305562148 -0500
-@@ -32,6 +32,7 @@
+@@ -39,6 +39,7 @@
    touch d/a b c &&
    git config user.email "you@example.com" &&
    git config user.name "Your Name" &&
diff --git a/system/grep/musl-ppc32.patch b/system/grep/musl-ppc32.patch
deleted file mode 100644
index 7f4149408..000000000
--- a/system/grep/musl-ppc32.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/lib/sigsegv.c b/lib/sigsegv.c
---- a/lib/sigsegv.c	2022-05-07 13:35:30.000000000 +0000
-+++ b/lib/sigsegv.c	2022-05-07 13:38:33.030000000 +0000
-@@ -222,7 +222,7 @@
- #   if 0
- #    define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1]
- #   else
--#    define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1]
-+#    define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_mcontext.gregs[1]
- #   endif
- #  endif
- 
-- 
cgit v1.2.3-70-g09d2