Hello community,
here is the log from the commit of package mariadb-connector-odbc for
openSUSE:Factory checked in at 2020-04-04 12:23:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mariadb-connector-odbc (Old)
and /work/SRC/openSUSE:Factory/.mariadb-connector-odbc.new.3248 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mariadb-connector-odbc"
Sat Apr 4 12:23:18 2020 rev:8 rq:790965 version:3.1.6
Changes:
--------
---
/work/SRC/openSUSE:Factory/mariadb-connector-odbc/mariadb-connector-odbc.changes
2019-05-22 15:40:34.470441626 +0200
+++
/work/SRC/openSUSE:Factory/.mariadb-connector-odbc.new.3248/mariadb-connector-odbc.changes
2020-04-04 12:23:45.895847947 +0200
@@ -1,0 +2,40 @@
+Thu Apr 2 11:56:12 UTC 2020 - Adam Majer <[email protected]>
+
+- New upstream version 3.1.6. Fixes include,
+ * ODBC-269: BEGIN NOT ATOMIC returning error
+
+ Fixes since version 3.1.1 includes,
+ * ODBC-196 - Optimize ODBC-120 issue for the case of array fetch
+ * ODBC-267 - Setup library has some redundant dependencies
+ * ODBC-87 - When testing a DSN (new or config datasource)
+ the database name is missing after the test
+ * ODBC-240 - SSLFP and SSLFPLIST parameters appear unused
+ * ODBC-241 - Add parameter that corresponds to
+ MYSQL_SERVER_PUBLIC_KEY option from MariaDB Connector/C
+ * ODBC-226 - Driver doesn't cause an error when it should
+ * ODBC-261 - Connector deploys direct execution, even for
+ server versions, that do not support it
+ * ODBC-262 - MSI and PKG packages do not contain ed25519 plugin
+ * ODBC-210 - Fix compilation warnings on OS X
+ * ODBC-250 - Operations with Dynamic Lists are not thread-safe,
+ and need to be guarded with mutexes
+ * ODBC-252 - Build failed when executed the commands present in
+ "BUILD.md" file
+ * ODBC-253 - MADB_StmtExecDirect() crashes if StatementText is "\0"
+ * ODBC-254 - FTBFS: Cmake libdir misconfiguration
+ * ODBC-256 - Driver craches on empty statement
+ * ODBC-257 - Double-check CPack for a copy-paste error
+ * ODBC-258 - RFE: make documentation and license dirs configurable
+ * ODBC-260 - Remove all references to internals of MYSQL structure
+ * ODBC-255 - When C/ODBC is upgraded on Windows, allow existing
+ data sources to be moved
+ * ODBC-211 - SQLDescribeCol return precision=0 for field type decimal(1,0)
+
+- install_correct_path.patch: removed, upstreamed
+- package_name.patch: removed, no longer necessary
+- DSN_names.patch: refreshed. Added new options
+ TlsPeerFp =
+ TlsPeerFpList =
+ ServerKey =
+
+-------------------------------------------------------------------
Old:
----
install_correct_path.patch
mariadb-connector-odbc-3.1.1-ga-src.tar.gz
mariadb-connector-odbc-3.1.1-ga-src.tar.gz.asc
package_name.patch
New:
----
mariadb-connector-odbc-3.1.6-ga-src.tar.gz
mariadb-connector-odbc-3.1.6-ga-src.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mariadb-connector-odbc.spec ++++++
--- /var/tmp/diff_new_pack.XZk8G1/_old 2020-04-04 12:23:46.775848703 +0200
+++ /var/tmp/diff_new_pack.XZk8G1/_new 2020-04-04 12:23:46.779848707 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mariadb-connector-odbc
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: mariadb-connector-odbc
-Version: 3.1.1
+Version: 3.1.6
Release: 0
Summary: MariaDB ODBC Connector
License: LGPL-2.1-or-later
@@ -30,8 +30,6 @@
Source3: sample_odbc.ini
Source4: mariadb-connector-odbc-rpmlintrc
Patch1: mysql_header_path.patch
-Patch2: install_correct_path.patch
-Patch5: package_name.patch
Patch6: DSN_names.patch
Patch7: missing_libs.patch
Patch8: nosoname.patch
@@ -48,27 +46,21 @@
This package contains the MariaDB ODBC Connector to be used with unixODBC.
%prep
-%setup -q -n mariadb-connector-odbc-%{version}-ga-src
-%patch1 -p1
-%patch2 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
+%autosetup -p1 -n mariadb-connector-odbc-%{version}-ga-src
%build
-export CFLAGS="%{optflags} -std=gnu11"
%cmake \
-DWITH_UNIXODBC=1 \
-DWITH_OPENSSL=ON \
- -DMARIADB_LINK_DYNAMIC=1
+ -DMARIADB_LINK_DYNAMIC=1 \
+ -DINSTALL_DOC_DIR=%{_docdir}/%{name} \
+ -DINSTALL_LICENSE_DIR=%{_licensedir}/%{name}
%make_jobs
%install
%cmake_install
install -Dpm 0644 %{SOURCE2} %{SOURCE3} \
%{buildroot}%{_docdir}/%{name}
-rm %{buildroot}%{_docdir}/%{name}/COPYING
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
++++++ DSN_names.patch ++++++
--- /var/tmp/diff_new_pack.XZk8G1/_old 2020-04-04 12:23:46.795848720 +0200
+++ /var/tmp/diff_new_pack.XZk8G1/_new 2020-04-04 12:23:46.799848724 +0200
@@ -8,28 +8,14 @@
The sample DSN config file is manually maintained based on
these options.
-Index: mariadb-connector-odbc-3.1.1-ga-src/ma_dsn.c
+Index: mariadb-connector-odbc-3.1.6-ga-src/ma_dsn.c
===================================================================
---- mariadb-connector-odbc-3.1.1-ga-src.orig/ma_dsn.c
-+++ mariadb-connector-odbc-3.1.1-ga-src/ma_dsn.c
-@@ -27,58 +27,58 @@
- #define DSNKEY_UID_INDEX 8
- #define DSNKEY_PWD_INDEX 9
- #define DSNKEY_DATABASE_INDEX 10
-+
-+ MADB_DsnKey DsnKeys[]=
-+ {
-+ {"DSN", offsetof(MADB_Dsn, DSNName), DSN_TYPE_STRING,
0, 0}, /* 0 */
-+ {"DESCRIPTION", offsetof(MADB_Dsn, Description), DSN_TYPE_STRING,
0, 0},
-+ {"DRIVER", offsetof(MADB_Dsn, Driver), DSN_TYPE_STRING,
0, 0},
-+ /* OPTIONS should go above all DSN_TYPE_OPTION. They are not saved in DSN
separately, and then DSN is read, corresponding
-+ properties are filled from OPTIONS. Also putting its alias here - it
should not appear on Windows(unless somebody edits
-+ registry manually), but on *nix we can expect everything. Array index
used in some places to decide if the key is OPTIONS */
-+ {"OPTIONS", offsetof(MADB_Dsn, Options), DSN_TYPE_INT,
0, 0}, /* DSNKEY_OPTIONS_INDEX */
-+ {"OPTION", DSNKEY_OPTIONS_INDEX, DSN_TYPE_INT,
0, 1}, /* DSNKEY_OPTION_INDEX */
+--- mariadb-connector-odbc-3.1.6-ga-src.orig/ma_dsn.c
++++ mariadb-connector-odbc-3.1.6-ga-src/ma_dsn.c
+@@ -33,53 +33,53 @@
--MADB_DsnKey DsnKeys[]=
--{
+ MADB_DsnKey DsnKeys[]=
+ {
- {"DSN", offsetof(MADB_Dsn, DSNName), DSN_TYPE_STRING,
0, 0}, /* 0 */
- {"DESCRIPTION", offsetof(MADB_Dsn, Description), DSN_TYPE_STRING,
0, 0},
- {"DRIVER", offsetof(MADB_Dsn, Driver), DSN_TYPE_STRING,
0, 0},
@@ -60,8 +46,8 @@
- {"SSLCAPATH", offsetof(MADB_Dsn, SslCaPath), DSN_TYPE_STRING,
0, 0},
- {"SSLCIPHER", offsetof(MADB_Dsn, SslCipher), DSN_TYPE_STRING,
0, 0},
- {"SSLVERIFY", offsetof(MADB_Dsn, SslVerify), DSN_TYPE_BOOL,
0, 0},
-- {"SSLFP", offsetof(MADB_Dsn, SslFp), DSN_TYPE_STRING,
0, 0},
-- {"SSLFPLIST", offsetof(MADB_Dsn, SslFpList), DSN_TYPE_STRING,
0, 0},
+- {"TLSPEERFP", offsetof(MADB_Dsn, TlsPeerFp), DSN_TYPE_STRING,
0, 0},
+- {"TLSPEERFPLIST", offsetof(MADB_Dsn, TlsPeerFpList), DSN_TYPE_STRING,
0, 0},
- {"SSLCRL", offsetof(MADB_Dsn, SslCrl), DSN_TYPE_STRING,
0, 0},
- {"SSLCRLPATH", offsetof(MADB_Dsn, SslCrlPath), DSN_TYPE_STRING,
0, 0},
- {"SOCKET", offsetof(MADB_Dsn, Socket), DSN_TYPE_STRING,
0, 0},
@@ -69,55 +55,60 @@
- {"USE_MYCNF", offsetof(MADB_Dsn, ReadMycnf), DSN_TYPE_OPTION,
MADB_OPT_FLAG_USE_CNF, 0},
- {"TLSVERSION", offsetof(MADB_Dsn, TlsVersion),
DSN_TYPE_CBOXGROUP, 0, 0},
- {"FORCETLS", offsetof(MADB_Dsn, ForceTls), DSN_TYPE_BOOL,
0, 0},
-- /* Aliases. Here offset is index of aliased key */
+- {"SERVERKEY", offsetof(MADB_Dsn, ServerKey), DSN_TYPE_STRING,
0, 0},
++ {"DSN", offsetof(MADB_Dsn, DSNName),
DSN_TYPE_STRING, 0, 0}, /* 0 */
++ {"DESCRIPTION", offsetof(MADB_Dsn, Description),
DSN_TYPE_STRING, 0, 0},
++ {"DRIVER", offsetof(MADB_Dsn, Driver),
DSN_TYPE_STRING, 0, 0},
++ /* OPTIONS should go above all DSN_TYPE_OPTION. They are not saved in DSN
separately, and then DSN is read, corresponding
++ properties are filled from OPTIONS. Also putting its alias here - it
should not appear on Windows(unless somebody edits
++ registry manually), but on *nix we can expect everything. Array index
used in some places to decide if the key is OPTIONS */
++ {"OPTIONS", offsetof(MADB_Dsn, Options), DSN_TYPE_INT,
0, 0}, /* DSNKEY_OPTIONS_INDEX */
++ {"OPTION", DSNKEY_OPTIONS_INDEX, DSN_TYPE_INT,
0, 1}, /* DSNKEY_OPTION_INDEX */
++
++ {"NamedPipe", offsetof(MADB_Dsn, IsNamedPipe),
DSN_TYPE_OPTION, MADB_OPT_FLAG_NAMED_PIPE, 0}, /* MADB_DSNKEY_NAMEDPIPE_INDEX */
++ {"TCPIP", offsetof(MADB_Dsn, IsTcpIp), DSN_TYPE_BOOL,
0, 0}, /* DSNKEY_TCPIP_INDEX */
++ {"SERVER", offsetof(MADB_Dsn, ServerName),
DSN_TYPE_STRING, 0, 0}, /* DSNKEY_SERVER_INDEX */
++ {"UID", offsetof(MADB_Dsn, UserName),
DSN_TYPE_STRING, 0, 0}, /* DSNKEY_UID_INDEX */
++ {"PWD", offsetof(MADB_Dsn, Password),
DSN_TYPE_STRING, 0, 0}, /* DSNKEY_PWD_INDEX */
++ {"DATABASE", offsetof(MADB_Dsn, Catalog), DSN_TYPE_COMBO,
0, 0}, /* 10 DSNKEY_DATABASE_INDEX */
++ {"PORT", offsetof(MADB_Dsn, Port), DSN_TYPE_INT,
0, 0},
++ {"INITSTMT", offsetof(MADB_Dsn, InitCommand),
DSN_TYPE_STRING, 0, 0},
++ {"CONN_TIMEOUT", offsetof(MADB_Dsn, ConnectionTimeout), DSN_TYPE_INT,
0, 0},
++ {"AUTO_RECONNECT", offsetof(MADB_Dsn, Reconnect),
DSN_TYPE_OPTION, MADB_OPT_FLAG_AUTO_RECONNECT,0},
++ {"NO_PROMPT", offsetof(MADB_Dsn, ConnectPrompt),
DSN_TYPE_OPTION, MADB_OPT_FLAG_NO_PROMPT,0},
++ {"CHARSET", offsetof(MADB_Dsn, CharacterSet), DSN_TYPE_COMBO,
0, 0},
++ {"TRACE", offsetof(MADB_Dsn, TraceFile),
DSN_TYPE_STRING, 0, 0},
++ {"PLUGIN_DIR", offsetof(MADB_Dsn, ConnCPluginsDir),
DSN_TYPE_STRING, 0, 0},
++ /* SSL */
++ {"SSLKEY", offsetof(MADB_Dsn, SslKey),
DSN_TYPE_STRING, 0, 0},
++ {"SSLCERT", offsetof(MADB_Dsn, SslCert),
DSN_TYPE_STRING, 0, 0}, /* 20 */
++ {"SSLCA", offsetof(MADB_Dsn, SslCa),
DSN_TYPE_STRING, 0, 0},
++ {"SSLCAPATH", offsetof(MADB_Dsn, SslCaPath),
DSN_TYPE_STRING, 0, 0},
++ {"SSLCIPHER", offsetof(MADB_Dsn, SslCipher),
DSN_TYPE_STRING, 0, 0},
++ {"SSLVERIFY", offsetof(MADB_Dsn, SslVerify), DSN_TYPE_BOOL,
0, 0},
++ {"TLSPEERFP", offsetof(MADB_Dsn, TlsPeerFp), DSN_TYPE_STRING,
0, 0},
++ {"TLSPEERFPLIST", offsetof(MADB_Dsn, TlsPeerFpList), DSN_TYPE_STRING,
0, 0},
++ {"SSLCRL", offsetof(MADB_Dsn, SslCrl),
DSN_TYPE_STRING, 0, 0},
++ {"SSLCRLPATH", offsetof(MADB_Dsn, SslCrlPath),
DSN_TYPE_STRING, 0, 0},
++ {"SOCKET", offsetof(MADB_Dsn, Socket),
DSN_TYPE_STRING, 0, 0},
++ {"SAVEFILE", offsetof(MADB_Dsn, SaveFile),
DSN_TYPE_STRING, 0, 0}, /* 30 */
++ {"USE_MYCNF", offsetof(MADB_Dsn, ReadMycnf),
DSN_TYPE_OPTION, MADB_OPT_FLAG_USE_CNF, 0},
++ {"TLSVERSION", offsetof(MADB_Dsn, TlsVersion),
DSN_TYPE_CBOXGROUP, 0, 0},
++ {"FORCETLS", offsetof(MADB_Dsn, ForceTls), DSN_TYPE_BOOL,
0, 0},
++ {"SERVERKEY", offsetof(MADB_Dsn, ServerKey), DSN_TYPE_STRING,
0, 0},
+ /* Aliases. Here offset is index of aliased key */
- {"SERVERNAME", DSNKEY_SERVER_INDEX, DSN_TYPE_STRING,
0, 1},
- {"USER", DSNKEY_UID_INDEX, DSN_TYPE_STRING,
0, 1},
- {"PASSWORD", DSNKEY_PWD_INDEX, DSN_TYPE_STRING,
0, 1},
- {"DB", DSNKEY_DATABASE_INDEX, DSN_TYPE_COMBO,
0, 1},
--
-- /* Terminating Null */
-- {NULL, 0, DSN_TYPE_BOOL,0,0}
--};
-+ {"NamedPipe", offsetof(MADB_Dsn, IsNamedPipe), DSN_TYPE_OPTION,
MADB_OPT_FLAG_NAMED_PIPE, 0}, /* MADB_DSNKEY_NAMEDPIPE_INDEX */
-+ {"TCPIP", offsetof(MADB_Dsn, IsTcpIp), DSN_TYPE_BOOL,
0, 0}, /* DSNKEY_TCPIP_INDEX */
-+ {"SERVER", offsetof(MADB_Dsn, ServerName), DSN_TYPE_STRING,
0, 0}, /* DSNKEY_SERVER_INDEX */
-+ {"UID", offsetof(MADB_Dsn, UserName), DSN_TYPE_STRING,
0, 0}, /* DSNKEY_UID_INDEX */
-+ {"PWD", offsetof(MADB_Dsn, Password), DSN_TYPE_STRING,
0, 0}, /* DSNKEY_PWD_INDEX */
-+ {"DATABASE", offsetof(MADB_Dsn, Catalog), DSN_TYPE_COMBO,
0, 0}, /* 10 DSNKEY_DATABASE_INDEX */
-+ {"PORT", offsetof(MADB_Dsn, Port), DSN_TYPE_INT,
0, 0},
-+ {"INITSTMT", offsetof(MADB_Dsn, InitCommand), DSN_TYPE_STRING,
0, 0},
-+ {"CONN_TIMEOUT", offsetof(MADB_Dsn, ConnectionTimeout), DSN_TYPE_INT,
0, 0},
-+ {"AUTO_RECONNECT", offsetof(MADB_Dsn, Reconnect), DSN_TYPE_OPTION,
MADB_OPT_FLAG_AUTO_RECONNECT,0},
-+ {"NO_PROMPT", offsetof(MADB_Dsn, ConnectPrompt), DSN_TYPE_OPTION,
MADB_OPT_FLAG_NO_PROMPT,0},
-+ {"CHARSET", offsetof(MADB_Dsn, CharacterSet), DSN_TYPE_COMBO,
0, 0},
-+ {"TRACE", offsetof(MADB_Dsn, TraceFile), DSN_TYPE_STRING,
0, 0},
-+ {"PLUGIN_DIR", offsetof(MADB_Dsn, ConnCPluginsDir), DSN_TYPE_STRING,
0, 0},
-+ /* SSL */
-+ {"SSLKEY", offsetof(MADB_Dsn, SslKey), DSN_TYPE_STRING,
0, 0},
-+ {"SSLCERT", offsetof(MADB_Dsn, SslCert), DSN_TYPE_STRING,
0, 0}, /* 20 */
-+ {"SSLCA", offsetof(MADB_Dsn, SslCa), DSN_TYPE_STRING,
0, 0},
-+ {"SSLCAPATH", offsetof(MADB_Dsn, SslCaPath), DSN_TYPE_STRING,
0, 0},
-+ {"SSLCIPHER", offsetof(MADB_Dsn, SslCipher), DSN_TYPE_STRING,
0, 0},
-+ {"SSLVERIFY", offsetof(MADB_Dsn, SslVerify), DSN_TYPE_BOOL,
0, 0},
-+ {"SSLFP", offsetof(MADB_Dsn, SslFp), DSN_TYPE_STRING,
0, 0},
-+ {"SSLFPLIST", offsetof(MADB_Dsn, SslFpList), DSN_TYPE_STRING,
0, 0},
-+ {"SSLCRL", offsetof(MADB_Dsn, SslCrl), DSN_TYPE_STRING,
0, 0},
-+ {"SSLCRLPATH", offsetof(MADB_Dsn, SslCrlPath), DSN_TYPE_STRING,
0, 0},
-+ {"SOCKET", offsetof(MADB_Dsn, Socket), DSN_TYPE_STRING,
0, 0},
-+ {"SAVEFILE", offsetof(MADB_Dsn, SaveFile), DSN_TYPE_STRING,
0, 0}, /* 30 */
-+ {"USE_MYCNF", offsetof(MADB_Dsn, ReadMycnf), DSN_TYPE_OPTION,
MADB_OPT_FLAG_USE_CNF, 0},
-+ {"TLSVERSION", offsetof(MADB_Dsn, TlsVersion),
DSN_TYPE_CBOXGROUP, 0, 0},
-+ {"FORCETLS", offsetof(MADB_Dsn, ForceTls), DSN_TYPE_BOOL,
0, 0},
-+ /* Aliases. Here offset is index of aliased key */
-+ {"SERVERNAME", DSNKEY_SERVER_INDEX, DSN_TYPE_STRING,
0, 1},
-+ {"USER", DSNKEY_UID_INDEX, DSN_TYPE_STRING,
0, 1},
-+ {"PASSWORD", DSNKEY_PWD_INDEX, DSN_TYPE_STRING,
0, 1},
-+ {"DB", DSNKEY_DATABASE_INDEX, DSN_TYPE_COMBO,
0, 1},
-
-+ /* Terminating Null */
-+ {NULL, 0, DSN_TYPE_BOOL,0,0}
-+ };
-+
- /* TODO: Shouln't 2nd be DSNKEY_OPTIONS_INDEX? But I seemed to remember it
was removed for a reason... */
- #define IS_OPTIONS_BITMAP(key_index) (key_index == DSNKEY_OPTIONS_INDEX ||
key_index == DSNKEY_OPTIONS_INDEX)
+- {"SSLFP", DSNKEY_FP_INDEX, DSN_TYPE_STRING,
0, 1},
+- {"SSLFPLIST", DSNKEY_FPLIST_INDEX, DSN_TYPE_STRING,
0, 1},
++ {"SERVERNAME", DSNKEY_SERVER_INDEX,
DSN_TYPE_STRING, 0, 1},
++ {"USER", DSNKEY_UID_INDEX,
DSN_TYPE_STRING, 0, 1},
++ {"PASSWORD", DSNKEY_PWD_INDEX,
DSN_TYPE_STRING, 0, 1},
++ {"DB", DSNKEY_DATABASE_INDEX, DSN_TYPE_COMBO,
0, 1},
++ {"SSLFP", DSNKEY_FP_INDEX,
DSN_TYPE_STRING, 0, 1},
++ {"SSLFPLIST", DSNKEY_FPLIST_INDEX,
DSN_TYPE_STRING, 0, 1},
+ /* Terminating Null */
+ {NULL, 0, DSN_TYPE_BOOL,0,0}
++++++ mariadb-connector-odbc-3.1.1-ga-src.tar.gz ->
mariadb-connector-odbc-3.1.6-ga-src.tar.gz ++++++
++++ 3306 lines of diff (skipped)
++++++ sample_odbc.ini ++++++
--- /var/tmp/diff_new_pack.XZk8G1/_old 2020-04-04 12:23:46.947848851 +0200
+++ /var/tmp/diff_new_pack.XZk8G1/_new 2020-04-04 12:23:46.947848851 +0200
@@ -43,10 +43,11 @@
#SslCaPath =
#SslCipher =
#SslVerify = On | Off*
-#SslFp =
-#SslFpList =
+#TlsPeerFp =
+#TlsPeerFpList =
#SslCrl =
#SslCrlPath =
+#ServerKey =
# Combination of "TLSv1.1", "TLSv1.2", "TLSv1.3"
#TlsVersion =
