Hello community,
here is the log from the commit of package mariadb-connector-odbc for
openSUSE:Factory checked in at 2019-05-22 15:40:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mariadb-connector-odbc (Old)
and /work/SRC/openSUSE:Factory/.mariadb-connector-odbc.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mariadb-connector-odbc"
Wed May 22 15:40:06 2019 rev:7 rq:704663 version:3.1.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/mariadb-connector-odbc/mariadb-connector-odbc.changes
2018-08-15 10:33:18.947738084 +0200
+++
/work/SRC/openSUSE:Factory/.mariadb-connector-odbc.new.5148/mariadb-connector-odbc.changes
2019-05-22 15:40:34.470441626 +0200
@@ -1,0 +2,23 @@
+Tue May 21 14:28:53 UTC 2019 - Adam Majer <[email protected]>
+
+- New upstream version 3.1.1
+ * Added FORCETLS connection string option
+ * Added connection string option TLSVERSION
+ * Added option for reading section in my.cnf
+
+- Changes in version 3.1.0:
+ * The fix and the testcase Wrong Input/Output parameter type when
+ mapping SQLBindParam to SQLBindParameter
+ * The fix and the testcase SQL_DESC_PARAMETER_TYPE is SQLSMALLINT,
+ but if application tried to read it into SQLSMALLINT buffer,
+ memory would be corrupted.
+
+- sample_odbc.ini - updated listing new connection options
+- refreshed patches: DSN_names.patch, missing_libs.patch, nosoname.patch,
+ package_name.patch
+- install_correct_path.patch: keep odbc library installed in correct
+ patch on 64bit systems
+- mysql_header_path.patch - mysql headers are now under mysql/ subdir
+- missing_includes.patch - dropped, not needed anymore
+
+-------------------------------------------------------------------
Old:
----
mariadb-connector-odbc-3.0.3-ga-src.tar.gz
mariadb-connector-odbc-3.0.3-ga-src.tar.gz.asc
missing_includes.patch
New:
----
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
mysql_header_path.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mariadb-connector-odbc.spec ++++++
--- /var/tmp/diff_new_pack.sdaFXo/_old 2019-05-22 15:40:45.254437780 +0200
+++ /var/tmp/diff_new_pack.sdaFXo/_new 2019-05-22 15:40:45.254437780 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mariadb-connector-odbc
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,12 +12,12 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: mariadb-connector-odbc
-Version: 3.0.3
+Version: 3.1.1
Release: 0
Summary: MariaDB ODBC Connector
License: LGPL-2.1-or-later
@@ -29,7 +29,8 @@
Source2: README
Source3: sample_odbc.ini
Source4: mariadb-connector-odbc-rpmlintrc
-Patch3: missing_includes.patch
+Patch1: mysql_header_path.patch
+Patch2: install_correct_path.patch
Patch5: package_name.patch
Patch6: DSN_names.patch
Patch7: missing_libs.patch
@@ -48,7 +49,8 @@
%prep
%setup -q -n mariadb-connector-odbc-%{version}-ga-src
-%patch3 -p1
+%patch1 -p1
+%patch2 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
++++++ DSN_names.patch ++++++
--- /var/tmp/diff_new_pack.sdaFXo/_old 2019-05-22 15:40:45.278437771 +0200
+++ /var/tmp/diff_new_pack.sdaFXo/_new 2019-05-22 15:40:45.278437771 +0200
@@ -8,13 +8,25 @@
The sample DSN config file is manually maintained based on
these options.
-Index: mariadb-connector-odbc-2.0.13-ga-src/ma_dsn.c
+Index: mariadb-connector-odbc-3.1.1-ga-src/ma_dsn.c
===================================================================
---- mariadb-connector-odbc-2.0.13-ga-src.orig/ma_dsn.c
-+++ mariadb-connector-odbc-2.0.13-ga-src/ma_dsn.c
-@@ -28,52 +28,52 @@
+--- 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 */
-MADB_DsnKey DsnKeys[]=
-{
@@ -53,8 +65,12 @@
- {"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}, /* 30 */
+- {"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},
@@ -62,17 +78,6 @@
- /* Terminating Null */
- {NULL, 0, DSN_TYPE_BOOL,0,0}
-};
-+ 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 */
-+
+ {"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 */
@@ -99,15 +104,20 @@
+ {"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}, /* 30 */
++ {"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)
++++++ install_correct_path.patch ++++++
Index: mariadb-connector-odbc-3.1.1-ga-src/CMakeLists.txt
===================================================================
--- mariadb-connector-odbc-3.1.1-ga-src.orig/CMakeLists.txt
+++ mariadb-connector-odbc-3.1.1-ga-src/CMakeLists.txt
@@ -324,7 +324,7 @@ ELSE()
IF(NOT DEFINED INSTALL_LIB_SUFFIX)
SET(INSTALL_LIB_SUFFIX "lib")
IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8" AND EXISTS "/usr/lib64/")
- SET(INSTALL_LIB_SUFFIX "lib")
+ SET(INSTALL_LIB_SUFFIX "lib64")
ENDIF()
ENDIF()
++++++ mariadb-connector-odbc-3.0.3-ga-src.tar.gz ->
mariadb-connector-odbc-3.1.1-ga-src.tar.gz ++++++
++++ 9937 lines of diff (skipped)
++++++ missing_libs.patch ++++++
--- /var/tmp/diff_new_pack.sdaFXo/_old 2019-05-22 15:40:45.450437710 +0200
+++ /var/tmp/diff_new_pack.sdaFXo/_new 2019-05-22 15:40:45.450437710 +0200
@@ -1,13 +1,13 @@
-Index: mariadb-connector-odbc-3.0.2-ga-src/CMakeLists.txt
+Index: mariadb-connector-odbc-3.1.1-ga-src/CMakeLists.txt
===================================================================
---- mariadb-connector-odbc-3.0.2-ga-src.orig/CMakeLists.txt
-+++ mariadb-connector-odbc-3.0.2-ga-src/CMakeLists.txt
-@@ -108,7 +108,7 @@ IF(WIN32)
+--- mariadb-connector-odbc-3.1.1-ga-src.orig/CMakeLists.txt
++++ mariadb-connector-odbc-3.1.1-ga-src/CMakeLists.txt
+@@ -159,7 +159,7 @@ IF(WIN32)
ENDIF()
ELSE()
SEARCH_LIBRARY(LIB_MATH floor m)
- SET(PLATFORM_DEPENDENCIES ${LIB_MATH})
+ SET(PLATFORM_DEPENDENCIES ${LIB_MATH} pthread)
SET (MARIADB_ODBC_SOURCES ${MARIADB_ODBC_SOURCES} ma_platform_posix.c)
- IF(MARIADB_LINK_DYNAMIC)
- SET(MARIADB_CLIENT_FILENAME libmariadb.so.3)
+ ENDIF()
+
++++++ mysql_header_path.patch ++++++
Index: mariadb-connector-odbc-3.1.1-ga-src/ma_odbc.h
===================================================================
--- mariadb-connector-odbc-3.1.1-ga-src.orig/ma_odbc.h
+++ mariadb-connector-odbc-3.1.1-ga-src/ma_odbc.h
@@ -29,7 +29,7 @@
#include <stdlib.h>
-#include <mysql.h>
+#include <mysql/mysql.h>
#include <ma_legacy_helpers.h>
@@ -37,7 +37,7 @@
#include <sqlext.h>
#include <odbcinst.h>
-#include <errmsg.h>
+#include <mysql/errmsg.h>
#include <string.h>
#include <stdio.h>
#include <math.h>
++++++ nosoname.patch ++++++
--- /var/tmp/diff_new_pack.sdaFXo/_old 2019-05-22 15:40:45.470437703 +0200
+++ /var/tmp/diff_new_pack.sdaFXo/_new 2019-05-22 15:40:45.474437701 +0200
@@ -1,13 +1,13 @@
-Index: mariadb-connector-odbc-3.0.2-ga-src/CMakeLists.txt
+Index: mariadb-connector-odbc-3.1.1-ga-src/CMakeLists.txt
===================================================================
---- mariadb-connector-odbc-3.0.2-ga-src.orig/CMakeLists.txt
-+++ mariadb-connector-odbc-3.0.2-ga-src/CMakeLists.txt
-@@ -238,7 +238,7 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/maria
- ${CMAKE_SOURCE_DIR}/mariadb-odbc-driver-uni.def)
-
- ####### MAODBC #######
--ADD_LIBRARY(${LIBRARY_NAME} SHARED ${MARIADB_ODBC_SOURCES}
${CMAKE_SOURCE_DIR}/mariadb-odbc-driver-uni.def maodbcu.rc)
-+ADD_LIBRARY(${LIBRARY_NAME} MODULE ${MARIADB_ODBC_SOURCES}
${CMAKE_SOURCE_DIR}/mariadb-odbc-driver-uni.def maodbcu.rc)
-
- SET_TARGET_PROPERTIES(maodbc PROPERTIES LANGUAGE C)
- TARGET_LINK_LIBRARIES(maodbc ${MARIADB_LIB} ${ODBC_INSTLIBS}
${PLATFORM_DEPENDENCIES})
+--- mariadb-connector-odbc-3.1.1-ga-src.orig/CMakeLists.txt
++++ mariadb-connector-odbc-3.1.1-ga-src/CMakeLists.txt
+@@ -281,7 +281,7 @@ IF(WIN32)
+ ADD_LIBRARY(${LIBRARY_NAME} SHARED ${MARIADB_ODBC_SOURCES}
${CMAKE_SOURCE_DIR}/mariadb-odbc-driver-uni.def maodbcu.rc)
+ ELSE()
+ MESSAGE(STATUS "Version script: ${CMAKE_SOURCE_DIR}/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_TARGET_PROPERTIES(${LIBRARY_NAME} PROPERTIES LINK_FLAGS "-Wl")
++++++ package_name.patch ++++++
--- /var/tmp/diff_new_pack.sdaFXo/_old 2019-05-22 15:40:45.482437698 +0200
+++ /var/tmp/diff_new_pack.sdaFXo/_new 2019-05-22 15:40:45.486437697 +0200
@@ -4,10 +4,10 @@
This is done so things are installed in right places with correct names.
-Index: mariadb-connector-odbc-3.0.2-ga-src/CMakeLists.txt
+Index: mariadb-connector-odbc-3.1.1-ga-src/CMakeLists.txt
===================================================================
---- mariadb-connector-odbc-3.0.2-ga-src.orig/CMakeLists.txt
-+++ mariadb-connector-odbc-3.0.2-ga-src/CMakeLists.txt
+--- mariadb-connector-odbc-3.1.1-ga-src.orig/CMakeLists.txt
++++ mariadb-connector-odbc-3.1.1-ga-src/CMakeLists.txt
@@ -16,7 +16,7 @@
# or write to the Free Software Foundation, Inc.,
# 51 Franklin St., Fifth Floor, Boston, MA 02110, USA
@@ -17,7 +17,7 @@
cmake_minimum_required(VERSION 2.8)
-@@ -261,7 +261,7 @@ IF(WIN32)
+@@ -313,7 +313,7 @@ IF(WIN32)
ENDIF()
@@ -26,12 +26,12 @@
IF(WIN32)
ADD_SUBDIRECTORY(wininstall)
ELSE()
-@@ -279,7 +279,7 @@ ELSE()
+@@ -337,7 +337,7 @@ ELSE()
${CMAKE_SOURCE_DIR}/COPYING
${CMAKE_SOURCE_DIR}/README
DESTINATION
-- ./share/doc/${CPACK_PACKAGE_NAME}/)
-+ ./share/doc/packages/${CPACK_PACKAGE_NAME}/)
+- ./share/doc/${CPACK_PACKAGE_NAME}/
++ ./share/doc/packages/${CPACK_PACKAGE_NAME}/
+ COMPONENT Documentation)
ENDIF()
- # Tests. Checking if we have them. May be not the case if we are building
from source package
++++++ sample_odbc.ini ++++++
--- /var/tmp/diff_new_pack.sdaFXo/_old 2019-05-22 15:40:45.514437687 +0200
+++ /var/tmp/diff_new_pack.sdaFXo/_new 2019-05-22 15:40:45.514437687 +0200
@@ -48,6 +48,15 @@
#SslCrl =
#SslCrlPath =
+# Combination of "TLSv1.1", "TLSv1.2", "TLSv1.3"
+#TlsVersion =
+#ForceTls =
+
+# file DSN
+#SaveFile =
+
+#ReadMycnf =
+
# Options is a numeric combination of the following constants
#
#OPT_FLAG_FIELD_LENGTH 1
