[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-httpclient/files/
commit: 032b53da29577a3c8ff9f5abd621a27f972bb983
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Sun Mar 17 12:21:03 2024 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Mon Mar 18 20:00:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=032b53da
dev-java/commons-httpclient: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Signed-off-by: Conrad Kostecki gentoo.org>
...pclient-3.1-SSLProtocolSocketFactory.java.patch | 369 -
1 file changed, 369 deletions(-)
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
deleted file mode 100644
index c059bf496a45..
---
a/dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch
+++ /dev/null
@@ -1,369 +0,0 @@
./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;
-
- import java.io.IOException;
-+import java.io.InputStream;
- import java.net.InetAddress;
- import java.net.Socket;
- import java.net.UnknownHostException;
--
-+import java.security.cert.Certificate;
-+import java.security.cert.CertificateParsingException;
-+import java.security.cert.X509Certificate;
-+import java.util.Arrays;
-+import java.util.Collection;
-+import java.util.Iterator;
-+import java.util.LinkedList;
-+import java.util.List;
-+import java.util.Locale;
-+import java.util.StringTokenizer;
-+import java.util.regex.Pattern;
-+
-+import javax.net.ssl.SSLException;
-+import javax.net.ssl.SSLSession;
-+import javax.net.ssl.SSLSocket;
- import javax.net.ssl.SSLSocketFactory;
-
- import org.apache.commons.httpclient.ConnectTimeoutException;
-@@ -55,6 +70,11 @@
- */
- private static final SSLProtocolSocketFactory factory = new
SSLProtocolSocketFactory();
-
-+// This is a a sorted list, if you insert new elements do it orderdered.
-+private final static String[] BAD_COUNTRY_2LDS =
-+{"ac", "co", "com", "ed", "edu", "go", "gouv", "gov", "info",
-+"lg", "ne", "net", "or", "org"};
-+
- /**
- * Gets an singleton instance of the SSLProtocolSocketFactory.
- * @return a SSLProtocolSocketFactory
-@@ -79,12 +99,14 @@
- InetAddress clientHost,
- int clientPort)
- throws IOException, UnknownHostException {
--return SSLSocketFactory.getDefault().createSocket(
-+Socket sslSocket = SSLSocketFactory.getDefault().createSocket(
- host,
- port,
- clientHost,
- clientPort
- );
-+verifyHostName(host, (SSLSocket) sslSocket);
-+return sslSocket;
- }
-
- /**
-@@ -124,16 +146,19 @@
- }
- int timeout = params.getConnectionTimeout();
- if (timeout == 0) {
--return createSocket(host, port, localAddress, localPort);
-+Socket sslSocket = createSocket(host, port, localAddress,
localPort);
-+verifyHostName(host, (SSLSocket) sslSocket);
-+return sslSocket;
- } else {
- // To be eventually deprecated when migrated to Java 1.4 or above
--Socket socket = ReflectionSocketFactory.createSocket(
-+Socket sslSocket = ReflectionSocketFactory.createSocket(
- "javax.net.ssl.SSLSocketFactory", host, port, localAddress,
localPort, timeout);
--if (socket == null) {
--socket = ControllerThreadSocketFactory.createSocket(
-+if (sslSocket == null) {
-+ sslSocket = ControllerThreadSocketFactory.createSocket(
- this, host, port, localAddress, localPort, timeout);
- }
--return socket;
-+verifyHostName(host, (SSLSocket) sslSocket);
-+return sslSocket;
- }
- }
-
-@@ -142,10 +167,12 @@
- */
- public Socket createSocket(String host, int port)
- throws IOException, UnknownHostException {
--return SSLSocketFactory.getDefault().createSocket(
-+Socket sslSocket = SSLSocketFactory.getDefault().createSocket(
- host,
- port
- );
-+verifyHostName(host, (SSLSocket) sslSocket);
-+return sslSocket;
- }
-
- /**
-@@ -157,13 +184,271 @@
- int port,
- boolean autoClose)
- throws IOException, UnknownHostException {
--return ((SSLSocketFactory)
SSLSocketFactory.getDefault()).createSocket(
-+Socket sslSocket = ((SSLSocketFactory)
SSLSocketFactory.getDefault()).createSocket(
- socket,
- host,
- port,
- autoClose
- );
-+verifyHostName(host,
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-httpclient/
commit: bf829c13098755b5c9fb1960bd568e49d726809e
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Mon Feb 26 14:05:58 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun Mar 10 21:10:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf829c13
dev-java/commons-httpclient: drop 3.1-r2
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Miroslav Šulc gentoo.org>
.../commons-httpclient-3.1-r2.ebuild | 68 --
1 file changed, 68 deletions(-)
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
b/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
deleted file mode 100644
index 6e82213d770d..
--- a/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc examples source test"
-MAVEN_ID="commons-httpclient:commons-httpclient:3.1"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="The Jakarta Commons HttpClient library"
-HOMEPAGE="https://hc.apache.org/httpclient-legacy/;
-SRC_URI="mirror://apache/httpcomponents/${PN}/source/${P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-# doesn't work with IBM JDK, bug #176133
-RESTRICT="test"
-
-CDEPEND="dev-java/commons-logging:0
- dev-java/commons-codec:0"
-RDEPEND=">=virtual/jre-1.8:*
- ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.8:*
- test? ( dev-java/ant-junit:0 )
- ${CDEPEND}"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="commons-logging,commons-codec"
-EANT_BUILD_TARGET="dist"
-EANT_DOC_TARGET="doc"
-
-# 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
-
- # remove javadoc task from compile task
- sed -i -e 's/depends="compile,doc"/depends="compile"/' build.xml || die
- sed -i -e '/link/ d' build.xml || die
-
- mkdir lib && cd lib
- java-pkg_filter-compiler jikes
-}
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit"
-EANT_TEST_TARGET="test"
-
-src_install() {
- java-pkg_dojar dist/${PN}.jar
-
- # contains both html docs and javadoc in correct subdir
- if use doc ; then
- java-pkg_dojavadoc dist/docs/api
- java-pkg_dohtml -r dist/docs/*
- fi
- use source && java-pkg_dosrc src/java/*
- use examples && java-pkg_doexamples src/examples
-}
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-httpclient/
commit: ee98457c9cf2a91290a92c2dbc7b28c4dbdfab82
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sun Mar 10 09:18:50 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun Mar 10 21:10:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee98457c
dev-java/commons-httpclient: re-add unstable keywords
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
index f18caf90421b..c0053b42b61e 100644
--- a/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
SLOT="3"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
# Tests run: 2036, Failures: 91
RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-httpclient/
commit: 8130cdda2ef91fb94d0d066cdd1693da1df390a1
Author: Arthur Zamarin gentoo org>
AuthorDate: Sun Mar 10 08:53:13 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Mar 10 08:53:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8130cdda
dev-java/commons-httpclient: Stabilize 3.1-r3 x86, #922766
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
index f84ff3079a14..f18caf90421b 100644
--- a/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
SLOT="3"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Tests run: 2036, Failures: 91
RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-httpclient/
commit: 3bcc6430171870181895edb2cc18cd5b69d46f21
Author: Sam James gentoo org>
AuthorDate: Sun Mar 3 06:11:14 2024 +
Commit: Sam James gentoo org>
CommitDate: Sun Mar 3 06:11:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bcc6430
dev-java/commons-httpclient: Stabilize 3.1-r3 arm64, #922766
Signed-off-by: Sam James gentoo.org>
dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
index 8ff7510f..f84ff3079a14 100644
--- a/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
# Tests run: 2036, Failures: 91
RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-httpclient/
commit: 15b1b3d582282928617dea994ebe70b61b1fe2c7
Author: Sam James gentoo org>
AuthorDate: Sun Feb 25 23:06:29 2024 +
Commit: Sam James gentoo org>
CommitDate: Sun Feb 25 23:06:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15b1b3d5
dev-java/commons-httpclient: Stabilize 3.1-r3 ppc64, #922766
Signed-off-by: Sam James gentoo.org>
dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
index 466fc7630c76..8ff7510f 100644
--- a/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
# Tests run: 2036, Failures: 91
RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-httpclient/
commit: e6f3f9b70a78a519c5e2d3789e34f6cdf18e7ffa
Author: Jakov Smolić gentoo org>
AuthorDate: Sun Feb 25 19:19:34 2024 +
Commit: Jakov Smolić gentoo org>
CommitDate: Sun Feb 25 19:19:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6f3f9b7
dev-java/commons-httpclient: Stabilize 3.1-r3 amd64, #922766
Signed-off-by: Jakov Smolić gentoo.org>
dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
index 81080faf4cad..466fc7630c76 100644
--- a/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
# Tests run: 2036, Failures: 91
RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-httpclient/
commit: e5dca8f051108ff56c52779d7ace711ee2ca05d0
Author: Matoro Mahri matoro tk>
AuthorDate: Sat Feb 17 06:08:13 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Feb 20 20:58:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5dca8f0
dev-java/commons-httpclient: Keyword 3.1-r3 ppc64, #922770
Signed-off-by: Matoro Mahri matoro.tk>
Signed-off-by: Ionen Wolkens gentoo.org>
dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
index d1f47a90940e..81080faf4cad 100644
--- a/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
# Tests run: 2036, Failures: 91
RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-httpclient/
commit: 64e5800ac42315cbb5f4410b11a28da3bd2701c3
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Feb 2 13:46:08 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Feb 2 13:46:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64e5800a
dev-java/commons-httpclient: Keyword 3.1-r3 x86, #922770
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
index 57e0fcc103ec..d1f47a90940e 100644
--- a/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
# Tests run: 2036, Failures: 91
RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-httpclient/
commit: 7f8f3b687952ad9b532144e2b7d364402491a062
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Tue Dec 26 07:03:36 2023 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Tue Jan 23 09:42:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f8f3b68
dev-java/commons-httpclient: add 3.1-r3 for >=dev-java/ant-1.10.14
also update EAPI 7 -> 8
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/commons-httpclient/Manifest | 1 +
.../commons-httpclient-3.1-r3.ebuild | 54 ++
2 files changed, 55 insertions(+)
diff --git a/dev-java/commons-httpclient/Manifest
b/dev-java/commons-httpclient/Manifest
index a8ecdcddf113..f2e83ed5113b 100644
--- a/dev-java/commons-httpclient/Manifest
+++ b/dev-java/commons-httpclient/Manifest
@@ -1 +1,2 @@
DIST commons-httpclient-3.1-src.tar.gz 1882664 BLAKE2B
ccf96bedad09011ee20eae38aae1fdfdd6fea5a8226f4b4d156762080c286c71b34c149035abfd61e70c55a1de84ab3cd38d73c3228f591dd8e16c0a7e79c3a5
SHA512
e73ceeba3f34a35c30b24a3c6cb8dfc2102ff21079a5ff9270935908cb2f707d366c2f31a53fbdafa99673cc2b82e05470a2bf40d96767c72b2ab037c0f55490
+DIST commons-httpclient-3.1-src.tar.gz.asc 189 BLAKE2B
44661748db96429682a82d8dba5ad71d0d1fc2aaf03e2f1dda059985757547a78ab04dff38863ca421e65d13100a68c8cb909ed4c34e0a66a837b6fdb91baf63
SHA512
3832c90048de4db1f96efecd2f467153f0bdce1ebd533b848b8fc78a92da0bba3ba8bb3447e6c8d34f4c1c731a5b41ab941754a1509728ff4ea96e238927ab09
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
new file mode 100644
index ..57e0fcc103ec
--- /dev/null
+++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="commons-httpclient:commons-httpclient:3.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="The Jakarta Commons HttpClient library"
+HOMEPAGE="https://hc.apache.org/httpclient-legacy/;
+SRC_URI="mirror://apache/httpcomponents/${PN}/source/${P}-src.tar.gz
+ verify-sig? (
https://downloads.apache.org/httpcomponents/commons-httpclient/source/${P}-src.tar.gz.asc
)"
+S="${WORKDIR}/${P}"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+# Tests run: 2036, Failures: 91
+RESTRICT="test"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/httpclient.commons.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons-httpclient )"
+DEPEND="
+ dev-java/commons-logging:0
+ dev-java/commons-codec:0
+ >=virtual/jdk-1.8:*
+ test? ( >=dev-java/ant-1.10.14:0[junit] )
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( NOTICE README RELEASE_NOTES )
+
+JAVA_ENCODING="ISO-8859-1"
+JAVA_CLASSPATH_EXTRA="
+ commons-logging
+ commons-codec
+"
+JAVA_SRC_DIR="src/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test"
+
+src_prepare() {
+ java-pkg-2_src_prepare
+ rm -r docs/apidocs || die "clean apidocs"
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ use doc && docinto html dodoc -r docs
+}
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-httpclient/
commit: 14acb0b49a2d63d3d61045823efd462ff22e7c80
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Thu May 5 19:16:14 2022 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Fri May 6 06:15:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14acb0b4
dev-java/commons-httpclient: drop 4.5.13-r1
Artifact was wrongly added to this package.
Moved to dev-java/httpcomponents-client
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/25337
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/commons-httpclient/Manifest | 1 -
.../commons-httpclient-4.5.13-r1.ebuild| 74 --
2 files changed, 75 deletions(-)
diff --git a/dev-java/commons-httpclient/Manifest
b/dev-java/commons-httpclient/Manifest
index b31577627594..a8ecdcddf113 100644
--- a/dev-java/commons-httpclient/Manifest
+++ b/dev-java/commons-httpclient/Manifest
@@ -1,2 +1 @@
DIST commons-httpclient-3.1-src.tar.gz 1882664 BLAKE2B
ccf96bedad09011ee20eae38aae1fdfdd6fea5a8226f4b4d156762080c286c71b34c149035abfd61e70c55a1de84ab3cd38d73c3228f591dd8e16c0a7e79c3a5
SHA512
e73ceeba3f34a35c30b24a3c6cb8dfc2102ff21079a5ff9270935908cb2f707d366c2f31a53fbdafa99673cc2b82e05470a2bf40d96767c72b2ab037c0f55490
-DIST httpcomponents-client-4.5.13-src.tar.gz 824131 BLAKE2B
1507c81749a92afcf8b170b606761236d71b02d8b8b257d753a0f09abbdc297057df39661e827dee52804a2138de7d201b2a837418cbec21085fd3ffd558b51c
SHA512
421e413fb2206fa95b6428ff067cdf2b440d2d3d4503cc3ca9bcf70ccd8ed1b8273ec4fe0703e6a8cd7612940b7ed966d9f163dbfeb8bf699ae2a8b2e0866d05
diff --git a/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
b/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
deleted file mode 100644
index 38274be97d07..
--- a/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom
httpcomponents-client-4.5.13/httpclient/pom.xml --download-uri
https://github.com/apache/httpcomponents-client/archive/refs/tags/rel/v4.5.13.tar.gz
--slot 4 --keywords "~amd64 ~ppc64 ~x86" --ebuild
commons-httpclient-4.5.13.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.httpcomponents:httpclient:4.5.13"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Apache HttpComponents Client"
-HOMEPAGE="https://hc.apache.org/httpcomponents-client;
-SRC_URI="mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-${PV}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-
-# Common dependencies
-# POM: httpcomponents-client-${PV}/httpclient/pom.xml
-# commons-codec:commons-codec:1.11 -> >=dev-java/commons-codec-1.15:0
-# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-# org.apache.httpcomponents:httpcore:4.4.13 -> >=dev-java/httpcore-4.4.14:0
-
-CDEPEND="
- dev-java/commons-codec:0
- dev-java/commons-logging:0
- dev-java/httpcore:0
-"
-
-# Compile dependencies
-# POM: httpcomponents-client-${PV}/httpclient/pom.xml
-# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4
-# test? org.mockito:mockito-core:1.10.19 -> >=dev-java/mockito-1.9.5:0
-
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.8:*
- test? (
- dev-java/hamcrest-core:1.3
- dev-java/mockito:0
- )"
-
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.8:*"
-
-DOCS=( ../{LICENSE,NOTICE,README,RELEASE_NOTES}.txt )
-
-S="${WORKDIR}/httpcomponents-client-${PV}/httpclient"
-
-JAVA_GENTOO_CLASSPATH="commons-codec,commons-logging,httpcore"
-JAVA_SRC_DIR=(
- "src/main/java"
- "src/main/java-deprecated"
-)
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito,hamcrest-core-1.3"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_EXCLUDES=(
- # Tests run: 929, Failures: 1
- # javax.net.ssl.SSLHandshakeException: Remote host terminated the
handshake
- "org.apache.http.conn.ssl.TestSSLSocketFactory"
-)
-
-src_install() {
- default
- java-pkg-simple_src_install
-}
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-httpclient/
commit: 3e9ae0d0e079e3430943a63265b8ed93efc23058
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sun Feb 20 18:39:42 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Sun Feb 20 20:28:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e9ae0d0
dev-java/commons-httpclient: Adjust HOMEPAGE
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/24288
Signed-off-by: Florian Schmaus gentoo.org>
dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
b/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
index 33d729be1df0..6e82213d770d 100644
--- a/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
@@ -9,7 +9,7 @@ MAVEN_ID="commons-httpclient:commons-httpclient:3.1"
inherit java-pkg-2 java-ant-2
DESCRIPTION="The Jakarta Commons HttpClient library"
-HOMEPAGE="https://hc.apache.org/;
+HOMEPAGE="https://hc.apache.org/httpclient-legacy/;
SRC_URI="mirror://apache/httpcomponents/${PN}/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="3"
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-httpclient/
commit: a2df61fd92f41dc9b1fb1ec374c584a4a983b406
Author: Sam James gentoo org>
AuthorDate: Wed Feb 9 01:24:22 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Feb 9 01:24:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2df61fd
dev-java/commons-httpclient: Stabilize 3.1-r2 arm64, #832896
Signed-off-by: Sam James gentoo.org>
dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
b/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
index f74e7fa80a51..33d729be1df0 100644
--- a/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://hc.apache.org/;
SRC_URI="mirror://apache/httpcomponents/${PN}/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
IUSE=""
# doesn't work with IBM JDK, bug #176133
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-httpclient/
commit: 70ab18c373e90c897471b9c1a37c365b1bcda5fe
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Jan 7 20:41:53 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Jan 7 20:41:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70ab18c3
dev-java/commons-httpclient: Keyword 3.1-r2 arm64, #830680
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
b/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
index 51610e0c3de9..f74e7fa80a51 100644
--- a/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://hc.apache.org/;
SRC_URI="mirror://apache/httpcomponents/${PN}/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="3"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
IUSE=""
# doesn't work with IBM JDK, bug #176133
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-httpclient/
commit: 733d67d3c491ce3c0a1b69583fc3cec8b97095c9
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Jan 7 20:41:54 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Jan 7 20:41:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=733d67d3
dev-java/commons-httpclient: Keyword 4.5.13-r1 arm64, #830680
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
b/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
index d3dd8ac9bea7..38274be97d07 100644
--- a/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
@@ -18,7 +18,7 @@
SRC_URI="mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-
LICENSE="Apache-2.0"
SLOT="4"
-KEYWORDS="amd64 ~arm ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
# Common dependencies
# POM: httpcomponents-client-${PV}/httpclient/pom.xml
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-httpclient/
commit: 62c3280bb7b24e73b6f442fc8c2a425b6244f176
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Jan 7 20:38:07 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Jan 7 20:40:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62c3280b
dev-java/commons-httpclient: Keyword 4.5.13-r1 arm, #830680
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
b/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
index 004ca865dbdb..d3dd8ac9bea7 100644
--- a/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
@@ -18,7 +18,7 @@
SRC_URI="mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-
LICENSE="Apache-2.0"
SLOT="4"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm ppc64 x86"
# Common dependencies
# POM: httpcomponents-client-${PV}/httpclient/pom.xml
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-httpclient/
commit: 3693ad90753355aa02d8c9ee5f4d6978d7d8049f
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Jan 7 20:38:07 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Jan 7 20:40:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3693ad90
dev-java/commons-httpclient: Keyword 3.1-r2 arm, #830680
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
b/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
index 5921250be5ee..51610e0c3de9 100644
--- a/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ HOMEPAGE="https://hc.apache.org/;
SRC_URI="mirror://apache/httpcomponents/${PN}/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="3"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux"
IUSE=""
# doesn't work with IBM JDK, bug #176133
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-httpclient/
commit: 2e726e162cf5b3294df6a0da50bc6f285e4e53cf
Author: Sam James gentoo org>
AuthorDate: Mon Jul 26 06:24:06 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Jul 26 06:24:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e726e16
dev-java/commons-httpclient: Stabilize 4.5.13-r1 ppc64, #758302
Signed-off-by: Sam James gentoo.org>
dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
b/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
index c13ad142839..004ca865dbd 100644
--- a/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
@@ -18,7 +18,7 @@
SRC_URI="mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-
LICENSE="Apache-2.0"
SLOT="4"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
# Common dependencies
# POM: httpcomponents-client-${PV}/httpclient/pom.xml
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-httpclient/
commit: 5a90918b8b3117232ceb189e49dad4d3f78dedf7
Author: Sam James gentoo org>
AuthorDate: Mon Jul 19 18:34:28 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Jul 19 18:34:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a90918b
dev-java/commons-httpclient: Stabilize 4.5.13-r1 amd64, #758302
Signed-off-by: Sam James gentoo.org>
dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
b/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
index a9080209c2f..c13ad142839 100644
--- a/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
@@ -18,7 +18,7 @@
SRC_URI="mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-
LICENSE="Apache-2.0"
SLOT="4"
-KEYWORDS="~amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
# Common dependencies
# POM: httpcomponents-client-${PV}/httpclient/pom.xml
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-httpclient/
commit: ef08e6bd4dea15dfc41899457cc91807b7df8461
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Thu Jul 15 16:58:31 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Fri Jul 16 06:32:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef08e6bd
dev-java/commons-httpclient: remove obsolete
Bug: https://bugs.gentoo.org/801475
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/21656
Signed-off-by: Miroslav Šulc gentoo.org>
.../commons-httpclient-4.5.13.ebuild | 73 --
1 file changed, 73 deletions(-)
diff --git a/dev-java/commons-httpclient/commons-httpclient-4.5.13.ebuild
b/dev-java/commons-httpclient/commons-httpclient-4.5.13.ebuild
deleted file mode 100644
index 736ff629cee..000
--- a/dev-java/commons-httpclient/commons-httpclient-4.5.13.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom
httpcomponents-client-4.5.13/httpclient/pom.xml --download-uri
https://github.com/apache/httpcomponents-client/archive/refs/tags/rel/v4.5.13.tar.gz
--slot 4 --keywords "~amd64 ~ppc64 ~x86" --ebuild
commons-httpclient-4.5.13.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.httpcomponents:httpclient:4.5.13"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Apache HttpComponents Client"
-HOMEPAGE="https://hc.apache.org/httpcomponents-client;
-SRC_URI="mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-${PV}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-# Common dependencies
-# POM: httpcomponents-client-${PV}/httpclient/pom.xml
-# commons-codec:commons-codec:1.11 -> >=dev-java/commons-codec-1.15:0
-# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-# org.apache.httpcomponents:httpcore:4.4.13 -> >=dev-java/httpcore-4.4.14:0
-
-CDEPEND="
- dev-java/commons-codec:0
- dev-java/commons-logging:0
- dev-java/httpcore:0
-"
-
-# Compile dependencies
-# POM: httpcomponents-client-${PV}/httpclient/pom.xml
-# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4
-# test? org.mockito:mockito-core:1.10.19 -> >=dev-java/mockito-1.9.5:0
-
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.8:*
- test? (
- dev-java/mockito:0
- )"
-
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.8:*"
-
-DOCS=( ../{LICENSE,NOTICE,README,RELEASE_NOTES}.txt )
-
-S="${WORKDIR}/httpcomponents-client-${PV}/httpclient"
-
-JAVA_GENTOO_CLASSPATH="commons-codec,commons-logging,httpcore"
-JAVA_SRC_DIR=(
- "src/main/java"
- "src/main/java-deprecated"
-)
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_EXCLUDES=(
- # Tests run: 929, Failures: 1
- # javax.net.ssl.SSLHandshakeException: Remote host terminated the
handshake
- "org.apache.http.conn.ssl.TestSSLSocketFactory"
-)
-
-src_install() {
- default
- java-pkg-simple_src_install
-}
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-httpclient/
commit: e0b8ea15be77cb21eaf1c86de41e98e92e00bde5
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Thu Jul 15 16:57:00 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Fri Jul 16 06:32:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0b8ea15
dev-java/commons-httpclient: depend on hamcrest-core
Bug: https://bugs.gentoo.org/801475
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Miroslav Šulc gentoo.org>
.../commons-httpclient-4.5.13-r1.ebuild| 74 ++
1 file changed, 74 insertions(+)
diff --git a/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
b/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
new file mode 100644
index 000..e4b77b275fb
--- /dev/null
+++ b/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom
httpcomponents-client-4.5.13/httpclient/pom.xml --download-uri
https://github.com/apache/httpcomponents-client/archive/refs/tags/rel/v4.5.13.tar.gz
--slot 4 --keywords "~amd64 ~ppc64 ~x86" --ebuild
commons-httpclient-4.5.13.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.httpcomponents:httpclient:4.5.13"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache HttpComponents Client"
+HOMEPAGE="https://hc.apache.org/httpcomponents-client;
+SRC_URI="mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: httpcomponents-client-${PV}/httpclient/pom.xml
+# commons-codec:commons-codec:1.11 -> >=dev-java/commons-codec-1.15:0
+# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
+# org.apache.httpcomponents:httpcore:4.4.13 -> >=dev-java/httpcore-4.4.14:0
+
+CDEPEND="
+ dev-java/commons-codec:0
+ dev-java/commons-logging:0
+ dev-java/httpcore:0
+"
+
+# Compile dependencies
+# POM: httpcomponents-client-${PV}/httpclient/pom.xml
+# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4
+# test? org.mockito:mockito-core:1.10.19 -> >=dev-java/mockito-1.9.5:0
+
+DEPEND="${CDEPEND}
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/hamcrest-core:1.3
+ dev-java/mockito:0
+ )"
+
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.8:*"
+
+DOCS=( ../{LICENSE,NOTICE,README,RELEASE_NOTES}.txt )
+
+S="${WORKDIR}/httpcomponents-client-${PV}/httpclient"
+
+JAVA_GENTOO_CLASSPATH="commons-codec,commons-logging,httpcore"
+JAVA_SRC_DIR=(
+ "src/main/java"
+ "src/main/java-deprecated"
+)
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito,hamcrest-core-1.3"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+ # Tests run: 929, Failures: 1
+ # javax.net.ssl.SSLHandshakeException: Remote host terminated the
handshake
+ "org.apache.http.conn.ssl.TestSSLSocketFactory"
+)
+
+src_install() {
+ default
+ java-pkg-simple_src_install
+}
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-httpclient/
commit: 74381de068c890ea97defeeae91ee47f0233f415
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Tue Jun 8 18:25:02 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sat Jul 10 11:01:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74381de0
dev-java/commons-httpclient: bump to 4.5.13
Bug: https://bugs.gentoo.org/758302
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes:
https://github.com/gentoo/gentoo/pull/21197/commits/282b2f490a05b41948ba1b53c856a60c7db58e03
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/commons-httpclient/Manifest | 1 +
.../commons-httpclient-4.5.13.ebuild | 73 ++
2 files changed, 74 insertions(+)
diff --git a/dev-java/commons-httpclient/Manifest
b/dev-java/commons-httpclient/Manifest
index a8ecdcddf11..b3157762759 100644
--- a/dev-java/commons-httpclient/Manifest
+++ b/dev-java/commons-httpclient/Manifest
@@ -1 +1,2 @@
DIST commons-httpclient-3.1-src.tar.gz 1882664 BLAKE2B
ccf96bedad09011ee20eae38aae1fdfdd6fea5a8226f4b4d156762080c286c71b34c149035abfd61e70c55a1de84ab3cd38d73c3228f591dd8e16c0a7e79c3a5
SHA512
e73ceeba3f34a35c30b24a3c6cb8dfc2102ff21079a5ff9270935908cb2f707d366c2f31a53fbdafa99673cc2b82e05470a2bf40d96767c72b2ab037c0f55490
+DIST httpcomponents-client-4.5.13-src.tar.gz 824131 BLAKE2B
1507c81749a92afcf8b170b606761236d71b02d8b8b257d753a0f09abbdc297057df39661e827dee52804a2138de7d201b2a837418cbec21085fd3ffd558b51c
SHA512
421e413fb2206fa95b6428ff067cdf2b440d2d3d4503cc3ca9bcf70ccd8ed1b8273ec4fe0703e6a8cd7612940b7ed966d9f163dbfeb8bf699ae2a8b2e0866d05
diff --git a/dev-java/commons-httpclient/commons-httpclient-4.5.13.ebuild
b/dev-java/commons-httpclient/commons-httpclient-4.5.13.ebuild
new file mode 100644
index 000..736ff629cee
--- /dev/null
+++ b/dev-java/commons-httpclient/commons-httpclient-4.5.13.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom
httpcomponents-client-4.5.13/httpclient/pom.xml --download-uri
https://github.com/apache/httpcomponents-client/archive/refs/tags/rel/v4.5.13.tar.gz
--slot 4 --keywords "~amd64 ~ppc64 ~x86" --ebuild
commons-httpclient-4.5.13.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.httpcomponents:httpclient:4.5.13"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache HttpComponents Client"
+HOMEPAGE="https://hc.apache.org/httpcomponents-client;
+SRC_URI="mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: httpcomponents-client-${PV}/httpclient/pom.xml
+# commons-codec:commons-codec:1.11 -> >=dev-java/commons-codec-1.15:0
+# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
+# org.apache.httpcomponents:httpcore:4.4.13 -> >=dev-java/httpcore-4.4.14:0
+
+CDEPEND="
+ dev-java/commons-codec:0
+ dev-java/commons-logging:0
+ dev-java/httpcore:0
+"
+
+# Compile dependencies
+# POM: httpcomponents-client-${PV}/httpclient/pom.xml
+# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4
+# test? org.mockito:mockito-core:1.10.19 -> >=dev-java/mockito-1.9.5:0
+
+DEPEND="${CDEPEND}
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/mockito:0
+ )"
+
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.8:*"
+
+DOCS=( ../{LICENSE,NOTICE,README,RELEASE_NOTES}.txt )
+
+S="${WORKDIR}/httpcomponents-client-${PV}/httpclient"
+
+JAVA_GENTOO_CLASSPATH="commons-codec,commons-logging,httpcore"
+JAVA_SRC_DIR=(
+ "src/main/java"
+ "src/main/java-deprecated"
+)
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+ # Tests run: 929, Failures: 1
+ # javax.net.ssl.SSLHandshakeException: Remote host terminated the
handshake
+ "org.apache.http.conn.ssl.TestSSLSocketFactory"
+)
+
+src_install() {
+ default
+ java-pkg-simple_src_install
+}
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-httpclient/files/, dev-java/commons-httpclient/
commit: 248eb60af631c757e16d0fcc5a498ba42357f04a
Author: Miroslav Šulc gentoo org>
AuthorDate: Fri Mar 12 11:01:08 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Fri Mar 12 12:18:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=248eb60a
dev-java/commons-httpclient: eapi7, added maven id, min jdk/jre 1.8
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Miroslav Šulc gentoo.org>
...1-r1.ebuild => commons-httpclient-3.1-r2.ebuild} | 21 +
...tpclient-3.1-SSLProtocolSocketFactory.java.patch | 4 ++--
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild
b/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
similarity index 80%
rename from dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild
rename to dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
index 0c9f3363633..5921250be5e 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 45df330092a..c059bf496a4 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;
