Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] chroot-grep: update to 3.7.
@ 2022-08-19 18:44 oreo639
  2022-08-19 18:54 ` [PR PATCH] [Updated] " oreo639
                   ` (18 more replies)
  0 siblings, 19 replies; 20+ messages in thread
From: oreo639 @ 2022-08-19 18:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1367 bytes --]

There is a new pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages chgrep
https://github.com/void-linux/void-packages/pull/38785

chroot-grep: update to 3.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

The regular grep package is 3.7, not sure if there is a specific reason to keep this on 3.3, so feel free to let me know.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/38785.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chgrep-38785.patch --]
[-- Type: text/x-diff, Size: 1046 bytes --]

From 4b4643946405c9ac852f7c39b5d07d5da0620c71 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 19 Aug 2022 11:42:49 -0700
Subject: [PATCH] chroot-grep: update to 3.7.

---
 srcpkgs/chroot-grep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chroot-grep/template b/srcpkgs/chroot-grep/template
index 022b01d20de2..ad80e323f33e 100644
--- a/srcpkgs/chroot-grep/template
+++ b/srcpkgs/chroot-grep/template
@@ -1,6 +1,6 @@
 # Template file for 'chroot-grep'
 pkgname=chroot-grep
-version=3.3
+version=3.7
 revision=1
 wrksrc="grep-${version}"
 bootstrap=yes
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/grep/"
 distfiles="${GNU_SITE}/grep/grep-${version}.tar.xz"
-checksum=b960541c499619efd6afe1fa795402e4733c8e11ebf9fafccc0bb4bccdc5b514
+checksum=5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c
 conflicts="grep>=0"
 provides="grep-${version}_${revision}"
 

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PR PATCH] [Updated] chroot-grep: update to 3.7.
  2022-08-19 18:44 [PR PATCH] chroot-grep: update to 3.7 oreo639
@ 2022-08-19 18:54 ` oreo639
  2022-08-19 19:48 ` oreo639
                   ` (17 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: oreo639 @ 2022-08-19 18:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1372 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages chgrep
https://github.com/void-linux/void-packages/pull/38785

chroot-grep: update to 3.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

The regular grep package is 3.7, not sure if there is a specific reason to keep this on 3.3, so feel free to let me know.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/38785.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chgrep-38785.patch --]
[-- Type: text/x-diff, Size: 1249 bytes --]

From 0d114b301ed89b979405f1524041b064f1e07e4a Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 19 Aug 2022 11:42:49 -0700
Subject: [PATCH] chroot-grep: update to 3.7.

---
 srcpkgs/chroot-grep/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/chroot-grep/template b/srcpkgs/chroot-grep/template
index 022b01d20de2..828c35fe1992 100644
--- a/srcpkgs/chroot-grep/template
+++ b/srcpkgs/chroot-grep/template
@@ -1,17 +1,17 @@
 # Template file for 'chroot-grep'
 pkgname=chroot-grep
-version=3.3
+version=3.7
 revision=1
 wrksrc="grep-${version}"
 bootstrap=yes
 build_style=gnu-configure
 configure_args="--disable-perl-regexp --disable-nls ac_cv_path_GREP=grep"
-short_desc="The GNU grep utility - for use with xbps-src"
+short_desc="GNU grep utility - for use with xbps-src"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/grep/"
 distfiles="${GNU_SITE}/grep/grep-${version}.tar.xz"
-checksum=b960541c499619efd6afe1fa795402e4733c8e11ebf9fafccc0bb4bccdc5b514
+checksum=5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c
 conflicts="grep>=0"
 provides="grep-${version}_${revision}"
 

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PR PATCH] [Updated] chroot-grep: update to 3.7.
  2022-08-19 18:44 [PR PATCH] chroot-grep: update to 3.7 oreo639
  2022-08-19 18:54 ` [PR PATCH] [Updated] " oreo639
@ 2022-08-19 19:48 ` oreo639
  2022-08-19 19:50 ` oreo639
                   ` (16 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: oreo639 @ 2022-08-19 19:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1372 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages chgrep
https://github.com/void-linux/void-packages/pull/38785

chroot-grep: update to 3.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

The regular grep package is 3.7, not sure if there is a specific reason to keep this on 3.3, so feel free to let me know.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/38785.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chgrep-38785.patch --]
[-- Type: text/x-diff, Size: 6831 bytes --]

From e359ae9a2bd5a0b6179870b4969ecf9192f9df34 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 19 Aug 2022 11:42:49 -0700
Subject: [PATCH] chroot-grep: update to 3.7.

---
 ...001-build-be-more-careful-about-Perl.patch |  34 ++++++
 ...tests-port-to-platforms-lacking-Perl.patch | 100 ++++++++++++++++++
 srcpkgs/chroot-grep/template                  |   7 +-
 3 files changed, 138 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/chroot-grep/patches/0001-build-be-more-careful-about-Perl.patch
 create mode 100644 srcpkgs/chroot-grep/patches/0001-tests-port-to-platforms-lacking-Perl.patch

diff --git a/srcpkgs/chroot-grep/patches/0001-build-be-more-careful-about-Perl.patch b/srcpkgs/chroot-grep/patches/0001-build-be-more-careful-about-Perl.patch
new file mode 100644
index 000000000000..5a646e05c5a4
--- /dev/null
+++ b/srcpkgs/chroot-grep/patches/0001-build-be-more-careful-about-Perl.patch
@@ -0,0 +1,34 @@
+From d6276889a04a5502c1f9d80ffc9f0ae5f7b628e0 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Sat, 21 May 2022 16:55:53 -0700
+Subject: [PATCH] build: be more careful about Perl
+
+Problem reported by Serge Belyshev for Coreutils (Bug#52844).
+I observed the same problem with current Grep on Fedora 35
+without Perl installed.
+* configure.ac (HAVE_PERL): Rely on latest Gnulib gl_PERL, which
+sets gl_cv_prog_perl.
+---
+ configure.ac | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c85651c..5941b88 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -68,11 +68,7 @@ gl_INIT
+ AC_DEFINE([GNULIB_NO_VLA], [1], [Define to 1 to disable use of VLAs])
+ 
+ # The test suite needs to know if we have a working perl.
+-# FIXME: this is suboptimal.  Ideally, we would be able to call gl_PERL
+-# with an ACTION-IF-NOT-FOUND argument ...
+-cu_have_perl=yes
+-case $PERL in *"/missing "*) cu_have_perl=no;; esac
+-AM_CONDITIONAL([HAVE_PERL], [test $cu_have_perl = yes])
++AM_CONDITIONAL([HAVE_PERL], [test "$gl_cv_prog_perl" != no])
+ 
+ # gl_GCC_VERSION_IFELSE([major], [minor], [run-if-found], [run-if-not-found])
+ # ------------------------------------------------
+-- 
+2.37.2
+
diff --git a/srcpkgs/chroot-grep/patches/0001-tests-port-to-platforms-lacking-Perl.patch b/srcpkgs/chroot-grep/patches/0001-tests-port-to-platforms-lacking-Perl.patch
new file mode 100644
index 000000000000..3c5f044547a4
--- /dev/null
+++ b/srcpkgs/chroot-grep/patches/0001-tests-port-to-platforms-lacking-Perl.patch
@@ -0,0 +1,100 @@
+From 80bcb074aeed9b508a02940c8036c4ea5a1b9c63 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Sat, 21 May 2022 18:38:26 -0700
+Subject: [PATCH] tests: port to platforms lacking Perl
+
+* tests/init.cfg (require_perl_): New function.
+* tests/big-hole, tests/hash-collision-perf, tests/long-pattern-perf:
+* tests/many-regex-performance, tests/mb-non-UTF8-performance:
+Use it.
+---
+ tests/big-hole                | 1 +
+ tests/hash-collision-perf     | 2 ++
+ tests/init.cfg                | 7 +++++++
+ tests/long-pattern-perf       | 1 +
+ tests/many-regex-performance  | 1 +
+ tests/mb-non-UTF8-performance | 1 +
+ 6 files changed, 13 insertions(+)
+
+diff --git a/tests/big-hole b/tests/big-hole
+index eac077f..2899a3b 100755
+--- a/tests/big-hole
++++ b/tests/big-hole
+@@ -4,6 +4,7 @@
+ . "${srcdir=.}/init.sh"; path_prepend_ ../src
+ 
+ expensive_
++require_perl_
+ 
+ # Skip this test if there is no usable SEEK_HOLE support,
+ # as is the case with linux-3.5.0 on ext4 and tmpfs file systems.
+diff --git a/tests/hash-collision-perf b/tests/hash-collision-perf
+index d701140..7b8d373 100755
+--- a/tests/hash-collision-perf
++++ b/tests/hash-collision-perf
+@@ -21,6 +21,8 @@
+ 
+ fail=0
+ 
++require_perl_
++
+ : > empty || framework_failure_
+ 
+ # Construct a test case that consumes enough CPU time that we don't
+diff --git a/tests/init.cfg b/tests/init.cfg
+index 72cab20..515482c 100644
+--- a/tests/init.cfg
++++ b/tests/init.cfg
+@@ -138,6 +138,13 @@ require_JP_EUC_locale_()
+   skip_ "$locale locale not found"
+ }
+ 
++# Skip the current test if we lack Perl.
++require_perl_()
++{
++  test "$PERL" && $PERL -e 'use warnings' > /dev/null 2>&1 \
++    || skip_ 'configure did not find a usable version of Perl'
++}
++
+ expensive_()
+ {
+   if test "$RUN_EXPENSIVE_TESTS" != yes; then
+diff --git a/tests/long-pattern-perf b/tests/long-pattern-perf
+index 2d5e7c1..4557bbf 100755
+--- a/tests/long-pattern-perf
++++ b/tests/long-pattern-perf
+@@ -24,6 +24,7 @@ fail=0
+ # system load during the two test runs, so we'll mark it as
+ # "expensive", making it less likely to be run by regular users.
+ expensive_
++require_perl_
+ 
+ echo x > in || framework_failure_
+ # Note that we want 10x the byte count (not line count) in the larger file.
+diff --git a/tests/many-regex-performance b/tests/many-regex-performance
+index e16e032..4a5adac 100755
+--- a/tests/many-regex-performance
++++ b/tests/many-regex-performance
+@@ -26,6 +26,7 @@ fail=0
+ # system load during the two test runs, so we'll mark it as
+ # "expensive", making it less likely to be run by regular users.
+ expensive_
++require_perl_
+ 
+ # Make the quick/small input large enough so that even on high-end
+ # systems this first invocation takes at least 10ms of user time.
+diff --git a/tests/mb-non-UTF8-performance b/tests/mb-non-UTF8-performance
+index a6208d8..f3b33af 100755
+--- a/tests/mb-non-UTF8-performance
++++ b/tests/mb-non-UTF8-performance
+@@ -26,6 +26,7 @@ fail=0
+ # system load during the two test runs, so we'll mark it as
+ # "expensive", making it less likely to be run by regular users.
+ expensive_
++require_perl_
+ 
+ # Make the input large enough so that even on high-end systems
+ # the unibyte test takes at least 10ms of user time.
+-- 
+2.37.2
+
diff --git a/srcpkgs/chroot-grep/template b/srcpkgs/chroot-grep/template
index 022b01d20de2..03ddf9fa95b4 100644
--- a/srcpkgs/chroot-grep/template
+++ b/srcpkgs/chroot-grep/template
@@ -1,17 +1,18 @@
 # Template file for 'chroot-grep'
 pkgname=chroot-grep
-version=3.3
+version=3.7
 revision=1
 wrksrc="grep-${version}"
 bootstrap=yes
 build_style=gnu-configure
+hostmakedepends="automake"
 configure_args="--disable-perl-regexp --disable-nls ac_cv_path_GREP=grep"
-short_desc="The GNU grep utility - for use with xbps-src"
+short_desc="GNU grep utility - for use with xbps-src"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/grep/"
 distfiles="${GNU_SITE}/grep/grep-${version}.tar.xz"
-checksum=b960541c499619efd6afe1fa795402e4733c8e11ebf9fafccc0bb4bccdc5b514
+checksum=5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c
 conflicts="grep>=0"
 provides="grep-${version}_${revision}"
 

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PR PATCH] [Updated] chroot-grep: update to 3.7.
  2022-08-19 18:44 [PR PATCH] chroot-grep: update to 3.7 oreo639
  2022-08-19 18:54 ` [PR PATCH] [Updated] " oreo639
  2022-08-19 19:48 ` oreo639
@ 2022-08-19 19:50 ` oreo639
  2022-08-19 19:57 ` oreo639
                   ` (15 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: oreo639 @ 2022-08-19 19:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1372 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages chgrep
https://github.com/void-linux/void-packages/pull/38785

chroot-grep: update to 3.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

The regular grep package is 3.7, not sure if there is a specific reason to keep this on 3.3, so feel free to let me know.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/38785.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chgrep-38785.patch --]
[-- Type: text/x-diff, Size: 6831 bytes --]

From 163c2161d451baa24ca16ad6e3cec279554f0579 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 19 Aug 2022 11:42:49 -0700
Subject: [PATCH] chroot-grep: update to 3.7.

---
 ...001-build-be-more-careful-about-Perl.patch |  34 ++++++
 ...tests-port-to-platforms-lacking-Perl.patch | 100 ++++++++++++++++++
 srcpkgs/chroot-grep/template                  |   7 +-
 3 files changed, 138 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/chroot-grep/patches/0001-build-be-more-careful-about-Perl.patch
 create mode 100644 srcpkgs/chroot-grep/patches/0001-tests-port-to-platforms-lacking-Perl.patch

