Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mariadb-connector-odbc for
openSUSE:Factory checked in at 2025-04-14 16:50:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mariadb-connector-odbc (Old)
and /work/SRC/openSUSE:Factory/.mariadb-connector-odbc.new.1907 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mariadb-connector-odbc"
Mon Apr 14 16:50:29 2025 rev:12 rq:1269287 version:3.2.5
Changes:
--------
---
/work/SRC/openSUSE:Factory/mariadb-connector-odbc/mariadb-connector-odbc.changes
2020-11-10 13:47:04.403573548 +0100
+++
/work/SRC/openSUSE:Factory/.mariadb-connector-odbc.new.1907/mariadb-connector-odbc.changes
2025-04-14 16:50:37.617182825 +0200
@@ -1,0 +2,14 @@
+Mon Apr 14 12:17:05 UTC 2025 - Adam Majer <[email protected]>
+
+- Update to upstream version 3.2.5
+ * ODBC-454 Error in SQLForeignKeys in keys of FK parameters only and no FK
+ * ODBC-449 Fractional seconds could be lost with SQLExecDirect
+ * ODBC-437 Driver returns wrong unicode string length
+ see https://mariadb.com/kb/en/about-mariadb-connector-odbc/
+ for comprehensinve list of changes
+
+- mariadb.keyring: upstream release keyring
+- mysql_header_path.patch, iconv.patch: dropped, unnecessary
+- nosoname.patch DSN_names.patch: refreshed
+
+-------------------------------------------------------------------
Old:
----
iconv.patch
mariadb-connector-odbc-3.1.10-ga-src.tar.gz
mysql_header_path.patch
New:
----
mariadb-connector-odbc-3.2.5-src.tar.gz
mariadb-connector-odbc-3.2.5-src.tar.gz.asc
mariadb.keyring
BETA DEBUG BEGIN:
Old:- mariadb.keyring: upstream release keyring
- mysql_header_path.patch, iconv.patch: dropped, unnecessary
- nosoname.patch DSN_names.patch: refreshed
Old:- mariadb.keyring: upstream release keyring
- mysql_header_path.patch, iconv.patch: dropped, unnecessary
- nosoname.patch DSN_names.patch: refreshed
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mariadb-connector-odbc.spec ++++++
--- /var/tmp/diff_new_pack.gnJMPT/_old 2025-04-14 16:50:38.389215238 +0200
+++ /var/tmp/diff_new_pack.gnJMPT/_new 2025-04-14 16:50:38.389215238 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mariadb-connector-odbc
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,22 +17,22 @@
Name: mariadb-connector-odbc
-Version: 3.1.10
+Version: 3.2.5
Release: 0
Summary: MariaDB ODBC Connector
License: LGPL-2.1-or-later
Group: Productivity/Databases/Tools
URL: https://downloads.mariadb.org/connector-odbc/
-Source:
https://downloads.mariadb.org/interstitial/connector-odbc-%{version}/mariadb-connector-odbc-%{version}-ga-src.tar.gz
-# signature is from copy/pasted stuff found on the download page, not actual
file
-# Source1: mariadb-connector-odbc-%{version}-ga-src.tar.gz.asc
+Source:
https://archive.mariadb.org/connector-odbc-%{version}/mariadb-connector-odbc-%{version}-src.tar.gz
+## copy-paste from download page ... ugly :(
+Source1: mariadb-connector-odbc-%{version}-src.tar.gz.asc
Source2: README
Source3: sample_odbc.ini
Source4: mariadb-connector-odbc-rpmlintrc
-Patch1: mysql_header_path.patch
+## https://mariadb.org/new-gpg-release-key-rpms/
+Source10: mariadb.keyring
Patch6: DSN_names.patch
Patch8: nosoname.patch
-Patch9: iconv.patch
BuildRequires: cmake > 3.5.0
BuildRequires: gcc-c++
# This is actually MariaDB -devel package(s)
@@ -47,7 +47,7 @@
This package contains the MariaDB ODBC Connector to be used with unixODBC.
%prep
-%autosetup -p1 -n mariadb-connector-odbc-%{version}-ga-src
+%autosetup -p1 -n mariadb-connector-odbc-%{version}-src
%build
%cmake \
@@ -61,17 +61,19 @@
%install
%cmake_install
+# remove devel files
+rm -r %{buildroot}%{_includedir}
+rm -r %{buildroot}%{_libdir}/pkgconfig
install -Dpm 0644 -t %{buildroot}%{_docdir}/%{name} %{SOURCE2} %{SOURCE3}
-sed -i 's#^Driver.*$#Driver = %{_libdir}/mariadb/libmaodbc.so#'
%{buildroot}%{_docdir}/%{name}/sample_odbc.ini
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%dir %{_docdir}/%{name}
-%dir %{_libdir}/mariadb
%license COPYING
-%{_libdir}/mariadb/libmaodbc.so
+%{_libdir}/libmaodbc.so
%{_docdir}/%{name}/README
%{_docdir}/%{name}/sample_odbc.ini
+%{_docdir}/%{name}/maodbc.ini
++++++ DSN_names.patch ++++++
--- /var/tmp/diff_new_pack.gnJMPT/_old 2025-04-14 16:50:38.409216078 +0200
+++ /var/tmp/diff_new_pack.gnJMPT/_new 2025-04-14 16:50:38.413216246 +0200
@@ -8,12 +8,12 @@
The sample DSN config file is manually maintained based on
these options.
-Index: mariadb-connector-odbc-3.1.10-ga-src/ma_dsn.c
+Index: mariadb-connector-odbc-3.2.5-src/driver/ma_dsn.c
===================================================================
---- mariadb-connector-odbc-3.1.10-ga-src.orig/ma_dsn.c
-+++ mariadb-connector-odbc-3.1.10-ga-src/ma_dsn.c
-@@ -34,56 +34,56 @@
-
+--- mariadb-connector-odbc-3.2.5-src.orig/driver/ma_dsn.c
++++ mariadb-connector-odbc-3.2.5-src/driver/ma_dsn.c
+@@ -39,75 +39,75 @@
+ DsnKeysSwitch below in this file, and index defines in this file,
accordingly */
MADB_DsnKey DsnKeys[]=
{
- {"DSN", offsetof(MADB_Dsn, DSNName), DSN_TYPE_STRING,
0, 0}, /* 0 */
@@ -42,8 +42,6 @@
- {"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},
+ {"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 */
@@ -56,7 +54,12 @@
+ {"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},
+ /* TODO: this has to be removed.Changed to bool to take less memory : ) The
problem is changed
+ * indexes of other elements of this array. I think they are relied upon in
the setup dialog
+ */
+- {"TRACE", offsetof(MADB_Dsn, TraceFile), DSN_TYPE_BOOL, 0,
0},
+- {"PLUGIN_DIR", offsetof(MADB_Dsn, ConnCPluginsDir), DSN_TYPE_STRING,
0, 0},
++ {"TRACE", offsetof(MADB_Dsn, TraceFile), DSN_TYPE_BOOL,
0, 0},
+ {"PLUGIN_DIR", offsetof(MADB_Dsn, ConnCPluginsDir),
DSN_TYPE_STRING, 0, 0},
/* SSL */
- {"SSLKEY", offsetof(MADB_Dsn, SslKey), DSN_TYPE_STRING,
0, 0},
@@ -78,6 +81,20 @@
- {"TLSKEYPWD", offsetof(MADB_Dsn, TlsKeyPwd), DSN_TYPE_STRING,
0, 0},
- {"INTERACTIVE", offsetof(MADB_Dsn, InteractiveClient), DSN_TYPE_BOOL,
0, 0},
- {"FORWARDONLY", offsetof(MADB_Dsn, ForceForwardOnly), DSN_TYPE_OPTION,
MADB_OPT_FLAG_FORWARD_CURSOR, 0},
+- {"SCHEMANOERROR", offsetof(MADB_Dsn, NeglectSchemaParam),DSN_TYPE_BOOL,
0, 0},
+- {"READ_TIMEOUT", offsetof(MADB_Dsn, ReadTimeout), DSN_TYPE_INT,
0, 0},
+- {"WRITE_TIMEOUT", offsetof(MADB_Dsn, WriteTimeout), DSN_TYPE_INT,
0, 0}, /* 40 */
+- {"NOLOCALINFILE", offsetof(MADB_Dsn, DisableLocalInfile),DSN_TYPE_BOOL,
0, 0},
+- {"NULLISCURRENT", offsetof(MADB_Dsn,
NullSchemaMeansCurrent),DSN_TYPE_BOOL, 0, 0},
+- {"STREAMRS", offsetof(MADB_Dsn, StreamResult), DSN_TYPE_OPTION,
MADB_OPT_FLAG_NO_CACHE, 0},
+- {"ATTR", offsetof(MADB_Dsn, Attributes), DSN_TYPE_STRING,
0, 0},
+- {"EDSERVER", offsetof(MADB_Dsn, EdPrepareOnServer), DSN_TYPE_BOOL,
0, 0},
+- {"PREPONCLIENT", offsetof(MADB_Dsn, PrepareOnClient), DSN_TYPE_BOOL,
0, 0},
+- {"PSCACHESIZE", offsetof(MADB_Dsn, PsCacheSize), DSN_TYPE_INT,
0, 0},
+- {"MAXCACHEKEY", offsetof(MADB_Dsn, PsCacheMaxKeyLen), DSN_TYPE_INT,
0, 0},
+- {"PCALLBACK", offsetof(MADB_Dsn, ParamCallbacks), DSN_TYPE_BOOL,
0, 0},
+- {"RCALLBACK", offsetof(MADB_Dsn, ResultCallbacks), DSN_TYPE_BOOL,
0, 0}, /* 50 */
+- {"NOBIGINT", offsetof(MADB_Dsn, NoBigint), DSN_TYPE_OPTION,
MADB_OPT_FLAG_NO_BIGINT, 0},
+ {"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},
@@ -97,6 +114,21 @@
+ {"TLSKEYPWD", offsetof(MADB_Dsn, TlsKeyPwd),
DSN_TYPE_STRING, 0, 0},
+ {"INTERACTIVE", offsetof(MADB_Dsn, InteractiveClient), DSN_TYPE_BOOL,
0, 0},
+ {"FORWARDONLY", offsetof(MADB_Dsn, ForceForwardOnly),
DSN_TYPE_OPTION, MADB_OPT_FLAG_FORWARD_CURSOR, 0},
++ {"SCHEMANOERROR", offsetof(MADB_Dsn, NeglectSchemaParam),DSN_TYPE_BOOL,
0, 0},
++ {"READ_TIMEOUT", offsetof(MADB_Dsn, ReadTimeout), DSN_TYPE_INT,
0, 0},
++ {"WRITE_TIMEOUT", offsetof(MADB_Dsn, WriteTimeout), DSN_TYPE_INT,
0, 0}, /* 40 */
++ {"NOLOCALINFILE", offsetof(MADB_Dsn, DisableLocalInfile),DSN_TYPE_BOOL,
0, 0},
++ {"NULLISCURRENT", offsetof(MADB_Dsn,
NullSchemaMeansCurrent),DSN_TYPE_BOOL, 0, 0},
++ {"STREAMRS", offsetof(MADB_Dsn, StreamResult),
DSN_TYPE_OPTION, MADB_OPT_FLAG_NO_CACHE, 0},
++ {"ATTR", offsetof(MADB_Dsn, Attributes),
DSN_TYPE_STRING, 0, 0},
++ {"EDSERVER", offsetof(MADB_Dsn, EdPrepareOnServer), DSN_TYPE_BOOL,
0, 0},
++ {"PREPONCLIENT", offsetof(MADB_Dsn, PrepareOnClient), DSN_TYPE_BOOL,
0, 0},
++ {"PSCACHESIZE", offsetof(MADB_Dsn, PsCacheSize), DSN_TYPE_INT,
0, 0},
++ {"MAXCACHEKEY", offsetof(MADB_Dsn, PsCacheMaxKeyLen), DSN_TYPE_INT,
0, 0},
++ {"PCALLBACK", offsetof(MADB_Dsn, ParamCallbacks), DSN_TYPE_BOOL,
0, 0},
++ {"RCALLBACK", offsetof(MADB_Dsn, ResultCallbacks), DSN_TYPE_BOOL,
0, 0}, /* 50 */
++ {"NOBIGINT", offsetof(MADB_Dsn, NoBigint),
DSN_TYPE_OPTION, MADB_OPT_FLAG_NO_BIGINT, 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},
@@ -104,13 +136,22 @@
- {"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},
+- {"NO_CACHE", DSNKEY_STREAMRS_INDEX, DSN_TYPE_BOOL,
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},
++ {"NO_CACHE", DSNKEY_STREAMRS_INDEX, DSN_TYPE_BOOL,
0, 1},
/* Terminating Null */
{NULL, 0, DSN_TYPE_BOOL,0,0}
+@@ -767,4 +767,4 @@ SQLULEN MADB_DsnToString(MADB_Dsn *Dsn,
+ }
+ return TotalLength;
+ }
+-/* }}} */
+\ No newline at end of file
++/* }}} */
++++++ mariadb-connector-odbc-3.1.10-ga-src.tar.gz ->
mariadb-connector-odbc-3.2.5-src.tar.gz ++++++
++++ 67626 lines of diff (skipped)
++++++ nosoname.patch ++++++
--- /var/tmp/diff_new_pack.gnJMPT/_old 2025-04-14 16:50:38.593223803 +0200
+++ /var/tmp/diff_new_pack.gnJMPT/_new 2025-04-14 16:50:38.597223971 +0200
@@ -1,14 +1,27 @@
-Index: mariadb-connector-odbc-3.1.9-ga-src/CMakeLists.txt
+Index: mariadb-connector-odbc-3.2.5-src/driver/CMakeLists.txt
===================================================================
---- mariadb-connector-odbc-3.1.9-ga-src.orig/CMakeLists.txt
-+++ mariadb-connector-odbc-3.1.9-ga-src/CMakeLists.txt
-@@ -312,7 +312,7 @@ IF(WIN32)
- ADD_LIBRARY(${LIBRARY_NAME} SHARED ${MARIADB_ODBC_SOURCES}
${CMAKE_SOURCE_DIR}/mariadb-odbc-driver-uni.def maodbcu.rc)
+--- mariadb-connector-odbc-3.2.5-src.orig/driver/CMakeLists.txt
++++ mariadb-connector-odbc-3.2.5-src/driver/CMakeLists.txt
+@@ -186,7 +186,7 @@ IF(WIN32)
+ ADD_LIBRARY(${LIBRARY_NAME} SHARED ${MARIADB_ODBC_SOURCES}
${CMAKE_BINARY_DIR}/driver/mariadb-odbc-driver-uni.def
${CMAKE_BINARY_DIR}/driver/maodbcu.rc)
ELSE()
- MESSAGE(STATUS "Version script: ${CMAKE_SOURCE_DIR}/maodbc.def")
+ MESSAGE(STATUS "Version script: ${CMAKE_SOURCE_DIR}/driver/maodbc.def")
- ADD_LIBRARY(${LIBRARY_NAME} SHARED ${MARIADB_ODBC_SOURCES} maodbcu.rc)
+ ADD_LIBRARY(${LIBRARY_NAME} MODULE ${MARIADB_ODBC_SOURCES} maodbcu.rc)
IF(APPLE)
SET(MAODBC_INSTALL_RPATH "${ODBC_LIB_DIR}" "@loader_path"
"/usr/local/opt/libiodbc" "/usr/local/iODBC/lib"
"/usr/local/opt/[email protected]/lib" "/usr/local/opt/libressl/lib")
+Index: mariadb-connector-odbc-3.2.5-src/dsn/CMakeLists.txt
+===================================================================
+--- mariadb-connector-odbc-3.2.5-src.orig/dsn/CMakeLists.txt
++++ mariadb-connector-odbc-3.2.5-src/dsn/CMakeLists.txt
+@@ -28,7 +28,7 @@ IF(WIN32)
+ ${CMAKE_SOURCE_DIR}/driver/ma_common.c)
+
+ ####### MAODBCS #######
+- ADD_LIBRARY(maodbcs SHARED ${DSN_DIALOG_FILES}
${CMAKE_SOURCE_DIR}/dsn/mariadb_odbc_setup.def)
++ ADD_LIBRARY(maodbcs MODULE ${DSN_DIALOG_FILES}
${CMAKE_SOURCE_DIR}/dsn/mariadb_odbc_setup.def)
+ SET_TARGET_PROPERTIES(maodbcs PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
+ # Specifically on Windows, to have implib in the same
place as the dll
