Use javax.net.ssl instead of com.sun.net.ssl. Now compiles with ibm-jdk-bin-1.5. Bug #175994.

(Portage version: 2.1.2.5)

4 files changed, 106 insertions, 1 deletions

diff --git a/dev-java/jtds/ChangeLog b/dev-java/jtds/ChangeLog
index bfb308841e8e..f4e8121aab2c 100644
--- a/dev-java/jtds/ChangeLog
+++ b/dev-java/jtds/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jtds
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/ChangeLog,v 1.10 2007/04/25 17:42:17 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/ChangeLog,v 1.11 2007/05/07 18:43:33 betelgeuse Exp $
+
+*jtds-1.2-r2 (07 May 2007)
+
+  07 May 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +files/1.2-com.sun.patch, +jtds-1.2-r2.ebuild:
+  Use javax.net.ssl instead of com.sun.net.ssl. Now compiles with
+  ibm-jdk-bin-1.5. Bug #175994.
 
 *jtds-1.2-r1 (25 Apr 2007)
 
diff --git a/dev-java/jtds/files/1.2-com.sun.patch b/dev-java/jtds/files/1.2-com.sun.patch
new file mode 100644
index 000000000000..b6b3437aceaa
--- /dev/null
+++ b/dev-java/jtds/files/1.2-com.sun.patch
@@ -0,0 +1,42 @@
+Index: src/main/net/sourceforge/jtds/ssl/SocketFactories.java
+===================================================================
+RCS file: /cvsroot/jtds/jtds/src/main/net/sourceforge/jtds/ssl/SocketFactories.java,v
+retrieving revision 1.7
+diff -u -r1.7 SocketFactories.java
+--- src/main/net/sourceforge/jtds/ssl/SocketFactories.java	28 Apr 2005 14:29:30 -0000	1.7
++++ src/main/net/sourceforge/jtds/ssl/SocketFactories.java	7 May 2007 18:36:12 -0000
+@@ -29,9 +29,9 @@
+ import javax.net.ssl.SSLSocket;
+ import javax.net.ssl.SSLSocketFactory;
+ 
+-import com.sun.net.ssl.SSLContext;
+-import com.sun.net.ssl.TrustManager;
+-import com.sun.net.ssl.X509TrustManager;
++import javax.net.ssl.SSLContext;
++import javax.net.ssl.TrustManager;
++import javax.net.ssl.X509TrustManager;
+ 
+ import net.sourceforge.jtds.util.Logger;
+ 
+@@ -184,17 +184,13 @@
+                     return new X509Certificate[0];
+                 }
+ 
+-                public boolean isClientTrusted(X509Certificate[] chain) {
+-                    return true;
+-                }
++                public void checkClientTrusted(X509Certificate[] chain, String authType) {}
+ 
+-                public boolean isServerTrusted(X509Certificate[] chain) {
+-                    return true;
+-                }
++                public void checkServerTrusted(X509Certificate[] chain, String authType) {}
+             };
+ 
+             return new X509TrustManager[]{tm};
+         }
+ 
+     }
+-}
+\ No newline at end of file
++}
diff --git a/dev-java/jtds/files/digest-jtds-1.2-r2 b/dev-java/jtds/files/digest-jtds-1.2-r2
new file mode 100644
index 000000000000..5e0ddfe8879d
--- /dev/null
+++ b/dev-java/jtds/files/digest-jtds-1.2-r2
@@ -0,0 +1,3 @@
+MD5 900ebcbf2eaa502f85dc7e2d44abfc94 jtds-1.2-src.zip 3489215
+RMD160 b7f79995090201af570239b5105d5ced030174f3 jtds-1.2-src.zip 3489215
+SHA256 60020866fec76fc246db5eaafc894a2348ac2d910139da8e9be91d23362d9b4e jtds-1.2-src.zip 3489215
diff --git a/dev-java/jtds/jtds-1.2-r2.ebuild b/dev-java/jtds/jtds-1.2-r2.ebuild
new file mode 100644
index 000000000000..04137a459f93
--- /dev/null
+++ b/dev-java/jtds/jtds-1.2-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/jtds-1.2-r2.ebuild,v 1.1 2007/05/07 18:43:33 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="jTDS - SQL Server and Sybase JDBC driver"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
+HOMEPAGE="http://jtds.sourceforge.net"
+LICENSE="LGPL-2.1"
+SLOT="1.2"
+KEYWORDS="~x86 ~amd64"
+COMMON_DEPEND="
+	=dev-java/jcifs-1*
+	>=dev-java/junit-3.8"
+# does not like javax.sql in >=1.6
+DEPEND="
+	|| (
+		=virtual/jdk-1.5*
+		=virtual/jdk-1.4*
+	)
+	${COMMON_DEPEND}
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPEND}"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/1.0.3-buildxml.patch"
+	# http://sourceforge.net/tracker/index.php?func=detail&aid=1714497&group_id=33291&atid=407764
+	epatch "${FILESDIR}/1.2-com.sun.patch"
+
+	cd "${S}/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from jcifs-1.1
+	#TODO: don't always build tests
+	java-pkg_jar-from junit
+}
+
+src_install() {
+	java-pkg_dojar build/*.jar
+
+	dodoc CHANGELOG README* || die "Failed to install docs."
+	use doc && java-pkg_dojavadoc build/doc
+	use source && java-pkg_dosrc ${S}/src/main/*
+}