From 8c364c784966be1700ea39ae45028f3e9be9cae0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 27 Mar 2018 22:40:05 +0100 Subject: gentoo resync : 27.03.2018 --- sys-devel/automake/Manifest | 4 --- .../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 ------------------- 5 files changed, 134 deletions(-) delete mode 100644 sys-devel/automake/files/automake-1.13-perl-escape-curly-bracket.patch delete mode 100644 sys-devel/automake/files/automake-1.9.6-ignore-comments.patch delete mode 100644 sys-devel/automake/files/automake-1.9.6-include-dir-prefix.patch delete mode 100644 sys-devel/automake/files/automake-1.9.6-infopage-namechange.patch (limited to 'sys-devel/automake') diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest index 5a706e1f6380..7b890f7a52bd 100644 --- a/sys-devel/automake/Manifest +++ b/sys-devel/automake/Manifest @@ -4,7 +4,6 @@ AUX automake-1.11-install-sh-avoid-low-risk-race-in-tmp.patch 3016 BLAKE2B 8dbc2 AUX automake-1.13-dyn-ithreads.patch 2126 BLAKE2B 13fa89641077b7e9e7052441b84b756d7ddbd1ac3b87857028ccb34feb4528d774400fc411bf4fa54bbed697d8be6bf948d774d474f0638611c52f8d98696951 SHA512 7a3795cb8b14b347a296abd410f3a740401e796a06317e52fa1ef8b0866099f71965f7fb12fd85db2ccc7445f310a4dbff6870d8a63e72c49ed6f8ca9da97277 AUX automake-1.13-hash-order-workaround.patch 529 BLAKE2B 92706c8c87aa1722de4ee4bbffd815720dfbc3d124776f7118ca57d682bbb9475174357412bb7e9f79c98adeb03651087cb095b52e682aa14447ab012945ca6a SHA512 2899c650664ead4c5fb4fdae79605b665cad52c3ecda0f8192e2ca37dbfdb42eb5937f9a24622e6463d4c003d70186b8a4c1404a47bd387de36d9f0db03e5593 AUX automake-1.13-perl-escape-curly-bracket-r1.patch 1127 BLAKE2B 18664d2af473845f6ae91ab566651a53cbcf16df598adc3812f6d40f774c2c571c20dada4f23193b2b39ddc36c5fe9fea0449f32231540477fbf2260a7052c51 SHA512 25d94503572f70a5f9ab808057ca1ad7080cba89cf98c2b1664da2dc347f8ada1db6a97138a9b3ee12ffa54a37a34307a9fded4c069e1eb20e490556ad4f46d3 -AUX automake-1.13-perl-escape-curly-bracket.patch 1135 BLAKE2B d8a8872354fc6171a8e4d239734ebdbd3d99eb902fb3b279f32e109ef63afd4f3f6b5bd0531cebba90e95c6ff447b069214228a004297607f814e9d249a88377 SHA512 857d7ef08f2b8ff5569cf3d52cda2cb419ff006eb9208535d902f1a9de0743443703f280e85b5ade90c66ca17bc21b1dfd44494e93ff865cc141523cb25ef564 AUX automake-1.14-gzip-fix.patch 2689 BLAKE2B 589f5261936f1d54f1345dccc284381373bef942d8fc484c3df1394109bb0cf9b425c28cf21f9c798d9dc9b7e095289a3b9547c6fbd3b4b0f1116d106e78d299 SHA512 aa5f25cc036a5b27a7066c9a0daeb862b739cfe6b32e029e1c76ef3a0816629e09d26f08137f07e52be9c6dce616f758e51030eef0109a17de1ec94b33a40d68 AUX automake-1.14-install-sh-avoid-low-risk-race-in-tmp.patch 3015 BLAKE2B a0a7afb76c8cd8a5dce60bcb0a7a59a7957bcfe2b70f541889d5677005f4c9a295cf0459eaf4626314ce75031716028fe0a91db00f416e2aef8d17d8e31009d0 SHA512 34a061b72993290ac9fbf7957da89d0ed0ded70f304db0983ffff557887434dba01f5ca40cfd13dccfc648af7ade9b94d45895bac33dd560d550e3f1b24b6a55 AUX automake-1.15-install-sh-avoid-low-risk-race-in-tmp.patch 3672 BLAKE2B e967579e81e3da85c9a5026a829be9dae93fd7d452c67bf94383787a7e7b46b62ba605112f3aaa5b4ee38d06727320ab8df017fc0b3a957e8fe0ba8e91883d52 SHA512 cfb9a11d82641b4f5b8e43d6a97fc20d012ce9ba6c4ab5fa3bae8c33da980867e3bad35229fbd5f2d811cfd849b275e83ecd0b80d25cff78695f700ebfc92cdc @@ -32,11 +31,8 @@ AUX automake-1.8.5-CVE-2009-4029.patch 2256 BLAKE2B c6c0c9624d7bbf5648efabd6ef3a AUX automake-1.8.5-test-fixes.patch 1068 BLAKE2B 5e72e237ba972be5c35e3630e9c673e0fce07af7aa260eeeb1a8363a0f35c7da7655f2b31d7fc726a2c564b7cbc8afc2124e4883469b8147405afe1760ede340 SHA512 703c40549542dcd55af05201e3c40118ee138398da6dc87ce7b880ee71a7bf15ad1063d8ebcf9807c2849c8a981367d2cc5f9f5b14c060ce36303250ec792685 AUX automake-1.9.6-aclocal7-test-sleep.patch 1102 BLAKE2B 63a4b56f2c88d290072cd88e1939323845db3b24c0cfbcc28ee6af06846a9bfb92a18fd9de3282b20ce5a1887855ec2f4bac210966f96852f8a7dca964b1ec46 SHA512 9ac24b6ff41b1fe17cf36d10c9b3e7a52b35cf7384ddbb03328a4593da76918707a47717a21257a86fa28c39e6c7648d0309ef7bb71be65744151704919dbb16 AUX automake-1.9.6-ignore-comments-r1.patch 618 BLAKE2B da53e3798ed97625f2e92e215d4da2d60f94f972d0a7df299f65561ea8f7a62a2f8d6847b7ebeb7de138336eb47b609fed9212edda0d4dc4f8913d46d4a0bb43 SHA512 0ecb4ca8dcb4cc13e5b7b90d59b9f1e5165adb90bbe06a297b89904d3a1de058cde5b448b842f04e1ba6ec642334b159e0c9983b81f5186fb4175227f8996ae5 -AUX automake-1.9.6-ignore-comments.patch 614 BLAKE2B 26057f34af2178f593fb942b93cdacbb557f68d58adad05eb9e91cea40ab652e945ba78588c37c0eb6763b1914dd070c16f62c5fbefe47b829387f4b2076c2a6 SHA512 c4475c97573a643441541a9c601d5f3db9464577366f53f7693295df10707aa605c112d4d05fddd9a01ada5cb7127283a70f65b970a1e6cfc141664886a7e60f AUX automake-1.9.6-include-dir-prefix-r1.patch 1110 BLAKE2B d3e81d86b83eaa6734201ef6ad238243332180352b593713a40544c2a73bd10d4b0162a0a1b2a3572a2cb89490de13871db4bdc2ebfb55b0e8dc88db2d939e3a SHA512 30f251c017de861d4a704b79043bb32b4a1cffc2a7888902218360b730a1103e076950637704d14db684e3f69d11a0c60359ff68d307bb2bd024e27a5751b450 -AUX automake-1.9.6-include-dir-prefix.patch 1106 BLAKE2B a0a5c8d2ad761ed28f70bbb568fb03fb49987c392b63aab901f9f0f798adc67928a0f2d0a2b302e0f93c262fae1f33ab1dfc0d2e1c456afe43a552d5b42daabc SHA512 dc555aa143bf620a88ed7192321a1eea4dff2d1d9cd3ccfeee0694b3d47516d055632d500378955c437b5d99af77cbbac4d7530ad91b3bb8df9a35f94b7b9fc7 AUX automake-1.9.6-infopage-namechange-r1.patch 1160 BLAKE2B 01a83d16f7b262d47075f146cc0c1452249b049e06bfd059649184601cf53582a7fcc3b988d5abbf9e2a98c6ded93d0fe7f85f0a706d2233460187c7fc60b158 SHA512 12696d6af2f6f7d8db3ca0b94532c8c9a170462dfbea52e92e127619a1af4ae87e063a47b34f675bc25e7591ce94713f5739a887a22ce4d2977a7d00e90009ed -AUX automake-1.9.6-infopage-namechange.patch 1156 BLAKE2B 664aca8498be9d1e554c9cb6a9703a09397d25cdea905fdee4a1a40614c72ca824d1dd1231a6808e950db72c9354b309f5c065f08ec4b3f80647850cf0f61912 SHA512 a4f969db72a38b3f93462670ddaead5147fe3a2065d2fd33a403e7cf89585fafa73b85771490a02144a524e811dde2c36857253b2ed1ad8e7c4d4027a352032b AUX automake-1.9.6-subst-test.patch 1332 BLAKE2B c7a882b592835a4bf9625435aa508975d7d8945f501dcc273947abca0bb22fe4a0a939777574bf7102b8c4c0c83d49a6e13e7e89a7e8d84a9c45f2427ae9c883 SHA512 f5e8106e96f5976d8f958665b53cdf1088d0620f7d4da3b9f5a73766ddc32c4eff13d39f245a8a01b90567c364949a94bc7ecdcc4b8214b43d2f7f6b1740a891 DIST automake-1.10.3.tar.bz2 957505 BLAKE2B e17dc5b4b1b70ed03fb12b48bef9ff7f1dd9d641ace5ba96ace8e76d2aa129deb272a2eebca1df599b2db9ce6e1c7a11ac866dc578aa703a6fb87bf06658db36 SHA512 4f4172c53f31103a93baa794bb498c8b42c1a06e5e0c909063863cdfee3f768016bdecf46e64417a8e362d4c524907b48c0c1b24f510d26aa66bcfd85d0b2598 DIST automake-1.11.6.tar.xz 1092908 BLAKE2B 17254d81d6920c32aa877b6c892025de8e4060b8bcbe50fff841ada513dd462ddde8fc6838b4976098a812f8fda047e7186cb62cea8175df615dde75a9959144 SHA512 6e4cdf69f07734954f770fd4a7211a8c9dc69fe25a7746bd3c1e01d3139c94cab2900399e87371548833e99687e0d2b59c5e746ab2fdfbc7d47f2c1d439137ba 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 a113d09c58c6..000000000000 --- 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 -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 f62987456cfe..000000000000 --- 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 - - * 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 a1d62a78e119..000000000000 --- 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 - - * 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 7870f65e5802..000000000000 --- 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" \ -- cgit v1.2.3