Remove vulnerable versions. Fix security bug 520200.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

5 files changed, 14 insertions, 188 deletions

diff --git a/dev-java/httpcomponents-core/ChangeLog b/dev-java/httpcomponents-core/ChangeLog
index 535d0483ac08..4da99e921b05 100644
--- a/dev-java/httpcomponents-core/ChangeLog
+++ b/dev-java/httpcomponents-core/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/httpcomponents-core
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/httpcomponents-core/ChangeLog,v 1.7 2015/06/25 15:50:22 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/httpcomponents-core/ChangeLog,v 1.8 2015/06/26 07:59:52 monsieurp Exp $
+
+  26 Jun 2015; Patrice Clement <monsieurp@gentoo.org>
+  -httpcomponents-core-4.2.4.ebuild, -httpcomponents-core-4.3.ebuild,
+  -httpcomponents-core-4.4.1.ebuild:
+  Remove vulnerable versions. Fix security bug 520200.
 
 *httpcomponents-core-4.4.1-r1 (25 Jun 2015)
 
diff --git a/dev-java/httpcomponents-core/Manifest b/dev-java/httpcomponents-core/Manifest
index 295ca9722b38..db1656d7ed62 100644
--- a/dev-java/httpcomponents-core/Manifest
+++ b/dev-java/httpcomponents-core/Manifest
@@ -6,24 +6,18 @@ AUX httpcomponents-core-4.2.4-httpcore-build.xml 12673 SHA256 2f5e7532c842a1be57
 AUX httpcomponents-core-4.2.4-httpcore-nio-build.xml 14455 SHA256 9cb0887b675375a749d1660adfb61f5ec5870031513fed536a89a0f16d287375 SHA512 04522defd55ed1594ec3e785ba88e77aee85862c85b92bc7596a17e32d22d7a7c6404fafdbfc379335bbb608cad7499475476e2b6e5323c7aa69f3cc64f719fb WHIRLPOOL 84272ff8bfdc655f3a0178da8ee721201fab706540e8f430187f6246e4a07a12c5abf7b76f5e87ed109782d286b9d60430001036b1a813ae1dcf1035fe5d789f
 AUX httpcomponents-core-4.4.1-httpcore-build.xml 10109 SHA256 da32b55f37b68057c8a0b90fd69285ca8afa422afc4a387e78573cd2431362e4 SHA512 44cab78a7855d607277d049a906a9ca157cd3f5d491ba7e5c406fda6700d95c6e8aebf0082245fc125bbeb50eea6782a0b70fe69ce5255bad468cf7256245a07 WHIRLPOOL 95e5a036b7e1f0c6cf97882685c841eea55cc00856b47d822d7c00e072d7b86a4e82acafa0ca60780094b6afe08e94fb4effdaa83d83676e5a1ca412430357d7
 AUX httpcomponents-core-4.4.1-httpcore-nio-build.xml 10465 SHA256 ab5221f4233c20e594e13a12a2e85bcc07e91d3200fc1d3e7e5f3cae4567a95a SHA512 07cf4fe938b802dca43744410d94c6452ac75e9c75aef06f6685597d4f1ec644674c64df4b0cb1c6fd837627059190b1d448e6a3f2df6954f920709bde844377 WHIRLPOOL 772a2deda8434d6fbc76e3aa2563869e18f087e327395590ddebe087b1b3184fbdc2100eac6ce555641a85708833fc5dfe37435a285aac95402e44d2c47d5c59
-DIST httpcomponents-core-4.2.4-src.tar.gz 1229938 SHA256 2ce05036ba4b32bc98aa11003e32e982bd55ff76cdc2d68e710feb896a014bdd SHA512 449a64f533c47ca682484ef16de9c26b2e2d00eb208d722f5444a55337b8f7de9b2428f5d9e5a0f6d9131449442ae03983a4c3267df170b391b19d7f486f1ddd WHIRLPOOL 676ecd1429588669e315262f0008095c7370971dda8f10a590f8d30f53a990cadbd0a42b7792e2de2768e5a236e028346bbf44e1248555dfa554c86c87ad7d53
-DIST httpcomponents-core-4.3-build.tar.bz2 2735 SHA256 ac81a4aff2669117dc6f16a7fb2959ed9a11fac65d4f164a016462c47a2db7f5 SHA512 0438c9e627d85cee031f669cb1e7d61e3d6aa9b3696cff84a2b5ef318f85638407efc526816d9d7ff36e7e81a65439f44348351f9543f05f4018c9ca3e665942 WHIRLPOOL bcd0e1fd1b078621ca62862a3d4c45c7bdaa8f659b2ae40c7483975730250d04f841bff0e6c4a56a7c2668a6a8f00d9373e8b076e98f794c6706841d54de9112
-DIST httpcomponents-core-4.3-src.tar.gz 500108 SHA256 a572703cec2a68438f1afe7a11689df68011bae4e083d132dec3b8e48009d618 SHA512 6d2dc9d4eeb9ce0d8291fac5867224e72066125b2b4ebc369cec0e4fd8555f20b91c38eb0e1178a8cbda469fbddad1a4a58bf79378a9e13ac6198a8df575b50b WHIRLPOOL e343544d5fd5c81af4382b1bf7a97b4aec17e909f6e9c22476bf0365e72c7b8ad157ae4aa25d16c2edcf86d749b798da4c1caef9180ada91113424e3c7f0512a
 DIST httpcomponents-core-4.4.1-src.tar.gz 549481 SHA256 11a2b73fb412000fee89dec1301cb77277365bced7c9291a970995b5a8ab9ac4 SHA512 1ccf6233a8b254986712732418fb4e25bbdbcb99c93f55ec7955d956d33c692eff6378ed8d701542272793f05831151ee75f0102cdd3b14a6f7530fcf9639b99 WHIRLPOOL e814a6b71b85a5235567378ccad9177e75231e5e47359756c00cf0f27fc942d0d8efe1df070712c3722e4e215ef223f27fd261a28b162bad42336876dc6a1017
-EBUILD httpcomponents-core-4.2.4.ebuild 1158 SHA256 fd234342d8ddbfde34c2a3aad91c4e8f72c5ce19c2fa0a553b922a034eb7907d SHA512 93ca17a33e2e6f5fe901a4e2f337e6e9881113c659d4d9ed201e81727af050fa436dbde3bd685eaf4fb0facef33d42d2c825b823696f4543dad3ab0dbd67e887 WHIRLPOOL f5c508c54c0d24eacc686466a78f9da0d3dcbe96aaa2fd53fa4268fe51d4afe8cc8a9215d87a5b8d335e40e453bacaa5183f859029d4ca1025e308d0faf1fe79
-EBUILD httpcomponents-core-4.3.ebuild 1551 SHA256 ad61faa3c91d3ce6697e59f2e2ca371e0f49d1aea48a310428e207f5c93c1cd5 SHA512 864f9cf33b7190ac17f06bc83198f5e32022c4c3bce8c6fe1f4613840300bf4aaec87b5059b33da6549cb68faa82b907366b129102a3dc2a33ca0c71eb7771d2 WHIRLPOOL 50b7df1a2c379ba063843f2ef22b0b390be54b8e4bbd4a04b6f6472119a77a09a260f3eea540fbf58abc4deda3ee2470618d99747e38eb66fec7303971f74588
 EBUILD httpcomponents-core-4.4.1-r1.ebuild 2321 SHA256 c4ca6cd972a8f170a7925c8ee4a6b422c74582c28adfe5596249c2c06a4e818c SHA512 60a6a2969ec237a009e8cb4c19f008b22cb54746e32c5d8baa215d1a1e8b68615c1356dd6839a3dcf493a3402310d0d7e1d1588b4b6f99cad8dca0190517825d WHIRLPOOL aab8a4558bf9528586904b6df2669df00356300eb2d5f26aba825bde72011f636c87a2e0b91f34f7875664fbde6124a79664fa0c2480d160bd71c2555e422414
