From d007c0f28a3b9e9e3c54d5aaea0c6988f57c4184 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 29 Apr 2024 13:03:02 +0200 Subject: [PATCH] grep: fix recursion on many files https://debbugs.gnu.org/cgi/bugreport.cgi?bug=64773 Made aware of by @thesamesam. --- srcpkgs/grep/patches/dirfd.patch | 32 ++++++++++++++++++++++++++++++++ srcpkgs/grep/template | 8 ++++++-- 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/grep/patches/dirfd.patch diff --git a/srcpkgs/grep/patches/dirfd.patch b/srcpkgs/grep/patches/dirfd.patch new file mode 100644 index 00000000000..c2e648cd74a --- /dev/null +++ b/srcpkgs/grep/patches/dirfd.patch @@ -0,0 +1,32 @@ +From d4d8abb39eb02c555f062b1f83ffcfac999c582f Mon Sep 17 00:00:00 2001 +From: Bruno Haible +Date: Fri, 5 May 2023 12:02:49 +0200 +Subject: dirfd: Fix bogus override (regression 2023-04-26). + +Reported by Bjarni Ingi Gislason in +. + +* m4/dirfd.m4 (gl_FUNC_DIRFD): Fix mistake in last change. +--- +--- a/m4/dirfd.m4 ++++ b/m4/dirfd.m4 +@@ -1,4 +1,4 @@ +-# serial 27 -*- Autoconf -*- ++# serial 28 -*- Autoconf -*- + + dnl Find out how to get the file descriptor associated with an open DIR*. + +@@ -40,10 +40,6 @@ AC_DEFUN([gl_FUNC_DIRFD], + HAVE_DIRFD=0 + else + HAVE_DIRFD=1 +- dnl Replace only if the system declares dirfd already. +- if test $ac_cv_have_decl_dirfd = yes; then +- REPLACE_DIRFD=1 +- fi + dnl Replace dirfd() on native Windows, to support fdopendir(). + AC_REQUIRE([gl_DIRENT_DIR]) + if test $DIR_HAS_FD_MEMBER = 0; then +-- +cgit v1.1 + diff --git a/srcpkgs/grep/template b/srcpkgs/grep/template index 0e90b7d1b85..d614d78e0c1 100644 --- a/srcpkgs/grep/template +++ b/srcpkgs/grep/template @@ -1,9 +1,9 @@ # Template file for 'grep' pkgname=grep version=3.11 -revision=1 +revision=2 build_style=gnu-configure -hostmakedepends="pkg-config" +hostmakedepends="automake gettext-devel-tools pkg-config" makedepends="pcre2-devel" checkdepends="perl" short_desc="GNU grep utility" @@ -12,3 +12,7 @@ license="GPL-3.0-or-later" homepage="https://www.gnu.org/software/grep/" distfiles="${GNU_SITE}/grep/grep-${version}.tar.xz" checksum=1db2aedde89d0dea42b16d9528f894c8d15dae4e190b59aecc78f5a951276eab + +pre_configure() { + autoreconf -fi +}