Hello community,
here is the log from the commit of package mysql-connector-java for
openSUSE:Factory checked in at 2015-05-16 07:12:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mysql-connector-java (Old)
and /work/SRC/openSUSE:Factory/.mysql-connector-java.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-connector-java"
Changes:
--------
---
/work/SRC/openSUSE:Factory/mysql-connector-java/mysql-connector-java.changes
2015-04-02 15:58:12.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.mysql-connector-java.new/mysql-connector-java.changes
2015-05-16 07:12:53.000000000 +0200
@@ -1,0 +2,19 @@
+Tue Apr 21 15:22:44 UTC 2015 - [email protected]
+
+- Update to 5.1.35 (see CHANGES for full list of issues)
+ bnc#927981 CVE-2015-2575:
+ * http://dev.mysql.com/doc/relnotes/connector-j/en/news-5-1.html
+- Remove not applicable patch:
+ * mysql-connector-java-7-jdbc-4.1.patch
+- Do not explicitely check for jdk6 but be happy with 7 and 8:
+ * jdk6-check-use-jdk7.patch
+- Do not require hibernate4 to actually build:
+ * extra-libs-build.patch
+- Do not build jdk5 depending jdbc3:
+ * no-jdk5-requirement.patch
+- Add and rebase jdbc4.1 patch:
+ * mysql-connector-java-jdbc-4.1.patch
+- Add new patch to build tests:
+ * use-classpath-in-tests.patch
+
+-------------------------------------------------------------------
Old:
----
mysql-connector-java-5.1.25-suse.tar.xz
mysql-connector-java-7-jdbc-4.1.patch
New:
----
extra-libs-build.patch
generate-tarball.sh
jdk6-check-use-jdk7.patch
mysql-connector-java-5.1.35-suse.tar.xz
mysql-connector-java-jdbc-4.1.patch
no-jdk5-requirement.patch
use-classpath-in-tests.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mysql-connector-java.spec ++++++
--- /var/tmp/diff_new_pack.UVy0kO/_old 2015-05-16 07:12:54.000000000 +0200
+++ /var/tmp/diff_new_pack.UVy0kO/_new 2015-05-16 07:12:54.000000000 +0200
@@ -17,32 +17,33 @@
Name: mysql-connector-java
-Version: 5.1.25
+Version: 5.1.35
Release: 0
Summary: Official JDBC Driver for MySQL
License: GPL-2.0+
Group: Development/Libraries/Java
-Url: http://www.mysql.com/downloads/api-jdbc-stable.html
-# url-for-download:
http://dev.mysql.com/get/Downloads/Connector-J/%{name}-%{version}.zip/from/pick#mirrors
-# docs are now under very strict proprietary license by Oracle, so lets not
distribute them
-# remove bundled jars as well
-# tar -xf %{name}-%{version}.tar.gz
-# rm -rf %{name}-%{version}/docs
-# find %{name}-%{version} -name '*jar' -delete
-# tar -xJf %{name}-%{version}-suse.tar.xz
+Url: http://dev.mysql.com/downloads/connector/j/
Source0: %{name}-%{version}-suse.tar.xz
-# Patch to build Java 7/jdbc 4.1
-Patch0: mysql-connector-java-7-jdbc-4.1.patch
+# 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
BuildRequires: ant
BuildRequires: ant-contrib
BuildRequires: apache-commons-logging
-#BuildRequires: jta >= 1.0
BuildRequires: geronimo-jta-1_1-api
-#BuildRequires: java-1_5_0-gcj-compat-devel
BuildRequires: java-devel >= 1.6.0
BuildRequires: javapackages-tools
BuildRequires: junit
-#!BuildIgnore: maven2-bootstrap
BuildRequires: log4j-mini
BuildRequires: slf4j
BuildRequires: xz
@@ -69,6 +70,10 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
# dup
rm -f README
@@ -76,13 +81,15 @@
sed -i -e 's/.$//' README.txt
%build
-
# disable jboss integration
rm -rf src/com/mysql/jdbc/integration/jboss
rm src/testsuite/regression/ConnectionRegressionTest.java
rm src/testsuite/regression/DataSourceRegressionTest.java
rm src/testsuite/simple/ReadOnlyCallableStatementTest.java
rm src/testsuite/simple/jdbc4/StatementsTest.java
+# disable hibernate4 integration
+rm -rf src/com/mysql/fabric/hibernate
+rm -rf src/demo
export CLASSPATH=$(build-classpath \
ant-contrib \
@@ -92,17 +99,12 @@
jta \
junit \
log4j)
-
-# we need jdk5 for jdbc3.0
-# XXX: JAVA_HOME must be setup **after** CLASSPATH
-#export JAVA_HOME=%{_libdir}/jvm/java-1.5.0-gcj
ant \
-Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
-DbuildDir=build-mysql-jdbc \
-DdistDir=dist-mysql-jdbc \
- -Dcom.mysql.jdbc.java6.javac="%{javac}" \
- -Dcom.mysql.jdbc.java6.java="%{java}" \
- -Dcom.mysql.jdbc.java6.rtjar"=%{java_home}/jre/lib/rt.jar"
+ -Dcom.mysql.jdbc.jdk6.javac="%{javac}" \
+ -Dcom.mysql.jdbc.jdk6.java="%{java}"
%install
install -d -m 755 %{buildroot}%{_javadir}
++++++ extra-libs-build.patch ++++++
Index: mysql-connector-java-5.1.35/build.xml
===================================================================
--- mysql-connector-java-5.1.35.orig/build.xml
+++ mysql-connector-java-5.1.35/build.xml
@@ -449,7 +449,7 @@ Java 6 (for JDBC4+ implementation) is al
<!-- Add commercial license configuration class (Build). -->
- <target name="-init-filter-license" depends="-extra-libs-check,
-init-copy" if="com.mysql.jdbc.filterLicense">
+ <target name="-init-filter-license" depends="-init-copy"
if="com.mysql.jdbc.filterLicense">
<copy
file="${com.mysql.jdbc.extra.libs}/CommercialLicenseConfiguration.notjava"
toFile="${buildDir}/${fullProdName}/com/mysql/jdbc/LicenseConfiguration.java"
overwrite="true" />
@@ -457,7 +457,7 @@ Java 6 (for JDBC4+ implementation) is al
<!-- Add no-crypto export control class (Build). -->
- <target name="-init-no-crypto" depends="-extra-libs-check, -init-copy"
if="com.mysql.jdbc.noCryptoBuild">
+ <target name="-init-no-crypto" depends="-init-copy"
if="com.mysql.jdbc.noCryptoBuild">
<copy
file="${com.mysql.jdbc.extra.libs}/ExportControlledNoCrypto.notjava"
toFile="${buildDir}/${fullProdName}/com/mysql/jdbc/ExportControlled.java"
overwrite="true" />
@@ -465,7 +465,7 @@ Java 6 (for JDBC4+ implementation) is al
<!-- Copy commercial license configuration class (Package). -->
- <target name="-copy-filter-license" depends="-extra-libs-check,
-init-copy" if="com.mysql.jdbc.filterLicense">
+ <target name="-copy-filter-license" depends="-init-copy"
if="com.mysql.jdbc.filterLicense">
<copy
file="${com.mysql.jdbc.extra.libs}/CommercialLicenseConfiguration.notjava"
toFile="${packageDest}/src/com/mysql/jdbc/LicenseConfiguration.java"
overwrite="true" />
@@ -473,7 +473,7 @@ Java 6 (for JDBC4+ implementation) is al
<!-- Copy no-crypto export control class (Package). -->
- <target name="-copy-no-crypto" depends="-extra-libs-check, -init-copy"
if="com.mysql.jdbc.noCryptoBuild">
+ <target name="-copy-no-crypto" depends="-init-copy"
if="com.mysql.jdbc.noCryptoBuild">
<copy
file="${com.mysql.jdbc.extra.libs}/ExportControlledNoCrypto.notjava"
toFile="${packageDest}/src/com/mysql/jdbc/ExportControlled.java"
overwrite="true" />
@@ -481,7 +481,7 @@ Java 6 (for JDBC4+ implementation) is al
<!-- Copy README-commercial info (Package). -->
- <target name="-copy-license-commercial" depends="-extra-libs-check,
-init-copy" if="com.mysql.jdbc.commercialBuild">
+ <target name="-copy-license-commercial" depends="-init-copy"
if="com.mysql.jdbc.commercialBuild">
<copy file="${com.mysql.jdbc.extra.libs}/README-commercial"
tofile="${packageDest}/README.txt" filtering="true">
<filterset refid="versionFilterset" />
<filterset refid="licenseFilterset" />
@@ -500,7 +500,7 @@ Java 6 (for JDBC4+ implementation) is al
<!-- Copy LICENCE.mysql and replace license commercial headers (Package).
-->
- <target name="-replace-license-commercial" depends="-extra-libs-check,
-init-copy" if="com.mysql.jdbc.commercialBuild">
+ <target name="-replace-license-commercial" depends="-init-copy"
if="com.mysql.jdbc.commercialBuild">
<delete file="${packageDest}/COPYING" />
<copy file="${com.mysql.jdbc.extra.libs}/LICENSE.mysql"
toDir="${packageDest}" />
@@ -773,6 +773,7 @@ Java 6 (for JDBC4+ implementation) is al
compiler="modern"
includeantruntime="false">
<include name="**/*.java" />
+ <exclude name="demo/**" />
<exclude name="testsuite/**" />
<exclude name="com/mysql/jdbc/integration/**" />
<exclude name="com/mysql/jdbc/log/Log4JLogger.java" />
++++++ generate-tarball.sh ++++++
#!/bin/sh
VERSION=$1
rm -rf mysql-connector-java-$VERSION
tar xfz mysql-connector-java-$VERSION.tar.gz || exit 1
find mysql-connector-java-$VERSION -name '*.jar' -exec rm {} \; -o -name
'*.zip' -exec rm {} \;
tar cfJ mysql-connector-java-$VERSION-suse.tar.xz mysql-connector-java-$VERSION
|| exit 1
rm -rf mysql-connector-java-$VERSION
exit 0
++++++ jdk6-check-use-jdk7.patch ++++++
Index: mysql-connector-java-5.1.35/build.xml
===================================================================
--- mysql-connector-java-5.1.35.orig/build.xml
+++ mysql-connector-java-5.1.35/build.xml
@@ -267,10 +267,7 @@ Java 6 (for JDBC4+ implementation) is al
<fail message="Java 6 (for JDBC4+ implementation) is required. Set the
full path to this JDK home with the property 'com.mysql.jdbc.jdk6'. Default:
'/usr/lib/jvm/jdk1.6'.">
<condition>
<not>
- <and>
- <equals arg1="${jdk6checkexitstatus}" arg2="0" />
- <contains string="${com.mysql.jdbc.jdk6.version}"
substring="java version "1.6" casesensitive="true" />
- </and>
+ <equals arg1="${jdk6checkexitstatus}" arg2="0" />
</not>
</condition>
</fail>
++++++ mysql-connector-java-5.1.25-suse.tar.xz ->
mysql-connector-java-5.1.35-suse.tar.xz ++++++
++++ 296462 lines of diff (skipped)
++++++ mysql-connector-java-7-jdbc-4.1.patch ->
mysql-connector-java-jdbc-4.1.patch ++++++
++++ 2846 lines (skipped)
++++ between
/work/SRC/openSUSE:Factory/mysql-connector-java/mysql-connector-java-7-jdbc-4.1.patch
++++ and
/work/SRC/openSUSE:Factory/.mysql-connector-java.new/mysql-connector-java-jdbc-4.1.patch
++++++ no-jdk5-requirement.patch ++++++
Index: mysql-connector-java-5.1.35/build.xml
===================================================================
--- mysql-connector-java-5.1.35.orig/build.xml
+++ mysql-connector-java-5.1.35/build.xml
@@ -219,7 +219,7 @@ com.mysql.jdbc.noCleanBetweenCompiles=ye
<!-- Check for required JDKs for compilation. -->
- <target name="-compiler-check" depends="-jdk5-check, -jdk6-check" />
+ <target name="-compiler-check" depends="-jdk6-check" />
<!-- Check for required JDK5 for compilation of JDBC3 implementation. -->
@@ -756,7 +756,7 @@ Java 6 (for JDBC4+ implementation) is al
<!-- Compile the driver including JDBC3 and JDBC4+ implementations only.
-->
<target name="compile-driver"
description="Compiles driver including JDBC3 and JDBC4+
implementations only."
- depends="-compile-driver-jdbc3, -compile-driver-jdbc4" />
+ depends="-compile-driver-jdbc4" />
<!-- Compile JDBC3 implementation. -->
@@ -787,7 +787,7 @@ Java 6 (for JDBC4+ implementation) is al
<!-- Compile JDBC4+ implementation. -->
- <target name="-compile-driver-jdbc4" depends="-compile-driver-jdbc3">
+ <target name="-compile-driver-jdbc4" depends="init, -clean-output">
<echo>Compiling MySQL Connector/J JDBC4+ implementation with
'${com.mysql.jdbc.jdk6}' to '${compiler.output}'</echo>
<javac sourcepath=""
@@ -816,21 +816,6 @@ Java 6 (for JDBC4+ implementation) is al
<javac sourcepath=""
srcdir="${buildDir}/${fullProdName}"
- destdir="${compiler.output}"
- deprecation="off"
- debug="${debug.enable}"
- fork="yes"
- executable="${com.mysql.jdbc.jdk5.javac}"
- compiler="modern"
- includeantruntime="false">
- <include name="testsuite/**" />
- <exclude name="testsuite/requiresNonRedists/**" />
- <exclude name="testsuite/**/jdbc4/**" />
- <classpath refid="project.build.classpath" />
- </javac>
-
- <javac sourcepath=""
- srcdir="${buildDir}/${fullProdName}"
destdir="${compiler.output}"
deprecation="off"
debug="${debug.enable}"
++++++ use-classpath-in-tests.patch ++++++
Index: mysql-connector-java-5.1.35/build.xml
===================================================================
--- mysql-connector-java-5.1.35.orig/build.xml
+++ mysql-connector-java-5.1.35/build.xml
@@ -191,6 +191,7 @@ com.mysql.jdbc.noCleanBetweenCompiles=ye
</fileset>
<pathelement location="${buildDir}/${fullProdName}" />
+ <pathelement path="${java.class.path}" />
</path>
