pool/mysql-connector-java
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
94b1cd0d11
mysql-connector-java/no-jdk5-requirement.patch

32 lines
1.3 KiB
Diff
Raw Normal View History

- 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 OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=33
2017-05-18 13:05:10 +02:00
Index: mysql-connector-java-5.1.42/build.xml
- 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 OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=21
2015-04-21 19:01:55 +02:00
===================================================================
- 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 OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=33
2017-05-18 13:05:10 +02:00
--- mysql-connector-java-5.1.42.orig/build.xml
+++ mysql-connector-java-5.1.42/build.xml
@@ -255,7 +255,7 @@ com.mysql.jdbc.noCleanBetweenCompiles=ye
- 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 OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=21
2015-04-21 19:01:55 +02:00
<!-- Check for required JDKs for compilation. -->
- 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 OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=33
2017-05-18 13:05:10 +02:00
- <target name="-compiler-check" depends="-jdk5-check, -jdk8-check, -jre6-rtjar-check" />
+ <target name="-compiler-check" depends="-jdk8-check, -jre6-rtjar-check" />
- 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 OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=21
2015-04-21 19:01:55 +02:00
- 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 OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=33
2017-05-18 13:05:10 +02:00
<!-- Check for required JDK5 for compilation of JDBC 3 implementation. -->
@@ -854,7 +854,7 @@ Java 8 (for JDBC 4+ implementation) is a
- Fix the patches to allow jdbc3 build and reenable it: * mysql-connector-java-jdbc-4.1.patch * no-jdk5-requirement.patch OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=27
2015-06-11 17:13:13 +02:00
deprecation="off"
debug="${debug.enable}"
fork="yes"
OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=23
2015-04-22 10:48:35 +02:00
- executable="${com.mysql.jdbc.jdk5.javac}"
- Fix the patches to allow jdbc3 build and reenable it: * mysql-connector-java-jdbc-4.1.patch * no-jdk5-requirement.patch OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=27
2015-06-11 17:13:13 +02:00
+ executable="${com.mysql.jdbc.jdk6.javac}"
compiler="modern"
- 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 OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=33
2017-05-18 13:05:10 +02:00
includeantruntime="false"
source="1.5"
@@ -929,7 +929,7 @@ Java 8 (for JDBC 4+ implementation) is a
OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=23
2015-04-22 10:48:35 +02:00
deprecation="off"
debug="${debug.enable}"
- Fix the patches to allow jdbc3 build and reenable it: * mysql-connector-java-jdbc-4.1.patch * no-jdk5-requirement.patch OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=27
2015-06-11 17:13:13 +02:00
fork="yes"
- executable="${com.mysql.jdbc.jdk5.javac}"
+ executable="${com.mysql.jdbc.jdk6.javac}"
compiler="modern"
- 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 OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=33
2017-05-18 13:05:10 +02:00
includeantruntime="false"
source="1.5"
Reference in New Issue Copy Permalink