[gentoo-commits] repo/gentoo:master commit in: sys-apps/findutils/files/, sys-apps/findutils/

2023-10-23 Thread Sam James 
commit: b5aadcfe0518d3c2d1516ab577929d597583aded
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct 23 08:03:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 23 08:03:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5aadcfe

sys-apps/findutils: fix tests w/ non-bash

Signed-off-by: Sam James  gentoo.org>

 .../files/findutils-4.9.0-dash-tests.patch | 41 ++
 sys-apps/findutils/findutils-4.9.0-r2.ebuild   |  6 +++-
 2 files changed, 46 insertions(+), 1 deletion(-)

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 ..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 
+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
 }

[gentoo-commits] repo/gentoo:master commit in: sys-apps/findutils/files/, sys-apps/findutils/

2020-04-21 Thread Lars Wendler 
commit: ffc0af0c067a98a26d530cb87a001fcf75d43c2c
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Apr 21 07:38:41 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Apr 21 07:38:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffc0af0c

sys-apps/findutils: Removed old

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Lars Wendler  gentoo.org>

 sys-apps/findutils/Manifest|   1 -
 .../findutils/files/findutils-4.6.0-glibc228.patch | 335 -
 .../files/findutils-4.6.0-gnulib-S_MAGIC_NFS.patch |  52 
 .../files/findutils-4.6.0-gnulib-mb.patch  |  34 ---
 sys-apps/findutils/findutils-4.6.0-r1.ebuild   |  65 
 5 files changed, 487 deletions(-)

diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index 429ddc77474..61aa8b5fa95 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,2 +1 @@
-DIST findutils-4.6.0.tar.gz 3780154 BLAKE2B 
cae93c4e6bac93fa374ffba18ada95b783335fa7f9f9491cdd1848cd9bb6781a98e7b0ae3677c88bb3052afca2e90e066e072ee0f67c407cb7b087b49831d799
 SHA512 
41fcd4197c1efbd77f7420e5754e2cf9332dfef19f90c65a8fa1844bb4bc5d529c8393ee0ff979a054e9ac65ff71d7fe3921ea079f9960843412fc9a71f8afd4
 DIST findutils-4.7.0.tar.xz 1895048 BLAKE2B 
5d9f1f2f6bc47415057f9139af3d28abae7be9f812a15bce6016a4478eb3206f35c9329f281fda892f614d017f4f5615003ad60b6a74996ebfad81b1f4b54bf0
 SHA512 
650a24507f8f4ebff83ad28dd27daa4785b4038dcaadc4fe00823b976e848527074cce3f9ec34065b7f037436d2aa6e9ec099bc05d7472c29864ac2c69de7f2e

diff --git a/sys-apps/findutils/files/findutils-4.6.0-glibc228.patch 
b/sys-apps/findutils/files/findutils-4.6.0-glibc228.patch
deleted file mode 100644
index 651c2d26532..000
--- a/sys-apps/findutils/files/findutils-4.6.0-glibc228.patch
+++ /dev/null
@@ -1,335 +0,0 @@
-Fix build failure on glibc-2.28:
-fseeko.c: In function 'rpl_fseeko':
-fseeko.c:110:4: error: #error "Please port gnulib fseeko.c to your 
platform! Look at the code in fseeko.c, then report this to bug-gnulib."
-   #error "Please port gnulib fseeko.c to your platform! Look at the code 
in fseeko.c, then report this to bug-gnulib."
-
-Patch by milan hodoscek.
-
-https://bugs.gentoo.org/663242
 a/old/stdio-impl.h
-+++ b/gl/lib/stdio-impl.h
-@@ -1,5 +1,5 @@
- /* Implementation details of FILE streams.
--   Copyright (C) 2007-2008, 2010-2015 Free Software Foundation, Inc.
-+   Copyright (C) 2007-2008, 2010-2018 Free Software Foundation, Inc.
- 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-@@ -12,12 +12,18 @@
-GNU General Public License for more details.
- 
-You should have received a copy of the GNU General Public License
--   along with this program.  If not, see .  */
-+   along with this program.  If not, see .  */
- 
- /* Many stdio implementations have the same logic and therefore can share
-the same implementation of stdio extension API, except that some fields
-have different naming conventions, or their access requires some casts.  */
- 
-+/* Glibc 2.28 made _IO_IN_BACKUP private.  For now, work around this
-+   problem by defining it ourselves.  FIXME: Do not rely on glibc
-+   internals.  */
-+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
-+# define _IO_IN_BACKUP 0x100
-+#endif
- 
- /* BSD stdio derived implementations.  */
- 
-@@ -29,10 +35,10 @@
- #include  /* For detecting Plan9.  */
- 
- #if defined __sferror || defined __DragonFly__ || defined __ANDROID__
--  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
-+  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android 
*/
- 
- # if defined __DragonFly__  /* DragonFly */
--  /* See 
.
  */
