commit: 7de3146d6424cbefdb08ba395a2ed24dc9a67f0a Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Tue Jan 10 19:25:03 2023 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Tue Jan 10 19:25:03 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7de3146d
sys-devel/automake: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/29046 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: David Seifert <soap <AT> gentoo.org> .../files/automake-1.13-dyn-ithreads.patch | 59 ---------------- .../automake-1.13-hash-order-workaround.patch | 14 ---- ....14-install-sh-avoid-low-risk-race-in-tmp.patch | 77 -------------------- ....15-install-sh-avoid-low-risk-race-in-tmp.patch | 82 ---------------------- 4 files changed, 232 deletions(-) diff --git a/sys-devel/automake/files/automake-1.13-dyn-ithreads.patch b/sys-devel/automake/files/automake-1.13-dyn-ithreads.patch deleted file mode 100644 index f790e7724c93..000000000000 --- a/sys-devel/automake/files/automake-1.13-dyn-ithreads.patch +++ /dev/null @@ -1,59 +0,0 @@ -https://bugs.gentoo.org/343439 - -From 182626687f2640609f8eb28ad1b04b078342f2c7 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <[email protected]> -Date: Sat, 12 Jan 2013 00:19:40 -0500 -Subject: [PATCH] ithreads: use runtime (not configure time) detection of perl - threads - -I can't imagine the runtime checks being a big runtime penalty, so there -shouldn't be a need to do the checks at configure check and hardcode the -result in the generated automake. - -With the current system, it means if you change your perl config (build -perl w/threads, build automake, build perl w/out threads), or deploy a -compiled automake package on a different system (build had threads, but -deployed system does not), you get errors when trying to run automake. - -So take the logic from configure.ac and move it to the one place where -PERL_THREADS is used (lib/Automake/Config.in) and do the version/config -checking at runtime. - -* bootstrap.sh (PERL_THREADS): Delete assignment and use in sed. -* configure.ac (am_cv_prog_PERL_ithreads, PERL_THREADS): Delete all code -related to these two variables. -* lib/Automake/Config.in (perl_threads): Initialize to 0, and only set to -1 if the perl version is at least 5.007_002, and useithreads is in Config. - -Copyright-paperwork-exempt: yes -Signed-off-by: Mike Frysinger <[email protected]> -Signed-off-by: Stefano Lattarini <[email protected]> ---- - bootstrap.sh | 2 -- - configure.ac | 26 -------------------------- - lib/Automake/Config.in | 9 ++++++++- - 3 files changed, 8 insertions(+), 29 deletions(-) - -diff --git a/lib/Automake/Config.in b/lib/Automake/Config.in -index fe6ef9d..885e74e 100644 ---- a/lib/Automake/Config.in -+++ b/lib/Automake/Config.in -@@ -33,7 +33,14 @@ our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@'; - our $VERSION = '@VERSION@'; - our $RELEASE_YEAR = '@RELEASE_YEAR@'; - our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@'; --our $perl_threads = @PERL_THREADS@; -+ -+our $perl_threads = 0; -+# We need at least this version for CLONE support. -+if (eval { require 5.007_002; }) -+ { -+ use Config; -+ $perl_threads = $Config{useithreads}; -+ } - - 1; - --- -1.8.0.2 - diff --git a/sys-devel/automake/files/automake-1.13-hash-order-workaround.patch b/sys-devel/automake/files/automake-1.13-hash-order-workaround.patch deleted file mode 100644 index 79b81e6fa407..000000000000 --- a/sys-devel/automake/files/automake-1.13-hash-order-workaround.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/t/primary-prefix-invalid-couples.tap -+++ b/t/primary-prefix-invalid-couples.tap -@@ -186,8 +186,10 @@ grep -v 'dir.* not a legitimate directory' stderr && exit 1 - # Check that the same failures are present without the '--add-missing' - # option. - mv stderr stderr.old -+cat stderr.old | sort > a - AUTOMAKE_fails -d "automake error out on mismatched prefix/primary couples" -+cat stderr | sort > b - command_ok_ "... and with the same diagnostic of 'automake -a'" \ -- diff stderr.old stderr -+ diff a b - - : diff --git a/sys-devel/automake/files/automake-1.14-install-sh-avoid-low-risk-race-in-tmp.patch b/sys-devel/automake/files/automake-1.14-install-sh-avoid-low-risk-race-in-tmp.patch deleted file mode 100644 index 679370686aaf..000000000000 --- a/sys-devel/automake/files/automake-1.14-install-sh-avoid-low-risk-race-in-tmp.patch +++ /dev/null @@ -1,77 +0,0 @@ -From: Pavel Raiskup <[email protected]> -Date: Sat, 15 Aug 2015 04:40:57 -0400 -Subject: install-sh: avoid (low risk) race in /tmp - -Ensure that nobody can cross privilege boundaries by pre-creating -symlink on '$tmpdir' path. - -Just testing 'mkdir -p' by creating '/tmp/ins$RANDOM-$$/d' is not -safe because '/tmp' directory is usually world-writeable and -'/tmp/ins$RANDOM-$$' content could be pretty easily guessed by -attacker (at least for shells where $RANDOM is not supported). -So, as the first step, create the '/tmp/ins$RANDOM-$$' without -p. -This step would fail early if somebody wanted catch us. - -Note that systems that implement (and have enabled) -fs.protected_symlinks kernel feature are not affected even without -this commit. - -References: -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=760455 -https://bugzilla.redhat.com/show_bug.cgi?id=1140725 - -* lib/install-sh: Implement safer 'mkdir -p' test by running -'$mkdirprog $mkdir_mode "$tmpdir"' first. -(scriptversion): Bump. - ---- a/lib/install-sh -+++ b/lib/install-sh -@@ -345,34 +345,41 @@ do - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) -+ # $RANDOM is not portable (e.g. dash); use it when possible to -+ # lower collision chance - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ -- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 -+ trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 - -+ # As "mkdir -p" follows symlinks and we work in /tmp possibly; so -+ # create the $tmpdir first (and fail if unsuccessful) to make sure -+ # that nobody tries to guess the $tmpdir name. - if (umask $mkdir_umask && -- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 -+ $mkdirprog $mkdir_mode "$tmpdir" && -+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. -- ls_ld_tmpdir=`ls -ld "$tmpdir"` -+ test_tmpdir="$tmpdir/a" -+ ls_ld_tmpdir=`ls -ld "$test_tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && -- $mkdirprog -m$different_mode -p -- "$tmpdir" && { -- ls_ld_tmpdir_1=`ls -ld "$tmpdir"` -+ $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { -+ ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi -- rmdir "$tmpdir/d" "$tmpdir" -+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. -- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null -+ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null - fi - trap '' 0;; - esac;; diff --git a/sys-devel/automake/files/automake-1.15-install-sh-avoid-low-risk-race-in-tmp.patch b/sys-devel/automake/files/automake-1.15-install-sh-avoid-low-risk-race-in-tmp.patch deleted file mode 100644 index 1fabdd5fb3e1..000000000000 --- a/sys-devel/automake/files/automake-1.15-install-sh-avoid-low-risk-race-in-tmp.patch +++ /dev/null @@ -1,82 +0,0 @@ -From: Pavel Raiskup <[email protected]> -Date: Sat, 15 Aug 2015 04:40:57 -0400 -Subject: install-sh: avoid (low risk) race in /tmp - -Ensure that nobody can cross privilege boundaries by pre-creating -symlink on '$tmpdir' path. - -Just testing 'mkdir -p' by creating '/tmp/ins$RANDOM-$$/d' is not -safe because '/tmp' directory is usually world-writeable and -'/tmp/ins$RANDOM-$$' content could be pretty easily guessed by -attacker (at least for shells where $RANDOM is not supported). -So, as the first step, create the '/tmp/ins$RANDOM-$$' without -p. -This step would fail early if somebody wanted catch us. - -Note that systems that implement (and have enabled) -fs.protected_symlinks kernel feature are not affected even without -this commit. - -References: -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=760455 -https://bugzilla.redhat.com/show_bug.cgi?id=1140725 - -* lib/install-sh: Implement safer 'mkdir -p' test by running -'$mkdirprog $mkdir_mode "$tmpdir"' first. -(scriptversion): Bump. ---- - lib/install-sh | 23 +++++++++++++++-------- - 1 file changed, 15 insertions(+), 8 deletions(-) - -diff --git a/lib/install-sh b/lib/install-sh -index 0b0fdcb..59990a1 100755 ---- a/lib/install-sh -+++ b/lib/install-sh -@@ -324,34 +324,41 @@ do - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) -+ # $RANDOM is not portable (e.g. dash); use it when possible to -+ # lower collision chance - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ -- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 -+ trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 - -+ # As "mkdir -p" follows symlinks and we work in /tmp possibly; so -+ # create the $tmpdir first (and fail if unsuccessful) to make sure -+ # that nobody tries to guess the $tmpdir name. - if (umask $mkdir_umask && -- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 -+ $mkdirprog $mkdir_mode "$tmpdir" && -+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. -- ls_ld_tmpdir=`ls -ld "$tmpdir"` -+ test_tmpdir="$tmpdir/a" -+ ls_ld_tmpdir=`ls -ld "$test_tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && -- $mkdirprog -m$different_mode -p -- "$tmpdir" && { -- ls_ld_tmpdir_1=`ls -ld "$tmpdir"` -+ $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { -+ ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi -- rmdir "$tmpdir/d" "$tmpdir" -+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. -- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null -+ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null - fi - trap '' 0;; - esac;;