diff --git a/srcpkgs/chroot-grep/patches/0001-build-be-more-careful-about-Perl.patch b/srcpkgs/chroot-grep/patches/0001-build-be-more-careful-about-Perl.patch
new file mode 100644
index 000000000000..5a646e05c5a4
--- /dev/null
+++ b/srcpkgs/chroot-grep/patches/0001-build-be-more-careful-about-Perl.patch
@@ -0,0 +1,34 @@
+From d6276889a04a5502c1f9d80ffc9f0ae5f7b628e0 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Sat, 21 May 2022 16:55:53 -0700
+Subject: [PATCH] build: be more careful about Perl
+
+Problem reported by Serge Belyshev for Coreutils (Bug#52844).
+I observed the same problem with current Grep on Fedora 35
+without Perl installed.
+* configure.ac (HAVE_PERL): Rely on latest Gnulib gl_PERL, which
+sets gl_cv_prog_perl.
+---
+ configure.ac | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c85651c..5941b88 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -68,11 +68,7 @@ gl_INIT
+ AC_DEFINE([GNULIB_NO_VLA], [1], [Define to 1 to disable use of VLAs])
+ 
+ # The test suite needs to know if we have a working perl.
+-# FIXME: this is suboptimal.  Ideally, we would be able to call gl_PERL
+-# with an ACTION-IF-NOT-FOUND argument ...
+-cu_have_perl=yes
+-case $PERL in *"/missing "*) cu_have_perl=no;; esac
+-AM_CONDITIONAL([HAVE_PERL], [test $cu_have_perl = yes])
++AM_CONDITIONAL([HAVE_PERL], [test "$gl_cv_prog_perl" != no])
+ 
+ # gl_GCC_VERSION_IFELSE([major], [minor], [run-if-found], [run-if-not-found])
+ # ------------------------------------------------
+-- 
+2.37.2
+
diff --git a/srcpkgs/chroot-grep/patches/0001-tests-port-to-platforms-lacking-Perl.patch b/srcpkgs/chroot-grep/patches/0001-tests-port-to-platforms-lacking-Perl.patch
new file mode 100644
index 000000000000..3c5f044547a4
--- /dev/null
+++ b/srcpkgs/chroot-grep/patches/0001-tests-port-to-platforms-lacking-Perl.patch
@@ -0,0 +1,100 @@
+From 80bcb074aeed9b508a02940c8036c4ea5a1b9c63 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Sat, 21 May 2022 18:38:26 -0700
+Subject: [PATCH] tests: port to platforms lacking Perl
+
+* tests/init.cfg (require_perl_): New function.
+* tests/big-hole, tests/hash-collision-perf, tests/long-pattern-perf:
+* tests/many-regex-performance, tests/mb-non-UTF8-performance:
+Use it.
+---
+ tests/big-hole                | 1 +
+ tests/hash-collision-perf     | 2 ++
+ tests/init.cfg                | 7 +++++++
+ tests/long-pattern-perf       | 1 +
+ tests/many-regex-performance  | 1 +
+ tests/mb-non-UTF8-performance | 1 +
+ 6 files changed, 13 insertions(+)
+
+diff --git a/tests/big-hole b/tests/big-hole
+index eac077f..2899a3b 100755
+--- a/tests/big-hole
++++ b/tests/big-hole
+@@ -4,6 +4,7 @@
+ . "${srcdir=.}/init.sh"; path_prepend_ ../src
+ 
+ expensive_
++require_perl_
+ 
+ # Skip this test if there is no usable SEEK_HOLE support,
+ # as is the case with linux-3.5.0 on ext4 and tmpfs file systems.
+diff --git a/tests/hash-collision-perf b/tests/hash-collision-perf
+index d701140..7b8d373 100755
+--- a/tests/hash-collision-perf
++++ b/tests/hash-collision-perf
+@@ -21,6 +21,8 @@
+ 
+ fail=0
+ 
++require_perl_
++
+ : > empty || framework_failure_
+ 
+ # Construct a test case that consumes enough CPU time that we don't
+diff --git a/tests/init.cfg b/tests/init.cfg
+index 72cab20..515482c 100644
+--- a/tests/init.cfg
++++ b/tests/init.cfg
+@@ -138,6 +138,13 @@ require_JP_EUC_locale_()
+   skip_ "$locale locale not found"
+ }
+ 
++# Skip the current test if we lack Perl.
++require_perl_()
++{
++  test "$PERL" && $PERL -e 'use warnings' > /dev/null 2>&1 \
++    || skip_ 'configure did not find a usable version of Perl'
++}
++
+ expensive_()
+ {
+   if test "$RUN_EXPENSIVE_TESTS" != yes; then
+diff --git a/tests/long-pattern-perf b/tests/long-pattern-perf
+index 2d5e7c1..4557bbf 100755
+--- a/tests/long-pattern-perf
++++ b/tests/long-pattern-perf
+@@ -24,6 +24,7 @@ fail=0
+ # system load during the two test runs, so we'll mark it as
+ # "expensive", making it less likely to be run by regular users.
+ expensive_
++require_perl_
+ 
+ echo x > in || framework_failure_
+ # Note that we want 10x the byte count (not line count) in the larger file.
+diff --git a/tests/many-regex-performance b/tests/many-regex-performance
+index e16e032..4a5adac 100755
+--- a/tests/many-regex-performance
++++ b/tests/many-regex-performance
+@@ -26,6 +26,7 @@ fail=0
+ # system load during the two test runs, so we'll mark it as
+ # "expensive", making it less likely to be run by regular users.
+ expensive_
++require_perl_
+ 
+ # Make the quick/small input large enough so that even on high-end
+ # systems this first invocation takes at least 10ms of user time.
+diff --git a/tests/mb-non-UTF8-performance b/tests/mb-non-UTF8-performance
+index a6208d8..f3b33af 100755
+--- a/tests/mb-non-UTF8-performance
++++ b/tests/mb-non-UTF8-performance
+@@ -26,6 +26,7 @@ fail=0
+ # system load during the two test runs, so we'll mark it as
+ # "expensive", making it less likely to be run by regular users.
+ expensive_
++require_perl_
+ 
+ # Make the input large enough so that even on high-end systems
+ # the unibyte test takes at least 10ms of user time.
+-- 
+2.37.2
+
diff --git a/srcpkgs/chroot-grep/template b/srcpkgs/chroot-grep/template
index 022b01d20de2..4b4afcb90721 100644
--- a/srcpkgs/chroot-grep/template
+++ b/srcpkgs/chroot-grep/template
@@ -1,17 +1,18 @@
 # Template file for 'chroot-grep'
 pkgname=chroot-grep
-version=3.3
+version=3.7
 revision=1
 wrksrc="grep-${version}"
 bootstrap=yes
 build_style=gnu-configure
 configure_args="--disable-perl-regexp --disable-nls ac_cv_path_GREP=grep"
-short_desc="The GNU grep utility - for use with xbps-src"
+hostmakedepends="automake"
+short_desc="GNU grep utility - for use with xbps-src"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/grep/"
 distfiles="${GNU_SITE}/grep/grep-${version}.tar.xz"
-checksum=b960541c499619efd6afe1fa795402e4733c8e11ebf9fafccc0bb4bccdc5b514
+checksum=5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c
 conflicts="grep>=0"
 provides="grep-${version}_${revision}"
 

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PR PATCH] [Updated] chroot-grep: update to 3.7.
  2022-08-19 18:44 [PR PATCH] chroot-grep: update to 3.7 oreo639
                   ` (2 preceding siblings ...)
  2022-08-19 19:50 ` oreo639
