public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/automake/files/
@ 2017-02-04 21:22 David Seifert
  0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2017-02-04 21:22 UTC (permalink / raw
  To: gentoo-commits

commit:     bd75d46ed98623712e23b29491a3fa64b6c4a1cf
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Feb  3 15:22:30 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb  4 21:20:44 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd75d46e

sys-devel/automake: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/3791

 .../automake/files/automake-1.10.1-tests.patch     | 111 ---------------------
 .../automake/files/automake-1.10.2-bash4.patch     |  22 ----
 2 files changed, 133 deletions(-)

diff --git a/sys-devel/automake/files/automake-1.10.1-tests.patch b/sys-devel/automake/files/automake-1.10.1-tests.patch
deleted file mode 100644
index 02e7194..00000000
--- a/sys-devel/automake/files/automake-1.10.1-tests.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-commit eed743342cfa0ff8cc69666243233229e7417f8f
-Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
-Date:   Wed Jan 30 21:23:16 2008 +0100
-
-    Split instsh2.test, so that only the new part requires non-root.
-    
-    * tests/instsh2.test: Split off testing of `install-sh -C' ...
-    * tests/instsh3.test: ... to this new test, requiring non-root.
-    * tests/Makefile.am: Adjust.
-    * THANKS: Update.
-    Report by Theodoros V. Kalamatianos.
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index ec10801..8405c7a 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -293,6 +293,7 @@ install2.test \
- installdir.test \
- instsh.test \
- instsh2.test \
-+instsh3.test \
- instdat.test \
- instdat2.test \
- instexec.test \
-diff --git a/tests/Makefile.in b/tests/Makefile.in
-index 6ba81ab..1bcb573 100644
---- a/tests/Makefile.in
-+++ b/tests/Makefile.in
-@@ -442,6 +442,7 @@ install2.test \
- installdir.test \
- instsh.test \
- instsh2.test \
-+instsh3.test \
- instdat.test \
- instdat2.test \
- instexec.test \
-diff --git a/tests/instsh2.test b/tests/instsh2.test
-index 17b61ab..f0b729e 100755
---- a/tests/instsh2.test
-+++ b/tests/instsh2.test
-@@ -1,5 +1,5 @@
- #! /bin/sh
--# Copyright (C) 2002, 2004, 2006  Free Software Foundation, Inc.
-+# Copyright (C) 2002, 2004, 2006, 2008  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
-@@ -77,20 +77,6 @@ test -f d3/y
- ./install-sh -T x d3 && exit 1
- ./install-sh -T x d4// && exit 1
- 
--# Do not change the timestamps when using -C.
--echo foo >file
--./install-sh -C file d1
--TZ=UTC0 touch -t $old_timestamp d1/file
--./install-sh -C file d1
--is_newest file d1/file
--echo foo1 >file
--./install-sh -C file d1
--diff file d1/file
--# Rights must be updated.
--./install-sh -C -m 444 file d1
--test -r d1/file
--test ! -w d1/file
--
- # Ensure that install-sh works with names that include spaces
- touch 'a  b'
- mkdir 'x  y'
-diff --git a/tests/instsh3.test b/tests/instsh3.test
-new file mode 100755
-index 0000000..95b74c7
---- /dev/null
-+++ b/tests/instsh3.test
-@@ -0,0 +1,37 @@
-+#! /bin/sh
-+# Copyright (C) 2006, 2008  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
-+# the Free Software Foundation; either version 3, or (at your option)
-+# any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# 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/>.
-+
-+# More install-sh checks: check -C.
-+
-+required=non-root
-+. ./defs || exit 1
-+set -e
-+
-+./install-sh -d d1
-+
-+# Do not change the timestamps when using -C.
-+echo foo >file
-+./install-sh -C file d1
-+TZ=UTC0 touch -t $old_timestamp d1/file
-+./install-sh -C file d1
-+is_newest file d1/file
-+echo foo1 >file
-+./install-sh -C file d1
-+diff file d1/file
-+# Rights must be updated.
-+./install-sh -C -m 444 file d1
-+test -r d1/file
-+test ! -w d1/file

diff --git a/sys-devel/automake/files/automake-1.10.2-bash4.patch b/sys-devel/automake/files/automake-1.10.2-bash4.patch
deleted file mode 100644
index 01829ce..00000000
--- a/sys-devel/automake/files/automake-1.10.2-bash4.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-An upstream patch to fix ksh test issues, which also affect bash 4.0
-
-http://bugs.gentoo.org/263068
-http://git.savannah.gnu.org/cgit/automake.git/commit/?h=branch-1-10&id=319305db77dfdcbba3d5a1703c781750affdb20a
-
-2008-12-21 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
-
- Testsuite fix for ksh.
- * tests/check10.test: Add ':' as last command in subshell, for
- zero exit status of the subshell.
- Missing backport from master reported by Tim Rice.
-
---- a/tests/check10.test
-+++ b/tests/check10.test
-@@ -72,6 +72,7 @@
-   env TESTS="xpass xpass2" $MAKE -e check
-   env TESTS='pass skip xfail' $MAKE -e check
-   $MAKE check
-+  :
- ) >stdout
- cat stdout
- 


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

* [gentoo-commits] repo/gentoo:master commit in: sys-devel/automake/files/
@ 2018-01-08 14:02 Lars Wendler
  0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2018-01-08 14:02 UTC (permalink / raw
  To: gentoo-commits

commit:     ef1e731e2c28f8548f3e66aec20a1cada5518c91
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Jan  6 08:54:28 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jan  8 14:02:44 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef1e731e

sys-devel/automake: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/6769

 .../automake/files/automake-1.15-mdate-tz.patch    | 53 ----------------------
 1 file changed, 53 deletions(-)

diff --git a/sys-devel/automake/files/automake-1.15-mdate-tz.patch b/sys-devel/automake/files/automake-1.15-mdate-tz.patch
deleted file mode 100644
index e00f2bf329d..00000000000
--- a/sys-devel/automake/files/automake-1.15-mdate-tz.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://bugs.gentoo.org/520818
-https://bugs.gentoo.org/574492
-https://lists.gnu.org/archive/html/bug-automake/2014-10/msg00003.html
-https://lists.gnu.org/archive/html/bug-automake/2014-10/msg00004.html
-
-https://debbugs.gnu.org/20314
-https://bugs.debian.org/782345
-https://lists.gnu.org/archive/html/automake-patches/2015-04/msg00000.html
-
-From: Reiner Herrmann <reiner@reiner-h.de>
-Date: Sat, 18 Jul 2015 14:10:35 -0400
-Subject: Make output of mdate-sh deterministic
-
-mdate-sh pretty-prints the modification time of a file.
-But it's output can vary depending on the timezone of
-the caller. Someone in timezone GMT-12 will get a different
-result (day) than someone in timezone GMT+12.
-
-As this output is also used to create/update stamp files,
-which influence the further build process, the build result
-can vary.
-To enable reproducible builds and to have a more deterministic
-build behavior, this change fixes the timezone to UTC.
-
-Signed-off-by: Reiner Herrmann <reiner at reiner-h.de>
----
- lib/mdate-sh | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/lib/mdate-sh b/lib/mdate-sh
-index e8dfaca..9e2c0c9 100755
---- a/lib/mdate-sh
-+++ b/lib/mdate-sh
-@@ -1,7 +1,7 @@
- #!/bin/sh
- # Get modification time of a file or directory and pretty-print it.
- 
--scriptversion=2010-08-21.06; # UTC
-+scriptversion=2015-04-09.19; # UTC
- 
- # Copyright (C) 1995-2014 Free Software Foundation, Inc.
- # written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995
-@@ -74,6 +74,10 @@ export LC_ALL
- LC_TIME=C
- export LC_TIME
- 
-+# Use UTC to get reproducible result
-+TZ=UTC
-+export TZ
-+
- # GNU ls changes its time format in response to the TIME_STYLE
- # variable.  Since we cannot assume 'unset' works, revert this
- # variable to its documented default.


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

* [gentoo-commits] repo/gentoo:master commit in: sys-devel/automake/files/
@ 2018-03-25 18:28 Lars Wendler
  0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2018-03-25 18:28 UTC (permalink / raw
  To: gentoo-commits

commit:     6df1f8ebfe5ef3f6291c52a9003083e75f1e99c8
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Mar 16 11:36:26 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Mar 25 18:28:23 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6df1f8eb

sys-devel/automake: remove unused patches

 .../automake-1.13-perl-escape-curly-bracket.patch  | 37 ----------------------
 .../files/automake-1.9.6-ignore-comments.patch     | 29 -----------------
 .../files/automake-1.9.6-include-dir-prefix.patch  | 31 ------------------
 .../files/automake-1.9.6-infopage-namechange.patch | 33 -------------------
 4 files changed, 130 deletions(-)

diff --git a/sys-devel/automake/files/automake-1.13-perl-escape-curly-bracket.patch b/sys-devel/automake/files/automake-1.13-perl-escape-curly-bracket.patch
deleted file mode 100644
index a113d09c58c..00000000000
--- a/sys-devel/automake/files/automake-1.13-perl-escape-curly-bracket.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-http://debbugs.gnu.org/cgi/bugreport.cgi?bug=21001
-
-From 34163794a58b5bd91c5d6bd9adf5437571c7a479 Mon Sep 17 00:00:00 2001
-From: Pavel Raiskup <praiskup@redhat.com>
-Date: Tue, 7 Jul 2015 10:54:24 +0200
-Subject: [PATCH] bin/automake: escape '{' in regexp pattern
-
-Based on perlre(1) documentation:
-.. in Perl v5.26, literal uses of a curly bracket will be required
-to be escaped, say by preceding them with a backslash ("\{" ) or
-enclosing them within square brackets ("[{]") ..
-
-References:
-https://bugzilla.redhat.com/1239379
-
-* bin/automake.in (substitute_ac_subst_variables): Escape the
-occurrence of '{' character.
----
- bin/automake.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/automake.in b/bin/automake.in
-index 0c29184..c294ced 100644
---- a/bin/automake.in
-+++ b/bin/automake.in
-@@ -3898,7 +3898,7 @@ sub substitute_ac_subst_variables_worker
- sub substitute_ac_subst_variables ($)
- {
-   my ($text) = @_;
--  $text =~ s/\${([^ \t=:+{}]+)}/&substitute_ac_subst_variables_worker ($1)/ge;
-+  $text =~ s/\$\{([^ \t=:+{}]+)}/&substitute_ac_subst_variables_worker ($1)/ge;
-   return $text;
- }
- 
--- 
-2.1.0
-

diff --git a/sys-devel/automake/files/automake-1.9.6-ignore-comments.patch b/sys-devel/automake/files/automake-1.9.6-ignore-comments.patch
deleted file mode 100644
index f62987456cf..00000000000
--- a/sys-devel/automake/files/automake-1.9.6-ignore-comments.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-http://bugs.gentoo.org/126388
-
-2006-03-16  Mike Frysinger  <vapier@gentoo.org>
-
-	* aclocal.in (scan_configure_dep): Ignore ## lines.
-	(scan_file): Remove dnl and # comments.
-
---- aclocal.in
-+++ aclocal.in
-@@ -227,6 +227,8 @@
-   foreach (split ("\n", $contents))
-     {
-       ++$line;
-+      # Ignore `##' lines.
-+      next if /^##/;
-       # Remove comments from current line.
-       s/\bdnl\b.*$//;
-       s/\#.*$//;
-@@ -311,6 +313,10 @@
- 
-       $contents .= $_;
- 
-+      # Remove comments from current line.
-+      s/\bdnl\b.*$//;
-+      s/\#.*$//;
-+
-       while (/$ac_defun_rx/go)
- 	{
- 	  if (! defined $1)

diff --git a/sys-devel/automake/files/automake-1.9.6-include-dir-prefix.patch b/sys-devel/automake/files/automake-1.9.6-include-dir-prefix.patch
deleted file mode 100644
index a1d62a78e11..00000000000
--- a/sys-devel/automake/files/automake-1.9.6-include-dir-prefix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-http://bugs.gentoo.org/107435
-http://lists.gnu.org/archive/html/automake/2005-09/msg00088.html
-
-2005-09-27  Stepan Kasal  <address@hidden>
-
-	* automake.in (handle_single_transform): Direct suffix rule preserves
-	  the directory prefix, so the generated object name should contain
-	  it, too.
-
---- automake.in	2005-09-17 15:05:39.000000000 +0200
-+++ automake.in	2005-09-27 17:10:47.000000000 +0200
-@@ -1755,6 +1755,10 @@
-             # This is probably the result of a direct suffix rule.
-             # In this case we just accept the rewrite.
-             $object = "$base$extension";
-+            if ($directory ne '')
-+            {
-+                $object = $directory . '/' . $object;
-+            }
-             $linker = '';
-         }
-         else
-@@ -1824,7 +1828,7 @@
- 
- 		# For Java, the way we're handling it right now, a
- 		# `..' component doesn't make sense.
--                if ($lang->name eq 'java' && $object =~ /(\/|^)\.\.\//)
-+                if ($lang && $lang->name eq 'java' && $object =~ /(\/|^)\.\.\//)
- 		  {
- 		    err_am "`$full' should not contain a `..' component";
- 		  }

diff --git a/sys-devel/automake/files/automake-1.9.6-infopage-namechange.patch b/sys-devel/automake/files/automake-1.9.6-infopage-namechange.patch
deleted file mode 100644
index 7870f65e580..00000000000
--- a/sys-devel/automake/files/automake-1.9.6-infopage-namechange.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- doc/Makefile.in.orig	2005-07-11 00:39:31.000000000 -0400
-+++ doc/Makefile.in	2005-07-11 00:40:46.000000000 -0400
-@@ -187,26 +187,10 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- .texi.info:
--	restore=: && backupdir="$(am__leading_dot)am$$$$" && \
--	am__cwd=`pwd` && cd $(srcdir) && \
--	rm -rf $$backupdir && mkdir $$backupdir && \
--	if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
--	  for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
--	    if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
--	  done; \
--	else :; fi && \
--	cd "$$am__cwd"; \
--	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
--	 -o $@ $<; \
--	then \
--	  rc=0; \
--	  cd $(srcdir); \
--	else \
--	  rc=$$?; \
--	  cd $(srcdir) && \
--	  $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
--	fi; \
--	rm -rf $$backupdir; exit $$rc
-+	@rm -f $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]
-+	cd $(srcdir) \
-+		&& $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
-+		`echo $< | sed 's,.*/,,'`
- 
- .texi.dvi:
- 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \


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

* [gentoo-commits] repo/gentoo:master commit in: sys-devel/automake/files/
@ 2021-07-10 21:16 Conrad Kostecki
  0 siblings, 0 replies; 6+ messages in thread
From: Conrad Kostecki @ 2021-07-10 21:16 UTC (permalink / raw
  To: gentoo-commits

commit:     284745a9005787c4743499753727b65be4f2c8a8
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Jun  3 16:49:56 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Jul 10 21:07:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=284745a9

sys-devel/automake: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/21106
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 ...1.16.2-skip-tags-lisp-space-without-etags.patch | 23 ----------------------
 1 file changed, 23 deletions(-)

diff --git a/sys-devel/automake/files/automake-1.16.2-skip-tags-lisp-space-without-etags.patch b/sys-devel/automake/files/automake-1.16.2-skip-tags-lisp-space-without-etags.patch
deleted file mode 100644
index 70ca8f783c3..00000000000
--- a/sys-devel/automake/files/automake-1.16.2-skip-tags-lisp-space-without-etags.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 77d39959511295f5a30332d5d03f0a6956bd9460 Mon Sep 17 00:00:00 2001
-From: Karl Berry <karl@freefriends.org>
-Date: Tue, 24 Mar 2020 18:30:18 -0700
-Subject: [PATCH] tests: require etags for tags-lisp-space test.
-
-* t/tags-lisp-space.sh (required): set to etags.
----
- t/tags-lisp-space.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/t/tags-lisp-space.sh b/t/tags-lisp-space.sh
-index d0a940ba3..44312b0b7 100755
---- a/t/tags-lisp-space.sh
-+++ b/t/tags-lisp-space.sh
-@@ -18,7 +18,7 @@
- # if there are CONFIG_HEADERS.
- # See automake bug#38139.
- 
--required=''
-+required=etags
- . test-init.sh
- 
- # some AC_CONFIG_FILES header is needed to trigger the bug.


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

* [gentoo-commits] repo/gentoo:master commit in: sys-devel/automake/files/
@ 2021-09-26 11:40 Conrad Kostecki
  0 siblings, 0 replies; 6+ messages in thread
From: Conrad Kostecki @ 2021-09-26 11:40 UTC (permalink / raw
  To: gentoo-commits

commit:     a739541d57df9faaf91286b763339660d1f5838b
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Sep 26 10:30:40 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Sep 26 11:27:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a739541d

sys-devel/automake: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/22412
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../automake-1.15-perl-escape-curly-bracket.patch  | 37 ----------------------
 1 file changed, 37 deletions(-)

diff --git a/sys-devel/automake/files/automake-1.15-perl-escape-curly-bracket.patch b/sys-devel/automake/files/automake-1.15-perl-escape-curly-bracket.patch
deleted file mode 100644
index 268548d1e9d..00000000000
--- a/sys-devel/automake/files/automake-1.15-perl-escape-curly-bracket.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-http://debbugs.gnu.org/cgi/bugreport.cgi?bug=21001
-
-From 34163794a58b5bd91c5d6bd9adf5437571c7a479 Mon Sep 17 00:00:00 2001
-From: Pavel Raiskup <praiskup@redhat.com>
-Date: Tue, 7 Jul 2015 10:54:24 +0200
-Subject: [PATCH] bin/automake: escape '{' in regexp pattern
-
-Based on perlre(1) documentation:
-.. in Perl v5.26, literal uses of a curly bracket will be required
-to be escaped, say by preceding them with a backslash ("\{" ) or
-enclosing them within square brackets ("[{]") ..
-
-References:
-https://bugzilla.redhat.com/1239379
-
-* bin/automake.in (substitute_ac_subst_variables): Escape the
-occurrence of '{' character.
----
- bin/automake.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/automake.in b/bin/automake.in
-index 0c29184..c294ced 100644
---- a/bin/automake.in
-+++ b/bin/automake.in
-@@ -3898,7 +3898,7 @@ sub substitute_ac_subst_variables_worker
- sub substitute_ac_subst_variables
- {
-   my ($text) = @_;
--  $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
-+  $text =~ s/\$\{([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
-   return $text;
- }
- 
--- 
-2.1.0
-


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

* [gentoo-commits] repo/gentoo:master commit in: sys-devel/automake/files/
@ 2023-01-10 19:25 David Seifert
  0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2023-01-10 19:25 UTC (permalink / raw
  To: gentoo-commits

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 <vapier@gentoo.org>
-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 <vapier@gentoo.org>
-Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
----
- 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 <praiskup@redhat.com>
-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 <praiskup@redhat.com>
-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;;


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

end of thread, other threads:[~2023-01-10 19:25 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-08 14:02 [gentoo-commits] repo/gentoo:master commit in: sys-devel/automake/files/ Lars Wendler
  -- strict thread matches above, loose matches on Subject: below --
2023-01-10 19:25 David Seifert
2021-09-26 11:40 Conrad Kostecki
2021-07-10 21:16 Conrad Kostecki
2018-03-25 18:28 Lars Wendler
2017-02-04 21:22 David Seifert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox