Security bump. CVE-2012-2098 #417909

Package-Manager: portage-2.1.10.62/cvs/Linux x86_64

3 files changed, 81 insertions, 10 deletions

diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog
index a56ba1ef6770..74ebd32c6b9f 100644
--- a/dev-java/ant/ChangeLog
+++ b/dev-java/ant/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ant
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.133 2012/05/25 11:20:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.134 2012/05/30 09:32:07 sera Exp $
+
+*ant-1.8.4 (30 May 2012)
+
+  30 May 2012; Ralph Sennhauser <sera@gentoo.org> +ant-1.8.4.ebuild:
+  Security bump. CVE-2012-2098 #417909
 
   25 May 2012; Agostino Sarubbo <ago@gentoo.org> ant-1.8.2.ebuild:
   Stable for amd64, wrt bug #417403
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index 17168c528222..a3119ca705f2 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 EBUILD ant-1.7.1.ebuild 1980 RMD160 6fe2fac83f35806fb5e0ddc627425749cdc22b76 SHA1 51aa009e522beece8401036e3d7cc47677d1b7ec SHA256 05642831226f844e6f79c38307f8e2988d0ed2e2d237de73339ce4b72e82bd88
 EBUILD ant-1.8.0.ebuild 2072 RMD160 86569f5df214b745ba15db548d326291d21b5578 SHA1 684cdc965f51b8b7ab8d5ec3f934da0fb62848b0 SHA256 cbf0794eff92590d6ac96df96d112ede62f1c2fb868ab3770f80e41d8f112967
 EBUILD ant-1.8.1.ebuild 2092 RMD160 8f21158adab0e5edea08aff1c480a0dbcc902e16 SHA1 522d207309e269a658babd3ec4ac68fb3c043469 SHA256 581bea02278871eb3aef0616c2fdbf8cc144c6cb4b4f1d251b25b5aac8706a03
 EBUILD ant-1.8.2.ebuild 2254 RMD160 7321d742c1f6466c6f3a2b0b27f014306516f5d5 SHA1 f724db9a98723b5eb571f5ab34ca0146bd59127e SHA256 555ba1d6ee0098e3d6243841907c5c425c3497279e659e281f3200e9573577c2
-MISC ChangeLog 5922 RMD160 541732c139f11b6249adfa88d8ab80fb2226e7d6 SHA1 c6116f5dfbfa5f433728c4eff48fe8031e356b70 SHA256 a272a4e553ca389d4028cb6c76d404b07077d24f6bb059be118c5c1d1831cf17
+EBUILD ant-1.8.4.ebuild 2257 RMD160 7c8267f8e33a55933b7c3a28b806179d87dc8806 SHA1 eddce017b5bd82f0aa19fa1d96e4a888cb687c15 SHA256 6d1d02f82b1c312858628600271d1922f3fc0edf9ab944da22098a15c31f78c2
+MISC ChangeLog 6058 RMD160 0c47c8b485973f7a1429c7925ea2cbe6e7a6cba8 SHA1 1f5ed67bc7dda76c75d73bd976458820f82e4163 SHA256 2b93c5a7ad42108fb860b023e4a0c5c8d4d8b352689d9afab7dc98ea18a90f0e
 MISC metadata.xml 1076 RMD160 7fb58da3c2363f0acf1767f9f7c5680460c1e2ee SHA1 f0ec8ee731cf67815f70860eba3fa91e739ca3a4 SHA256 013d89ddc64f92df85732549c4d2e3333faf84b0951cb2db91ae2a7dce8db4a5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPv2r8AAoJEOTDgjZ80txdYVMH/31KhempDT3A1nYjKFXkVi0G