@ 2022-08-19 19:57 ` oreo639
  2022-08-19 20:01 ` oreo639
                   ` (14 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: oreo639 @ 2022-08-19 19:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1372 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages chgrep
https://github.com/void-linux/void-packages/pull/38785

chroot-grep: update to 3.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

The regular grep package is 3.7, not sure if there is a specific reason to keep this on 3.3, so feel free to let me know.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/38785.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chgrep-38785.patch --]
[-- Type: text/x-diff, Size: 7801 bytes --]

From a8e1dba673c44139892cee11e492e41bbe94a963 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 19 Aug 2022 12:56:32 -0700
Subject: [PATCH 1/2] grep: fix running tests without perl

---
 ...001-build-be-more-careful-about-Perl.patch |  34 ++++++
 ...tests-port-to-platforms-lacking-Perl.patch | 100 ++++++++++++++++++
 srcpkgs/grep/template                         |   2 +-
 3 files changed, 135 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/grep/patches/0001-build-be-more-careful-about-Perl.patch
 create mode 100644 srcpkgs/grep/patches/0001-tests-port-to-platforms-lacking-Perl.patch

diff --git a/srcpkgs/grep/patches/0001-build-be-more-careful-about-Perl.patch b/srcpkgs/grep/patches/0001-build-be-more-careful-about-Perl.patch
new file mode 100644
index 000000000000..5a646e05c5a4
--- /dev/null
+++ b/srcpkgs/grep/patches/0001-build-be-more-careful-about-Perl.patch
@@ -0,0 +1,34 @@
+From d6276889a04a5502c1f9d80ffc9f0ae5f7b628e0 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Sat, 21 May 2022 16:55:53 -0700
+Subject: [PATCH] build: be more careful about Perl
+
+Problem reported by Serge Belyshev for Coreutils (Bug#52844).
+I observed the same problem with current Grep on Fedora 35
+without Perl installed.
+* configure.ac (HAVE_PERL): Rely on latest Gnulib gl_PERL, which
+sets gl_cv_prog_perl.
+---
+ configure.ac | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c85651c..5941b88 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -68,11 +68,7 @@ gl_INIT
+ AC_DEFINE([GNULIB_NO_VLA], [1], [Define to 1 to disable use of VLAs])
+ 
+ # The test suite needs to know if we have a working perl.
+-# FIXME: this is suboptimal.  Ideally, we would be able to call gl_PERL
+-# with an ACTION-IF-NOT-FOUND argument ...
+-cu_have_perl=yes
+-case $PERL in *"/missing "*) cu_have_perl=no;; esac
+-AM_CONDITIONAL([HAVE_PERL], [test $cu_have_perl = yes])
++AM_CONDITIONAL([HAVE_PERL], [test "$gl_cv_prog_perl" != no])
+ 
+ # gl_GCC_VERSION_IFELSE([major], [minor], [run-if-found], [run-if-not-found])
+ # ------------------------------------------------
+-- 
+2.37.2
+
diff --git a/srcpkgs/grep/patches/0001-tests-port-to-platforms-lacking-Perl.patch b/srcpkgs/grep/patches/0001-tests-port-to-platforms-lacking-Perl.patch
new file mode 100644
index 000000000000..3c5f044547a4
--- /dev/null
+++ b/srcpkgs/grep/patches/0001-tests-port-to-platforms-lacking-Perl.patch
@@ -0,0 +1,100 @@
+From 80bcb074aeed9b508a02940c8036c4ea5a1b9c63 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Sat, 21 May 2022 18:38:26 -0700
+Subject: [PATCH] tests: port to platforms lacking Perl
+
+* tests/init.cfg (require_perl_): New function.
+* tests/big-hole, tests/hash-collision-perf, tests/long-pattern-perf:
+* tests/many-regex-performance, tests/mb-non-UTF8-performance:
+Use it.
+---
+ tests/big-hole                | 1 +
+ tests/hash-collision-perf     | 2 ++
+ tests/init.cfg                | 7 +++++++
+ tests/long-pattern-perf       | 1 +
+ tests/many-regex-performance  | 1 +
+ tests/mb-non-UTF8-performance | 1 +
+ 6 files changed, 13 insertions(+)
+
+diff --git a/tests/big-hole b/tests/big-hole
+index eac077f..2899a3b 100755
+--- a/tests/big-hole
++++ b/tests/big-hole
+@@ -4,6 +4,7 @@
+ . "${srcdir=.}/init.sh"; path_prepend_ ../src
+ 
+ expensive_
++require_perl_
+ 
+ # Skip this test if there is no usable SEEK_HOLE support,
+ # as is the case with linux-3.5.0 on ext4 and tmpfs file systems.
+diff --git a/tests/hash-collision-perf b/tests/hash-collision-perf
+index d701140..7b8d373 100755
+--- a/tests/hash-collision-perf
++++ b/tests/hash-collision-perf
+@@ -21,6 +21,8 @@
+ 
+ fail=0
+ 
++require_perl_
++
+ : > empty || framework_failure_
+ 
+ # Construct a test case that consumes enough CPU time that we don't
+diff --git a/tests/init.cfg b/tests/init.cfg
+index 72cab20..515482c 100644
+--- a/tests/init.cfg
++++ b/tests/init.cfg
+@@ -138,6 +138,13 @@ require_JP_EUC_locale_()
+   skip_ "$locale locale not found"
+ }
+ 
++# Skip the current test if we lack Perl.
++require_perl_()
++{
++  test "$PERL" && $PERL -e 'use warnings' > /dev/null 2>&1 \
++    || skip_ 'configure did not find a usable version of Perl'
++}
++
+ expensive_()
+ {
+   if test "$RUN_EXPENSIVE_TESTS" != yes; then
+diff --git a/tests/long-pattern-perf b/tests/long-pattern-perf
+index 2d5e7c1..4557bbf 100755
+--- a/tests/long-pattern-perf
++++ b/tests/long-pattern-perf
+@@ -24,6 +24,7 @@ fail=0
+ # system load during the two test runs, so we'll mark it as
+ # "expensive", making it less likely to be run by regular users.
+ expensive_
++require_perl_
+ 
+ echo x > in || framework_failure_
+ # Note that we want 10x the byte count (not line count) in the larger file.
+diff --git a/tests/many-regex-performance b/tests/many-regex-performance
+index e16e032..4a5adac 100755
+--- a/tests/many-regex-performance
++++ b/tests/many-regex-performance
+@@ -26,6 +26,7 @@ fail=0
+ # system load during the two test runs, so we'll mark it as
+ # "expensive", making it less likely to be run by regular users.
+ expensive_
++require_perl_
+ 
+ # Make the quick/small input large enough so that even on high-end
+ # systems this first invocation takes at least 10ms of user time.
+diff --git a/tests/mb-non-UTF8-performance b/tests/mb-non-UTF8-performance
+index a6208d8..f3b33af 100755
+--- a/tests/mb-non-UTF8-performance
++++ b/tests/mb-non-UTF8-performance
+@@ -26,6 +26,7 @@ fail=0
+ # system load during the two test runs, so we'll mark it as
+ # "expensive", making it less likely to be run by regular users.
+ expensive_
++require_perl_
+ 
+ # Make the input large enough so that even on high-end systems
+ # the unibyte test takes at least 10ms of user time.
+-- 
+2.37.2
+
diff --git a/srcpkgs/grep/template b/srcpkgs/grep/template
index 7bab5c9c28e6..b80c32a05f2b 100644
--- a/srcpkgs/grep/template
+++ b/srcpkgs/grep/template
@@ -3,7 +3,7 @@ pkgname=grep
 version=3.7
 revision=1
 build_style=gnu-configure
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config automake"
 makedepends="pcre-devel"
 checkdepends="perl"
 short_desc="GNU grep utility"

From a6c20e71f6077b73a66c4671467ed6aa144753be Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 19 Aug 2022 12:56:54 -0700
Subject: [PATCH 2/2] chroot-grep: update to 3.7.

---
 srcpkgs/chroot-grep/patches  | 1 +
 srcpkgs/chroot-grep/template | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)
 create mode 120000 srcpkgs/chroot-grep/patches

diff --git a/srcpkgs/chroot-grep/patches b/srcpkgs/chroot-grep/patches
new file mode 120000
index 000000000000..bcb05f606dca
--- /dev/null
+++ b/srcpkgs/chroot-grep/patches
@@ -0,0 +1 @@
+../grep/patches
\ No newline at end of file
diff --git a/srcpkgs/chroot-grep/template b/srcpkgs/chroot-grep/template
index 022b01d20de2..4b4afcb90721 100644
--- a/srcpkgs/chroot-grep/template
+++ b/srcpkgs/chroot-grep/template
@@ -1,17 +1,18 @@
 # Template file for 'chroot-grep'
 pkgname=chroot-grep
-version=3.3
+version=3.7
 revision=1
 wrksrc="grep-${version}"
 bootstrap=yes
 build_style=gnu-configure
 configure_args="--disable-perl-regexp --disable-nls ac_cv_path_GREP=grep"
-short_desc="The GNU grep utility - for use with xbps-src"
+hostmakedepends="automake"
+short_desc="GNU grep utility - for use with xbps-src"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/grep/"
 distfiles="${GNU_SITE}/grep/grep-${version}.tar.xz"
-checksum=b960541c499619efd6afe1fa795402e4733c8e11ebf9fafccc0bb4bccdc5b514
+checksum=5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c
 conflicts="grep>=0"
 provides="grep-${version}_${revision}"
 

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PR PATCH] [Updated] chroot-grep: update to 3.7.
  2022-08-19 18:44 [PR PATCH] chroot-grep: update to 3.7 oreo639
                   ` (3 preceding siblings ...)
  2022-08-19 19:57 ` oreo639
@ 2022-08-19 20:01 ` oreo639
  2022-08-19 20:26 ` oreo639
                   ` (13 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: oreo639 @ 2022-08-19 20:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1372 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages chgrep
https://github.com/void-linux/void-packages/pull/38785

chroot-grep: update to 3.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

The regular grep package is 3.7, not sure if there is a specific reason to keep this on 3.3, so feel free to let me know.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/38785.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chgrep-38785.patch --]
[-- Type: text/x-diff, Size: 8332 bytes --]

From 164accc22ab0e3a22283b5c3f9c1b2c876594e6d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 19 Aug 2022 13:01:31 -0700
Subject: [PATCH 1/2] grep: fix running tests without perl

---
 ...001-build-be-more-careful-about-Perl.patch |  34 ++++++
 ...tests-port-to-platforms-lacking-Perl.patch | 100 ++++++++++++++++++
 srcpkgs/grep/template                         |   5 +-
 3 files changed, 138 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/grep/patches/0001-build-be-more-careful-about-Perl.patch
 create mode 100644 srcpkgs/grep/patches/0001-tests-port-to-platforms-lacking-Perl.patch

