gentoo auto-resync : 23:10:2023 - 14:39:50

4 files changed, 48 insertions, 2 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 98458a4a13f8..4f1e17886b6f 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index 6b0ecfa08afa..bd4d33cf4e38 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,4 +1,5 @@
+AUX findutils-4.9.0-dash-tests.patch 1196 BLAKE2B 36b35d9632e240882363de795b8b0fef236cdc95eda4d182f4bef2c166d0bd4897c5ec65ae62232cf1ff1ae99c5f8da3a00e570a1d61164f4f17d9146c974718 SHA512 9e3ecc4edeb4998849dbf1d5e053925809a7d4749ea4f19eb17a1794c98d7cb0b568151174083dbe278cbaf06cc13fcc13801b168a0e1f7812ebc54c6382e258
 DIST findutils-4.9.0.tar.xz 2046252 BLAKE2B 3ada8903fc552ad2e580a7b631a4b9d941935b3f4231029564c6f2b7b10ba6f2244e2de57f6d79268c5e0481a193f64edbbae637e7a51ae6f495e3eefabf52c9 SHA512 ba4844f4403de0148ad14b46a3dbefd5a721f6257c864bf41a6789b11705408524751c627420b15a52af95564d8e5b52f0978474f640a62ab86a41d20cf14be9
 DIST findutils-4.9.0.tar.xz.sig 488 BLAKE2B 7aab47ccb1351f08be03e781332b79d6778ff0d5d7959adf75fa8eab11325ee9971c89972338edfb58daac7f702891a1a5dd8379a703ccfa601e6b99db588197 SHA512 b8e0b5471242912a20b9e468fa27b7f27339af5f7be8918173105262dee0152183bf4cf516844d348b206a694e028490d5d3b190f3aed8c698ba5444941f8dfc
-EBUILD findutils-4.9.0-r2.ebuild 2355 BLAKE2B b4589925401b25b3217431a9aa293da3a2dde3cd0bb183c8507ef78d7ec8d9f8400fee7cbe989c8b11bb933018892cdf698b36bb3841670f92a672e18d3b9316 SHA512 65c45808f5096bac5477027b78961871efcadda0c51fc7a25b079124e39bc90b2796b7b8bb2844c7e425c7dfcabe3419a945f44e8469142bac70bf3f3afa75b7
+EBUILD findutils-4.9.0-r2.ebuild 2406 BLAKE2B 15994ff41ae5b5c0ff34de992b1ded2d58b72c33402daac630f8a764d66d8428331e21f5289740be997ea6bbddca509016d0c6fc40d090b78436401f46a3b958 SHA512 6065e2a6337375ac2fade16dc91765c65e4bcbb4ecb0e9e5b21c730fbea325bf9230841f9a2972a4e00f29593281edfddf78c0ec5f2a6d3fa492ac093eb96fde
 MISC metadata.xml 383 BLAKE2B 19523d687c23d0f2e1edc4f9f9f183642d34717f29e0ddb0215c3fecabc4af9eb36443451044dd41e0b379c5b69d11ea60332f777c4ebc17dd8569483b88e3b2 SHA512 355aca11f02d0770f684a423dad09a107b28f4d4bcfdbede4b5dd80523803fe6f0d03dea23569c1d728a51c7545ee3ac041068492038ace55093d738f81d04d1
diff --git a/sys-apps/findutils/files/findutils-4.9.0-dash-tests.patch b/sys-apps/findutils/files/findutils-4.9.0-dash-tests.patch
new file mode 100644
index 000000000000..5bbc632e7710
--- /dev/null
+++ b/sys-apps/findutils/files/findutils-4.9.0-dash-tests.patch
@@ -0,0 +1,41 @@
+https://git.savannah.gnu.org/cgit/findutils.git/commit/?id=a5b2e20d8
+
+From a5b2e20d8f93e96817e00af6dd0a4c914580e8a2 Mon Sep 17 00:00:00 2001
+From: Bernhard Voelker <mail@bernhard-voelker.de>
+Date: Tue, 23 May 2023 01:57:47 +0200
+Subject: tests: fix FP in xargs test when /bin/sh is dash
+
+Dash as /bin/sh apparently does not know $'\n' syntax.
+
+* tests/xargs/verbose-quote.sh: Define NL variable for newline character;
+change from $'\n' syntax to the above variable when generating input
+for xargs.
+
+Fixes https://sv.gnu.org/bugs/?63934
+---
+ tests/xargs/verbose-quote.sh | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/tests/xargs/verbose-quote.sh b/tests/xargs/verbose-quote.sh
+index d25f7db..e3607ce 100755
+--- a/tests/xargs/verbose-quote.sh
++++ b/tests/xargs/verbose-quote.sh
+@@ -28,12 +28,15 @@ printf "%s\n" \
+   || framework_failure_
+ 
+ # Run xargs with -t for verious commands which require quoting.
++# (Use NL because dash as /bin/sh does not know $'\n' syntax.)
++nl='
++'
+ printf '%s\0' \
+   000 \
+   '10 0' \
+   '20"0' \
+   "30'0" \
+-  40$'\n'0 \
++  "40${nl}0" \
+   | xargs -0t '-I{}' './my command' 'hel lo' '{}' world > out 2> err \
+   || fail=1
+ 
+-- 
+cgit v1.1
diff --git a/sys-apps/findutils/findutils-4.9.0-r2.ebuild b/sys-apps/findutils/findutils-4.9.0-r2.ebuild
index 8bf357fa6a0e..39f3f9cd3dbf 100644
--- a/sys-apps/findutils/findutils-4.9.0-r2.ebuild
+++ b/sys-apps/findutils/findutils-4.9.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/findutils.asc
 inherit flag-o-matic python-any-r1 verify-sig
 
@@ -32,6 +32,10 @@ BDEPEND="
 	verify-sig? ( sec-keys/openpgp-keys-findutils )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-dash-tests.patch
+)
+
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }