Version bump and apply fixes from upstream for CVE-2009-4029 #295357.

Package-Manager: portage-2.2_rc55/cvs/Linux x86_64

13 files changed, 690 insertions, 6 deletions

diff --git a/sys-devel/automake/ChangeLog b/sys-devel/automake/ChangeLog
index 0866c6afc6cd..ace37ddcf9ff 100644
--- a/sys-devel/automake/ChangeLog
+++ b/sys-devel/automake/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for sys-devel/automake
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.138 2009/05/29 23:41:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.139 2009/12/09 09:01:46 vapier Exp $
+
+*automake-1.11.1 (09 Dec 2009)
+*automake-1.10.3 (09 Dec 2009)
+*automake-1.9.6-r3 (09 Dec 2009)
+*automake-1.8.5-r4 (09 Dec 2009)
+*automake-1.7.9-r2 (09 Dec 2009)
+*automake-1.6.3-r1 (09 Dec 2009)
+*automake-1.5-r1 (09 Dec 2009)
+*automake-1.4_p6-r1 (09 Dec 2009)
+
+  09 Dec 2009; Mike Frysinger <vapier@gentoo.org>
+  +automake-1.4_p6-r1.ebuild, +files/automake-1.4-CVE-2009-4029.patch,
+  +automake-1.5-r1.ebuild, +files/automake-1.5-CVE-2009-4029.patch,
+  +automake-1.6.3-r1.ebuild, +automake-1.7.9-r2.ebuild,
+  +automake-1.8.5-r4.ebuild, +files/automake-1.8.5-CVE-2009-4029.patch,
+  +automake-1.9.6-r3.ebuild, +automake-1.10.3.ebuild,
+  +automake-1.11.1.ebuild:
+  Version bump and apply fixes from upstream for CVE-2009-4029 #295357.
 
   29 May 2009; Mike Frysinger <vapier@gentoo.org> automake-1.5.ebuild,
   automake-1.6.3.ebuild, automake-1.7.9-r1.ebuild, automake-1.8.5-r3.ebuild,
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index a45798d2601e..22a1e96cf602 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -4,10 +4,12 @@ Hash: SHA1
 AUX automake-1.10-ccnoco-ldflags.patch 901 RMD160 6b85133540877b082c4dfdd2fb378c66293bea64 SHA1 8aaa601cc4efe9cc294708d572ed34de9d5ea529 SHA256 98c85d873eac326a4b6c6afde25d887da85a45bae4bb4fad853a40e46fba7af5
 AUX automake-1.10.1-tests.patch 3283 RMD160 6ddc6524fa2e26f96dabb3062fb926d4ad9a08d2 SHA1 0f2616f5fa9eca0f6caf79539809391c9de8e146 SHA256 107f073536a7104d5b25dc7ff80933c22f44f847789435f5678c01090890506b
 AUX automake-1.10.2-bash4.patch 644 RMD160 5ab94e24f620ba2817fa1d227308cf3cb5c34f5b SHA1 43d2a5bd5ac0f32c5d0cb57433263b9bdfe76a09 SHA256 c07951416ab13e34d5090892cbba5e4d0e6e351fef1ee540d11b0da88d6ea677
+AUX automake-1.4-CVE-2009-4029.patch 2186 RMD160 091ae4f33c7d709c259090054d8cf19c117cb2ae SHA1 0b963afd899c52493ab620a358b83ff3716e5067 SHA256 29a556dee26b3081ecfc5b04eda8c3e5430a3e48a37f156ffc54b1d2132d9275
 AUX automake-1.4-ansi2knr-stdlib.patch 249 RMD160 f17983551ea326df6dc03f8389c02df3670eb475 SHA1 f6f23af88bde758dcc6893c01c98adb502a4c1e1 SHA256 8a29de01493b888f392388a0cffc0e4e2c0f4d81bc2ff34a4b65d27fab804210
 AUX automake-1.4-libtoolize.patch 542 RMD160 8ae18870f6b6f934b5f3d0440bb472c54f4f0bfb SHA1 90d41bbb160578142b540638a99426d9440c6c13 SHA256 1620b99a3043c66d6e6ae8a369733a1042ff5deec08ab11c727dea15032a684b
 AUX automake-1.4-nls-nuisances.patch 746 RMD160 0b791a0f27a402343c0a78cf032937bf1ecb50aa SHA1 aeaca0172c9db128f8e0784ef44341aa39189094 SHA256 aa35eb06e5aff390812e31c705976a11fbdff38a5567737f0b234a3fb00fd002
 AUX automake-1.4-subdirs-89656.patch 944 RMD160 d7a380e5857698aa88ec2a519fe9937fe45a9f0a SHA1 45e344abffb09418df4d24b16d9daee0a551ba0e SHA256 94e279bc6479b1753ad76334837d236e8b1f13d6a1be712da634fa7498247640
+AUX automake-1.5-CVE-2009-4029.patch 2316 RMD160 12dc29b814c8223be87e1447165638a597966d88 SHA1 6cd1c46dc0c46ec4371e68e363e750c6b19d9725 SHA256 b31c72cc038c89d118ea33d73eab11f539f5f2358db40fe51dd7563e2ad365ee
 AUX automake-1.5-slot.patch 1191 RMD160 280dbad54c737db251f4a40e90e3d50fc74cc48c SHA1 cdb0322ac92fa0ea39a7c0659ae69bed4889a17a SHA256 b1395634c1dbcd1c7071a371989a91838c3149e8f1399ad14ed9d4c062c99ab3
 AUX automake-1.5-target_hook.patch 1132 RMD160 7f0614d273825d415ef30eff9de9c37ce7defed3 SHA1 90453c7d115c8ad05b062391d1dff5ef6392fa6f SHA256 7169c860060faeeb698195ed82cd742162e5375cec0d2b4037b0cbb09998a421
 AUX automake-1.5-test-fixes.patch 1300 RMD160 02d88482792d77972aeb5fbf1cbb207bd0d53278 SHA1 5e31b7413ed7dbc1fb61084bf0c448befed62080 SHA256 117bdb7848b0c7daf8ed6253e81de265c92f427176e703c28f9de4bdbb13c235
@@ -16,6 +18,7 @@ AUX automake-1.7.9-infopage-namechange.patch 592 RMD160 78f09d0a4ce09d0389cd3d3f
 AUX automake-1.7.9-libtool-2.patch 859 RMD160 9cf0f3c8099e4570ccaab8ad5c6b70eb9631f296 SHA1 7462940d4abbc47cab21be3c58a82dd1dd90e6fe SHA256 3e919b1611dec9bd3a43945c881aa11cca6c3359e3425805d32d386be4d182d3
 AUX automake-1.7.9-test-fixes.patch 1159 RMD160 9d90c8d6cdcc5ba3455dee28701c2c6eb7fa86dd SHA1 bf2fd0227124555af86fdc09e9cfc6fcfcde7d91 SHA256 44221e4c945b0cb61663cb2857a3238e50800d228e7612203529726c53272dbb
 AUX automake-1.8.2-infopage-namechange.patch 1131 RMD160 c520c80b37dd30e0b6fca359bcc7f242ded15fae SHA1 28a051a76d90530b484c3dab1f868264df71829c SHA256 305979b9a07496352bfc6cc2177bf7aa1587ef1d0dcbbab1de7a56cb9d0ac539
+AUX automake-1.8.5-CVE-2009-4029.patch 2256 RMD160 140ee2fa391148b8a84e241c051219343893280e SHA1 5b6d679a99085474e712a6b7071a8a68bbf96dfb SHA256 2c249ae1c93210f00ba3a58624b99e3490f1e58117bd41d2b4fcb838f7b8a5fe
 AUX automake-1.8.5-test-fixes.patch 1068 RMD160 517f75255fa9d29e459b56079e2e27fff073d41c SHA1 350ac439fee8f6d0082ca876d0c7501e1e5a8a09 SHA256 1a94bcc5a8e33b4c187e6291ad672daf3dca7b2e2995586d6af39f653678cebd
 AUX automake-1.9.6-aclocal7-test-sleep.patch 1102 RMD160 8e32341de00eb09af25a820340832f9286128118 SHA1 f0b90bf9f161530c7bef8bdb57e6e6e32fe7b3d5 SHA256 9bc281d49a753a6135c65b80642b03a6056538a6e944aeb344f1ed460be2904e
 AUX automake-1.9.6-ignore-comments.patch 614 RMD160 2d9ca9b4de82171370edd6843b4a3c2b9c073b4c SHA1 c10645bafd86fe2dfa15a4e62f96b55032c66c1b SHA256 28b80f088b53a72935f15c7d845919f474224ece83847d7b3bae5f2236fe30fe
@@ -23,6 +26,8 @@ AUX automake-1.9.6-include-dir-prefix.patch 1106 RMD160 1a440ea039e4b71a44caaae7
 AUX automake-1.9.6-infopage-namechange.patch 1156 RMD160 6c6c899d0119bd1068c3e1c63301c7ee74663ba9 SHA1 3060100d79f5b1e43c5cb61805c7f30269a123e9 SHA256 32fcbef369731846abb28181cc924c4d8261eafd3b86d3c506976de622b76737
 AUX automake-1.9.6-subst-test.patch 1332 RMD160 00223b889535970a3f50b15a7383ad9d79375c29 SHA1 f4c757db0b583963daa1d7849d1baf55453eba36 SHA256 3e793187719a3149f24eec1c4d4a3603ae02625f31c82056300d4e37248bd359
 DIST automake-1.10.2.tar.bz2 936322 RMD160 cf3a31b5dac83295651c3c8b9a668cc3f3fae3da SHA1 fad55795a57b82d107808ae1bf51f72eba45c921 SHA256 c38ac9fe53d9492b0a0a02a8e691cd2c96d7f4cc13aedeedc6d08613b77e640f
