This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch jessie-security in repository mysql-connector-java.
commit b2c29bf06c975f20679d6ad59fca775547b5225e Author: Markus Koschany <[email protected]> Date: Wed Jul 6 22:31:18 2016 +0200 Add disable-JDBC42-invocation.patch --- debian/changelog | 5 ++-- debian/patches/disable-JDBC42-invocation.patch | 36 ++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7422880..8e2ab01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,9 +10,10 @@ mysql-connector-java (5.1.39-1~deb8u1) jessie-security; urgency=high access to some MySQL Connectors accessible data as well as read access to a subset of MySQL Connectors accessible data. * Relax build-dependency on default-jdk to >= 1.7. - * Do not build the JDBC 4+ implementation which requires Java 8. + * Do not build the JDBC 4+ implementation which requires Java 8 and disable + JDBC42 invocations. - -- Markus Koschany <[email protected]> Wed, 22 Jun 2016 15:02:52 +0200 + -- Markus Koschany <[email protected]> Wed, 06 Jul 2016 22:31:55 +0200 mysql-connector-java (5.1.39-1) unstable; urgency=medium diff --git a/debian/patches/disable-JDBC42-invocation.patch b/debian/patches/disable-JDBC42-invocation.patch new file mode 100644 index 0000000..163c6da --- /dev/null +++ b/debian/patches/disable-JDBC42-invocation.patch @@ -0,0 +1,36 @@ +From: Fritz Elfert <[email protected]> +Date: Wed, 6 Jul 2016 22:29:07 +0200 +Subject: disable JDBC42 invocation + +Debian-Bug: https://bugs.debian.org/828836 +--- + src/com/mysql/jdbc/Util.java | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +diff --git a/src/com/mysql/jdbc/Util.java b/src/com/mysql/jdbc/Util.java +index e9797ad..500a09c 100644 +--- a/src/com/mysql/jdbc/Util.java ++++ b/src/com/mysql/jdbc/Util.java +@@ -62,7 +62,7 @@ public class Util { + + private static boolean isJdbc4; + +- private static boolean isJdbc42; ++ private static boolean isJdbc42 = false; + + private static int jvmVersion = -1; + +@@ -76,13 +76,6 @@ public class Util { + isJdbc4 = false; + } + +- try { +- Class.forName("java.sql.JDBCType"); +- isJdbc42 = true; +- } catch (Throwable t) { +- isJdbc42 = false; +- } +- + String jvmVersionString = System.getProperty("java.version"); + int startPos = jvmVersionString.indexOf('.'); + int endPos = startPos + 1; diff --git a/debian/patches/series b/debian/patches/series index 2e7cf14..e1bc656 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ 0003-disable-hibernate-fabric.patch 0004-skip-jdk-check.patch remove-JDBC-4-classes.patch +disable-JDBC42-invocation.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mysql-connector-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
