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, (SSLSo