-+  /* See 
.
  */
- #  define fp_ ((struct { struct __FILE_public pub; \
-  struct { unsigned char *_base; int _size; } _bf; \
-  void *cookie; \
-@@ -49,30 +55,84 @@
-  fpos_t _offset; \
-  /* More fields, not relevant here.  */ \
-} *) fp)
--  /* See 
.
  */
-+  /* See 
.
  */
- #  define _p pub._p
- #  define _flags pub._flags
- #  define _r pub._r
- #  define _w pub._w
-+# elif defined __ANDROID__ /* Android */
-+  /* Up to this commit from 2015-10-12
-+ 

-+ the innards of

[gentoo-commits] repo/gentoo:master commit in: sys-apps/findutils/files/, sys-apps/findutils/

2019-01-14 Thread Mikle Kolyada 
commit: 9ba2efa16a703d1ec7ddb3a9af80d3945b8be4bf
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Jan 14 20:39:56 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Jan 14 20:40:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ba2efa1

sys-apps/findutils: Drop old

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 sys-apps/findutils/Manifest|   2 -
 .../files/findutils-4.4.2-gnulib-date-x32.patch|  26 --
 .../findutils/files/findutils-4.4.2-selinux.diff   | 464 -
 sys-apps/findutils/findutils-4.4.2-r2.ebuild   |  55 ---
 sys-apps/findutils/findutils-4.5.18.ebuild |  54 ---
 5 files changed, 601 deletions(-)

diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index b758d6d8a67..5643ce25844 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,3 +1 @@
-DIST findutils-4.4.2.tar.gz 2149838 BLAKE2B 
be061487c8b50bbb8aa1e085dc46f9b71dcc465c884417531d56bda6dcf35746ec9c25f940ec660d83431787b88a3cb6931382326fdc3ab82575f236e9543163
 SHA512 
262d0a8301158e6541b9f24e4e043d8d8c1b196b18dbe59c3bedcf17b50c95708e33ab23a07e3bfb947ad495faafffdca3c296fb525794ca60f2dfd682f228c1
-DIST findutils-4.5.18.tar.gz 3870196 BLAKE2B 
766c072aed143313460facf8179ff3645f441e8f1253a5e7b59d67e20207a060c074f17f0a839e60027810fed739839ffe066ff40e2e07fb23c6f20d326ec8d8
 SHA512 
2ae70cef9aee81d4402298db11890efa0ec38dba561dfc11afc9c91af7c1c6a7cca221f669c45b00e65eba53a8b08f5124ed4e862d9e26bcf69c48a927e6b398
 DIST findutils-4.6.0.tar.gz 3780154 BLAKE2B 
cae93c4e6bac93fa374ffba18ada95b783335fa7f9f9491cdd1848cd9bb6781a98e7b0ae3677c88bb3052afca2e90e066e072ee0f67c407cb7b087b49831d799
 SHA512 
41fcd4197c1efbd77f7420e5754e2cf9332dfef19f90c65a8fa1844bb4bc5d529c8393ee0ff979a054e9ac65ff71d7fe3921ea079f9960843412fc9a71f8afd4

diff --git a/sys-apps/findutils/files/findutils-4.4.2-gnulib-date-x32.patch 
b/sys-apps/findutils/files/findutils-4.4.2-gnulib-date-x32.patch
deleted file mode 100644
index 9ff86f6b84a..000
--- a/sys-apps/findutils/files/findutils-4.4.2-gnulib-date-x32.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-newer gnulib has rewritten these checks in a way that works for the x32,
-and for the targets we care about, these checks won't return false.  so
-just drop them to make our life simpler.
-
-https://sites.google.com/site/x32abi/x32-patches
-
 findutils-4.4.2/gnulib/lib/getdate.c.x32   2009-05-10 14:23:57.0 
-0700
-+++ findutils-4.4.2/gnulib/lib/getdate.c   2011-12-05 11:41:18.130675712 
-0800
-@@ -114,7 +114,6 @@
-wraps around, but there's no portable way to check for that at
-compile-time.  */
- verify (TYPE_IS_INTEGER (time_t));
--verify (LONG_MIN <= TYPE_MINIMUM (time_t) && TYPE_MAXIMUM (time_t) <= 
LONG_MAX);
- 
- /* An integer value, and the number of digits in its textual
-representation.  */
 findutils-4.4.2/gnulib/lib/mktime.c.x322009-05-10 14:25:13.0 
