grep: update to 3.12

Changelog: https://lists.gnu.org/archive/html/info-gnu/2025-04/msg00008.html

Also skip building doc, tests, and gnulib-tests.

Signed-off-by: Wei-Ting Yang <williamatcg@gmail.com>

diff --git a/utils/grep/Makefile b/utils/grep/Makefile
index 8b35ca9cf31962df2a580867215020bae4c2d616..712493ae73036cc9026a2726e603b8e316e1ec0a 100644 (file)
--- a/utils/grep/Makefile
+++ b/utils/grep/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2010-2016 OpenWrt.org
+# Copyright (C) 2010-2025 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=grep
-PKG_VERSION:=3.11
-PKG_RELEASE:=2
+PKG_VERSION:=3.12
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/grep
-PKG_HASH:=1db2aedde89d0dea42b16d9528f894c8d15dae4e190b59aecc78f5a951276eab
+PKG_HASH:=2649b27c0e90e632eadcd757be06c6e9a4f48d941de51e7c0f83ff76408a07b9
 
 PKG_MAINTAINER:=Julen Landa Alustiza <julen@zokormazo.info>
 PKG_LICENSE:=GPL-3.0-or-later
@@ -26,6 +26,7 @@ PKG_BUILD_PARALLEL:=1
 include $(INCLUDE_DIR)/package.mk
 
 MAKE_FLAGS += SHELL="/bin/sh"
+TARGET_CFLAGS += -std=c17
 
 define Package/grep
   SECTION:=utils

diff --git a/utils/grep/patches/901-ppc-musl.patch b/utils/grep/patches/901-ppc-musl.patch
new file mode 100644 (file)
index 0000000..aeb0266
--- /dev/null
+++ b/utils/grep/patches/901-ppc-musl.patch
@@ -0,0 +1,15 @@
+https://github.com/void-linux/void-packages/commit/0d9556b8593d6e67027fb1c83d176b7f899547e5
+--- a/lib/sigsegv.c
++++ b/lib/sigsegv.c
+@@ -246,8 +246,10 @@ int libsigsegv_version = LIBSIGSEGV_VERS
+ /* Because of the union, both definitions 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
+ #  endif

diff --git a/utils/grep/patches/902-skip-doc-tests-gnulib-tests.patch b/utils/grep/patches/902-skip-doc-tests-gnulib-tests.patch
new file mode 100644 (file)
index 0000000..73b44c5
--- /dev/null
+++ b/utils/grep/patches/902-skip-doc-tests-gnulib-tests.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -2399,7 +2399,7 @@ top_srcdir = @top_srcdir@
+ # along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ #
+ AUTOMAKE_OPTIONS = gnu 1.12
+-SUBDIRS = po lib doc src tests gnulib-tests
++SUBDIRS = po lib src
+ EXTRA_DIST = \
+   .mailmap            \
+   ChangeLog-2009      \

diff --git a/utils/grep/patches/ppc-musl.patch b/utils/grep/patches/ppc-musl.patch
deleted file mode 100644 (file)
index aeb0266..0000000
--- a/utils/grep/patches/ppc-musl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://github.com/void-linux/void-packages/commit/0d9556b8593d6e67027fb1c83d176b7f899547e5
---- a/lib/sigsegv.c
-+++ b/lib/sigsegv.c
-@@ -246,8 +246,10 @@ int libsigsegv_version = LIBSIGSEGV_VERS
- /* Because of the union, both definitions 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
- #  endif