+DIST automake-1.10.3.tar.bz2 957505 RMD160 698d4fe613ec852669c3c74a980b9c72f2dc821c SHA1 ed6944f2b746a356bd161ab2210cf121d1d04e12 SHA256 e98ab43bb839c31696a4202e5b6ff388b391659ef2387cf9365019fad17e1adc
+DIST automake-1.11.1.tar.bz2 1066685 RMD160 0d160a06a022b145095c6433c3f0511ec5a8c6fd SHA1 44ab0007d8edbe82338e29bdda2f461f43a98818 SHA256 5b159d3c0e0a1f87de71b68bcb9f1a1c49e9e71749c9b723f17e2e1e0295c7ae
 DIST automake-1.11.tar.bz2 1058759 RMD160 65a65be39f9c1c43e1b65cfffe97fcce3f8eeb72 SHA1 1ae8c15d91b8eb8728c35cf0901a02782830e9de SHA256 29aaf27be23559002ac003f539e73c8858cefada2f1ef3f05b6d44f28340aac0
 DIST automake-1.4-p6.tar.gz 375060 RMD160 ae40b2200eec95b601ebc65bc3cc916bb2a54066 SHA1 330c75c98e6dcdf21cbb63cf94ced8ea564b9438 SHA256 503cdc2b0992a4309545d17f462cb15f99bb57b7161dfc4082b2e7188f2bcc0f
 DIST automake-1.5.tar.gz 526934 RMD160 5c5310c3923a8bfb1c94d77c7c53c593552e0464 SHA1 9c426ac75e514dc214dea6309b07c5d9cb95002c SHA256 24b4775e3143fd3e35db5cbaba80845d9359c7bfd751a6cebe3014fbf6115d78
@@ -31,20 +36,28 @@ DIST automake-1.7.9.tar.bz2 577705 RMD160 d967c0dd5bf4a8430d6b598660a98e71588695
 DIST automake-1.8.5.tar.bz2 663182 RMD160 36892a845b189d81593e4b1146352c391c4affac SHA1 b639ff48033e9ac7347a6f938b015107754fdf3a SHA256 84c93aaa3c3651a9e7474b721b0e6788318592509e7de604bafe4ea8049dc410
 DIST automake-1.9.6.tar.bz2 765505 RMD160 ad93e095056f41f0369ac6a06fed3904d8e3514f SHA1 d205dbb274d3ff5be1cf6734f27fb452c7131866 SHA256 8eccaa98e1863d10e4a5f861d8e2ec349a23e88cb12ad10f6b6f79022ad2bb8d
 EBUILD automake-1.10.2.ebuild 1695 RMD160 0fd9acb40486ad66972d470dcd917a8de2219526 SHA1 ba7797430d68d6e4c3d823fdadbabd288cbe07b0 SHA256 c4a14f8272d5bcf5456b6b9313dcd79926477c2bfeee104cac153633930acf04
+EBUILD automake-1.10.3.ebuild 1660 RMD160 c7178dce01fe18d7cdc17bb46b807966711d0905 SHA1 a718de3c1816b3f69c615f3199f7a74656550635 SHA256 2f433cc8b052f906a90e4830c26c0c6db6b2de6e61de1dbb3e1cfa8de8e2aa8d
+EBUILD automake-1.11.1.ebuild 2187 RMD160 b40eb46ee9968717c039ae02f759f99fb448c563 SHA1 a8c3365926c69021fcfc8e93f76480d6ec89455e SHA256 b4638a25f1bc2908a60bc8af320093874c6299cee105fd258f268723ad221386
 EBUILD automake-1.11.ebuild 2188 RMD160 f6c049e3573fa96888c46103f8a87ae39968ccc4 SHA1 4bcf157d414ab7a4e11ccc65d147a46171d180c6 SHA256 ae3589f0b84dfce0817af9fc062c34ead704a95c435813b61899a16f1b4890ff
+EBUILD automake-1.4_p6-r1.ebuild 1823 RMD160 ce0d6544badecaa8e0ddb48a93aca3f634eb2cf0 SHA1 edf470a45a29cbcf9b90e3e945162a234a7b4c66 SHA256 fbcc01f800eeead34dd47b74e5596b2bb946f9424c548701f79fb3691b74dafe
 EBUILD automake-1.4_p6.ebuild 1761 RMD160 f5bb9fb1c89d9a1c23c771476580bd610e2165a5 SHA1 39c9f8b688e7465f57e79860aa85f43694df5e2a SHA256 23f76d39345964515b71aa56aabe318309014e877958111932612d519b3f9c40
+EBUILD automake-1.5-r1.ebuild 1779 RMD160 396224d43dd5e809ae18df495bd7067ccc9b4884 SHA1 7924cb9a71f1604c4e13db4435ad62327f33dab4 SHA256 1989bbb72cdf15933b78f8b20a32c7fc377b4f74ad1b77b58139bee9ac8d203e
 EBUILD automake-1.5.ebuild 1710 RMD160 a2cbf8bfde1ddd46ab89f689813c65360f4e6d08 SHA1 65addeaed18edce73fbc37c1c5caee657cd68e51 SHA256 2307c53ffb284e609458a1b87644984745da3b10c6c268e02db4df0fcf983f4c
+EBUILD automake-1.6.3-r1.ebuild 1508 RMD160 b95ff80f1d9f9261c9515d308e66560e55b46483 SHA1 a3822228dc17055bd3943597e4733ce127eba16d SHA256 58abd1bffe24bb199683e385935b15676a688ef4efb32b2d20cb411d8f2139c0
 EBUILD automake-1.6.3.ebuild 1434 RMD160 c55aad35b86c4a6dd0eef87c0ef3146e35db47ab SHA1 49e8d67984bd94a96855c5995d5444feece50876 SHA256 b62d4e5fdb5596647721a2cfe39992cf8dc0e3e111b1a80709cd1cf3bbb9e386
 EBUILD automake-1.7.9-r1.ebuild 1611 RMD160 f683a331e8e1a2bd7ec22e02a1235e496cb197ef SHA1 90ac3edd3cf985db7191a7fc81c08feb6544615c SHA256 0e04690f7404d4d478082d0a8297de5be8c1d0c96ae0923e7292a9cbc239d2b4
