rpms/mariadb-java-client
5
0
Fork 0
Code Issues Pull Requests Releases Activity

version update

Browse Source
This commit is contained in:
Tomas Repik 2017-06-26 14:11:37 +02:00
parent 83acebd55b
commit 72005b58ba
4 changed files with 48 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -5,3 +5,4 @@
/1.5.3.tar.gz /1.5.3.tar.gz
/1.5.4.tar.gz /1.5.4.tar.gz
/1.5.5.tar.gz /1.5.5.tar.gz
/2.0.2.tar.gz

14
mariadb-java-client.spec
View File

@ -1,6 +1,6 @@
Name: mariadb-java-client Name: mariadb-java-client
Version: 1.5.5 Version: 2.0.2
Release: 2%{?dist} Release: 1%{?dist}
Summary: Connects applications developed in Java to MariaDB and MySQL databases Summary: Connects applications developed in Java to MariaDB and MySQL databases
# added BSD license because of https://bugzilla.redhat.com/show_bug.cgi?id=1291558#c13 # added BSD license because of https://bugzilla.redhat.com/show_bug.cgi?id=1291558#c13
License: BSD and LGPLv2+ License: BSD and LGPLv2+
@ -15,11 +15,12 @@ BuildRequires: maven-local
BuildRequires: mvn(net.java.dev.jna:jna) BuildRequires: mvn(net.java.dev.jna:jna)
BuildRequires: mvn(net.java.dev.jna:jna-platform) BuildRequires: mvn(net.java.dev.jna:jna-platform)
BuildRequires: mvn(com.google.code.maven-replacer-plugin:replacer) BuildRequires: mvn(com.google.code.maven-replacer-plugin:replacer)
BuildRequires: mvn(org.apache.maven.plugins:maven-javadoc-plugin)
# fedora 25 # fedora 25
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:)
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
# since version 1.5.2 missing optional dependency # since version 1.5.2 missing optional dependency (windows)
#BuildRequires: mvn(com.github.dblock.waffle:waffle-jna) #BuildRequires: mvn(com.github.dblock.waffle:waffle-jna)
Requires: mariadb Requires: mariadb
@ -48,7 +49,7 @@ done
# remove missing optional dependency waffle-jna # remove missing optional dependency waffle-jna
%pom_remove_dep com.github.dblock.waffle:waffle-jna %pom_remove_dep com.github.dblock.waffle:waffle-jna
# also remove the file using the removed plugin # also remove the file using the removed plugin
rm -f src/main/java/org/mariadb/jdbc/internal/packet/send/gssapi/WindowsNativeSspiAuthentication.java rm -f src/main/java/org/mariadb/jdbc/internal/com/send/gssapi/WindowsNativeSspiAuthentication.java
# patch the sources so that the missing file is not making trouble # patch the sources so that the missing file is not making trouble
%patch0 -p1 %patch0 -p1
@ -57,6 +58,8 @@ rm -f src/main/java/org/mariadb/jdbc/internal/packet/send/gssapi/WindowsNativeSs
%pom_remove_plugin org.apache.maven.plugins:maven-checkstyle-plugin %pom_remove_plugin org.apache.maven.plugins:maven-checkstyle-plugin
%pom_remove_plugin org.apache.maven.plugins:maven-source-plugin %pom_remove_plugin org.apache.maven.plugins:maven-source-plugin
%pom_remove_plugin org.sonatype.plugins:nexus-staging-maven-plugin
%pom_remove_plugin pl.project13.maven:git-commit-id-plugin
# remove preconfigured OSGi manifest file and generate OSGi manifest file # remove preconfigured OSGi manifest file and generate OSGi manifest file
# with maven-bundle-plugin instead of using maven-jar-plugin # with maven-bundle-plugin instead of using maven-jar-plugin
@ -105,6 +108,9 @@ rm src/main/resources/META-INF/MANIFEST.MF
%license LICENSE %license LICENSE
%changelog %changelog
* Mon Jun 26 2017 Tomas Repik <trepik@redhat.com> - 2.0.2-1
- version update
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.5-2 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

50
remove_waffle-jna.patch
View File

@ -1,24 +1,35 @@
--- mariadb-connector-j-1.5.2/src/main/java/org/mariadb/jdbc/internal/packet/send/SendGssApiAuthPacket.java 2016-08-31 01:52:20.000000000 +0200 From 560a30be0f79895d00868f7743da32302679343e Mon Sep 17 00:00:00 2001
+++ SendGssApiAuthPacket.java 2016-09-14 12:12:17.784284202 +0200 From: Tomas Repik <trepik@redhat.com>
@@ -55,7 +55,6 @@ Date: Mon, 26 Jun 2017 13:56:47 +0200
import org.mariadb.jdbc.internal.packet.result.ErrorPacket; Subject: [PATCH] remove waffle-jna
import org.mariadb.jdbc.internal.packet.send.gssapi.GssapiAuth;
import org.mariadb.jdbc.internal.packet.send.gssapi.StandardGssapiAuthentication; ---
-import org.mariadb.jdbc.internal.packet.send.gssapi.WindowsNativeSspiAuthentication; .../internal/com/send/SendGssApiAuthPacket.java | 31 +---------------------
import org.mariadb.jdbc.internal.stream.PacketOutputStream; 1 file changed, 1 insertion(+), 30 deletions(-)
import org.mariadb.jdbc.internal.util.buffer.Buffer;
import org.mariadb.jdbc.internal.util.dao.QueryException; diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/SendGssApiAuthPacket.java b/src/main/java/org/mariadb/jdbc/internal/com/send/SendGssApiAuthPacket.java
@@ -85,7 +84,7 @@ index b739b54..65c4507 100644
String mechanisms = buffer.readString(Charset.forName("UTF-8")); --- a/src/main/java/org/mariadb/jdbc/internal/com/send/SendGssApiAuthPacket.java
+++ b/src/main/java/org/mariadb/jdbc/internal/com/send/SendGssApiAuthPacket.java
@@ -56,7 +56,6 @@ import org.mariadb.jdbc.internal.com.read.Buffer;
import org.mariadb.jdbc.internal.com.read.ErrorPacket;
import org.mariadb.jdbc.internal.com.send.gssapi.GssapiAuth;
import org.mariadb.jdbc.internal.com.send.gssapi.StandardGssapiAuthentication;
-import org.mariadb.jdbc.internal.com.send.gssapi.WindowsNativeSspiAuthentication;
import org.mariadb.jdbc.internal.io.input.PacketInputStream;
import org.mariadb.jdbc.internal.io.output.PacketOutputStream;
@@ -88,7 +87,7 @@ public class SendGssApiAuthPacket extends AbstractAuthSwitchSendResponsePacket i
String mechanisms = buffer.readStringNullEnd(StandardCharsets.UTF_8);
if (mechanisms.equals("")) mechanisms = "Kerberos"; if (mechanisms.equals("")) mechanisms = "Kerberos";
- GssapiAuth gssapiAuth = getAuthenticationMethod(); - GssapiAuth gssapiAuth = getAuthenticationMethod();
+ GssapiAuth gssapiAuth = new StandardGssapiAuthentication(packetFetcher, packSeq); + GssapiAuth gssapiAuth = new StandardGssapiAuthentication(reader, packSeq);
gssapiAuth.authenticate(writer, serverPrincipalName, mechanisms); gssapiAuth.authenticate(pos, serverPrincipalName, mechanisms);
} }
@@ -103,33 +102,5 @@ @@ -106,33 +105,5 @@ public class SendGssApiAuthPacket extends AbstractAuthSwitchSendResponsePacket i
throw new QueryException("Authentication exception", 1045, "28000", e); throw new SQLException("Authentication exception", "28000", 1045, e);
} }
} }
- -
@ -38,7 +49,7 @@
- if (isWindows.booleanValue()) { - if (isWindows.booleanValue()) {
- try { - try {
- Class.forName("waffle.windows.auth.impl.WindowsAuthProviderImpl"); - Class.forName("waffle.windows.auth.impl.WindowsAuthProviderImpl");
- return new WindowsNativeSspiAuthentication(packetFetcher, packSeq); - return new WindowsNativeSspiAuthentication(reader, packSeq);
- } catch (ClassNotFoundException cle) { - } catch (ClassNotFoundException cle) {
- //waffle not in the classpath - //waffle not in the classpath
- } - }
@ -46,8 +57,11 @@
- } catch (Exception cle) { - } catch (Exception cle) {
- //jna jar's are not in classpath - //jna jar's are not in classpath
- } - }
- return new StandardGssapiAuthentication(packetFetcher, packSeq); - return new StandardGssapiAuthentication(reader, packSeq);
- } - }
- -
} }
--
2.9.4

2
sources
View File

@ -1 +1 @@
544f5f6d14753fe096a7202694bbad97 1.5.5.tar.gz SHA512 (2.0.2.tar.gz) = d34964e8789c7eeb67ce7b2be9464f7d894b9f6a80148ac1e7ca9f60dd3138b5f8a37a54a45e93ed4bb026fa35ea2fc67097c101cca09b1014d5c2a7508dc785