diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-12 21:55:15 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-12 21:55:15 +0000 |
| commit | 7218e1b46bceac05841e90472501742d905fb3fc (patch) | |
| tree | 56fae051db521b8fce8014cbc8b11484885b14b3 /dev-java/commons-httpclient | |
| parent | 6d691ad5b6239929063441bbd14c489e92e7396e (diff) | |
gentoo resync : 12.03.2021
Diffstat (limited to 'dev-java/commons-httpclient')
| -rw-r--r-- | dev-java/commons-httpclient/Manifest | 4 | ||||
| -rw-r--r-- | dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild (renamed from dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild) | 21 | ||||
| -rw-r--r-- | dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch | 4 |
3 files changed, 17 insertions, 12 deletions
diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest index d2f420e59b90..abe324bd1669 100644 --- a/dev-java/commons-httpclient/Manifest +++ b/dev-java/commons-httpclient/Manifest @@ -1,4 +1,4 @@ -AUX commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch 12400 BLAKE2B 76cd9cff541adc08b987119de99e23ae50e2b849432aaab9431a760da67d4cb3ac53199ac7ca74393ee5d55a5d3c2148ffbffbfde005b7ff936da00620b94dac SHA512 3f20161688bcd40497747fc2e5802d12881d10a071c04a151d56b3603f81b4c14f56962b83ee72cc38d1e7a4e7e43e51426f00d06ec983feb23d8771df237c2a +AUX commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch 12404 BLAKE2B 294ef11924310e2e63865018843faf199521f619e0859cc2c857d8a9fb038fbc44d88b06cf2df44b05cc6891c9e9d1bba5898071a873fc0dd774427afb0a2de2 SHA512 af18eeb48d8da55fc63526a528b88f626d9fad2369a6a8f570fe2dfee76384a5d86a9bab4883e557a1acd0a866859c4bd075476f9cfaff8e8465de6db0f2848d DIST commons-httpclient-3.1-src.tar.gz 1882664 BLAKE2B ccf96bedad09011ee20eae38aae1fdfdd6fea5a8226f4b4d156762080c286c71b34c149035abfd61e70c55a1de84ab3cd38d73c3228f591dd8e16c0a7e79c3a5 SHA512 e73ceeba3f34a35c30b24a3c6cb8dfc2102ff21079a5ff9270935908cb2f707d366c2f31a53fbdafa99673cc2b82e05470a2bf40d96767c72b2ab037c0f55490 -EBUILD commons-httpclient-3.1-r1.ebuild 1618 BLAKE2B e82e0b6ad99f5800d38edcb9225b36853b5fcb38b02aafecc7ac24380e15f4eaeb3fd9e4c79322c3032649dc1ce0be78e7a6afce1d6a3c59a454259977ed667f SHA512 406fd3fd24975f136ef9b80f65e6a7adb9ea36699ff6e9683cdd49bba9fc15f0c46d5448c8de9ce5ec5e3559dc1b46842e8215017ebd46f8e1beb0cc7c8f8f3f +EBUILD commons-httpclient-3.1-r2.ebuild 1680 BLAKE2B 39796278c783e63835011467992fc9d8891bd2c691924078b909d409cd5567a8ebe505a834bfe65617936b4196cc99bcd12770e6a0462c237b5a5ff0f33cef11 SHA512 c1c327018aa78ccadd57a06845771ce12eef99106092823763eb7285d9bee587aa654b3fafcfabc7e725d36a5db7cda5e276bc6c6c7c291bf19bfbb553116244 MISC metadata.xml 456 BLAKE2B b4e2261943e4bd92d413eae20f60f23b79e7deb961d9c7e08f855f28cf69f0b45c5113a308138122a9cc4b42da1498e67c8be2093ce0252f60d5ef56ea55e72a SHA512 27c629a07a007dd4336cd50f4ea32156ec301b02f398b008c057532b36bc0698132282e32007ee31f0dd21f3f5664b3d7c9607fe43a4dfbbffb67d3000c3a661 diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild index 0c9f3363633b..5921250be5ee 100644 --- a/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild +++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild @@ -1,14 +1,15 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 JAVA_PKG_IUSE="doc examples source test" +MAVEN_ID="commons-httpclient:commons-httpclient:3.1" -inherit eutils java-pkg-2 java-ant-2 +inherit java-pkg-2 java-ant-2 DESCRIPTION="The Jakarta Commons HttpClient library" -HOMEPAGE="http://hc.apache.org/" +HOMEPAGE="https://hc.apache.org/" SRC_URI="mirror://apache/httpcomponents/${PN}/source/${P}-src.tar.gz" LICENSE="Apache-2.0" SLOT="3" @@ -20,9 +21,9 @@ RESTRICT="test" CDEPEND="dev-java/commons-logging:0 dev-java/commons-codec:0" -RDEPEND=">=virtual/jre-1.6 +RDEPEND=">=virtual/jre-1.8:* ${CDEPEND}" -DEPEND=">=virtual/jdk-1.6 +DEPEND=">=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) ${CDEPEND}" @@ -32,9 +33,13 @@ EANT_GENTOO_CLASSPATH="commons-logging,commons-codec" EANT_BUILD_TARGET="dist" EANT_DOC_TARGET="doc" -java_prepare() { - # patch against CVE-2012-{5783,6153}. See bug 442292. - epatch "${FILESDIR}"/"${P}-SSLProtocolSocketFactory.java.patch" +# patch against CVE-2012-{5783,6153}. See bug 442292. +PATCHES=( + "${FILESDIR}/${P}-SSLProtocolSocketFactory.java.patch" +) + +src_prepare() { + default # generated docs go into docs/api rm -rf docs/apidocs diff --git a/dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch b/dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch index 45df330092ab..c059bf496a45 100644 --- a/dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch +++ b/dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch @@ -1,5 +1,5 @@ ---- src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java -+++ src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java +--- ./src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java ++++ ./src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java @@ -31,10 +31,25 @@ package org.apache.commons.httpclient.protocol; |