Sync from SUSE:ALP:Source:Standard:1.0 mysql-connector-java revision cdad0e2e6709520bacd2e328c7eece96
This commit is contained in:
commit
3eee14b183
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
## Default LFS
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||
16
javac-check.patch
Normal file
16
javac-check.patch
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
Description: Disable the JDK check
|
||||
Author: Emmanuel Bourg <ebourg@apache.org>
|
||||
Forwarded: not-needed
|
||||
Index: mysql-connector-j-8.0.31/build.xml
|
||||
===================================================================
|
||||
--- mysql-connector-j-8.0.31.orig/build.xml
|
||||
+++ mysql-connector-j-8.0.31/build.xml
|
||||
@@ -405,7 +405,7 @@ See also com.mysql.cj.conf.PropertyDefin
|
||||
|
||||
|
||||
<!-- Initialize the build directory and check requirements for compiling the driver code. -->
|
||||
- <target name="-init" depends="-extra-libs-check, -compiler-check, -copy-files, -copy-notices-commercial, -copy-notices-gpl, -init-info-files">
|
||||
+ <target name="-init" depends="-extra-libs-check, -copy-files, -copy-notices-commercial, -copy-notices-gpl, -init-info-files">
|
||||
<!-- The following is needed as the classpath can't be modified dynamically, and not having this library present causes the build to fail. -->
|
||||
<available property="com.mysql.cj.c3p0Present" classname="com.mchange.v2.c3p0.QueryConnectionTester" classpathref="com.mysql.cj.build.classpath" />
|
||||
</target>
|
||||
BIN
mysql-connector-java-8.2.0.tar.gz
(Stored with Git LFS)
Normal file
BIN
mysql-connector-java-8.2.0.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
mysql-connector-java-generated-for-protobuf-3.9.2.tar.xz
(Stored with Git LFS)
Normal file
BIN
mysql-connector-java-generated-for-protobuf-3.9.2.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
43
mysql-connector-java-remove-oci-support.patch
Normal file
43
mysql-connector-java-remove-oci-support.patch
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
Index: mysql-connector-j-8.2.0/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java
|
||||
===================================================================
|
||||
--- mysql-connector-j-8.2.0.orig/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java
|
||||
+++ mysql-connector-j-8.2.0/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java
|
||||
@@ -58,7 +58,6 @@ import com.mysql.cj.protocol.a.NativeCon
|
||||
import com.mysql.cj.protocol.a.authentication.AuthenticationFidoClient;
|
||||
import com.mysql.cj.protocol.a.authentication.AuthenticationKerberosClient;
|
||||
import com.mysql.cj.protocol.a.authentication.AuthenticationLdapSaslClientPlugin;
|
||||
-import com.mysql.cj.protocol.a.authentication.AuthenticationOciClient;
|
||||
import com.mysql.cj.protocol.a.authentication.AuthenticationWebAuthnClient;
|
||||
import com.mysql.cj.protocol.a.authentication.CachingSha2PasswordPlugin;
|
||||
import com.mysql.cj.protocol.a.authentication.MysqlClearPasswordPlugin;
|
||||
@@ -259,7 +258,6 @@ public class NativeAuthenticationProvide
|
||||
pluginsToInit.add(new MysqlOldPasswordPlugin());
|
||||
pluginsToInit.add(new AuthenticationLdapSaslClientPlugin());
|
||||
pluginsToInit.add(new AuthenticationKerberosClient());
|
||||
- pluginsToInit.add(new AuthenticationOciClient());
|
||||
pluginsToInit.add(new AuthenticationFidoClient());
|
||||
pluginsToInit.add(new AuthenticationWebAuthnClient());
|
||||
|
||||
Index: mysql-connector-j-8.2.0/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties
|
||||
===================================================================
|
||||
--- mysql-connector-j-8.2.0.orig/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties
|
||||
+++ mysql-connector-j-8.2.0/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties
|
||||
@@ -49,18 +49,6 @@ AuthenticationLdapSaslClientPlugin.Missi
|
||||
AuthenticationLdapSaslClientPlugin.FailCreateSaslClient=Failed creating a SASL client for the authentication mechanism ''{0}''.
|
||||
AuthenticationLdapSaslClientPlugin.ErrProcessingAuthIter=Error while processing an authentication iteration for the authentication mechanism ''{0}''.
|
||||
|
||||
-AuthenticationOciClientPlugin.ConfigFileNotFound=OCI configuration file not found.
|
||||
-AuthenticationOciClientPlugin.OciSdkNotFound=The OCI SDK cannot be found or it is not installed.
|
||||
-AuthenticationOciClientPlugin.OciConfigFileError=The OCI configuration file cannot be read.
|
||||
-AuthenticationOciClientPlugin.ProfileNotFound=The specified profile is not found in the OCI configuration file.
|
||||
-AuthenticationOciClientPlugin.OciConfigFileMissingEntry=The OCI configuration file does not contain a ''fingerprint'' or ''key_file'' entry.
|
||||
-AuthenticationOciClientPlugin.PrivateKeyNotFound=The private key cannot be found at the location referenced in the OCI configuration entry ''key_file''.
|
||||
-AuthenticationOciClientPlugin.FailedReadingPrivateKey=Failed reading the private key file referenced in the OCI configuration entry ''key_file''.
|
||||
-AuthenticationOciClientPlugin.PrivateKeyNotValid=The OCI configuration entry ''key_file'' does not reference a valid key file.
|
||||
-AuthenticationOciClientPlugin.SecurityTokenFileNotFound=The security token file cannot be found at the location referenced in the OCI configuration entry ''security_token_file''.
|
||||
-AuthenticationOciClientPlugin.SecurityTokenTooBig=Invalid security token file. File size above 10 KB.
|
||||
-AuthenticationOciClientPlugin.FailedReadingSecurityTokenFile=Failed reading the security token file referenced in the OCI configuration entry ''security_token_file''.
|
||||
-
|
||||
AuthenticationProvider.BadDefaultAuthenticationPlugin=Improper value "{0}" for property ''defaultAuthenticationPlugin''.
|
||||
AuthenticationProvider.DefaultAuthenticationPluginIsNotListed=Default authentication plugin "{0}" is neither one of the built-in plugins nor one of the plugins listed in ''authenticationPlugins''.
|
||||
AuthenticationProvider.BadDisabledAuthenticationPlugin=Can''t disable the default authentication plugin. Either remove "{0}" from the disabled authentication plugins list, or choose a different default authentication plugin.
|
||||
1217
mysql-connector-java.changes
Normal file
1217
mysql-connector-java.changes
Normal file
File diff suppressed because it is too large
Load Diff
148
mysql-connector-java.spec
Normal file
148
mysql-connector-java.spec
Normal file
|
|
@ -0,0 +1,148 @@
|
|||
#
|
||||
# spec file for package mysql-connector-java
|
||||
#
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%define new_name mysql-connector-j
|
||||
Name: mysql-connector-java
|
||||
Version: 8.2.0
|
||||
Release: 0
|
||||
Summary: Official JDBC Driver for MySQL
|
||||
License: GPL-2.0-or-later
|
||||
Group: Development/Languages/Java
|
||||
URL: https://dev.mysql.com/downloads/connector/j/
|
||||
Source0: https://github.com/mysql/mysql-connector-j/archive/refs/tags/%{version}.tar.gz#:/%{name}-%{version}.tar.gz
|
||||
# NOTE:
|
||||
# the following file contains the generated protobuf files with
|
||||
# previous versions of protoc (protobuf) that are needed to build
|
||||
# in previous SUSE distros.
|
||||
# Source from:
|
||||
# https://github.com/mysql/mysql-connector-j/commit/6976d9d779b498c254fc5cab5e69cfc74fc3e4f0
|
||||
Source1: mysql-connector-java-generated-for-protobuf-3.9.2.tar.xz
|
||||
Patch0: javac-check.patch
|
||||
# NOTE: Oracle OCI is not packaged yet
|
||||
# The patch doesn't remove the file AuthenticationOciClient.java
|
||||
# therefore it's removed during prep phase
|
||||
Patch1: %{name}-remove-oci-support.patch
|
||||
Patch2: reproducible-build.patch
|
||||
BuildRequires: ant
|
||||
BuildRequires: ant-contrib
|
||||
BuildRequires: apache-commons-logging
|
||||
BuildRequires: geronimo-jta-1_1-api
|
||||
BuildRequires: git
|
||||
BuildRequires: java-devel >= 1.8
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: javassist >= 3.28.0
|
||||
BuildRequires: junit
|
||||
BuildRequires: protobuf-java >= 3.9.2
|
||||
BuildRequires: slf4j
|
||||
BuildRequires: xz
|
||||
Requires: jta >= 1.0
|
||||
Requires: slf4j
|
||||
Provides: mm.mysql = %{version}
|
||||
Obsoletes: mm.mysql < %{version}
|
||||
# we'll be providing the new package name until this one is deprecated
|
||||
Provides: %{new_name}
|
||||
# manual is no longer distributed
|
||||
Provides: %{name}-manual = %{version}
|
||||
Obsoletes: %{name}-manual < %{version}
|
||||
BuildArch: noarch
|
||||
%if 0%{?suse_version} < 1500
|
||||
BuildRequires: log4j
|
||||
Requires: log4j
|
||||
%else
|
||||
BuildRequires: reload4j
|
||||
Requires: reload4j
|
||||
%endif
|
||||
|
||||
%description
|
||||
MySQL Connector/J is a native Java driver that converts JDBC (Java
|
||||
Database Connectivity) calls into the network protocol used by the
|
||||
MySQL database. It lets developers working with the Java programming
|
||||
language easily build programs and applets that interact with MySQL and
|
||||
connect all corporate data, even in a heterogeneous environment. MySQL
|
||||
Connector/J is a Type IV JDBC driver and has a complete JDBC feature
|
||||
set that supports the capabilities of MySQL.
|
||||
|
||||
%prep
|
||||
%setup -q -n mysql-connector-j-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
%if 0%{?suse_version} <= 1500 && 0%{?sle_version} <= 150200
|
||||
# ship protobuf generated files compatible with protobuf 3.9.2
|
||||
# which is the version we have in SLE15 SP2, the files were taken
|
||||
# from commit 6976d9d779b498c254fc5cab5e69cfc74fc3e4f0, which is
|
||||
# the last version compatible with that version of protobuf and
|
||||
# are equivalent in functionality
|
||||
tar -xvf %{SOURCE1} -C .
|
||||
%endif
|
||||
|
||||
# remove OCI support
|
||||
rm -rf src/main/protocol-impl/java/com/mysql/cj/protocol/a/authentication/AuthenticationOciClient.java
|
||||
|
||||
# extra libs
|
||||
mkdir -p lib
|
||||
mkdir -p src/lib
|
||||
ln -f -s %{_datadir}/java/ant/ant-contrib.jar lib/ant-contrib.jar
|
||||
ln -f -s %{_datadir}/java/slf4j/api.jar lib/slf4j-api.jar
|
||||
ln -s %{_datadir}/java/javassist.jar lib/javassist.jar
|
||||
ln -s %{_datadir}/java/protobuf.jar lib/protobuf.jar
|
||||
|
||||
%build
|
||||
|
||||
export CLASSPATH=$(build-classpath \
|
||||
ant-contrib \
|
||||
commons-logging \
|
||||
slf4j \
|
||||
jdbc-stdext\
|
||||
jta \
|
||||
junit \
|
||||
reload4j \
|
||||
protobuf)
|
||||
%{ant} \
|
||||
-Dsnapshot.version= \
|
||||
-Dcom.mysql.jdbc.extra.libs=lib \
|
||||
-Dant.java.version=1.8 \
|
||||
-Dant.build.javac.source=1.8 \
|
||||
-Dant.build.javac.target=1.8 \
|
||||
-Dcom.mysql.cj.build.jdk=%{java_home} \
|
||||
-Dcom.mysql.cj.build.jdk.javac=%javac \
|
||||
-Dcom.mysql.cj.build.jdk.java=%java \
|
||||
build
|
||||
|
||||
%install
|
||||
install -d -m 755 %{buildroot}%{_javadir}
|
||||
|
||||
install build/%{new_name}-%{version}-SNAPSHOT/%{new_name}-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/%{new_name}.jar
|
||||
ln -sf %{_javadir}/%{new_name}.jar %{buildroot}%{_javadir}/%{name}.jar
|
||||
|
||||
rm -rf %{buildroot}%{new_name}-%{version}/docs/release-test-output
|
||||
|
||||
install -d -m 755 %{buildroot}%{_mavenpomdir}
|
||||
|
||||
# Install the Maven build information as new name
|
||||
%mvn_install_pom build/%{new_name}-%{version}-SNAPSHOT/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{new_name}.pom
|
||||
sed -i 's/-SNAPSHOT//' %{buildroot}%{_mavenpomdir}/JPP-%{new_name}.pom
|
||||
%add_maven_depmap JPP-%{new_name}.pom %{new_name}.jar -a com.mysql:%{name}
|
||||
|
||||
%files -f .mfiles
|
||||
%{_javadir}/%{name}.jar
|
||||
%license LICENSE
|
||||
%doc CHANGES README
|
||||
|
||||
%changelog
|
||||
20
reproducible-build.patch
Normal file
20
reproducible-build.patch
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
--- mysql-connector-j-8.1.0/src/main/core-api/java/com/mysql/cj/conf/PropertyDefinitions.java 2023-09-26 06:49:03.580772166 +0200
|
||||
+++ mysql-connector-j-8.1.0/src/main/core-api/java/com/mysql/cj/conf/PropertyDefinitions.java 2023-09-26 06:53:10.775563886 +0200
|
||||
@@ -30,7 +30,7 @@
|
||||
package com.mysql.cj.conf;
|
||||
|
||||
import java.util.Collections;
|
||||
-import java.util.HashMap;
|
||||
+import java.util.TreeMap;
|
||||
import java.util.Map;
|
||||
|
||||
import com.mysql.cj.Messages;
|
||||
@@ -895,7 +895,7 @@
|
||||
//
|
||||
};
|
||||
|
||||
- HashMap<PropertyKey, PropertyDefinition<?>> propertyKeyToPropertyDefinitionMap = new HashMap<>();
|
||||
+ TreeMap<PropertyKey, PropertyDefinition<?>> propertyKeyToPropertyDefinitionMap = new TreeMap<>();
|
||||
for (PropertyDefinition<?> pdef : pdefs) {
|
||||
propertyKeyToPropertyDefinitionMap.put(pdef.getPropertyKey(), pdef);
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user