-0700
-+++ findutils-4.4.2/gnulib/lib/mktime.c2011-12-05 11:49:38.368589386 
-0800
-@@ -166,7 +166,5 @@ ydhms_diff (long int year1, long int yda
- {
-   verify (C99_integer_division, -1 / 2 == 0);
--  verify (long_int_year_and_yday_are_wide_enough,
--INT_MAX <= LONG_MAX / 2 || TIME_T_MAX <= UINT_MAX);
- 
-   /* Compute intervening leap days correctly even if year is negative.
-  Take care to avoid integer overflow here.  */

diff --git a/sys-apps/findutils/files/findutils-4.4.2-selinux.diff 
b/sys-apps/findutils/files/findutils-4.4.2-selinux.diff
deleted file mode 100644
index 66c9c412a0a..000
--- a/sys-apps/findutils/files/findutils-4.4.2-selinux.diff
+++ /dev/null
@@ -1,464 +0,0 @@
-diff -purN findutils-4.4.2.orig/find/Makefile.am 
findutils-4.4.2/find/Makefile.am
 findutils-4.4.2.orig/find/Makefile.am  2009-05-16 15:17:01.0 
+
-+++ findutils-4.4.2/find/Makefile.am   2010-04-25 03:58:33.762402367 +
-@@ -2,6 +2,7 @@ AUTOMAKE_OPTIONS = std-options
- localedir = $(datadir)/locale
- # noinst_PROGRAMS = regexprops
- # regexprops_SOURCES = regexprops.c
-+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX
- 
- noinst_LIBRARIES = libfindtools.a
- libfindtools_a_SOURCES = finddata.c fstype.c parser.c pred.c tree.c util.c
-@@ -26,7 +27,7 @@ endif
- 
- EXTRA_DIST = defs.h $(man_MANS)
- INCLUDES = -I../gnulib/lib -I$(top_srcdir)/lib -I$(top_srcdir)/gnulib/lib 
-I../intl -DLOCALEDIR=\"$(localedir)\"
--LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a 
@INTLLIBS@ @LIB_CLOCK_GETTIME@ @FINDLIBS@
-+LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a 
@INTLLIBS@ @LIB_CLOCK_GETTIME@ @FINDLIBS@ -lselinux
- man_MANS = find.1
- SUBDIRS = . testsuite
- 
-diff -purN findutils-4.4.2.orig/find/Makefile.in 
findutils-4.4.2/find/Makefile.in
 findutils-4.4.2.orig/find/Makefile.in  2009-05-16 15:28:13.0 
+
-+++ findutils-4.4.2/find/Makefile.in   2010-04-25

[gentoo-commits] repo/gentoo:master commit in: sys-apps/findutils/files/, sys-apps/findutils/

2015-12-25 Thread Lars Wendler 
commit: f16269fb464df0b8999c017d84f8713a4ecaff93
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Dec 25 10:53:18 2015 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Dec 25 10:53:18 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f16269fb

sys-apps/findutils: Removed old.

Package-Manager: portage-2.2.26
Signed-off-by: Lars Wendler  gentoo.org>

 sys-apps/findutils/Manifest|  2 -
 .../files/findutils-4.5.14-test-bashisms.patch | 66 -
 sys-apps/findutils/findutils-4.5.14-r1.ebuild  | 63 
 sys-apps/findutils/findutils-4.5.15.ebuild | 68 --
 4 files changed, 199 deletions(-)

diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index f0c8cb4..06df4af 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,5 +1,3 @@
 DIST findutils-4.4.2.tar.gz 2149838 SHA256 
434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a SHA512 
262d0a8301158e6541b9f24e4e043d8d8c1b196b18dbe59c3bedcf17b50c95708e33ab23a07e3bfb947ad495faafffdca3c296fb525794ca60f2dfd682f228c1
 WHIRLPOOL 
2af1467403ece2f290be6b9f69db013d386427ab553efcf750ce36bf608fab0d37708209c22bf61b8a82f41aa13bf25a247c62f78dc95446290b7a4bd35d3393
-DIST findutils-4.5.14.tar.gz 3536727 SHA256 
0de3cf625a5c9f154eee3171e072515ffdde405244dd00502af617ac57b73ae2 SHA512 
e26f0d58c316202d99d7dcc1c4d4d40591150dcf198dff2dab0f8ef5e4dc039a5ff42ef536bfc08d860f39ee4bd8215591b4cb460ff45f73007040fc5f99e66b
 WHIRLPOOL 
116b725ffb76562a3f1e9bbfa475a791b873746a7ae362eea1a97f3b701c6e32508eafb10fe47a3ad8f56ef0e67fb04a5d98a7baf5371646945718e7aff5ad60
-DIST findutils-4.5.15.tar.gz 3815470 SHA256 
bc843179f32cba7bec8192edc91b4ad0d0bf434e61b82c04d9d2c8115617d9fb SHA512 
425e14ce956fcfe83412d49b63f9487cda2ce935b6f707c4fe7d4334449d1db47369bad8358979b2782ac749047bf6396e49fb92bef114518a1d6c133417e186
 WHIRLPOOL 
f6a3761dc2c50faca0a7684731ed543676382ac4c23ed48804d70c243b53ddd34ba41c0e96fbb20a079d3e51b4a1f1773707d8b1ed7c4e44b4685544b1ae7470
 DIST findutils-4.5.16.tar.gz 3869606 SHA256 
d116b48cf2a90a457726f58e24842bfa6078447d0c53be0fd1593f2555f7caae SHA512 
d03100ea0708448ac714e86b6bc8ae4d9667f46df1cf0d29e1cfad6f52656254a47a2dd7ef88aaa68f94f399e848cd9d0977e25eda3781cfcd20819dc9fa76d6
 WHIRLPOOL 
d42c7028eccdb38229aa725fade1a6aa2b2a57a65f317ccff83cf3da5594463f7810c17cc10fa5ced89a4213780133a57fd61948dc5d03b300a57f927e103eb2
 DIST findutils-4.5.17.tar.gz 3871981 SHA256 
a41f171f0e05b6960ae1081dc21fb87f58bf939395d6559e297b59a493136a4f SHA512 
a3f9a522e721e1d5c4d1b2839dcf85e829c531cb3eb63ec99765b0d5367c7a64b51ec4150e93be3fca5c620eebd3ca7a3bd7eee868663068658ee23b003bdd7a
 WHIRLPOOL 
da22ebab27435c32718d082a9991548745d13468558562590609e57478f586e7789a49e88138e9f23833189a4dc3d79fbbeaba8b3481f1cf812f1dd8a9db93b8

diff --git a/sys-apps/findutils/files/findutils-4.5.14-test-bashisms.patch 
b/sys-apps/findutils/files/findutils-4.5.14-test-bashisms.patch
deleted file mode 100644
index 0bfe701..000
--- a/sys-apps/findutils/files/findutils-4.5.14-test-bashisms.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 284afcb4a01996bb1a56f87da1e7c541fd0a903c Mon Sep 17 00:00:00 2001
-From: Mike Frysinger 
-Date: Sat, 4 Apr 2015 18:34:51 -0400
-Subject: [PATCH] test: fix bashisms
-
-These test scripts use #!/bin/sh, but then try to use bash-specific
-[[...]] tests.  Change them to [...] instead.
-
-Reported-by: Paolo Pedroni 
-URL: https://bugs.gentoo.org/531020
-
-* find/testsuite/binary_locations.sh: Change [[...]] to [...].
-* find/testsuite/sv-34079.sh: Likewise.

- find/testsuite/binary_locations.sh | 6 +++---
- find/testsuite/sv-34079.sh | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/find/testsuite/binary_locations.sh 
b/find/testsuite/binary_locations.sh
-index 96943a0..238d57f 100644
 a/find/testsuite/binary_locations.sh
-+++ b/find/testsuite/binary_locations.sh
-@@ -1,15 +1,15 @@
- # Source this file, don't execute it.
- 
--if [[ -z "${testname}" ]]; then
-+if [ -z "${testname}" ]; then
- echo 'Please set $testname before sourcing binary_locations.sh.' >&2
- exit 1
- fi
- 
- parent="$(cd .. && pwd)"
--if [[ -f "${parent}/ftsfind" ]]; then
-+if [ -f "${parent}/ftsfind" ]; then
- ftsfind="${parent}/ftsfind"
- oldfind="${parent}/find"
--elif [[ -f "${parent}/oldfind" ]]; then
-+elif [ -f "${parent}/oldfind" ]; then
- ftsfind="${parent}/find"
- oldfind="${parent}/oldfind"
- else
-diff --git a/find/testsuite/sv-34079.sh b/find/testsuite/sv-34079.sh
-index 5773a3f..928a9af 100755
 a/find/testsuite/sv-34079.sh
-+++ b/find/testsuite/sv-34079.sh
-@@ -41,7 +41,7 @@ make_test_data() {
- }
- 
- 
--if [[ -n "${RUN_VERY_EXPENSIVE_TESTS}" ]]; then
-+if [ -n "${RUN_VERY_EXPENSIVE_TESTS}" ]; then
- if outdir=$(mktemp -d); then
-   # Create some test files.
-   bad=""
-@@ -64,7 +64,7 @@ if [[ -n