-EBUILD httpcomponents-core-4.4.1.ebuild 1963 SHA256 0f8a8f2bd9f1e2d706f894c2883ac1e5d30ed6c7c15cf6499d9cfcc2e8c83d17 SHA512 9871b0edebee9032d2dbc2fc4e65bb26762d0d00f73c7a2f3a6b4d784e71df3171d27d88c327bf5f7e77d538c052b87598e1d7850b71b678583a3fe8478d8245 WHIRLPOOL 989cac8a52bed108b9260c840a060f51599312c3bc037c175157cfca766a9ebdd392e281dde7eae6dab80e9277d47c57b88c81b9702b0e2d23051326a4f006ea
-MISC ChangeLog 1920 SHA256 2240a96ae8bbab4fbf9912aa228b446a160b5089ef18e9034528f69fc616e3da SHA512 968840a271724f9e2544436c3c5e90c22089f84dd82f796f4d516bd0696a0c20354800de777d3a5e4de9a4f4c910e6e4004b5f1f743bec513510fbdd1ab91305 WHIRLPOOL 061d9821fee868b1eb49880ab67c156fd067fe748a82bc88811fc8dcf1338783222f14aacb08f7950457faab8b6375c657fb4c0b24473cdb4bc8fb0d9f9f2e8b
+MISC ChangeLog 2137 SHA256 d9bad3f03bb3dea55596f5005ff44ce780d00c63b776f1478c4cb4f4963205a6 SHA512 7e714e0b8ae5e2118b8bd5ae9f4c95edbe633c689cffcd2bf393e6e1ab1a28459001346bce1c8292ba13f4d5ba61a969d4d0b3ab56e06b945e14cd73c305215d WHIRLPOOL d22b1399a00ce9031fba5525a483d42767ff242124acf732daaa5395c783d688b5b0deb25d3456439244b88a24c516001ef6d238f57e9e7047284f453986521a
 MISC metadata.xml 231 SHA256 df9c89bbd906177c58e836ba5acec71407ee4acf92b646c84554cb18f2060857 SHA512 d0acabd8d1a8c373a52aae16b9be05782f3d0e6be8c1dfe0a7677771497f2a4d0f93fa1b7ddd4ebfcb61250a21dae8687c43552ac728b01a838d080d57f9a73a WHIRLPOOL 4c8c7239edae2fa2619975c41f0df20494cc4c311e6a012f00a967f1852dd8cf48b96e08134f04bfbd0df548fcf20899058cbdb3d5b2feac28cb41739998d798
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVjDGvAAoJEJGRpfGTSRu4Lu8IAKw7IxU+KozaCYi1acOetCCm
-qsLfH0CYL7suRrnhp0cf/i3ce/24ogCNoIowUWrY0lf8/R4aqSfnzU/rZuaBRqeS
-59WwUXnX+nR8V08x/hmnpe9co3i1CAOpwE7vnmR8PhhSNro/fjK0nY2AnrtLKsCU
-4yMBhHSB6RcO8f3ouMxWeNRhinJB6s9rKTY+/aWdIOG+ovRSJbSsSLWGgQDlbcoo
-BtSMwpdFJxAAq27KgpL8aonoMXlScVBhPciQtz3N1cLvKMk99r5znXHQjFswDl6o
-3Q0hYomehv3DxXQPIvR7/e/Csqm72LBooSHGi0/FLHo/h9oIzadmpJipoozhoN0=
-=hXIL
+iQEcBAEBCAAGBQJVjRTrAAoJEJGRpfGTSRu4UK0H/A7ix4Kw+3yix4+ZVrUN/80n
+W5MwpUKQUlF2SahhXinmsWCU0wHif1Z6LbcoIhHC1enO6zefe5cIAujGVuRhTqtD
+smauZsFa8/+kr6/nGaxz1c0xYKmOYGmT/epnjh90c8fVl+SlM6bKZJiq2QltsFA7
+4yeUHovjO3iiAkg/4D1HjMTjagfjJeDMW4BDZFQAxZk7ptcfd+UU3M/hjIR5HUbo
+IISSK6PNU24WtGHO+iuiRNYw53xzTpTfsn5e6319ZNbRtE9T5f9iAUb3ImoWliLh
+yNMqQwKi+hv73anN2j6NE3nUu9vMlY8IDOyS84oHE2ZHhYSGvzKH5GKdJoACSLY=
+=KFoQ
 -----END PGP SIGNATURE-----
diff --git a/dev-java/httpcomponents-core/httpcomponents-core-4.2.4.ebuild b/dev-java/httpcomponents-core/httpcomponents-core-4.2.4.ebuild
deleted file mode 100644
index 7aa839a399d7..000000000000
--- a/dev-java/httpcomponents-core/httpcomponents-core-4.2.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/httpcomponents-core/httpcomponents-core-4.2.4.ebuild,v 1.2 2014/08/10 20:14:49 slyfox Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source examples"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A low level toolset of Java components focused on HTTP and associated protocols"
-HOMEPAGE="http://hc.apache.org/index.html"
-SRC_URI="mirror://apache/${PN/-//http}/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
-
-EANT_BUILD_TARGET="package"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-
-	for x in "${FILESDIR}"/${P}-httpcore*; do
-		d=$(basename ${x})
-		d=${d/${P}-}
-		cp "${x}" ${d/-build.xml}/build.xml || die
-	done
-}
-
-src_install() {
-	for mod in httpcore httpcore-nio ; do
-		java-pkg_newjar ${mod}/target/${mod}-${PV}.jar ${mod}.jar
-	done
-
-	use source && java-pkg_dosrc httpcore{,-nio}/src/main/java
-	use examples && java-pkg_doexamples httpcore{,-nio}/src/examples
-
-	dodoc {README,RELEASE_NOTES,NOTICE}.txt
-}
diff --git a/dev-java/httpcomponents-core/httpcomponents-core-4.3.ebuild b/dev-java/httpcomponents-core/httpcomponents-core-4.3.ebuild
deleted file mode 100644
index 5f634804b490..000000000000
--- a/dev-java/httpcomponents-core/httpcomponents-core-4.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/httpcomponents-core/httpcomponents-core-4.3.ebuild,v 1.2 2014/08/10 20:14:49 slyfox Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source examples test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A low level toolset of Java components focused on HTTP and associated protocols"
-HOMEPAGE="http://hc.apache.org/index.html"
-SRC_URI="mirror://apache/${PN/-//http}/source/${P}-src.tar.gz
-		http://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}-build.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="4.3"
-KEYWORDS="~amd64 ~x86"
-IUSE="deprecated"
-
-DEPEND=">=virtual/jdk-1.5
-	test? (
-		dev-java/commons-logging:0
-		dev-java/junit:4
-		dev-java/ant-junit4
-		dev-java/mockito:0
-	)"
-RDEPEND=">=virtual/jre-1.5"
-
-EANT_BUILD_TARGET="package"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_TEST_GENTOO_CLASSPATH="junit-4,commons-logging,mockito"
-EANT_TEST_ANT_TASKS="ant-junit4"
-
-java_prepare() {
-	if use deprecated; then
-		cp -r "${S}"/httpcore/src/main/java-deprecated/* \
-				"${S}"/httpcore/src/main/java/* || die
-		cp -r "${S}"/httpcore-nio/src/main/java-deprecated/* \
-				"${S}"/httpcore-nio/src/main/java/* || die
-	fi
-}
-
-src_install() {
-	java-pkg_dojar httpcore/target/httpcore.jar \
-					httpcore-nio/target/httpcore-nio.jar
-
-	use source && java-pkg_dosrc httpcore{,-nio}/src/main/java
-	use examples && java-pkg_doexamples httpcore{,-nio}/src/examples
-
-	dodoc {README,RELEASE_NOTES,NOTICE}.txt
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
diff --git a/dev-java/httpcomponents-core/httpcomponents-core-4.4.1.ebuild b/dev-java/httpcomponents-core/httpcomponents-core-4.4.1.ebuild
deleted file mode 100644
index d9a1488c06cb..000000000000
--- a/dev-java/httpcomponents-core/httpcomponents-core-4.4.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/httpcomponents-core/httpcomponents-core-4.4.1.ebuild,v 1.3 2015/06/23 15:25:18 ago Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source examples test"
-
-# "components"
-CMPT=${PN%%-*}
-
-# "core"
-CORE=${PN##*-}
-
-# "httpcore"
-HTTPCORE="http${CORE}"
-
-# "httpcore-nio"
-HTTPNIO="${HTTPCORE}-nio"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A low level toolset of Java components focused on HTTP and associated protocols"
-HOMEPAGE="http://hc.apache.org/index.html"
-SRC_URI="mirror://apache/httpcomponents/${HTTPCORE}/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4.4"
-KEYWORDS="amd64 x86"
-
-DEPEND=">=virtual/jdk-1.6
-	test? (
-		dev-java/commons-logging:0
-		dev-java/ant-junit:0
-		dev-java/mockito:0
-	)"
-RDEPEND=">=virtual/jre-1.6"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_BUILD_TARGET="package"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/${HTTPCORE}/target/${HTTPCORE}-${PV}.jar"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-${HTTPCORE}-build.xml ${HTTPCORE}/build.xml
-	cp "${FILESDIR}"/${P}-${HTTPNIO}-build.xml ${HTTPNIO}/build.xml
-}
-
-src_compile() {
-	# first, compile httpcore module
-	EANT_BUILD_XML="${HTTPCORE}/build.xml" java-pkg-2_src_compile
-
-	# then, httpnio module
-	EANT_BUILD_XML="${HTTPNIO}/build.xml" java-pkg-2_src_compile
-}
-
-EANT_TEST_GENTOO_CLASSPATH="commons-logging,mockito"
-
-src_test() {
-	# run junit tests for httpcore module
-	EANT_BUILD_XML="${HTTPCORE}/build.xml" java-pkg-2_src_test
-
-	# run junit tests for httpcore-nio module
-	EANT_BUILD_XML="${HTTPNIO}/build.xml" java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar ${HTTPCORE}/target/${HTTPCORE}-${PV}.jar ${HTTPCORE}.jar
-	java-pkg_newjar ${HTTPNIO}/target/${HTTPNIO}-${PV}.jar ${HTTPNIO}.jar
-
-	use source && java-pkg_dosrc httpcore{,-nio}/src/main/java
-	use examples && java-pkg_doexamples httpcore{,-nio}/src/examples
-
-	dodoc {README,RELEASE_NOTES,NOTICE}.txt
-}