+EBUILD automake-1.7.9-r2.ebuild 1682 RMD160 916c1c16922bd72c918bca54fccc7dd921ca330a SHA1 51cc84150a7c38699786d25f60b2ad7f47f6b18f SHA256 c1a5f55396a51d5b068eefec8d29c0322d77a4dafee10823d05f191acfd9e6a9
 EBUILD automake-1.8.5-r3.ebuild 1633 RMD160 a78567f377ca6773aaf0cefa53584b19cfc11e95 SHA1 28d507543b807faad7dae0d5942d5f5325fd3b36 SHA256 791f1eab85d6bdf2dc3708ac3a66b6a04cc64e9782c7a233de16b32685606c5a
+EBUILD automake-1.8.5-r4.ebuild 1804 RMD160 0be32b1d1891ae91b6d7428f61ef6a50f0c2301d SHA1 09c435833b3e9c26eea5a85945ed42976320c173 SHA256 c4b59c406d30317923c338a6a472ab02381fb0df45ffc62335aebe8f2e6dda52
 EBUILD automake-1.9.6-r2.ebuild 1849 RMD160 4852ec3df07516d917d5da1a8e47a335c36ea667 SHA1 b9a84f319a46bb7ff6d448e0efb758148b61349d SHA256 bf9012ec8ac6a7d9e72938bb8c1d730d912ae1daaaef542943603d07239a9cd2
+EBUILD automake-1.9.6-r3.ebuild 1922 RMD160 a3b51737e4f01ed8c92c1d9d0638bd7c9d799abf SHA1 69b61f7eab3da9eace3b86c0923a71aa28fa8693 SHA256 f3ab2c9c80527cb1430cc9c7026936df7303e90547bd4879fed9220e9669fe49
 EBUILD automake-9999.ebuild 1486 RMD160 4e82fd03d3ccdf006d3ff1da24c9e6c49cb8991f SHA1 8d5b190a9c21aa9f311cdc39ad77477b57837d4a SHA256 010c5638f1bd10c9697b42bc08e15454b82bb186c30518c37fbe0eeca94b9ac1