diff --git a/srcpkgs/grep/patches/0001-build-be-more-careful-about-Perl.patch b/srcpkgs/grep/patches/0001-build-be-more-careful-about-Perl.patch
new file mode 100644
index 000000000000..5a646e05c5a4
--- /dev/null
+++ b/srcpkgs/grep/patches/0001-build-be-more-careful-about-Perl.patch
@@ -0,0 +1,34 @@
+From d6276889a04a5502c1f9d80ffc9f0ae5f7b628e0 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Sat, 21 May 2022 16:55:53 -0700
+Subject: [PATCH] build: be more careful about Perl
+
+Problem reported by Serge Belyshev for Coreutils (Bug#52844).
+I observed the same problem with current Grep on Fedora 35
+without Perl installed.
+* configure.ac (HAVE_PERL): Rely on latest Gnulib gl_PERL, which
+sets gl_cv_prog_perl.
+---
+ configure.ac | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c85651c..5941b88 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -68,11 +68,7 @@ gl_INIT
+ AC_DEFINE([GNULIB_NO_VLA], [1], [Define to 1 to disable use of VLAs])
+ 
+ # The test suite needs to know if we have a working perl.
+-# FIXME: this is suboptimal.  Ideally, we would be able to call gl_PERL
+-# with an ACTION-IF-NOT-FOUND argument ...
+-cu_have_perl=yes
+-case $PERL in *"/missing "*) cu_have_perl=no;; esac
+-AM_CONDITIONAL([HAVE_PERL], [test $cu_have_perl = yes])
++AM_CONDITIONAL([HAVE_PERL], [test "$gl_cv_prog_perl" != no])
+ 
+ # gl_GCC_VERSION_IFELSE([major], [minor], [run-if-found], [run-if-not-found])
+ # ------------------------------------------------
+-- 
+2.37.2
+
diff --git a/srcpkgs/grep/patches/0001-tests-port-to-platforms-lacking-Perl.patch b/srcpkgs/grep/patches/0001-tests-port-to-platforms-lacking-Perl.patch
new file mode 100644
index 000000000000..3c5f044547a4
--- /dev/null
+++ b/srcpkgs/grep/patches/0001-tests-port-to-platforms-lacking-Perl.patch
@@ -0,0 +1,100 @@
+From 80bcb074aeed9b508a02940c8036c4ea5a1b9c63 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Sat, 21 May 2022 18:38:26 -0700
+Subject: [PATCH] tests: port to platforms lacking Perl
+
+* tests/init.cfg (require_perl_): New function.
+* tests/big-hole, tests/hash-collision-perf, tests/long-pattern-perf:
+* tests/many-regex-performance, tests/mb-non-UTF8-performance:
+Use it.
+---
+ tests/big-hole                | 1 +
+ tests/hash-collision-perf     | 2 ++
+ tests/init.cfg                | 7 +++++++
+ tests/long-pattern-perf       | 1 +
+ tests/many-regex-performance  | 1 +
+ tests/mb-non-UTF8-performance | 1 +
+ 6 files changed, 13 insertions(+)
+
+diff --git a/tests/big-hole b/tests/big-hole
+index eac077f..2899a3b 100755
+--- a/tests/big-hole
++++ b/tests/big-hole
+@@ -4,6 +4,7 @@
+ . "${srcdir=.}/init.sh"; path_prepend_ ../src
+ 
+ expensive_
++require_perl_
+ 
+ # Skip this test if there is no usable SEEK_HOLE support,
+ # as is the case with linux-3.5.0 on ext4 and tmpfs file systems.
+diff --git a/tests/hash-collision-perf b/tests/hash-collision-perf
+index d701140..7b8d373 100755
+--- a/tests/hash-collision-perf
++++ b/tests/hash-collision-perf
+@@ -21,6 +21,8 @@
+ 
+ fail=0
+ 
++require_perl_
++
+ : > empty || framework_failure_
+ 
+ # Construct a test case that consumes enough CPU time that we don't
+diff --git a/tests/init.cfg b/tests/init.cfg
+index 72cab20..515482c 100644
+--- a/tests/init.cfg
++++ b/tests/init.cfg
+@@ -138,6 +138,13 @@ require_JP_EUC_locale_()
+   skip_ "$locale locale not found"
+ }
+ 
++# Skip the current test if we lack Perl.
++require_perl_()
++{
++  test "$PERL" && $PERL -e 'use warnings' > /dev/null 2>&1 \
++    || skip_ 'configure did not find a usable version of Perl'
++}
++
+ expensive_()
+ {
+   if test "$RUN_EXPENSIVE_TESTS" != yes; then
+diff --git a/tests/long-pattern-perf b/tests/long-pattern-perf
+index 2d5e7c1..4557bbf 100755
+--- a/tests/long-pattern-perf
++++ b/tests/long-pattern-perf
+@@ -24,6 +24,7 @@ fail=0
+ # system load during the two test runs, so we'll mark it as
+ # "expensive", making it less likely to be run by regular users.
+ expensive_
++require_perl_
+ 
+ echo x > in || framework_failure_
+ # Note that we want 10x the byte count (not line count) in the larger file.
+diff --git a/tests/many-regex-performance b/tests/many-regex-performance
+index e16e032..4a5adac 100755
+--- a/tests/many-regex-performance
++++ b/tests/many-regex-performance
+@@ -26,6 +26,7 @@ fail=0
+ # system load during the two test runs, so we'll mark it as
+ # "expensive", making it less likely to be run by regular users.
+ expensive_
++require_perl_
+ 
+ # Make the quick/small input large enough so that even on high-end
+ # systems this first invocation takes at least 10ms of user time.
+diff --git a/tests/mb-non-UTF8-performance b/tests/mb-non-UTF8-performance
+index a6208d8..f3b33af 100755
+--- a/tests/mb-non-UTF8-performance
++++ b/tests/mb-non-UTF8-performance
+@@ -26,6 +26,7 @@ fail=0
+ # system load during the two test runs, so we'll mark it as
+ # "expensive", making it less likely to be run by regular users.
+ expensive_
++require_perl_
+ 
+ # Make the input large enough so that even on high-end systems
+ # the unibyte test takes at least 10ms of user time.
+-- 
+2.37.2
+
diff --git a/srcpkgs/grep/template b/srcpkgs/grep/template
index 7bab5c9c28e6..1c7b668b26f5 100644
--- a/srcpkgs/grep/template
+++ b/srcpkgs/grep/template
@@ -1,9 +1,12 @@
 # Template file for 'grep'
+#
+# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/chroot-grep"
+#
 pkgname=grep
 version=3.7
 revision=1
 build_style=gnu-configure
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config automake"
 makedepends="pcre-devel"
 checkdepends="perl"
 short_desc="GNU grep utility"

From 9b5b5bc5645a7208d8a6075c46c52d86e53eaf4e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 19 Aug 2022 13:01:50 -0700
Subject: [PATCH 2/2] chroot-grep: update to 3.7.

---
 srcpkgs/chroot-grep/patches  |  1 +
 srcpkgs/chroot-grep/template | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)
 create mode 120000 srcpkgs/chroot-grep/patches

diff --git a/srcpkgs/chroot-grep/patches b/srcpkgs/chroot-grep/patches
new file mode 120000
index 000000000000..bcb05f606dca
--- /dev/null
+++ b/srcpkgs/chroot-grep/patches
@@ -0,0 +1 @@
+../grep/patches
\ No newline at end of file
diff --git a/srcpkgs/chroot-grep/template b/srcpkgs/chroot-grep/template
index 022b01d20de2..18bd12da6fe3 100644
--- a/srcpkgs/chroot-grep/template
+++ b/srcpkgs/chroot-grep/template
@@ -1,17 +1,21 @@
 # Template file for 'chroot-grep'
+#
+# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/grep"
+#
 pkgname=chroot-grep
-version=3.3
+version=3.7
 revision=1
 wrksrc="grep-${version}"
 bootstrap=yes
 build_style=gnu-configure
 configure_args="--disable-perl-regexp --disable-nls ac_cv_path_GREP=grep"
-short_desc="The GNU grep utility - for use with xbps-src"
+hostmakedepends="automake"
+short_desc="GNU grep utility - for use with xbps-src"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/grep/"
 distfiles="${GNU_SITE}/grep/grep-${version}.tar.xz"
-checksum=b960541c499619efd6afe1fa795402e4733c8e11ebf9fafccc0bb4bccdc5b514
+checksum=5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c
 conflicts="grep>=0"
 provides="grep-${version}_${revision}"
 
@@ -20,6 +24,14 @@ if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	export ac_cv_header_sys_cdefs_h=no
 fi
 
+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
+}
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/share/info ${DESTDIR}/usr/share/man
 }

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PR PATCH] [Updated] chroot-grep: update to 3.7.
  2022-08-19 18:44 [PR PATCH] chroot-grep: update to 3.7 oreo639
                   ` (4 preceding siblings ...)
  2022-08-19 20:01 ` oreo639
