* [gentoo-commits] repo/gentoo:master commit in: sys-apps/findutils/files/, sys-apps/findutils/
@ 2015-12-25 10:53 Lars Wendler
0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2015-12-25 10:53 UTC (permalink / raw
To: gentoo-commits
commit: f16269fb464df0b8999c017d84f8713a4ecaff93
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 25 10:53:18 2015 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Dec 25 10:53:18 2015 +0000
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 <polynomial-c <AT> 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..0000000
--- 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 <vapier@gentoo.org>
-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 <paolo.pedroni@iol.it>
-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 "${RUN_VERY_EXPENSIVE_TESTS}" ]]; then
- bad="failed to set up the test in ${outdir}"
- fi
- rm -rf "${outdir}" || exit 1
-- if [[ -n "${bad}" ]]; then
-+ if [ -n "${bad}" ]; then
- echo "${bad}" >&2
- exit 1
- fi
---
-2.3.5
-
diff --git a/sys-apps/findutils/findutils-4.5.14-r1.ebuild b/sys-apps/findutils/findutils-4.5.14-r1.ebuild
deleted file mode 100644
index f4f5a44..0000000
--- a/sys-apps/findutils/findutils-4.5.14-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic toolchain-funcs python-any-r1
-
-DESCRIPTION="GNU utilities for finding files"
-HOMEPAGE="https://www.gnu.org/software/findutils/"
-SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug nls selinux static"
-
-RDEPEND="selinux? ( sys-libs/libselinux )
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- test? ( ${PYTHON_DEPS} )
- nls? ( sys-devel/gettext )"
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-test-bashisms.patch #531020
- # Don't build or install locate because it conflicts with slocate,
- # which is a secure version of locate. See bug 18729
- sed -i '/^SUBDIRS/s/locate//' Makefile.in
-
- # Disable gnulib build test that has no impact on the source.
- # Re-enable w/next version bump (and gnulib is updated). #554728
- [[ ${PV} != "4.5.14" ]] && die "re-enable test #554728"
- echo 'exit 0' > tests/test-update-copyright.sh || die
-}
-
-src_configure() {
- use static && append-ldflags -static
-
- program_prefix=$(usex userland_GNU '' g)
- econf \
- --with-packager="Gentoo" \
- --with-packager-version="${PVR}" \
- --with-packager-bug-reports="https://bugs.gentoo.org/" \
- --program-prefix=${program_prefix} \
- $(use_enable debug) \
- $(use_enable nls) \
- $(use_with selinux) \
- --libexecdir='$(libdir)'/find
-}
-
-src_install() {
- default
-
- # We don't need this, so punt it.
- rm "${ED}"/usr/bin/${program_prefix}oldfind \
- "${ED}"/usr/share/man/man1/${program_prefix}oldfind.1 || die
-}
diff --git a/sys-apps/findutils/findutils-4.5.15.ebuild b/sys-apps/findutils/findutils-4.5.15.ebuild
deleted file mode 100644
index 71678a5..0000000
--- a/sys-apps/findutils/findutils-4.5.15.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit eutils flag-o-matic toolchain-funcs python-any-r1
-
-DESCRIPTION="GNU utilities for finding files"
-HOMEPAGE="https://www.gnu.org/software/findutils/"
-SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug nls selinux static test"
-
-RDEPEND="selinux? ( sys-libs/libselinux )
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- test? ( ${PYTHON_DEPS} )
- nls? ( sys-devel/gettext )"
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # Don't build or install locate because it conflicts with slocate,
- # which is a secure version of locate. See bug 18729
- sed -i '/^SUBDIRS/s/locate//' Makefile.in
-
- # Disable gnulib build test that has no impact on the source.
- # Re-enable w/next version bump (and gnulib is updated). #554728
- [[ ${PV} != "4.5.15" ]] && die "re-enable test #554728"
- echo 'exit 0' > tests/test-update-copyright.sh || die
-}
-
-src_configure() {
- use static && append-ldflags -static
-
- program_prefix=$(usex userland_GNU '' g)
- econf \
- --with-packager="Gentoo" \
- --with-packager-version="${PVR}" \
- --with-packager-bug-reports="https://bugs.gentoo.org/" \
- --program-prefix=${program_prefix} \
- $(use_enable debug) \
- $(use_enable nls) \
- $(use_with selinux) \
- --libexecdir='$(libdir)'/find
-}
-
-src_compile() {
- # We don't build locate, but the docs want a file in there.
- emake -C locate dblocation.texi
- default
-}
-
-src_install() {
- default
-
- # We don't need this, so punt it.
- rm "${ED}"/usr/bin/${program_prefix}oldfind \
- "${ED}"/usr/share/man/man1/${program_prefix}oldfind.1 || die
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/findutils/files/, sys-apps/findutils/
@ 2019-01-14 20:40 Mikle Kolyada
0 siblings, 0 replies; 4+ messages in thread
From: Mikle Kolyada @ 2019-01-14 20:40 UTC (permalink / raw
To: gentoo-commits
commit: 9ba2efa16a703d1ec7ddb3a9af80d3945b8be4bf
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 14 20:39:56 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon Jan 14 20:40:46 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ba2efa1
sys-apps/findutils: Drop old
Signed-off-by: Mikle Kolyada <zlogene <AT> 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..00000000000
--- 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.000000000 -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.x32 2009-05-10 14:25:13.000000000 -0700
-+++ findutils-4.4.2/gnulib/lib/mktime.c 2011-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..00000000000
--- 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.000000000 +0000
-+++ findutils-4.4.2/find/Makefile.am 2010-04-25 03:58:33.762402367 +0000
-@@ -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.000000000 +0000
-+++ findutils-4.4.2/find/Makefile.in 2010-04-25 03:58:33.762402367 +0000
-@@ -275,7 +275,7 @@ CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DEFAULT_ARG_SIZE = @DEFAULT_ARG_SIZE@
--DEFS = @DEFS@
-+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX
- DEPDIR = @DEPDIR@
- DIRENT_H = @DIRENT_H@
- ECHO_C = @ECHO_C@
-@@ -607,7 +607,7 @@ libfindtools_a_SOURCES = finddata.c fsty
- @WITH_FTS_TRUE@oldfind_SOURCES = find.c
- @WITH_FTS_FALSE@ftsfind_SOURCES = ftsfind.c
- EXTRA_DIST = defs.h $(man_MANS)
--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
- all: all-recursive
-diff -purN findutils-4.4.2.orig/find/defs.h findutils-4.4.2/find/defs.h
---- findutils-4.4.2.orig/find/defs.h 2009-05-16 15:17:01.000000000 +0000
-+++ findutils-4.4.2/find/defs.h 2010-04-25 03:58:33.762402367 +0000
-@@ -91,6 +91,9 @@ int get_statinfo PARAMS((const char *pat
- #define MODE_RWX (S_IXUSR | S_IXGRP | S_IXOTH | MODE_RW)
- #define MODE_ALL (S_ISUID | S_ISGID | S_ISVTX | MODE_RWX)
-
-+#ifdef WITH_SELINUX
-+#include <selinux/selinux.h>
-+#endif /*WITH_SELINUX*/
-
- struct predicate;
- struct options;
-@@ -315,6 +318,9 @@ struct predicate
- struct samefile_file_id samefileid; /* samefile */
- mode_t type; /* type */
- struct format_val printf_vec; /* printf fprintf fprint ls fls print0 fprint0 print */
-+#ifdef WITH_SELINUX
-+ security_context_t scontext; /* scontext */
-+#endif /*WITH_SELINUX*/
- } args;
-
- /* The next predicate in the user input sequence,
-@@ -459,7 +465,9 @@ PREDICATEFUNCTION pred_used;
- PREDICATEFUNCTION pred_user;
- PREDICATEFUNCTION pred_writable;
- PREDICATEFUNCTION pred_xtype;
--
-+#ifdef WITH_SELINUX
-+PREDICATEFUNCTION pred_scontext;
-+#endif /* WITH_SELINUX */
-
-
- int launch PARAMS((const struct buildcmd_control *ctl,
-@@ -605,10 +613,13 @@ struct options
- */
- unsigned short optimisation_level;
-
--
- /* How should we quote filenames in error messages and so forth?
- */
- enum quoting_style err_quoting_style;
-+
-+#ifdef WITH_SELINUX
-+ int (*x_getfilecon)();
-+#endif /* WITH_SELINUX */
- };
- extern struct options options;
-
-diff -purN findutils-4.4.2.orig/find/find.1 findutils-4.4.2/find/find.1
---- findutils-4.4.2.orig/find/find.1 2009-05-16 15:17:01.000000000 +0000
-+++ findutils-4.4.2/find/find.1 2010-04-25 03:58:33.762402367 +0000
-@@ -934,6 +934,10 @@ checks the type of the file that
- .B \-type
- does not check.
-
-+.IP "\-context \fIscontext\fR"
-+.IP "\--context \fIscontext\fR"
-+(SELinux only) File has the security context \fIscontext\fR.
-+
- .SS ACTIONS
- .IP "\-delete\fR"
- Delete files; true if removal succeeded. If the removal failed, an
-@@ -1354,6 +1358,8 @@ File's type (like in
- U=unknown type (shouldn't happen)
- .IP %Y
- File's type (like %y), plus follow symlinks: L=loop, N=nonexistent
-+.IP %Z
-+(SELinux only) file's security context.
- .PP
- A `%' character followed by any other character is discarded, but the
- other character is printed (don't rely on this, as further format
-diff -purN findutils-4.4.2.orig/find/find.c findutils-4.4.2/find/find.c
---- findutils-4.4.2.orig/find/find.c 2009-05-16 15:17:01.000000000 +0000
-+++ findutils-4.4.2/find/find.c 2010-04-25 03:58:33.764899827 +0000
-@@ -1270,7 +1270,7 @@ process_path (char *pathname, char *name
- static void
- process_dir (char *pathname, char *name, int pathlen, const struct stat *statp, char *parent)
- {
-- int subdirs_left; /* Number of unexamined subdirs in PATHNAME. */
-+ int subdirs_left=0; /* Number of unexamined subdirs in PATHNAME. */
- boolean subdirs_unreliable; /* if true, cannot use dir link count as subdir limif (if false, it may STILL be unreliable) */
- unsigned int idx; /* Which entry are we on? */
- struct stat stat_buf;
-diff -purN findutils-4.4.2.orig/find/parser.c findutils-4.4.2/find/parser.c
---- findutils-4.4.2.orig/find/parser.c 2009-05-16 15:17:01.000000000 +0000
-+++ findutils-4.4.2/find/parser.c 2010-04-25 03:58:33.764899827 +0000
-@@ -53,6 +53,13 @@
- #include <unistd.h>
- #include <sys/stat.h>
-
-+#ifdef WITH_SELINUX
-+#include <selinux/selinux.h>
-+int optionh_getfilecon(const char *name, security_context_t *p);
-+int optionl_getfilecon(const char *name, security_context_t *p);
-+int optionp_getfilecon(const char *name, security_context_t *p);
-+#endif /*WITH_SELINUX*/
-+
- #if ENABLE_NLS
- # include <libintl.h>
- # define _(Text) gettext (Text)
-@@ -155,6 +162,9 @@ static boolean parse_noignore_race PARAM
- static boolean parse_warn PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
- static boolean parse_xtype PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
- static boolean parse_quit PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
-+#ifdef WITH_SELINUX
-+static boolean parse_scontext PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
-+#endif /*WITH_SELINUX*/
-
- boolean parse_print PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
-
-@@ -340,6 +350,8 @@ static struct parser_table const parse_t
- {ARG_TEST, "-help", parse_help, NULL}, /* GNU */
- {ARG_TEST, "version", parse_version, NULL}, /* GNU */
- {ARG_TEST, "-version", parse_version, NULL}, /* GNU */
-+ {ARG_TEST, "context", parse_scontext, pred_scontext}, /* SELinux */
-+ {ARG_TEST, "-context", parse_scontext, pred_scontext}, /* SELinux */
- {0, 0, 0, 0}
- };
- \f
-@@ -451,10 +463,16 @@ set_follow_state(enum SymlinkOption opt)
- case SYMLINK_ALWAYS_DEREF: /* -L */
- options.xstat = optionl_stat;
- options.no_leaf_check = true;
-+#ifdef WITH_SELINUX
-+ options.x_getfilecon = optionl_getfilecon;
-+#endif /* WITH_SELINUX */
- break;
-
- case SYMLINK_NEVER_DEREF: /* -P (default) */
- options.xstat = optionp_stat;
-+#ifdef WITH_SELINUX
-+ options.x_getfilecon = optionp_getfilecon;
-+#endif /* WITH_SELINUX */
- /* Can't turn no_leaf_check off because the user might have specified
- * -noleaf anyway
- */
-@@ -463,6 +481,9 @@ set_follow_state(enum SymlinkOption opt)
- case SYMLINK_DEREF_ARGSONLY: /* -H */
- options.xstat = optionh_stat;
- options.no_leaf_check = true;
-+#ifdef WITH_SELINUX
-+ options.x_getfilecon = optionh_getfilecon;
-+#endif /* WITH_SELINUX */
- }
- }
- options.symlink_handling = opt;
-@@ -670,6 +691,94 @@ collect_arg_stat_info(char **argv, int *
-
- The predicate structure is updated with the new information. */
-
-+#ifdef WITH_SELINUX
-+\f
-+static int
-+fallback_getfilecon(const char *name, security_context_t *p, int prev_rv)
-+{
-+ /* Our original getfilecon() call failed. Perhaps we can't follow a
-+ * symbolic link. If that might be the problem, lgetfilecon() the link.
-+ * Otherwise, admit defeat.
-+ */
-+ switch (errno)
-+ {
-+ case ENOENT:
-+ case ENOTDIR:
-+#ifdef DEBUG_STAT
-+ fprintf(stderr, "fallback_getfilecon(): getfilecon(%s) failed; falling back on lgetfilecon()\n", name);
-+#endif
-+ return lgetfilecon(name, p);
-+
-+ case EACCES:
-+ case EIO:
-+ case ELOOP:
-+ case ENAMETOOLONG:
-+#ifdef EOVERFLOW
-+ case EOVERFLOW: /* EOVERFLOW is not #defined on UNICOS. */
-+#endif
-+ default:
-+ return prev_rv;
-+ }
-+}
-+
-+\f
-+/* optionh_getfilecon() implements the getfilecon operation when the
-+ * -H option is in effect.
-+ *
-+ * If the item to be examined is a command-line argument, we follow
-+ * symbolic links. If the getfilecon() call fails on the command-line
-+ * item, we fall back on the properties of the symbolic link.
-+ *
-+ * If the item to be examined is not a command-line argument, we
-+ * examine the link itself.
-+ */
-+int
-+optionh_getfilecon(const char *name, security_context_t *p)
-+{
-+ if (0 == state.curdepth)
-+ {
-+ /* This file is from the command line; deference the link (if it
-+ * is a link).
-+ */
-+ int rv = getfilecon(name, p);
-+ if (0 == rv)
-+ return 0; /* success */
-+ else
-+ return fallback_getfilecon(name, p, rv);
-+ }
-+ else
-+ {
-+ /* Not a file on the command line; do not derefernce the link.
-+ */
-+ return lgetfilecon(name, p);
-+ }
-+}
-+\f
-+/* optionl_getfilecon() implements the getfilecon operation when the
-+ * -L option is in effect. That option makes us examine the thing the
-+ * symbolic link points to, not the symbolic link itself.
-+ */
-+int
-+optionl_getfilecon(const char *name, security_context_t *p)
-+{
-+ int rv = getfilecon(name, p);
-+ if (0 == rv)
-+ return 0; /* normal case. */
-+ else
-+ return fallback_getfilecon(name, p, rv);
-+}
-+\f
-+/* optionp_getfilecon() implements the stat operation when the -P
-+ * option is in effect (this is also the default). That option makes
-+ * us examine the symbolic link itself, not the thing it points to.
-+ */
-+int
-+optionp_getfilecon(const char *name, security_context_t *p)
-+{
-+ return lgetfilecon(name, p);
-+}
-+#endif /* WITH_SELINUX */
-+
- \f
- static boolean
- parse_and (const struct parser_table* entry, char **argv, int *arg_ptr)
-@@ -1128,6 +1237,10 @@ tests (N can be +N or -N or N): -amin N
- -readable -writable -executable\n\
- -wholename PATTERN -size N[bcwkMG] -true -type [bcdpflsD] -uid N\n\
- -used N -user NAME -xtype [bcdpfls]\n"));
-+#ifdef WITH_SELINUX
-+ puts (_("\
-+ -context CONTEXT\n"));
-+#endif /*WITH_SELINUX*/
- puts (_("\
- actions: -delete -print0 -printf FORMAT -fprintf FILE FORMAT -print \n\
- -fprint0 FILE -fprint FILE -ls -fls FILE -prune -quit\n\
-@@ -2552,6 +2665,29 @@ parse_version (const struct parser_table
- exit (0);
- }
-
-+#ifdef WITH_SELINUX
-+
-+static boolean
-+parse_scontext ( const struct parser_table* entry, char **argv, int *arg_ptr)
-+{
-+ struct predicate *our_pred;
-+
-+ if ( (argv == NULL) || (argv[*arg_ptr] == NULL) )
-+ return( false );
-+
-+ our_pred = insert_primary(entry);
-+ our_pred->need_stat = false;
-+#ifdef DEBUG
-+ our_pred->p_name = find_pred_name (pred_scontext);
-+#endif /*DEBUG*/
-+ our_pred->args.scontext = argv[*arg_ptr];;
-+
-+ (*arg_ptr)++;
-+ return( true );
-+}
-+
-+#endif /*WITH_SELINUX*/
-+
- static boolean
- parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr)
- {
-@@ -2803,7 +2939,11 @@ insert_fprintf (struct format_val *vec,
- if (*scan2 == '.')
- for (scan2++; ISDIGIT (*scan2); scan2++)
- /* Do nothing. */ ;
-+#ifdef WITH_SELINUX
-+ if (strchr ("abcdDfFgGhHiklmMnpPsStuUyYZ", *scan2))
-+#else
- if (strchr ("abcdDfFgGhHiklmMnpPsStuUyY", *scan2))
-+#endif
- {
- segmentp = make_segment (segmentp, format, scan2 - format,
- KIND_FORMAT, *scan2, 0,
-diff -purN findutils-4.4.2.orig/find/pred.c findutils-4.4.2/find/pred.c
---- findutils-4.4.2.orig/find/pred.c 2009-05-16 15:17:01.000000000 +0000
-+++ findutils-4.4.2/find/pred.c 2010-04-25 03:58:33.764899827 +0000
-@@ -48,6 +48,14 @@
- #include "error.h"
- #include "verify.h"
-
-+#ifdef WITH_SELINUX
-+#include <selinux/selinux.h>
-+#endif /*WITH_SELINUX*/
-+
-+#ifndef FNM_CASEFOLD
-+#define FNM_CASEFOLD (1<<4)
-+#endif /*FNM_CASEFOLD*/
-+
- #if ENABLE_NLS
- # include <libintl.h>
- # define _(Text) gettext (Text)
-@@ -230,6 +238,9 @@ struct pred_assoc pred_table[] =
- {pred_user, "user "},
- {pred_writable, "writable "},
- {pred_xtype, "xtype "},
-+#ifdef WITH_SELINUX
-+ {pred_scontext, "context"},
-+#endif /*WITH_SELINUX*/
- {0, "none "}
- };
- #endif
-@@ -1054,6 +1065,26 @@ do_fprintf(struct format_val *dest,
- mode_to_filetype(stat_buf->st_mode & S_IFMT));
- }
- break;
-+#ifdef WITH_SELINUX
-+ case 'Z': /* SELinux security context */
-+ {
-+ security_context_t scontext;
-+ int rv;
-+ rv = (*options.x_getfilecon)(state.rel_pathname, &scontext);
-+
-+ if ( rv < 0 ) {
-+ fprintf(stderr, "getfileconf(%s): %s",
-+ pathname, strerror(errno));
-+ fflush(stderr);
-+ }
-+ else {
-+ segment->text[segment->text_len] = 's';
-+ checked_fprintf (dest, segment->text, scontext);
-+ freecon(scontext);
-+ }
-+ }
-+ break ;
-+#endif /* WITH_SELINUX */
- }
- /* end of KIND_FORMAT case */
- break;
-@@ -1844,6 +1875,31 @@ pred_xtype (const char *pathname, struct
- */
- return (pred_type (pathname, &sbuf, pred_ptr));
- }
-+
-+
-+#ifdef WITH_SELINUX
-+
-+boolean
-+pred_scontext (const char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)
-+{
-+ int rv;
-+ security_context_t scontext;
-+
-+ rv = (* options.x_getfilecon)(state.rel_pathname, &scontext);
-+
-+ if ( rv < 0 ) {
-+ (void) fprintf(stderr, "getfilecon(%s): %s\n", pathname, strerror(errno));
-+ (void) fflush(stderr);
-+ return ( false );
-+ }
-+
-+ rv = (fnmatch(pred_ptr->args.scontext, scontext,0)==0);
-+ freecon(scontext);
-+ return rv;
-+}
-+
-+#endif /*WITH_SELINUX*/
-+
- \f
- /* 1) fork to get a child; parent remembers the child pid
- 2) child execs the command requested
-diff -purN findutils-4.4.2.orig/find/tree.c findutils-4.4.2/find/tree.c
---- findutils-4.4.2.orig/find/tree.c 2009-05-16 15:17:01.000000000 +0000
-+++ findutils-4.4.2/find/tree.c 2010-04-25 03:58:33.764899827 +0000
-@@ -1195,6 +1195,10 @@ build_expression_tree(int argc, char *ar
- const struct parser_table *entry_close, *entry_print, *entry_open;
- int i, oldi;
-
-+#ifdef WITH_SELINUX
-+ int is_selinux_enabled_flag = is_selinux_enabled()>0;
-+#endif /* WITH_SELINUX */
-+
- predicates = NULL;
-
- /* Find where in ARGV the predicates begin by skipping the list of
-@@ -1230,6 +1234,16 @@ build_expression_tree(int argc, char *ar
- }
-
- predicate_name = argv[i];
-+
-+#ifdef WITH_SELINUX
-+ if (! is_selinux_enabled_flag) {
-+ if ((strncmp(predicate_name,"-context",strlen("-context"))==0) ||
-+ (strncmp(predicate_name,"--context",strlen("--context"))==0)) {
-+ error (1, 0,_("Error: invalid predicate %s: the kernel is not selinux-enabled.\n"),predicate_name);
-+ }
-+ }
-+#endif
-+
- parse_entry = find_parser (predicate_name);
- if (parse_entry == NULL)
- {
-@@ -1434,6 +1448,9 @@ get_new_pred (const struct parser_table
- last_pred->need_stat = true;
- last_pred->need_type = true;
- last_pred->args.str = NULL;
-+#ifdef WITH_SELINUX
-+ last_pred->args.scontext = NULL;
-+#endif
- last_pred->pred_next = NULL;
- last_pred->pred_left = NULL;
- last_pred->pred_right = NULL;
diff --git a/sys-apps/findutils/findutils-4.4.2-r2.ebuild b/sys-apps/findutils/findutils-4.4.2-r2.ebuild
deleted file mode 100644
index 3208b910b59..00000000000
--- a/sys-apps/findutils/findutils-4.4.2-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-SELINUX_PATCH="findutils-4.4.2-selinux.diff"
-
-DESCRIPTION="GNU utilities for finding files"
-HOMEPAGE="https://www.gnu.org/software/findutils/"
-SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz
- mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug nls selinux static"
-
-RDEPEND="selinux? ( sys-libs/libselinux )
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gnulib-date-x32.patch
-
- # Don't build or install locate because it conflicts with slocate,
- # which is a secure version of locate. See bug 18729
- sed -i '/^SUBDIRS/s/locate//' Makefile.in
-
- use selinux && epatch "${FILESDIR}/${SELINUX_PATCH}"
-}
-
-src_configure() {
- use static && append-ldflags -static
-
- program_prefix=$(usex userland_GNU '' g)
- econf \
- --program-prefix=${program_prefix} \
- $(use_enable debug) \
- $(use_enable nls) \
- --libexecdir='$(libdir)'/find
-}
-
-src_compile() {
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
-
- # We don't need this, so punt it.
- rm "${ED}"/usr/bin/${program_prefix}oldfind || die
-}
diff --git a/sys-apps/findutils/findutils-4.5.18.ebuild b/sys-apps/findutils/findutils-4.5.18.ebuild
deleted file mode 100644
index 355715d5cb1..00000000000
--- a/sys-apps/findutils/findutils-4.5.18.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils flag-o-matic toolchain-funcs python-any-r1
-
-DESCRIPTION="GNU utilities for finding files"
-HOMEPAGE="https://www.gnu.org/software/findutils/"
-SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug nls selinux static test"
-
-RDEPEND="selinux? ( sys-libs/libselinux )
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- test? ( ${PYTHON_DEPS} )
- nls? ( sys-devel/gettext )"
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # Don't build or install locate because it conflicts with slocate,
- # which is a secure version of locate. See bug 18729
- sed -i '/^SUBDIRS/s/locate//' Makefile.in
-}
-
-src_configure() {
- use static && append-ldflags -static
-
- program_prefix=$(usex userland_GNU '' g)
- econf \
- --with-packager="Gentoo" \
- --with-packager-version="${PVR}" \
- --with-packager-bug-reports="https://bugs.gentoo.org/" \
- --program-prefix=${program_prefix} \
- $(use_enable debug) \
- $(use_enable nls) \
- $(use_with selinux) \
- --libexecdir='$(libdir)'/find
-}
-
-src_compile() {
- # We don't build locate, but the docs want a file in there.
- emake -C locate dblocation.texi
- default
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/findutils/files/, sys-apps/findutils/
@ 2020-04-21 7:44 Lars Wendler
0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2020-04-21 7:44 UTC (permalink / raw
To: gentoo-commits
commit: ffc0af0c067a98a26d530cb87a001fcf75d43c2c
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 21 07:38:41 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Apr 21 07:38:41 2020 +0000
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 <polynomial-c <AT> 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..00000000000
--- 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 <http://www.gnu.org/licenses/>. */
-+ along with this program. If not, see <https://www.gnu.org/licenses/>. */
-
- /* 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 <errno.h> /* 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 <http://www.dragonflybsd.org/cvsweb/src/lib/libc/stdio/priv_stdio.h?rev=HEAD&content-type=text/x-cvsweb-markup>. */
-+ /* See <https://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/lib/libc/stdio/priv_stdio.h>. */
- # 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 <http://www.dragonflybsd.org/cvsweb/src/include/stdio.h?rev=HEAD&content-type=text/x-cvsweb-markup>. */
-+ /* See <https://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/include/stdio.h>. */
- # 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
-+ <https://android.googlesource.com/platform/bionic.git/+/f0141dfab10a4b332769d52fa76631a64741297a>
-+ the innards of FILE were public, and fp_ub could be defined like for OpenBSD,
-+ see <https://android.googlesource.com/platform/bionic.git/+/e78392637d5086384a5631ddfdfa8d7ec8326ee3/libc/stdio/fileext.h>
-+ and <https://android.googlesource.com/platform/bionic.git/+/e78392637d5086384a5631ddfdfa8d7ec8326ee3/libc/stdio/local.h>.
-+ After this commit, the innards of FILE are hidden. */
-+# define fp_ ((struct { unsigned char *_p; \
-+ int _r; \
-+ int _w; \
-+ int _flags; \
-+ int _file; \
-+ struct { unsigned char *_base; size_t _size; } _bf; \
-+ int _lbfsize; \
-+ void *_cookie; \
-+ void *_close; \
-+ void *_read; \
-+ void *_seek; \
-+ void *_write; \
-+ struct { unsigned char *_base; size_t _size; } _ext; \
-+ unsigned char *_up; \
-+ int _ur; \
-+ unsigned char _ubuf[3]; \
-+ unsigned char _nbuf[1]; \
-+ struct { unsigned char *_base; size_t _size; } _lb; \
-+ int _blksize; \
-+ fpos_t _offset; \
-+ /* More fields, not relevant here. */ \
-+ } *) fp)
- # else
- # define fp_ fp
- # endif
-
--# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __ANDROID__ /* NetBSD >= 1.5ZA, OpenBSD, Android */
-+# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __minix /* NetBSD >= 1.5ZA, OpenBSD, Minix 3 */
- /* See <http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup>
-- and <http://www.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup> */
-+ and <https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup>
-+ and <https://github.com/Stichting-MINIX-Research-Foundation/minix/blob/master/lib/libc/stdio/fileext.h> */
- struct __sfileext
- {
- struct __sbuf _ub; /* ungetc buffer */
- /* More fields, not relevant here. */
- };
- # define fp_ub ((struct __sfileext *) fp->_ext._base)->_ub
--# else /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin, Android */
-+# elif defined __ANDROID__ /* Android */
-+ struct __sfileext
-+ {
-+ struct { unsigned char *_base; size_t _size; } _ub; /* ungetc buffer */
-+ /* More fields, not relevant here. */
-+ };
-+# define fp_ub ((struct __sfileext *) fp_->_ext._base)->_ub
-+# else /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin */
- # define fp_ub fp_->_ub
- # endif
-
- # define HASUB(fp) (fp_ub._base != NULL)
-
-+# if defined __ANDROID__ /* Android */
-+ /* Needed after this commit from 2016-01-25
-+ <https://android.googlesource.com/platform/bionic.git/+/e70e0e9267d069bf56a5078c99307e08a7280de7> */
-+# ifndef __SEOF
-+# define __SLBF 1
-+# define __SNBF 2
-+# define __SRD 4
-+# define __SWR 8
-+# define __SRW 0x10
-+# define __SEOF 0x20
-+# define __SERR 0x40
-+# endif
-+# ifndef __SOFF
-+# define __SOFF 0x1000
-+# endif
-+# endif
-+
- #endif
-
-
-@@ -81,7 +141,7 @@
- #ifdef __TANDEM /* NonStop Kernel */
- # ifndef _IOERR
- /* These values were determined by the program 'stdioext-flags' at
-- <http://lists.gnu.org/archive/html/bug-gnulib/2010-12/msg00165.html>. */
-+ <https://lists.gnu.org/r/bug-gnulib/2010-12/msg00165.html>. */
- # define _IOERR 0x40
- # define _IOREAD 0x80
- # define _IOWRT 0x4
-@@ -99,6 +159,8 @@
- int _file; \
- unsigned int _flag; \
- } *) fp)
-+# elif defined __VMS /* OpenVMS */
-+# define fp_ ((struct _iobuf *) fp)
- # else
- # define fp_ fp
- # endif
-@@ -110,4 +172,31 @@
- # define _flag __flag
- # endif
-
-+#elif defined _WIN32 && ! defined __CYGWIN__ /* newer Windows with MSVC */
-+
-+/* <stdio.h> does not define the innards of FILE any more. */
-+# define WINDOWS_OPAQUE_FILE
-+
-+struct _gl_real_FILE
-+{
-+ /* Note: Compared to older Windows and to mingw, it has the fields
-+ _base and _cnt swapped. */
-+ unsigned char *_ptr;
-+ unsigned char *_base;
-+ int _cnt;
-+ int _flag;
-+ int _file;
-+ int _charbuf;
-+ int _bufsiz;
-+};
-+# define fp_ ((struct _gl_real_FILE *) fp)
-+
-+/* These values were determined by a program similar to the one at
-+ <https://lists.gnu.org/r/bug-gnulib/2010-12/msg00165.html>. */
-+# define _IOREAD 0x1
-+# define _IOWRT 0x2
-+# define _IORW 0x4
-+# define _IOEOF 0x8
-+# define _IOERR 0x10
-+
- #endif
---- a/old/fseeko.c
-+++ b/gl/lib/fseeko.c
-@@ -1,5 +1,5 @@
- /* An fseeko() function that, together with fflush(), is POSIX compliant.
-- Copyright (C) 2007-2015 Free Software Foundation, Inc.
-+ Copyright (C) 2007-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,7 +12,7 @@
- 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 <http://www.gnu.org/licenses/>. */
-+ with this program; if not, see <https://www.gnu.org/licenses/>. */
-
- #include <config.h>
-
-@@ -33,9 +33,9 @@ fseeko (FILE *fp, off_t offset, int whence)
- #endif
- #if _GL_WINDOWS_64_BIT_OFF_T
- # undef fseeko
--# if HAVE__FSEEKI64 /* msvc, mingw64 */
-+# if HAVE__FSEEKI64 && HAVE_DECL__FSEEKI64 /* msvc, mingw since msvcrt8.0, mingw64 */
- # define fseeko _fseeki64
--# else /* mingw */
-+# else /* mingw before msvcrt8.0 */
- # define fseeko fseeko64
- # endif
- #endif
-@@ -47,12 +47,13 @@ fseeko (FILE *fp, off_t offset, int whence)
- #endif
-
- /* These tests are based on fpurge.c. */
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
-+ /* GNU libc, BeOS, Haiku, Linux libc5 */
- if (fp->_IO_read_end == fp->_IO_read_ptr
- && fp->_IO_write_ptr == fp->_IO_write_base
- && fp->_IO_save_base == NULL)
- #elif 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 __SL64 && defined __SCLE /* Cygwin */
- if ((fp->_flags & __SL64) == 0)
- {
-@@ -80,7 +81,7 @@ fseeko (FILE *fp, off_t offset, int whence)
- #elif defined __minix /* Minix */
- if (fp_->_ptr == fp_->_buf
- && (fp_->_ptr == NULL || fp_->_count == 0))
--#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
-+#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */
- if (fp_->_ptr == fp_->_base
- && (fp_->_ptr == NULL || fp_->_cnt == 0))
- #elif defined __UCLIBC__ /* uClibc */
-@@ -117,18 +118,19 @@ fseeko (FILE *fp, off_t offset, int whence)
- if (pos == -1)
- {
- #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 */
- fp_->_flags &= ~__SOFF;
- #endif
- return -1;
- }
-
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
-+ /* GNU libc, BeOS, Haiku, Linux libc5 */
- fp->_flags &= ~_IO_EOF_SEEN;
- fp->_offset = pos;
- #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
-- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
--# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000)
-+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
-+# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000) || defined __minix
- /* fp_->_offset is typed as an integer. */
- fp_->_offset = pos;
- # else
-@@ -150,8 +152,8 @@ fseeko (FILE *fp, off_t offset, int whence)
- fp_->_flags &= ~__SEOF;
- #elif defined __EMX__ /* emx+gcc */
- fp->_flags &= ~_IOEOF;
--#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
-- fp->_flag &= ~_IOEOF;
-+#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */
-+ fp_->_flag &= ~_IOEOF;
- #elif defined __MINT__ /* Atari FreeMiNT */
- fp->__offset = pos;
- fp->__eof = 0;
---- a/old/freadahead.c
-+++ b/gl/lib/freadahead.c
-@@ -1,5 +1,5 @@
- /* Retrieve information about a FILE stream.
-- Copyright (C) 2007-2015 Free Software Foundation, Inc.
-+ Copyright (C) 2007-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,7 +12,7 @@
- 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 <http://www.gnu.org/licenses/>. */
-+ along with this program. If not, see <https://www.gnu.org/licenses/>. */
-
- #include <config.h>
-
-@@ -22,17 +22,26 @@
- #include <stdlib.h>
- #include "stdio-impl.h"
-
-+#if defined __DragonFly__
-+/* Defined in libc, but not declared in <stdio.h>. */
-+extern size_t __sreadahead (FILE *);
-+#endif
-+
-+/* This file is not used on systems that have the __freadahead function,
-+ namely musl libc. */
-+
- size_t
- freadahead (FILE *fp)
- {
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
-+ /* GNU libc, BeOS, Haiku, Linux libc5 */
- if (fp->_IO_write_ptr > fp->_IO_write_base)
- return 0;
- return (fp->_IO_read_end - fp->_IO_read_ptr)
- + (fp->_flags & _IO_IN_BACKUP ? fp->_IO_save_end - fp->_IO_save_base :
- 0);
- #elif 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 ((fp_->_flags & __SWR) != 0 || fp_->_r < 0)
- return 0;
- # if defined __DragonFly__
-@@ -53,7 +62,7 @@ freadahead (FILE *fp)
- if ((fp_->_flags & _IOWRITING) != 0)
- return 0;
- return fp_->_count;
--#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
-+#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */
- if ((fp_->_flag & _IOWRT) != 0)
- return 0;
- return fp_->_cnt;
diff --git a/sys-apps/findutils/files/findutils-4.6.0-gnulib-S_MAGIC_NFS.patch b/sys-apps/findutils/files/findutils-4.6.0-gnulib-S_MAGIC_NFS.patch
deleted file mode 100644
index 8d47800eeb5..00000000000
--- a/sys-apps/findutils/files/findutils-4.6.0-gnulib-S_MAGIC_NFS.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 85717b68b03bf85016c5079fbbf0c8aa2b182ba6 Mon Sep 17 00:00:00 2001
-From: Pádraig Brady <P@draigBrady.com>
-Date: Mon, 18 Jan 2016 17:29:28 +0000
-Subject: fts: don't unconditionally use leaf optimization for NFS
-
-NFS st_nlink are not accurate on all implementations,
-leading to aborts() if that assumption is made.
-See <https://bugzilla.redhat.com/1299169>
-* lib/fts.c (leaf_optimization_applies): Remove NFS from
-the white list, and document the issue.
----
-(limited to 'lib/fts.c')
-
-diff --git a/lib/fts.c b/lib/fts.c
-index 7e9aca6..2c9df2f 100644
---- a/gl/lib/fts.c
-+++ b/gl/lib/fts.c
-@@ -718,22 +718,23 @@ leaf_optimization_applies (int dir_fd)
-
- switch (fs_buf.f_type)
- {
-- case S_MAGIC_NFS:
-- /* NFS provides usable dirent.d_type but not necessarily for all entries
-- of large directories. See <https://bugzilla.redhat.com/1252549>. */
-- return true;
--
- /* List here the file system types that lack usable dirent.d_type
- info, yet for which the optimization does apply. */
- case S_MAGIC_REISERFS:
- case S_MAGIC_XFS:
- return true;
-
-+ /* Explicitly list here any other file system type for which the
-+ optimization is not applicable, but need documentation. */
-+ case S_MAGIC_NFS:
-+ /* NFS provides usable dirent.d_type but not necessarily for all entries
-+ of large directories, so as per <https://bugzilla.redhat.com/1252549>
-+ NFS should return true. However st_nlink values are not accurate on
-+ all implementations as per <https://bugzilla.redhat.com/1299169>. */
-+ /* fall through */
- case S_MAGIC_PROC:
-- /* Explicitly listing this or any other file system type for which
-- the optimization is not applicable is not necessary, but we leave
-- it here to document the risk. Per http://bugs.debian.org/143111,
-- /proc may have bogus stat.st_nlink values. */
-+ /* Per <http://bugs.debian.org/143111> /proc may have
-+ bogus stat.st_nlink values. */
- /* fall through */
- default:
- return false;
---
-cgit v0.9.0.2
diff --git a/sys-apps/findutils/files/findutils-4.6.0-gnulib-mb.patch b/sys-apps/findutils/files/findutils-4.6.0-gnulib-mb.patch
deleted file mode 100644
index 925d7cf4422..00000000000
--- a/sys-apps/findutils/files/findutils-4.6.0-gnulib-mb.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://bugs.gentoo.org/576818
-
-From 1f63650823cebf52044df840c81062ccb52163a2 Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@gnu.org>
-Date: Mon, 28 Dec 2015 06:27:42 +0900
-Subject: [PATCH] maint: fix operator precedence in mbrtowc test
-
-This is a fix for test breakage introduced by commit 45228d96; the
-equality expression must be parenthesized when negated with '!',
-otherwise we always get:
-
- test-mbrtowc.c:49: assertion 'ret == (size_t)(-2)' failed
-
-* m4/mbrtowc.m4 (gl_MBRTOWC_EMPTY_INPUT): Negate the entire expression.
-* m4/mbrlen.m4 (gl_MBRLEN_EMPTY_INPUT): Likewise.
----
- m4/mbrlen.m4 | 2 +-
- m4/mbrtowc.m4 | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/configure
-+++ b/configure
-@@ -569,7 +569,7 @@ changequote([,])dnl
- int
- main (void)
- {
-- return ! mbrtowc (&wc, "", 0, &mbs) == (size_t) -2;
-+ return mbrtowc (&wc, "", 0, &mbs) != (size_t) -2;
- }
- _ACEOF
- if ac_fn_c_try_run "$LINENO"; then :
---
-2.6.2
-
diff --git a/sys-apps/findutils/findutils-4.6.0-r1.ebuild b/sys-apps/findutils/findutils-4.6.0-r1.ebuild
deleted file mode 100644
index 61cd4f0efab..00000000000
--- a/sys-apps/findutils/findutils-4.6.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit eutils flag-o-matic toolchain-funcs python-any-r1
-
-DESCRIPTION="GNU utilities for finding files"
-HOMEPAGE="https://www.gnu.org/software/findutils/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls selinux static test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="selinux? ( sys-libs/libselinux )
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- test? ( ${PYTHON_DEPS} )
- nls? ( sys-devel/gettext )"
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # Don't build or install locate because it conflicts with slocate,
- # which is a secure version of locate. See bug 18729
- sed -i '/^SUBDIRS/s/locate//' Makefile.in
-
- # Newer C libraries omit this include from sys/types.h.
- # https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00018.html
- sed -i \
- '/include.*config.h/a#ifdef MAJOR_IN_SYSMACROS\n#include <sys/sysmacros.h>\n#endif\n' \
- gl/lib/mountlist.c || die
-
- epatch "${FILESDIR}"/${P}-gnulib-mb.patch #576818
- epatch "${FILESDIR}"/${P}-gnulib-S_MAGIC_NFS.patch #580032
- epatch "${FILESDIR}"/${P}-glibc228.patch #663242
- epatch_user
-}
-
-src_configure() {
- use static && append-ldflags -static
-
- program_prefix=$(usex userland_GNU '' g)
- econf \
- --with-packager="Gentoo" \
- --with-packager-version="${PVR}" \
- --with-packager-bug-reports="https://bugs.gentoo.org/" \
- --program-prefix=${program_prefix} \
- $(use_enable nls) \
- $(use_with selinux) \
- --libexecdir='$(libdir)'/find
-}
-
-src_compile() {
- # We don't build locate, but the docs want a file in there.
- emake -C locate dblocation.texi
- default
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/findutils/files/, sys-apps/findutils/
@ 2023-10-23 8:05 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-10-23 8:05 UTC (permalink / raw
To: gentoo-commits
commit: b5aadcfe0518d3c2d1516ab577929d597583aded
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 23 08:03:20 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 23 08:03:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5aadcfe
sys-apps/findutils: fix tests w/ non-bash
Signed-off-by: Sam James <sam <AT> 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 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
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-10-23 8:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-23 8:05 [gentoo-commits] repo/gentoo:master commit in: sys-apps/findutils/files/, sys-apps/findutils/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2020-04-21 7:44 Lars Wendler
2019-01-14 20:40 Mikle Kolyada
2015-12-25 10:53 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox