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

Update to 2.3.0

Browse Source
This commit is contained in:
Jakub Janco 2018-11-26 12:08:01 +01:00
parent e22a7a7e4b
commit 4db32b7b02
4 changed files with 26 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -14,3 +14,4 @@
/2.2.4.tar.gz
/2.2.5.tar.gz
/2.2.6.tar.gz
/2.3.0.tar.gz

5
mariadb-java-client.spec
View File

@ -1,5 +1,5 @@
Name: mariadb-java-client
Version: 2.2.6
Version: 2.3.0
Release: 1%{?dist}
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
@ -137,6 +137,9 @@ cp target/%{name}-%{version}-tests.jar %{buildroot}/%{_jnidir}/%{name}-tests.jar
%license LICENSE
%changelog
* Mon Nov 26 2018 Jakub Janco <jjanco@redhat.com> - 2.3.0-1
- new version
* Tue Aug 07 2018 Jakub Janco <jjanco@redhat.com> - 2.2.6-1
- new version

79
remove_waffle-jna.patch
View File

@ -1,63 +1,24 @@
From d4d3f02f3b940693e99f065dd543e6bc03721f53 Mon Sep 17 00:00:00 2001
From: Jakub Janco <jjanco@redhat.com>
Date: Sat, 5 May 2018 15:37:06 +0200
Subject: [PATCH] Remove WindowsNativeSspiAuthentication This dependency is
optional and not in Fedora
---
.../internal/com/send/SendGssApiAuthPacket.java | 26 +---------------------
1 file changed, 1 insertion(+), 25 deletions(-)
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
index 55771a61..d6a76979 100644
--- a/src/main/java/org/mariadb/jdbc/internal/com/send/SendGssApiAuthPacket.java
+++ b/src/main/java/org/mariadb/jdbc/internal/com/send/SendGssApiAuthPacket.java
@@ -57,7 +57,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.isEmpty()) mechanisms = "Kerberos";
- GssapiAuth gssapiAuth = getAuthenticationMethod();
+ GssapiAuth gssapiAuth = new StandardGssapiAuthentication(reader, packSeq);
gssapiAuth.authenticate(pos, serverPrincipalName, mechanisms);
}
@@ -107,28 +106,5 @@ public class SendGssApiAuthPacket extends AbstractAuthSwitchSendResponsePacket i
}
}
- /**
- * Get authentication method according to classpath.
- * Windows native authentication is using Waffle-jna.
- *
- * @return authentication method
- */
- private GssapiAuth getAuthenticationMethod() {
diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/gssapi/GssUtility.java b/src/main/java/org/mariadb/jdbc/internal/com/send/gssapi/GssUtility.java
index fbfd4cb5..1d54c2bd 100644
--- a/src/main/java/org/mariadb/jdbc/internal/com/send/gssapi/GssUtility.java
+++ b/src/main/java/org/mariadb/jdbc/internal/com/send/gssapi/GssUtility.java
@@ -13,19 +13,6 @@ public class GssUtility {
* @return authentication method
*/
public static BiFunction<PacketInputStream, Integer, GssapiAuth> getAuthenticationMethod() {
- try {
- //Waffle-jna has jna as dependency, so if not available on classpath, just use standard authentication
- if (Platform.isWindows()) {
- try {
- //Waffle-jna has jna as dependency, so if not available on classpath, just use standard authentication
- if (Platform.isWindows()) {
- try {
- Class.forName("waffle.windows.auth.impl.WindowsAuthProviderImpl");
- return new WindowsNativeSspiAuthentication(reader, packSeq);
- } catch (ClassNotFoundException cle) {
- //waffle not in the classpath
- }
- }
- } catch (Throwable cle) {
- //jna jar's are not in classpath
- Class.forName("waffle.windows.auth.impl.WindowsAuthProviderImpl");
- return (reader, packSeq) -> new WindowsNativeSspiAuthentication(reader, packSeq);
- } catch (ClassNotFoundException cle) {
- //waffle not in the classpath
- }
- return new StandardGssapiAuthentication(reader, packSeq);
- }
- } catch (Throwable cle) {
- //jna jar's are not in classpath
- }
-
}
return (reader, packSeq) -> new StandardGssapiAuthentication(reader, packSeq);
}
--
2.14.3

2
sources
View File

@ -1 +1 @@
SHA512 (2.2.6.tar.gz) = 400eca213fe555da0098987b00d04f9e29efc4ac84515505cbbd08105ba7eac1b305791d481dfb727767b920728f261dade0146ecc4c1c1a32036b4061803963
SHA512 (2.3.0.tar.gz) = b9408ba48dd6a5cbff98878ce85fec7891edf6f63fd1f88bccf5fbddecd36d506e46ebd9caa7c92a36e2a856022709608e0e012f20c8b1c22cf2f37dbd7f5fc7