@ 2022-08-19 20:26 ` oreo639
  2022-08-19 22:08 ` [PR REVIEW] " paper42
                   ` (12 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: oreo639 @ 2022-08-19 20:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1372 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages chgrep
https://github.com/void-linux/void-packages/pull/38785

chroot-grep: update to 3.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

The regular grep package is 3.7, not sure if there is a specific reason to keep this on 3.3, so feel free to let me know.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/38785.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chgrep-38785.patch --]
[-- Type: text/x-diff, Size: 8375 bytes --]

From 86452c95dba03bbf9619e9326d382ebf7754bf1b Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 19 Aug 2022 13:25:35 -0700
Subject: [PATCH 1/2] grep: fix running tests without perl

---
 ...001-build-be-more-careful-about-Perl.patch |  34 ++++++
 ...tests-port-to-platforms-lacking-Perl.patch | 100 ++++++++++++++++++
 srcpkgs/grep/template                         |  13 +--
 3 files changed, 138 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/grep/patches/0001-build-be-more-careful-about-Perl.patch
 create mode 100644 srcpkgs/grep/patches/0001-tests-port-to-platforms-lacking-Perl.patch

diff --git a/srcpkgs/grep/patches/0001-build-be-more-careful-about-Perl.patch b/srcpkgs/grep/patches/0001-build-be-more-careful-about-Perl.patch
new file mode 100644
index 000000000000..5a646e05c5a4
--- /dev/null
+++ b/srcpkgs/grep/patches/0001-build-be-more-careful-about-Perl.patch
@@ -0,0 +1,34 @@
+From d6276889a04a5502c1f9d80ffc9f0ae5f7b628e0 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Sat, 21 May 2022 16:55:53 -0700
+Subject: [PATCH] build: be more careful about Perl
+
+Problem reported by Serge Belyshev for Coreutils (Bug#52844).
+I observed the same problem with current Grep on Fedora 35
+without Perl installed.
+* configure.ac (HAVE_PERL): Rely on latest Gnulib gl_PERL, which
+sets gl_cv_prog_perl.
+---
+ configure.ac | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c85651c..5941b88 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -68,11 +68,7 @@ gl_INIT
+ AC_DEFINE([GNULIB_NO_VLA], [1], [Define to 1 to disable use of VLAs])
+ 
+ # The test suite needs to know if we have a working perl.
+-# FIXME: this is suboptimal.  Ideally, we would be able to call gl_PERL
+-# with an ACTION-IF-NOT-FOUND argument ...
+-cu_have_perl=yes
+-case $PERL in *"/missing "*) cu_have_perl=no;; esac
+-AM_CONDITIONAL([HAVE_PERL], [test $cu_have_perl = yes])
++AM_CONDITIONAL([HAVE_PERL], [test "$gl_cv_prog_perl" != no])
+ 
+ # gl_GCC_VERSION_IFELSE([major], [minor], [run-if-found], [run-if-not-found])
+ # ------------------------------------------------
+-- 
+2.37.2
+
diff --git a/srcpkgs/grep/patches/0001-tests-port-to-platforms-lacking-Perl.patch b/srcpkgs/grep/patches/0001-tests-port-to-platforms-lacking-Perl.patch
new file mode 100644
index 000000000000..3c5f044547a4
--- /dev/null
+++ b/srcpkgs/grep/patches/0001-tests-port-to-platforms-lacking-Perl.patch
@@ -0,0 +1,100 @@
+From 80bcb074aeed9b508a02940c8036c4ea5a1b9c63 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Sat, 21 May 2022 18:38:26 -0700
+Subject: [PATCH] tests: port to platforms lacking Perl
+
+* tests/init.cfg (require_perl_): New function.
+* tests/big-hole, tests/hash-collision-perf, tests/long-pattern-perf:
+* tests/many-regex-performance, tests/mb-non-UTF8-performance:
+Use it.
+---
+ tests/big-hole                | 1 +
+ tests/hash-collision-perf     | 2 ++
+ tests/init.cfg                | 7 +++++++
+ tests/long-pattern-perf       | 1 +
+ tests/many-regex-performance  | 1 +
+ tests/mb-non-UTF8-performance | 1 +
+ 6 files changed, 13 insertions(+)
+
+diff --git a/tests/big-hole b/tests/big-hole
+index eac077f..2899a3b 100755
+--- a/tests/big-hole
++++ b/tests/big-hole
+@@ -4,6 +4,7 @@
+ . "${srcdir=.}/init.sh"; path_prepend_ ../src
+ 
+ expensive_
++require_perl_
+ 
+ # Skip this test if there is no usable SEEK_HOLE support,
+ # as is the case with linux-3.5.0 on ext4 and tmpfs file systems.
+diff --git a/tests/hash-collision-perf b/tests/hash-collision-perf
+index d701140..7b8d373 100755
+--- a/tests/hash-collision-perf
++++ b/tests/hash-collision-perf
+@@ -21,6 +21,8 @@
+ 
+ fail=0
+ 
++require_perl_
++
+ : > empty || framework_failure_
+ 
+ # Construct a test case that consumes enough CPU time that we don't
+diff --git a/tests/init.cfg b/tests/init.cfg
+index 72cab20..515482c 100644
+--- a/tests/init.cfg
++++ b/tests/init.cfg
+@@ -138,6 +138,13 @@ require_JP_EUC_locale_()
+   skip_ "$locale locale not found"
+ }
+ 
++# Skip the current test if we lack Perl.
++require_perl_()
++{
++  test "$PERL" && $PERL -e 'use warnings' > /dev/null 2>&1 \
++    || skip_ 'configure did not find a usable version of Perl'
++}
++
+ expensive_()
+ {
+   if test "$RUN_EXPENSIVE_TESTS" != yes; then
+diff --git a/tests/long-pattern-perf b/tests/long-pattern-perf
+index 2d5e7c1..4557bbf 100755
+--- a/tests/long-pattern-perf
++++ b/tests/long-pattern-perf
+@@ -24,6 +24,7 @@ fail=0
+ # system load during the two test runs, so we'll mark it as
+ # "expensive", making it less likely to be run by regular users.
+ expensive_
++require_perl_
+ 
+ echo x > in || framework_failure_
+ # Note that we want 10x the byte count (not line count) in the larger file.
+diff --git a/tests/many-regex-performance b/tests/many-regex-performance
+index e16e032..4a5adac 100755
+--- a/tests/many-regex-performance
++++ b/tests/many-regex-performance
+@@ -26,6 +26,7 @@ fail=0
+ # system load during the two test runs, so we'll mark it as
+ # "expensive", making it less likely to be run by regular users.
+ expensive_
++require_perl_
+ 
+ # Make the quick/small input large enough so that even on high-end
+ # systems this first invocation takes at least 10ms of user time.
+diff --git a/tests/mb-non-UTF8-performance b/tests/mb-non-UTF8-performance
+index a6208d8..f3b33af 100755
+--- a/tests/mb-non-UTF8-performance
++++ b/tests/mb-non-UTF8-performance
+@@ -26,6 +26,7 @@ fail=0
+ # system load during the two test runs, so we'll mark it as
+ # "expensive", making it less likely to be run by regular users.
+ expensive_
++require_perl_
+ 
+ # Make the input large enough so that even on high-end systems
+ # the unibyte test takes at least 10ms of user time.
+-- 
+2.37.2
+
diff --git a/srcpkgs/grep/template b/srcpkgs/grep/template
index 7bab5c9c28e6..c3a8cf462ac6 100644
--- a/srcpkgs/grep/template
+++ b/srcpkgs/grep/template
@@ -1,9 +1,12 @@
 # Template file for 'grep'
+#
+# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/chroot-grep"
+#
 pkgname=grep
 version=3.7
 revision=1
 build_style=gnu-configure
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config automake"
 makedepends="pcre-devel"
 checkdepends="perl"
 short_desc="GNU grep utility"
@@ -12,11 +15,3 @@ 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
-}

From a5524fcd798b5c9ce148c8cef46670b9684c5f96 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 19 Aug 2022 13:26:00 -0700
Subject: [PATCH 2/2] chroot-grep: update to 3.7.

---
 srcpkgs/chroot-grep/patches  |  1 +
 srcpkgs/chroot-grep/template | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)
 create mode 120000 srcpkgs/chroot-grep/patches

diff --git a/srcpkgs/chroot-grep/patches b/srcpkgs/chroot-grep/patches
new file mode 120000
index 000000000000..bcb05f606dca
--- /dev/null
+++ b/srcpkgs/chroot-grep/patches
@@ -0,0 +1 @@
+../grep/patches
\ No newline at end of file
diff --git a/srcpkgs/chroot-grep/template b/srcpkgs/chroot-grep/template
index 022b01d20de2..6453b7b33b40 100644
--- a/srcpkgs/chroot-grep/template
+++ b/srcpkgs/chroot-grep/template
@@ -1,17 +1,21 @@
 # Template file for 'chroot-grep'
+#
+# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/grep"
+#
 pkgname=chroot-grep
-version=3.3
+version=3.7
 revision=1
 wrksrc="grep-${version}"
 bootstrap=yes
 build_style=gnu-configure
 configure_args="--disable-perl-regexp --disable-nls ac_cv_path_GREP=grep"
-short_desc="The GNU grep utility - for use with xbps-src"
+hostmakedepends="automake"
+short_desc="GNU grep utility - for use with xbps-src"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/grep/"
 distfiles="${GNU_SITE}/grep/grep-${version}.tar.xz"
-checksum=b960541c499619efd6afe1fa795402e4733c8e11ebf9fafccc0bb4bccdc5b514
+checksum=5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c
 conflicts="grep>=0"
 provides="grep-${version}_${revision}"
 

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PR REVIEW] chroot-grep: update to 3.7.
  2022-08-19 18:44 [PR PATCH] chroot-grep: update to 3.7 oreo639
                   ` (5 preceding siblings ...)
  2022-08-19 20:26 ` oreo639
@ 2022-08-19 22:08 ` paper42
  2022-08-19 22:09 ` oreo639
                   ` (11 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: paper42 @ 2022-08-19 22:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 283 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/38785#discussion_r950583915

Comment:
I don't think we can have automake as a build dependency in bootstrap packages, if it's only needed for fixing tests, just disable them.

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PR REVIEW] chroot-grep: update to 3.7.
  2022-08-19 18:44 [PR PATCH] chroot-grep: update to 3.7 oreo639
                   ` (6 preceding siblings ...)
  2022-08-19 22:08 ` [PR REVIEW] " paper42
