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

Package-Manager: portage-2.1.2.5

5 files changed, 124 insertions, 8 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/Manifest b/dev-java/jtds/Manifest
index d56230844389..3816438964ee 100644
--- a/dev-java/jtds/Manifest
+++ b/dev-java/jtds/Manifest
@@ -9,6 +9,10 @@ AUX 1.0.3-buildxml.patch 1043 RMD160 5637eae6ac7368fbeae32d5aa112ca018f4892cf SH
 MD5 791c11d2de983b6e6a4cf3694cf0106f files/1.0.3-buildxml.patch 1043
 RMD160 5637eae6ac7368fbeae32d5aa112ca018f4892cf files/1.0.3-buildxml.patch 1043
 SHA256 34810830f3aa1fd43bf21957c4c05bfe7f409ad7e229bd912f5cc0a67445dc45 files/1.0.3-buildxml.patch 1043
+AUX 1.2-com.sun.patch 1474 RMD160 102af5a075184de8df0396f142b6e7e061c84322 SHA1 13c7ea250ab8ba747d6662acf95f7681c5b06354 SHA256 cbc223c0ea7df88db087133bc4d65be4e660833dbb540801f4699d7b78f51bea
+MD5 8535dda006a78b0f5b97726ab84ef3f2 files/1.2-com.sun.patch 1474
+RMD160 102af5a075184de8df0396f142b6e7e061c84322 files/1.2-com.sun.patch 1474
+SHA256 cbc223c0ea7df88db087133bc4d65be4e660833dbb540801f4699d7b78f51bea files/1.2-com.sun.patch 1474
 AUX buildxml-gentoo.patch 2919 RMD160 09e8138ccf2b60bd797afbf11fa77f50c7e1cead SHA1 a86a6397a2b5f39664e93dc7b84395a2e5ef24a3 SHA256 ad850b2cc62eaf90163af5285044e359fda7baac582fca744135290d0a0c1b79
 MD5 f3a1bea2ce8720ca91b3e2d813631ca9 files/buildxml-gentoo.patch 2919
 RMD160 09e8138ccf2b60bd797afbf11fa77f50c7e1cead files/buildxml-gentoo.patch 2919
@@ -28,14 +32,18 @@ EBUILD jtds-1.2-r1.ebuild 1130 RMD160 3339db0ef78ca85aef06eee564cf4b0c09f4ff5e S
 MD5 53098bc5b3f9e7667830ab0c9eb532f0 jtds-1.2-r1.ebuild 1130
 RMD160 3339db0ef78ca85aef06eee564cf4b0c09f4ff5e jtds-1.2-r1.ebuild 1130
 SHA256 103520202fbd0e95a3facd655fb099d998b1c7f91431498b42d3925eef4c99e6 jtds-1.2-r1.ebuild 1130
+EBUILD jtds-1.2-r2.ebuild 1267 RMD160 b49047880b6c1283a0abfc793d5bcc1ff35c5000 SHA1 d37c9c984c94c1be94ed54018157fd4d9faec1cd SHA256 6e665a72485501999bd1533bc64e3cdc500f477763784139cb0f9de3ba3fab3f
+MD5 0c7d389d4f5082ac24eedd2e23471f53 jtds-1.2-r2.ebuild 1267
+RMD160 b49047880b6c1283a0abfc793d5bcc1ff35c5000 jtds-1.2-r2.ebuild 1267
+SHA256 6e665a72485501999bd1533bc64e3cdc500f477763784139cb0f9de3ba3fab3f jtds-1.2-r2.ebuild 1267
 EBUILD jtds-1.2.ebuild 1298 RMD160 e1679a5d19033445de7593b054b7067060d26ed0 SHA1 0d651a1dada0a023a7df98b1dab51dba1e58a7d0 SHA256 47bd50ddd9357092e881e2a5c2da2dee46c47c98e9c600b7a6bef8e365d01cd9
 MD5 e36b3b17cc91e4a0091661440c17f7b1 jtds-1.2.ebuild 1298
 RMD160 e1679a5d19033445de7593b054b7067060d26ed0 jtds-1.2.ebuild 1298
 SHA256 47bd50ddd9357092e881e2a5c2da2dee46c47c98e9c600b7a6bef8e365d01cd9 jtds-1.2.ebuild 1298
-MISC ChangeLog 1823 RMD160 c69f40c28145e046e91692c32d2042fa9e36815e SHA1 1555b562b76bda48d9080819775111cd5330eb21 SHA256 14c4f1146b1f2d9a82b43528ebeba90370da75313aeb83bec665f3e4d8845347
-MD5 b40e134a05a1848ad0f63f2c2e602b42 ChangeLog 1823
-RMD160 c69f40c28145e046e91692c32d2042fa9e36815e ChangeLog 1823
-SHA256 14c4f1146b1f2d9a82b43528ebeba90370da75313aeb83bec665f3e4d8845347 ChangeLog 1823
+MISC ChangeLog 2052 RMD160 f962c326280a4fd1945bb4e8d2f9fe5dd8f11148 SHA1 9af3a05ff20419d2ab81e77a1f5aa6d55abbae83 SHA256 e433d87520c9c76356de2c2aacc0bfcabf237aea3c835fd87ab1c7d70943152a
+MD5 bc05cff178d6bdde017fec994e8743c7 ChangeLog 2052
+RMD160 f962c326280a4fd1945bb4e8d2f9fe5dd8f11148 ChangeLog 2052
+SHA256 e433d87520c9c76356de2c2aacc0bfcabf237aea3c835fd87ab1c7d70943152a ChangeLog 2052
 MISC metadata.xml 728 RMD160 394d832af5454401e1f5e382465b1e05d2367e98 SHA1 ba2c17315d21d6afe07a1739b8e180cd84db7a3a SHA256 3e7b67c3c3850d9f00d6c036ae8f77d1346462bbb479f4fb82a732976220a3a7
 MD5 18b4e0bc9665a646af0bec4688bad602 metadata.xml 728
 RMD160 394d832af5454401e1f5e382465b1e05d2367e98 metadata.xml 728
@@ -52,10 +60,13 @@ SHA256 cdbec460ca437522dad0326270f0f5ed226518c75318147d4886e276d3a8a4eb files/di
 MD5 65195690fbb916cdb0855d4386d78a67 files/digest-jtds-1.2-r1 232
 RMD160 87453400508e3fcef8eefd6c7caa12303a03ee91 files/digest-jtds-1.2-r1 232
 SHA256 cdbec460ca437522dad0326270f0f5ed226518c75318147d4886e276d3a8a4eb files/digest-jtds-1.2-r1 232
+MD5 65195690fbb916cdb0855d4386d78a67 files/digest-jtds-1.2-r2 232
+RMD160 87453400508e3fcef8eefd6c7caa12303a03ee91 files/digest-jtds-1.2-r2 232
+SHA256 cdbec460ca437522dad0326270f0f5ed226518c75318147d4886e276d3a8a4eb files/digest-jtds-1.2-r2 232
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGL5L7cxLzpIGCsLQRAu57AJ4j4/opI6pYnszc8JbHMn0R35xifQCeLMjy
-sZRgf5ZxfdiCcFppVtKPmzE=
-=0CE6
+iD8DBQFGP3NecxLzpIGCsLQRAvXFAJ9/KYLL1iLUVCxePWruBNKpBGwOcgCeOBep
++dfYOeKBLmHM3JdpLS9JiWU=
+=S5OA
 -----END PGP SIGNATURE-----
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/*
+}