Hello community,
here is the log from the commit of package mysql-connector-java for
openSUSE:Factory checked in at 2017-05-31 13:29:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mysql-connector-java (Old)
and /work/SRC/openSUSE:Factory/.mysql-connector-java.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-connector-java"
Wed May 31 13:29:37 2017 rev:26 rq:496681 version:5.1.42
Changes:
--------
---
/work/SRC/openSUSE:Factory/mysql-connector-java/mysql-connector-java.changes
2017-05-06 18:24:52.307693352 +0200
+++
/work/SRC/openSUSE:Factory/.mysql-connector-java.new/mysql-connector-java.changes
2017-05-31 13:29:39.705041042 +0200
@@ -1,0 +2,39 @@
+Fri May 19 11:34:06 UTC 2017 - dziolkow...@suse.com
+
+- New build dependency: javapackages-local
+- cleaned spec using spec-cleaner
+
+-------------------------------------------------------------------
+Thu May 18 12:40:03 UTC 2017 - tchva...@suse.com
+
+- Hardcode requirement for java 1.8 or newer to build
+
+-------------------------------------------------------------------
+Thu May 18 11:55:03 UTC 2017 - tchva...@suse.com
+
+- Drop patch use-classpath-in-tests.patch
+- Add patch disabling testsuite:
+ * disable-testsuite.patch
+- Drop patch extra-libs-build.patch:
+ * Rather use the thing to propagate some wrongly found libs
+- Drop patch no-jdk5-requirement.patch:
+ * Simply override the value in ant command
+- Add patch hibernate-check.patch to remove hibernate check
+- Add patch compile-jdk7.patch to compile with old JDK versions
+
+-------------------------------------------------------------------
+Thu May 18 10:42:07 UTC 2017 - tchva...@suse.com
+
+- Version update to 5.1.42 bsc#1035210 bsc#1035697 bsc#1035211:
+ * CVE-2017-3589 CVE-2017-3523 CVE-2017-3586
+ * http://dev.mysql.com/doc/relnotes/connector-j/en/news-5-1.html
+- Remove upstreamed mysql-connector-java-5.1.35-CVE-2017-3523.patch
+- Refresh patch extra-libs-build.patch
+- Drop obsolete patch jdk6-check-use-jdk7.patch
+- Refresh patch no-jdk5-requirement.patch
+- Attempt to refresh mysql-connector-java-jdbc-4.1.patch
+ * Partialy merged by upstream, many conflicts
+- Add patch to relax compiler check:
+ * javac-check.patch
+
+-------------------------------------------------------------------
Old:
----
extra-libs-build.patch
jdk6-check-use-jdk7.patch
mysql-connector-java-5.1.35-CVE-2017-3523.patch
mysql-connector-java-5.1.35-suse.tar.xz
no-jdk5-requirement.patch
use-classpath-in-tests.patch
New:
----
compile-jdk7.patch
disable-testsuite.patch
hibernate-check.patch
javac-check.patch
mysql-connector-java-5.1.42-suse.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mysql-connector-java.spec ++++++
--- /var/tmp/diff_new_pack.OCBqKb/_old 2017-05-31 13:29:40.404942389 +0200
+++ /var/tmp/diff_new_pack.OCBqKb/_new 2017-05-31 13:29:40.404942389 +0200
@@ -17,7 +17,7 @@
Name: mysql-connector-java
-Version: 5.1.35
+Version: 5.1.42
Release: 0
Summary: Official JDBC Driver for MySQL
License: GPL-2.0+
@@ -27,24 +27,17 @@
# Script to repack upstream tarball
# ./generate-tarball.sh VERSION
Source99: generate-tarball.sh
-# PATCH-FIX-UPSTREAM: do not strictly require jdk6 to compile
-Patch0: jdk6-check-use-jdk7.patch
-# PATCH-FIX-UPSTREAM: do not require hibernate4 to actually just build
-Patch1: extra-libs-build.patch
-# PATCH-FIX-SUSE: do not build jdbc3 driver needing too old java
-Patch2: no-jdk5-requirement.patch
-# PATCH-FIX-UPSTREAM: build with jdbc4.1 and also with new javac
-Patch3: mysql-connector-java-jdbc-4.1.patch
-# PATCH-FIX-UPSTREAM: do not lose classpath during tests build
-Patch4: use-classpath-in-tests.patch
-# PATCH_FIX-UPSTREAM: CVE-2017-3523 Oracle MySQL <=5.1.40 Connector/J
-# Remote Code Execution Vulnerability
-Patch5: mysql-connector-java-5.1.35-CVE-2017-3523.patch
+Patch0: javac-check.patch
+Patch1: hibernate-check.patch
+Patch2: mysql-connector-java-jdbc-4.1.patch
+Patch3: disable-testsuite.patch
+Patch4: compile-jdk7.patch
BuildRequires: ant
BuildRequires: ant-contrib
BuildRequires: apache-commons-logging
BuildRequires: geronimo-jta-1_1-api
-BuildRequires: java-devel >= 1.6.0
+BuildRequires: java-devel >= 1.8.0
+BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildRequires: junit
BuildRequires: log4j-mini
@@ -77,13 +70,18 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
# dup
rm -f README
# wrong end of line encoding
sed -i -e 's/.$//' README.txt
+# extra libs
+mkdir -p lib
+mkdir -p src/lib
+ln -f -s %{_datadir}/java/ant/ant-contrib.jar lib/ant-contrib.jar
+ln -f -s %{_datadir}/java/slf4j/api.jar lib/slf4j-api.jar
+
%build
# disable jboss integration
rm -rf src/com/mysql/jdbc/integration/jboss
@@ -104,17 +102,19 @@
junit \
log4j)
ant \
- -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
- -DbuildDir=build-mysql-jdbc \
- -DdistDir=dist-mysql-jdbc \
- -Dcom.mysql.jdbc.jdk6.javac="%{javac}" \
- -Dcom.mysql.jdbc.jdk6.java="%{java}" \
+ -Dcom.mysql.jdbc.jdk5.javac=%javac \
+ -Dcom.mysql.jdbc.jdk8.javac=%javac \
+ -Dsnapshot.version= \
+ -Dcom.mysql.jdbc.extra.libs=lib \
+ -Dant.java.version=1.5 \
+ -Dant.build.javac.source=1.6 \
+ -Dant.build.javac.target=1.7 \
dist
%install
install -d -m 755 %{buildroot}%{_javadir}
-install
./build-mysql-jdbc/%{name}-%{version}-SNAPSHOT/%{name}-%{version}-SNAPSHOT-bin.jar
\
+install ./build/%{name}-%{version}/%{name}-%{version}-bin.jar \
%{buildroot}%{_javadir}/%{name}.jar
rm -rf %{buildroot}%{name}-%{version}/docs/release-test-output
@@ -130,7 +130,11 @@
%defattr(0644,root,root,0755)
%doc CHANGES COPYING README.txt
%attr(0644,root,root) %{_javadir}/%{name}.jar
+%if %{?suse_version} > 1320
%config(noreplace) %{_datadir}/maven-metadata/%{name}.xml*
+%else
+%config(noreplace) %{_mavendepmapfragdir}/*
+%endif
%{_mavenpomdir}/*.pom
%changelog
++++++ compile-jdk7.patch ++++++
Index: mysql-connector-java-5.1.42/build.xml
===================================================================
--- mysql-connector-java-5.1.42.orig/build.xml
+++ mysql-connector-java-5.1.42/build.xml
@@ -911,8 +911,8 @@ Java 8 (for JDBC 4+ implementation) is a
executable="${com.mysql.jdbc.jdk8.javac}"
compiler="modern"
includeantruntime="false"
- source="1.8"
- target="1.8">
+ source="1.6"
+ target="1.6">
<include name="**/JDBC42*.java" />
<classpath refid="project.build.classpath" />
<compilerarg line="${javac.compilerarg}" />
@@ -970,8 +970,8 @@ Java 8 (for JDBC 4+ implementation) is a
executable="${com.mysql.jdbc.jdk8.javac}"
compiler="modern"
includeantruntime="false"
- source="1.8"
- target="1.8">
+ source="1.6"
+ target="1.6">
<include name="testsuite/**/jdbc42/**" />
<classpath refid="project.build.classpath" />
<compilerarg line="${javac.compilerarg}" />
++++++ disable-testsuite.patch ++++++
From: Debian Java Maintainers <pkg-java-maintain...@lists.alioth.debian.org>
Date: Thu, 25 Aug 2011 10:44:00 +0200
Subject: [PATCH] disable testsuite
---
build.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
--- a/build.xml
+++ b/build.xml
@@ -835,7 +835,7 @@
<!-- Compile the driver including JDBC 3 and JDBC 4+ implementations,
JUnit test suite and 'helpers' for third-party software. -->
<target name="compile"
description="Compiles driver including JDBC 3 and JDBC 4+
implementations, JUnit test suite and integration 'helpers' for third-party
software."
- depends="init, compile-driver, compile-testsuite,
compile-integration" />
+ depends="init, compile-driver, compile-integration" />
<!-- Compile the driver including JDBC 3 and JDBC 4+ implementations only.
-->
++++++ hibernate-check.patch ++++++
Description: Do not compile MultiTenantConnectionProvider since it requires
Hibernate 4 which isn't in Debian yet
Author: Emmanuel Bourg <ebo...@apache.org>
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
@@ -244,6 +244,7 @@
</not>
</condition>
</fail>
+<!--
<fail message="Hibernate libraries, required for build tasks, must be
in the directory '${com.mysql.jdbc.extra.libs}/hibernate4'.">
<condition>
<not>
@@ -251,6 +252,7 @@
</not>
</condition>
</fail>
+-->
</target>
@@ -889,8 +891,10 @@
bootclasspath="${com.mysql.jdbc.jre6.rtjar}"
source="1.6"
target="1.6">
+<!--
<include name="**/FabricMultiTenantConnectionProvider.java" />
<include name="**/HibernateFabric.java" />
+-->
<include name="**/JDBC4*.java" />
<exclude name="**/JDBC42*.java" />
<include name="com/mysql/jdbc/exceptions/jdbc4/*" />
++++++ javac-check.patch ++++++
Description: Disable the JDK check
Author: Emmanuel Bourg <ebo...@apache.org>
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
@@ -415,7 +415,7 @@
<!-- Prepares files and settings for compiling driver. -->
- <target name="init" depends="-compiler-check, -init-copy,
-init-filter-license, -init-no-crypto">
+ <target name="init" depends="-init-copy, -init-filter-license,
-init-no-crypto">
<!-- The following is needed for source distributions as the classpath
can't be dynamically altered, and not having this directory present causes the
build to fail. -->
<available file="${com.mysql.jdbc.docs.sourceDir}"
property="com.mysql.jdbc.docs.sourcesPresent" />
++++++ mysql-connector-java-5.1.35-suse.tar.xz ->
mysql-connector-java-5.1.42-suse.tar.xz ++++++
++++ 73230 lines of diff (skipped)
++++++ mysql-connector-java-jdbc-4.1.patch ++++++
++++ 2884 lines (skipped)
++++ between
/work/SRC/openSUSE:Factory/mysql-connector-java/mysql-connector-java-jdbc-4.1.patch
++++ and
/work/SRC/openSUSE:Factory/.mysql-connector-java.new/mysql-connector-java-jdbc-4.1.patch