@ 2022-08-19 22:09 ` oreo639
  2022-08-19 22:10 ` paper42
                   ` (10 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: oreo639 @ 2022-08-19 22:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 185 bytes --]

New review comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/38785#discussion_r950584187

Comment:
Alright.
Should I remove the patches?

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PR REVIEW] chroot-grep: update to 3.7.
  2022-08-19 18:44 [PR PATCH] chroot-grep: update to 3.7 oreo639
                   ` (7 preceding siblings ...)
  2022-08-19 22:09 ` oreo639
@ 2022-08-19 22:10 ` paper42
  2022-08-19 22:11 ` oreo639
                   ` (9 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: paper42 @ 2022-08-19 22:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 246 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/38785#discussion_r950584509

Comment:
they fix tests in the grep package too, right? I would leave them there and just remove the symlink

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PR REVIEW] chroot-grep: update to 3.7.
  2022-08-19 18:44 [PR PATCH] chroot-grep: update to 3.7 oreo639
                   ` (8 preceding siblings ...)
  2022-08-19 22:10 ` paper42
@ 2022-08-19 22:11 ` oreo639
  2022-08-19 22:13 ` oreo639
                   ` (8 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: oreo639 @ 2022-08-19 22:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 220 bytes --]

New review comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/38785#discussion_r950585029

Comment:
It doesn't affect the grep package since it has perl in the checkdepends.

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PR REVIEW] chroot-grep: update to 3.7.
  2022-08-19 18:44 [PR PATCH] chroot-grep: update to 3.7 oreo639
                   ` (9 preceding siblings ...)
  2022-08-19 22:11 ` oreo639
@ 2022-08-19 22:13 ` oreo639
  2022-08-19 22:17 ` paper42
                   ` (7 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: oreo639 @ 2022-08-19 22:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 299 bytes --]

New review comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/38785#discussion_r950585029

Comment:
It doesn't affect the grep package since it has perl in the checkdepends. (it just fixes an infinite loop when running the tests without perl installed)

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PR REVIEW] chroot-grep: update to 3.7.
  2022-08-19 18:44 [PR PATCH] chroot-grep: update to 3.7 oreo639
                   ` (10 preceding siblings ...)
  2022-08-19 22:13 ` oreo639
@ 2022-08-19 22:17 ` paper42
  2022-08-19 22:22 ` [PR PATCH] [Updated] " oreo639
                   ` (6 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: paper42 @ 2022-08-19 22:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 179 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/38785#discussion_r950586824

Comment:
then yes, I would just drop them

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PR PATCH] [Updated] chroot-grep: update to 3.7.
  2022-08-19 18:44 [PR PATCH] chroot-grep: update to 3.7 oreo639
                   ` (11 preceding siblings ...)
  2022-08-19 22:17 ` paper42
@ 2022-08-19 22:22 ` oreo639
  2022-08-19 22:26 ` [PR REVIEW] " oreo639
                   ` (5 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: oreo639 @ 2022-08-19 22:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1372 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages chgrep
https://github.com/void-linux/void-packages/pull/38785

chroot-grep: update to 3.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

The regular grep package is 3.7, not sure if there is a specific reason to keep this on 3.3, so feel free to let me know.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/38785.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chgrep-38785.patch --]
[-- Type: text/x-diff, Size: 2803 bytes --]

From 786161164290f6a88427c65f21a2abe67232b856 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 19 Aug 2022 15:22:20 -0700
Subject: [PATCH 1/2] grep: fix tests on musl

---
 srcpkgs/grep/template | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/grep/template b/srcpkgs/grep/template
index 7bab5c9c28e6..e35e92bd5ef4 100644
--- a/srcpkgs/grep/template
+++ b/srcpkgs/grep/template
@@ -1,4 +1,7 @@
 # Template file for 'grep'
+#
+# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/chroot-grep"
+#
 pkgname=grep
 version=3.7
 revision=1
@@ -12,11 +15,3 @@ 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
-}

From 63f768f7b0252176b8bb6c97deda51105794e602 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 19 Aug 2022 15:22:39 -0700
Subject: [PATCH 2/2] chroot-grep: update to 3.7.

---
 srcpkgs/chroot-grep/patches  |  1 +
 srcpkgs/chroot-grep/template | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)
 create mode 120000 srcpkgs/chroot-grep/patches

diff --git a/srcpkgs/chroot-grep/patches b/srcpkgs/chroot-grep/patches
new file mode 120000
index 000000000000..bcb05f606dca
--- /dev/null
+++ b/srcpkgs/chroot-grep/patches
@@ -0,0 +1 @@
+../grep/patches
\ No newline at end of file
diff --git a/srcpkgs/chroot-grep/template b/srcpkgs/chroot-grep/template
index 022b01d20de2..7167099959d9 100644
--- a/srcpkgs/chroot-grep/template
+++ b/srcpkgs/chroot-grep/template
@@ -1,19 +1,23 @@
 # Template file for 'chroot-grep'
+#
+# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/grep"
+#
 pkgname=chroot-grep
-version=3.3
+version=3.7
 revision=1
 wrksrc="grep-${version}"
 bootstrap=yes
 build_style=gnu-configure
 configure_args="--disable-perl-regexp --disable-nls ac_cv_path_GREP=grep"
-short_desc="The GNU grep utility - for use with xbps-src"
+short_desc="GNU grep utility - for use with xbps-src"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/grep/"
 distfiles="${GNU_SITE}/grep/grep-${version}.tar.xz"
-checksum=b960541c499619efd6afe1fa795402e4733c8e11ebf9fafccc0bb4bccdc5b514
+checksum=5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c
 conflicts="grep>=0"
 provides="grep-${version}_${revision}"
+make_check=no # Infinate loop in hash-collision-perf without perl
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	export ac_cv_lib_error_at_line=no

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PR REVIEW] chroot-grep: update to 3.7.
  2022-08-19 18:44 [PR PATCH] chroot-grep: update to 3.7 oreo639
                   ` (12 preceding siblings ...)
  2022-08-19 22:22 ` [PR PATCH] [Updated] " oreo639