-cMdB7jNx7XEknGZMQ0vEfRpLycqzi/AiXXxFMK+LXJ8l54q1B8z59Clk7sBsXOsL
-AgX3YMDQ02uSQYA5+ndSQuJ4QsCoTNGTbJA2pdW9p5iwQRxboUPFQn5+ZImxVyii
-Z8gK5GIsCEGVXhh3BwV6CWjl/pKWjzi4QdiJXOTV2HENeCslMvB9PmHz722u6x2U
-l+uwnrA0ann4acNiE/FnXU7UajjoEWi7kED90u7paFO3NRqgR+rTClCn6Tdyxhno
-WLhHS4W5YmEVoTBbkKypTQC7znMwI2crd01Uw3jEjNb7JhtYxrg1RK/AeCoX69Y=
-=Fp92
+iQEcBAEBAgAGBQJPxekpAAoJEIUJ+svaV163l7sIAIt+P/CsTCYBczEEksIQCNss
+Z32RCcQYIwC+M9pNzJAE0U/C2dTHi9px2zScZcanFtgY7NOYH/TT5Piwn12yJ0j9
+B5+WGeB0fnlRbJzHJ0bySr6RfV7PYxUMbqCWsaQYsIqEgzWdxEM1QAy3sp7k3p96
+Sp8tVXUyrBJVgGWW6cWKN2JVMKL4WFzsgXIFo0LZsbwoQ+z+PKMeTSzkFAJYbLZF
+ptHYAToUQ3KC2a3zQ8b3GRvBmguQ5fW666RQK9fSRY0e6t4JDAzcbgEyZYxnCiZa
+4J1CYkj/xOfwAOCuuvW3v149OXEyZVcgZ051lwEg6LnBJzh9PBUeR3aj9YaXFFM=
+=Ri+S
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant/ant-1.8.4.ebuild b/dev-java/ant/ant-1.8.4.ebuild
new file mode 100644
index 000000000000..e1728da5783d
--- /dev/null
+++ b/dev-java/ant/ant-1.8.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.8.4.ebuild,v 1.1 2012/05/30 09:32:07 sera Exp $
+
+EAPI="4"
+
+inherit versionator
+
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
+HOMEPAGE="http://ant.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="~dev-java/ant-core-${PV}"
+RDEPEND="${DEPEND}"
+
+IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf
+	+jsch +log4j +oro +regexp +resolver testutil"
+
+RDEPEND="~dev-java/ant-core-${PV}
+	~dev-java/ant-nodeps-${PV}
+	~dev-java/ant-junit-${PV}
+	!dev-java/ant-optional
+	!dev-java/ant-tasks
+	~dev-java/ant-trax-${PV}
+	~dev-java/ant-apache-xalan2-${PV}
+	antlr? ( ~dev-java/ant-antlr-${PV} )
+	bcel? ( ~dev-java/ant-apache-bcel-${PV} )
+	bsf? ( ~dev-java/ant-apache-bsf-${PV} )
+	log4j? ( ~dev-java/ant-apache-log4j-${PV} )
+	oro? ( ~dev-java/ant-apache-oro-${PV} )
+	regexp? ( ~dev-java/ant-apache-regexp-${PV} )
+	resolver? ( ~dev-java/ant-apache-resolver-${PV} )
+	commonslogging? ( ~dev-java/ant-commons-logging-${PV} )
+	commonsnet? ( ~dev-java/ant-commons-net-${PV} )
+	jai? ( ~dev-java/ant-jai-${PV} )
+	javamail? ( ~dev-java/ant-javamail-${PV} )
+	jdepend? ( ~dev-java/ant-jdepend-${PV} )
+	jmf? ( ~dev-java/ant-jmf-${PV} )
+	jsch? ( ~dev-java/ant-jsch-${PV} )
+	testutil? ( ~dev-java/ant-testutil-${PV} )
+	X? ( ~dev-java/ant-swing-${PV} )"
+
+DEPEND=""
+
+S="${WORKDIR}"
+
+src_compile() { :; }
+
+pkg_postinst() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		# if we update from a version below 1.7.1
+		if ! version_is_at_least 1.7.1 ${REPLACING_VERSIONS}; then
+			elog "Since 1.7.1, the ant-tasks meta-ebuild has been removed and its USE"
+			elog "flags have been moved to dev-java/ant."
+			elog
+			elog "You may now freely set the USE flags of this package without breaking"
+			elog "building of Java packages, which depend on the exact ant tasks they need."
+			elog "The USE flags default to enabled (except X, jai and jmf) for convenience."
+		fi
+	fi
+}