-MISC ChangeLog 21586 RMD160 de9f53b83972ae05e83f802b1728cd4d531e2e06 SHA1 fc2658a4cc4b1672b0dcb28a23d53d0b9b02dee4 SHA256 81ee01bf07d7faef9d15ac70d257ac50d9bace91e5d547b2275538bfb2a29c5b
+MISC ChangeLog 22317 RMD160 440ab9e56630bda6f7de78caf0ec2bf3443062f7 SHA1 7942c2674146a2b9b939562f662244d00be8f1f9 SHA256 5a5c398e6b41758407fc2a2c40430cb6c28dcc637298ac4615bc241e6baae83a
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkogcp0ACgkQn/5bYzqsSmGWVACeKxvIItsOy3gQcw0xbedSV7Mu
-xvUAn2l3PHTCyl309VPI7Z+47uFu+71v
-=7GfK
+iEYEARECAAYFAksfZ5UACgkQlPl3HsVfCDoMnQCdHFPP0AltHizXV2RIR9LpZ6r5
+JNYAn00UONMjiLPz3RTs/ENA7STZxyrW
+=pWZZ
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/automake/automake-1.10.3.ebuild b/sys-devel/automake/automake-1.10.3.ebuild
new file mode 100644
index 000000000000..c90172e400eb
--- /dev/null
+++ b/sys-devel/automake/automake-1.10.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.10.3.ebuild,v 1.1 2009/12/09 09:01:46 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="Used to generate Makefile.in from Makefile.am"
+HOMEPAGE="http://sources.redhat.com/automake/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="${PV:0:4}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+	>=sys-devel/automake-wrapper-2
+	>=sys-devel/autoconf-2.60
+	>=sys-apps/texinfo-4.7
+	sys-devel/gnuconfig"
+DEPEND="${RDEPEND}
+	sys-apps/help2man"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	chmod a+rx tests/*.test
+	sed -i \
+		-e "s|: (automake)| v${SLOT}: (automake${SLOT})|" \
+		doc/automake.texi || die "sed failed"
+	mv doc/automake{,${SLOT}}.texi
+	sed -i \
+		-e "s:automake.info:automake${SLOT}.info:" \
+		-e "s:automake.texi:automake${SLOT}.texi:" \
+		doc/Makefile.in || die "sed on Makefile.in failed"
+	export WANT_AUTOCONF=2.5
+}
+
+src_compile() {
+	econf --docdir=/usr/share/doc/${PF} || die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
+
+	# SLOT the docs and junk
+	local x
+	for x in aclocal automake ; do
+		help2man "perl -Ilib ${x}" > ${x}-${SLOT}.1
+		doman ${x}-${SLOT}.1
+		rm -f "${D}"/usr/bin/${x}
+	done
+
+	# remove all config.guess and config.sub files replacing them
+	# w/a symlink to a specific gnuconfig version
+	for x in guess sub ; do
+		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
+	done
+}
diff --git a/sys-devel/automake/automake-1.11.1.ebuild b/sys-devel/automake/automake-1.11.1.ebuild
new file mode 100644
index 000000000000..2cbcb7c4b7f0
--- /dev/null
+++ b/sys-devel/automake/automake-1.11.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.11.1.ebuild,v 1.1 2009/12/09 09:01:46 vapier Exp $
+
+inherit eutils versionator
+
+if [[ ${PV/_beta} == ${PV} ]]; then
+	MY_P=${P}
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+else
+	MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b"
+	MY_P="${PN}-${MY_PV}"
+
+	# Alpha/beta releases are not distributed on the usual mirrors.
+	SRC_URI="ftp://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.bz2"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+# Use Gentoo versioning for slotting.
+SLOT="${PV:0:4}"
+
+DESCRIPTION="Used to generate Makefile.in from Makefile.am"
+HOMEPAGE="http://sources.redhat.com/automake/"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+	>=sys-devel/automake-wrapper-3-r2
+	>=sys-devel/autoconf-2.62
+	>=sys-apps/texinfo-4.7
+	sys-devel/gnuconfig"
+DEPEND="${RDEPEND}
+	sys-apps/help2man"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	chmod a+rx tests/*.test
+	sed -i \
+		-e "s|: (automake)| v${SLOT}: (automake${SLOT})|" \
+		doc/automake.texi || die "sed failed"
+	mv doc/automake{,${SLOT}}.texi
+	sed -i \
+		-e "s:automake.info:automake${SLOT}.info:" \
+		-e "s:automake.texi:automake${SLOT}.texi:" \
+		doc/Makefile.in || die "sed on Makefile.in failed"
+	export WANT_AUTOCONF=2.5
+}
+
+src_compile() {
+	econf --docdir=/usr/share/doc/${PF} HELP2MAN=true || die
+	emake \
+		APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
+
+	local x
+	for x in aclocal automake; do
+		help2man "perl -Ilib ${x}" > doc/${x}-${SLOT}.1
+	done
+}
+
+src_install() {
+	emake DESTDIR="${D}" install \
+		APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
+	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
+
+	rm \
+		"${D}"/usr/bin/{aclocal,automake} \
+		"${D}"/usr/share/man/man1/{aclocal,automake}.1
+
+	# remove all config.guess and config.sub files replacing them
+	# w/a symlink to a specific gnuconfig version
+	local x
+	for x in guess sub ; do
+		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
+	done
+}
diff --git a/sys-devel/automake/automake-1.4_p6-r1.ebuild b/sys-devel/automake/automake-1.4_p6-r1.ebuild
new file mode 100644
index 000000000000..6ec7d196eee5
--- /dev/null
+++ b/sys-devel/automake/automake-1.4_p6-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.4_p6-r1.ebuild,v 1.1 2009/12/09 09:01:46 vapier Exp $
+
+inherit eutils
+
+MY_P="${P/_/-}"
+DESCRIPTION="Used to generate Makefile.in from Makefile.am"
+HOMEPAGE="http://sources.redhat.com/automake/"
+SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="${PV:0:3}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	sys-devel/automake-wrapper
+	>=sys-devel/autoconf-2.59-r6
+	sys-devel/gnuconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.4-nls-nuisances.patch #121151
+	epatch "${FILESDIR}"/${PN}-1.4-libtoolize.patch
+	epatch "${FILESDIR}"/${PN}-1.4-subdirs-89656.patch
+	epatch "${FILESDIR}"/${PN}-1.4-ansi2knr-stdlib.patch
+	epatch "${FILESDIR}"/${PN}-1.4-CVE-2009-4029.patch #295357
+	sed -i 's:error\.test::' tests/Makefile.in #79529
+	sed -i \
+		-e "/^@setfilename/s|automake|automake${SLOT}|" \
+		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
+		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
+		automake.texi || die "sed failed"
+	export WANT_AUTOCONF=2.5
+}
+
+src_install() {
+	emake install DESTDIR="${D}" \
+		pkgdatadir=/usr/share/automake-${SLOT} \
+		m4datadir=/usr/share/aclocal-${SLOT} \
+		|| die
+	rm -f "${D}"/usr/bin/{aclocal,automake}
+	dosym automake-${SLOT} /usr/share/automake
+
+	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
+	doinfo *.info
+
+	# remove all config.guess and config.sub files replacing them
+	# w/a symlink to a specific gnuconfig version
+	for x in guess sub ; do
+		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
+	done
+}
diff --git a/sys-devel/automake/automake-1.5-r1.ebuild b/sys-devel/automake/automake-1.5-r1.ebuild
new file mode 100644
index 000000000000..1a5cbd19efb9
--- /dev/null
+++ b/sys-devel/automake/automake-1.5-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.5-r1.ebuild,v 1.5 2009/12/09 09:01:46 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="Used to generate Makefile.in from Makefile.am"
+HOMEPAGE="http://sources.redhat.com/automake/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="${PV:0:3}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	sys-devel/automake-wrapper
+	>=sys-devel/autoconf-2.59-r6
+	sys-devel/gnuconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/automake-1.4-nls-nuisances.patch #121151
+	epatch "${FILESDIR}"/${P}-target_hook.patch
+	epatch "${FILESDIR}"/${P}-slot.patch
+	epatch "${FILESDIR}"/${P}-test-fixes.patch #79505
+	epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
+	epatch "${FILESDIR}"/${P}-CVE-2009-4029.patch #295357
+	sed -i \
+		-e "/^@setfilename/s|automake|automake${SLOT}|" \
+		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
+		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
+		automake.texi || die "sed failed"
+	export WANT_AUTOCONF=2.5
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "make install failed"
+
+	local x=
+	for x in aclocal automake ; do
+		mv "${D}"/usr/bin/${x}{,-${SLOT}} || die "rename ${x}"
+		mv "${D}"/usr/share/${x}{,-${SLOT}} || die "move ${x}"
+	done
+
+	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
+	doinfo *.info
+
+	# remove all config.guess and config.sub files replacing them
+	# w/a symlink to a specific gnuconfig version
+	for x in guess sub ; do
+		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
+	done
+}
diff --git a/sys-devel/automake/automake-1.6.3-r1.ebuild b/sys-devel/automake/automake-1.6.3-r1.ebuild
new file mode 100644
index 000000000000..f2cda6e8b01e
--- /dev/null
+++ b/sys-devel/automake/automake-1.6.3-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.6.3-r1.ebuild,v 1.1 2009/12/09 09:01:46 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="Used to generate Makefile.in from Makefile.am"
+HOMEPAGE="http://sources.redhat.com/automake/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="${PV:0:3}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	sys-devel/automake-wrapper
+	>=sys-devel/autoconf-2.59-r6
+	sys-devel/gnuconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i \
+		-e "/^@setfilename/s|automake|automake${SLOT}|" \
+		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
+		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
+		automake.texi || die "sed failed"
+	epatch "${FILESDIR}"/${P}-test-fixes.patch #159557
+	epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
+	epatch "${FILESDIR}"/${PN}-1.5-CVE-2009-4029.patch #295357
+	export WANT_AUTOCONF=2.5
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	rm -f "${D}"/usr/bin/{aclocal,automake}
+
+	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
+	doinfo *.info
+
+	# remove all config.guess and config.sub files replacing them
+	# w/a symlink to a specific gnuconfig version
+	local x=
+	for x in guess sub ; do
+		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
+	done
+}
diff --git a/sys-devel/automake/automake-1.7.9-r2.ebuild b/sys-devel/automake/automake-1.7.9-r2.ebuild
new file mode 100644
index 000000000000..19eb29a3cbf9
--- /dev/null
+++ b/sys-devel/automake/automake-1.7.9-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.7.9-r2.ebuild,v 1.1 2009/12/09 09:01:46 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="Used to generate Makefile.in from Makefile.am"
+HOMEPAGE="http://sources.redhat.com/automake/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="${PV:0:3}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	sys-devel/automake-wrapper
+	>=sys-devel/autoconf-2.59-r6
+	sys-devel/gnuconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i \
+		-e "/^@setfilename/s|automake|automake${SLOT}|" \
+		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
+		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
+		automake.texi || die "sed texi failed"
+	epatch "${FILESDIR}"/${P}-infopage-namechange.patch
+	epatch "${FILESDIR}"/${P}-test-fixes.patch
+	epatch "${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225
+	epatch "${FILESDIR}"/${P}-libtool-2.patch #257544
+	epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
+	epatch "${FILESDIR}"/${PN}-1.5-CVE-2009-4029.patch #295357
+	export WANT_AUTOCONF=2.5
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	rm -f "${D}"/usr/bin/{aclocal,automake}
+
+	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
+	doinfo automake${SLOT}.info
+
+	# remove all config.guess and config.sub files replacing them
+	# w/a symlink to a specific gnuconfig version
+	local x=
+	for x in guess sub ; do
+		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
+	done
+}
diff --git a/sys-devel/automake/automake-1.8.5-r4.ebuild b/sys-devel/automake/automake-1.8.5-r4.ebuild
new file mode 100644
index 000000000000..c1058d973f25
--- /dev/null
+++ b/sys-devel/automake/automake-1.8.5-r4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.8.5-r4.ebuild,v 1.1 2009/12/09 09:01:46 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="Used to generate Makefile.in from Makefile.am"
+HOMEPAGE="http://sources.redhat.com/automake/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="${PV:0:3}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	sys-devel/automake-wrapper
+	>=sys-devel/autoconf-2.59-r6
+	sys-devel/gnuconfig"
+
+src_unpack() {
+eshopts_push -o noglob
+eshopts_push -o notify
+eshopts_pop
+eshopts_push -o notify
+eshopts_pop
+eshopts_pop
+	unpack ${A}
+	cd "${S}"
+	sed -i \
+		-e "/^@setfilename/s|automake|automake${SLOT}|" \
+		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
+		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
+		doc/automake.texi || die "sed failed"
+	epatch "${FILESDIR}"/${PN}-1.8.2-infopage-namechange.patch
+	epatch "${FILESDIR}"/${P}-test-fixes.patch #159557
+	epatch "${FILESDIR}"/${PN}-1.9.6-aclocal7-test-sleep.patch #197366
+	epatch "${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225
+	epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
+	epatch "${FILESDIR}"/${P}-CVE-2009-4029.patch #295357
+	export WANT_AUTOCONF=2.5
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	rm -f "${D}"/usr/bin/{aclocal,automake}
+
+	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
+	doinfo doc/*.info*
+
+	# remove all config.guess and config.sub files replacing them
+	# w/a symlink to a specific gnuconfig version
+	local x=
+	for x in guess sub ; do
+		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
+	done
+}
diff --git a/sys-devel/automake/automake-1.9.6-r3.ebuild b/sys-devel/automake/automake-1.9.6-r3.ebuild
new file mode 100644
index 000000000000..aab3754b7fc1
--- /dev/null
+++ b/sys-devel/automake/automake-1.9.6-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.9.6-r3.ebuild,v 1.1 2009/12/09 09:01:46 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="Used to generate Makefile.in from Makefile.am"
+HOMEPAGE="http://sources.redhat.com/automake/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="${PV:0:3}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+	sys-devel/automake-wrapper
+	>=sys-devel/autoconf-2.59-r6
+	>=sys-apps/texinfo-4.7
+	sys-devel/gnuconfig"
+DEPEND="${RDEPEND}
+	sys-apps/help2man"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i \
+		-e "/^@setfilename/s|automake|automake${SLOT}|" \
+		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
+		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
+		doc/automake.texi || die "sed failed"
+	epatch "${FILESDIR}"/${PN}-1.9.6-infopage-namechange.patch
+	epatch "${FILESDIR}"/${P}-include-dir-prefix.patch #107435
+	epatch "${FILESDIR}"/${P}-ignore-comments.patch #126388
+	epatch "${FILESDIR}"/${P}-aclocal7-test-sleep.patch #197366
+	epatch "${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225
+	epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
+	epatch "${FILESDIR}"/${PN}-1.8.5-CVE-2009-4029.patch #295357
+	export WANT_AUTOCONF=2.5
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	local x
+	for x in aclocal automake ; do
+		help2man "perl -Ilib ${x}" > ${x}-${SLOT}.1
+		doman ${x}-${SLOT}.1
+		rm -f "${D}"/usr/bin/${x}
+	done
+
+	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
+	doinfo doc/*.info*
+
+	# remove all config.guess and config.sub files replacing them
+	# w/a symlink to a specific gnuconfig version
+	for x in guess sub ; do
+		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
+	done
+}
diff --git a/sys-devel/automake/files/automake-1.4-CVE-2009-4029.patch b/sys-devel/automake/files/automake-1.4-CVE-2009-4029.patch
new file mode 100644
index 000000000000..42aef8c8e1bc
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.4-CVE-2009-4029.patch
@@ -0,0 +1,65 @@
+http://bugs.gentoo.org/295357
+
+(Makefile.in mangled a little for 1.4_p6)
+
+From 449d20aa12e13fefd848604225fc83d0c39c61d0 Mon Sep 17 00:00:00 2001
+From: Jim Meyering <meyering@redhat.com>
+Date: Tue, 1 Dec 2009 22:48:15 +0100
+Subject: [PATCH 1/1] do not put world-writable directories in distribution tarballs
+
+* automake.in (handle_dist_worker): Do not make all directories
+group- or world-writable.  Instead, use 755.
+
+Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+---
+ Makefile.in |    4 ++--
+ automake.in |    4 ++--
+ 4 files changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 93da407..59eb9f4 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -456,7 +456,7 @@ dist-all: distdir
+ distdir: $(DISTFILES)
+ 	-rm -rf $(distdir)
+ 	mkdir $(distdir)
+-	-chmod 777 $(distdir)
++	-chmod 755 $(distdir)
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+@@ -477,7 +477,7 @@ distdir: $(DISTFILES)
+ 	    test -d $(distdir)/$$subdir \
+ 	    || mkdir $(distdir)/$$subdir \
+ 	    || exit 1; \
+-	    chmod 777 $(distdir)/$$subdir; \
++	    chmod 755 $(distdir)/$$subdir; \
+ 	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+diff --git a/automake.in b/automake.in
+index 8eceea7..8f48236 100755
+--- a/automake.in
++++ b/automake.in
+@@ -2336,7 +2336,7 @@ sub handle_dist_worker
+ 	# Create dist directory.
+ 	$output_rules .= ("\t-rm -rf \$(distdir)\n"
+ 			  . "\tmkdir \$(distdir)\n"
+-			  . "\t-chmod 777 \$(distdir)\n");
++			  . "\t-chmod 755 \$(distdir)\n");
+     }
+ 
+     # Only run automake in `dist' target if --include-deps and
+@@ -2468,7 +2468,7 @@ sub handle_dist_worker
+ 	     . "\t" . '    test -d $(distdir)/$$subdir ' . "\\\n"
+ 	     . "\t" . '    || mkdir $(distdir)/$$subdir ' . "\\\n"
+ 	     . "\t" . '    || exit 1; ' . "\\\n"
+-	     . "\t" . '    chmod 777 $(distdir)/$$subdir; ' . "\\\n"
++	     . "\t" . '    chmod 755 $(distdir)/$$subdir; ' . "\\\n"
+ 	     . "\t" . '    (cd $$subdir'
+ 	     . ' && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$('
+ 	     . (($relative_dir eq '.') ? 'distdir' : 'top_distdir')
+-- 
+1.6.5.4
+
diff --git a/sys-devel/automake/files/automake-1.5-CVE-2009-4029.patch b/sys-devel/automake/files/automake-1.5-CVE-2009-4029.patch
new file mode 100644
index 000000000000..d91139b30178
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.5-CVE-2009-4029.patch
@@ -0,0 +1,60 @@
+http://bugs.gentoo.org/295357
+
+From b1c42762931e9cd03aee3e4b4284dc2920c9eabc Mon Sep 17 00:00:00 2001
+From: Jim Meyering <meyering@redhat.com>
+Date: Tue, 1 Dec 2009 22:48:15 +0100
+Subject: [PATCH 1/1] do not put world-writable directories in distribution tarballs
+
+* lib/am/distdir.am (distdir): Do not make all directories
+group- or world-writable.  Instead, use 755.
+
+Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+---
+ Makefile.in       |    3 ++-
+ lib/am/distdir.am |    9 +++------
+ 4 files changed, 15 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index ebbfd2f..76991db 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -379,7 +379,8 @@ distdir: $(DISTFILES)
+ 	$(MAKE) $(AM_MAKEFLAGS) \
+ 	  top_distdir="${top_distdir}" distdir="$(distdir)" \
+ 	  dist-info
+-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
++	-find "$(distdir)" -type d ! -perm -755 \
++		-exec chmod u+rwx,go+rx {} \; -o \
+ 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+ 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+diff --git a/lib/am/distdir.am b/lib/am/distdir.am
+index e808966..0a01c4e 100644
+--- a/lib/am/distdir.am
++++ b/lib/am/distdir.am
+@@ -127,11 +127,7 @@ if %?DIST-TARGETS%
+ endif %?DIST-TARGETS%
+ ##
+ ## This complex find command will try to avoid changing the modes of
+-## links into the source tree, in case they're hard-linked.  It will
+-## also make directories writable by everybody, because some
+-## brain-dead tar implementations change ownership and permissions of
+-## a directory before extracting the files, thus becoming unable to
+-## extract them.
++## links into the source tree, in case they're hard-linked.
+ ##
+ ## Ignore return result from chmod, because it might give an error
+ ## if we chmod a symlink.
+@@ -144,7 +140,8 @@ endif %?DIST-TARGETS%
+ ## the file in place in the source tree.
+ ##
+ if %?TOPDIR_P%
+-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
++	-find "$(distdir)" -type d ! -perm -755 \
++		-exec chmod u+rwx,go+rx {} \; -o \
+ 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+ 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+-- 
+1.6.5.4
+
diff --git a/sys-devel/automake/files/automake-1.8.5-CVE-2009-4029.patch b/sys-devel/automake/files/automake-1.8.5-CVE-2009-4029.patch
new file mode 100644
index 000000000000..9e42e52c80bd
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.8.5-CVE-2009-4029.patch
@@ -0,0 +1,60 @@
+http://bugs.gentoo.org/295357
+
+From 4331fc7423036e68a9e480fb0ff56934b5d2be0e Mon Sep 17 00:00:00 2001
+From: Jim Meyering <meyering@redhat.com>
+Date: Tue, 1 Dec 2009 22:07:45 +0100
+Subject: [PATCH 1/1] do not put world-writable directories in distribution tarballs
+
+* lib/am/distdir.am (distdir): Do not make all directories
+group- or world-writable.  Instead, use 755.
+
+Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+---
+ Makefile.in       |    3 ++-
+ lib/am/distdir.am |    9 +++------
+ 4 files changed, 17 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index f6971b4..c753eaa 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -389,7 +389,8 @@ distdir: $(DISTFILES)
+ 	      || exit 1; \
+ 	  fi; \
+ 	done
+-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
++	-find "$(distdir)" -type d ! -perm -755 \
++		-exec chmod u+rwx,go+rx {} \; -o \
+ 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+ 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+diff --git a/lib/am/distdir.am b/lib/am/distdir.am
+index 0ed0593..91dbe6b 100644
+--- a/lib/am/distdir.am
++++ b/lib/am/distdir.am
+@@ -190,11 +190,7 @@ if %?DIST-TARGETS%
+ endif %?DIST-TARGETS%
+ ##
+ ## This complex find command will try to avoid changing the modes of
+-## links into the source tree, in case they're hard-linked.  It will
+-## also make directories writable by everybody, because some
+-## brain-dead tar implementations change ownership and permissions of
+-## a directory before extracting the files, thus becoming unable to
+-## extract them.
++## links into the source tree, in case they're hard-linked.
+ ##
+ ## Ignore return result from chmod, because it might give an error
+ ## if we chmod a symlink.
+@@ -207,7 +203,8 @@ endif %?DIST-TARGETS%
+ ## the file in place in the source tree.
+ ##
+ if %?TOPDIR_P%
+-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
++	-find "$(distdir)" -type d ! -perm -755 \
++		-exec chmod u+rwx,go+rx {} \; -o \
+ 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+ 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+-- 
+1.6.5.4
+