@ 2022-08-19 22:26 ` oreo639
  2022-08-19 22:30 ` paper42
                   ` (4 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: oreo639 @ 2022-08-19 22:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 154 bytes --]

New review comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/38785#discussion_r950589885

Comment:
Thanks.

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: chroot-grep: update to 3.7.
  2022-08-19 18:44 [PR PATCH] chroot-grep: update to 3.7 oreo639
                   ` (13 preceding siblings ...)
  2022-08-19 22:26 ` [PR REVIEW] " oreo639
@ 2022-08-19 22:30 ` paper42
  2022-08-19 22:35 ` Duncaen
                   ` (3 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: paper42 @ 2022-08-19 22:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 260 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/38785#issuecomment-1221137622

Comment:
split the "grep: fix tests on musl" to a separate PR, it's not related to this chroot-grep update if I am not mistaken

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: chroot-grep: update to 3.7.
  2022-08-19 18:44 [PR PATCH] chroot-grep: update to 3.7 oreo639
                   ` (14 preceding siblings ...)
  2022-08-19 22:30 ` paper42
@ 2022-08-19 22:35 ` Duncaen
  2022-08-20  0:27 ` [PR PATCH] [Updated] " oreo639
                   ` (2 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: Duncaen @ 2022-08-19 22:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 269 bytes --]

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/38785#issuecomment-1221139866

Comment:
Not sure if the comment is necessary, we usually do that if its actually required for some reason like a bootstrapping version.

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PR PATCH] [Updated] chroot-grep: update to 3.7.
  2022-08-19 18:44 [PR PATCH] chroot-grep: update to 3.7 oreo639
                   ` (15 preceding siblings ...)
  2022-08-19 22:35 ` Duncaen
@ 2022-08-20  0:27 ` oreo639
  2022-08-20  0:30 ` oreo639
  2022-08-21 12:47 ` [PR PATCH] [Merged]: " leahneukirchen
  18 siblings, 0 replies; 20+ messages in thread
From: oreo639 @ 2022-08-20  0:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1372 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages chgrep
https://github.com/void-linux/void-packages/pull/38785

chroot-grep: update to 3.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

The regular grep package is 3.7, not sure if there is a specific reason to keep this on 3.3, so feel free to let me know.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/38785.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chgrep-38785.patch --]
[-- Type: text/x-diff, Size: 1711 bytes --]

From 3fcb0a9e88882ce2ec974626db78651407f94e35 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 19 Aug 2022 15:22:39 -0700
Subject: [PATCH] chroot-grep: update to 3.7.

---
 srcpkgs/chroot-grep/patches  | 1 +
 srcpkgs/chroot-grep/template | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)
 create mode 120000 srcpkgs/chroot-grep/patches

diff --git a/srcpkgs/chroot-grep/patches b/srcpkgs/chroot-grep/patches
new file mode 120000
index 000000000000..bcb05f606dca
--- /dev/null
+++ b/srcpkgs/chroot-grep/patches
@@ -0,0 +1 @@
+../grep/patches
\ No newline at end of file
diff --git a/srcpkgs/chroot-grep/template b/srcpkgs/chroot-grep/template
index 022b01d20de2..468249d87ebc 100644
--- a/srcpkgs/chroot-grep/template
+++ b/srcpkgs/chroot-grep/template
@@ -1,19 +1,20 @@
 # Template file for 'chroot-grep'
 pkgname=chroot-grep
-version=3.3
+version=3.7
 revision=1
 wrksrc="grep-${version}"
 bootstrap=yes
 build_style=gnu-configure
 configure_args="--disable-perl-regexp --disable-nls ac_cv_path_GREP=grep"
-short_desc="The GNU grep utility - for use with xbps-src"
+short_desc="GNU grep utility - for use with xbps-src"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/grep/"
 distfiles="${GNU_SITE}/grep/grep-${version}.tar.xz"
-checksum=b960541c499619efd6afe1fa795402e4733c8e11ebf9fafccc0bb4bccdc5b514
+checksum=5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c
 conflicts="grep>=0"
 provides="grep-${version}_${revision}"
+make_check=no # Infinate loop in hash-collision-perf without perl
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	export ac_cv_lib_error_at_line=no

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PR PATCH] [Updated] chroot-grep: update to 3.7.
  2022-08-19 18:44 [PR PATCH] chroot-grep: update to 3.7 oreo639
                   ` (16 preceding siblings ...)
  2022-08-20  0:27 ` [PR PATCH] [Updated] " oreo639
@ 2022-08-20  0:30 ` oreo639
  2022-08-21 12:47 ` [PR PATCH] [Merged]: " leahneukirchen
  18 siblings, 0 replies; 20+ messages in thread
From: oreo639 @ 2022-08-20  0:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1372 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages chgrep
https://github.com/void-linux/void-packages/pull/38785

chroot-grep: update to 3.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

The regular grep package is 3.7, not sure if there is a specific reason to keep this on 3.3, so feel free to let me know.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/38785.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chgrep-38785.patch --]
[-- Type: text/x-diff, Size: 1394 bytes --]

From e99bf9efaeb716603d8189fe2a0827730187460a Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 19 Aug 2022 15:22:39 -0700
Subject: [PATCH] chroot-grep: update to 3.7.

---
 srcpkgs/chroot-grep/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/chroot-grep/template b/srcpkgs/chroot-grep/template
index 022b01d20de2..468249d87ebc 100644
--- a/srcpkgs/chroot-grep/template
+++ b/srcpkgs/chroot-grep/template
@@ -1,19 +1,20 @@
 # Template file for 'chroot-grep'
 pkgname=chroot-grep
-version=3.3
+version=3.7
 revision=1
 wrksrc="grep-${version}"
 bootstrap=yes
 build_style=gnu-configure
 configure_args="--disable-perl-regexp --disable-nls ac_cv_path_GREP=grep"
-short_desc="The GNU grep utility - for use with xbps-src"
+short_desc="GNU grep utility - for use with xbps-src"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/grep/"
 distfiles="${GNU_SITE}/grep/grep-${version}.tar.xz"
-checksum=b960541c499619efd6afe1fa795402e4733c8e11ebf9fafccc0bb4bccdc5b514
+checksum=5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c
 conflicts="grep>=0"
 provides="grep-${version}_${revision}"
+make_check=no # Infinate loop in hash-collision-perf without perl
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	export ac_cv_lib_error_at_line=no

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PR PATCH] [Merged]: chroot-grep: update to 3.7.
  2022-08-19 18:44 [PR PATCH] chroot-grep: update to 3.7 oreo639
                   ` (17 preceding siblings ...)
  2022-08-20  0:30 ` oreo639
@ 2022-08-21 12:47 ` leahneukirchen
  18 siblings, 0 replies; 20+ messages in thread
From: leahneukirchen @ 2022-08-21 12:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1217 bytes --]

There's a merged pull request on the void-packages repository

chroot-grep: update to 3.7.
https://github.com/void-linux/void-packages/pull/38785

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

The regular grep package is 3.7, not sure if there is a specific reason to keep this on 3.3, so feel free to let me know.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 20+ messages in thread

end of thread, other threads:[~2022-08-21 12:47 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-19 18:44 [PR PATCH] chroot-grep: update to 3.7 oreo639
2022-08-19 18:54 ` [PR PATCH] [Updated] " oreo639
2022-08-19 19:48 ` oreo639
2022-08-19 19:50 ` oreo639
2022-08-19 19:57 ` oreo639
2022-08-19 20:01 ` oreo639
2022-08-19 20:26 ` oreo639
2022-08-19 22:08 ` [PR REVIEW] " paper42
2022-08-19 22:09 ` oreo639
2022-08-19 22:10 ` paper42
2022-08-19 22:11 ` oreo639
2022-08-19 22:13 ` oreo639
2022-08-19 22:17 ` paper42
2022-08-19 22:22 ` [PR PATCH] [Updated] " oreo639
2022-08-19 22:26 ` [PR REVIEW] " oreo639
2022-08-19 22:30 ` paper42
2022-08-19 22:35 ` Duncaen
2022-08-20  0:27 ` [PR PATCH] [Updated] " oreo639
2022-08-20  0:30 ` oreo639
2022-08-21 12:47 ` [PR PATCH] [Merged]: " leahneukirchen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).