0397197231
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 OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=21
67 lines
3.8 KiB
Diff
67 lines
3.8 KiB
Diff
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" />
|