diff options
| author |   Thomas Matthijs <axxo@gentoo.org> | 2005-07-10 18:46:06 +0000 |
|---|---|---|
| committer | Thomas Matthijs <axxo@gentoo.org> | 2005-07-10 18:46:06 +0000 |
| commit | 4e3e3d54f6a3b4ba59e118b9fead7ddfcfa002bb (patch) | |
| tree | d6ece3cc26ff6975012864cf5ba14e3cafc92f9f /dev-java/jdbc-mysql | |
| parent | Ã~amd64 keyword (diff) | |
| download | historical-4e3e3d54f6a3b4ba59e118b9fead7ddfcfa002bb.tar.gz historical-4e3e3d54f6a3b4ba59e118b9fead7ddfcfa002bb.tar.bz2 historical-4e3e3d54f6a3b4ba59e118b9fead7ddfcfa002bb.zip | |
log4j fix
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'dev-java/jdbc-mysql')
| -rw-r--r-- | dev-java/jdbc-mysql/Manifest | 9 | ||||
| -rw-r--r-- | dev-java/jdbc-mysql/files/compile-without-log4j.patch | 19 | ||||
| -rw-r--r-- | dev-java/jdbc-mysql/jdbc-mysql-3.1.10.ebuild | 3 |
3 files changed, 26 insertions, 5 deletions
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest index 682511c10382..c42c6b586633 100644 --- a/dev-java/jdbc-mysql/Manifest +++ b/dev-java/jdbc-mysql/Manifest @@ -3,7 +3,7 @@ Hash: SHA1 MD5 25cb84184fd79630a56b4140bb069033 jdbc-mysql-3.0.16.ebuild 864 MD5 8d591c5fe9abbffec905f064673f678b jdbc-mysql-3.0.11.ebuild 638 -MD5 e2649beb48cd69c33f1672b7e83fee88 jdbc-mysql-3.1.10.ebuild 1185 +MD5 9a5411dedc5b0c08c819bb48e7282c10 jdbc-mysql-3.1.10.ebuild 1233 MD5 58fd79614b22f7c7055c9920bfcb5710 jdbc-mysql-3.0.17.ebuild 1010 MD5 574fc1c99e8ba56acbdd1a6571fc61a2 ChangeLog 5616 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 @@ -11,10 +11,11 @@ MD5 96778981695f92599ce9eac1c669a9b0 files/digest-jdbc-mysql-3.0.11 86 MD5 702d2b80aba3c4eb8db59e08716c954a files/digest-jdbc-mysql-3.0.16 83 MD5 d3e310eef0498efe3d56ad6ddcd306d9 files/digest-jdbc-mysql-3.0.17 83 MD5 28a1e7fdcedd48ae04a5f1631ac8b3b3 files/digest-jdbc-mysql-3.1.10 80 +MD5 9c5bb9d7e3bc63f3942f7e29a3f79707 files/compile-without-log4j.patch 674 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFC0WnC/rLF9B432nYRArnTAJ9TF29ohDSN/XL2I613Dr1lpDVvPgCfWcGs -A969F1FqxxdvI5Uo/a+3Yss= -=kfXS +iD8DBQFC0W0J/rLF9B432nYRAvaBAJ9sT7xcn97pBRO+RpX6KdARuldApACdGmAc +KvTd0v/0usSFK5tJyppO830= +=pGcM -----END PGP SIGNATURE----- diff --git a/dev-java/jdbc-mysql/files/compile-without-log4j.patch b/dev-java/jdbc-mysql/files/compile-without-log4j.patch new file mode 100644 index 000000000000..4e3e28ab9700 --- /dev/null +++ b/dev-java/jdbc-mysql/files/compile-without-log4j.patch @@ -0,0 +1,19 @@ +--- src/com/mysql/jdbc/ConnectionProperties.java.orig 2005-07-10 20:42:46.000000000 +0200 ++++ src/com/mysql/jdbc/ConnectionProperties.java 2005-07-10 20:43:16.000000000 +0200 +@@ -26,7 +26,6 @@ + + import com.mysql.jdbc.log.Jdk14Logger; + import com.mysql.jdbc.log.Log; +-import com.mysql.jdbc.log.Log4JLogger; + import com.mysql.jdbc.log.StandardLogger; + + import java.io.UnsupportedEncodingException; +@@ -2392,7 +2391,7 @@ + try { + // Is Log4J available? + Class.forName("org.apache.log4j.Level"); +- setLogger(Log4JLogger.class.getName()); ++ setLogger("org.apache.log4j.Level"); + } catch (Throwable t) { + try { + // Are we running on JDK-1.4? diff --git a/dev-java/jdbc-mysql/jdbc-mysql-3.1.10.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-3.1.10.ebuild index 81ce9d7116f2..d4e6e98877f1 100644 --- a/dev-java/jdbc-mysql/jdbc-mysql-3.1.10.ebuild +++ b/dev-java/jdbc-mysql/jdbc-mysql-3.1.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-3.1.10.ebuild,v 1.1 2005/07/10 18:13:26 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-3.1.10.ebuild,v 1.2 2005/07/10 18:46:06 axxo Exp $ inherit eutils java-pkg @@ -28,6 +28,7 @@ src_unpack() { unpack ${A} cd ${S} rm -f *.jar + epatch ${FILESDIR}/compile-without-log4j.patch sed -i 's,{buildDir}/MANIFEST.MF,{buildDir}/META-INF/MANIFEST.MF,' build.xml || die "sed failed" |