From e90a5ee6295af51435ed1a473a65f13d36d8f9ff9f03dfb8663cd4cf2a15ccd2 Mon Sep 17 00:00:00 2001 From: Yuchen Lin Date: Tue, 11 Apr 2017 07:33:06 +0000 Subject: [PATCH 01/32] Accepting request 482634 from server:database new package OBS-URL: https://build.opensuse.org/request/show/482634 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=1 --- absolute_path_fix.patch | 41 ++ baselibs.conf | 3 - bigendian_type_fixes.patch | 25 + ...connector-c-2.3.1_unresolved_symbols.patch | 22 +- mariadb-connector-c-2.3.2-src.tar.gz | 3 + mariadb-connector-c-2.3.2-src.tar.gz.asc | 11 + mariadb-connector-c-3.2.3-src.tar.gz | 3 - mariadb-connector-c-3.2.3-src.tar.gz.asc | 11 - mariadb-connector-c.changes | 466 ------------------ mariadb-connector-c.spec | 165 +++---- private_library.patch | 129 ++--- 11 files changed, 221 insertions(+), 658 deletions(-) create mode 100644 absolute_path_fix.patch delete mode 100644 baselibs.conf create mode 100644 bigendian_type_fixes.patch create mode 100644 mariadb-connector-c-2.3.2-src.tar.gz create mode 100644 mariadb-connector-c-2.3.2-src.tar.gz.asc delete mode 100644 mariadb-connector-c-3.2.3-src.tar.gz delete mode 100644 mariadb-connector-c-3.2.3-src.tar.gz.asc diff --git a/absolute_path_fix.patch b/absolute_path_fix.patch new file mode 100644 index 0000000..32e0298 --- /dev/null +++ b/absolute_path_fix.patch @@ -0,0 +1,41 @@ +Author: Adam Majer +Date: Fri Mar 3 15:59:09 CET 2017 +Summary: Remove pure ugliness with paths + +Index: mariadb-connector-c-2.3.2-src/mariadb_config/mariadb_config.c.in +=================================================================== +--- mariadb-connector-c-2.3.2-src.orig/mariadb_config/mariadb_config.c.in ++++ mariadb-connector-c-2.3.2-src/mariadb_config/mariadb_config.c.in +@@ -3,12 +3,12 @@ + #include + #include + +-#define INCLUDE "-I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@/mysql" +-#define LIBS "-L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb" \ ++#define INCLUDE "-I@INCLUDE_INSTALL_DIR@ -I@INCLUDE_INSTALL_DIR@/mariadb" ++#define LIBS "-L@LIB_INSTALL_DIR@/mariadb -lmariadb" \ + "@extra_dynamic_LDFLAGS@" + #define CFLAGS INCLUDE " @CMAKE_C_FLAGS@" + #define VERSION "@MYSQL_CLIENT_VERSION@" +-#define PLUGIN_DIR "@PREFIX_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@/@PLUGIN_INSTALL_DIR@" ++#define PLUGIN_DIR "@PLUGIN_INSTALL_DIR@" + #define SOCKET "@MYSQL_UNIX_ADDR@" + #define PORT "@MYSQL_PORT@" + +Index: mariadb-connector-c-2.3.2-src/libmariadb/CMakeLists.txt +=================================================================== +--- mariadb-connector-c-2.3.2-src.orig/libmariadb/CMakeLists.txt ++++ mariadb-connector-c-2.3.2-src/libmariadb/CMakeLists.txt +@@ -430,9 +430,9 @@ ENDIF() + + INSTALL(TARGETS + libmariadb mariadbclient +- RUNTIME DESTINATION "${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR}" +- LIBRARY DESTINATION "${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR}" +- ARCHIVE DESTINATION "${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR}") ++ RUNTIME DESTINATION "${LIB_INSTALL_DIR}" ++ LIBRARY DESTINATION "${LIB_INSTALL_DIR}" ++ ARCHIVE DESTINATION "${LIB_INSTALL_DIR}") + + INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include/ + DESTINATION ${INCLUDE_INSTALL_DIR}/${SUFFIX_INSTALL_DIR}) diff --git a/baselibs.conf b/baselibs.conf deleted file mode 100644 index 44c1d6f..0000000 --- a/baselibs.conf +++ /dev/null @@ -1,3 +0,0 @@ -libmariadb3 - provides "libmysqlclient.so.18" - provides "libmysqlclient.so.18(libmysqlclient_18)" diff --git a/bigendian_type_fixes.patch b/bigendian_type_fixes.patch new file mode 100644 index 0000000..abc9335 --- /dev/null +++ b/bigendian_type_fixes.patch @@ -0,0 +1,25 @@ +Author: Adam Majer +Date: Fri Mar 3 14:57:53 CET 2017 +Summary: Fix build failure on Big Endien machines + +include/my_global.h:930:31: warning: dereferencing 'void *' pointer [enabled by default] + *((T)+2)=(char) ((uchar *) &A)[1];\ + ^ +libmariadb/my_stmt_codec.c:361:7: note: in expansion of macro 'float4store' + float4store(r_param->buffer, fval); + ^ +libmariadb/my_stmt_codec.c:361:7: error: invalid use of void expression + +Index: mariadb-connector-c-2.3.2-src/libmariadb/my_stmt_codec.c +=================================================================== +--- mariadb-connector-c-2.3.2-src.orig/libmariadb/my_stmt_codec.c ++++ mariadb-connector-c-2.3.2-src/libmariadb/my_stmt_codec.c +@@ -358,7 +358,7 @@ static void convert_from_long(MYSQL_BIND + { + float fval; + fval= is_unsigned ? (float)(ulonglong)(val) : (float)val; +- float4store(r_param->buffer, fval); ++ float4store((uchar *)r_param->buffer, fval); + *r_param->error= is_unsigned ? (ulonglong)fval != (ulonglong)val : (longlong)fval != val; + r_param->buffer_length= 4; + } diff --git a/mariadb-connector-c-2.3.1_unresolved_symbols.patch b/mariadb-connector-c-2.3.1_unresolved_symbols.patch index 95526ff..34fa82b 100644 --- a/mariadb-connector-c-2.3.1_unresolved_symbols.patch +++ b/mariadb-connector-c-2.3.1_unresolved_symbols.patch @@ -1,14 +1,12 @@ -Index: mariadb-connector-c-3.1.4-src/plugins/auth/CMakeLists.txt +Index: mariadb-connector-c-2.3.1/plugins/auth/CMakeLists.txt =================================================================== ---- mariadb-connector-c-3.1.4-src.orig/plugins/auth/CMakeLists.txt -+++ mariadb-connector-c-3.1.4-src/plugins/auth/CMakeLists.txt -@@ -32,7 +32,8 @@ REGISTER_PLUGIN(TARGET dialog - CONFIGURATIONS DYNAMIC STATIC OFF - DEFAULT DYNAMIC - SOURCES ${CC_SOURCE_DIR}/plugins/auth/dialog.c -- ${CC_SOURCE_DIR}/libmariadb/get_password.c) -+ ${CC_SOURCE_DIR}/libmariadb/get_password.c -+ LIBRARIES dl) +--- mariadb-connector-c-2.3.1.orig/plugins/auth/CMakeLists.txt ++++ mariadb-connector-c-2.3.1/plugins/auth/CMakeLists.txt +@@ -11,6 +11,7 @@ IF(WIN32) + SET(DIALOG_SOURCES ${DIALOG_SOURCES} ${CMAKE_SOURCE_DIR}/plugins/plugin.def) + ENDIF() + ADD_LIBRARY(dialog SHARED ${dialog_RC} ${DIALOG_SOURCES}) ++TARGET_LINK_LIBRARIES(dialog dl) + SET_TARGET_PROPERTIES(dialog PROPERTIES PREFIX "") + SIGN_TARGET(dialog) - - # Crypto plugins diff --git a/mariadb-connector-c-2.3.2-src.tar.gz b/mariadb-connector-c-2.3.2-src.tar.gz new file mode 100644 index 0000000..c8c4247 --- /dev/null +++ b/mariadb-connector-c-2.3.2-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4063c8655dc37608d4eade981e25b76f67f5d36e8426dc7f20d59e48ebba628a +size 538172 diff --git a/mariadb-connector-c-2.3.2-src.tar.gz.asc b/mariadb-connector-c-2.3.2-src.tar.gz.asc new file mode 100644 index 0000000..1f813f0 --- /dev/null +++ b/mariadb-connector-c-2.3.2-src.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAABCAAGBQJYfrGoAAoJEM4aPdXjyU9J1U0H/0U+qBNVoVTSXh++rWofQ2Mq +aC0qtyRe2eZ9ybuW2qRntDgix8tv8xY9edjMPI8huZqEKKyNCa+KkC2z5vdduRo9 +KpWqzAGuTGrHfiSFFx8uYa7DJMz++rApNsPVclCV5l/KqYpDHnjP1nvjBDAkksj9 +570DhN+lfW4jPb6YU8cZ21k1k6oJTi/tXaxletrXeu8erab2Srf17LbNCXV4fMid +u+LfDfqCJ0XsUobEDnxMYpNGOhv8ZEqQh6mdIbND4alqS8ty5vcvWAJtRXaMjhaA +nOscbaWlWnuy0e0lZXCHd7hZFdSpQNGYfIOJ1uizjhXKYUZo9vE4lNqIE4sWbF4= +=ZhvH +-----END PGP SIGNATURE----- diff --git a/mariadb-connector-c-3.2.3-src.tar.gz b/mariadb-connector-c-3.2.3-src.tar.gz deleted file mode 100644 index 3023d82..0000000 --- a/mariadb-connector-c-3.2.3-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b6aa38656438e092242a95d01d3a80a5ce95c7fc02ec81009f4f0f46262331f4 -size 992155 diff --git a/mariadb-connector-c-3.2.3-src.tar.gz.asc b/mariadb-connector-c-3.2.3-src.tar.gz.asc deleted file mode 100644 index e1551af..0000000 --- a/mariadb-connector-c-3.2.3-src.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEcBAABCAAGBQJg5fRYAAoJEM4aPdXjyU9JrdkIAMOL39K8XTgO/Ud8HzLknm9u -7QIsz0CJ2o/arc8KYfryP2Mg+V44Cq9mnTZ+mkn6X22foSt+zr/AnQ/vBw6GA2Zd -glqw3ioBc9Aj7uoG20xcObs88hks9Sg0YfIAva1bN+7A6g0wlnxcpUjVGofxKXET -6oHbPtys9MCckrfXslKQIfWwTT3OIkU49vBbE5E609ufVsDw5eNcYGL/UD9N1qCW -w1W8n9bvP8lkz3NipUpKqBBbZIqqtWz0JHBgIHaGw06qwGQYF0g0xqvU2y4damfo -h/H4Nr1wPyux4Se54QK048jUq7UjPstsKwRwyf9G2M+C/PNC5NMX/NL6anan6H0= -=mKTh ------END PGP SIGNATURE----- diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index e27ae64..96ed210 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,469 +1,3 @@ -------------------------------------------------------------------- -Wed Aug 4 10:16:00 UTC 2021 - Danilo Spinella - -- Update to 3.2.3: - * release notes and changelog: - https://mariadb.com/kb/en/library/mariadb-connector-c-323-release-notes - https://mariadb.com/kb/en/library/mariadb-connector-c-323-changelog - https://mariadb.com/kb/en/library/mariadb-connector-c-322-release-notes - https://mariadb.com/kb/en/library/mariadb-connector-c-322-changelog - https://mariadb.com/kb/en/library/mariadb-connector-c-320-release-notes - https://mariadb.com/kb/en/library/mariadb-connector-c-320-changelog -- Refresh private_library.patch - -------------------------------------------------------------------- -Thu Jun 17 11:21:36 UTC 2021 - Dirk Müller - -- drop absolute_path_fix.patch: obsolete after previous change - (properly setting INSTALL_LAYOUT and libdir) [bsc#1187459] - -------------------------------------------------------------------- -Thu May 27 18:48:59 UTC 2021 - Kristyna Streitova - -- set INSTALL_LAYOUT=RPM and adjust libdir, includedir, plugindir - and pcdir values to fix mariadb_config output. Also fix the - missing "%s" in private_library.patch so it shows the correct - path for plugindir [bsc#1179921] [bsc#1183878] - -------------------------------------------------------------------- -Thu May 27 09:31:16 UTC 2021 - Kristyna Streitova - -- Update to release 3.1.13 [bsc#1185870], [bsc#1185872], [bsc#1185868] - * CONC-537: Only read from MYSQL_HOME if MARIADB_HOME was not set - * CONC-548: Symbol conflict with libsodium - * CONC-490: Handshake error when CLIENT_CONNECT_WITH_DB flag was - set without specifying database - * CONC-543: Hash functions conflict with GnuTLS - * CONC-539: Added cipher suites ECDHE-RSA-AES128-SHA256 (0xC027) - and ECDHE-RSA-AES256-SHA384 (0xC028) to the cipher map which - maps cipher suite names to the corresponding algorithm ids - (Windows Schannel) - * CONC-535: Disabled checksum ignored in events (replication/ - binlog API) -- Remove mariadb-connector-c-cmake-3.20.patch (upstreamed) - -------------------------------------------------------------------- -Thu Apr 29 12:04:20 UTC 2021 - Dominique Leuenberger - -- Add mariadb-connector-c-cmake-3.20.patch: Fix build with cmake - 3.20. - -------------------------------------------------------------------- -Wed Mar 3 23:31:24 UTC 2021 - Kristyna Streitova - -- Update to release 3.1.12 [bsc#1182739]: - * MDEV-24577: Fix warnings generated during compilation of - plugin/auth_pam/testing/pam_mariadb_mtr.c on FreeBSD - * CONC-521: Fixed warning on MacOS when including ucontext.h - * CONC-518: Check if mysql->options.extension was allocated before - checking async_context - * CONC-517: C/C looks for plugins in wrong location on Windows - -------------------------------------------------------------------- -Thu Nov 5 13:53:30 UTC 2020 - Adam Majer - -- Update to release 3.1.11: - * CONC-513: MSAN use-of-uninitialized-value in strstr() - * CONC-512: truncation check for float values fails on i386 due - * to Intel FPU optimization bug in gcc - * CONC-510: Fix crash when loading plugins in mysql_server_init() - * CONC-508: Added support for passwords > 255 characters - * CONC-507: Fixed race condition in ma_net_init - * CONC-501: Added support for TLS v1.3 cipher suites - * MDEV-21612: Removed unused command COM_MULTI - -- changes in release 3.1.10: - * CONC-500: Fixed error when loading intermediate chained certificates - * MDEV-18818: Fixed wrong zlib in mariadb_config when building - inside server package - * CONC-498: MYSQL_UNIX_ADDR and MYSQL_PORT are now defined - * Added new build option WIITH_ICONV=ON/OFF. When set to OFF (default) - API function mariadb_convert_string will always return -1 and - sets errorcode to ENOTSUP. - * mariadb_config now tries to determine the path of execution or - uses MARIADB_CONFIG environment variable before falling back and - using CMAKE_INSTALL_PREFIX for location of libraries and include files - * added --variables option for mariadb_config. - Supported values are pkgincludedir, pkglibdir and pkgplugindir. - -- absolute_path_fix.patch, private_library.patch: refreshed - -------------------------------------------------------------------- -Fri Jul 3 11:57:03 UTC 2020 - Kristyna Streitova - -- Update to release 3.1.9 - * CONC-469: Use servers preferred authentication method unless - another plugin was specified. - * Added support for kFreeBSD builds - * Fixed memory leak in GnuTLS if connection couldn't be established. -- refresh private_library.patch - -------------------------------------------------------------------- -Fri May 22 15:05:07 UTC 2020 - Kristyna Streitova - -- Update to release 3.1.8 [bsc#1171550] - * CONC-304: Rename the static library to libmariadb.a and other - libmariadb files in a consistent manner - * CONC-441: Default user name for C/C is wrong if login user - is different from effective user - * CONC-449: Check $MARIADB_HOME/my.cnf in addition to - $MYSQL_HOME/my.cnf - * CONC-457: mysql_list_processes crashes in unpack_fields - * CONC-458: mysql_get_timeout_value crashes when used improperly - * CONC-464: Fix static build for auth_gssapi_client plugin - * Fixes for the following security vulnerabilities: - CVE-2020-13249 -- refresh absolute_path_fix.patch and private_library.patch - -------------------------------------------------------------------- -Thu Feb 6 20:30:28 UTC 2020 - Kristyna Streitova - -- Update to release 3.1.7 - * TLS/SSL: when the client doesn't procide a CA file and the - option ssl_verify_server_cert was set, the peer cerificate - will be validated against the system CA. - -------------------------------------------------------------------- -Fri Dec 20 00:13:52 UTC 2019 - Jan Engelhardt - -- Update to release 3.1.6 - * Fixed: ERROR 2026 (HY000): SSL connection error: Certificate - signature check failed - * Fixed: Provide error code and message for Schannel errors - * Fixed SEC_E_INVALID_TOKEN when server sends large message - during SSL handshake - -------------------------------------------------------------------- -Thu Nov 28 16:06:53 UTC 2019 - Kristyna Streitova - -- New upstream version 3.1.5 [bsc#1156669] - * MDEV-20469: Plugin dialog could not be loaded (wrong path) - * ODBC-440: Fixed typo in sha256_password cmake configuration - * CONC-418: For unknown/not handled schannel error codes - FormatMessage function will be used instead of returning - "Unknown error" message. - -------------------------------------------------------------------- -Tue Sep 24 10:59:32 UTC 2019 - Kristyna Streitova - -- New upstream version 3.1.4 - * CONC-431: Use windows crypto libraries on Windows platforms - * Included in MariaDB 10.4.8, MariaDB 10.3.18, and MariaDB 10.2.27 -- refresh mariadb-connector-c-2.3.1_unresolved_symbols.patch and - private_library.patch - -------------------------------------------------------------------- -Mon Aug 5 11:28:22 UTC 2019 - Kristyna Streitova - -- New upstream version 3.1.3 - * CONC-380: Fix CMake warnings - * CONC-345: heap-use-after-free in client_mpvio_read_packet - * CONC-423: Fix GnuTLS error with TLSv1.3 - * CONC-424: Ignore SERVER_STATUS_CURSOR_EXISTS if client didn't - open a cursor before - * CONC-421: Fixed crash in GnuTLS when key and certificate are - in the same file - * CONC-429: Don't allow invalid characters in plugin names - * MDEV-19807: Fixed Location of PLUGINDIR if Connector/C is a - subproject -- refresh absolute_path_fix.patch and private_library.patch - -------------------------------------------------------------------- -Wed Jul 3 15:24:22 UTC 2019 - Kristyna Streitova - -- New upstream version 3.1.2 [bsc#1136035] - * CONC-383: client plugins can't be loaded due to missing prefix - * Fixed version setting in GnuTLS by moving "NORMAL" at the end - of priority string - * CONC-386: Added support for pem files which contain certificate - and private key. - * Replication/Binlog API: The main mechanism used in replication - is the binary log. - * CONC-395: Dashes and underscores are not interchangeable in - options in my.cnf -- refresh mariadb-connector-c-2.3.1_unresolved_symbols.patch and - private_library.patch -- pack client_ed25519.so - -------------------------------------------------------------------- -Tue May 14 07:38:44 UTC 2019 - Dominique Leuenberger - -- Add pkgconfig(zlib) Requires to the -devel package: the .pc file - lists -lz in the Libs, but does not mention any requires - explicitly. So let's do our consumers a favor and pull in what we - require. - -------------------------------------------------------------------- -Fri Mar 1 15:19:46 UTC 2019 - kstreitova@suse.com - -- move libmariadb.pc from /usr/lib/pkgconfig to - /usr/lib64/pkgconfig [bsc#1126088] - -------------------------------------------------------------------- -Wed Feb 13 14:19:53 UTC 2019 - kstreitova@suse.com - -- New upstream version 3.0.9 - * CONC-384: Incorrect packet when a connection attribute name or - value is equal to or greater than 251 - * CONC-388: field->def_length is always set to 0 (only used by - deprecated function mysql_list_fields) - * Getter should get and the setter should set - CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS - * CONC-385: Removed some cmake system checks - * CONC-387: Fix case sensitive include file names for cross - compiling - * Fixed cnake policy CMP007 - * Support static linking auth plugins - * Fix build with deprecated OpenSSL API: replaced ERR_remove_state - by ERR_remove_thread_state - * Disable LOAD DATA LOCAL INFILE suport by default and auto-enable - it for the duration of one query, if the query string starts with - the word "load". In all other cases the application should enable - LOAD DATA LOCAL INFILE support explicitly - * Changed return code for mysql_optionv/mysql_get_optionv to 1 - (was -1) and added CR_NOT_IMPLEMENTED error message if a option - is unknown or not supported. This will fix possible error when - setting connection attribute failed - -------------------------------------------------------------------- -Thu Jan 3 15:11:38 UTC 2019 - kstreitova@suse.com - -- New upstream version 3.0.8 - * mingw fix: use lowercase names for include files - * CONC-375: Fixed handshake errors when mixing TLSv1.3 cipher - suites with cipher suites from other TLS protocols - * CONC-312: Added new caching_sha2_password authentication plugin - for authentication with MySQL 8.0 -- refresh mariadb-connector-c-2.3.1_unresolved_symbols.patch -- pack caching_sha2_password.so plugin - -------------------------------------------------------------------- -Thu Nov 15 09:53:11 UTC 2018 - kstreitova@suse.com - -- New upstream version 3.0.7 [bsc#1116686] - * Build fixes when building with ASAN/TSAN - * CONC-370: Fixed memory leak in configuration file parsing. - * CONC-371: Incorrect fractional part conversion when converting - datetime string to MYSQL_TIME - * CONC-283: Fixed pkg-config configuration - * CONC-364: Not all sockets created in pvio_socket_connect - function are closed - * multiple fixes in named pipe implementation - * CONC-349: Added new parameter STMT_ATTR_STATE to retrieve - statement status via api function mysql_stmt_attr_get -- refresh private_library.patch and absolute_path_fix.patch -- pack libmariadb.pc - -------------------------------------------------------------------- -Thu Aug 2 23:08:34 UTC 2018 - kstreitova@suse.com - -- New upstream version 3.0.6 - * MDEV-15263: FIx IS_NUM() macro - * CONC-297: local infile parameter must be unsigned int instead - of my_bool - * CONC-329: change return value of internal socket functions - from my_bool to int - * CONC-332: my_auth doesn't read/update server ok packet - * CONC-344: reset internal row counter - * CONC-345: invalid heap use after free - * CONC-346: Remove old cmake policies - * fixed crash in mysql_select_db if NULL parameter was provided -- refresh private_library.patch - -------------------------------------------------------------------- -Fri Jun 29 15:12:47 UTC 2018 - kstreitova@suse.com - -- New upstream version 3.0.5 -- 3.0.5 important changes: - * CONC-336: Allow multiple initialization of client library - * Fixed string to MYSQL_TIME conversion (prepared statements) - * CONC-334: Copy all members of MYSQL_FIELD to internal - statement structure - * Fixed double free in dynamic column library - * Added checks for corrupted packets in protocol - * MDEV-15450: Added default connection attribute _server_host - * CONC-326: fixed wrong openssl thread id callback -- 3.0.4 important changes: - * Added option MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS for - mysql_options()/mysql_optionsv(): - * New plugin configuration interface: The default configuration - for a specific plugin can be specified via cmake parameter - -DCLIENT_PLUGIN_${PLUGIN}=[DYNAMIC|STATIC|OFF]. - * Added support for linux abstract socket (MDEV-15655). - * CONC-320: Added asynchronous/non-blocking support for - OpenSSL and GnuTLS - * CONC-294: Access violation in mysql_close when using - a connection plugin. - * MDEV-14977: If built dynamically the old_password plugin - could not be located due to wrong filename (must be - mysql_old_password.so instead of old_password.so). - * CONC-315: If no default client character set was specified, - the utf8 character set will be used by default (instead of - setting the client character set to server character set) - * CONC-317: Parsing of configuration file fails if key/value - pairs contain white spaces. - * CONC-322: Correct handling of EAGAIN and EINPROGRESS in - internal_connect (socket) for non windows platforms. - * CONC-323: mariadb_stmt_execute_direct hangs forever if - compression used. - * CONC-324: Wrong codepage numbers for some collations. - * CONC-326: ssl_thread_init() uses wrong openssl threadid - callback -- refresh the following patches: - * mariadb-connector-c-2.3.1_unresolved_symbols.patch - * absolute_path_fix.patch - * private_library.patch - -------------------------------------------------------------------- -Fri Jun 29 10:00:42 UTC 2018 - adam.majer@suse.de - -- Drop libmysqlclient_r Provides from the -devel package. - (bsc#1097938) - -------------------------------------------------------------------- -Thu Apr 19 10:05:16 UTC 2018 - kstreitova@suse.com - -- New upstream version 3.0.3 - * Added support for new utf8mb4 character sets - * MDEV-9059: Bundle first command with authentication packet - * Build: support static OpenSSL on Windows - * MDEV-14101: Add support for tls-version, via - mysql_options(mysql, MARIADB_OPT_TLS_VERSION, value), - where value must be "TLSv1.1", "TLSv1.2" or "TLSv1.3". - * CONC-275: New indicator type STMT_INDICATOR_IGNORE_ROW for - skipping particular parameter set in bulk operation - (prepared statements). - * MDEV-10361: Don't try to reconnect twice if mysql_ping failed. - * Build fix for TSAN build with Clang - * CONC-302: Fix output of mariadb_config - * CONC-301: In case of a truncation the statement status was not - updated correctly and further calls to mysql_stmt_fetch_column - failed - * MDEV-14647: Fixed crash when client receives extended ok packet - with SESSION_TRACK_STATE_CHANGE information flag - * CONC-297: setting MYSQL_OPT_LOCAL_INFILE failed on big endian - systems. - * MDEV-14514: mariadb_config returned wrong exit code when - specifying an invalid option - * MDEV-11546: Fixed timeout problem in Schannel - * CONC-277: Allow reinitialization of the library if - mysql_server_end() was called. - * CONC-292: Fixed malloc result check in dynamic columns - * MDEV-14165: The metadata length value for a column with a - zerofill flag was calculated with a fixed length instead of using - the reported length. - * CONC-286: Force TLS/SSL usage if fingerprint parameters were - specified. - * CONC-282: Connector/C now provides additional information for - package version - * mariadb_config --cc_version lists the package version - * Beside MARIADB_PACKAGE_VERSION numeric representation - MARIADB_PACKAGE_VERSION_ID can be used now within preprocessor - directives. - * MDEV-13959: Fixed duplicate if condition in dynamic columns - * Added MARIADB_BASE_VERSION definition in mariadb_version.h to - distnguish MARIADB from MySQL - * CONC-271: installation layout fix for RPM -- refresh the following patches: - * absolute_path_fix.patch - * private_library.patch -- drop 0334aa48.patch that is no longer needed -- use %license instead of %doc [bsc#1082318] - -------------------------------------------------------------------- -Sun Nov 19 07:41:13 UTC 2017 - mpluskal@suse.com - -- Use more cmake macros -- Run spec-cleaner - -------------------------------------------------------------------- -Fri Nov 17 14:20:39 UTC 2017 - adam.majer@suse.de - -- 0334aa48.patch: Backported implementation and testcase for - skipping particular paramset in bulk operation/. This is needed - to get current stable MariaDB connector/ODBC actually compilable. - -------------------------------------------------------------------- -Mon Nov 13 17:54:46 UTC 2017 - mpluskal@suse.com - -- Install missing header (bsc#1067904) - -------------------------------------------------------------------- -Thu Nov 2 17:07:25 UTC 2017 - kstreitova@suse.com - -- mariadb-connector-c is now a provider of the libmariadb library - for mariadb and others -- add compatibility symlinks -- change LIBDIR, INCLUDEDIR and PLUGINDIR paths to be the same as - it was in the mariadb package (compatibility reasons) -- add baselibs.conf -- add %{mariadb_version} macro that should correspond with the - current version of the mariadb package -- refresh absolute_path_fix.patch and private_library.patch - -------------------------------------------------------------------- -Fri Sep 29 11:05:34 UTC 2017 - kstreitova@suse.com - -- move libraries to %{_libdir}/mariadb/ to avoid a conflict - -------------------------------------------------------------------- -Thu Sep 14 15:08:28 UTC 2017 - kstreitova@suse.com - -- add README and COPYING.LIB to %doc - -------------------------------------------------------------------- -Tue Aug 22 15:21:41 UTC 2017 - kstreitova@suse.com - -- New upstream version 3.0.2 - * Array support for prepared statements (bulk operations) - * TLS/SSL support for GnuTLS, Windows SChannel and LibreSSL - * Support for passphrase protected keys - * SHA256 authentication plugin -- refreshed - * mariadb-connector-c-2.3.1_unresolved_symbols.patch - * absolute_path_fix.patch - * private_library.patch -- change sover from 2 to 3 -- tweak build options - * DMYSQL_UNIX_ADDR is now DMARIADB_UNIX_ADDR - * DPLUGIN_INSTALL_DIR is now DINSTALL_PLUGINDIR - * add DINSTALL_LIBDIR, WITH_MYSQLCOMPAT and DWITH_SSL -- now we build also the following plugins: - * auth_gssapi_client.so - * remote_io.so - * sha256_password.so -- move libmysqlclient* libraries to %{_libdir} - -------------------------------------------------------------------- -Tue Aug 8 08:14:58 UTC 2017 - jengelh@inai.de - -- Fix RPM groups once more. - -------------------------------------------------------------------- -Thu Jul 13 12:15:06 UTC 2017 - adam.majer@suse.de - -- New upstream version 2.3.3: - * Fixed build for big-endian platforms. Obsoletes - bigendian_type_fixes.patch - * Changed parameter type for parameter reconnect in - mysql_optionsv from uint to my_bool -- absolute_path_fix.patch: refreshed - -------------------------------------------------------------------- -Thu Jul 13 12:00:32 UTC 2017 - olaf@aepfle.de - -- Remove unused gnutls from buildrequires - -------------------------------------------------------------------- -Mon Apr 3 13:03:12 UTC 2017 - jengelh@inai.de - -- Update descriptions and RPM groups - -------------------------------------------------------------------- -Wed Mar 29 11:04:35 UTC 2017 - adam.majer@suse.de - -- Set proper MySQL socket path for localhost connections - ------------------------------------------------------------------- Thu Mar 23 10:56:02 UTC 2017 - adam.majer@suse.de diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 4c441f9..2084bc3 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -1,7 +1,7 @@ # # spec file for package mariadb-connector-c # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2016 SUSE LINUX Products 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,180 +12,131 @@ # 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/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -%define sover 3 -%define libname libmariadb -# equivalent mariadb version -%define mariadb_version 10.3.21 -%if ! %{defined _rundir} -%define _rundir %{_localstatedir}/run -%endif %bcond_with sqlite3 +%define sover 2 +%define libname libmariadb + Name: mariadb-connector-c -Version: 3.2.3 +Version: 2.3.2 Release: 0 -Summary: MariaDB connector in C -License: LGPL-2.1-or-later +License: LGPL-2.1+ +Summary: MariaDB Connector/C +Url: https://github.com/MariaDB/mariadb-connector-c Group: Development/Libraries/C and C++ -URL: https://github.com/MariaDB/mariadb-connector-c -Source: https://downloads.mariadb.com/Connectors/c/connector-c-%{version}/%{name}-%{version}-src.tar.gz -Source1: https://downloads.mariadb.com/Connectors/c/connector-c-%{version}/%{name}-%{version}-src.tar.gz.asc +Source: https://downloads.mariadb.com/Connectors/c/connector-c-2.3.2/%{name}-%{version}-src.tar.gz +Source1: https://downloads.mariadb.com/Connectors/c/connector-c-2.3.2/%{name}-%{version}-src.tar.gz.asc # Imported from keyserver based on keyid @ https://mariadb.com/kb/en/mariadb-enterprise/mariadb-enterprise-installation-guide/ Source2: mariadb.keyring -Source3: baselibs.conf Patch1: mariadb-connector-c-2.3.1_unresolved_symbols.patch +Patch2: bigendian_type_fixes.patch +Patch3: absolute_path_fix.patch Patch4: private_library.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: curl-devel -BuildRequires: pkgconfig +BuildRequires: pkgconfig(gnutls) BuildRequires: pkgconfig(krb5) +BuildRequires: pkgconfig(krb5-gssapi) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(zlib) %if %{with sqlite3} -BuildRequires: pkgconfig(sqlite3) +BuildRequires: sqlite3-devel %endif %description -MariaDB Connector is used to connect applications developed in -C or C++ to MariaDB and MySQL databases. This is a different -implementation from the traditional libmariadbclient/libmysqlclient -that is shipped with mariadb-server/mysql-server, but the API is the same. +MariaDB Connector/C is used to connect applications developed in C/C++ to MariaDB and MySQL databases. %package -n %{libname}%{sover} -Summary: MariaDB connector in C -Group: System/Libraries +Group: Development/Libraries/C and C++ +Summary: MariaDB Connector/C %description -n %{libname}%{sover} -MariaDB Connector is used to connect applications developed in -C or C++ to MariaDB and MySQL databases. This is a different -implementation from the traditional libmariadbclient/libmysqlclient -that is shipped with mariadb-server/mysql-server, but the API is the same. +MariaDB Connector/C is used to connect applications developed in C/C++ to MariaDB and MySQL databases. This package holds the runtime components. %package -n %{libname}_plugins -Summary: Plugins for the MariaDB C Connector -# We need "Conflicts" because we moved some plugins here: -# dialog.so was in mariadb-client package -# mysql_clear_password.so was in mariadb package -Group: System/Libraries -Conflicts: mariadb <= 10.1.25 -Conflicts: mariadb-client <= 10.1.25 +Group: Development/Libraries/C and C++ +Summary: MariaDB Connector/C %description -n %{libname}_plugins -MariaDB Connector is used to connect applications developed in -C or C++ to MariaDB and MySQL databases. +MariaDB Connector/C is used to connect applications developed in C/C++ to MariaDB and MySQL databases. This package holds MariaDB library plugins. %package -n %{libname}private -Summary: Additional internal libraries for the MariaDB C Connector -Group: System/Libraries +Group: Development/Libraries/C and C++ +Summary: MariaDB Connector/C %description -n %{libname}private -MariaDB Connector is used to connect applications developed in -C or C++ to MariaDB and MySQL databases. +MariaDB Connector/C is used to connect applications developed in C/C++ to MariaDB and MySQL databases. This package holds the runtime components with private API. %package -n %{libname}-devel -Summary: Development files for the MariaDB Connector C API Group: Development/Libraries/C and C++ Requires: %{libname}%{sover} = %{version} Requires: pkgconfig(openssl) -Requires: pkgconfig(zlib) -# mysql-devel needs to be provided as some pkgs still depend on it -Provides: mysql-devel = %{mariadb_version} -Obsoletes: mysql-devel < %{mariadb_version} -Provides: libmysqlclient-devel = %{mariadb_version} -Obsoletes: libmysqlclient-devel < %{mariadb_version} - +# +Summary: Development files for MariaDB Connector/C %description -n %{libname}-devel -MariaDB Connector is used to connect applications developed in -C or C++ to MariaDB and MySQL databases. +MariaDB Connector/C is used to connect applications developed in C/C++ to MariaDB and MySQL databases. This package holds the development files. %prep %setup -q -n %{name}-%{version}-src %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %patch4 -p1 %build -# plugin types seems to require no aliasing assumptions -%define _lto_cflags %{nil} -export CFLAGS="%{optflags} -fno-strict-aliasing" - %cmake \ %if %{with sqlite3} -DWITH_SQLITE:BOOL=ON \ %endif -DWITH_EXTERNAL_ZLIB:BOOL=ON \ - -DMARIADB_UNIX_ADDR:STRING=%{_rundir}/mysql/mysql.sock \ - -DINSTALL_LAYOUT=RPM \ - -DINSTALL_LIBDIR:STRING=%{_lib} \ - -DINSTALL_INCLUDEDIR:STRING=include/mysql \ - -DINSTALL_PLUGINDIR:STRING=%{_lib}/mysql/plugin/ \ - -DWITH_MYSQLCOMPAT=ON \ - -DWITH_SSL=OPENSSL \ - -DINSTALL_PCDIR="%{_lib}/pkgconfig" -%make_jobs + -DPLUGIN_INSTALL_DIR:STRING=%{_libdir}/mariadb/plugin/ +make %{?_smp_mflags} %install %cmake_install -# remove static linked libraries -rm %{buildroot}%{_libdir}/libmariadbclient.a -rm %{buildroot}%{_libdir}/libmysqlclient.a -rm %{buildroot}%{_libdir}/libmysqlclient_r.a +rm %{buildroot}%{_includedir}/mariadb/CMakeLists.txt \ + %{buildroot}%{_includedir}/mariadb/*.am -# add a compatibility symlinks -ln -s mariadb_config %{buildroot}%{_bindir}/mysql_config -ln -s mariadb_version.h %{buildroot}%{_includedir}/mysql/mysql_version.h +rm %{buildroot}%{_libdir}/mariadb/*.a +rm %{buildroot}%{_libdir}/*.a -ln -s %{_includedir}/mysql %{buildroot}%{_includedir}/mariadb +%files -n %{libname}%{sover} +%defattr(-,root,root) +%{_libdir}/libmariadb.so.%{sover} -# install some extra required header file -install -Dpm 0644 build/include/ma_config.h \ - %{buildroot}%{_includedir}/mysql/my_config.h +%files -n %{libname}_plugins +%dir %{_libdir}/mariadb/ +%dir %{_libdir}/mariadb/plugin/ +%{_libdir}/mariadb/plugin/dialog.so +%{_libdir}/mariadb/plugin/mysql_clear_password.so + +%files -n %{libname}private +%{_libdir}/libmariadbprivate.so + +%files -n %{libname}-devel +%defattr(-,root,root) +%{_bindir}/mariadb_config +%{_includedir}/mariadb/ +%{_libdir}/libmariadb.so +%{_libdir}/mariadb/libmysqlclient.so +%{_libdir}/mariadb/libmysqlclient_r.so %post -n %{libname}%{sover} -p /sbin/ldconfig %post -n %{libname}private -p /sbin/ldconfig %postun -n %{libname}%{sover} -p /sbin/ldconfig %postun -n %{libname}private -p /sbin/ldconfig -%files -n %{libname}%{sover} -%license COPYING.LIB -%doc README -%{_libdir}/libmariadb.so.%{sover} - -%files -n %{libname}_plugins -%dir %{_libdir}/mysql/ -%dir %{_libdir}/mysql/plugin/ -%{_libdir}/mysql/plugin/dialog.so -%{_libdir}/mysql/plugin/mysql_clear_password.so -%{_libdir}/mysql/plugin/auth_gssapi_client.so -%{_libdir}/mysql/plugin/remote_io.so -%{_libdir}/mysql/plugin/sha256_password.so -%{_libdir}/mysql/plugin/caching_sha2_password.so -%{_libdir}/mysql/plugin/client_ed25519.so - -%files -n %{libname}private -%{_libdir}/libmariadbprivate.so - -%files -n %{libname}-devel -%{_bindir}/mariadb_config -%{_bindir}/mysql_config -%dir %{_includedir}/mysql -%{_includedir}/mysql/* -%{_includedir}/mariadb -%{_libdir}/pkgconfig/libmariadb.pc -%{_libdir}/libmariadb.so -%{_libdir}/libmysqlclient.so -%{_libdir}/libmysqlclient_r.so -%{_mandir}/man3/* - %changelog + diff --git a/private_library.patch b/private_library.patch index e1e5e39..cfefab9 100644 --- a/private_library.patch +++ b/private_library.patch @@ -8,12 +8,12 @@ static linking, create a private shared library that simply exports all symbols. With the exception of exported symbols, it is identical to the regular library. -Index: mariadb-connector-c-3.1.13-src/libmariadb/CMakeLists.txt +Index: mariadb-connector-c-2.3.2-src/libmariadb/CMakeLists.txt =================================================================== ---- mariadb-connector-c-3.1.13-src.orig/libmariadb/CMakeLists.txt -+++ mariadb-connector-c-3.1.13-src/libmariadb/CMakeLists.txt -@@ -414,6 +414,12 @@ TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE ${SYSTEM_LIBS}) - +--- mariadb-connector-c-2.3.2-src.orig/libmariadb/CMakeLists.txt ++++ mariadb-connector-c-2.3.2-src/libmariadb/CMakeLists.txt +@@ -397,13 +397,22 @@ IF(UNIX) + ENDIF() SIGN_TARGET(libmariadb) +ADD_LIBRARY(libmariadbprivate SHARED ${libmariadb_RC} $ ${EMPTY_FILE} ${EXPORT_LINK}) @@ -22,69 +22,86 @@ Index: mariadb-connector-c-3.1.13-src/libmariadb/CMakeLists.txt + SET_TARGET_PROPERTIES(libmariadbprivate PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}") +ENDIF() + - IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR - CMAKE_SYSTEM_NAME MATCHES "kFreeBSD" OR - CMAKE_SYSTEM_NAME MATCHES "GNU") -@@ -421,11 +427,13 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR - TARGET_LINK_LIBRARIES (libmariadb LINK_PRIVATE "-Wl,--no-undefined") - ENDIF() - SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINK_FLAGS "${CC_BINARY_DIR}/libmariadb/mariadbclient.def") -+ SET_TARGET_PROPERTIES(libmariadbprivate PROPERTIES LINK_FLAGS "-Wl,--no-undefined") + IF(CMAKE_SYSTEM_NAME MATCHES "Linux") + TARGET_LINK_LIBRARIES (libmariadb "-Wl,--no-undefined") + TARGET_LINK_LIBRARIES (libmariadb "-Wl,--version-script=${EXPORT_FILE}") + TARGET_LINK_LIBRARIES (mariadbclient "-Wl,--no-undefined") + TARGET_LINK_LIBRARIES (mariadbclient "-Wl,--version-script=${EXPORT_FILE}") ++ TARGET_LINK_LIBRARIES (libmariadbprivate "-Wl,--no-undefined") ENDIF() - SET_TARGET_PROPERTIES(mariadbclient PROPERTIES IMPORTED_INTERFACE_LINK_LIBRARIES "${SYSTEM_LIBS}") - SET_TARGET_PROPERTIES(libmariadb PROPERTIES IMPORTED_INTERFACE_LINK_LIBRARIES "${SYSTEM_LIBS}") - +SET_TARGET_PROPERTIES(libmariadbprivate PROPERTIES PREFIX "") ++ SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "") - # -@@ -461,7 +469,9 @@ INSTALL(TARGETS mariadbclient - INSTALL(TARGETS libmariadb - COMPONENT SharedLibraries - DESTINATION ${INSTALL_LIBDIR}) -- -+INSTALL(TARGETS libmariadbprivate -+ COMPONENT SharedLibraries -+ DESTINATION ${INSTALL_LIBDIR}) + SET_TARGET_PROPERTIES(libmariadb PROPERTIES VERSION +@@ -429,7 +438,7 @@ ENDIF() - IF(MSVC) - # On Windows, install PDB -Index: mariadb-connector-c-3.1.13-src/mariadb_config/mariadb_config.c.in + + INSTALL(TARGETS +- libmariadb mariadbclient ++ libmariadb libmariadbprivate mariadbclient + RUNTIME DESTINATION "${LIB_INSTALL_DIR}" + LIBRARY DESTINATION "${LIB_INSTALL_DIR}" + ARCHIVE DESTINATION "${LIB_INSTALL_DIR}") +Index: mariadb-connector-c-2.3.2-src/mariadb_config/mariadb_config.c.in =================================================================== ---- mariadb-connector-c-3.1.13-src.orig/mariadb_config/mariadb_config.c.in -+++ mariadb-connector-c-3.1.13-src/mariadb_config/mariadb_config.c.in -@@ -30,6 +30,7 @@ static char *mariadb_progname; - #define INCLUDE "-I%s/@INSTALL_INCLUDEDIR@ -I%s/@INSTALL_INCLUDEDIR@/mysql" - #define LIBS "-L%s/@INSTALL_LIBDIR@/ -lmariadb" - #define LIBS_SYS "@extra_dynamic_LDFLAGS@" -+#define PRIVATE_LIBS "-L%s/@INSTALL_LIBDIR@ -lmariadbprivate " LIBS_SYS - #define CFLAGS INCLUDE - #define VERSION "@MARIADB_CLIENT_VERSION@" - #define CC_VERSION "@CPACK_PACKAGE_VERSION@" -@@ -65,6 +66,7 @@ static struct option long_options[]= - {OPT_STRING_TYPE "plugindir", no_argument, 0, 'j'}, - {OPT_STRING_TYPE "tlsinfo", no_argument, 0, 'k'}, - {OPT_STRING_TYPE "variable", 2, 0, 'm'}, -+ {OPT_STRING_TYPE "privatelibs", no_argument, 0, 'z'}, +--- mariadb-connector-c-2.3.2-src.orig/mariadb_config/mariadb_config.c.in ++++ mariadb-connector-c-2.3.2-src/mariadb_config/mariadb_config.c.in +@@ -6,6 +6,8 @@ + #define INCLUDE "-I@INCLUDE_INSTALL_DIR@ -I@INCLUDE_INSTALL_DIR@/mariadb" + #define LIBS "-L@LIB_INSTALL_DIR@/mariadb -lmariadb" \ + "@extra_dynamic_LDFLAGS@" ++#define PRIVATE_LIBS "-L@LIB_INSTALL_DIR@/mariadb -lmariadbprivate" \ ++ "@extra_dynamic_LDFLAGS@" + #define CFLAGS INCLUDE " @CMAKE_C_FLAGS@" + #define VERSION "@MYSQL_CLIENT_VERSION@" + #define PLUGIN_DIR "@PLUGIN_INSTALL_DIR@" +@@ -22,6 +24,7 @@ static struct option long_options[]= + {"version", no_argument, 0, 'f'}, + {"socket", no_argument, 0, 'g'}, + {"port", no_argument, 0, 'h'}, ++ {"privatelibs", no_argument, 0, 'i'}, + {"plugindir", no_argument, 0, 'p'}, {NULL, 0, 0, 0} }; - -@@ -92,6 +94,7 @@ static const char *values[]= - CC_VERSION, +@@ -36,6 +39,7 @@ static char *values[]= + VERSION, SOCKET, PORT, + PRIVATE_LIBS, - PLUGIN_DIR, - TLS_LIBRARY_VERSION, - "VAR VAR is one of:" -@@ -288,6 +291,9 @@ int main(int argc, char **argv) - } + PLUGIN_DIR + }; + +@@ -92,6 +96,9 @@ int main(int argc, char **argv) + case 'h': + puts(PORT); break; - } -+ case 'z': ++ case 'i': + puts(PRIVATE_LIBS); + break; - default: - exit((c != -1)); - } + case 'p': + puts(PLUGIN_DIR); + break; +Index: mariadb-connector-c-2.3.2-src/plugins/auth/CMakeLists.txt +=================================================================== +--- mariadb-connector-c-2.3.2-src.orig/plugins/auth/CMakeLists.txt ++++ mariadb-connector-c-2.3.2-src/plugins/auth/CMakeLists.txt +@@ -10,7 +10,7 @@ IF(WIN32) + "FILE_DESCRIPTION:Authentication plugin") + SET(DIALOG_SOURCES ${DIALOG_SOURCES} ${CMAKE_SOURCE_DIR}/plugins/plugin.def) + ENDIF() +-ADD_LIBRARY(dialog SHARED ${dialog_RC} ${DIALOG_SOURCES}) ++ADD_LIBRARY(dialog MODULE ${dialog_RC} ${DIALOG_SOURCES}) + TARGET_LINK_LIBRARIES(dialog dl) + SET_TARGET_PROPERTIES(dialog PROPERTIES PREFIX "") + SIGN_TARGET(dialog) +@@ -32,7 +32,7 @@ IF(WIN32) + "FILE_DESCRIPTION:Authentication plugin") + SET(CTEXT_SOURCES ${CTEXT_SOURCES} ${CMAKE_SOURCE_DIR}/plugins/plugin.def) + ENDIF() +-ADD_LIBRARY(mysql_clear_password SHARED ${mysql_clear_password_RC} ${CTEXT_SOURCES}) ++ADD_LIBRARY(mysql_clear_password MODULE ${mysql_clear_password_RC} ${CTEXT_SOURCES}) + SET_TARGET_PROPERTIES(mysql_clear_password PROPERTIES PREFIX "") + SIGN_TARGET(mysql_clear_password) + From 65237fcccb351d740334a041a6dd21969f39948389df9c792370e2bc0c5ac781 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 20 Apr 2017 18:57:52 +0000 Subject: [PATCH 02/32] Accepting request 489021 from server:database Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/489021 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=2 --- mariadb-connector-c.changes | 5 +++++ mariadb-connector-c.spec | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index 96ed210..72ab63a 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 29 11:04:35 UTC 2017 - adam.majer@suse.de + +- Set proper MySQL socket path for localhost connections + ------------------------------------------------------------------- Thu Mar 23 10:56:02 UTC 2017 - adam.majer@suse.de diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 2084bc3..1218dd1 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -19,6 +19,10 @@ %define sover 2 %define libname libmariadb +%if ! %{defined _rundir} +%define _rundir %{_localstatedir}/run +%endif + Name: mariadb-connector-c Version: 2.3.2 Release: 0 @@ -100,7 +104,8 @@ This package holds the development files. -DWITH_SQLITE:BOOL=ON \ %endif -DWITH_EXTERNAL_ZLIB:BOOL=ON \ - -DPLUGIN_INSTALL_DIR:STRING=%{_libdir}/mariadb/plugin/ + -DPLUGIN_INSTALL_DIR:STRING=%{_libdir}/mariadb/plugin/ \ + -DMYSQL_UNIX_ADDR:STRING=%{_rundir}/mysql/mysql.sock make %{?_smp_mflags} %install From f9b5cf7fe1a08a28946d606d9ae33735533352e5824c6ea09f696ea0c3800699 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 16 May 2017 12:43:12 +0000 Subject: [PATCH 03/32] Accepting request 494402 from server:database 1 OBS-URL: https://build.opensuse.org/request/show/494402 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=3 --- mariadb-connector-c.changes | 5 +++++ mariadb-connector-c.spec | 34 +++++++++++++++++++--------------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index 72ab63a..f67aef6 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 3 13:03:12 UTC 2017 - jengelh@inai.de + +- Update descriptions and RPM groups + ------------------------------------------------------------------- Wed Mar 29 11:04:35 UTC 2017 - adam.majer@suse.de diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 1218dd1..aaaf572 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -27,7 +27,7 @@ Name: mariadb-connector-c Version: 2.3.2 Release: 0 License: LGPL-2.1+ -Summary: MariaDB Connector/C +Summary: MariaDB connector in C Url: https://github.com/MariaDB/mariadb-connector-c Group: Development/Libraries/C and C++ Source: https://downloads.mariadb.com/Connectors/c/connector-c-2.3.2/%{name}-%{version}-src.tar.gz @@ -51,32 +51,36 @@ BuildRequires: sqlite3-devel %endif %description -MariaDB Connector/C is used to connect applications developed in C/C++ to MariaDB and MySQL databases. +MariaDB Connector is used to connect applications developed in +C or C++ to MariaDB and MySQL databases. %package -n %{libname}%{sover} -Group: Development/Libraries/C and C++ -Summary: MariaDB Connector/C +Group: System/Libraries +Summary: MariaDB connector in C %description -n %{libname}%{sover} -MariaDB Connector/C is used to connect applications developed in C/C++ to MariaDB and MySQL databases. +MariaDB Connector is used to connect applications developed in +C or C++ to MariaDB and MySQL databases. This package holds the runtime components. %package -n %{libname}_plugins -Group: Development/Libraries/C and C++ -Summary: MariaDB Connector/C +Group: SystemLibraries +Summary: Plugins for the MariaDB C Connector %description -n %{libname}_plugins -MariaDB Connector/C is used to connect applications developed in C/C++ to MariaDB and MySQL databases. +MariaDB Connector is used to connect applications developed in +C or C++ to MariaDB and MySQL databases. This package holds MariaDB library plugins. %package -n %{libname}private -Group: Development/Libraries/C and C++ -Summary: MariaDB Connector/C +Group: System/Libraries +Summary: Additional internal libraries for the MariaDB C Connector %description -n %{libname}private -MariaDB Connector/C is used to connect applications developed in C/C++ to MariaDB and MySQL databases. +MariaDB Connector is used to connect applications developed in +C or C++ to MariaDB and MySQL databases. This package holds the runtime components with private API. @@ -84,10 +88,11 @@ This package holds the runtime components with private API. Group: Development/Libraries/C and C++ Requires: %{libname}%{sover} = %{version} Requires: pkgconfig(openssl) -# -Summary: Development files for MariaDB Connector/C +Summary: Development files for the MariaDB Connector C API + %description -n %{libname}-devel -MariaDB Connector/C is used to connect applications developed in C/C++ to MariaDB and MySQL databases. +MariaDB Connector is used to connect applications developed in +C or C++ to MariaDB and MySQL databases. This package holds the development files. @@ -144,4 +149,3 @@ rm %{buildroot}%{_libdir}/*.a %postun -n %{libname}private -p /sbin/ldconfig %changelog - From fe7908aad89ab2281ec0f8452f394fe73059ad466927d508d715c639af2548cb Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 17 Jul 2017 07:10:59 +0000 Subject: [PATCH 04/32] Accepting request 510115 from server:database - New upstream version 2.3.3: * Fixed build for big-endian platforms. Obsoletes bigendian_type_fixes.patch * Changed parameter type for parameter reconnect in mysql_optionsv from uint to my_bool - absolute_path_fix.patch: refreshed - Remove unused gnutls from buildrequires OBS-URL: https://build.opensuse.org/request/show/510115 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=4 --- absolute_path_fix.patch | 16 +++++++------- bigendian_type_fixes.patch | 25 ---------------------- mariadb-connector-c-2.3.2-src.tar.gz | 3 --- mariadb-connector-c-2.3.2-src.tar.gz.asc | 11 ---------- mariadb-connector-c-2.3.3-src.tar.gz | 3 +++ mariadb-connector-c-2.3.3-src.tar.gz.asc | 11 ++++++++++ mariadb-connector-c.changes | 15 +++++++++++++ mariadb-connector-c.spec | 27 +++++++++++------------- 8 files changed, 49 insertions(+), 62 deletions(-) delete mode 100644 bigendian_type_fixes.patch delete mode 100644 mariadb-connector-c-2.3.2-src.tar.gz delete mode 100644 mariadb-connector-c-2.3.2-src.tar.gz.asc create mode 100644 mariadb-connector-c-2.3.3-src.tar.gz create mode 100644 mariadb-connector-c-2.3.3-src.tar.gz.asc diff --git a/absolute_path_fix.patch b/absolute_path_fix.patch index 32e0298..940a7e8 100644 --- a/absolute_path_fix.patch +++ b/absolute_path_fix.patch @@ -2,13 +2,13 @@ Author: Adam Majer Date: Fri Mar 3 15:59:09 CET 2017 Summary: Remove pure ugliness with paths -Index: mariadb-connector-c-2.3.2-src/mariadb_config/mariadb_config.c.in +Index: mariadb-connector-c-2.3.3-src/mariadb_config/mariadb_config.c.in =================================================================== ---- mariadb-connector-c-2.3.2-src.orig/mariadb_config/mariadb_config.c.in -+++ mariadb-connector-c-2.3.2-src/mariadb_config/mariadb_config.c.in -@@ -3,12 +3,12 @@ - #include +--- mariadb-connector-c-2.3.3-src.orig/mariadb_config/mariadb_config.c.in ++++ mariadb-connector-c-2.3.3-src/mariadb_config/mariadb_config.c.in +@@ -2,12 +2,12 @@ #include + #include -#define INCLUDE "-I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@/mysql" -#define LIBS "-L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb" \ @@ -22,10 +22,10 @@ Index: mariadb-connector-c-2.3.2-src/mariadb_config/mariadb_config.c.in #define SOCKET "@MYSQL_UNIX_ADDR@" #define PORT "@MYSQL_PORT@" -Index: mariadb-connector-c-2.3.2-src/libmariadb/CMakeLists.txt +Index: mariadb-connector-c-2.3.3-src/libmariadb/CMakeLists.txt =================================================================== ---- mariadb-connector-c-2.3.2-src.orig/libmariadb/CMakeLists.txt -+++ mariadb-connector-c-2.3.2-src/libmariadb/CMakeLists.txt +--- mariadb-connector-c-2.3.3-src.orig/libmariadb/CMakeLists.txt ++++ mariadb-connector-c-2.3.3-src/libmariadb/CMakeLists.txt @@ -430,9 +430,9 @@ ENDIF() INSTALL(TARGETS diff --git a/bigendian_type_fixes.patch b/bigendian_type_fixes.patch deleted file mode 100644 index abc9335..0000000 --- a/bigendian_type_fixes.patch +++ /dev/null @@ -1,25 +0,0 @@ -Author: Adam Majer -Date: Fri Mar 3 14:57:53 CET 2017 -Summary: Fix build failure on Big Endien machines - -include/my_global.h:930:31: warning: dereferencing 'void *' pointer [enabled by default] - *((T)+2)=(char) ((uchar *) &A)[1];\ - ^ -libmariadb/my_stmt_codec.c:361:7: note: in expansion of macro 'float4store' - float4store(r_param->buffer, fval); - ^ -libmariadb/my_stmt_codec.c:361:7: error: invalid use of void expression - -Index: mariadb-connector-c-2.3.2-src/libmariadb/my_stmt_codec.c -=================================================================== ---- mariadb-connector-c-2.3.2-src.orig/libmariadb/my_stmt_codec.c -+++ mariadb-connector-c-2.3.2-src/libmariadb/my_stmt_codec.c -@@ -358,7 +358,7 @@ static void convert_from_long(MYSQL_BIND - { - float fval; - fval= is_unsigned ? (float)(ulonglong)(val) : (float)val; -- float4store(r_param->buffer, fval); -+ float4store((uchar *)r_param->buffer, fval); - *r_param->error= is_unsigned ? (ulonglong)fval != (ulonglong)val : (longlong)fval != val; - r_param->buffer_length= 4; - } diff --git a/mariadb-connector-c-2.3.2-src.tar.gz b/mariadb-connector-c-2.3.2-src.tar.gz deleted file mode 100644 index c8c4247..0000000 --- a/mariadb-connector-c-2.3.2-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4063c8655dc37608d4eade981e25b76f67f5d36e8426dc7f20d59e48ebba628a -size 538172 diff --git a/mariadb-connector-c-2.3.2-src.tar.gz.asc b/mariadb-connector-c-2.3.2-src.tar.gz.asc deleted file mode 100644 index 1f813f0..0000000 --- a/mariadb-connector-c-2.3.2-src.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEcBAABCAAGBQJYfrGoAAoJEM4aPdXjyU9J1U0H/0U+qBNVoVTSXh++rWofQ2Mq -aC0qtyRe2eZ9ybuW2qRntDgix8tv8xY9edjMPI8huZqEKKyNCa+KkC2z5vdduRo9 -KpWqzAGuTGrHfiSFFx8uYa7DJMz++rApNsPVclCV5l/KqYpDHnjP1nvjBDAkksj9 -570DhN+lfW4jPb6YU8cZ21k1k6oJTi/tXaxletrXeu8erab2Srf17LbNCXV4fMid -u+LfDfqCJ0XsUobEDnxMYpNGOhv8ZEqQh6mdIbND4alqS8ty5vcvWAJtRXaMjhaA -nOscbaWlWnuy0e0lZXCHd7hZFdSpQNGYfIOJ1uizjhXKYUZo9vE4lNqIE4sWbF4= -=ZhvH ------END PGP SIGNATURE----- diff --git a/mariadb-connector-c-2.3.3-src.tar.gz b/mariadb-connector-c-2.3.3-src.tar.gz new file mode 100644 index 0000000..9d06ae4 --- /dev/null +++ b/mariadb-connector-c-2.3.3-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82a5710134e7654b9cad58964d6a25ed91b3dc1804ff51e8be2def0032914089 +size 537738 diff --git a/mariadb-connector-c-2.3.3-src.tar.gz.asc b/mariadb-connector-c-2.3.3-src.tar.gz.asc new file mode 100644 index 0000000..ed5df00 --- /dev/null +++ b/mariadb-connector-c-2.3.3-src.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAABCAAGBQJZLaBiAAoJEM4aPdXjyU9JdZ8H/iYT1L6PfAsO8bB2DcPG7Ixi +wwymNU2v2CTRIIiWvjlOVC3k3oIrhVdnEKTOKTc9kKc3TKFq8dujzog86qGB5gG1 +A1mXZvoipz5D+PU0h614WecNi2VgDgIZr89ka/6cYUM3TKPBC1De0PQx9vbHntnn +jL4Dzw8PJwPSkt+Ngk9iU5Ft+qS3BCtO2Ws1EGvmGxcW+QBrOUKdFNL+bBtI7oLz +a57VwoTXCBZ4SA7ZFAdrshN515DAriCk1ldvsfQhPqPwsdXOpJwxst7Q6I2bZ8YR +Ltmv3vVuoQdPEmS0SwTjApSt82JiejRS5euTczCnQ9MEf7tOrh3mwOwuUCa6Ql8= +=W0+a +-----END PGP SIGNATURE----- diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index f67aef6..2e07189 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Jul 13 12:15:06 UTC 2017 - adam.majer@suse.de + +- New upstream version 2.3.3: + * Fixed build for big-endian platforms. Obsoletes + bigendian_type_fixes.patch + * Changed parameter type for parameter reconnect in + mysql_optionsv from uint to my_bool +- absolute_path_fix.patch: refreshed + +------------------------------------------------------------------- +Thu Jul 13 12:00:32 UTC 2017 - olaf@aepfle.de + +- Remove unused gnutls from buildrequires + ------------------------------------------------------------------- Mon Apr 3 13:03:12 UTC 2017 - jengelh@inai.de diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index aaaf572..d000129 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -1,7 +1,7 @@ # # spec file for package mariadb-connector-c # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %bcond_with sqlite3 %define sover 2 %define libname libmariadb @@ -24,24 +25,22 @@ %endif Name: mariadb-connector-c -Version: 2.3.2 +Version: 2.3.3 Release: 0 -License: LGPL-2.1+ Summary: MariaDB connector in C -Url: https://github.com/MariaDB/mariadb-connector-c +License: LGPL-2.1+ Group: Development/Libraries/C and C++ -Source: https://downloads.mariadb.com/Connectors/c/connector-c-2.3.2/%{name}-%{version}-src.tar.gz -Source1: https://downloads.mariadb.com/Connectors/c/connector-c-2.3.2/%{name}-%{version}-src.tar.gz.asc +Url: https://github.com/MariaDB/mariadb-connector-c +Source: https://downloads.mariadb.com/Connectors/c/connector-c-%{version}/%{name}-%{version}-src.tar.gz +Source1: https://downloads.mariadb.com/Connectors/c/connector-c-%{version}/%{name}-%{version}-src.tar.gz.asc # Imported from keyserver based on keyid @ https://mariadb.com/kb/en/mariadb-enterprise/mariadb-enterprise-installation-guide/ Source2: mariadb.keyring Patch1: mariadb-connector-c-2.3.1_unresolved_symbols.patch -Patch2: bigendian_type_fixes.patch Patch3: absolute_path_fix.patch Patch4: private_library.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: curl-devel -BuildRequires: pkgconfig(gnutls) BuildRequires: pkgconfig(krb5) BuildRequires: pkgconfig(krb5-gssapi) BuildRequires: pkgconfig(openssl) @@ -55,8 +54,8 @@ MariaDB Connector is used to connect applications developed in C or C++ to MariaDB and MySQL databases. %package -n %{libname}%{sover} -Group: System/Libraries Summary: MariaDB connector in C +Group: System/Libraries %description -n %{libname}%{sover} MariaDB Connector is used to connect applications developed in @@ -65,8 +64,8 @@ C or C++ to MariaDB and MySQL databases. This package holds the runtime components. %package -n %{libname}_plugins -Group: SystemLibraries Summary: Plugins for the MariaDB C Connector +Group: SystemLibraries %description -n %{libname}_plugins MariaDB Connector is used to connect applications developed in @@ -75,8 +74,8 @@ C or C++ to MariaDB and MySQL databases. This package holds MariaDB library plugins. %package -n %{libname}private -Group: System/Libraries Summary: Additional internal libraries for the MariaDB C Connector +Group: System/Libraries %description -n %{libname}private MariaDB Connector is used to connect applications developed in @@ -85,10 +84,10 @@ C or C++ to MariaDB and MySQL databases. This package holds the runtime components with private API. %package -n %{libname}-devel -Group: Development/Libraries/C and C++ Requires: %{libname}%{sover} = %{version} Requires: pkgconfig(openssl) Summary: Development files for the MariaDB Connector C API +Group: Development/Libraries/C and C++ %description -n %{libname}-devel MariaDB Connector is used to connect applications developed in @@ -99,7 +98,6 @@ This package holds the development files. %prep %setup -q -n %{name}-%{version}-src %patch1 -p1 -%patch2 -p1 %patch3 -p1 %patch4 -p1 @@ -116,8 +114,7 @@ make %{?_smp_mflags} %install %cmake_install -rm %{buildroot}%{_includedir}/mariadb/CMakeLists.txt \ - %{buildroot}%{_includedir}/mariadb/*.am +rm %{buildroot}%{_includedir}/mariadb/CMakeLists.txt rm %{buildroot}%{_libdir}/mariadb/*.a rm %{buildroot}%{_libdir}/*.a From ebe6371f1523353859641e3dfe37a182b9139f460c655a7fd9415e2e3abd2b7d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 16 Aug 2017 14:13:07 +0000 Subject: [PATCH 05/32] Accepting request 515189 from server:database 1 OBS-URL: https://build.opensuse.org/request/show/515189 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=5 --- mariadb-connector-c.changes | 5 +++++ mariadb-connector-c.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index 2e07189..12eda1e 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 8 08:14:58 UTC 2017 - jengelh@inai.de + +- Fix RPM groups once more. + ------------------------------------------------------------------- Thu Jul 13 12:15:06 UTC 2017 - adam.majer@suse.de diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index d000129..1b3003c 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -65,7 +65,7 @@ This package holds the runtime components. %package -n %{libname}_plugins Summary: Plugins for the MariaDB C Connector -Group: SystemLibraries +Group: System/Libraries %description -n %{libname}_plugins MariaDB Connector is used to connect applications developed in From fec2be8f6caee9264409d002e2990702b52bab76cb87cec28a73e9e72c404285 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 3 Oct 2017 21:17:30 +0000 Subject: [PATCH 06/32] Accepting request 529952 from server:database 1 OBS-URL: https://build.opensuse.org/request/show/529952 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=6 --- absolute_path_fix.patch | 52 ++++------ ...connector-c-2.3.1_unresolved_symbols.patch | 22 ++--- mariadb-connector-c-2.3.3-src.tar.gz | 3 - mariadb-connector-c-2.3.3-src.tar.gz.asc | 11 --- mariadb-connector-c-3.0.2-src.tar.gz | 3 + mariadb-connector-c-3.0.2-src.tar.gz.asc | 11 +++ mariadb-connector-c.changes | 33 +++++++ mariadb-connector-c.spec | 29 +++--- private_library.patch | 95 ++++++++----------- 9 files changed, 132 insertions(+), 127 deletions(-) delete mode 100644 mariadb-connector-c-2.3.3-src.tar.gz delete mode 100644 mariadb-connector-c-2.3.3-src.tar.gz.asc create mode 100644 mariadb-connector-c-3.0.2-src.tar.gz create mode 100644 mariadb-connector-c-3.0.2-src.tar.gz.asc diff --git a/absolute_path_fix.patch b/absolute_path_fix.patch index 940a7e8..8ff6077 100644 --- a/absolute_path_fix.patch +++ b/absolute_path_fix.patch @@ -2,40 +2,24 @@ Author: Adam Majer Date: Fri Mar 3 15:59:09 CET 2017 Summary: Remove pure ugliness with paths -Index: mariadb-connector-c-2.3.3-src/mariadb_config/mariadb_config.c.in +Index: mariadb-connector-c-3.0.2-src/mariadb_config/mariadb_config.c.in =================================================================== ---- mariadb-connector-c-2.3.3-src.orig/mariadb_config/mariadb_config.c.in -+++ mariadb-connector-c-2.3.3-src/mariadb_config/mariadb_config.c.in -@@ -2,12 +2,12 @@ - #include - #include +--- mariadb-connector-c-3.0.2-src.orig/mariadb_config/mariadb_config.c.in ++++ mariadb-connector-c-3.0.2-src/mariadb_config/mariadb_config.c.in +@@ -5,13 +5,13 @@ --#define INCLUDE "-I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@/mysql" --#define LIBS "-L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb" \ -+#define INCLUDE "-I@INCLUDE_INSTALL_DIR@ -I@INCLUDE_INSTALL_DIR@/mariadb" -+#define LIBS "-L@LIB_INSTALL_DIR@/mariadb -lmariadb" \ + static char *mariadb_progname; + +-#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql" +-#define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb "\ ++#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb" ++#define LIBS "-L@INSTALL_LIBDIR@/mariadb -lmariadb" \ "@extra_dynamic_LDFLAGS@" - #define CFLAGS INCLUDE " @CMAKE_C_FLAGS@" - #define VERSION "@MYSQL_CLIENT_VERSION@" --#define PLUGIN_DIR "@PREFIX_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@/@PLUGIN_INSTALL_DIR@" -+#define PLUGIN_DIR "@PLUGIN_INSTALL_DIR@" - #define SOCKET "@MYSQL_UNIX_ADDR@" - #define PORT "@MYSQL_PORT@" - -Index: mariadb-connector-c-2.3.3-src/libmariadb/CMakeLists.txt -=================================================================== ---- mariadb-connector-c-2.3.3-src.orig/libmariadb/CMakeLists.txt -+++ mariadb-connector-c-2.3.3-src/libmariadb/CMakeLists.txt -@@ -430,9 +430,9 @@ ENDIF() - - INSTALL(TARGETS - libmariadb mariadbclient -- RUNTIME DESTINATION "${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR}" -- LIBRARY DESTINATION "${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR}" -- ARCHIVE DESTINATION "${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR}") -+ RUNTIME DESTINATION "${LIB_INSTALL_DIR}" -+ LIBRARY DESTINATION "${LIB_INSTALL_DIR}" -+ ARCHIVE DESTINATION "${LIB_INSTALL_DIR}") - - INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include/ - DESTINATION ${INCLUDE_INSTALL_DIR}/${SUFFIX_INSTALL_DIR}) + #define LIBS_SYS "@extra_dynamic_LDFLAGS@" + #define CFLAGS INCLUDE + #define VERSION "@MARIADB_CLIENT_VERSION@" +-#define PLUGIN_DIR "@CMAKE_INSTALL_PREFIX@/@INSTALL_PLUGINDIR@" ++#define PLUGIN_DIR "@INSTALL_PLUGINDIR@" + #define SOCKET "@MARIADB_UNIX_ADDR@" + #define PORT "@MARIADB_PORT@" + #define TLS_LIBRARY_VERSION "@TLS_LIBRARY_VERSION@" diff --git a/mariadb-connector-c-2.3.1_unresolved_symbols.patch b/mariadb-connector-c-2.3.1_unresolved_symbols.patch index 34fa82b..a97f3ab 100644 --- a/mariadb-connector-c-2.3.1_unresolved_symbols.patch +++ b/mariadb-connector-c-2.3.1_unresolved_symbols.patch @@ -1,12 +1,12 @@ -Index: mariadb-connector-c-2.3.1/plugins/auth/CMakeLists.txt +Index: mariadb-connector-c-3.0.2-src/plugins/auth/CMakeLists.txt =================================================================== ---- mariadb-connector-c-2.3.1.orig/plugins/auth/CMakeLists.txt -+++ mariadb-connector-c-2.3.1/plugins/auth/CMakeLists.txt -@@ -11,6 +11,7 @@ IF(WIN32) - SET(DIALOG_SOURCES ${DIALOG_SOURCES} ${CMAKE_SOURCE_DIR}/plugins/plugin.def) - ENDIF() - ADD_LIBRARY(dialog SHARED ${dialog_RC} ${DIALOG_SOURCES}) -+TARGET_LINK_LIBRARIES(dialog dl) - SET_TARGET_PROPERTIES(dialog PROPERTIES PREFIX "") - SIGN_TARGET(dialog) - +--- mariadb-connector-c-3.0.2-src.orig/plugins/auth/CMakeLists.txt ++++ mariadb-connector-c-3.0.2-src/plugins/auth/CMakeLists.txt +@@ -21,6 +21,7 @@ IF(AUTH_DIALOG_PLUGIN_TYPE MATCHES "DYNA + SET(DIALOG_SOURCES ${DIALOG_SOURCES} ${CC_SOURCE_DIR}/plugins/plugin.def) + ENDIF() + ADD_LIBRARY(dialog MODULE ${DIALOG_SOURCES}) ++ TARGET_LINK_LIBRARIES(dialog dl) + SET_TARGET_PROPERTIES(dialog PROPERTIES PREFIX "") + SIGN_TARGET(dialog) + INSTALL_PLUGIN(dialog ${CC_BINARY_DIR}/plugins/auth) diff --git a/mariadb-connector-c-2.3.3-src.tar.gz b/mariadb-connector-c-2.3.3-src.tar.gz deleted file mode 100644 index 9d06ae4..0000000 --- a/mariadb-connector-c-2.3.3-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:82a5710134e7654b9cad58964d6a25ed91b3dc1804ff51e8be2def0032914089 -size 537738 diff --git a/mariadb-connector-c-2.3.3-src.tar.gz.asc b/mariadb-connector-c-2.3.3-src.tar.gz.asc deleted file mode 100644 index ed5df00..0000000 --- a/mariadb-connector-c-2.3.3-src.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEcBAABCAAGBQJZLaBiAAoJEM4aPdXjyU9JdZ8H/iYT1L6PfAsO8bB2DcPG7Ixi -wwymNU2v2CTRIIiWvjlOVC3k3oIrhVdnEKTOKTc9kKc3TKFq8dujzog86qGB5gG1 -A1mXZvoipz5D+PU0h614WecNi2VgDgIZr89ka/6cYUM3TKPBC1De0PQx9vbHntnn -jL4Dzw8PJwPSkt+Ngk9iU5Ft+qS3BCtO2Ws1EGvmGxcW+QBrOUKdFNL+bBtI7oLz -a57VwoTXCBZ4SA7ZFAdrshN515DAriCk1ldvsfQhPqPwsdXOpJwxst7Q6I2bZ8YR -Ltmv3vVuoQdPEmS0SwTjApSt82JiejRS5euTczCnQ9MEf7tOrh3mwOwuUCa6Ql8= -=W0+a ------END PGP SIGNATURE----- diff --git a/mariadb-connector-c-3.0.2-src.tar.gz b/mariadb-connector-c-3.0.2-src.tar.gz new file mode 100644 index 0000000..b2b3d03 --- /dev/null +++ b/mariadb-connector-c-3.0.2-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:518d14b8d77838370767d73f9bf1674f46232e1a2a34d4195bd38f52a3033758 +size 662569 diff --git a/mariadb-connector-c-3.0.2-src.tar.gz.asc b/mariadb-connector-c-3.0.2-src.tar.gz.asc new file mode 100644 index 0000000..f5d6cca --- /dev/null +++ b/mariadb-connector-c-3.0.2-src.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAABCAAGBQJZcM5uAAoJEM4aPdXjyU9JkZ8H/Rg3zVcfYukS9GKM5/JhfrMX +/Cy0ideQtuGbgtEQJFFASC1d0Nnc2EoQj+xO0R6R0mvUV5FKT/CS28RrcgXvZEyu +3yy5amq3YbaMojqqevms+5TDbhjGFy0SceBSNU2NOYdFjhorFPwqptXDoyb1Xrno +DiUAFLmY4n+vlUZYmMgMXt/nz7I6+u/zUEvCBo38HmIZwTPrw0/xXQsk8WW697yK +2+O59RqKFF0qQGQBKl7MRdbDGXSdxlzYwWBXcB/P1mxO3Ac1TvO0NVIqdcKLsRvo +x70bzHtBeXwTjvYCZTKArwz/xh+uQioqgZh3ds4ZDcgovMSwpWNHJ3nhdLX8SMc= +=A5ve +-----END PGP SIGNATURE----- diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index 12eda1e..3edf726 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Fri Sep 29 11:05:34 UTC 2017 - kstreitova@suse.com + +- move libraries to %{_libdir}/mariadb/ to avoid a conflict + +------------------------------------------------------------------- +Thu Sep 14 15:08:28 UTC 2017 - kstreitova@suse.com + +- add README and COPYING.LIB to %doc + +------------------------------------------------------------------- +Tue Aug 22 15:21:41 UTC 2017 - kstreitova@suse.com + +- New upstream version 3.0.2 + * Array support for prepared statements (bulk operations) + * TLS/SSL support for GnuTLS, Windows SChannel and LibreSSL + * Support for passphrase protected keys + * SHA256 authentication plugin +- refreshed + * mariadb-connector-c-2.3.1_unresolved_symbols.patch + * absolute_path_fix.patch + * private_library.patch +- change sover from 2 to 3 +- tweak build options + * DMYSQL_UNIX_ADDR is now DMARIADB_UNIX_ADDR + * DPLUGIN_INSTALL_DIR is now DINSTALL_PLUGINDIR + * add DINSTALL_LIBDIR, WITH_MYSQLCOMPAT and DWITH_SSL +- now we build also the following plugins: + * auth_gssapi_client.so + * remote_io.so + * sha256_password.so +- move libmysqlclient* libraries to %{_libdir} + ------------------------------------------------------------------- Tue Aug 8 08:14:58 UTC 2017 - jengelh@inai.de diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 1b3003c..94e360a 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -17,7 +17,7 @@ %bcond_with sqlite3 -%define sover 2 +%define sover 3 %define libname libmariadb %if ! %{defined _rundir} @@ -25,7 +25,7 @@ %endif Name: mariadb-connector-c -Version: 2.3.3 +Version: 3.0.2 Release: 0 Summary: MariaDB connector in C License: LGPL-2.1+ @@ -107,36 +107,43 @@ This package holds the development files. -DWITH_SQLITE:BOOL=ON \ %endif -DWITH_EXTERNAL_ZLIB:BOOL=ON \ - -DPLUGIN_INSTALL_DIR:STRING=%{_libdir}/mariadb/plugin/ \ - -DMYSQL_UNIX_ADDR:STRING=%{_rundir}/mysql/mysql.sock + -DMARIADB_UNIX_ADDR:STRING=%{_rundir}/mysql/mysql.sock \ + -DINSTALL_LIBDIR:STRING=%{_libdir}/mariadb \ + -DINSTALL_PLUGINDIR:STRING=%{_libdir}/mariadb/plugin/ \ + -DWITH_MYSQLCOMPAT=ON \ + -DWITH_SSL=OPENSSL make %{?_smp_mflags} %install %cmake_install -rm %{buildroot}%{_includedir}/mariadb/CMakeLists.txt - -rm %{buildroot}%{_libdir}/mariadb/*.a -rm %{buildroot}%{_libdir}/*.a +# remove static linked libraries +rm %{buildroot}%{_libdir}/mariadb/libmariadbclient.a +rm %{buildroot}%{_libdir}/mariadb/libmysqlclient.a +rm %{buildroot}%{_libdir}/mariadb/libmysqlclient_r.a %files -n %{libname}%{sover} %defattr(-,root,root) -%{_libdir}/libmariadb.so.%{sover} +%doc README COPYING.LIB +%{_libdir}/mariadb/libmariadb.so.%{sover} %files -n %{libname}_plugins %dir %{_libdir}/mariadb/ %dir %{_libdir}/mariadb/plugin/ %{_libdir}/mariadb/plugin/dialog.so %{_libdir}/mariadb/plugin/mysql_clear_password.so +%{_libdir}/mariadb/plugin/auth_gssapi_client.so +%{_libdir}/mariadb/plugin/remote_io.so +%{_libdir}/mariadb/plugin/sha256_password.so %files -n %{libname}private -%{_libdir}/libmariadbprivate.so +%{_libdir}/mariadb/libmariadbprivate.so %files -n %{libname}-devel %defattr(-,root,root) %{_bindir}/mariadb_config %{_includedir}/mariadb/ -%{_libdir}/libmariadb.so +%{_libdir}/mariadb/libmariadb.so %{_libdir}/mariadb/libmysqlclient.so %{_libdir}/mariadb/libmysqlclient_r.so diff --git a/private_library.patch b/private_library.patch index cfefab9..7554d7d 100644 --- a/private_library.patch +++ b/private_library.patch @@ -8,13 +8,13 @@ static linking, create a private shared library that simply exports all symbols. With the exception of exported symbols, it is identical to the regular library. -Index: mariadb-connector-c-2.3.2-src/libmariadb/CMakeLists.txt +Index: mariadb-connector-c-3.0.2-src/libmariadb/CMakeLists.txt =================================================================== ---- mariadb-connector-c-2.3.2-src.orig/libmariadb/CMakeLists.txt -+++ mariadb-connector-c-2.3.2-src/libmariadb/CMakeLists.txt -@@ -397,13 +397,22 @@ IF(UNIX) +--- mariadb-connector-c-3.0.2-src.orig/libmariadb/CMakeLists.txt ++++ mariadb-connector-c-3.0.2-src/libmariadb/CMakeLists.txt +@@ -400,16 +400,24 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC) + SET_TARGET_PROPERTIES(mariadbclient PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64") ENDIF() - SIGN_TARGET(libmariadb) +ADD_LIBRARY(libmariadbprivate SHARED ${libmariadb_RC} $ ${EMPTY_FILE} ${EXPORT_LINK}) +TARGET_LINK_LIBRARIES(libmariadbprivate ${SYSTEM_LIBS}) @@ -23,57 +23,60 @@ Index: mariadb-connector-c-2.3.2-src/libmariadb/CMakeLists.txt +ENDIF() + IF(CMAKE_SYSTEM_NAME MATCHES "Linux") - TARGET_LINK_LIBRARIES (libmariadb "-Wl,--no-undefined") - TARGET_LINK_LIBRARIES (libmariadb "-Wl,--version-script=${EXPORT_FILE}") - TARGET_LINK_LIBRARIES (mariadbclient "-Wl,--no-undefined") - TARGET_LINK_LIBRARIES (mariadbclient "-Wl,--version-script=${EXPORT_FILE}") + IF (NOT WITH_ASAN) + TARGET_LINK_LIBRARIES (libmariadb "-Wl,--no-undefined") + ENDIF() + TARGET_LINK_LIBRARIES (libmariadb "-Wl,--version-script=${CC_BINARY_DIR}/libmariadb/mariadbclient.def") + TARGET_LINK_LIBRARIES (libmariadbprivate "-Wl,--no-undefined") ENDIF() + SET_TARGET_PROPERTIES(mariadbclient PROPERTIES IMPORTED_INTERFACE_LINK_LIBRARIES "${SYSTEM_LIBS}") + SET_TARGET_PROPERTIES(libmariadb PROPERTIES IMPORTED_INTERFACE_LINK_LIBRARIES "${SYSTEM_LIBS}") + +SET_TARGET_PROPERTIES(libmariadbprivate PROPERTIES PREFIX "") -+ SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "") - SET_TARGET_PROPERTIES(libmariadb PROPERTIES VERSION -@@ -429,7 +438,7 @@ ENDIF() + # +@@ -439,6 +447,9 @@ INSTALL(TARGETS mariadbclient + INSTALL(TARGETS libmariadb + COMPONENT SharedLibraries + DESTINATION ${INSTALL_LIBDIR}) ++INSTALL(TARGETS libmariadbprivate ++ COMPONENT SharedLibraries ++ DESTINATION ${INSTALL_LIBDIR}) - - INSTALL(TARGETS -- libmariadb mariadbclient -+ libmariadb libmariadbprivate mariadbclient - RUNTIME DESTINATION "${LIB_INSTALL_DIR}" - LIBRARY DESTINATION "${LIB_INSTALL_DIR}" - ARCHIVE DESTINATION "${LIB_INSTALL_DIR}") -Index: mariadb-connector-c-2.3.2-src/mariadb_config/mariadb_config.c.in + IF(WIN32) + # On Windows, install PDB +Index: mariadb-connector-c-3.0.2-src/mariadb_config/mariadb_config.c.in =================================================================== ---- mariadb-connector-c-2.3.2-src.orig/mariadb_config/mariadb_config.c.in -+++ mariadb-connector-c-2.3.2-src/mariadb_config/mariadb_config.c.in -@@ -6,6 +6,8 @@ - #define INCLUDE "-I@INCLUDE_INSTALL_DIR@ -I@INCLUDE_INSTALL_DIR@/mariadb" - #define LIBS "-L@LIB_INSTALL_DIR@/mariadb -lmariadb" \ +--- mariadb-connector-c-3.0.2-src.orig/mariadb_config/mariadb_config.c.in ++++ mariadb-connector-c-3.0.2-src/mariadb_config/mariadb_config.c.in +@@ -8,6 +8,8 @@ static char *mariadb_progname; + #define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb" + #define LIBS "-L@INSTALL_LIBDIR@/mariadb -lmariadb" \ "@extra_dynamic_LDFLAGS@" -+#define PRIVATE_LIBS "-L@LIB_INSTALL_DIR@/mariadb -lmariadbprivate" \ ++#define PRIVATE_LIBS "-L@INSTALL_LIBDIR@/mariadb -lmariadbprivate" \ + "@extra_dynamic_LDFLAGS@" - #define CFLAGS INCLUDE " @CMAKE_C_FLAGS@" - #define VERSION "@MYSQL_CLIENT_VERSION@" - #define PLUGIN_DIR "@PLUGIN_INSTALL_DIR@" -@@ -22,6 +24,7 @@ static struct option long_options[]= + #define LIBS_SYS "@extra_dynamic_LDFLAGS@" + #define CFLAGS INCLUDE + #define VERSION "@MARIADB_CLIENT_VERSION@" +@@ -27,6 +29,7 @@ static struct option long_options[]= {"version", no_argument, 0, 'f'}, {"socket", no_argument, 0, 'g'}, {"port", no_argument, 0, 'h'}, + {"privatelibs", no_argument, 0, 'i'}, {"plugindir", no_argument, 0, 'p'}, + {"tlsinfo", no_argument, 0, 't'}, {NULL, 0, 0, 0} - }; -@@ -36,6 +39,7 @@ static char *values[]= +@@ -43,6 +46,7 @@ static const char *values[]= VERSION, SOCKET, PORT, + PRIVATE_LIBS, - PLUGIN_DIR + PLUGIN_DIR, + TLS_LIBRARY_VERSION }; - -@@ -92,6 +96,9 @@ int main(int argc, char **argv) +@@ -101,6 +105,9 @@ int main(int argc, char **argv) case 'h': puts(PORT); break; @@ -83,25 +86,3 @@ Index: mariadb-connector-c-2.3.2-src/mariadb_config/mariadb_config.c.in case 'p': puts(PLUGIN_DIR); break; -Index: mariadb-connector-c-2.3.2-src/plugins/auth/CMakeLists.txt -=================================================================== ---- mariadb-connector-c-2.3.2-src.orig/plugins/auth/CMakeLists.txt -+++ mariadb-connector-c-2.3.2-src/plugins/auth/CMakeLists.txt -@@ -10,7 +10,7 @@ IF(WIN32) - "FILE_DESCRIPTION:Authentication plugin") - SET(DIALOG_SOURCES ${DIALOG_SOURCES} ${CMAKE_SOURCE_DIR}/plugins/plugin.def) - ENDIF() --ADD_LIBRARY(dialog SHARED ${dialog_RC} ${DIALOG_SOURCES}) -+ADD_LIBRARY(dialog MODULE ${dialog_RC} ${DIALOG_SOURCES}) - TARGET_LINK_LIBRARIES(dialog dl) - SET_TARGET_PROPERTIES(dialog PROPERTIES PREFIX "") - SIGN_TARGET(dialog) -@@ -32,7 +32,7 @@ IF(WIN32) - "FILE_DESCRIPTION:Authentication plugin") - SET(CTEXT_SOURCES ${CTEXT_SOURCES} ${CMAKE_SOURCE_DIR}/plugins/plugin.def) - ENDIF() --ADD_LIBRARY(mysql_clear_password SHARED ${mysql_clear_password_RC} ${CTEXT_SOURCES}) -+ADD_LIBRARY(mysql_clear_password MODULE ${mysql_clear_password_RC} ${CTEXT_SOURCES}) - SET_TARGET_PROPERTIES(mysql_clear_password PROPERTIES PREFIX "") - SIGN_TARGET(mysql_clear_password) - From b6b55121fad9418a6ce9c5ebc475f577648e0da187fef224a257e9af7db0982c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 7 Nov 2017 09:04:39 +0000 Subject: [PATCH 07/32] Accepting request 539333 from server:database OBS-URL: https://build.opensuse.org/request/show/539333 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=7 --- absolute_path_fix.patch | 25 +++++++++++++- baselibs.conf | 3 ++ mariadb-connector-c.changes | 13 +++++++ mariadb-connector-c.spec | 68 ++++++++++++++++++++++++++----------- private_library.patch | 4 +-- 5 files changed, 91 insertions(+), 22 deletions(-) create mode 100644 baselibs.conf diff --git a/absolute_path_fix.patch b/absolute_path_fix.patch index 8ff6077..e82c598 100644 --- a/absolute_path_fix.patch +++ b/absolute_path_fix.patch @@ -13,7 +13,7 @@ Index: mariadb-connector-c-3.0.2-src/mariadb_config/mariadb_config.c.in -#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql" -#define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb "\ +#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb" -+#define LIBS "-L@INSTALL_LIBDIR@/mariadb -lmariadb" \ ++#define LIBS "-L@INSTALL_LIBDIR@ -lmariadb "\ "@extra_dynamic_LDFLAGS@" #define LIBS_SYS "@extra_dynamic_LDFLAGS@" #define CFLAGS INCLUDE @@ -23,3 +23,26 @@ Index: mariadb-connector-c-3.0.2-src/mariadb_config/mariadb_config.c.in #define SOCKET "@MARIADB_UNIX_ADDR@" #define PORT "@MARIADB_PORT@" #define TLS_LIBRARY_VERSION "@TLS_LIBRARY_VERSION@" +Index: mariadb-connector-c-3.0.2-src/mariadb_config/libmariadb.pc.in +=================================================================== +--- mariadb-connector-c-3.0.2-src.orig/mariadb_config/libmariadb.pc.in ++++ mariadb-connector-c-3.0.2-src/mariadb_config/libmariadb.pc.in +@@ -6,14 +6,14 @@ + # Dan Nicholson’s Guide to pkg-config (http://www.freedesktop.org/wiki/Software/pkg-config/) + # + +-includedir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ +-libdir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ ++includedir=@INCLUDE_INSTALL_DIR@ ++libdir=@INCLUDE_INSTALL_DIR@ + prefix=@PREFIX_INSTALL_DIR@ + + Name: libmariadb + Version: @LIBMARIADB_VERSION@ + Description: MariaDB Connector/C dynamic library +-Cflags: -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ @CMAKE_C_FLAGS@ +-Libs: -L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb @extra_dynamic_LDFLAGS@ ++Cflags: -I@INCLUDE_INSTALL_DIR@ @CMAKE_C_FLAGS@ ++Libs: -L@LIB_INSTALL_DIR@ -lmariadb @extra_dynamic_LDFLAGS@ + + diff --git a/baselibs.conf b/baselibs.conf new file mode 100644 index 0000000..44c1d6f --- /dev/null +++ b/baselibs.conf @@ -0,0 +1,3 @@ +libmariadb3 + provides "libmysqlclient.so.18" + provides "libmysqlclient.so.18(libmysqlclient_18)" diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index 3edf726..06cb279 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Nov 2 17:07:25 UTC 2017 - kstreitova@suse.com + +- mariadb-connector-c is now a provider of the libmariadb library + for mariadb and others +- add compatibility symlinks and Provides/Obsoletes +- change LIBDIR, INCLUDEDIR and PLUGINDIR paths to be the same as + it was in the mariadb package (compatibility reasons) +- add baselibs.conf +- add %{mariadb_version} macro that should correspond with the + current version of the mariadb package +- refresh absolute_path_fix.patch and private_library.patch + ------------------------------------------------------------------- Fri Sep 29 11:05:34 UTC 2017 - kstreitova@suse.com diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 94e360a..4078a01 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -19,7 +19,8 @@ %bcond_with sqlite3 %define sover 3 %define libname libmariadb - +# equivalent mariadb version +%define mariadb_version 10.2.10 %if ! %{defined _rundir} %define _rundir %{_localstatedir}/run %endif @@ -35,6 +36,7 @@ Source: https://downloads.mariadb.com/Connectors/c/connector-c-%{version Source1: https://downloads.mariadb.com/Connectors/c/connector-c-%{version}/%{name}-%{version}-src.tar.gz.asc # Imported from keyserver based on keyid @ https://mariadb.com/kb/en/mariadb-enterprise/mariadb-enterprise-installation-guide/ Source2: mariadb.keyring +Source3: baselibs.conf Patch1: mariadb-connector-c-2.3.1_unresolved_symbols.patch Patch3: absolute_path_fix.patch Patch4: private_library.patch @@ -55,7 +57,15 @@ C or C++ to MariaDB and MySQL databases. %package -n %{libname}%{sover} Summary: MariaDB connector in C +# Compatibility Provides Group: System/Libraries +%if 0%{?__isa_bits} == 64 +Provides: libmysqlclient.so.18()(64bit) +Provides: libmysqlclient.so.18(libmysqlclient_18)(64bit) +%else +Provides: libmysqlclient.so.18 +Provides: libmysqlclient.so.18(libmysqlclient_18) +%endif %description -n %{libname}%{sover} MariaDB Connector is used to connect applications developed in @@ -65,7 +75,12 @@ This package holds the runtime components. %package -n %{libname}_plugins Summary: Plugins for the MariaDB C Connector +# We need "Conflicts" because we moved some plugins here: +# dialog.so was in mariadb-client package +# mysql_clear_password.so was in mariadb package Group: System/Libraries +Conflicts: mariadb-client <= 10.1.25 +Conflicts: mariadb <= 10.1.25 %description -n %{libname}_plugins MariaDB Connector is used to connect applications developed in @@ -86,6 +101,14 @@ This package holds the runtime components with private API. %package -n %{libname}-devel Requires: %{libname}%{sover} = %{version} Requires: pkgconfig(openssl) +# mysql-devel needs to be provided as some pkgs still depend on it +Provides: mysql-devel = %{mariadb_version} +Obsoletes: mysql-devel < %{mariadb_version} +Provides: libmysqlclient-devel = %{mariadb_version} +Obsoletes: libmysqlclient-devel < %{mariadb_version} +# libmysqlclient_r.so was in libmysqlclient_r18 subpackage, now it's here +Provides: libmysqlclient_r18 = %{mariadb_version} +Obsoletes: libmysqlclient_r18 < %{mariadb_version} Summary: Development files for the MariaDB Connector C API Group: Development/Libraries/C and C++ @@ -108,8 +131,9 @@ This package holds the development files. %endif -DWITH_EXTERNAL_ZLIB:BOOL=ON \ -DMARIADB_UNIX_ADDR:STRING=%{_rundir}/mysql/mysql.sock \ - -DINSTALL_LIBDIR:STRING=%{_libdir}/mariadb \ - -DINSTALL_PLUGINDIR:STRING=%{_libdir}/mariadb/plugin/ \ + -DINSTALL_LIBDIR:STRING=%{_libdir} \ + -DINSTALL_INCLUDEDIR:STRING=%{_includedir}/mysql \ + -DINSTALL_PLUGINDIR:STRING=%{_libdir}/mysql/plugin/ \ -DWITH_MYSQLCOMPAT=ON \ -DWITH_SSL=OPENSSL make %{?_smp_mflags} @@ -118,34 +142,40 @@ make %{?_smp_mflags} %cmake_install # remove static linked libraries -rm %{buildroot}%{_libdir}/mariadb/libmariadbclient.a -rm %{buildroot}%{_libdir}/mariadb/libmysqlclient.a -rm %{buildroot}%{_libdir}/mariadb/libmysqlclient_r.a +rm %{buildroot}%{_libdir}/libmariadbclient.a +rm %{buildroot}%{_libdir}/libmysqlclient.a +rm %{buildroot}%{_libdir}/libmysqlclient_r.a + +# add a compatibility symlink +ln -s mariadb_config %{buildroot}%{_bindir}/mysql_config +ln -s mariadb_version.h %{buildroot}%{_includedir}/mysql/mysql_version.h %files -n %{libname}%{sover} %defattr(-,root,root) %doc README COPYING.LIB -%{_libdir}/mariadb/libmariadb.so.%{sover} +%{_libdir}/libmariadb.so.%{sover} %files -n %{libname}_plugins -%dir %{_libdir}/mariadb/ -%dir %{_libdir}/mariadb/plugin/ -%{_libdir}/mariadb/plugin/dialog.so -%{_libdir}/mariadb/plugin/mysql_clear_password.so -%{_libdir}/mariadb/plugin/auth_gssapi_client.so -%{_libdir}/mariadb/plugin/remote_io.so -%{_libdir}/mariadb/plugin/sha256_password.so +%dir %{_libdir}/mysql/ +%dir %{_libdir}/mysql/plugin/ +%{_libdir}/mysql/plugin/dialog.so +%{_libdir}/mysql/plugin/mysql_clear_password.so +%{_libdir}/mysql/plugin/auth_gssapi_client.so +%{_libdir}/mysql/plugin/remote_io.so +%{_libdir}/mysql/plugin/sha256_password.so %files -n %{libname}private -%{_libdir}/mariadb/libmariadbprivate.so +%{_libdir}/libmariadbprivate.so %files -n %{libname}-devel %defattr(-,root,root) %{_bindir}/mariadb_config -%{_includedir}/mariadb/ -%{_libdir}/mariadb/libmariadb.so -%{_libdir}/mariadb/libmysqlclient.so -%{_libdir}/mariadb/libmysqlclient_r.so +%{_bindir}/mysql_config +%dir %{_includedir}/mysql +%{_includedir}/mysql/* +%{_libdir}/libmariadb.so +%{_libdir}/libmysqlclient.so +%{_libdir}/libmysqlclient_r.so %post -n %{libname}%{sover} -p /sbin/ldconfig %post -n %{libname}private -p /sbin/ldconfig diff --git a/private_library.patch b/private_library.patch index 7554d7d..2db8b98 100644 --- a/private_library.patch +++ b/private_library.patch @@ -53,9 +53,9 @@ Index: mariadb-connector-c-3.0.2-src/mariadb_config/mariadb_config.c.in +++ mariadb-connector-c-3.0.2-src/mariadb_config/mariadb_config.c.in @@ -8,6 +8,8 @@ static char *mariadb_progname; #define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb" - #define LIBS "-L@INSTALL_LIBDIR@/mariadb -lmariadb" \ + #define LIBS "-L@INSTALL_LIBDIR@ -lmariadb "\ "@extra_dynamic_LDFLAGS@" -+#define PRIVATE_LIBS "-L@INSTALL_LIBDIR@/mariadb -lmariadbprivate" \ ++#define PRIVATE_LIBS "-L@INSTALL_LIBDIR@ -lmariadbprivate " \ + "@extra_dynamic_LDFLAGS@" #define LIBS_SYS "@extra_dynamic_LDFLAGS@" #define CFLAGS INCLUDE From aa53767deaf15907c469398a96815db8363817da4db88983fa3d0c95e602b09c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 7 Nov 2017 10:43:12 +0000 Subject: [PATCH 08/32] Revert, needs to be in parallel to mariadb upgrade OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=8 --- absolute_path_fix.patch | 25 +------------- baselibs.conf | 3 -- mariadb-connector-c.changes | 13 ------- mariadb-connector-c.spec | 68 +++++++++++-------------------------- private_library.patch | 4 +-- 5 files changed, 22 insertions(+), 91 deletions(-) delete mode 100644 baselibs.conf diff --git a/absolute_path_fix.patch b/absolute_path_fix.patch index e82c598..8ff6077 100644 --- a/absolute_path_fix.patch +++ b/absolute_path_fix.patch @@ -13,7 +13,7 @@ Index: mariadb-connector-c-3.0.2-src/mariadb_config/mariadb_config.c.in -#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql" -#define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb "\ +#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb" -+#define LIBS "-L@INSTALL_LIBDIR@ -lmariadb "\ ++#define LIBS "-L@INSTALL_LIBDIR@/mariadb -lmariadb" \ "@extra_dynamic_LDFLAGS@" #define LIBS_SYS "@extra_dynamic_LDFLAGS@" #define CFLAGS INCLUDE @@ -23,26 +23,3 @@ Index: mariadb-connector-c-3.0.2-src/mariadb_config/mariadb_config.c.in #define SOCKET "@MARIADB_UNIX_ADDR@" #define PORT "@MARIADB_PORT@" #define TLS_LIBRARY_VERSION "@TLS_LIBRARY_VERSION@" -Index: mariadb-connector-c-3.0.2-src/mariadb_config/libmariadb.pc.in -=================================================================== ---- mariadb-connector-c-3.0.2-src.orig/mariadb_config/libmariadb.pc.in -+++ mariadb-connector-c-3.0.2-src/mariadb_config/libmariadb.pc.in -@@ -6,14 +6,14 @@ - # Dan Nicholson’s Guide to pkg-config (http://www.freedesktop.org/wiki/Software/pkg-config/) - # - --includedir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ --libdir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -+includedir=@INCLUDE_INSTALL_DIR@ -+libdir=@INCLUDE_INSTALL_DIR@ - prefix=@PREFIX_INSTALL_DIR@ - - Name: libmariadb - Version: @LIBMARIADB_VERSION@ - Description: MariaDB Connector/C dynamic library --Cflags: -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ @CMAKE_C_FLAGS@ --Libs: -L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb @extra_dynamic_LDFLAGS@ -+Cflags: -I@INCLUDE_INSTALL_DIR@ @CMAKE_C_FLAGS@ -+Libs: -L@LIB_INSTALL_DIR@ -lmariadb @extra_dynamic_LDFLAGS@ - - diff --git a/baselibs.conf b/baselibs.conf deleted file mode 100644 index 44c1d6f..0000000 --- a/baselibs.conf +++ /dev/null @@ -1,3 +0,0 @@ -libmariadb3 - provides "libmysqlclient.so.18" - provides "libmysqlclient.so.18(libmysqlclient_18)" diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index 06cb279..3edf726 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,16 +1,3 @@ -------------------------------------------------------------------- -Thu Nov 2 17:07:25 UTC 2017 - kstreitova@suse.com - -- mariadb-connector-c is now a provider of the libmariadb library - for mariadb and others -- add compatibility symlinks and Provides/Obsoletes -- change LIBDIR, INCLUDEDIR and PLUGINDIR paths to be the same as - it was in the mariadb package (compatibility reasons) -- add baselibs.conf -- add %{mariadb_version} macro that should correspond with the - current version of the mariadb package -- refresh absolute_path_fix.patch and private_library.patch - ------------------------------------------------------------------- Fri Sep 29 11:05:34 UTC 2017 - kstreitova@suse.com diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 4078a01..94e360a 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -19,8 +19,7 @@ %bcond_with sqlite3 %define sover 3 %define libname libmariadb -# equivalent mariadb version -%define mariadb_version 10.2.10 + %if ! %{defined _rundir} %define _rundir %{_localstatedir}/run %endif @@ -36,7 +35,6 @@ Source: https://downloads.mariadb.com/Connectors/c/connector-c-%{version Source1: https://downloads.mariadb.com/Connectors/c/connector-c-%{version}/%{name}-%{version}-src.tar.gz.asc # Imported from keyserver based on keyid @ https://mariadb.com/kb/en/mariadb-enterprise/mariadb-enterprise-installation-guide/ Source2: mariadb.keyring -Source3: baselibs.conf Patch1: mariadb-connector-c-2.3.1_unresolved_symbols.patch Patch3: absolute_path_fix.patch Patch4: private_library.patch @@ -57,15 +55,7 @@ C or C++ to MariaDB and MySQL databases. %package -n %{libname}%{sover} Summary: MariaDB connector in C -# Compatibility Provides Group: System/Libraries -%if 0%{?__isa_bits} == 64 -Provides: libmysqlclient.so.18()(64bit) -Provides: libmysqlclient.so.18(libmysqlclient_18)(64bit) -%else -Provides: libmysqlclient.so.18 -Provides: libmysqlclient.so.18(libmysqlclient_18) -%endif %description -n %{libname}%{sover} MariaDB Connector is used to connect applications developed in @@ -75,12 +65,7 @@ This package holds the runtime components. %package -n %{libname}_plugins Summary: Plugins for the MariaDB C Connector -# We need "Conflicts" because we moved some plugins here: -# dialog.so was in mariadb-client package -# mysql_clear_password.so was in mariadb package Group: System/Libraries -Conflicts: mariadb-client <= 10.1.25 -Conflicts: mariadb <= 10.1.25 %description -n %{libname}_plugins MariaDB Connector is used to connect applications developed in @@ -101,14 +86,6 @@ This package holds the runtime components with private API. %package -n %{libname}-devel Requires: %{libname}%{sover} = %{version} Requires: pkgconfig(openssl) -# mysql-devel needs to be provided as some pkgs still depend on it -Provides: mysql-devel = %{mariadb_version} -Obsoletes: mysql-devel < %{mariadb_version} -Provides: libmysqlclient-devel = %{mariadb_version} -Obsoletes: libmysqlclient-devel < %{mariadb_version} -# libmysqlclient_r.so was in libmysqlclient_r18 subpackage, now it's here -Provides: libmysqlclient_r18 = %{mariadb_version} -Obsoletes: libmysqlclient_r18 < %{mariadb_version} Summary: Development files for the MariaDB Connector C API Group: Development/Libraries/C and C++ @@ -131,9 +108,8 @@ This package holds the development files. %endif -DWITH_EXTERNAL_ZLIB:BOOL=ON \ -DMARIADB_UNIX_ADDR:STRING=%{_rundir}/mysql/mysql.sock \ - -DINSTALL_LIBDIR:STRING=%{_libdir} \ - -DINSTALL_INCLUDEDIR:STRING=%{_includedir}/mysql \ - -DINSTALL_PLUGINDIR:STRING=%{_libdir}/mysql/plugin/ \ + -DINSTALL_LIBDIR:STRING=%{_libdir}/mariadb \ + -DINSTALL_PLUGINDIR:STRING=%{_libdir}/mariadb/plugin/ \ -DWITH_MYSQLCOMPAT=ON \ -DWITH_SSL=OPENSSL make %{?_smp_mflags} @@ -142,40 +118,34 @@ make %{?_smp_mflags} %cmake_install # remove static linked libraries -rm %{buildroot}%{_libdir}/libmariadbclient.a -rm %{buildroot}%{_libdir}/libmysqlclient.a -rm %{buildroot}%{_libdir}/libmysqlclient_r.a - -# add a compatibility symlink -ln -s mariadb_config %{buildroot}%{_bindir}/mysql_config -ln -s mariadb_version.h %{buildroot}%{_includedir}/mysql/mysql_version.h +rm %{buildroot}%{_libdir}/mariadb/libmariadbclient.a +rm %{buildroot}%{_libdir}/mariadb/libmysqlclient.a +rm %{buildroot}%{_libdir}/mariadb/libmysqlclient_r.a %files -n %{libname}%{sover} %defattr(-,root,root) %doc README COPYING.LIB -%{_libdir}/libmariadb.so.%{sover} +%{_libdir}/mariadb/libmariadb.so.%{sover} %files -n %{libname}_plugins -%dir %{_libdir}/mysql/ -%dir %{_libdir}/mysql/plugin/ -%{_libdir}/mysql/plugin/dialog.so -%{_libdir}/mysql/plugin/mysql_clear_password.so -%{_libdir}/mysql/plugin/auth_gssapi_client.so -%{_libdir}/mysql/plugin/remote_io.so -%{_libdir}/mysql/plugin/sha256_password.so +%dir %{_libdir}/mariadb/ +%dir %{_libdir}/mariadb/plugin/ +%{_libdir}/mariadb/plugin/dialog.so +%{_libdir}/mariadb/plugin/mysql_clear_password.so +%{_libdir}/mariadb/plugin/auth_gssapi_client.so +%{_libdir}/mariadb/plugin/remote_io.so +%{_libdir}/mariadb/plugin/sha256_password.so %files -n %{libname}private -%{_libdir}/libmariadbprivate.so +%{_libdir}/mariadb/libmariadbprivate.so %files -n %{libname}-devel %defattr(-,root,root) %{_bindir}/mariadb_config -%{_bindir}/mysql_config -%dir %{_includedir}/mysql -%{_includedir}/mysql/* -%{_libdir}/libmariadb.so -%{_libdir}/libmysqlclient.so -%{_libdir}/libmysqlclient_r.so +%{_includedir}/mariadb/ +%{_libdir}/mariadb/libmariadb.so +%{_libdir}/mariadb/libmysqlclient.so +%{_libdir}/mariadb/libmysqlclient_r.so %post -n %{libname}%{sover} -p /sbin/ldconfig %post -n %{libname}private -p /sbin/ldconfig diff --git a/private_library.patch b/private_library.patch index 2db8b98..7554d7d 100644 --- a/private_library.patch +++ b/private_library.patch @@ -53,9 +53,9 @@ Index: mariadb-connector-c-3.0.2-src/mariadb_config/mariadb_config.c.in +++ mariadb-connector-c-3.0.2-src/mariadb_config/mariadb_config.c.in @@ -8,6 +8,8 @@ static char *mariadb_progname; #define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb" - #define LIBS "-L@INSTALL_LIBDIR@ -lmariadb "\ + #define LIBS "-L@INSTALL_LIBDIR@/mariadb -lmariadb" \ "@extra_dynamic_LDFLAGS@" -+#define PRIVATE_LIBS "-L@INSTALL_LIBDIR@ -lmariadbprivate " \ ++#define PRIVATE_LIBS "-L@INSTALL_LIBDIR@/mariadb -lmariadbprivate" \ + "@extra_dynamic_LDFLAGS@" #define LIBS_SYS "@extra_dynamic_LDFLAGS@" #define CFLAGS INCLUDE From 5d9785ed7e4f72ee941ca066d19ca87692f5c7d8b867c3fe4218e310022de7be Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 30 Nov 2017 11:43:48 +0000 Subject: [PATCH 09/32] Accepting request 544049 from server:database - Use more cmake macros - Run spec-cleaner - 0334aa48.patch: Backported implementation and testcase for skipping particular paramset in bulk operation/. This is needed to get current stable MariaDB connector/ODBC actually compilable. - Install missing header (bsc#1067904) - mariadb-connector-c is now a provider of the libmariadb library for mariadb and others - add compatibility symlinks - change LIBDIR, INCLUDEDIR and PLUGINDIR paths to be the same as it was in the mariadb package (compatibility reasons) - add baselibs.conf - add %{mariadb_version} macro that should correspond with the current version of the mariadb package - refresh absolute_path_fix.patch and private_library.patch OBS-URL: https://build.opensuse.org/request/show/544049 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=9 --- 0334aa48.patch | 180 ++++++++++++++++++++++++++++++++++++ absolute_path_fix.patch | 25 ++++- baselibs.conf | 3 + mariadb-connector-c.changes | 31 +++++++ mariadb-connector-c.spec | 100 ++++++++++++-------- private_library.patch | 4 +- 6 files changed, 302 insertions(+), 41 deletions(-) create mode 100644 0334aa48.patch create mode 100644 baselibs.conf diff --git a/0334aa48.patch b/0334aa48.patch new file mode 100644 index 0000000..b462952 --- /dev/null +++ b/0334aa48.patch @@ -0,0 +1,180 @@ +commit 0334aa4811ae751d3362facad136c25b9765693a +Author: Lawrin Novitsky +Date: Mon Aug 14 17:23:42 2017 +0200 + + Implementation and testcase for CONC-275 - skipping particular paramset in bulk operation - with help of special indicator value STMT_INDICATOR_IGNORE_ROW set in any column of the row. + The revision also adds some (mainly VS specific) file/dirs definitions to .gitignore to make 'gid status' usable on Windows, and the typo in bulk1 testsuite + +diff --git a/include/mariadb_stmt.h b/include/mariadb_stmt.h +index 9e67ad8..5e1c711 100644 +--- a/include/mariadb_stmt.h ++++ b/include/mariadb_stmt.h +@@ -81,7 +81,8 @@ enum enum_indicator_type + STMT_INDICATOR_NONE=0, + STMT_INDICATOR_NULL=1, + STMT_INDICATOR_DEFAULT=2, +- STMT_INDICATOR_IGNORE=3 ++ STMT_INDICATOR_IGNORE=3, ++ STMT_INDICATOR_IGNORE_ROW=4 + }; + + /* +diff --git a/libmariadb/mariadb_stmt.c b/libmariadb/mariadb_stmt.c +index aba845e..869c6ea 100644 +--- a/libmariadb/mariadb_stmt.c ++++ b/libmariadb/mariadb_stmt.c +@@ -797,7 +797,21 @@ mem_error: + } + /* }}} */ + +-/* {{{ mysqlnd_stmt_execute_generate_bulk_request */ ++/* {{{ mysql_stmt_skip_paramset */ ++my_bool mysql_stmt_skip_paramset(MYSQL_STMT *stmt, uint row) ++{ ++ uint i; ++ for (i=0; i < stmt->param_count; i++) ++ { ++ if (ma_get_indicator(stmt, i, row) == STMT_INDICATOR_IGNORE_ROW) ++ return '\1'; ++ } ++ ++ return '\0'; ++} ++/* }}} */ ++ ++/* {{{ mysql_stmt_execute_generate_bulk_request */ + unsigned char* mysql_stmt_execute_generate_bulk_request(MYSQL_STMT *stmt, size_t *request_len) + { + /* execute packet has the following format: +@@ -820,6 +834,7 @@ unsigned char* mysql_stmt_execute_generate_bulk_request(MYSQL_STMT *stmt, size_t + STMT_INDICATOR_NULL 1 + STMT_INDICATOR_DEFAULT 2 + STMT_INDICATOR_IGNORE 3 ++ STMT_INDICATOR_SKIP_SET 4 + n data from bind buffer + + */ +@@ -894,6 +909,9 @@ unsigned char* mysql_stmt_execute_generate_bulk_request(MYSQL_STMT *stmt, size_t + /* calculate data size */ + for (j=0; j < stmt->array_size; j++) + { ++ if (mysql_stmt_skip_paramset(stmt, j)) ++ continue; ++ + for (i=0; i < stmt->param_count; i++) + { + size_t size= 0; +diff --git a/unittest/libmariadb/bulk1.c b/unittest/libmariadb/bulk1.c +index e5f6ec9..c6623ce 100644 +--- a/unittest/libmariadb/bulk1.c ++++ b/unittest/libmariadb/bulk1.c +@@ -588,7 +588,7 @@ static int test_conc243(MYSQL *mysql) + if (strcmp(row[0], "Monty") || strcmp(row[1], "Widenius")) + { + mysql_free_result(result); +- diag("Wrong walues"); ++ diag("Wrong values"); + return FAIL; + } + mysql_free_result(result); +@@ -767,6 +767,92 @@ static int test_char_conv2(MYSQL *mysql) + return OK; + } + ++ ++static int bulk_skip_row(MYSQL *mysql) ++{ ++ MYSQL_STMT *stmt; ++ MYSQL_BIND bind[3]; ++ MYSQL_RES *result; ++ MYSQL_ROW row; ++ ++ struct st_data { ++ unsigned long id; ++ char id_ind; ++ char forename[30]; ++ char forename_ind; ++ char surname[30]; ++ char surname_ind; ++ }; ++ ++ struct st_data data[]={ ++ { 0, STMT_INDICATOR_NULL, "Monty", STMT_INDICATOR_NTS, "Widenius", STMT_INDICATOR_IGNORE_ROW }, ++ { 0, STMT_INDICATOR_IGNORE_ROW, "David", STMT_INDICATOR_NTS, "Axmark", STMT_INDICATOR_NTS }, ++ { 0, STMT_INDICATOR_NULL, "default", STMT_INDICATOR_DEFAULT, "N.N.", STMT_INDICATOR_NTS }, ++ }; ++ ++ unsigned int array_size= 3; ++ size_t row_size= sizeof(struct st_data); ++ int rc; ++ ++ rc= mysql_query(mysql, "DROP TABLE IF EXISTS bulk_example2"); ++ check_mysql_rc(rc, mysql); ++ ++ rc= mysql_query(mysql, "CREATE TABLE bulk_example2 (id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,"\ ++ "forename CHAR(30) NOT NULL DEFAULT 'unknown', surname CHAR(30))"); ++ check_mysql_rc(rc, mysql); ++ ++ stmt= mysql_stmt_init(mysql); ++ rc= mysql_stmt_prepare(stmt, "INSERT INTO bulk_example2 VALUES (?,?,?)", -1); ++ check_stmt_rc(rc, stmt); ++ ++ memset(bind, 0, sizeof(MYSQL_BIND) * 3); ++ ++ /* We autogenerate id's, so all indicators are STMT_INDICATOR_NULL */ ++ bind[0].u.indicator= &data[0].id_ind; ++ bind[0].buffer_type= MYSQL_TYPE_LONG; ++ ++ bind[1].buffer= &data[0].forename; ++ bind[1].buffer_type= MYSQL_TYPE_STRING; ++ bind[1].u.indicator= &data[0].forename_ind; ++ ++ bind[2].buffer_type= MYSQL_TYPE_STRING; ++ bind[2].buffer= &data[0].surname; ++ bind[2].u.indicator= &data[0].surname_ind; ++ ++ /* set array size */ ++ mysql_stmt_attr_set(stmt, STMT_ATTR_ARRAY_SIZE, &array_size); ++ ++ /* set row size */ ++ mysql_stmt_attr_set(stmt, STMT_ATTR_ROW_SIZE, &row_size); ++ ++ /* bind parameter */ ++ mysql_stmt_bind_param(stmt, bind); ++ ++ /* execute */ ++ rc= mysql_stmt_execute(stmt); ++ check_stmt_rc(rc, stmt); ++ ++ mysql_stmt_close(stmt); ++ ++ rc= mysql_query(mysql, "SELECT forename, surname FROM bulk_example2"); ++ check_mysql_rc(rc, mysql); ++ ++ result= mysql_store_result(mysql); ++ FAIL_IF(!result || mysql_num_rows(result) != 1, "Invalid resultset"); ++ ++ row = mysql_fetch_row(result); ++ if (strcmp(row[0], "unknown") || strcmp(row[1], "N.N.")) ++ { ++ mysql_free_result(result); ++ diag("Wrong values"); ++ return FAIL; ++ } ++ mysql_free_result(result); ++ rc= mysql_query(mysql, "DROP TABLE bulk_example2"); ++ check_mysql_rc(rc, mysql); ++ return OK; ++} ++ + struct my_tests_st my_tests[] = { + {"check_bulk", check_bulk, TEST_CONNECTION_DEFAULT, 0, NULL, NULL}, + {"test_char_conv1", test_char_conv1, TEST_CONNECTION_NEW, 0, NULL, NULL}, +@@ -780,6 +866,7 @@ struct my_tests_st my_tests[] = { + {"bulk3", bulk3, TEST_CONNECTION_DEFAULT, 0, NULL, NULL}, + {"bulk4", bulk4, TEST_CONNECTION_DEFAULT, 0, NULL, NULL}, + {"bulk_null", bulk_null, TEST_CONNECTION_DEFAULT, 0, NULL, NULL}, ++ {"bulk_skip_row", bulk_skip_row, TEST_CONNECTION_DEFAULT, 0, NULL, NULL}, + {NULL, NULL, 0, 0, NULL, NULL} + }; + diff --git a/absolute_path_fix.patch b/absolute_path_fix.patch index 8ff6077..e82c598 100644 --- a/absolute_path_fix.patch +++ b/absolute_path_fix.patch @@ -13,7 +13,7 @@ Index: mariadb-connector-c-3.0.2-src/mariadb_config/mariadb_config.c.in -#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql" -#define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb "\ +#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb" -+#define LIBS "-L@INSTALL_LIBDIR@/mariadb -lmariadb" \ ++#define LIBS "-L@INSTALL_LIBDIR@ -lmariadb "\ "@extra_dynamic_LDFLAGS@" #define LIBS_SYS "@extra_dynamic_LDFLAGS@" #define CFLAGS INCLUDE @@ -23,3 +23,26 @@ Index: mariadb-connector-c-3.0.2-src/mariadb_config/mariadb_config.c.in #define SOCKET "@MARIADB_UNIX_ADDR@" #define PORT "@MARIADB_PORT@" #define TLS_LIBRARY_VERSION "@TLS_LIBRARY_VERSION@" +Index: mariadb-connector-c-3.0.2-src/mariadb_config/libmariadb.pc.in +=================================================================== +--- mariadb-connector-c-3.0.2-src.orig/mariadb_config/libmariadb.pc.in ++++ mariadb-connector-c-3.0.2-src/mariadb_config/libmariadb.pc.in +@@ -6,14 +6,14 @@ + # Dan Nicholson’s Guide to pkg-config (http://www.freedesktop.org/wiki/Software/pkg-config/) + # + +-includedir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ +-libdir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ ++includedir=@INCLUDE_INSTALL_DIR@ ++libdir=@INCLUDE_INSTALL_DIR@ + prefix=@PREFIX_INSTALL_DIR@ + + Name: libmariadb + Version: @LIBMARIADB_VERSION@ + Description: MariaDB Connector/C dynamic library +-Cflags: -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ @CMAKE_C_FLAGS@ +-Libs: -L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb @extra_dynamic_LDFLAGS@ ++Cflags: -I@INCLUDE_INSTALL_DIR@ @CMAKE_C_FLAGS@ ++Libs: -L@LIB_INSTALL_DIR@ -lmariadb @extra_dynamic_LDFLAGS@ + + diff --git a/baselibs.conf b/baselibs.conf new file mode 100644 index 0000000..44c1d6f --- /dev/null +++ b/baselibs.conf @@ -0,0 +1,3 @@ +libmariadb3 + provides "libmysqlclient.so.18" + provides "libmysqlclient.so.18(libmysqlclient_18)" diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index 3edf726..dd9d27c 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Sun Nov 19 07:41:13 UTC 2017 - mpluskal@suse.com + +- Use more cmake macros +- Run spec-cleaner + +------------------------------------------------------------------- +Fri Nov 17 14:20:39 UTC 2017 - adam.majer@suse.de + +- 0334aa48.patch: Backported implementation and testcase for + skipping particular paramset in bulk operation/. This is needed + to get current stable MariaDB connector/ODBC actually compilable. + +------------------------------------------------------------------- +Mon Nov 13 17:54:46 UTC 2017 - mpluskal@suse.com + +- Install missing header (bsc#1067904) + +------------------------------------------------------------------- +Thu Nov 2 17:07:25 UTC 2017 - kstreitova@suse.com + +- mariadb-connector-c is now a provider of the libmariadb library + for mariadb and others +- add compatibility symlinks +- change LIBDIR, INCLUDEDIR and PLUGINDIR paths to be the same as + it was in the mariadb package (compatibility reasons) +- add baselibs.conf +- add %{mariadb_version} macro that should correspond with the + current version of the mariadb package +- refresh absolute_path_fix.patch and private_library.patch + ------------------------------------------------------------------- Fri Sep 29 11:05:34 UTC 2017 - kstreitova@suse.com diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 94e360a..91e4dad 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -16,14 +16,14 @@ # -%bcond_with sqlite3 %define sover 3 %define libname libmariadb - +# equivalent mariadb version +%define mariadb_version 10.2.10 %if ! %{defined _rundir} %define _rundir %{_localstatedir}/run %endif - +%bcond_with sqlite3 Name: mariadb-connector-c Version: 3.0.2 Release: 0 @@ -35,18 +35,19 @@ Source: https://downloads.mariadb.com/Connectors/c/connector-c-%{version Source1: https://downloads.mariadb.com/Connectors/c/connector-c-%{version}/%{name}-%{version}-src.tar.gz.asc # Imported from keyserver based on keyid @ https://mariadb.com/kb/en/mariadb-enterprise/mariadb-enterprise-installation-guide/ Source2: mariadb.keyring +Source3: baselibs.conf Patch1: mariadb-connector-c-2.3.1_unresolved_symbols.patch Patch3: absolute_path_fix.patch Patch4: private_library.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch5: 0334aa48.patch BuildRequires: cmake BuildRequires: curl-devel +BuildRequires: pkgconfig BuildRequires: pkgconfig(krb5) -BuildRequires: pkgconfig(krb5-gssapi) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(zlib) %if %{with sqlite3} -BuildRequires: sqlite3-devel +BuildRequires: pkgconfig(sqlite3) %endif %description @@ -65,7 +66,12 @@ This package holds the runtime components. %package -n %{libname}_plugins Summary: Plugins for the MariaDB C Connector +# We need "Conflicts" because we moved some plugins here: +# dialog.so was in mariadb-client package +# mysql_clear_password.so was in mariadb package Group: System/Libraries +Conflicts: mariadb <= 10.1.25 +Conflicts: mariadb-client <= 10.1.25 %description -n %{libname}_plugins MariaDB Connector is used to connect applications developed in @@ -84,10 +90,18 @@ C or C++ to MariaDB and MySQL databases. This package holds the runtime components with private API. %package -n %{libname}-devel -Requires: %{libname}%{sover} = %{version} -Requires: pkgconfig(openssl) Summary: Development files for the MariaDB Connector C API Group: Development/Libraries/C and C++ +Requires: %{libname}%{sover} = %{version} +Requires: pkgconfig(openssl) +# mysql-devel needs to be provided as some pkgs still depend on it +Provides: mysql-devel = %{mariadb_version} +Obsoletes: mysql-devel < %{mariadb_version} +Provides: libmysqlclient-devel = %{mariadb_version} +Obsoletes: libmysqlclient-devel < %{mariadb_version} +# libmysqlclient_r.so was in libmysqlclient_r18 subpackage, now it's here +Provides: libmysqlclient_r18 = %{mariadb_version} +Obsoletes: libmysqlclient_r18 < %{mariadb_version} %description -n %{libname}-devel MariaDB Connector is used to connect applications developed in @@ -100,6 +114,7 @@ This package holds the development files. %patch1 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build %cmake \ @@ -108,48 +123,57 @@ This package holds the development files. %endif -DWITH_EXTERNAL_ZLIB:BOOL=ON \ -DMARIADB_UNIX_ADDR:STRING=%{_rundir}/mysql/mysql.sock \ - -DINSTALL_LIBDIR:STRING=%{_libdir}/mariadb \ - -DINSTALL_PLUGINDIR:STRING=%{_libdir}/mariadb/plugin/ \ + -DINSTALL_LIBDIR:STRING=%{_libdir} \ + -DINSTALL_INCLUDEDIR:STRING=%{_includedir}/mysql \ + -DINSTALL_PLUGINDIR:STRING=%{_libdir}/mysql/plugin/ \ -DWITH_MYSQLCOMPAT=ON \ - -DWITH_SSL=OPENSSL -make %{?_smp_mflags} + -DWITH_SSL=OPENSSL +%make_jobs %install %cmake_install # remove static linked libraries -rm %{buildroot}%{_libdir}/mariadb/libmariadbclient.a -rm %{buildroot}%{_libdir}/mariadb/libmysqlclient.a -rm %{buildroot}%{_libdir}/mariadb/libmysqlclient_r.a +rm %{buildroot}%{_libdir}/libmariadbclient.a +rm %{buildroot}%{_libdir}/libmysqlclient.a +rm %{buildroot}%{_libdir}/libmysqlclient_r.a -%files -n %{libname}%{sover} -%defattr(-,root,root) -%doc README COPYING.LIB -%{_libdir}/mariadb/libmariadb.so.%{sover} +# add a compatibility symlink +ln -s mariadb_config %{buildroot}%{_bindir}/mysql_config +ln -s mariadb_version.h %{buildroot}%{_includedir}/mysql/mysql_version.h -%files -n %{libname}_plugins -%dir %{_libdir}/mariadb/ -%dir %{_libdir}/mariadb/plugin/ -%{_libdir}/mariadb/plugin/dialog.so -%{_libdir}/mariadb/plugin/mysql_clear_password.so -%{_libdir}/mariadb/plugin/auth_gssapi_client.so -%{_libdir}/mariadb/plugin/remote_io.so -%{_libdir}/mariadb/plugin/sha256_password.so - -%files -n %{libname}private -%{_libdir}/mariadb/libmariadbprivate.so - -%files -n %{libname}-devel -%defattr(-,root,root) -%{_bindir}/mariadb_config -%{_includedir}/mariadb/ -%{_libdir}/mariadb/libmariadb.so -%{_libdir}/mariadb/libmysqlclient.so -%{_libdir}/mariadb/libmysqlclient_r.so +# install some extra required header file +install -Dpm 0644 build/include/ma_config.h \ + %{buildroot}%{_includedir}/mysql/my_config.h %post -n %{libname}%{sover} -p /sbin/ldconfig %post -n %{libname}private -p /sbin/ldconfig %postun -n %{libname}%{sover} -p /sbin/ldconfig %postun -n %{libname}private -p /sbin/ldconfig +%files -n %{libname}%{sover} +%doc README COPYING.LIB +%{_libdir}/libmariadb.so.%{sover} + +%files -n %{libname}_plugins +%dir %{_libdir}/mysql/ +%dir %{_libdir}/mysql/plugin/ +%{_libdir}/mysql/plugin/dialog.so +%{_libdir}/mysql/plugin/mysql_clear_password.so +%{_libdir}/mysql/plugin/auth_gssapi_client.so +%{_libdir}/mysql/plugin/remote_io.so +%{_libdir}/mysql/plugin/sha256_password.so + +%files -n %{libname}private +%{_libdir}/libmariadbprivate.so + +%files -n %{libname}-devel +%{_bindir}/mariadb_config +%{_bindir}/mysql_config +%dir %{_includedir}/mysql +%{_includedir}/mysql/* +%{_libdir}/libmariadb.so +%{_libdir}/libmysqlclient.so +%{_libdir}/libmysqlclient_r.so + %changelog diff --git a/private_library.patch b/private_library.patch index 7554d7d..2db8b98 100644 --- a/private_library.patch +++ b/private_library.patch @@ -53,9 +53,9 @@ Index: mariadb-connector-c-3.0.2-src/mariadb_config/mariadb_config.c.in +++ mariadb-connector-c-3.0.2-src/mariadb_config/mariadb_config.c.in @@ -8,6 +8,8 @@ static char *mariadb_progname; #define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb" - #define LIBS "-L@INSTALL_LIBDIR@/mariadb -lmariadb" \ + #define LIBS "-L@INSTALL_LIBDIR@ -lmariadb "\ "@extra_dynamic_LDFLAGS@" -+#define PRIVATE_LIBS "-L@INSTALL_LIBDIR@/mariadb -lmariadbprivate" \ ++#define PRIVATE_LIBS "-L@INSTALL_LIBDIR@ -lmariadbprivate " \ + "@extra_dynamic_LDFLAGS@" #define LIBS_SYS "@extra_dynamic_LDFLAGS@" #define CFLAGS INCLUDE From 79de48052838592678442fd27364a8c4dbf86e584db9134e0578d65a0b4b9732 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 25 Apr 2018 07:57:37 +0000 Subject: [PATCH 10/32] Accepting request 598533 from server:database OBS-URL: https://build.opensuse.org/request/show/598533 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=10 --- 0334aa48.patch | 180 ----------------------- absolute_path_fix.patch | 15 +- mariadb-connector-c-3.0.2-src.tar.gz | 3 - mariadb-connector-c-3.0.2-src.tar.gz.asc | 11 -- mariadb-connector-c-3.0.3-src.tar.gz | 3 + mariadb-connector-c-3.0.3-src.tar.gz.asc | 11 ++ mariadb-connector-c.changes | 50 +++++++ mariadb-connector-c.spec | 11 +- private_library.patch | 54 +++---- 9 files changed, 104 insertions(+), 234 deletions(-) delete mode 100644 0334aa48.patch delete mode 100644 mariadb-connector-c-3.0.2-src.tar.gz delete mode 100644 mariadb-connector-c-3.0.2-src.tar.gz.asc create mode 100644 mariadb-connector-c-3.0.3-src.tar.gz create mode 100644 mariadb-connector-c-3.0.3-src.tar.gz.asc diff --git a/0334aa48.patch b/0334aa48.patch deleted file mode 100644 index b462952..0000000 --- a/0334aa48.patch +++ /dev/null @@ -1,180 +0,0 @@ -commit 0334aa4811ae751d3362facad136c25b9765693a -Author: Lawrin Novitsky -Date: Mon Aug 14 17:23:42 2017 +0200 - - Implementation and testcase for CONC-275 - skipping particular paramset in bulk operation - with help of special indicator value STMT_INDICATOR_IGNORE_ROW set in any column of the row. - The revision also adds some (mainly VS specific) file/dirs definitions to .gitignore to make 'gid status' usable on Windows, and the typo in bulk1 testsuite - -diff --git a/include/mariadb_stmt.h b/include/mariadb_stmt.h -index 9e67ad8..5e1c711 100644 ---- a/include/mariadb_stmt.h -+++ b/include/mariadb_stmt.h -@@ -81,7 +81,8 @@ enum enum_indicator_type - STMT_INDICATOR_NONE=0, - STMT_INDICATOR_NULL=1, - STMT_INDICATOR_DEFAULT=2, -- STMT_INDICATOR_IGNORE=3 -+ STMT_INDICATOR_IGNORE=3, -+ STMT_INDICATOR_IGNORE_ROW=4 - }; - - /* -diff --git a/libmariadb/mariadb_stmt.c b/libmariadb/mariadb_stmt.c -index aba845e..869c6ea 100644 ---- a/libmariadb/mariadb_stmt.c -+++ b/libmariadb/mariadb_stmt.c -@@ -797,7 +797,21 @@ mem_error: - } - /* }}} */ - --/* {{{ mysqlnd_stmt_execute_generate_bulk_request */ -+/* {{{ mysql_stmt_skip_paramset */ -+my_bool mysql_stmt_skip_paramset(MYSQL_STMT *stmt, uint row) -+{ -+ uint i; -+ for (i=0; i < stmt->param_count; i++) -+ { -+ if (ma_get_indicator(stmt, i, row) == STMT_INDICATOR_IGNORE_ROW) -+ return '\1'; -+ } -+ -+ return '\0'; -+} -+/* }}} */ -+ -+/* {{{ mysql_stmt_execute_generate_bulk_request */ - unsigned char* mysql_stmt_execute_generate_bulk_request(MYSQL_STMT *stmt, size_t *request_len) - { - /* execute packet has the following format: -@@ -820,6 +834,7 @@ unsigned char* mysql_stmt_execute_generate_bulk_request(MYSQL_STMT *stmt, size_t - STMT_INDICATOR_NULL 1 - STMT_INDICATOR_DEFAULT 2 - STMT_INDICATOR_IGNORE 3 -+ STMT_INDICATOR_SKIP_SET 4 - n data from bind buffer - - */ -@@ -894,6 +909,9 @@ unsigned char* mysql_stmt_execute_generate_bulk_request(MYSQL_STMT *stmt, size_t - /* calculate data size */ - for (j=0; j < stmt->array_size; j++) - { -+ if (mysql_stmt_skip_paramset(stmt, j)) -+ continue; -+ - for (i=0; i < stmt->param_count; i++) - { - size_t size= 0; -diff --git a/unittest/libmariadb/bulk1.c b/unittest/libmariadb/bulk1.c -index e5f6ec9..c6623ce 100644 ---- a/unittest/libmariadb/bulk1.c -+++ b/unittest/libmariadb/bulk1.c -@@ -588,7 +588,7 @@ static int test_conc243(MYSQL *mysql) - if (strcmp(row[0], "Monty") || strcmp(row[1], "Widenius")) - { - mysql_free_result(result); -- diag("Wrong walues"); -+ diag("Wrong values"); - return FAIL; - } - mysql_free_result(result); -@@ -767,6 +767,92 @@ static int test_char_conv2(MYSQL *mysql) - return OK; - } - -+ -+static int bulk_skip_row(MYSQL *mysql) -+{ -+ MYSQL_STMT *stmt; -+ MYSQL_BIND bind[3]; -+ MYSQL_RES *result; -+ MYSQL_ROW row; -+ -+ struct st_data { -+ unsigned long id; -+ char id_ind; -+ char forename[30]; -+ char forename_ind; -+ char surname[30]; -+ char surname_ind; -+ }; -+ -+ struct st_data data[]={ -+ { 0, STMT_INDICATOR_NULL, "Monty", STMT_INDICATOR_NTS, "Widenius", STMT_INDICATOR_IGNORE_ROW }, -+ { 0, STMT_INDICATOR_IGNORE_ROW, "David", STMT_INDICATOR_NTS, "Axmark", STMT_INDICATOR_NTS }, -+ { 0, STMT_INDICATOR_NULL, "default", STMT_INDICATOR_DEFAULT, "N.N.", STMT_INDICATOR_NTS }, -+ }; -+ -+ unsigned int array_size= 3; -+ size_t row_size= sizeof(struct st_data); -+ int rc; -+ -+ rc= mysql_query(mysql, "DROP TABLE IF EXISTS bulk_example2"); -+ check_mysql_rc(rc, mysql); -+ -+ rc= mysql_query(mysql, "CREATE TABLE bulk_example2 (id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,"\ -+ "forename CHAR(30) NOT NULL DEFAULT 'unknown', surname CHAR(30))"); -+ check_mysql_rc(rc, mysql); -+ -+ stmt= mysql_stmt_init(mysql); -+ rc= mysql_stmt_prepare(stmt, "INSERT INTO bulk_example2 VALUES (?,?,?)", -1); -+ check_stmt_rc(rc, stmt); -+ -+ memset(bind, 0, sizeof(MYSQL_BIND) * 3); -+ -+ /* We autogenerate id's, so all indicators are STMT_INDICATOR_NULL */ -+ bind[0].u.indicator= &data[0].id_ind; -+ bind[0].buffer_type= MYSQL_TYPE_LONG; -+ -+ bind[1].buffer= &data[0].forename; -+ bind[1].buffer_type= MYSQL_TYPE_STRING; -+ bind[1].u.indicator= &data[0].forename_ind; -+ -+ bind[2].buffer_type= MYSQL_TYPE_STRING; -+ bind[2].buffer= &data[0].surname; -+ bind[2].u.indicator= &data[0].surname_ind; -+ -+ /* set array size */ -+ mysql_stmt_attr_set(stmt, STMT_ATTR_ARRAY_SIZE, &array_size); -+ -+ /* set row size */ -+ mysql_stmt_attr_set(stmt, STMT_ATTR_ROW_SIZE, &row_size); -+ -+ /* bind parameter */ -+ mysql_stmt_bind_param(stmt, bind); -+ -+ /* execute */ -+ rc= mysql_stmt_execute(stmt); -+ check_stmt_rc(rc, stmt); -+ -+ mysql_stmt_close(stmt); -+ -+ rc= mysql_query(mysql, "SELECT forename, surname FROM bulk_example2"); -+ check_mysql_rc(rc, mysql); -+ -+ result= mysql_store_result(mysql); -+ FAIL_IF(!result || mysql_num_rows(result) != 1, "Invalid resultset"); -+ -+ row = mysql_fetch_row(result); -+ if (strcmp(row[0], "unknown") || strcmp(row[1], "N.N.")) -+ { -+ mysql_free_result(result); -+ diag("Wrong values"); -+ return FAIL; -+ } -+ mysql_free_result(result); -+ rc= mysql_query(mysql, "DROP TABLE bulk_example2"); -+ check_mysql_rc(rc, mysql); -+ return OK; -+} -+ - struct my_tests_st my_tests[] = { - {"check_bulk", check_bulk, TEST_CONNECTION_DEFAULT, 0, NULL, NULL}, - {"test_char_conv1", test_char_conv1, TEST_CONNECTION_NEW, 0, NULL, NULL}, -@@ -780,6 +866,7 @@ struct my_tests_st my_tests[] = { - {"bulk3", bulk3, TEST_CONNECTION_DEFAULT, 0, NULL, NULL}, - {"bulk4", bulk4, TEST_CONNECTION_DEFAULT, 0, NULL, NULL}, - {"bulk_null", bulk_null, TEST_CONNECTION_DEFAULT, 0, NULL, NULL}, -+ {"bulk_skip_row", bulk_skip_row, TEST_CONNECTION_DEFAULT, 0, NULL, NULL}, - {NULL, NULL, 0, 0, NULL, NULL} - }; - diff --git a/absolute_path_fix.patch b/absolute_path_fix.patch index e82c598..25fb161 100644 --- a/absolute_path_fix.patch +++ b/absolute_path_fix.patch @@ -2,11 +2,11 @@ Author: Adam Majer Date: Fri Mar 3 15:59:09 CET 2017 Summary: Remove pure ugliness with paths -Index: mariadb-connector-c-3.0.2-src/mariadb_config/mariadb_config.c.in +Index: mariadb-connector-c-3.0.3-src/mariadb_config/mariadb_config.c.in =================================================================== ---- mariadb-connector-c-3.0.2-src.orig/mariadb_config/mariadb_config.c.in -+++ mariadb-connector-c-3.0.2-src/mariadb_config/mariadb_config.c.in -@@ -5,13 +5,13 @@ +--- mariadb-connector-c-3.0.3-src.orig/mariadb_config/mariadb_config.c.in ++++ mariadb-connector-c-3.0.3-src/mariadb_config/mariadb_config.c.in +@@ -5,14 +5,14 @@ static char *mariadb_progname; @@ -18,15 +18,16 @@ Index: mariadb-connector-c-3.0.2-src/mariadb_config/mariadb_config.c.in #define LIBS_SYS "@extra_dynamic_LDFLAGS@" #define CFLAGS INCLUDE #define VERSION "@MARIADB_CLIENT_VERSION@" + #define CC_VERSION "@CPACK_PACKAGE_VERSION@" -#define PLUGIN_DIR "@CMAKE_INSTALL_PREFIX@/@INSTALL_PLUGINDIR@" +#define PLUGIN_DIR "@INSTALL_PLUGINDIR@" #define SOCKET "@MARIADB_UNIX_ADDR@" #define PORT "@MARIADB_PORT@" #define TLS_LIBRARY_VERSION "@TLS_LIBRARY_VERSION@" -Index: mariadb-connector-c-3.0.2-src/mariadb_config/libmariadb.pc.in +Index: mariadb-connector-c-3.0.3-src/mariadb_config/libmariadb.pc.in =================================================================== ---- mariadb-connector-c-3.0.2-src.orig/mariadb_config/libmariadb.pc.in -+++ mariadb-connector-c-3.0.2-src/mariadb_config/libmariadb.pc.in +--- mariadb-connector-c-3.0.3-src.orig/mariadb_config/libmariadb.pc.in ++++ mariadb-connector-c-3.0.3-src/mariadb_config/libmariadb.pc.in @@ -6,14 +6,14 @@ # Dan Nicholson’s Guide to pkg-config (http://www.freedesktop.org/wiki/Software/pkg-config/) # diff --git a/mariadb-connector-c-3.0.2-src.tar.gz b/mariadb-connector-c-3.0.2-src.tar.gz deleted file mode 100644 index b2b3d03..0000000 --- a/mariadb-connector-c-3.0.2-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:518d14b8d77838370767d73f9bf1674f46232e1a2a34d4195bd38f52a3033758 -size 662569 diff --git a/mariadb-connector-c-3.0.2-src.tar.gz.asc b/mariadb-connector-c-3.0.2-src.tar.gz.asc deleted file mode 100644 index f5d6cca..0000000 --- a/mariadb-connector-c-3.0.2-src.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEcBAABCAAGBQJZcM5uAAoJEM4aPdXjyU9JkZ8H/Rg3zVcfYukS9GKM5/JhfrMX -/Cy0ideQtuGbgtEQJFFASC1d0Nnc2EoQj+xO0R6R0mvUV5FKT/CS28RrcgXvZEyu -3yy5amq3YbaMojqqevms+5TDbhjGFy0SceBSNU2NOYdFjhorFPwqptXDoyb1Xrno -DiUAFLmY4n+vlUZYmMgMXt/nz7I6+u/zUEvCBo38HmIZwTPrw0/xXQsk8WW697yK -2+O59RqKFF0qQGQBKl7MRdbDGXSdxlzYwWBXcB/P1mxO3Ac1TvO0NVIqdcKLsRvo -x70bzHtBeXwTjvYCZTKArwz/xh+uQioqgZh3ds4ZDcgovMSwpWNHJ3nhdLX8SMc= -=A5ve ------END PGP SIGNATURE----- diff --git a/mariadb-connector-c-3.0.3-src.tar.gz b/mariadb-connector-c-3.0.3-src.tar.gz new file mode 100644 index 0000000..58e0583 --- /dev/null +++ b/mariadb-connector-c-3.0.3-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:210f0ee3414b235d3db8e98e9e5a0a98381ecf771e67ca4a688036368984eeea +size 666928 diff --git a/mariadb-connector-c-3.0.3-src.tar.gz.asc b/mariadb-connector-c-3.0.3-src.tar.gz.asc new file mode 100644 index 0000000..4047d3f --- /dev/null +++ b/mariadb-connector-c-3.0.3-src.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAABCAAGBQJaX2KNAAoJEM4aPdXjyU9JbowIAIov5HuFK79EHQgAdZ+s2AVZ +ZdPb5VIR8ql3lbr36jPtD0x/Tpn9IsHSfxMEQ+MZBNp4wDurKTIsloSZsRCXfZuX +5WxRKn6yeYHA6wwe9vJtydS4uRHxbZta8zfIHZqH5NR328Qrsn4Okj7vk5Ps/r8Z +xXHE07eaEjl7bDX6ehLoaLazz3gIOlLl0CB2VWRN3OVQw31CgP9Ejmcl1uCMA33g +kANYQZsZB5hyEBultpesuSvxnJmNBK15d77mS6erGBNPSMMms8u/Mju4kqgC8s32 +SXvkswFqFzgHpTK5V2e7//H+muGeaQBzR/L8Rs0Yi8oLmkT3u6qS2KlApn9N9ZU= +=bU47 +-----END PGP SIGNATURE----- diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index dd9d27c..8367ad9 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,53 @@ +------------------------------------------------------------------- +Thu Apr 19 10:05:16 UTC 2018 - kstreitova@suse.com + +- New upstream version 3.0.3 + * Added support for new utf8mb4 character sets + * MDEV-9059: Bundle first command with authentication packet + * Build: support static OpenSSL on Windows + * MDEV-14101: Add support for tls-version, via + mysql_options(mysql, MARIADB_OPT_TLS_VERSION, value), + where value must be "TLSv1.1", "TLSv1.2" or "TLSv1.3". + * CONC-275: New indicator type STMT_INDICATOR_IGNORE_ROW for + skipping particular parameter set in bulk operation + (prepared statements). + * MDEV-10361: Don't try to reconnect twice if mysql_ping failed. + * Build fix for TSAN build with Clang + * CONC-302: Fix output of mariadb_config + * CONC-301: In case of a truncation the statement status was not + updated correctly and further calls to mysql_stmt_fetch_column + failed + * MDEV-14647: Fixed crash when client receives extended ok packet + with SESSION_TRACK_STATE_CHANGE information flag + * CONC-297: setting MYSQL_OPT_LOCAL_INFILE failed on big endian + systems. + * MDEV-14514: mariadb_config returned wrong exit code when + specifying an invalid option + * MDEV-11546: Fixed timeout problem in Schannel + * CONC-277: Allow reinitialization of the library if + mysql_server_end() was called. + * CONC-292: Fixed malloc result check in dynamic columns + * MDEV-14165: The metadata length value for a column with a + zerofill flag was calculated with a fixed length instead of using + the reported length. + * CONC-286: Force TLS/SSL usage if fingerprint parameters were + specified. + * CONC-282: Connector/C now provides additional information for + package version + * mariadb_config --cc_version lists the package version + * Beside MARIADB_PACKAGE_VERSION numeric representation + MARIADB_PACKAGE_VERSION_ID can be used now within preprocessor + directives. + * MDEV-13959: Fixed duplicate if condition in dynamic columns + * Added MARIADB_BASE_VERSION definition in mariadb_version.h to + distnguish MARIADB from MySQL + * CONC-271: installation layout fix for RPM +- refresh the following patches: + * absolute_path_fix.patch + * private_library.patch +- drop 0334aa48.patch that is no longer needed +- use %license instead of %doc [bsc#1082318] + ------------------------------------------------------------------- Sun Nov 19 07:41:13 UTC 2017 - mpluskal@suse.com diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 91e4dad..6c34bed 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -1,7 +1,7 @@ # # spec file for package mariadb-connector-c # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -25,10 +25,10 @@ %endif %bcond_with sqlite3 Name: mariadb-connector-c -Version: 3.0.2 +Version: 3.0.3 Release: 0 Summary: MariaDB connector in C -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ Url: https://github.com/MariaDB/mariadb-connector-c Source: https://downloads.mariadb.com/Connectors/c/connector-c-%{version}/%{name}-%{version}-src.tar.gz @@ -39,7 +39,6 @@ Source3: baselibs.conf Patch1: mariadb-connector-c-2.3.1_unresolved_symbols.patch Patch3: absolute_path_fix.patch Patch4: private_library.patch -Patch5: 0334aa48.patch BuildRequires: cmake BuildRequires: curl-devel BuildRequires: pkgconfig @@ -114,7 +113,6 @@ This package holds the development files. %patch1 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 %build %cmake \ @@ -152,7 +150,8 @@ install -Dpm 0644 build/include/ma_config.h \ %postun -n %{libname}private -p /sbin/ldconfig %files -n %{libname}%{sover} -%doc README COPYING.LIB +%license COPYING.LIB +%doc README %{_libdir}/libmariadb.so.%{sover} %files -n %{libname}_plugins diff --git a/private_library.patch b/private_library.patch index 2db8b98..0d51bf0 100644 --- a/private_library.patch +++ b/private_library.patch @@ -8,11 +8,11 @@ static linking, create a private shared library that simply exports all symbols. With the exception of exported symbols, it is identical to the regular library. -Index: mariadb-connector-c-3.0.2-src/libmariadb/CMakeLists.txt +Index: mariadb-connector-c-3.0.3-src/libmariadb/CMakeLists.txt =================================================================== ---- mariadb-connector-c-3.0.2-src.orig/libmariadb/CMakeLists.txt -+++ mariadb-connector-c-3.0.2-src/libmariadb/CMakeLists.txt -@@ -400,16 +400,24 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC) +--- mariadb-connector-c-3.0.3-src.orig/libmariadb/CMakeLists.txt ++++ mariadb-connector-c-3.0.3-src/libmariadb/CMakeLists.txt +@@ -391,16 +391,24 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC) SET_TARGET_PROPERTIES(mariadbclient PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64") ENDIF() @@ -23,10 +23,10 @@ Index: mariadb-connector-c-3.0.2-src/libmariadb/CMakeLists.txt +ENDIF() + IF(CMAKE_SYSTEM_NAME MATCHES "Linux") - IF (NOT WITH_ASAN) + IF (NOT WITH_ASAN AND NOT WITH_TSAN) TARGET_LINK_LIBRARIES (libmariadb "-Wl,--no-undefined") ENDIF() - TARGET_LINK_LIBRARIES (libmariadb "-Wl,--version-script=${CC_BINARY_DIR}/libmariadb/mariadbclient.def") + TARGET_LINK_LIBRARIES (libmariadb "${CC_BINARY_DIR}/libmariadb/mariadbclient.def") + TARGET_LINK_LIBRARIES (libmariadbprivate "-Wl,--no-undefined") ENDIF() @@ -36,8 +36,8 @@ Index: mariadb-connector-c-3.0.2-src/libmariadb/CMakeLists.txt +SET_TARGET_PROPERTIES(libmariadbprivate PROPERTIES PREFIX "") SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "") - # -@@ -439,6 +447,9 @@ INSTALL(TARGETS mariadbclient + SET_TARGET_PROPERTIES(libmariadb PROPERTIES VERSION +@@ -434,6 +442,9 @@ INSTALL(TARGETS mariadbclient INSTALL(TARGETS libmariadb COMPONENT SharedLibraries DESTINATION ${INSTALL_LIBDIR}) @@ -47,10 +47,10 @@ Index: mariadb-connector-c-3.0.2-src/libmariadb/CMakeLists.txt IF(WIN32) # On Windows, install PDB -Index: mariadb-connector-c-3.0.2-src/mariadb_config/mariadb_config.c.in +Index: mariadb-connector-c-3.0.3-src/mariadb_config/mariadb_config.c.in =================================================================== ---- mariadb-connector-c-3.0.2-src.orig/mariadb_config/mariadb_config.c.in -+++ mariadb-connector-c-3.0.2-src/mariadb_config/mariadb_config.c.in +--- mariadb-connector-c-3.0.3-src.orig/mariadb_config/mariadb_config.c.in ++++ mariadb-connector-c-3.0.3-src/mariadb_config/mariadb_config.c.in @@ -8,6 +8,8 @@ static char *mariadb_progname; #define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb" #define LIBS "-L@INSTALL_LIBDIR@ -lmariadb "\ @@ -60,29 +60,29 @@ Index: mariadb-connector-c-3.0.2-src/mariadb_config/mariadb_config.c.in #define LIBS_SYS "@extra_dynamic_LDFLAGS@" #define CFLAGS INCLUDE #define VERSION "@MARIADB_CLIENT_VERSION@" -@@ -27,6 +29,7 @@ static struct option long_options[]= - {"version", no_argument, 0, 'f'}, - {"socket", no_argument, 0, 'g'}, - {"port", no_argument, 0, 'h'}, -+ {"privatelibs", no_argument, 0, 'i'}, - {"plugindir", no_argument, 0, 'p'}, - {"tlsinfo", no_argument, 0, 't'}, +@@ -31,6 +33,7 @@ static struct option long_options[]= + {"port", no_argument, 0, 'i'}, + {"plugindir", no_argument, 0, 'j'}, + {"tlsinfo", no_argument, 0, 'k'}, ++ {"privatelibs", no_argument, 0, 'm'}, {NULL, 0, 0, 0} -@@ -43,6 +46,7 @@ static const char *values[]= - VERSION, + }; + +@@ -46,6 +49,7 @@ static const char *values[]= + CC_VERSION, SOCKET, PORT, + PRIVATE_LIBS, PLUGIN_DIR, TLS_LIBRARY_VERSION }; -@@ -101,6 +105,9 @@ int main(int argc, char **argv) - case 'h': - puts(PORT); +@@ -116,6 +120,9 @@ int main(int argc, char **argv) + case 'l': + puts(LIBS_SYS); break; -+ case 'i': ++ case 'm': + puts(PRIVATE_LIBS); + break; - case 'p': - puts(PLUGIN_DIR); - break; + default: + exit((c != -1)); + } From 198b3f702fffb72ed7cd97cb3e7fceea677138bd864017f5cb83bd9af6af1f55 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 2 Jul 2018 21:29:17 +0000 Subject: [PATCH 11/32] Accepting request 619745 from server:database OBS-URL: https://build.opensuse.org/request/show/619745 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=11 --- mariadb-connector-c.changes | 6 ++++++ mariadb-connector-c.spec | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index 8367ad9..23d6468 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 29 10:00:42 UTC 2018 - adam.majer@suse.de + +- Drop libmysqlclient_r Provides from the -devel package. + (bsc#1097938) + ------------------------------------------------------------------- Thu Apr 19 10:05:16 UTC 2018 - kstreitova@suse.com diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 6c34bed..8607a61 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -98,9 +98,6 @@ Provides: mysql-devel = %{mariadb_version} Obsoletes: mysql-devel < %{mariadb_version} Provides: libmysqlclient-devel = %{mariadb_version} Obsoletes: libmysqlclient-devel < %{mariadb_version} -# libmysqlclient_r.so was in libmysqlclient_r18 subpackage, now it's here -Provides: libmysqlclient_r18 = %{mariadb_version} -Obsoletes: libmysqlclient_r18 < %{mariadb_version} %description -n %{libname}-devel MariaDB Connector is used to connect applications developed in From 571fa78bb01ef1a7fe7f780ff34442a7b3bf6ee888ea0f1149c27a348bbf6897 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 2 Aug 2018 12:48:49 +0000 Subject: [PATCH 12/32] Accepting request 625058 from server:database Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/625058 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=12 --- absolute_path_fix.patch | 19 ++++---- ...connector-c-2.3.1_unresolved_symbols.patch | 24 +++++----- mariadb-connector-c-3.0.3-src.tar.gz | 3 -- mariadb-connector-c-3.0.3-src.tar.gz.asc | 11 ----- mariadb-connector-c-3.0.5-src.tar.gz | 3 ++ mariadb-connector-c-3.0.5-src.tar.gz.asc | 11 +++++ mariadb-connector-c.changes | 44 +++++++++++++++++++ mariadb-connector-c.spec | 2 +- private_library.patch | 32 +++++++------- 9 files changed, 97 insertions(+), 52 deletions(-) delete mode 100644 mariadb-connector-c-3.0.3-src.tar.gz delete mode 100644 mariadb-connector-c-3.0.3-src.tar.gz.asc create mode 100644 mariadb-connector-c-3.0.5-src.tar.gz create mode 100644 mariadb-connector-c-3.0.5-src.tar.gz.asc diff --git a/absolute_path_fix.patch b/absolute_path_fix.patch index 25fb161..6d21684 100644 --- a/absolute_path_fix.patch +++ b/absolute_path_fix.patch @@ -2,19 +2,18 @@ Author: Adam Majer Date: Fri Mar 3 15:59:09 CET 2017 Summary: Remove pure ugliness with paths -Index: mariadb-connector-c-3.0.3-src/mariadb_config/mariadb_config.c.in +Index: mariadb-connector-c-3.0.5-src/mariadb_config/mariadb_config.c.in =================================================================== ---- mariadb-connector-c-3.0.3-src.orig/mariadb_config/mariadb_config.c.in -+++ mariadb-connector-c-3.0.3-src/mariadb_config/mariadb_config.c.in -@@ -5,14 +5,14 @@ +--- mariadb-connector-c-3.0.5-src.orig/mariadb_config/mariadb_config.c.in ++++ mariadb-connector-c-3.0.5-src/mariadb_config/mariadb_config.c.in +@@ -5,13 +5,13 @@ static char *mariadb_progname; -#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql" --#define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb "\ +-#define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb @extra_dynamic_LDFLAGS@" +#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb" -+#define LIBS "-L@INSTALL_LIBDIR@ -lmariadb "\ - "@extra_dynamic_LDFLAGS@" ++#define LIBS "-L@INSTALL_LIBDIR@ -lmariadb @extra_dynamic_LDFLAGS@" #define LIBS_SYS "@extra_dynamic_LDFLAGS@" #define CFLAGS INCLUDE #define VERSION "@MARIADB_CLIENT_VERSION@" @@ -24,10 +23,10 @@ Index: mariadb-connector-c-3.0.3-src/mariadb_config/mariadb_config.c.in #define SOCKET "@MARIADB_UNIX_ADDR@" #define PORT "@MARIADB_PORT@" #define TLS_LIBRARY_VERSION "@TLS_LIBRARY_VERSION@" -Index: mariadb-connector-c-3.0.3-src/mariadb_config/libmariadb.pc.in +Index: mariadb-connector-c-3.0.5-src/mariadb_config/libmariadb.pc.in =================================================================== ---- mariadb-connector-c-3.0.3-src.orig/mariadb_config/libmariadb.pc.in -+++ mariadb-connector-c-3.0.3-src/mariadb_config/libmariadb.pc.in +--- mariadb-connector-c-3.0.5-src.orig/mariadb_config/libmariadb.pc.in ++++ mariadb-connector-c-3.0.5-src/mariadb_config/libmariadb.pc.in @@ -6,14 +6,14 @@ # Dan Nicholson’s Guide to pkg-config (http://www.freedesktop.org/wiki/Software/pkg-config/) # diff --git a/mariadb-connector-c-2.3.1_unresolved_symbols.patch b/mariadb-connector-c-2.3.1_unresolved_symbols.patch index a97f3ab..05a9f1b 100644 --- a/mariadb-connector-c-2.3.1_unresolved_symbols.patch +++ b/mariadb-connector-c-2.3.1_unresolved_symbols.patch @@ -1,12 +1,14 @@ -Index: mariadb-connector-c-3.0.2-src/plugins/auth/CMakeLists.txt +Index: mariadb-connector-c-3.0.5-src/plugins/auth/CMakeLists.txt =================================================================== ---- mariadb-connector-c-3.0.2-src.orig/plugins/auth/CMakeLists.txt -+++ mariadb-connector-c-3.0.2-src/plugins/auth/CMakeLists.txt -@@ -21,6 +21,7 @@ IF(AUTH_DIALOG_PLUGIN_TYPE MATCHES "DYNA - SET(DIALOG_SOURCES ${DIALOG_SOURCES} ${CC_SOURCE_DIR}/plugins/plugin.def) - ENDIF() - ADD_LIBRARY(dialog MODULE ${DIALOG_SOURCES}) -+ TARGET_LINK_LIBRARIES(dialog dl) - SET_TARGET_PROPERTIES(dialog PROPERTIES PREFIX "") - SIGN_TARGET(dialog) - INSTALL_PLUGIN(dialog ${CC_BINARY_DIR}/plugins/auth) +--- mariadb-connector-c-3.0.5-src.orig/plugins/auth/CMakeLists.txt ++++ mariadb-connector-c-3.0.5-src/plugins/auth/CMakeLists.txt +@@ -16,7 +16,8 @@ REGISTER_PLUGIN(TARGET dialog + CONFIGURATIONS DYNAMIC STATIC OFF + DEFAULT DYNAMIC + SOURCES ${CC_SOURCE_DIR}/plugins/auth/dialog.c +- ${CC_SOURCE_DIR}/libmariadb/get_password.c) ++ ${CC_SOURCE_DIR}/libmariadb/get_password.c ++ LIBRARIES dl) + + #GSSAPI client authentication plugin + IF(NOT WIN32) diff --git a/mariadb-connector-c-3.0.3-src.tar.gz b/mariadb-connector-c-3.0.3-src.tar.gz deleted file mode 100644 index 58e0583..0000000 --- a/mariadb-connector-c-3.0.3-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:210f0ee3414b235d3db8e98e9e5a0a98381ecf771e67ca4a688036368984eeea -size 666928 diff --git a/mariadb-connector-c-3.0.3-src.tar.gz.asc b/mariadb-connector-c-3.0.3-src.tar.gz.asc deleted file mode 100644 index 4047d3f..0000000 --- a/mariadb-connector-c-3.0.3-src.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEcBAABCAAGBQJaX2KNAAoJEM4aPdXjyU9JbowIAIov5HuFK79EHQgAdZ+s2AVZ -ZdPb5VIR8ql3lbr36jPtD0x/Tpn9IsHSfxMEQ+MZBNp4wDurKTIsloSZsRCXfZuX -5WxRKn6yeYHA6wwe9vJtydS4uRHxbZta8zfIHZqH5NR328Qrsn4Okj7vk5Ps/r8Z -xXHE07eaEjl7bDX6ehLoaLazz3gIOlLl0CB2VWRN3OVQw31CgP9Ejmcl1uCMA33g -kANYQZsZB5hyEBultpesuSvxnJmNBK15d77mS6erGBNPSMMms8u/Mju4kqgC8s32 -SXvkswFqFzgHpTK5V2e7//H+muGeaQBzR/L8Rs0Yi8oLmkT3u6qS2KlApn9N9ZU= -=bU47 ------END PGP SIGNATURE----- diff --git a/mariadb-connector-c-3.0.5-src.tar.gz b/mariadb-connector-c-3.0.5-src.tar.gz new file mode 100644 index 0000000..388d25a --- /dev/null +++ b/mariadb-connector-c-3.0.5-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:940017f13a13846153eb9d36290824c4615c8a8be4142b6bbaeb698609f02667 +size 664949 diff --git a/mariadb-connector-c-3.0.5-src.tar.gz.asc b/mariadb-connector-c-3.0.5-src.tar.gz.asc new file mode 100644 index 0000000..e09a63f --- /dev/null +++ b/mariadb-connector-c-3.0.5-src.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAABCAAGBQJbF/X+AAoJEM4aPdXjyU9JVhsIAL6jqJdmzBn3c0bQghD2na9R +uZlcr/z1V8xDotRE1fwXuO1+/EVM5E8TkWV+8CZIMxER6fobqZ2kZBKxpAF5lTgY +aO2q1udLZ4HoXVxCN55l20IwgD2VUk2Ib/oHK1beS/GSdpz+W5ZeSSfEEXR8/QHz +qh9/KQAb17qHZN6jij6P41N5MBOv98/mDPyNbKNPlVp0Lnx1PQCv3DxSUdyJG7Q8 +tUwpxF3v7C7/3sS7QK10WkYG6R0+tD7g9+++LH6JY7ysOgSpAUdc56GrkMBTNQ8j +PF5Ykwoi21K2CgyvRRL1IeYfTg3LPjEo5G1rlpsW132uZhXRdn3VCSyNImnLHmo= +=Wvvv +-----END PGP SIGNATURE----- diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index 23d6468..506f88f 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,47 @@ +------------------------------------------------------------------- +Fri Jun 29 15:12:47 UTC 2018 - kstreitova@suse.com + +- New upstream version 3.0.5 +- 3.0.5 important changes: + * CONC-336: Allow multiple initialization of client library + * Fixed string to MYSQL_TIME conversion (prepared statements) + * CONC-334: Copy all members of MYSQL_FIELD to internal + statement structure + * Fixed double free in dynamic column library + * Added checks for corrupted packets in protocol + * MDEV-15450: Added default connection attribute _server_host + * CONC-326: fixed wrong openssl thread id callback +- 3.0.4 important changes: + * Added option MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS for + mysql_options()/mysql_optionsv(): + * New plugin configuration interface: The default configuration + for a specific plugin can be specified via cmake parameter + -DCLIENT_PLUGIN_${PLUGIN}=[DYNAMIC|STATIC|OFF]. + * Added support for linux abstract socket (MDEV-15655). + * CONC-320: Added asynchronous/non-blocking support for + OpenSSL and GnuTLS + * CONC-294: Access violation in mysql_close when using + a connection plugin. + * MDEV-14977: If built dynamically the old_password plugin + could not be located due to wrong filename (must be + mysql_old_password.so instead of old_password.so). + * CONC-315: If no default client character set was specified, + the utf8 character set will be used by default (instead of + setting the client character set to server character set) + * CONC-317: Parsing of configuration file fails if key/value + pairs contain white spaces. + * CONC-322: Correct handling of EAGAIN and EINPROGRESS in + internal_connect (socket) for non windows platforms. + * CONC-323: mariadb_stmt_execute_direct hangs forever if + compression used. + * CONC-324: Wrong codepage numbers for some collations. + * CONC-326: ssl_thread_init() uses wrong openssl threadid + callback +- refresh the following patches: + * mariadb-connector-c-2.3.1_unresolved_symbols.patch + * absolute_path_fix.patch + * private_library.patch + ------------------------------------------------------------------- Fri Jun 29 10:00:42 UTC 2018 - adam.majer@suse.de diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 8607a61..15e2420 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -25,7 +25,7 @@ %endif %bcond_with sqlite3 Name: mariadb-connector-c -Version: 3.0.3 +Version: 3.0.5 Release: 0 Summary: MariaDB connector in C License: LGPL-2.1-or-later diff --git a/private_library.patch b/private_library.patch index 0d51bf0..8c4d6b4 100644 --- a/private_library.patch +++ b/private_library.patch @@ -8,11 +8,11 @@ static linking, create a private shared library that simply exports all symbols. With the exception of exported symbols, it is identical to the regular library. -Index: mariadb-connector-c-3.0.3-src/libmariadb/CMakeLists.txt +Index: mariadb-connector-c-3.0.5-src/libmariadb/CMakeLists.txt =================================================================== ---- mariadb-connector-c-3.0.3-src.orig/libmariadb/CMakeLists.txt -+++ mariadb-connector-c-3.0.3-src/libmariadb/CMakeLists.txt -@@ -391,16 +391,24 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC) +--- mariadb-connector-c-3.0.5-src.orig/libmariadb/CMakeLists.txt ++++ mariadb-connector-c-3.0.5-src/libmariadb/CMakeLists.txt +@@ -403,16 +403,24 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC) SET_TARGET_PROPERTIES(mariadbclient PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64") ENDIF() @@ -23,7 +23,7 @@ Index: mariadb-connector-c-3.0.3-src/libmariadb/CMakeLists.txt +ENDIF() + IF(CMAKE_SYSTEM_NAME MATCHES "Linux") - IF (NOT WITH_ASAN AND NOT WITH_TSAN) + IF (NOT WITH_ASAN) TARGET_LINK_LIBRARIES (libmariadb "-Wl,--no-undefined") ENDIF() TARGET_LINK_LIBRARIES (libmariadb "${CC_BINARY_DIR}/libmariadb/mariadbclient.def") @@ -36,8 +36,8 @@ Index: mariadb-connector-c-3.0.3-src/libmariadb/CMakeLists.txt +SET_TARGET_PROPERTIES(libmariadbprivate PROPERTIES PREFIX "") SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "") - SET_TARGET_PROPERTIES(libmariadb PROPERTIES VERSION -@@ -434,6 +442,9 @@ INSTALL(TARGETS mariadbclient + # +@@ -442,6 +450,9 @@ INSTALL(TARGETS mariadbclient INSTALL(TARGETS libmariadb COMPONENT SharedLibraries DESTINATION ${INSTALL_LIBDIR}) @@ -47,20 +47,20 @@ Index: mariadb-connector-c-3.0.3-src/libmariadb/CMakeLists.txt IF(WIN32) # On Windows, install PDB -Index: mariadb-connector-c-3.0.3-src/mariadb_config/mariadb_config.c.in +Index: mariadb-connector-c-3.0.5-src/mariadb_config/mariadb_config.c.in =================================================================== ---- mariadb-connector-c-3.0.3-src.orig/mariadb_config/mariadb_config.c.in -+++ mariadb-connector-c-3.0.3-src/mariadb_config/mariadb_config.c.in -@@ -8,6 +8,8 @@ static char *mariadb_progname; +--- mariadb-connector-c-3.0.5-src.orig/mariadb_config/mariadb_config.c.in ++++ mariadb-connector-c-3.0.5-src/mariadb_config/mariadb_config.c.in +@@ -7,6 +7,8 @@ static char *mariadb_progname; + #define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb" - #define LIBS "-L@INSTALL_LIBDIR@ -lmariadb "\ - "@extra_dynamic_LDFLAGS@" + #define LIBS "-L@INSTALL_LIBDIR@ -lmariadb @extra_dynamic_LDFLAGS@" +#define PRIVATE_LIBS "-L@INSTALL_LIBDIR@ -lmariadbprivate " \ + "@extra_dynamic_LDFLAGS@" #define LIBS_SYS "@extra_dynamic_LDFLAGS@" #define CFLAGS INCLUDE #define VERSION "@MARIADB_CLIENT_VERSION@" -@@ -31,6 +33,7 @@ static struct option long_options[]= +@@ -30,6 +32,7 @@ static struct option long_options[]= {"port", no_argument, 0, 'i'}, {"plugindir", no_argument, 0, 'j'}, {"tlsinfo", no_argument, 0, 'k'}, @@ -68,7 +68,7 @@ Index: mariadb-connector-c-3.0.3-src/mariadb_config/mariadb_config.c.in {NULL, 0, 0, 0} }; -@@ -46,6 +49,7 @@ static const char *values[]= +@@ -45,6 +48,7 @@ static const char *values[]= CC_VERSION, SOCKET, PORT, @@ -76,7 +76,7 @@ Index: mariadb-connector-c-3.0.3-src/mariadb_config/mariadb_config.c.in PLUGIN_DIR, TLS_LIBRARY_VERSION }; -@@ -116,6 +120,9 @@ int main(int argc, char **argv) +@@ -115,6 +119,9 @@ int main(int argc, char **argv) case 'l': puts(LIBS_SYS); break; From 3a61e4e830fe81f1cf6b04a94c319b69d61dde3ad24adfb81c5f9b3eddb395d5 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 17 Aug 2018 21:57:24 +0000 Subject: [PATCH 13/32] Accepting request 628376 from server:database OBS-URL: https://build.opensuse.org/request/show/628376 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=13 --- mariadb-connector-c-3.0.5-src.tar.gz | 3 --- mariadb-connector-c-3.0.5-src.tar.gz.asc | 11 ----------- mariadb-connector-c-3.0.6-src.tar.gz | 3 +++ mariadb-connector-c-3.0.6-src.tar.gz.asc | 11 +++++++++++ mariadb-connector-c.changes | 16 ++++++++++++++++ mariadb-connector-c.spec | 4 ++-- private_library.patch | 21 +++++++++++---------- 7 files changed, 43 insertions(+), 26 deletions(-) delete mode 100644 mariadb-connector-c-3.0.5-src.tar.gz delete mode 100644 mariadb-connector-c-3.0.5-src.tar.gz.asc create mode 100644 mariadb-connector-c-3.0.6-src.tar.gz create mode 100644 mariadb-connector-c-3.0.6-src.tar.gz.asc diff --git a/mariadb-connector-c-3.0.5-src.tar.gz b/mariadb-connector-c-3.0.5-src.tar.gz deleted file mode 100644 index 388d25a..0000000 --- a/mariadb-connector-c-3.0.5-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:940017f13a13846153eb9d36290824c4615c8a8be4142b6bbaeb698609f02667 -size 664949 diff --git a/mariadb-connector-c-3.0.5-src.tar.gz.asc b/mariadb-connector-c-3.0.5-src.tar.gz.asc deleted file mode 100644 index e09a63f..0000000 --- a/mariadb-connector-c-3.0.5-src.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEcBAABCAAGBQJbF/X+AAoJEM4aPdXjyU9JVhsIAL6jqJdmzBn3c0bQghD2na9R -uZlcr/z1V8xDotRE1fwXuO1+/EVM5E8TkWV+8CZIMxER6fobqZ2kZBKxpAF5lTgY -aO2q1udLZ4HoXVxCN55l20IwgD2VUk2Ib/oHK1beS/GSdpz+W5ZeSSfEEXR8/QHz -qh9/KQAb17qHZN6jij6P41N5MBOv98/mDPyNbKNPlVp0Lnx1PQCv3DxSUdyJG7Q8 -tUwpxF3v7C7/3sS7QK10WkYG6R0+tD7g9+++LH6JY7ysOgSpAUdc56GrkMBTNQ8j -PF5Ykwoi21K2CgyvRRL1IeYfTg3LPjEo5G1rlpsW132uZhXRdn3VCSyNImnLHmo= -=Wvvv ------END PGP SIGNATURE----- diff --git a/mariadb-connector-c-3.0.6-src.tar.gz b/mariadb-connector-c-3.0.6-src.tar.gz new file mode 100644 index 0000000..aa14c9f --- /dev/null +++ b/mariadb-connector-c-3.0.6-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b2d18dc969dc385f7f740e4db112300e11bc626c9ba9aa05c284704095b9e48 +size 666819 diff --git a/mariadb-connector-c-3.0.6-src.tar.gz.asc b/mariadb-connector-c-3.0.6-src.tar.gz.asc new file mode 100644 index 0000000..6315d91 --- /dev/null +++ b/mariadb-connector-c-3.0.6-src.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAABCAAGBQJbYhQoAAoJEM4aPdXjyU9JvaQH/0ehF7SIcto1OxLeEB8pVsnl +iIuA0OXiY2T85q9SgYS2bJr8uvP+jpNWlkioT5FMic223yZ/hego763Ybbsoo5i+ +IGpCMrPwD8qw5uPVl1MJOGN/jP+99nBaQ0wZp6LlP1MY0vADcF/ThrKuB2sNmQyi +RFRjgUGLAcpRJyFE4ClWhtD21SaFbaAel2FEYV5lWaQqAl55mFWdDjvgz2L97iPF +dlvjAE3ZmhJWifVHtOEaqw3rMaRzItgyYwUVNpxxRxIRYgKZ2kzCPRg1oO2R/orG +/332LcOqsMhvUiWkZWRylxssQGyU81ZHfVGNpC60uRk37YIFlR1teCIVudv8x0s= +=kgd5 +-----END PGP SIGNATURE----- diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index 506f88f..368aff8 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Aug 2 23:08:34 UTC 2018 - kstreitova@suse.com + +- New upstream version 3.0.6 + * MDEV-15263: FIx IS_NUM() macro + * CONC-297: local infile parameter must be unsigned int instead + of my_bool + * CONC-329: change return value of internal socket functions + from my_bool to int + * CONC-332: my_auth doesn't read/update server ok packet + * CONC-344: reset internal row counter + * CONC-345: invalid heap use after free + * CONC-346: Remove old cmake policies + * fixed crash in mysql_select_db if NULL parameter was provided +- refresh private_library.patch + ------------------------------------------------------------------- Fri Jun 29 15:12:47 UTC 2018 - kstreitova@suse.com diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 15e2420..3f917ae 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -19,13 +19,13 @@ %define sover 3 %define libname libmariadb # equivalent mariadb version -%define mariadb_version 10.2.10 +%define mariadb_version 10.2.16 %if ! %{defined _rundir} %define _rundir %{_localstatedir}/run %endif %bcond_with sqlite3 Name: mariadb-connector-c -Version: 3.0.5 +Version: 3.0.6 Release: 0 Summary: MariaDB connector in C License: LGPL-2.1-or-later diff --git a/private_library.patch b/private_library.patch index 8c4d6b4..5b370ea 100644 --- a/private_library.patch +++ b/private_library.patch @@ -8,10 +8,10 @@ static linking, create a private shared library that simply exports all symbols. With the exception of exported symbols, it is identical to the regular library. -Index: mariadb-connector-c-3.0.5-src/libmariadb/CMakeLists.txt +Index: mariadb-connector-c-3.0.6-src/libmariadb/CMakeLists.txt =================================================================== ---- mariadb-connector-c-3.0.5-src.orig/libmariadb/CMakeLists.txt -+++ mariadb-connector-c-3.0.5-src/libmariadb/CMakeLists.txt +--- mariadb-connector-c-3.0.6-src.orig/libmariadb/CMakeLists.txt ++++ mariadb-connector-c-3.0.6-src/libmariadb/CMakeLists.txt @@ -403,16 +403,24 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC) SET_TARGET_PROPERTIES(mariadbclient PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64") ENDIF() @@ -26,8 +26,8 @@ Index: mariadb-connector-c-3.0.5-src/libmariadb/CMakeLists.txt IF (NOT WITH_ASAN) TARGET_LINK_LIBRARIES (libmariadb "-Wl,--no-undefined") ENDIF() - TARGET_LINK_LIBRARIES (libmariadb "${CC_BINARY_DIR}/libmariadb/mariadbclient.def") -+ TARGET_LINK_LIBRARIES (libmariadbprivate "-Wl,--no-undefined") + SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINK_FLAGS "${CC_BINARY_DIR}/libmariadb/mariadbclient.def") ++ SET_TARGET_PROPERTIES(libmariadbprivate PROPERTIES LINK_FLAGS "-Wl,--no-undefined") ENDIF() SET_TARGET_PROPERTIES(mariadbclient PROPERTIES IMPORTED_INTERFACE_LINK_LIBRARIES "${SYSTEM_LIBS}") @@ -37,20 +37,21 @@ Index: mariadb-connector-c-3.0.5-src/libmariadb/CMakeLists.txt SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "") # -@@ -442,6 +450,9 @@ INSTALL(TARGETS mariadbclient +@@ -446,7 +454,9 @@ INSTALL(TARGETS mariadbclient INSTALL(TARGETS libmariadb COMPONENT SharedLibraries DESTINATION ${INSTALL_LIBDIR}) +- +INSTALL(TARGETS libmariadbprivate + COMPONENT SharedLibraries + DESTINATION ${INSTALL_LIBDIR}) IF(WIN32) - # On Windows, install PDB -Index: mariadb-connector-c-3.0.5-src/mariadb_config/mariadb_config.c.in + IF(${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo") +Index: mariadb-connector-c-3.0.6-src/mariadb_config/mariadb_config.c.in =================================================================== ---- mariadb-connector-c-3.0.5-src.orig/mariadb_config/mariadb_config.c.in -+++ mariadb-connector-c-3.0.5-src/mariadb_config/mariadb_config.c.in +--- mariadb-connector-c-3.0.6-src.orig/mariadb_config/mariadb_config.c.in ++++ mariadb-connector-c-3.0.6-src/mariadb_config/mariadb_config.c.in @@ -7,6 +7,8 @@ static char *mariadb_progname; #define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb" From abce85c6addf56ac8d2c35794013a9d785062fa4846f3600b788797d718c4863 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 13 Feb 2019 09:15:14 +0000 Subject: [PATCH 14/32] Accepting request 663311 from server:database OBS-URL: https://build.opensuse.org/request/show/663311 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=14 --- absolute_path_fix.patch | 34 +++++++------------ ...connector-c-2.3.1_unresolved_symbols.patch | 10 +++--- mariadb-connector-c-3.0.6-src.tar.gz | 3 -- mariadb-connector-c-3.0.6-src.tar.gz.asc | 11 ------ mariadb-connector-c-3.0.8-src.tar.gz | 3 ++ mariadb-connector-c-3.0.8-src.tar.gz.asc | 11 ++++++ mariadb-connector-c.changes | 29 ++++++++++++++++ mariadb-connector-c.spec | 10 +++--- private_library.patch | 16 ++++----- 9 files changed, 75 insertions(+), 52 deletions(-) delete mode 100644 mariadb-connector-c-3.0.6-src.tar.gz delete mode 100644 mariadb-connector-c-3.0.6-src.tar.gz.asc create mode 100644 mariadb-connector-c-3.0.8-src.tar.gz create mode 100644 mariadb-connector-c-3.0.8-src.tar.gz.asc diff --git a/absolute_path_fix.patch b/absolute_path_fix.patch index 6d21684..6141121 100644 --- a/absolute_path_fix.patch +++ b/absolute_path_fix.patch @@ -2,10 +2,10 @@ Author: Adam Majer Date: Fri Mar 3 15:59:09 CET 2017 Summary: Remove pure ugliness with paths -Index: mariadb-connector-c-3.0.5-src/mariadb_config/mariadb_config.c.in +Index: mariadb-connector-c-3.0.7-src/mariadb_config/mariadb_config.c.in =================================================================== ---- mariadb-connector-c-3.0.5-src.orig/mariadb_config/mariadb_config.c.in -+++ mariadb-connector-c-3.0.5-src/mariadb_config/mariadb_config.c.in +--- mariadb-connector-c-3.0.7-src.orig/mariadb_config/mariadb_config.c.in ++++ mariadb-connector-c-3.0.7-src/mariadb_config/mariadb_config.c.in @@ -5,13 +5,13 @@ static char *mariadb_progname; @@ -23,26 +23,18 @@ Index: mariadb-connector-c-3.0.5-src/mariadb_config/mariadb_config.c.in #define SOCKET "@MARIADB_UNIX_ADDR@" #define PORT "@MARIADB_PORT@" #define TLS_LIBRARY_VERSION "@TLS_LIBRARY_VERSION@" -Index: mariadb-connector-c-3.0.5-src/mariadb_config/libmariadb.pc.in +Index: mariadb-connector-c-3.0.7-src/mariadb_config/libmariadb.pc.in =================================================================== ---- mariadb-connector-c-3.0.5-src.orig/mariadb_config/libmariadb.pc.in -+++ mariadb-connector-c-3.0.5-src/mariadb_config/libmariadb.pc.in -@@ -6,14 +6,14 @@ - # Dan Nicholson’s Guide to pkg-config (http://www.freedesktop.org/wiki/Software/pkg-config/) +--- mariadb-connector-c-3.0.7-src.orig/mariadb_config/libmariadb.pc.in ++++ mariadb-connector-c-3.0.7-src/mariadb_config/libmariadb.pc.in +@@ -7,8 +7,8 @@ # --includedir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ --libdir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -+includedir=@INCLUDE_INSTALL_DIR@ -+libdir=@INCLUDE_INSTALL_DIR@ - prefix=@PREFIX_INSTALL_DIR@ + prefix=@CMAKE_INSTALL_PREFIX@ +-includedir=${prefix}/@INSTALL_INCLUDEDIR@/@SUFFIX_INSTALL_DIR@ +-libdir=${prefix}/@INSTALL_LIBDIR@/@SUFFIX_INSTALL_DIR@ ++includedir=@INSTALL_INCLUDEDIR@ ++libdir=@INSTALL_LIBDIR@ Name: libmariadb - Version: @LIBMARIADB_VERSION@ - Description: MariaDB Connector/C dynamic library --Cflags: -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ @CMAKE_C_FLAGS@ --Libs: -L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb @extra_dynamic_LDFLAGS@ -+Cflags: -I@INCLUDE_INSTALL_DIR@ @CMAKE_C_FLAGS@ -+Libs: -L@LIB_INSTALL_DIR@ -lmariadb @extra_dynamic_LDFLAGS@ - - + Version: @CPACK_PACKAGE_VERSION@ diff --git a/mariadb-connector-c-2.3.1_unresolved_symbols.patch b/mariadb-connector-c-2.3.1_unresolved_symbols.patch index 05a9f1b..42b621c 100644 --- a/mariadb-connector-c-2.3.1_unresolved_symbols.patch +++ b/mariadb-connector-c-2.3.1_unresolved_symbols.patch @@ -1,7 +1,7 @@ -Index: mariadb-connector-c-3.0.5-src/plugins/auth/CMakeLists.txt +Index: mariadb-connector-c-3.0.8-src/plugins/auth/CMakeLists.txt =================================================================== ---- mariadb-connector-c-3.0.5-src.orig/plugins/auth/CMakeLists.txt -+++ mariadb-connector-c-3.0.5-src/plugins/auth/CMakeLists.txt +--- mariadb-connector-c-3.0.8-src.orig/plugins/auth/CMakeLists.txt ++++ mariadb-connector-c-3.0.8-src/plugins/auth/CMakeLists.txt @@ -16,7 +16,8 @@ REGISTER_PLUGIN(TARGET dialog CONFIGURATIONS DYNAMIC STATIC OFF DEFAULT DYNAMIC @@ -10,5 +10,5 @@ Index: mariadb-connector-c-3.0.5-src/plugins/auth/CMakeLists.txt + ${CC_SOURCE_DIR}/libmariadb/get_password.c + LIBRARIES dl) - #GSSAPI client authentication plugin - IF(NOT WIN32) + # SHA256 caching plugin for MySQL 8.0 connection + IF(WITH_SSL) diff --git a/mariadb-connector-c-3.0.6-src.tar.gz b/mariadb-connector-c-3.0.6-src.tar.gz deleted file mode 100644 index aa14c9f..0000000 --- a/mariadb-connector-c-3.0.6-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b2d18dc969dc385f7f740e4db112300e11bc626c9ba9aa05c284704095b9e48 -size 666819 diff --git a/mariadb-connector-c-3.0.6-src.tar.gz.asc b/mariadb-connector-c-3.0.6-src.tar.gz.asc deleted file mode 100644 index 6315d91..0000000 --- a/mariadb-connector-c-3.0.6-src.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEcBAABCAAGBQJbYhQoAAoJEM4aPdXjyU9JvaQH/0ehF7SIcto1OxLeEB8pVsnl -iIuA0OXiY2T85q9SgYS2bJr8uvP+jpNWlkioT5FMic223yZ/hego763Ybbsoo5i+ -IGpCMrPwD8qw5uPVl1MJOGN/jP+99nBaQ0wZp6LlP1MY0vADcF/ThrKuB2sNmQyi -RFRjgUGLAcpRJyFE4ClWhtD21SaFbaAel2FEYV5lWaQqAl55mFWdDjvgz2L97iPF -dlvjAE3ZmhJWifVHtOEaqw3rMaRzItgyYwUVNpxxRxIRYgKZ2kzCPRg1oO2R/orG -/332LcOqsMhvUiWkZWRylxssQGyU81ZHfVGNpC60uRk37YIFlR1teCIVudv8x0s= -=kgd5 ------END PGP SIGNATURE----- diff --git a/mariadb-connector-c-3.0.8-src.tar.gz b/mariadb-connector-c-3.0.8-src.tar.gz new file mode 100644 index 0000000..75182c6 --- /dev/null +++ b/mariadb-connector-c-3.0.8-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ca368fd79e87e80497a5c9fd18922d8316af8584d87cecb35bd5897cb1efd05 +size 674455 diff --git a/mariadb-connector-c-3.0.8-src.tar.gz.asc b/mariadb-connector-c-3.0.8-src.tar.gz.asc new file mode 100644 index 0000000..d929fcc --- /dev/null +++ b/mariadb-connector-c-3.0.8-src.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAABCAAGBQJcHSpAAAoJEM4aPdXjyU9J8w8H/ivEMCO9TuptBRZDsyWugF1l +MjusiO3cIuUpdHQ9t2v14rDjkTvVyW4XVJA55RmQVOSQ2BSjhEQ+WhTG9FgjicuB +JYdWzEVvI8vfgITD4c93j+rM5qdVfWTKjy9KXgXTpkj7rhd/4j7PEGTtk6N2A+4D +EdGdO4hI79zzSAGeMGkkaVQl2p74FwusOxNwIwWMVm4j1N/Z3OnadjlE6ujNATMq +9Ngd9RTCF/XZIPI5+KGj20RhJ6yycmEW1DQwS7gM9/v+NbafdsPYyRvtt7y5XFm+ +8ld5n19a5V0aMAAS5/Q6Ucd5NdyBsqcQsQwIRRTEY03Jkz63tKb7zGm9iHmTWbA= +=2wES +-----END PGP SIGNATURE----- diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index 368aff8..af5de62 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Thu Jan 3 15:11:38 UTC 2019 - kstreitova@suse.com + +- New upstream version 3.0.8 + * mingw fix: use lowercase names for include files + * CONC-375: Fixed handshake errors when mixing TLSv1.3 cipher + suites with cipher suites from other TLS protocols + * CONC-312: Added new caching_sha2_password authentication plugin + for authentication with MySQL 8.0 +- refresh mariadb-connector-c-2.3.1_unresolved_symbols.patch +- pack caching_sha2_password.so plugin + +------------------------------------------------------------------- +Thu Nov 15 09:53:11 UTC 2018 - kstreitova@suse.com + +- New upstream version 3.0.7 [bsc#1116686] + * Build fixes when building with ASAN/TSAN + * CONC-370: Fixed memory leak in configuration file parsing. + * CONC-371: Incorrect fractional part conversion when converting + datetime string to MYSQL_TIME + * CONC-283: Fixed pkg-config configuration + * CONC-364: Not all sockets created in pvio_socket_connect + function are closed + * multiple fixes in named pipe implementation + * CONC-349: Added new parameter STMT_ATTR_STATE to retrieve + statement status via api function mysql_stmt_attr_get +- refresh private_library.patch and absolute_path_fix.patch +- pack libmariadb.pc + ------------------------------------------------------------------- Thu Aug 2 23:08:34 UTC 2018 - kstreitova@suse.com diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 3f917ae..cff0df7 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -1,7 +1,7 @@ # # spec file for package mariadb-connector-c # -# 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 @@ -19,18 +19,18 @@ %define sover 3 %define libname libmariadb # equivalent mariadb version -%define mariadb_version 10.2.16 +%define mariadb_version 10.2.21 %if ! %{defined _rundir} %define _rundir %{_localstatedir}/run %endif %bcond_with sqlite3 Name: mariadb-connector-c -Version: 3.0.6 +Version: 3.0.8 Release: 0 Summary: MariaDB connector in C License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ -Url: https://github.com/MariaDB/mariadb-connector-c +URL: https://github.com/MariaDB/mariadb-connector-c Source: https://downloads.mariadb.com/Connectors/c/connector-c-%{version}/%{name}-%{version}-src.tar.gz Source1: https://downloads.mariadb.com/Connectors/c/connector-c-%{version}/%{name}-%{version}-src.tar.gz.asc # Imported from keyserver based on keyid @ https://mariadb.com/kb/en/mariadb-enterprise/mariadb-enterprise-installation-guide/ @@ -159,6 +159,7 @@ install -Dpm 0644 build/include/ma_config.h \ %{_libdir}/mysql/plugin/auth_gssapi_client.so %{_libdir}/mysql/plugin/remote_io.so %{_libdir}/mysql/plugin/sha256_password.so +%{_libdir}/mysql/plugin/caching_sha2_password.so %files -n %{libname}private %{_libdir}/libmariadbprivate.so @@ -168,6 +169,7 @@ install -Dpm 0644 build/include/ma_config.h \ %{_bindir}/mysql_config %dir %{_includedir}/mysql %{_includedir}/mysql/* +%{_prefix}/lib/pkgconfig/libmariadb.pc %{_libdir}/libmariadb.so %{_libdir}/libmysqlclient.so %{_libdir}/libmysqlclient_r.so diff --git a/private_library.patch b/private_library.patch index 5b370ea..9dc9a90 100644 --- a/private_library.patch +++ b/private_library.patch @@ -8,10 +8,10 @@ static linking, create a private shared library that simply exports all symbols. With the exception of exported symbols, it is identical to the regular library. -Index: mariadb-connector-c-3.0.6-src/libmariadb/CMakeLists.txt +Index: mariadb-connector-c-3.0.7-src/libmariadb/CMakeLists.txt =================================================================== ---- mariadb-connector-c-3.0.6-src.orig/libmariadb/CMakeLists.txt -+++ mariadb-connector-c-3.0.6-src/libmariadb/CMakeLists.txt +--- mariadb-connector-c-3.0.7-src.orig/libmariadb/CMakeLists.txt ++++ mariadb-connector-c-3.0.7-src/libmariadb/CMakeLists.txt @@ -403,16 +403,24 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC) SET_TARGET_PROPERTIES(mariadbclient PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64") ENDIF() @@ -23,7 +23,7 @@ Index: mariadb-connector-c-3.0.6-src/libmariadb/CMakeLists.txt +ENDIF() + IF(CMAKE_SYSTEM_NAME MATCHES "Linux") - IF (NOT WITH_ASAN) + IF (NOT WITH_ASAN AND NOT WITH_TSAN) TARGET_LINK_LIBRARIES (libmariadb "-Wl,--no-undefined") ENDIF() SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINK_FLAGS "${CC_BINARY_DIR}/libmariadb/mariadbclient.def") @@ -47,11 +47,11 @@ Index: mariadb-connector-c-3.0.6-src/libmariadb/CMakeLists.txt + DESTINATION ${INSTALL_LIBDIR}) IF(WIN32) - IF(${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo") -Index: mariadb-connector-c-3.0.6-src/mariadb_config/mariadb_config.c.in + # On Windows, install PDB +Index: mariadb-connector-c-3.0.7-src/mariadb_config/mariadb_config.c.in =================================================================== ---- mariadb-connector-c-3.0.6-src.orig/mariadb_config/mariadb_config.c.in -+++ mariadb-connector-c-3.0.6-src/mariadb_config/mariadb_config.c.in +--- mariadb-connector-c-3.0.7-src.orig/mariadb_config/mariadb_config.c.in ++++ mariadb-connector-c-3.0.7-src/mariadb_config/mariadb_config.c.in @@ -7,6 +7,8 @@ static char *mariadb_progname; #define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb" From 29310cf7432c901a96d1f6d808b18e88887f58ebe442b357c9461e750a809903 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 28 Feb 2019 20:23:08 +0000 Subject: [PATCH 15/32] Accepting request 674868 from server:database OBS-URL: https://build.opensuse.org/request/show/674868 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=15 --- mariadb-connector-c-3.0.8-src.tar.gz | 3 --- mariadb-connector-c-3.0.8-src.tar.gz.asc | 11 ---------- mariadb-connector-c-3.0.9-src.tar.gz | 3 +++ mariadb-connector-c-3.0.9-src.tar.gz.asc | 11 ++++++++++ mariadb-connector-c.changes | 26 ++++++++++++++++++++++++ mariadb-connector-c.spec | 2 +- 6 files changed, 41 insertions(+), 15 deletions(-) delete mode 100644 mariadb-connector-c-3.0.8-src.tar.gz delete mode 100644 mariadb-connector-c-3.0.8-src.tar.gz.asc create mode 100644 mariadb-connector-c-3.0.9-src.tar.gz create mode 100644 mariadb-connector-c-3.0.9-src.tar.gz.asc diff --git a/mariadb-connector-c-3.0.8-src.tar.gz b/mariadb-connector-c-3.0.8-src.tar.gz deleted file mode 100644 index 75182c6..0000000 --- a/mariadb-connector-c-3.0.8-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ca368fd79e87e80497a5c9fd18922d8316af8584d87cecb35bd5897cb1efd05 -size 674455 diff --git a/mariadb-connector-c-3.0.8-src.tar.gz.asc b/mariadb-connector-c-3.0.8-src.tar.gz.asc deleted file mode 100644 index d929fcc..0000000 --- a/mariadb-connector-c-3.0.8-src.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEcBAABCAAGBQJcHSpAAAoJEM4aPdXjyU9J8w8H/ivEMCO9TuptBRZDsyWugF1l -MjusiO3cIuUpdHQ9t2v14rDjkTvVyW4XVJA55RmQVOSQ2BSjhEQ+WhTG9FgjicuB -JYdWzEVvI8vfgITD4c93j+rM5qdVfWTKjy9KXgXTpkj7rhd/4j7PEGTtk6N2A+4D -EdGdO4hI79zzSAGeMGkkaVQl2p74FwusOxNwIwWMVm4j1N/Z3OnadjlE6ujNATMq -9Ngd9RTCF/XZIPI5+KGj20RhJ6yycmEW1DQwS7gM9/v+NbafdsPYyRvtt7y5XFm+ -8ld5n19a5V0aMAAS5/Q6Ucd5NdyBsqcQsQwIRRTEY03Jkz63tKb7zGm9iHmTWbA= -=2wES ------END PGP SIGNATURE----- diff --git a/mariadb-connector-c-3.0.9-src.tar.gz b/mariadb-connector-c-3.0.9-src.tar.gz new file mode 100644 index 0000000..72db251 --- /dev/null +++ b/mariadb-connector-c-3.0.9-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7277c0caba6f50b1d07e1d682baf0b962a63e2e6af9e00e09b8dcf36a7858641 +size 668142 diff --git a/mariadb-connector-c-3.0.9-src.tar.gz.asc b/mariadb-connector-c-3.0.9-src.tar.gz.asc new file mode 100644 index 0000000..6e11205 --- /dev/null +++ b/mariadb-connector-c-3.0.9-src.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAABCAAGBQJcYb40AAoJEM4aPdXjyU9JolIIALSQhZsC+GHcbAxGGMn3IsWp +VfGf1aGrsiAzDPgbHa+lPM6DPIVbo6rPGHPEhRTOVNQulAYeamWMKoIVKZ+o+tqM +kdU078vXlFoLszuG7Vkwurz60NnIXMwzmNAF26PLfRx5P9thijL9L7hnZa3Gx7ne +Tgi1yxkuNEypj3CN4iYCwGtx16tP+VjIdZ+6PcmlX7OMt+PenSfUi1Zxv9jabmUi +a+OrAAir2fn+FZgt61CeG4eFn0eObjBTOEDSifa0R894YHOH0R8Kj7JIsfBreq1R +L7tP0YAHTrKZUcLZrQ2YEpfhQgc3TIYINy0e9J1VkngGZ31VeP5DhdbpApOjg9I= +=GLzz +-----END PGP SIGNATURE----- diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index af5de62..6560e38 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Wed Feb 13 14:19:53 UTC 2019 - kstreitova@suse.com + +- New upstream version 3.0.9 + * CONC-384: Incorrect packet when a connection attribute name or + value is equal to or greater than 251 + * CONC-388: field->def_length is always set to 0 (only used by + deprecated function mysql_list_fields) + * Getter should get and the setter should set + CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS + * CONC-385: Removed some cmake system checks + * CONC-387: Fix case sensitive include file names for cross + compiling + * Fixed cnake policy CMP007 + * Support static linking auth plugins + * Fix build with deprecated OpenSSL API: replaced ERR_remove_state + by ERR_remove_thread_state + * Disable LOAD DATA LOCAL INFILE suport by default and auto-enable + it for the duration of one query, if the query string starts with + the word "load". In all other cases the application should enable + LOAD DATA LOCAL INFILE support explicitly + * Changed return code for mysql_optionv/mysql_get_optionv to 1 + (was -1) and added CR_NOT_IMPLEMENTED error message if a option + is unknown or not supported. This will fix possible error when + setting connection attribute failed + ------------------------------------------------------------------- Thu Jan 3 15:11:38 UTC 2019 - kstreitova@suse.com diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index cff0df7..16c1ab9 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -25,7 +25,7 @@ %endif %bcond_with sqlite3 Name: mariadb-connector-c -Version: 3.0.8 +Version: 3.0.9 Release: 0 Summary: MariaDB connector in C License: LGPL-2.1-or-later From 1a92b5febc010dbc085c9cf97f8c3130ff8020d89314d161680e75780d5e33d4 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 4 Mar 2019 08:14:26 +0000 Subject: [PATCH 16/32] Accepting request 680555 from server:database OBS-URL: https://build.opensuse.org/request/show/680555 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=16 --- mariadb-connector-c.changes | 6 ++++++ mariadb-connector-c.spec | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index 6560e38..ccce1ee 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 1 15:19:46 UTC 2019 - kstreitova@suse.com + +- move libmariadb.pc from /usr/lib/pkgconfig to + /usr/lib64/pkgconfig [bsc#1126088] + ------------------------------------------------------------------- Wed Feb 13 14:19:53 UTC 2019 - kstreitova@suse.com diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 16c1ab9..6393246 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -122,7 +122,8 @@ This package holds the development files. -DINSTALL_INCLUDEDIR:STRING=%{_includedir}/mysql \ -DINSTALL_PLUGINDIR:STRING=%{_libdir}/mysql/plugin/ \ -DWITH_MYSQLCOMPAT=ON \ - -DWITH_SSL=OPENSSL + -DWITH_SSL=OPENSSL \ + -DINSTALL_PCDIR="%{_libdir}/pkgconfig" \ %make_jobs %install @@ -169,7 +170,7 @@ install -Dpm 0644 build/include/ma_config.h \ %{_bindir}/mysql_config %dir %{_includedir}/mysql %{_includedir}/mysql/* -%{_prefix}/lib/pkgconfig/libmariadb.pc +%{_libdir}/pkgconfig/libmariadb.pc %{_libdir}/libmariadb.so %{_libdir}/libmysqlclient.so %{_libdir}/libmysqlclient_r.so From 16945b65eaa9c0c9bc5dbf1aa0b9839d2e31aa4dcd380ff4699260abc8e4edaf Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 16 May 2019 19:57:41 +0000 Subject: [PATCH 17/32] Accepting request 703402 from server:database OBS-URL: https://build.opensuse.org/request/show/703402 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=17 --- mariadb-connector-c.changes | 8 ++++++++ mariadb-connector-c.spec | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index ccce1ee..8d9192b 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue May 14 07:38:44 UTC 2019 - Dominique Leuenberger + +- Add pkgconfig(zlib) Requires to the -devel package: the .pc file + lists -lz in the Libs, but does not mention any requires + explicitly. So let's do our consumers a favor and pull in what we + require. + ------------------------------------------------------------------- Fri Mar 1 15:19:46 UTC 2019 - kstreitova@suse.com diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 6393246..ee4ded2 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -12,7 +12,7 @@ # 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/ # @@ -93,6 +93,7 @@ Summary: Development files for the MariaDB Connector C API Group: Development/Libraries/C and C++ Requires: %{libname}%{sover} = %{version} Requires: pkgconfig(openssl) +Requires: pkgconfig(zlib) # mysql-devel needs to be provided as some pkgs still depend on it Provides: mysql-devel = %{mariadb_version} Obsoletes: mysql-devel < %{mariadb_version} @@ -123,7 +124,7 @@ This package holds the development files. -DINSTALL_PLUGINDIR:STRING=%{_libdir}/mysql/plugin/ \ -DWITH_MYSQLCOMPAT=ON \ -DWITH_SSL=OPENSSL \ - -DINSTALL_PCDIR="%{_libdir}/pkgconfig" \ + -DINSTALL_PCDIR="%{_libdir}/pkgconfig" %make_jobs %install From 64553dabd032e5c8b195f6a491809b14c9bfa1f3bddb35ec69935be864350ec7 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 8 Jul 2019 13:04:41 +0000 Subject: [PATCH 18/32] Accepting request 713453 from server:database OBS-URL: https://build.opensuse.org/request/show/713453 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=18 --- ...connector-c-2.3.1_unresolved_symbols.patch | 10 +++++----- mariadb-connector-c-3.0.9-src.tar.gz | 3 --- mariadb-connector-c-3.0.9-src.tar.gz.asc | 11 ----------- mariadb-connector-c-3.1.2-src.tar.gz | 3 +++ mariadb-connector-c-3.1.2-src.tar.gz.asc | 11 +++++++++++ mariadb-connector-c.changes | 17 +++++++++++++++++ mariadb-connector-c.spec | 5 +++-- private_library.patch | 19 ++++++++++--------- 8 files changed, 49 insertions(+), 30 deletions(-) delete mode 100644 mariadb-connector-c-3.0.9-src.tar.gz delete mode 100644 mariadb-connector-c-3.0.9-src.tar.gz.asc create mode 100644 mariadb-connector-c-3.1.2-src.tar.gz create mode 100644 mariadb-connector-c-3.1.2-src.tar.gz.asc diff --git a/mariadb-connector-c-2.3.1_unresolved_symbols.patch b/mariadb-connector-c-2.3.1_unresolved_symbols.patch index 42b621c..8c5a113 100644 --- a/mariadb-connector-c-2.3.1_unresolved_symbols.patch +++ b/mariadb-connector-c-2.3.1_unresolved_symbols.patch @@ -1,7 +1,7 @@ -Index: mariadb-connector-c-3.0.8-src/plugins/auth/CMakeLists.txt +Index: mariadb-connector-c-3.1.2-src/plugins/auth/CMakeLists.txt =================================================================== ---- mariadb-connector-c-3.0.8-src.orig/plugins/auth/CMakeLists.txt -+++ mariadb-connector-c-3.0.8-src/plugins/auth/CMakeLists.txt +--- mariadb-connector-c-3.1.2-src.orig/plugins/auth/CMakeLists.txt ++++ mariadb-connector-c-3.1.2-src/plugins/auth/CMakeLists.txt @@ -16,7 +16,8 @@ REGISTER_PLUGIN(TARGET dialog CONFIGURATIONS DYNAMIC STATIC OFF DEFAULT DYNAMIC @@ -10,5 +10,5 @@ Index: mariadb-connector-c-3.0.8-src/plugins/auth/CMakeLists.txt + ${CC_SOURCE_DIR}/libmariadb/get_password.c + LIBRARIES dl) - # SHA256 caching plugin for MySQL 8.0 connection - IF(WITH_SSL) + #ED25519 client authentication plugin + SET(REF10_DIR ${CC_SOURCE_DIR}/plugins/auth/ref10) diff --git a/mariadb-connector-c-3.0.9-src.tar.gz b/mariadb-connector-c-3.0.9-src.tar.gz deleted file mode 100644 index 72db251..0000000 --- a/mariadb-connector-c-3.0.9-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7277c0caba6f50b1d07e1d682baf0b962a63e2e6af9e00e09b8dcf36a7858641 -size 668142 diff --git a/mariadb-connector-c-3.0.9-src.tar.gz.asc b/mariadb-connector-c-3.0.9-src.tar.gz.asc deleted file mode 100644 index 6e11205..0000000 --- a/mariadb-connector-c-3.0.9-src.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEcBAABCAAGBQJcYb40AAoJEM4aPdXjyU9JolIIALSQhZsC+GHcbAxGGMn3IsWp -VfGf1aGrsiAzDPgbHa+lPM6DPIVbo6rPGHPEhRTOVNQulAYeamWMKoIVKZ+o+tqM -kdU078vXlFoLszuG7Vkwurz60NnIXMwzmNAF26PLfRx5P9thijL9L7hnZa3Gx7ne -Tgi1yxkuNEypj3CN4iYCwGtx16tP+VjIdZ+6PcmlX7OMt+PenSfUi1Zxv9jabmUi -a+OrAAir2fn+FZgt61CeG4eFn0eObjBTOEDSifa0R894YHOH0R8Kj7JIsfBreq1R -L7tP0YAHTrKZUcLZrQ2YEpfhQgc3TIYINy0e9J1VkngGZ31VeP5DhdbpApOjg9I= -=GLzz ------END PGP SIGNATURE----- diff --git a/mariadb-connector-c-3.1.2-src.tar.gz b/mariadb-connector-c-3.1.2-src.tar.gz new file mode 100644 index 0000000..c04ee88 --- /dev/null +++ b/mariadb-connector-c-3.1.2-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:156aa2de91fd9607fa6c638d23888082b6dd07628652697992bba6d15045ff5d +size 735530 diff --git a/mariadb-connector-c-3.1.2-src.tar.gz.asc b/mariadb-connector-c-3.1.2-src.tar.gz.asc new file mode 100644 index 0000000..e20be2b --- /dev/null +++ b/mariadb-connector-c-3.1.2-src.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAABCAAGBQJdCkq+AAoJEM4aPdXjyU9JEjsIANGk0gPBnHUe5bhj/baACykZ +ggUmLqoGHAZ9u0t6Oo6fCroQ0YWo3oixsU+/4IpI5X84IYux7O1uicKe05/7qFBX +WCwQ5wpE0deKX0wgMFDLh/ML0YMCWM69qo6glTLM3QySK5Baj1jKCV6z2rqwlIJH +HkMZ9CFVDTHdDUG0B8O+y0LmfyE3VfWRbMRIcWkCiK5fzYK3fFhDG3A+KDtjz3Kr +kOpAVRGLmFTDln9dkO7G64iXB4Gru+FvvUb/ylJeY1hEb1fJ+iOXEZyglrP6DSOM +clLUVWtzq9lC/GRkiABa3jp8aIC/r6We3+heMVvvrbDVXaSlq+EnBQNWzbWRKV4= +=YtDs +-----END PGP SIGNATURE----- diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index 8d9192b..96f5209 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Wed Jul 3 15:24:22 UTC 2019 - Kristyna Streitova + +- New upstream version 3.1.2 [bsc#1136035] + * CONC-383: client plugins can't be loaded due to missing prefix + * Fixed version setting in GnuTLS by moving "NORMAL" at the end + of priority string + * CONC-386: Added support for pem files which contain certificate + and private key. + * Replication/Binlog API: The main mechanism used in replication + is the binary log. + * CONC-395: Dashes and underscores are not interchangeable in + options in my.cnf +- refresh mariadb-connector-c-2.3.1_unresolved_symbols.patch and + private_library.patch +- pack client_ed25519.so + ------------------------------------------------------------------- Tue May 14 07:38:44 UTC 2019 - Dominique Leuenberger diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index ee4ded2..e528a62 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -19,13 +19,13 @@ %define sover 3 %define libname libmariadb # equivalent mariadb version -%define mariadb_version 10.2.21 +%define mariadb_version 10.2.25 %if ! %{defined _rundir} %define _rundir %{_localstatedir}/run %endif %bcond_with sqlite3 Name: mariadb-connector-c -Version: 3.0.9 +Version: 3.1.2 Release: 0 Summary: MariaDB connector in C License: LGPL-2.1-or-later @@ -162,6 +162,7 @@ install -Dpm 0644 build/include/ma_config.h \ %{_libdir}/mysql/plugin/remote_io.so %{_libdir}/mysql/plugin/sha256_password.so %{_libdir}/mysql/plugin/caching_sha2_password.so +%{_libdir}/mysql/plugin/client_ed25519.so %files -n %{libname}private %{_libdir}/libmariadbprivate.so diff --git a/private_library.patch b/private_library.patch index 9dc9a90..a27b602 100644 --- a/private_library.patch +++ b/private_library.patch @@ -8,11 +8,11 @@ static linking, create a private shared library that simply exports all symbols. With the exception of exported symbols, it is identical to the regular library. -Index: mariadb-connector-c-3.0.7-src/libmariadb/CMakeLists.txt +Index: mariadb-connector-c-3.1.2-src/libmariadb/CMakeLists.txt =================================================================== ---- mariadb-connector-c-3.0.7-src.orig/libmariadb/CMakeLists.txt -+++ mariadb-connector-c-3.0.7-src/libmariadb/CMakeLists.txt -@@ -403,16 +403,24 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC) +--- mariadb-connector-c-3.1.2-src.orig/libmariadb/CMakeLists.txt ++++ mariadb-connector-c-3.1.2-src/libmariadb/CMakeLists.txt +@@ -410,17 +410,25 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC) SET_TARGET_PROPERTIES(mariadbclient PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64") ENDIF() @@ -22,7 +22,8 @@ Index: mariadb-connector-c-3.0.7-src/libmariadb/CMakeLists.txt + SET_TARGET_PROPERTIES(libmariadbprivate PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}") +ENDIF() + - IF(CMAKE_SYSTEM_NAME MATCHES "Linux") + IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR + CMAKE_SYSTEM_NAME MATCHES "GNU") IF (NOT WITH_ASAN AND NOT WITH_TSAN) TARGET_LINK_LIBRARIES (libmariadb "-Wl,--no-undefined") ENDIF() @@ -37,7 +38,7 @@ Index: mariadb-connector-c-3.0.7-src/libmariadb/CMakeLists.txt SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "") # -@@ -446,7 +454,9 @@ INSTALL(TARGETS mariadbclient +@@ -454,7 +462,9 @@ INSTALL(TARGETS mariadbclient INSTALL(TARGETS libmariadb COMPONENT SharedLibraries DESTINATION ${INSTALL_LIBDIR}) @@ -48,10 +49,10 @@ Index: mariadb-connector-c-3.0.7-src/libmariadb/CMakeLists.txt IF(WIN32) # On Windows, install PDB -Index: mariadb-connector-c-3.0.7-src/mariadb_config/mariadb_config.c.in +Index: mariadb-connector-c-3.1.2-src/mariadb_config/mariadb_config.c.in =================================================================== ---- mariadb-connector-c-3.0.7-src.orig/mariadb_config/mariadb_config.c.in -+++ mariadb-connector-c-3.0.7-src/mariadb_config/mariadb_config.c.in +--- mariadb-connector-c-3.1.2-src.orig/mariadb_config/mariadb_config.c.in ++++ mariadb-connector-c-3.1.2-src/mariadb_config/mariadb_config.c.in @@ -7,6 +7,8 @@ static char *mariadb_progname; #define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb" From 3ec318e2ca1b0d74e8e77ddb97ea53ac750fad0e5f026923f66efc0a1e0e74b7 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 15 Aug 2019 10:25:31 +0000 Subject: [PATCH 19/32] Accepting request 721052 from server:database OBS-URL: https://build.opensuse.org/request/show/721052 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=19 --- absolute_path_fix.patch | 16 ++++++++-------- mariadb-connector-c-3.1.2-src.tar.gz | 3 --- mariadb-connector-c-3.1.2-src.tar.gz.asc | 11 ----------- mariadb-connector-c-3.1.3-src.tar.gz | 3 +++ mariadb-connector-c-3.1.3-src.tar.gz.asc | 11 +++++++++++ mariadb-connector-c.changes | 16 ++++++++++++++++ mariadb-connector-c.spec | 4 ++-- private_library.patch | 14 +++++++------- 8 files changed, 47 insertions(+), 31 deletions(-) delete mode 100644 mariadb-connector-c-3.1.2-src.tar.gz delete mode 100644 mariadb-connector-c-3.1.2-src.tar.gz.asc create mode 100644 mariadb-connector-c-3.1.3-src.tar.gz create mode 100644 mariadb-connector-c-3.1.3-src.tar.gz.asc diff --git a/absolute_path_fix.patch b/absolute_path_fix.patch index 6141121..7c851a7 100644 --- a/absolute_path_fix.patch +++ b/absolute_path_fix.patch @@ -2,18 +2,18 @@ Author: Adam Majer Date: Fri Mar 3 15:59:09 CET 2017 Summary: Remove pure ugliness with paths -Index: mariadb-connector-c-3.0.7-src/mariadb_config/mariadb_config.c.in +Index: mariadb-connector-c-3.1.3-src/mariadb_config/mariadb_config.c.in =================================================================== ---- mariadb-connector-c-3.0.7-src.orig/mariadb_config/mariadb_config.c.in -+++ mariadb-connector-c-3.0.7-src/mariadb_config/mariadb_config.c.in +--- mariadb-connector-c-3.1.3-src.orig/mariadb_config/mariadb_config.c.in ++++ mariadb-connector-c-3.1.3-src/mariadb_config/mariadb_config.c.in @@ -5,13 +5,13 @@ static char *mariadb_progname; -#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql" --#define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb @extra_dynamic_LDFLAGS@" +-#define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb" +#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb" -+#define LIBS "-L@INSTALL_LIBDIR@ -lmariadb @extra_dynamic_LDFLAGS@" ++#define LIBS "-L@INSTALL_LIBDIR@ -lmariadb" #define LIBS_SYS "@extra_dynamic_LDFLAGS@" #define CFLAGS INCLUDE #define VERSION "@MARIADB_CLIENT_VERSION@" @@ -23,10 +23,10 @@ Index: mariadb-connector-c-3.0.7-src/mariadb_config/mariadb_config.c.in #define SOCKET "@MARIADB_UNIX_ADDR@" #define PORT "@MARIADB_PORT@" #define TLS_LIBRARY_VERSION "@TLS_LIBRARY_VERSION@" -Index: mariadb-connector-c-3.0.7-src/mariadb_config/libmariadb.pc.in +Index: mariadb-connector-c-3.1.3-src/mariadb_config/libmariadb.pc.in =================================================================== ---- mariadb-connector-c-3.0.7-src.orig/mariadb_config/libmariadb.pc.in -+++ mariadb-connector-c-3.0.7-src/mariadb_config/libmariadb.pc.in +--- mariadb-connector-c-3.1.3-src.orig/mariadb_config/libmariadb.pc.in ++++ mariadb-connector-c-3.1.3-src/mariadb_config/libmariadb.pc.in @@ -7,8 +7,8 @@ # diff --git a/mariadb-connector-c-3.1.2-src.tar.gz b/mariadb-connector-c-3.1.2-src.tar.gz deleted file mode 100644 index c04ee88..0000000 --- a/mariadb-connector-c-3.1.2-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:156aa2de91fd9607fa6c638d23888082b6dd07628652697992bba6d15045ff5d -size 735530 diff --git a/mariadb-connector-c-3.1.2-src.tar.gz.asc b/mariadb-connector-c-3.1.2-src.tar.gz.asc deleted file mode 100644 index e20be2b..0000000 --- a/mariadb-connector-c-3.1.2-src.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEcBAABCAAGBQJdCkq+AAoJEM4aPdXjyU9JEjsIANGk0gPBnHUe5bhj/baACykZ -ggUmLqoGHAZ9u0t6Oo6fCroQ0YWo3oixsU+/4IpI5X84IYux7O1uicKe05/7qFBX -WCwQ5wpE0deKX0wgMFDLh/ML0YMCWM69qo6glTLM3QySK5Baj1jKCV6z2rqwlIJH -HkMZ9CFVDTHdDUG0B8O+y0LmfyE3VfWRbMRIcWkCiK5fzYK3fFhDG3A+KDtjz3Kr -kOpAVRGLmFTDln9dkO7G64iXB4Gru+FvvUb/ylJeY1hEb1fJ+iOXEZyglrP6DSOM -clLUVWtzq9lC/GRkiABa3jp8aIC/r6We3+heMVvvrbDVXaSlq+EnBQNWzbWRKV4= -=YtDs ------END PGP SIGNATURE----- diff --git a/mariadb-connector-c-3.1.3-src.tar.gz b/mariadb-connector-c-3.1.3-src.tar.gz new file mode 100644 index 0000000..796509e --- /dev/null +++ b/mariadb-connector-c-3.1.3-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8bcd0a7fe9487a08019a7e74b861cdf79068ace62a9b599384936a8f83d3170e +size 738250 diff --git a/mariadb-connector-c-3.1.3-src.tar.gz.asc b/mariadb-connector-c-3.1.3-src.tar.gz.asc new file mode 100644 index 0000000..ae0b662 --- /dev/null +++ b/mariadb-connector-c-3.1.3-src.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAABCAAGBQJdQuz3AAoJEM4aPdXjyU9JJA8H/Al3YK7ep7Zk8OkGh83GGPeX +rJ/dJE8uPtwRf2GiPpxYRCrTDxfxx7U2be7wpwhnu0qSyME+aZftIS2O0r4Vbvwi +wF+aRg6kceP5OHWtfrcK7IbORV4mq4un4qBh2N2fD4hKL7H/SBAqJeV34c8EBK4C +++f1787WED/q+5XNAKyqGO5hLjfvIiWOjoE4ZNaycI9496HBxlrhKJuCNKvV3e4r ++Lg8vVh06mdPaSeFB1jjv8ac1sGTvH7KnQRK9ygwrFxGPrhden0OsZoM83UpzWTb +xnoMND+A0KmezF4FfofNj/h4kELIkVM7IXhor2AFFFb6lkDjR6EJw0fGDgYk1kM= +=7cyK +-----END PGP SIGNATURE----- diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index 96f5209..e14fef9 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Aug 5 11:28:22 UTC 2019 - Kristyna Streitova + +- New upstream version 3.1.3 + * CONC-380: Fix CMake warnings + * CONC-345: heap-use-after-free in client_mpvio_read_packet + * CONC-423: Fix GnuTLS error with TLSv1.3 + * CONC-424: Ignore SERVER_STATUS_CURSOR_EXISTS if client didn't + open a cursor before + * CONC-421: Fixed crash in GnuTLS when key and certificate are + in the same file + * CONC-429: Don't allow invalid characters in plugin names + * MDEV-19807: Fixed Location of PLUGINDIR if Connector/C is a + subproject +- refresh absolute_path_fix.patch and private_library.patch + ------------------------------------------------------------------- Wed Jul 3 15:24:22 UTC 2019 - Kristyna Streitova diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index e528a62..7d11e2c 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -19,13 +19,13 @@ %define sover 3 %define libname libmariadb # equivalent mariadb version -%define mariadb_version 10.2.25 +%define mariadb_version 10.3.17 %if ! %{defined _rundir} %define _rundir %{_localstatedir}/run %endif %bcond_with sqlite3 Name: mariadb-connector-c -Version: 3.1.2 +Version: 3.1.3 Release: 0 Summary: MariaDB connector in C License: LGPL-2.1-or-later diff --git a/private_library.patch b/private_library.patch index a27b602..9719821 100644 --- a/private_library.patch +++ b/private_library.patch @@ -8,10 +8,10 @@ static linking, create a private shared library that simply exports all symbols. With the exception of exported symbols, it is identical to the regular library. -Index: mariadb-connector-c-3.1.2-src/libmariadb/CMakeLists.txt +Index: mariadb-connector-c-3.1.3-src/libmariadb/CMakeLists.txt =================================================================== ---- mariadb-connector-c-3.1.2-src.orig/libmariadb/CMakeLists.txt -+++ mariadb-connector-c-3.1.2-src/libmariadb/CMakeLists.txt +--- mariadb-connector-c-3.1.3-src.orig/libmariadb/CMakeLists.txt ++++ mariadb-connector-c-3.1.3-src/libmariadb/CMakeLists.txt @@ -410,17 +410,25 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC) SET_TARGET_PROPERTIES(mariadbclient PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64") ENDIF() @@ -49,14 +49,14 @@ Index: mariadb-connector-c-3.1.2-src/libmariadb/CMakeLists.txt IF(WIN32) # On Windows, install PDB -Index: mariadb-connector-c-3.1.2-src/mariadb_config/mariadb_config.c.in +Index: mariadb-connector-c-3.1.3-src/mariadb_config/mariadb_config.c.in =================================================================== ---- mariadb-connector-c-3.1.2-src.orig/mariadb_config/mariadb_config.c.in -+++ mariadb-connector-c-3.1.2-src/mariadb_config/mariadb_config.c.in +--- mariadb-connector-c-3.1.3-src.orig/mariadb_config/mariadb_config.c.in ++++ mariadb-connector-c-3.1.3-src/mariadb_config/mariadb_config.c.in @@ -7,6 +7,8 @@ static char *mariadb_progname; #define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb" - #define LIBS "-L@INSTALL_LIBDIR@ -lmariadb @extra_dynamic_LDFLAGS@" + #define LIBS "-L@INSTALL_LIBDIR@ -lmariadb" +#define PRIVATE_LIBS "-L@INSTALL_LIBDIR@ -lmariadbprivate " \ + "@extra_dynamic_LDFLAGS@" #define LIBS_SYS "@extra_dynamic_LDFLAGS@" From 059a3d252ca8b08a00e32f3d135280290f5825b4fb17baa87b4629ce470269ff Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 30 Sep 2019 13:51:57 +0000 Subject: [PATCH 20/32] Accepting request 732948 from server:database OBS-URL: https://build.opensuse.org/request/show/732948 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=20 --- mariadb-connector-c-2.3.1_unresolved_symbols.patch | 12 ++++++------ mariadb-connector-c-3.1.3-src.tar.gz | 3 --- mariadb-connector-c-3.1.3-src.tar.gz.asc | 11 ----------- mariadb-connector-c-3.1.4-src.tar.gz | 3 +++ mariadb-connector-c-3.1.4-src.tar.gz.asc | 11 +++++++++++ mariadb-connector-c.changes | 9 +++++++++ mariadb-connector-c.spec | 2 +- private_library.patch | 14 +++++++------- 8 files changed, 37 insertions(+), 28 deletions(-) delete mode 100644 mariadb-connector-c-3.1.3-src.tar.gz delete mode 100644 mariadb-connector-c-3.1.3-src.tar.gz.asc create mode 100644 mariadb-connector-c-3.1.4-src.tar.gz create mode 100644 mariadb-connector-c-3.1.4-src.tar.gz.asc diff --git a/mariadb-connector-c-2.3.1_unresolved_symbols.patch b/mariadb-connector-c-2.3.1_unresolved_symbols.patch index 8c5a113..95526ff 100644 --- a/mariadb-connector-c-2.3.1_unresolved_symbols.patch +++ b/mariadb-connector-c-2.3.1_unresolved_symbols.patch @@ -1,8 +1,8 @@ -Index: mariadb-connector-c-3.1.2-src/plugins/auth/CMakeLists.txt +Index: mariadb-connector-c-3.1.4-src/plugins/auth/CMakeLists.txt =================================================================== ---- mariadb-connector-c-3.1.2-src.orig/plugins/auth/CMakeLists.txt -+++ mariadb-connector-c-3.1.2-src/plugins/auth/CMakeLists.txt -@@ -16,7 +16,8 @@ REGISTER_PLUGIN(TARGET dialog +--- mariadb-connector-c-3.1.4-src.orig/plugins/auth/CMakeLists.txt ++++ mariadb-connector-c-3.1.4-src/plugins/auth/CMakeLists.txt +@@ -32,7 +32,8 @@ REGISTER_PLUGIN(TARGET dialog CONFIGURATIONS DYNAMIC STATIC OFF DEFAULT DYNAMIC SOURCES ${CC_SOURCE_DIR}/plugins/auth/dialog.c @@ -10,5 +10,5 @@ Index: mariadb-connector-c-3.1.2-src/plugins/auth/CMakeLists.txt + ${CC_SOURCE_DIR}/libmariadb/get_password.c + LIBRARIES dl) - #ED25519 client authentication plugin - SET(REF10_DIR ${CC_SOURCE_DIR}/plugins/auth/ref10) + + # Crypto plugins diff --git a/mariadb-connector-c-3.1.3-src.tar.gz b/mariadb-connector-c-3.1.3-src.tar.gz deleted file mode 100644 index 796509e..0000000 --- a/mariadb-connector-c-3.1.3-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8bcd0a7fe9487a08019a7e74b861cdf79068ace62a9b599384936a8f83d3170e -size 738250 diff --git a/mariadb-connector-c-3.1.3-src.tar.gz.asc b/mariadb-connector-c-3.1.3-src.tar.gz.asc deleted file mode 100644 index ae0b662..0000000 --- a/mariadb-connector-c-3.1.3-src.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEcBAABCAAGBQJdQuz3AAoJEM4aPdXjyU9JJA8H/Al3YK7ep7Zk8OkGh83GGPeX -rJ/dJE8uPtwRf2GiPpxYRCrTDxfxx7U2be7wpwhnu0qSyME+aZftIS2O0r4Vbvwi -wF+aRg6kceP5OHWtfrcK7IbORV4mq4un4qBh2N2fD4hKL7H/SBAqJeV34c8EBK4C -++f1787WED/q+5XNAKyqGO5hLjfvIiWOjoE4ZNaycI9496HBxlrhKJuCNKvV3e4r -+Lg8vVh06mdPaSeFB1jjv8ac1sGTvH7KnQRK9ygwrFxGPrhden0OsZoM83UpzWTb -xnoMND+A0KmezF4FfofNj/h4kELIkVM7IXhor2AFFFb6lkDjR6EJw0fGDgYk1kM= -=7cyK ------END PGP SIGNATURE----- diff --git a/mariadb-connector-c-3.1.4-src.tar.gz b/mariadb-connector-c-3.1.4-src.tar.gz new file mode 100644 index 0000000..48eaff6 --- /dev/null +++ b/mariadb-connector-c-3.1.4-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a1a72fee00e4c28060f96c3efbbf38aabcbbab17903e82fce85a85002565316 +size 738308 diff --git a/mariadb-connector-c-3.1.4-src.tar.gz.asc b/mariadb-connector-c-3.1.4-src.tar.gz.asc new file mode 100644 index 0000000..f30c325 --- /dev/null +++ b/mariadb-connector-c-3.1.4-src.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAABCAAGBQJdd6B/AAoJEM4aPdXjyU9JFoAH/29ea24OfhsghrbZ5LOkrUcb +FnYWXwJchbdNv9xlN41184BTANN3vEGc/XpVW0HYM904NGLODqIIyZc5PN6bIHHj +6q7idAWTqfD8LdtUg7QDVo0R8m10zMYMu6kUMt9WmxBIKIxD0qKxbgXeSJPvdqUA +3FEBvd7SsQZpbddx7ZGPKWdL9FPsT+rKXYlYvvrPo7HTCwlpKLWuqoxku3dUka9X +OwOPW63X4fc6+JAxBqgfH1x3SexIjU9R2rmVV1HfaBWReFSq9wItcuECIq8He9b/ +ghB0RMK/WDeAp43dBCZywOOrm5P/Kje02XmbM0nAbbeLY1bkp2nJ2jnfDOxqv0U= +=jbKq +-----END PGP SIGNATURE----- diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index e14fef9..2541c43 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Sep 24 10:59:32 UTC 2019 - Kristyna Streitova + +- New upstream version 3.1.4 + * CONC-431: Use windows crypto libraries on Windows platforms + * Included in MariaDB 10.4.8, MariaDB 10.3.18, and MariaDB 10.2.27 +- refresh mariadb-connector-c-2.3.1_unresolved_symbols.patch and + private_library.patch + ------------------------------------------------------------------- Mon Aug 5 11:28:22 UTC 2019 - Kristyna Streitova diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 7d11e2c..a2be7b4 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -25,7 +25,7 @@ %endif %bcond_with sqlite3 Name: mariadb-connector-c -Version: 3.1.3 +Version: 3.1.4 Release: 0 Summary: MariaDB connector in C License: LGPL-2.1-or-later diff --git a/private_library.patch b/private_library.patch index 9719821..3b860f3 100644 --- a/private_library.patch +++ b/private_library.patch @@ -8,10 +8,10 @@ static linking, create a private shared library that simply exports all symbols. With the exception of exported symbols, it is identical to the regular library. -Index: mariadb-connector-c-3.1.3-src/libmariadb/CMakeLists.txt +Index: mariadb-connector-c-3.1.4-src/libmariadb/CMakeLists.txt =================================================================== ---- mariadb-connector-c-3.1.3-src.orig/libmariadb/CMakeLists.txt -+++ mariadb-connector-c-3.1.3-src/libmariadb/CMakeLists.txt +--- mariadb-connector-c-3.1.4-src.orig/libmariadb/CMakeLists.txt ++++ mariadb-connector-c-3.1.4-src/libmariadb/CMakeLists.txt @@ -410,17 +410,25 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC) SET_TARGET_PROPERTIES(mariadbclient PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64") ENDIF() @@ -24,7 +24,7 @@ Index: mariadb-connector-c-3.1.3-src/libmariadb/CMakeLists.txt + IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "GNU") - IF (NOT WITH_ASAN AND NOT WITH_TSAN) + IF (NOT WITH_ASAN AND NOT WITH_TSAN AND NOT WITH_UBSAN AND NOT WITH_MSAN) TARGET_LINK_LIBRARIES (libmariadb "-Wl,--no-undefined") ENDIF() SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINK_FLAGS "${CC_BINARY_DIR}/libmariadb/mariadbclient.def") @@ -49,10 +49,10 @@ Index: mariadb-connector-c-3.1.3-src/libmariadb/CMakeLists.txt IF(WIN32) # On Windows, install PDB -Index: mariadb-connector-c-3.1.3-src/mariadb_config/mariadb_config.c.in +Index: mariadb-connector-c-3.1.4-src/mariadb_config/mariadb_config.c.in =================================================================== ---- mariadb-connector-c-3.1.3-src.orig/mariadb_config/mariadb_config.c.in -+++ mariadb-connector-c-3.1.3-src/mariadb_config/mariadb_config.c.in +--- mariadb-connector-c-3.1.4-src.orig/mariadb_config/mariadb_config.c.in ++++ mariadb-connector-c-3.1.4-src/mariadb_config/mariadb_config.c.in @@ -7,6 +7,8 @@ static char *mariadb_progname; #define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb" From 7ded8744e16a378ddb10b605258385052c88d8a0e90dd31add211f7b9b73ed5d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 7 Dec 2019 14:19:01 +0000 Subject: [PATCH 21/32] Accepting request 751755 from server:database OBS-URL: https://build.opensuse.org/request/show/751755 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=21 --- mariadb-connector-c-3.1.4-src.tar.gz | 3 --- mariadb-connector-c-3.1.4-src.tar.gz.asc | 11 ----------- mariadb-connector-c-3.1.5-src.tar.gz | 3 +++ mariadb-connector-c-3.1.5-src.tar.gz.asc | 11 +++++++++++ mariadb-connector-c.changes | 10 ++++++++++ mariadb-connector-c.spec | 4 ++-- 6 files changed, 26 insertions(+), 16 deletions(-) delete mode 100644 mariadb-connector-c-3.1.4-src.tar.gz delete mode 100644 mariadb-connector-c-3.1.4-src.tar.gz.asc create mode 100644 mariadb-connector-c-3.1.5-src.tar.gz create mode 100644 mariadb-connector-c-3.1.5-src.tar.gz.asc diff --git a/mariadb-connector-c-3.1.4-src.tar.gz b/mariadb-connector-c-3.1.4-src.tar.gz deleted file mode 100644 index 48eaff6..0000000 --- a/mariadb-connector-c-3.1.4-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a1a72fee00e4c28060f96c3efbbf38aabcbbab17903e82fce85a85002565316 -size 738308 diff --git a/mariadb-connector-c-3.1.4-src.tar.gz.asc b/mariadb-connector-c-3.1.4-src.tar.gz.asc deleted file mode 100644 index f30c325..0000000 --- a/mariadb-connector-c-3.1.4-src.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEcBAABCAAGBQJdd6B/AAoJEM4aPdXjyU9JFoAH/29ea24OfhsghrbZ5LOkrUcb -FnYWXwJchbdNv9xlN41184BTANN3vEGc/XpVW0HYM904NGLODqIIyZc5PN6bIHHj -6q7idAWTqfD8LdtUg7QDVo0R8m10zMYMu6kUMt9WmxBIKIxD0qKxbgXeSJPvdqUA -3FEBvd7SsQZpbddx7ZGPKWdL9FPsT+rKXYlYvvrPo7HTCwlpKLWuqoxku3dUka9X -OwOPW63X4fc6+JAxBqgfH1x3SexIjU9R2rmVV1HfaBWReFSq9wItcuECIq8He9b/ -ghB0RMK/WDeAp43dBCZywOOrm5P/Kje02XmbM0nAbbeLY1bkp2nJ2jnfDOxqv0U= -=jbKq ------END PGP SIGNATURE----- diff --git a/mariadb-connector-c-3.1.5-src.tar.gz b/mariadb-connector-c-3.1.5-src.tar.gz new file mode 100644 index 0000000..234ea67 --- /dev/null +++ b/mariadb-connector-c-3.1.5-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9de5fedd1a7805c86e23be49b9ceb79a86b090ad560d51495d7ba5952a9d9d5 +size 739192 diff --git a/mariadb-connector-c-3.1.5-src.tar.gz.asc b/mariadb-connector-c-3.1.5-src.tar.gz.asc new file mode 100644 index 0000000..59ab29d --- /dev/null +++ b/mariadb-connector-c-3.1.5-src.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAABCAAGBQJdxcf4AAoJEM4aPdXjyU9JwJQH/RDWKSJ8GZW7Jue9+40rHbZu +sKLlr8KPXYUXg9VW+gDGcrX/e9DIAUpK+QGv4TJ6L0Ytdij2QmqhUb32EW0CQvaE +zZ94tyXmApHASPzApGfNGgOHcQTEx6wHSXky3r/0VNZHFQDIwe6b0dqLBC3svPJR +Da/HdoIENCCZWDGvTL/RQFTJFMuEL9Nrv2ZN43aeB3IWL+7zLgaeSIuH+4FLYQ7i +q60BRw0x+hTDugOQci751rmASTaQ2xdH2RAfGvhRO0NikqQCgj6hkeLT6OSnIVA8 +yEUuPkSyjMz+rqxORV2G+WezYVU4boR/MzXkcSrF08KKuBBGdcys6X1Oxfxxsqc= +=/+fl +-----END PGP SIGNATURE----- diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index 2541c43..fefbd4b 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Nov 28 16:06:53 UTC 2019 - Kristyna Streitova + +- New upstream version 3.1.5 [bsc#1156669] + * MDEV-20469: Plugin dialog could not be loaded (wrong path) + * ODBC-440: Fixed typo in sha256_password cmake configuration + * CONC-418: For unknown/not handled schannel error codes + FormatMessage function will be used instead of returning + "Unknown error" message. + ------------------------------------------------------------------- Tue Sep 24 10:59:32 UTC 2019 - Kristyna Streitova diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index a2be7b4..53b9e80 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -19,13 +19,13 @@ %define sover 3 %define libname libmariadb # equivalent mariadb version -%define mariadb_version 10.3.17 +%define mariadb_version 10.3.20 %if ! %{defined _rundir} %define _rundir %{_localstatedir}/run %endif %bcond_with sqlite3 Name: mariadb-connector-c -Version: 3.1.4 +Version: 3.1.5 Release: 0 Summary: MariaDB connector in C License: LGPL-2.1-or-later From 3444a7727be39f641348b79d865ee06af70a477b75fa52fd7c21c7ec60c72246 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 1 Jan 2020 13:56:51 +0000 Subject: [PATCH 22/32] Accepting request 758454 from server:database OBS-URL: https://build.opensuse.org/request/show/758454 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=22 --- mariadb-connector-c-3.1.5-src.tar.gz | 3 --- mariadb-connector-c-3.1.5-src.tar.gz.asc | 11 ----------- mariadb-connector-c-3.1.6-src.tar.gz | 3 +++ mariadb-connector-c-3.1.6-src.tar.gz.asc | 11 +++++++++++ mariadb-connector-c.changes | 10 ++++++++++ mariadb-connector-c.spec | 14 +++++++++----- 6 files changed, 33 insertions(+), 19 deletions(-) delete mode 100644 mariadb-connector-c-3.1.5-src.tar.gz delete mode 100644 mariadb-connector-c-3.1.5-src.tar.gz.asc create mode 100644 mariadb-connector-c-3.1.6-src.tar.gz create mode 100644 mariadb-connector-c-3.1.6-src.tar.gz.asc diff --git a/mariadb-connector-c-3.1.5-src.tar.gz b/mariadb-connector-c-3.1.5-src.tar.gz deleted file mode 100644 index 234ea67..0000000 --- a/mariadb-connector-c-3.1.5-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a9de5fedd1a7805c86e23be49b9ceb79a86b090ad560d51495d7ba5952a9d9d5 -size 739192 diff --git a/mariadb-connector-c-3.1.5-src.tar.gz.asc b/mariadb-connector-c-3.1.5-src.tar.gz.asc deleted file mode 100644 index 59ab29d..0000000 --- a/mariadb-connector-c-3.1.5-src.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEcBAABCAAGBQJdxcf4AAoJEM4aPdXjyU9JwJQH/RDWKSJ8GZW7Jue9+40rHbZu -sKLlr8KPXYUXg9VW+gDGcrX/e9DIAUpK+QGv4TJ6L0Ytdij2QmqhUb32EW0CQvaE -zZ94tyXmApHASPzApGfNGgOHcQTEx6wHSXky3r/0VNZHFQDIwe6b0dqLBC3svPJR -Da/HdoIENCCZWDGvTL/RQFTJFMuEL9Nrv2ZN43aeB3IWL+7zLgaeSIuH+4FLYQ7i -q60BRw0x+hTDugOQci751rmASTaQ2xdH2RAfGvhRO0NikqQCgj6hkeLT6OSnIVA8 -yEUuPkSyjMz+rqxORV2G+WezYVU4boR/MzXkcSrF08KKuBBGdcys6X1Oxfxxsqc= -=/+fl ------END PGP SIGNATURE----- diff --git a/mariadb-connector-c-3.1.6-src.tar.gz b/mariadb-connector-c-3.1.6-src.tar.gz new file mode 100644 index 0000000..7b44f97 --- /dev/null +++ b/mariadb-connector-c-3.1.6-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d266bb67df83c088c4fb05392713d2504c67be620894cedaf758a9561c116720 +size 742858 diff --git a/mariadb-connector-c-3.1.6-src.tar.gz.asc b/mariadb-connector-c-3.1.6-src.tar.gz.asc new file mode 100644 index 0000000..e2b2f46 --- /dev/null +++ b/mariadb-connector-c-3.1.6-src.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAABCAAGBQJd8lhgAAoJEM4aPdXjyU9Jd/wH/1pPgI/UmZ24PlG/MTBQi8aW +agfClj1SqM+BX5MthfAYNVI0aj50cKhI1lHy9A1j3zGy1rKUMQFCKC2KP1LnpApF +ZEK6z2vqil/z3FLGySzMX5lgxpuNuYOD7xUgWHK8MDX3qwAIYL7ywdOY/C8LFO+F +ruI/iquQXVPowoOSWqsfnFbDx2BZeuC3UQHbwlvYJqZaw7oVZojZFGJr3OXcgnJq +kKLzcNy6Z00ipX+1aI03uudKEktoZWxUKOdAInx9go2uJS3Umzzk8WE9G0CyGsg/ +7n0rtDGDXqjdpsHDgG4vt3J74IM8eNAxulZUuD/ceSG9ihh7oxNeBmkjI2dVaiw= +=zO3a +-----END PGP SIGNATURE----- diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index fefbd4b..64074b1 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Dec 20 00:13:52 UTC 2019 - Jan Engelhardt + +- Update to release 3.1.6 + * Fixed: ERROR 2026 (HY000): SSL connection error: Certificate + signature check failed + * Fixed: Provide error code and message for Schannel errors + * Fixed SEC_E_INVALID_TOKEN when server sends large message + during SSL handshake + ------------------------------------------------------------------- Thu Nov 28 16:06:53 UTC 2019 - Kristyna Streitova diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 53b9e80..5ae7d7d 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -1,7 +1,7 @@ # # spec file for package mariadb-connector-c # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,13 @@ %define sover 3 %define libname libmariadb # equivalent mariadb version -%define mariadb_version 10.3.20 +%define mariadb_version 10.3.21 %if ! %{defined _rundir} %define _rundir %{_localstatedir}/run %endif %bcond_with sqlite3 Name: mariadb-connector-c -Version: 3.1.5 +Version: 3.1.6 Release: 0 Summary: MariaDB connector in C License: LGPL-2.1-or-later @@ -51,7 +51,9 @@ BuildRequires: pkgconfig(sqlite3) %description MariaDB Connector is used to connect applications developed in -C or C++ to MariaDB and MySQL databases. +C or C++ to MariaDB and MySQL databases. This is a different +implementation from the traditional libmariadbclient/libmysqlclient +that is shipped with mariadb-server/mysql-server, but the API is the same. %package -n %{libname}%{sover} Summary: MariaDB connector in C @@ -59,7 +61,9 @@ Group: System/Libraries %description -n %{libname}%{sover} MariaDB Connector is used to connect applications developed in -C or C++ to MariaDB and MySQL databases. +C or C++ to MariaDB and MySQL databases. This is a different +implementation from the traditional libmariadbclient/libmysqlclient +that is shipped with mariadb-server/mysql-server, but the API is the same. This package holds the runtime components. From fce2a86971dafd7a5e6a2ca400b001b7b388e367a64bab7fab9cc068732ef594 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 15 Feb 2020 21:23:12 +0000 Subject: [PATCH 23/32] Accepting request 770773 from server:database OBS-URL: https://build.opensuse.org/request/show/770773 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=23 --- mariadb-connector-c-3.1.6-src.tar.gz | 3 --- mariadb-connector-c-3.1.6-src.tar.gz.asc | 11 ----------- mariadb-connector-c-3.1.7-src.tar.gz | 3 +++ mariadb-connector-c-3.1.7-src.tar.gz.asc | 11 +++++++++++ mariadb-connector-c.changes | 8 ++++++++ mariadb-connector-c.spec | 4 ++-- 6 files changed, 24 insertions(+), 16 deletions(-) delete mode 100644 mariadb-connector-c-3.1.6-src.tar.gz delete mode 100644 mariadb-connector-c-3.1.6-src.tar.gz.asc create mode 100644 mariadb-connector-c-3.1.7-src.tar.gz create mode 100644 mariadb-connector-c-3.1.7-src.tar.gz.asc diff --git a/mariadb-connector-c-3.1.6-src.tar.gz b/mariadb-connector-c-3.1.6-src.tar.gz deleted file mode 100644 index 7b44f97..0000000 --- a/mariadb-connector-c-3.1.6-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d266bb67df83c088c4fb05392713d2504c67be620894cedaf758a9561c116720 -size 742858 diff --git a/mariadb-connector-c-3.1.6-src.tar.gz.asc b/mariadb-connector-c-3.1.6-src.tar.gz.asc deleted file mode 100644 index e2b2f46..0000000 --- a/mariadb-connector-c-3.1.6-src.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEcBAABCAAGBQJd8lhgAAoJEM4aPdXjyU9Jd/wH/1pPgI/UmZ24PlG/MTBQi8aW -agfClj1SqM+BX5MthfAYNVI0aj50cKhI1lHy9A1j3zGy1rKUMQFCKC2KP1LnpApF -ZEK6z2vqil/z3FLGySzMX5lgxpuNuYOD7xUgWHK8MDX3qwAIYL7ywdOY/C8LFO+F -ruI/iquQXVPowoOSWqsfnFbDx2BZeuC3UQHbwlvYJqZaw7oVZojZFGJr3OXcgnJq -kKLzcNy6Z00ipX+1aI03uudKEktoZWxUKOdAInx9go2uJS3Umzzk8WE9G0CyGsg/ -7n0rtDGDXqjdpsHDgG4vt3J74IM8eNAxulZUuD/ceSG9ihh7oxNeBmkjI2dVaiw= -=zO3a ------END PGP SIGNATURE----- diff --git a/mariadb-connector-c-3.1.7-src.tar.gz b/mariadb-connector-c-3.1.7-src.tar.gz new file mode 100644 index 0000000..c695d63 --- /dev/null +++ b/mariadb-connector-c-3.1.7-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64f7bc8f5df3200ba6e3080f68ee4942382a33e8371baea8ca4b9242746df59a +size 742923 diff --git a/mariadb-connector-c-3.1.7-src.tar.gz.asc b/mariadb-connector-c-3.1.7-src.tar.gz.asc new file mode 100644 index 0000000..9f7a655 --- /dev/null +++ b/mariadb-connector-c-3.1.7-src.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAABCAAGBQJeMaEDAAoJEM4aPdXjyU9JzUgIAONDecQgdFhNnfi0TF5gvoYO +2z8GSrw6hT3sXr7eQT33UpIqb4Qc3H0gLTIYbBYcFC8qbwtfvhO3ROoTiQRDWeA9 +rQiaFg6pojMWyRsdmcBpo8SatnE9R6rk7sVDzEemmkPWN9xmggUQRHbsbMLtK1D4 +EY9eQ2k2oD4rTm699IjYYoZICTWuVqxPQTnNLyWdvlHgJPOnV9n+wr5SEPLAMj0T +ETrVX5usnzZPcJ9yKX196rNSdGYzPq3MPW6JiKpTTXlNbqFcrb+yzrlxluuqNXuV +X2z5O5gayi7Nn28dK4pSMWJnga4N64+AI13mf1zIArLpIV0lqJPXm7h4Kc+yuXM= +=urB6 +-----END PGP SIGNATURE----- diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index 64074b1..51c9659 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Feb 6 20:30:28 UTC 2020 - Kristyna Streitova + +- Update to release 3.1.7 + * TLS/SSL: when the client doesn't procide a CA file and the + option ssl_verify_server_cert was set, the peer cerificate + will be validated against the system CA. + ------------------------------------------------------------------- Fri Dec 20 00:13:52 UTC 2019 - Jan Engelhardt diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 5ae7d7d..9ade9cd 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -1,7 +1,7 @@ # # spec file for package mariadb-connector-c # -# Copyright (c) 2019 SUSE LLC +# 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 @@ -25,7 +25,7 @@ %endif %bcond_with sqlite3 Name: mariadb-connector-c -Version: 3.1.6 +Version: 3.1.7 Release: 0 Summary: MariaDB connector in C License: LGPL-2.1-or-later From 0a961d018e2c7f62360490a6f7bfcf1d81dc8b28848172bedd379911a2a7211a Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 3 Jun 2020 18:30:25 +0000 Subject: [PATCH 24/32] Accepting request 808309 from server:database OBS-URL: https://build.opensuse.org/request/show/808309 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=24 --- absolute_path_fix.patch | 16 +++++------ mariadb-connector-c-3.1.7-src.tar.gz | 3 --- mariadb-connector-c-3.1.7-src.tar.gz.asc | 11 -------- mariadb-connector-c-3.1.8-src.tar.gz | 3 +++ mariadb-connector-c-3.1.8-src.tar.gz.asc | 11 ++++++++ mariadb-connector-c.changes | 17 ++++++++++++ mariadb-connector-c.spec | 2 +- private_library.patch | 34 ++++++++++++------------ 8 files changed, 57 insertions(+), 40 deletions(-) delete mode 100644 mariadb-connector-c-3.1.7-src.tar.gz delete mode 100644 mariadb-connector-c-3.1.7-src.tar.gz.asc create mode 100644 mariadb-connector-c-3.1.8-src.tar.gz create mode 100644 mariadb-connector-c-3.1.8-src.tar.gz.asc diff --git a/absolute_path_fix.patch b/absolute_path_fix.patch index 7c851a7..40f020d 100644 --- a/absolute_path_fix.patch +++ b/absolute_path_fix.patch @@ -2,16 +2,16 @@ Author: Adam Majer Date: Fri Mar 3 15:59:09 CET 2017 Summary: Remove pure ugliness with paths -Index: mariadb-connector-c-3.1.3-src/mariadb_config/mariadb_config.c.in +Index: mariadb-connector-c-3.1.8-src/mariadb_config/mariadb_config.c.in =================================================================== ---- mariadb-connector-c-3.1.3-src.orig/mariadb_config/mariadb_config.c.in -+++ mariadb-connector-c-3.1.3-src/mariadb_config/mariadb_config.c.in +--- mariadb-connector-c-3.1.8-src.orig/mariadb_config/mariadb_config.c.in ++++ mariadb-connector-c-3.1.8-src/mariadb_config/mariadb_config.c.in @@ -5,13 +5,13 @@ static char *mariadb_progname; --#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql" --#define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb" +-#define INCLUDE "-I@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql" +-#define LIBS "-L@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb" +#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb" +#define LIBS "-L@INSTALL_LIBDIR@ -lmariadb" #define LIBS_SYS "@extra_dynamic_LDFLAGS@" @@ -23,10 +23,10 @@ Index: mariadb-connector-c-3.1.3-src/mariadb_config/mariadb_config.c.in #define SOCKET "@MARIADB_UNIX_ADDR@" #define PORT "@MARIADB_PORT@" #define TLS_LIBRARY_VERSION "@TLS_LIBRARY_VERSION@" -Index: mariadb-connector-c-3.1.3-src/mariadb_config/libmariadb.pc.in +Index: mariadb-connector-c-3.1.8-src/mariadb_config/libmariadb.pc.in =================================================================== ---- mariadb-connector-c-3.1.3-src.orig/mariadb_config/libmariadb.pc.in -+++ mariadb-connector-c-3.1.3-src/mariadb_config/libmariadb.pc.in +--- mariadb-connector-c-3.1.8-src.orig/mariadb_config/libmariadb.pc.in ++++ mariadb-connector-c-3.1.8-src/mariadb_config/libmariadb.pc.in @@ -7,8 +7,8 @@ # diff --git a/mariadb-connector-c-3.1.7-src.tar.gz b/mariadb-connector-c-3.1.7-src.tar.gz deleted file mode 100644 index c695d63..0000000 --- a/mariadb-connector-c-3.1.7-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64f7bc8f5df3200ba6e3080f68ee4942382a33e8371baea8ca4b9242746df59a -size 742923 diff --git a/mariadb-connector-c-3.1.7-src.tar.gz.asc b/mariadb-connector-c-3.1.7-src.tar.gz.asc deleted file mode 100644 index 9f7a655..0000000 --- a/mariadb-connector-c-3.1.7-src.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEcBAABCAAGBQJeMaEDAAoJEM4aPdXjyU9JzUgIAONDecQgdFhNnfi0TF5gvoYO -2z8GSrw6hT3sXr7eQT33UpIqb4Qc3H0gLTIYbBYcFC8qbwtfvhO3ROoTiQRDWeA9 -rQiaFg6pojMWyRsdmcBpo8SatnE9R6rk7sVDzEemmkPWN9xmggUQRHbsbMLtK1D4 -EY9eQ2k2oD4rTm699IjYYoZICTWuVqxPQTnNLyWdvlHgJPOnV9n+wr5SEPLAMj0T -ETrVX5usnzZPcJ9yKX196rNSdGYzPq3MPW6JiKpTTXlNbqFcrb+yzrlxluuqNXuV -X2z5O5gayi7Nn28dK4pSMWJnga4N64+AI13mf1zIArLpIV0lqJPXm7h4Kc+yuXM= -=urB6 ------END PGP SIGNATURE----- diff --git a/mariadb-connector-c-3.1.8-src.tar.gz b/mariadb-connector-c-3.1.8-src.tar.gz new file mode 100644 index 0000000..a305c58 --- /dev/null +++ b/mariadb-connector-c-3.1.8-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b +size 744745 diff --git a/mariadb-connector-c-3.1.8-src.tar.gz.asc b/mariadb-connector-c-3.1.8-src.tar.gz.asc new file mode 100644 index 0000000..413887c --- /dev/null +++ b/mariadb-connector-c-3.1.8-src.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAABCAAGBQJevFK0AAoJEM4aPdXjyU9JDxwIAL6cDHSoPcnc9OcSF8HrriMz +cb4qwabGFnzpPl8ieXtr+8B1KYt/etsJqHZhCPoaKMvLboTKlN68vHX9O6Clii9i +4C8p02trGgbtJ3Pl+e4rBTX2bHIJXXCha9orbcHYUaNXMTc5tw84kgmvLRNUyf4o +kBkGghq4WZ5vulinkidSn47DM0BeGQ0QqM/EaGSDoQjtPR/7U0XtptLDKZ4mACAb +mvRMBRXiOJk4CfVrmmiyKKjo86IG5iiFqQotu+/f/BxGDr2p9/1HAiQv7oyQ8GLY +o5qDdf37RxHMkcqfmYszp4cQuJlW2yDZLK8SnctMIUbj71ruOFNKf1g+23uR30c= +=L+bO +-----END PGP SIGNATURE----- diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index 51c9659..f93de53 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Fri May 22 15:05:07 UTC 2020 - Kristyna Streitova + +- Update to release 3.1.8 [bsc#1171550] + * CONC-304: Rename the static library to libmariadb.a and other + libmariadb files in a consistent manner + * CONC-441: Default user name for C/C is wrong if login user + is different from effective user + * CONC-449: Check $MARIADB_HOME/my.cnf in addition to + $MYSQL_HOME/my.cnf + * CONC-457: mysql_list_processes crashes in unpack_fields + * CONC-458: mysql_get_timeout_value crashes when used improperly + * CONC-464: Fix static build for auth_gssapi_client plugin + * Fixes for the following security vulnerabilities: + CVE-2020-13249 +- refresh absolute_path_fix.patch and private_library.patch + ------------------------------------------------------------------- Thu Feb 6 20:30:28 UTC 2020 - Kristyna Streitova diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 9ade9cd..8adfdd3 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -25,7 +25,7 @@ %endif %bcond_with sqlite3 Name: mariadb-connector-c -Version: 3.1.7 +Version: 3.1.8 Release: 0 Summary: MariaDB connector in C License: LGPL-2.1-or-later diff --git a/private_library.patch b/private_library.patch index 3b860f3..2163ec3 100644 --- a/private_library.patch +++ b/private_library.patch @@ -8,11 +8,11 @@ static linking, create a private shared library that simply exports all symbols. With the exception of exported symbols, it is identical to the regular library. -Index: mariadb-connector-c-3.1.4-src/libmariadb/CMakeLists.txt +Index: mariadb-connector-c-3.1.8-src/libmariadb/CMakeLists.txt =================================================================== ---- mariadb-connector-c-3.1.4-src.orig/libmariadb/CMakeLists.txt -+++ mariadb-connector-c-3.1.4-src/libmariadb/CMakeLists.txt -@@ -410,17 +410,25 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC) +--- mariadb-connector-c-3.1.8-src.orig/libmariadb/CMakeLists.txt ++++ mariadb-connector-c-3.1.8-src/libmariadb/CMakeLists.txt +@@ -411,17 +411,25 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC) SET_TARGET_PROPERTIES(mariadbclient PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64") ENDIF() @@ -25,7 +25,7 @@ Index: mariadb-connector-c-3.1.4-src/libmariadb/CMakeLists.txt IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "GNU") IF (NOT WITH_ASAN AND NOT WITH_TSAN AND NOT WITH_UBSAN AND NOT WITH_MSAN) - TARGET_LINK_LIBRARIES (libmariadb "-Wl,--no-undefined") + TARGET_LINK_LIBRARIES (libmariadb LINK_PRIVATE "-Wl,--no-undefined") ENDIF() SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINK_FLAGS "${CC_BINARY_DIR}/libmariadb/mariadbclient.def") + SET_TARGET_PROPERTIES(libmariadbprivate PROPERTIES LINK_FLAGS "-Wl,--no-undefined") @@ -38,7 +38,7 @@ Index: mariadb-connector-c-3.1.4-src/libmariadb/CMakeLists.txt SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "") # -@@ -454,7 +462,9 @@ INSTALL(TARGETS mariadbclient +@@ -455,7 +463,9 @@ INSTALL(TARGETS mariadbclient INSTALL(TARGETS libmariadb COMPONENT SharedLibraries DESTINATION ${INSTALL_LIBDIR}) @@ -47,12 +47,12 @@ Index: mariadb-connector-c-3.1.4-src/libmariadb/CMakeLists.txt + COMPONENT SharedLibraries + DESTINATION ${INSTALL_LIBDIR}) - IF(WIN32) + IF(MSVC) # On Windows, install PDB -Index: mariadb-connector-c-3.1.4-src/mariadb_config/mariadb_config.c.in +Index: mariadb-connector-c-3.1.8-src/mariadb_config/mariadb_config.c.in =================================================================== ---- mariadb-connector-c-3.1.4-src.orig/mariadb_config/mariadb_config.c.in -+++ mariadb-connector-c-3.1.4-src/mariadb_config/mariadb_config.c.in +--- mariadb-connector-c-3.1.8-src.orig/mariadb_config/mariadb_config.c.in ++++ mariadb-connector-c-3.1.8-src/mariadb_config/mariadb_config.c.in @@ -7,6 +7,8 @@ static char *mariadb_progname; #define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb" @@ -62,15 +62,15 @@ Index: mariadb-connector-c-3.1.4-src/mariadb_config/mariadb_config.c.in #define LIBS_SYS "@extra_dynamic_LDFLAGS@" #define CFLAGS INCLUDE #define VERSION "@MARIADB_CLIENT_VERSION@" -@@ -30,6 +32,7 @@ static struct option long_options[]= - {"port", no_argument, 0, 'i'}, - {"plugindir", no_argument, 0, 'j'}, - {"tlsinfo", no_argument, 0, 'k'}, -+ {"privatelibs", no_argument, 0, 'm'}, +@@ -35,6 +37,7 @@ static struct option long_options[]= + {OPT_STRING_TYPE "port", no_argument, 0, 'i'}, + {OPT_STRING_TYPE "plugindir", no_argument, 0, 'j'}, + {OPT_STRING_TYPE "tlsinfo", no_argument, 0, 'k'}, ++ {OPT_STRING_TYPE "privatelibs", no_argument, 0, 'm'}, {NULL, 0, 0, 0} }; -@@ -45,6 +48,7 @@ static const char *values[]= +@@ -50,6 +53,7 @@ static const char *values[]= CC_VERSION, SOCKET, PORT, @@ -78,7 +78,7 @@ Index: mariadb-connector-c-3.1.4-src/mariadb_config/mariadb_config.c.in PLUGIN_DIR, TLS_LIBRARY_VERSION }; -@@ -115,6 +119,9 @@ int main(int argc, char **argv) +@@ -120,6 +124,9 @@ int main(int argc, char **argv) case 'l': puts(LIBS_SYS); break; From 177de9496a7cc31133641f11e1d7fdcfc3c2593aa37b9114d677431e62f9dfba Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 9 Jul 2020 15:49:01 +0000 Subject: [PATCH 25/32] Accepting request 818996 from server:database OBS-URL: https://build.opensuse.org/request/show/818996 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=25 --- mariadb-connector-c-3.1.8-src.tar.gz | 3 --- mariadb-connector-c-3.1.8-src.tar.gz.asc | 11 ----------- mariadb-connector-c-3.1.9-src.tar.gz | 3 +++ mariadb-connector-c-3.1.9-src.tar.gz.asc | 11 +++++++++++ mariadb-connector-c.changes | 10 ++++++++++ mariadb-connector-c.spec | 2 +- private_library.patch | 19 ++++++++++--------- 7 files changed, 35 insertions(+), 24 deletions(-) delete mode 100644 mariadb-connector-c-3.1.8-src.tar.gz delete mode 100644 mariadb-connector-c-3.1.8-src.tar.gz.asc create mode 100644 mariadb-connector-c-3.1.9-src.tar.gz create mode 100644 mariadb-connector-c-3.1.9-src.tar.gz.asc diff --git a/mariadb-connector-c-3.1.8-src.tar.gz b/mariadb-connector-c-3.1.8-src.tar.gz deleted file mode 100644 index a305c58..0000000 --- a/mariadb-connector-c-3.1.8-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b -size 744745 diff --git a/mariadb-connector-c-3.1.8-src.tar.gz.asc b/mariadb-connector-c-3.1.8-src.tar.gz.asc deleted file mode 100644 index 413887c..0000000 --- a/mariadb-connector-c-3.1.8-src.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEcBAABCAAGBQJevFK0AAoJEM4aPdXjyU9JDxwIAL6cDHSoPcnc9OcSF8HrriMz -cb4qwabGFnzpPl8ieXtr+8B1KYt/etsJqHZhCPoaKMvLboTKlN68vHX9O6Clii9i -4C8p02trGgbtJ3Pl+e4rBTX2bHIJXXCha9orbcHYUaNXMTc5tw84kgmvLRNUyf4o -kBkGghq4WZ5vulinkidSn47DM0BeGQ0QqM/EaGSDoQjtPR/7U0XtptLDKZ4mACAb -mvRMBRXiOJk4CfVrmmiyKKjo86IG5iiFqQotu+/f/BxGDr2p9/1HAiQv7oyQ8GLY -o5qDdf37RxHMkcqfmYszp4cQuJlW2yDZLK8SnctMIUbj71ruOFNKf1g+23uR30c= -=L+bO ------END PGP SIGNATURE----- diff --git a/mariadb-connector-c-3.1.9-src.tar.gz b/mariadb-connector-c-3.1.9-src.tar.gz new file mode 100644 index 0000000..3035827 --- /dev/null +++ b/mariadb-connector-c-3.1.9-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:108d99bf2add434dcb3bd9526ba1d89a2b9a943b62dcd9d0a41fcbef8ffbf2c7 +size 745374 diff --git a/mariadb-connector-c-3.1.9-src.tar.gz.asc b/mariadb-connector-c-3.1.9-src.tar.gz.asc new file mode 100644 index 0000000..d9a70f3 --- /dev/null +++ b/mariadb-connector-c-3.1.9-src.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAABCAAGBQJe68dpAAoJEM4aPdXjyU9JYQIH/i3dCQNfvH1LXAlXuI9OcoSj +4xAvzTa1MAFU7IBjlMV4E57Z7t5fnX8MToDNUrhjacrmKPAxLKCe19a4+1XPz+f9 +7lViRUZzn5FjuBsYt14pLJ6cvCsqvBoeWH6N+W+Qj1Xk/54465BTKBElGzSLTeOy +WxtKy+zwQr6EbaA/AlgziCuU/wJw2+aTIka/APFKZXiD4l06rbVYj+YguCajzb/7 +yyS7+CQiO1v7ro1Xtk5DibE3YyXbTh0mciY2LOwLzIoofZlhOvgWwJpL9kEyMqzr +8nHzXgH54HK4CQnpaeI8JalKgBM/YXUyIYaInBeiawc+bsVbx8TKAxkx87YF2ok= +=jO6v +-----END PGP SIGNATURE----- diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index f93de53..7f97b14 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Jul 3 11:57:03 UTC 2020 - Kristyna Streitova + +- Update to release 3.1.9 + * CONC-469: Use servers preferred authentication method unless + another plugin was specified. + * Added support for kFreeBSD builds + * Fixed memory leak in GnuTLS if connection couldn't be established. +- refresh private_library.patch + ------------------------------------------------------------------- Fri May 22 15:05:07 UTC 2020 - Kristyna Streitova diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 8adfdd3..4b443af 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -25,7 +25,7 @@ %endif %bcond_with sqlite3 Name: mariadb-connector-c -Version: 3.1.8 +Version: 3.1.9 Release: 0 Summary: MariaDB connector in C License: LGPL-2.1-or-later diff --git a/private_library.patch b/private_library.patch index 2163ec3..d8bec49 100644 --- a/private_library.patch +++ b/private_library.patch @@ -8,11 +8,11 @@ static linking, create a private shared library that simply exports all symbols. With the exception of exported symbols, it is identical to the regular library. -Index: mariadb-connector-c-3.1.8-src/libmariadb/CMakeLists.txt +Index: mariadb-connector-c-3.1.9-src/libmariadb/CMakeLists.txt =================================================================== ---- mariadb-connector-c-3.1.8-src.orig/libmariadb/CMakeLists.txt -+++ mariadb-connector-c-3.1.8-src/libmariadb/CMakeLists.txt -@@ -411,17 +411,25 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC) +--- mariadb-connector-c-3.1.9-src.orig/libmariadb/CMakeLists.txt ++++ mariadb-connector-c-3.1.9-src/libmariadb/CMakeLists.txt +@@ -411,6 +411,12 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC) SET_TARGET_PROPERTIES(mariadbclient PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64") ENDIF() @@ -23,8 +23,9 @@ Index: mariadb-connector-c-3.1.8-src/libmariadb/CMakeLists.txt +ENDIF() + IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR + CMAKE_SYSTEM_NAME MATCHES "kFreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "GNU") - IF (NOT WITH_ASAN AND NOT WITH_TSAN AND NOT WITH_UBSAN AND NOT WITH_MSAN) +@@ -418,11 +424,13 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR TARGET_LINK_LIBRARIES (libmariadb LINK_PRIVATE "-Wl,--no-undefined") ENDIF() SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINK_FLAGS "${CC_BINARY_DIR}/libmariadb/mariadbclient.def") @@ -38,7 +39,7 @@ Index: mariadb-connector-c-3.1.8-src/libmariadb/CMakeLists.txt SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "") # -@@ -455,7 +463,9 @@ INSTALL(TARGETS mariadbclient +@@ -456,7 +464,9 @@ INSTALL(TARGETS mariadbclient INSTALL(TARGETS libmariadb COMPONENT SharedLibraries DESTINATION ${INSTALL_LIBDIR}) @@ -49,10 +50,10 @@ Index: mariadb-connector-c-3.1.8-src/libmariadb/CMakeLists.txt IF(MSVC) # On Windows, install PDB -Index: mariadb-connector-c-3.1.8-src/mariadb_config/mariadb_config.c.in +Index: mariadb-connector-c-3.1.9-src/mariadb_config/mariadb_config.c.in =================================================================== ---- mariadb-connector-c-3.1.8-src.orig/mariadb_config/mariadb_config.c.in -+++ mariadb-connector-c-3.1.8-src/mariadb_config/mariadb_config.c.in +--- mariadb-connector-c-3.1.9-src.orig/mariadb_config/mariadb_config.c.in ++++ mariadb-connector-c-3.1.9-src/mariadb_config/mariadb_config.c.in @@ -7,6 +7,8 @@ static char *mariadb_progname; #define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb" From 130cfed17630bfc8e3d3bacb8c789eebe968360b8d8823764197e3adb9d0a8e9 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 9 Nov 2020 12:57:13 +0000 Subject: [PATCH 26/32] Accepting request 846503 from server:database - Update to release 3.1.11: * CONC-513: MSAN use-of-uninitialized-value in strstr() * CONC-512: truncation check for float values fails on i386 due * to Intel FPU optimization bug in gcc * CONC-510: Fix crash when loading plugins in mysql_server_init() * CONC-508: Added support for passwords > 255 characters * CONC-507: Fixed race condition in ma_net_init * CONC-501: Added support for TLS v1.3 cipher suites * MDEV-21612: Removed unused command COM_MULTI - changes in release 3.1.10: * CONC-500: Fixed error when loading intermediate chained certificates * MDEV-18818: Fixed wrong zlib in mariadb_config when building inside server package * CONC-498: MYSQL_UNIX_ADDR and MYSQL_PORT are now defined * Added new build option WIITH_ICONV=ON/OFF. When set to OFF (default) API function mariadb_convert_string will always return -1 and sets errorcode to ENOTSUP. * mariadb_config now tries to determine the path of execution or uses MARIADB_CONFIG environment variable before falling back and using CMAKE_INSTALL_PREFIX for location of libraries and include files * added --variables option for mariadb_config. Supported values are pkgincludedir, pkglibdir and pkgplugindir. - absolute_path_fix.patch, private_library.patch: refreshed OBS-URL: https://build.opensuse.org/request/show/846503 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=26 --- absolute_path_fix.patch | 40 ++++++++---------- mariadb-connector-c-3.1.11-src.tar.gz | 3 ++ mariadb-connector-c-3.1.11-src.tar.gz.asc | 11 +++++ mariadb-connector-c-3.1.9-src.tar.gz | 3 -- mariadb-connector-c-3.1.9-src.tar.gz.asc | 11 ----- mariadb-connector-c.changes | 29 ++++++++++++++ mariadb-connector-c.spec | 11 ++++- private_library.patch | 49 +++++++++++------------ 8 files changed, 92 insertions(+), 65 deletions(-) create mode 100644 mariadb-connector-c-3.1.11-src.tar.gz create mode 100644 mariadb-connector-c-3.1.11-src.tar.gz.asc delete mode 100644 mariadb-connector-c-3.1.9-src.tar.gz delete mode 100644 mariadb-connector-c-3.1.9-src.tar.gz.asc diff --git a/absolute_path_fix.patch b/absolute_path_fix.patch index 40f020d..5ae92af 100644 --- a/absolute_path_fix.patch +++ b/absolute_path_fix.patch @@ -2,31 +2,10 @@ Author: Adam Majer Date: Fri Mar 3 15:59:09 CET 2017 Summary: Remove pure ugliness with paths -Index: mariadb-connector-c-3.1.8-src/mariadb_config/mariadb_config.c.in +Index: mariadb-connector-c-3.1.11-src/mariadb_config/libmariadb.pc.in =================================================================== ---- mariadb-connector-c-3.1.8-src.orig/mariadb_config/mariadb_config.c.in -+++ mariadb-connector-c-3.1.8-src/mariadb_config/mariadb_config.c.in -@@ -5,13 +5,13 @@ - - static char *mariadb_progname; - --#define INCLUDE "-I@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql" --#define LIBS "-L@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb" -+#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb" -+#define LIBS "-L@INSTALL_LIBDIR@ -lmariadb" - #define LIBS_SYS "@extra_dynamic_LDFLAGS@" - #define CFLAGS INCLUDE - #define VERSION "@MARIADB_CLIENT_VERSION@" - #define CC_VERSION "@CPACK_PACKAGE_VERSION@" --#define PLUGIN_DIR "@CMAKE_INSTALL_PREFIX@/@INSTALL_PLUGINDIR@" -+#define PLUGIN_DIR "@INSTALL_PLUGINDIR@" - #define SOCKET "@MARIADB_UNIX_ADDR@" - #define PORT "@MARIADB_PORT@" - #define TLS_LIBRARY_VERSION "@TLS_LIBRARY_VERSION@" -Index: mariadb-connector-c-3.1.8-src/mariadb_config/libmariadb.pc.in -=================================================================== ---- mariadb-connector-c-3.1.8-src.orig/mariadb_config/libmariadb.pc.in -+++ mariadb-connector-c-3.1.8-src/mariadb_config/libmariadb.pc.in +--- mariadb-connector-c-3.1.11-src.orig/mariadb_config/libmariadb.pc.in ++++ mariadb-connector-c-3.1.11-src/mariadb_config/libmariadb.pc.in @@ -7,8 +7,8 @@ # @@ -38,3 +17,16 @@ Index: mariadb-connector-c-3.1.8-src/mariadb_config/libmariadb.pc.in Name: libmariadb Version: @CPACK_PACKAGE_VERSION@ +Index: mariadb-connector-c-3.1.11-src/mariadb_config/mariadb_config.c.in +=================================================================== +--- mariadb-connector-c-3.1.11-src.orig/mariadb_config/mariadb_config.c.in ++++ mariadb-connector-c-3.1.11-src/mariadb_config/mariadb_config.c.in +@@ -210,7 +210,7 @@ end: + } + if (!p || !p[0]) + { +- strncpy(installation_dir, "@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@", PATH_MAX - 1); ++ installation_dir[0] = 0; + return; + } + } diff --git a/mariadb-connector-c-3.1.11-src.tar.gz b/mariadb-connector-c-3.1.11-src.tar.gz new file mode 100644 index 0000000..9f2a92c --- /dev/null +++ b/mariadb-connector-c-3.1.11-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e6f6c399493fe90efdc21a3fe70c30434b7480e8195642a959f1dd7a0fa5b0f +size 752342 diff --git a/mariadb-connector-c-3.1.11-src.tar.gz.asc b/mariadb-connector-c-3.1.11-src.tar.gz.asc new file mode 100644 index 0000000..eb839b0 --- /dev/null +++ b/mariadb-connector-c-3.1.11-src.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAABCAAGBQJfouChAAoJEM4aPdXjyU9JppkH/1U+Cq9AH/AGumPfcjrCdJ73 +jGicuX1uRcA5m1Yg1S8Up8bvspchH143WAPrJ/Z6aGn6ZpjwAfPKN/SWtNXoPR2u +F1QAH8Kt0IGJvtr9/0fBZO537htS85sx81d3lnwxTznIfD2+9N1PCgZVksr7IMUE +SbnO0ZkI82u/kOKgFdI7pt3m6VeaTxsADbEI+8JaUziRnf6EPw6SVLqQW5OkUgZ6 +eXCRYnV9RaXzSmE2PliKvDYjzueARDG7AwSdsyGbqXn+WhGTQj8jG77vJYI9mgYY +OJvA4wDdtsqikVRrNCC/5nxPFeEpr33mLsrTpaJKrYJiProbh/kSykTvc4T/ngI= +=UYxL +-----END PGP SIGNATURE----- diff --git a/mariadb-connector-c-3.1.9-src.tar.gz b/mariadb-connector-c-3.1.9-src.tar.gz deleted file mode 100644 index 3035827..0000000 --- a/mariadb-connector-c-3.1.9-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:108d99bf2add434dcb3bd9526ba1d89a2b9a943b62dcd9d0a41fcbef8ffbf2c7 -size 745374 diff --git a/mariadb-connector-c-3.1.9-src.tar.gz.asc b/mariadb-connector-c-3.1.9-src.tar.gz.asc deleted file mode 100644 index d9a70f3..0000000 --- a/mariadb-connector-c-3.1.9-src.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEcBAABCAAGBQJe68dpAAoJEM4aPdXjyU9JYQIH/i3dCQNfvH1LXAlXuI9OcoSj -4xAvzTa1MAFU7IBjlMV4E57Z7t5fnX8MToDNUrhjacrmKPAxLKCe19a4+1XPz+f9 -7lViRUZzn5FjuBsYt14pLJ6cvCsqvBoeWH6N+W+Qj1Xk/54465BTKBElGzSLTeOy -WxtKy+zwQr6EbaA/AlgziCuU/wJw2+aTIka/APFKZXiD4l06rbVYj+YguCajzb/7 -yyS7+CQiO1v7ro1Xtk5DibE3YyXbTh0mciY2LOwLzIoofZlhOvgWwJpL9kEyMqzr -8nHzXgH54HK4CQnpaeI8JalKgBM/YXUyIYaInBeiawc+bsVbx8TKAxkx87YF2ok= -=jO6v ------END PGP SIGNATURE----- diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index 7f97b14..6426c47 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Thu Nov 5 13:53:30 UTC 2020 - Adam Majer + +- Update to release 3.1.11: + * CONC-513: MSAN use-of-uninitialized-value in strstr() + * CONC-512: truncation check for float values fails on i386 due + * to Intel FPU optimization bug in gcc + * CONC-510: Fix crash when loading plugins in mysql_server_init() + * CONC-508: Added support for passwords > 255 characters + * CONC-507: Fixed race condition in ma_net_init + * CONC-501: Added support for TLS v1.3 cipher suites + * MDEV-21612: Removed unused command COM_MULTI + +- changes in release 3.1.10: + * CONC-500: Fixed error when loading intermediate chained certificates + * MDEV-18818: Fixed wrong zlib in mariadb_config when building + inside server package + * CONC-498: MYSQL_UNIX_ADDR and MYSQL_PORT are now defined + * Added new build option WIITH_ICONV=ON/OFF. When set to OFF (default) + API function mariadb_convert_string will always return -1 and + sets errorcode to ENOTSUP. + * mariadb_config now tries to determine the path of execution or + uses MARIADB_CONFIG environment variable before falling back and + using CMAKE_INSTALL_PREFIX for location of libraries and include files + * added --variables option for mariadb_config. + Supported values are pkgincludedir, pkglibdir and pkgplugindir. + +- absolute_path_fix.patch, private_library.patch: refreshed + ------------------------------------------------------------------- Fri Jul 3 11:57:03 UTC 2020 - Kristyna Streitova diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 4b443af..a68b549 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -25,7 +25,7 @@ %endif %bcond_with sqlite3 Name: mariadb-connector-c -Version: 3.1.9 +Version: 3.1.11 Release: 0 Summary: MariaDB connector in C License: LGPL-2.1-or-later @@ -117,6 +117,10 @@ This package holds the development files. %patch4 -p1 %build +# plugin types seems to require no aliasing assumptions +%define _lto_cflags %{nil} +export CFLAGS="%{optflags} -fno-strict-aliasing" + %cmake \ %if %{with sqlite3} -DWITH_SQLITE:BOOL=ON \ @@ -139,10 +143,12 @@ rm %{buildroot}%{_libdir}/libmariadbclient.a rm %{buildroot}%{_libdir}/libmysqlclient.a rm %{buildroot}%{_libdir}/libmysqlclient_r.a -# add a compatibility symlink +# add a compatibility symlinks ln -s mariadb_config %{buildroot}%{_bindir}/mysql_config ln -s mariadb_version.h %{buildroot}%{_includedir}/mysql/mysql_version.h +ln -s %{_includedir}/mysql %{buildroot}%{_includedir}/mariadb + # install some extra required header file install -Dpm 0644 build/include/ma_config.h \ %{buildroot}%{_includedir}/mysql/my_config.h @@ -176,6 +182,7 @@ install -Dpm 0644 build/include/ma_config.h \ %{_bindir}/mysql_config %dir %{_includedir}/mysql %{_includedir}/mysql/* +%{_includedir}/mariadb %{_libdir}/pkgconfig/libmariadb.pc %{_libdir}/libmariadb.so %{_libdir}/libmysqlclient.so diff --git a/private_library.patch b/private_library.patch index d8bec49..a15cd6c 100644 --- a/private_library.patch +++ b/private_library.patch @@ -8,11 +8,11 @@ static linking, create a private shared library that simply exports all symbols. With the exception of exported symbols, it is identical to the regular library. -Index: mariadb-connector-c-3.1.9-src/libmariadb/CMakeLists.txt +Index: mariadb-connector-c-3.1.11-src/libmariadb/CMakeLists.txt =================================================================== ---- mariadb-connector-c-3.1.9-src.orig/libmariadb/CMakeLists.txt -+++ mariadb-connector-c-3.1.9-src/libmariadb/CMakeLists.txt -@@ -411,6 +411,12 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC) +--- mariadb-connector-c-3.1.11-src.orig/libmariadb/CMakeLists.txt ++++ mariadb-connector-c-3.1.11-src/libmariadb/CMakeLists.txt +@@ -414,6 +414,12 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC) SET_TARGET_PROPERTIES(mariadbclient PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64") ENDIF() @@ -25,7 +25,7 @@ Index: mariadb-connector-c-3.1.9-src/libmariadb/CMakeLists.txt IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "kFreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "GNU") -@@ -418,11 +424,13 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR +@@ -421,11 +427,13 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR TARGET_LINK_LIBRARIES (libmariadb LINK_PRIVATE "-Wl,--no-undefined") ENDIF() SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINK_FLAGS "${CC_BINARY_DIR}/libmariadb/mariadbclient.def") @@ -39,7 +39,7 @@ Index: mariadb-connector-c-3.1.9-src/libmariadb/CMakeLists.txt SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "") # -@@ -456,7 +464,9 @@ INSTALL(TARGETS mariadbclient +@@ -461,7 +469,9 @@ INSTALL(TARGETS mariadbclient INSTALL(TARGETS libmariadb COMPONENT SharedLibraries DESTINATION ${INSTALL_LIBDIR}) @@ -50,40 +50,39 @@ Index: mariadb-connector-c-3.1.9-src/libmariadb/CMakeLists.txt IF(MSVC) # On Windows, install PDB -Index: mariadb-connector-c-3.1.9-src/mariadb_config/mariadb_config.c.in +Index: mariadb-connector-c-3.1.11-src/mariadb_config/mariadb_config.c.in =================================================================== ---- mariadb-connector-c-3.1.9-src.orig/mariadb_config/mariadb_config.c.in -+++ mariadb-connector-c-3.1.9-src/mariadb_config/mariadb_config.c.in -@@ -7,6 +7,8 @@ static char *mariadb_progname; - - #define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb" - #define LIBS "-L@INSTALL_LIBDIR@ -lmariadb" -+#define PRIVATE_LIBS "-L@INSTALL_LIBDIR@ -lmariadbprivate " \ -+ "@extra_dynamic_LDFLAGS@" +--- mariadb-connector-c-3.1.11-src.orig/mariadb_config/mariadb_config.c.in ++++ mariadb-connector-c-3.1.11-src/mariadb_config/mariadb_config.c.in +@@ -30,6 +30,7 @@ static char *mariadb_progname; + #define INCLUDE "-I%s/@INSTALL_INCLUDEDIR@ -I%s/@INSTALL_INCLUDEDIR@/mysql" + #define LIBS "-L%s/@INSTALL_LIBDIR@/ -lmariadb" #define LIBS_SYS "@extra_dynamic_LDFLAGS@" ++#define PRIVATE_LIBS "-L@INSTALL_LIBDIR@ -lmariadbprivate " LIBS_SYS #define CFLAGS INCLUDE #define VERSION "@MARIADB_CLIENT_VERSION@" -@@ -35,6 +37,7 @@ static struct option long_options[]= - {OPT_STRING_TYPE "port", no_argument, 0, 'i'}, + #define CC_VERSION "@CPACK_PACKAGE_VERSION@" +@@ -65,6 +66,7 @@ static struct option long_options[]= {OPT_STRING_TYPE "plugindir", no_argument, 0, 'j'}, {OPT_STRING_TYPE "tlsinfo", no_argument, 0, 'k'}, -+ {OPT_STRING_TYPE "privatelibs", no_argument, 0, 'm'}, + {OPT_STRING_TYPE "variable", 2, 0, 'm'}, ++ {OPT_STRING_TYPE "privatelibs", no_argument, 0, 'z'}, {NULL, 0, 0, 0} }; -@@ -50,6 +53,7 @@ static const char *values[]= +@@ -92,6 +94,7 @@ static const char *values[]= CC_VERSION, SOCKET, PORT, + PRIVATE_LIBS, PLUGIN_DIR, - TLS_LIBRARY_VERSION - }; -@@ -120,6 +124,9 @@ int main(int argc, char **argv) - case 'l': - puts(LIBS_SYS); + TLS_LIBRARY_VERSION, + "VAR VAR is one of:" +@@ -288,6 +291,9 @@ int main(int argc, char **argv) + } break; -+ case 'm': + } ++ case 'z': + puts(PRIVATE_LIBS); + break; default: From c5494e8ea2fc274c40e2a58ea03c55d36e65c4133ebc636216d86c2a07513b84 Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Tue, 16 Mar 2021 14:42:46 +0000 Subject: [PATCH 27/32] Accepting request 879103 from server:database OBS-URL: https://build.opensuse.org/request/show/879103 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=27 --- mariadb-connector-c-3.1.11-src.tar.gz | 3 --- mariadb-connector-c-3.1.11-src.tar.gz.asc | 11 ----------- mariadb-connector-c-3.1.12-src.tar.gz | 3 +++ mariadb-connector-c-3.1.12-src.tar.gz.asc | 11 +++++++++++ mariadb-connector-c.changes | 11 +++++++++++ mariadb-connector-c.spec | 4 ++-- 6 files changed, 27 insertions(+), 16 deletions(-) delete mode 100644 mariadb-connector-c-3.1.11-src.tar.gz delete mode 100644 mariadb-connector-c-3.1.11-src.tar.gz.asc create mode 100644 mariadb-connector-c-3.1.12-src.tar.gz create mode 100644 mariadb-connector-c-3.1.12-src.tar.gz.asc diff --git a/mariadb-connector-c-3.1.11-src.tar.gz b/mariadb-connector-c-3.1.11-src.tar.gz deleted file mode 100644 index 9f2a92c..0000000 --- a/mariadb-connector-c-3.1.11-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e6f6c399493fe90efdc21a3fe70c30434b7480e8195642a959f1dd7a0fa5b0f -size 752342 diff --git a/mariadb-connector-c-3.1.11-src.tar.gz.asc b/mariadb-connector-c-3.1.11-src.tar.gz.asc deleted file mode 100644 index eb839b0..0000000 --- a/mariadb-connector-c-3.1.11-src.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEcBAABCAAGBQJfouChAAoJEM4aPdXjyU9JppkH/1U+Cq9AH/AGumPfcjrCdJ73 -jGicuX1uRcA5m1Yg1S8Up8bvspchH143WAPrJ/Z6aGn6ZpjwAfPKN/SWtNXoPR2u -F1QAH8Kt0IGJvtr9/0fBZO537htS85sx81d3lnwxTznIfD2+9N1PCgZVksr7IMUE -SbnO0ZkI82u/kOKgFdI7pt3m6VeaTxsADbEI+8JaUziRnf6EPw6SVLqQW5OkUgZ6 -eXCRYnV9RaXzSmE2PliKvDYjzueARDG7AwSdsyGbqXn+WhGTQj8jG77vJYI9mgYY -OJvA4wDdtsqikVRrNCC/5nxPFeEpr33mLsrTpaJKrYJiProbh/kSykTvc4T/ngI= -=UYxL ------END PGP SIGNATURE----- diff --git a/mariadb-connector-c-3.1.12-src.tar.gz b/mariadb-connector-c-3.1.12-src.tar.gz new file mode 100644 index 0000000..3b5119c --- /dev/null +++ b/mariadb-connector-c-3.1.12-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f5ae14708b4813e4ff6857d152c22e6fc0e551c9fa743c1ef81a68e3254fe63 +size 966702 diff --git a/mariadb-connector-c-3.1.12-src.tar.gz.asc b/mariadb-connector-c-3.1.12-src.tar.gz.asc new file mode 100644 index 0000000..32ec6ec --- /dev/null +++ b/mariadb-connector-c-3.1.12-src.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAABCAAGBQJgLnuNAAoJEM4aPdXjyU9JlggH/3xXZlm1Ftgf89DkMrRTHcOM +6cL0Ke9galIwttsyd/FTHsg9V6+LJFzhj/jT4FpG0vxhKD8C4kCbLJPgvxzKveD2 +Ma4CEd/EO1GylUOLtpqOORyhPPKYDOeDtPPq0ndj1GwaJF3hwIEKuvH04IQfGVm6 +7NgQqih15hCY6VPHl+CGvb1HrORSJe2sN1XXnl+BND34U5l3kNoghiC2IafpGEM3 +WQJctqo742rP0WeJ+3p3T+TpPj36Y/+gUiQ0HUq52LWfCbEp6BwmipJ2H4+tKyEt +CPtc6Dah63xupm8ItFQjZVSeblPJVmnMiaavTfcw9PBLD6OsJrd6qhVpxTlG/hU= +=cdLo +-----END PGP SIGNATURE----- diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index 6426c47..1ffc013 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Mar 3 23:31:24 UTC 2021 - Kristyna Streitova + +- Update to release 3.1.12 [bsc#1182739]: + * MDEV-24577: Fix warnings generated during compilation of + plugin/auth_pam/testing/pam_mariadb_mtr.c on FreeBSD + * CONC-521: Fixed warning on MacOS when including ucontext.h + * CONC-518: Check if mysql->options.extension was allocated before + checking async_context + * CONC-517: C/C looks for plugins in wrong location on Windows + ------------------------------------------------------------------- Thu Nov 5 13:53:30 UTC 2020 - Adam Majer diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index a68b549..59222ed 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -1,7 +1,7 @@ # # spec file for package mariadb-connector-c # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ %endif %bcond_with sqlite3 Name: mariadb-connector-c -Version: 3.1.11 +Version: 3.1.12 Release: 0 Summary: MariaDB connector in C License: LGPL-2.1-or-later From 88457f6c7835803ab88e1f28f70402d80063bdad07bf9afe80e0fc6a9c87401a Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 30 Apr 2021 22:46:20 +0000 Subject: [PATCH 28/32] Accepting request 889355 from server:database OBS-URL: https://build.opensuse.org/request/show/889355 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=28 --- mariadb-connector-c-cmake-3.20.patch | 24 ++++++++++++++++++++++++ mariadb-connector-c.changes | 8 +++++++- mariadb-connector-c.spec | 2 ++ 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 mariadb-connector-c-cmake-3.20.patch diff --git a/mariadb-connector-c-cmake-3.20.patch b/mariadb-connector-c-cmake-3.20.patch new file mode 100644 index 0000000..10af29c --- /dev/null +++ b/mariadb-connector-c-cmake-3.20.patch @@ -0,0 +1,24 @@ +From 242cab8cbcd91af882233730a83627d3b12ced83 Mon Sep 17 00:00:00 2001 +From: Vladislav Vaintroub +Date: Fri, 12 Mar 2021 00:01:11 +0100 +Subject: [PATCH] Fix syntax error in cmake 3.20 + +https://github.com/mariadb-corporation/mariadb-connector-c/commit/242cab8cbc + +--- + cmake/ConnectorName.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/ConnectorName.cmake b/cmake/ConnectorName.cmake +index b7bbbad8..357b8ac0 100644 +--- a/cmake/ConnectorName.cmake ++++ b/cmake/ConnectorName.cmake +@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows") + SET(MACHINE_NAME "x64") + ELSE() + SET(MACHINE_NAME "32") +- END() ++ ENDIF() + ENDIF() + + SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}") diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index 1ffc013..6c4ddea 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 29 12:04:20 UTC 2021 - Dominique Leuenberger + +- Add mariadb-connector-c-cmake-3.20.patch: Fix build with cmake + 3.20. + ------------------------------------------------------------------- Wed Mar 3 23:31:24 UTC 2021 - Kristyna Streitova @@ -7,7 +13,7 @@ Wed Mar 3 23:31:24 UTC 2021 - Kristyna Streitova * CONC-521: Fixed warning on MacOS when including ucontext.h * CONC-518: Check if mysql->options.extension was allocated before checking async_context - * CONC-517: C/C looks for plugins in wrong location on Windows + * CONC-517: C/C looks for plugins in wrong location on Windows ------------------------------------------------------------------- Thu Nov 5 13:53:30 UTC 2020 - Adam Majer diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 59222ed..f7a88ce 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -39,6 +39,7 @@ Source3: baselibs.conf Patch1: mariadb-connector-c-2.3.1_unresolved_symbols.patch Patch3: absolute_path_fix.patch Patch4: private_library.patch +Patch5: mariadb-connector-c-cmake-3.20.patch BuildRequires: cmake BuildRequires: curl-devel BuildRequires: pkgconfig @@ -115,6 +116,7 @@ This package holds the development files. %patch1 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build # plugin types seems to require no aliasing assumptions From da1f0e20ca9cf248b716e02ed1db71fa018ec083969cf1949a8ddc0f7f994a99 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 21 Jun 2021 18:34:55 +0000 Subject: [PATCH 29/32] Accepting request 900575 from server:database OBS-URL: https://build.opensuse.org/request/show/900575 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=29 --- absolute_path_fix.patch | 32 ----------------------- mariadb-connector-c-3.1.12-src.tar.gz | 3 --- mariadb-connector-c-3.1.12-src.tar.gz.asc | 11 -------- mariadb-connector-c-3.1.13-src.tar.gz | 3 +++ mariadb-connector-c-3.1.13-src.tar.gz.asc | 11 ++++++++ mariadb-connector-c-cmake-3.20.patch | 24 ----------------- mariadb-connector-c.changes | 31 ++++++++++++++++++++++ mariadb-connector-c.spec | 15 +++++------ private_library.patch | 14 +++++----- 9 files changed, 58 insertions(+), 86 deletions(-) delete mode 100644 absolute_path_fix.patch delete mode 100644 mariadb-connector-c-3.1.12-src.tar.gz delete mode 100644 mariadb-connector-c-3.1.12-src.tar.gz.asc create mode 100644 mariadb-connector-c-3.1.13-src.tar.gz create mode 100644 mariadb-connector-c-3.1.13-src.tar.gz.asc delete mode 100644 mariadb-connector-c-cmake-3.20.patch diff --git a/absolute_path_fix.patch b/absolute_path_fix.patch deleted file mode 100644 index 5ae92af..0000000 --- a/absolute_path_fix.patch +++ /dev/null @@ -1,32 +0,0 @@ -Author: Adam Majer -Date: Fri Mar 3 15:59:09 CET 2017 -Summary: Remove pure ugliness with paths - -Index: mariadb-connector-c-3.1.11-src/mariadb_config/libmariadb.pc.in -=================================================================== ---- mariadb-connector-c-3.1.11-src.orig/mariadb_config/libmariadb.pc.in -+++ mariadb-connector-c-3.1.11-src/mariadb_config/libmariadb.pc.in -@@ -7,8 +7,8 @@ - # - - prefix=@CMAKE_INSTALL_PREFIX@ --includedir=${prefix}/@INSTALL_INCLUDEDIR@/@SUFFIX_INSTALL_DIR@ --libdir=${prefix}/@INSTALL_LIBDIR@/@SUFFIX_INSTALL_DIR@ -+includedir=@INSTALL_INCLUDEDIR@ -+libdir=@INSTALL_LIBDIR@ - - Name: libmariadb - Version: @CPACK_PACKAGE_VERSION@ -Index: mariadb-connector-c-3.1.11-src/mariadb_config/mariadb_config.c.in -=================================================================== ---- mariadb-connector-c-3.1.11-src.orig/mariadb_config/mariadb_config.c.in -+++ mariadb-connector-c-3.1.11-src/mariadb_config/mariadb_config.c.in -@@ -210,7 +210,7 @@ end: - } - if (!p || !p[0]) - { -- strncpy(installation_dir, "@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@", PATH_MAX - 1); -+ installation_dir[0] = 0; - return; - } - } diff --git a/mariadb-connector-c-3.1.12-src.tar.gz b/mariadb-connector-c-3.1.12-src.tar.gz deleted file mode 100644 index 3b5119c..0000000 --- a/mariadb-connector-c-3.1.12-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2f5ae14708b4813e4ff6857d152c22e6fc0e551c9fa743c1ef81a68e3254fe63 -size 966702 diff --git a/mariadb-connector-c-3.1.12-src.tar.gz.asc b/mariadb-connector-c-3.1.12-src.tar.gz.asc deleted file mode 100644 index 32ec6ec..0000000 --- a/mariadb-connector-c-3.1.12-src.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEcBAABCAAGBQJgLnuNAAoJEM4aPdXjyU9JlggH/3xXZlm1Ftgf89DkMrRTHcOM -6cL0Ke9galIwttsyd/FTHsg9V6+LJFzhj/jT4FpG0vxhKD8C4kCbLJPgvxzKveD2 -Ma4CEd/EO1GylUOLtpqOORyhPPKYDOeDtPPq0ndj1GwaJF3hwIEKuvH04IQfGVm6 -7NgQqih15hCY6VPHl+CGvb1HrORSJe2sN1XXnl+BND34U5l3kNoghiC2IafpGEM3 -WQJctqo742rP0WeJ+3p3T+TpPj36Y/+gUiQ0HUq52LWfCbEp6BwmipJ2H4+tKyEt -CPtc6Dah63xupm8ItFQjZVSeblPJVmnMiaavTfcw9PBLD6OsJrd6qhVpxTlG/hU= -=cdLo ------END PGP SIGNATURE----- diff --git a/mariadb-connector-c-3.1.13-src.tar.gz b/mariadb-connector-c-3.1.13-src.tar.gz new file mode 100644 index 0000000..9752ff5 --- /dev/null +++ b/mariadb-connector-c-3.1.13-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0271a5edfd64b13bca5937267474e4747d832ec62e169fc2589d2ead63746875 +size 968401 diff --git a/mariadb-connector-c-3.1.13-src.tar.gz.asc b/mariadb-connector-c-3.1.13-src.tar.gz.asc new file mode 100644 index 0000000..25c84e9 --- /dev/null +++ b/mariadb-connector-c-3.1.13-src.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAABCAAGBQJgmsf1AAoJEM4aPdXjyU9JSokIAIt+QDFuH6do56ohf8ITyhG+ +9JEIvNo/q7DPEc6NyBB9PaI800apcyDbe9ief+TtiA8KECSopVOoW2LZsxGOBCiI +8+rjMJUPQ7IJyecBuCeIrfZyilVw0oU0R776rWsCT5uPWdo+cj8wtHJchgRsIHJa +I5ZptX76+cZwyf+j0I52Ihgp1BukJNUCLiygfaK5fGc/Wd3Wy4Q7b9h+hwQ+ZsqT +PcUzHvcpnq0wIgkA9fuzslIzKRaqAaIhsM1gEtkpQm4ncl189bXTOyzgrlR399eb +cjVUkTCZnJZU5reskEasp6XpAfEIAJZfROI6HSWz7ulRnL7lW8DdeuKplZtTXWA= +=jtOS +-----END PGP SIGNATURE----- diff --git a/mariadb-connector-c-cmake-3.20.patch b/mariadb-connector-c-cmake-3.20.patch deleted file mode 100644 index 10af29c..0000000 --- a/mariadb-connector-c-cmake-3.20.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 242cab8cbcd91af882233730a83627d3b12ced83 Mon Sep 17 00:00:00 2001 -From: Vladislav Vaintroub -Date: Fri, 12 Mar 2021 00:01:11 +0100 -Subject: [PATCH] Fix syntax error in cmake 3.20 - -https://github.com/mariadb-corporation/mariadb-connector-c/commit/242cab8cbc - ---- - cmake/ConnectorName.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/ConnectorName.cmake b/cmake/ConnectorName.cmake -index b7bbbad8..357b8ac0 100644 ---- a/cmake/ConnectorName.cmake -+++ b/cmake/ConnectorName.cmake -@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows") - SET(MACHINE_NAME "x64") - ELSE() - SET(MACHINE_NAME "32") -- END() -+ ENDIF() - ENDIF() - - SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}") diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index 6c4ddea..79f40d7 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Thu Jun 17 11:21:36 UTC 2021 - Dirk Müller + +- drop absolute_path_fix.patch: obsolete after previous change + (properly setting INSTALL_LAYOUT and libdir) + +------------------------------------------------------------------- +Thu May 27 18:48:59 UTC 2021 - Kristyna Streitova + +- set INSTALL_LAYOUT=RPM and adjust libdir, includedir, plugindir + and pcdir values to fix mariadb_config output. Also fix the + missing "%s" in private_library.patch so it shows the correct + path for plugindir [bsc#1179921] [bsc#1183878] + +------------------------------------------------------------------- +Thu May 27 09:31:16 UTC 2021 - Kristyna Streitova + +- Update to release 3.1.13 [bsc#1185870], [bsc#1185872], [bsc#1185868] + * CONC-537: Only read from MYSQL_HOME if MARIADB_HOME was not set + * CONC-548: Symbol conflict with libsodium + * CONC-490: Handshake error when CLIENT_CONNECT_WITH_DB flag was + set without specifying database + * CONC-543: Hash functions conflict with GnuTLS + * CONC-539: Added cipher suites ECDHE-RSA-AES128-SHA256 (0xC027) + and ECDHE-RSA-AES256-SHA384 (0xC028) to the cipher map which + maps cipher suite names to the corresponding algorithm ids + (Windows Schannel) + * CONC-535: Disabled checksum ignored in events (replication/ + binlog API) +- Remove mariadb-connector-c-cmake-3.20.patch (upstreamed) + ------------------------------------------------------------------- Thu Apr 29 12:04:20 UTC 2021 - Dominique Leuenberger diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index f7a88ce..8a1cb2c 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -25,7 +25,7 @@ %endif %bcond_with sqlite3 Name: mariadb-connector-c -Version: 3.1.12 +Version: 3.1.13 Release: 0 Summary: MariaDB connector in C License: LGPL-2.1-or-later @@ -37,9 +37,7 @@ Source1: https://downloads.mariadb.com/Connectors/c/connector-c-%{version Source2: mariadb.keyring Source3: baselibs.conf Patch1: mariadb-connector-c-2.3.1_unresolved_symbols.patch -Patch3: absolute_path_fix.patch Patch4: private_library.patch -Patch5: mariadb-connector-c-cmake-3.20.patch BuildRequires: cmake BuildRequires: curl-devel BuildRequires: pkgconfig @@ -114,9 +112,7 @@ This package holds the development files. %prep %setup -q -n %{name}-%{version}-src %patch1 -p1 -%patch3 -p1 %patch4 -p1 -%patch5 -p1 %build # plugin types seems to require no aliasing assumptions @@ -129,12 +125,13 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" %endif -DWITH_EXTERNAL_ZLIB:BOOL=ON \ -DMARIADB_UNIX_ADDR:STRING=%{_rundir}/mysql/mysql.sock \ - -DINSTALL_LIBDIR:STRING=%{_libdir} \ - -DINSTALL_INCLUDEDIR:STRING=%{_includedir}/mysql \ - -DINSTALL_PLUGINDIR:STRING=%{_libdir}/mysql/plugin/ \ + -DINSTALL_LAYOUT=RPM \ + -DINSTALL_LIBDIR:STRING=%{_lib} \ + -DINSTALL_INCLUDEDIR:STRING=include/mysql \ + -DINSTALL_PLUGINDIR:STRING=%{_lib}/mysql/plugin/ \ -DWITH_MYSQLCOMPAT=ON \ -DWITH_SSL=OPENSSL \ - -DINSTALL_PCDIR="%{_libdir}/pkgconfig" + -DINSTALL_PCDIR="%{_lib}/pkgconfig" %make_jobs %install diff --git a/private_library.patch b/private_library.patch index a15cd6c..7b72a22 100644 --- a/private_library.patch +++ b/private_library.patch @@ -8,10 +8,10 @@ static linking, create a private shared library that simply exports all symbols. With the exception of exported symbols, it is identical to the regular library. -Index: mariadb-connector-c-3.1.11-src/libmariadb/CMakeLists.txt +Index: mariadb-connector-c-3.1.13-src/libmariadb/CMakeLists.txt =================================================================== ---- mariadb-connector-c-3.1.11-src.orig/libmariadb/CMakeLists.txt -+++ mariadb-connector-c-3.1.11-src/libmariadb/CMakeLists.txt +--- mariadb-connector-c-3.1.13-src.orig/libmariadb/CMakeLists.txt ++++ mariadb-connector-c-3.1.13-src/libmariadb/CMakeLists.txt @@ -414,6 +414,12 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC) SET_TARGET_PROPERTIES(mariadbclient PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64") ENDIF() @@ -50,15 +50,15 @@ Index: mariadb-connector-c-3.1.11-src/libmariadb/CMakeLists.txt IF(MSVC) # On Windows, install PDB -Index: mariadb-connector-c-3.1.11-src/mariadb_config/mariadb_config.c.in +Index: mariadb-connector-c-3.1.13-src/mariadb_config/mariadb_config.c.in =================================================================== ---- mariadb-connector-c-3.1.11-src.orig/mariadb_config/mariadb_config.c.in -+++ mariadb-connector-c-3.1.11-src/mariadb_config/mariadb_config.c.in +--- mariadb-connector-c-3.1.13-src.orig/mariadb_config/mariadb_config.c.in ++++ mariadb-connector-c-3.1.13-src/mariadb_config/mariadb_config.c.in @@ -30,6 +30,7 @@ static char *mariadb_progname; #define INCLUDE "-I%s/@INSTALL_INCLUDEDIR@ -I%s/@INSTALL_INCLUDEDIR@/mysql" #define LIBS "-L%s/@INSTALL_LIBDIR@/ -lmariadb" #define LIBS_SYS "@extra_dynamic_LDFLAGS@" -+#define PRIVATE_LIBS "-L@INSTALL_LIBDIR@ -lmariadbprivate " LIBS_SYS ++#define PRIVATE_LIBS "-L%s/@INSTALL_LIBDIR@ -lmariadbprivate " LIBS_SYS #define CFLAGS INCLUDE #define VERSION "@MARIADB_CLIENT_VERSION@" #define CC_VERSION "@CPACK_PACKAGE_VERSION@" From 87e94fa5672bc548e6dde154c4fbf7bc7f88d6f3dce3bac20ab16fa6962617b5 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 2 Jul 2021 11:26:58 +0000 Subject: [PATCH 30/32] Accepting request 901337 from server:database bugnumber ref added only OBS-URL: https://build.opensuse.org/request/show/901337 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=30 --- mariadb-connector-c.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index 79f40d7..c1b50c1 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -2,7 +2,7 @@ Thu Jun 17 11:21:36 UTC 2021 - Dirk Müller - drop absolute_path_fix.patch: obsolete after previous change - (properly setting INSTALL_LAYOUT and libdir) + (properly setting INSTALL_LAYOUT and libdir) [bsc#1187459] ------------------------------------------------------------------- Thu May 27 18:48:59 UTC 2021 - Kristyna Streitova From c43f28dcbe142696eeeb841e75f77850477ca2e653e4229975d9b5471ee58285 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 6 Aug 2021 20:44:25 +0000 Subject: [PATCH 31/32] Accepting request 910254 from server:database OBS-URL: https://build.opensuse.org/request/show/910254 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=31 --- mariadb-connector-c-3.1.13-src.tar.gz | 3 --- mariadb-connector-c-3.1.13-src.tar.gz.asc | 11 ----------- mariadb-connector-c-3.2.3-src.tar.gz | 3 +++ mariadb-connector-c-3.2.3-src.tar.gz.asc | 11 +++++++++++ mariadb-connector-c.changes | 13 +++++++++++++ mariadb-connector-c.spec | 3 ++- private_library.patch | 6 +++--- 7 files changed, 32 insertions(+), 18 deletions(-) delete mode 100644 mariadb-connector-c-3.1.13-src.tar.gz delete mode 100644 mariadb-connector-c-3.1.13-src.tar.gz.asc create mode 100644 mariadb-connector-c-3.2.3-src.tar.gz create mode 100644 mariadb-connector-c-3.2.3-src.tar.gz.asc diff --git a/mariadb-connector-c-3.1.13-src.tar.gz b/mariadb-connector-c-3.1.13-src.tar.gz deleted file mode 100644 index 9752ff5..0000000 --- a/mariadb-connector-c-3.1.13-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0271a5edfd64b13bca5937267474e4747d832ec62e169fc2589d2ead63746875 -size 968401 diff --git a/mariadb-connector-c-3.1.13-src.tar.gz.asc b/mariadb-connector-c-3.1.13-src.tar.gz.asc deleted file mode 100644 index 25c84e9..0000000 --- a/mariadb-connector-c-3.1.13-src.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEcBAABCAAGBQJgmsf1AAoJEM4aPdXjyU9JSokIAIt+QDFuH6do56ohf8ITyhG+ -9JEIvNo/q7DPEc6NyBB9PaI800apcyDbe9ief+TtiA8KECSopVOoW2LZsxGOBCiI -8+rjMJUPQ7IJyecBuCeIrfZyilVw0oU0R776rWsCT5uPWdo+cj8wtHJchgRsIHJa -I5ZptX76+cZwyf+j0I52Ihgp1BukJNUCLiygfaK5fGc/Wd3Wy4Q7b9h+hwQ+ZsqT -PcUzHvcpnq0wIgkA9fuzslIzKRaqAaIhsM1gEtkpQm4ncl189bXTOyzgrlR399eb -cjVUkTCZnJZU5reskEasp6XpAfEIAJZfROI6HSWz7ulRnL7lW8DdeuKplZtTXWA= -=jtOS ------END PGP SIGNATURE----- diff --git a/mariadb-connector-c-3.2.3-src.tar.gz b/mariadb-connector-c-3.2.3-src.tar.gz new file mode 100644 index 0000000..3023d82 --- /dev/null +++ b/mariadb-connector-c-3.2.3-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6aa38656438e092242a95d01d3a80a5ce95c7fc02ec81009f4f0f46262331f4 +size 992155 diff --git a/mariadb-connector-c-3.2.3-src.tar.gz.asc b/mariadb-connector-c-3.2.3-src.tar.gz.asc new file mode 100644 index 0000000..e1551af --- /dev/null +++ b/mariadb-connector-c-3.2.3-src.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAABCAAGBQJg5fRYAAoJEM4aPdXjyU9JrdkIAMOL39K8XTgO/Ud8HzLknm9u +7QIsz0CJ2o/arc8KYfryP2Mg+V44Cq9mnTZ+mkn6X22foSt+zr/AnQ/vBw6GA2Zd +glqw3ioBc9Aj7uoG20xcObs88hks9Sg0YfIAva1bN+7A6g0wlnxcpUjVGofxKXET +6oHbPtys9MCckrfXslKQIfWwTT3OIkU49vBbE5E609ufVsDw5eNcYGL/UD9N1qCW +w1W8n9bvP8lkz3NipUpKqBBbZIqqtWz0JHBgIHaGw06qwGQYF0g0xqvU2y4damfo +h/H4Nr1wPyux4Se54QK048jUq7UjPstsKwRwyf9G2M+C/PNC5NMX/NL6anan6H0= +=mKTh +-----END PGP SIGNATURE----- diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index c1b50c1..e27ae64 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Aug 4 10:16:00 UTC 2021 - Danilo Spinella + +- Update to 3.2.3: + * release notes and changelog: + https://mariadb.com/kb/en/library/mariadb-connector-c-323-release-notes + https://mariadb.com/kb/en/library/mariadb-connector-c-323-changelog + https://mariadb.com/kb/en/library/mariadb-connector-c-322-release-notes + https://mariadb.com/kb/en/library/mariadb-connector-c-322-changelog + https://mariadb.com/kb/en/library/mariadb-connector-c-320-release-notes + https://mariadb.com/kb/en/library/mariadb-connector-c-320-changelog +- Refresh private_library.patch + ------------------------------------------------------------------- Thu Jun 17 11:21:36 UTC 2021 - Dirk Müller diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 8a1cb2c..4c441f9 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -25,7 +25,7 @@ %endif %bcond_with sqlite3 Name: mariadb-connector-c -Version: 3.1.13 +Version: 3.2.3 Release: 0 Summary: MariaDB connector in C License: LGPL-2.1-or-later @@ -186,5 +186,6 @@ install -Dpm 0644 build/include/ma_config.h \ %{_libdir}/libmariadb.so %{_libdir}/libmysqlclient.so %{_libdir}/libmysqlclient_r.so +%{_mandir}/man3/* %changelog diff --git a/private_library.patch b/private_library.patch index 7b72a22..e1e5e39 100644 --- a/private_library.patch +++ b/private_library.patch @@ -12,9 +12,9 @@ Index: mariadb-connector-c-3.1.13-src/libmariadb/CMakeLists.txt =================================================================== --- mariadb-connector-c-3.1.13-src.orig/libmariadb/CMakeLists.txt +++ mariadb-connector-c-3.1.13-src/libmariadb/CMakeLists.txt -@@ -414,6 +414,12 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC) - SET_TARGET_PROPERTIES(mariadbclient PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64") - ENDIF() +@@ -414,6 +414,12 @@ TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE ${SYSTEM_LIBS}) + + SIGN_TARGET(libmariadb) +ADD_LIBRARY(libmariadbprivate SHARED ${libmariadb_RC} $ ${EMPTY_FILE} ${EXPORT_LINK}) +TARGET_LINK_LIBRARIES(libmariadbprivate ${SYSTEM_LIBS}) From 419b0f9c8eb496e2660a6e1532952db0412fd672ed1471db8217dba6fa1324d9 Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Tue, 10 Aug 2021 09:11:49 +0000 Subject: [PATCH 32/32] Accepting request 911052 from openSUSE:Factory Revert to 3.1.13, there are serious issues with 3.2.3. boo#1189184, QTBUG-95071, QTBUG-95639 OBS-URL: https://build.opensuse.org/request/show/911052 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=32 --- mariadb-connector-c-3.1.13-src.tar.gz | 3 +++ mariadb-connector-c-3.1.13-src.tar.gz.asc | 11 +++++++++++ mariadb-connector-c-3.2.3-src.tar.gz | 3 --- mariadb-connector-c-3.2.3-src.tar.gz.asc | 11 ----------- mariadb-connector-c.changes | 13 ------------- mariadb-connector-c.spec | 3 +-- private_library.patch | 6 +++--- 7 files changed, 18 insertions(+), 32 deletions(-) create mode 100644 mariadb-connector-c-3.1.13-src.tar.gz create mode 100644 mariadb-connector-c-3.1.13-src.tar.gz.asc delete mode 100644 mariadb-connector-c-3.2.3-src.tar.gz delete mode 100644 mariadb-connector-c-3.2.3-src.tar.gz.asc diff --git a/mariadb-connector-c-3.1.13-src.tar.gz b/mariadb-connector-c-3.1.13-src.tar.gz new file mode 100644 index 0000000..9752ff5 --- /dev/null +++ b/mariadb-connector-c-3.1.13-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0271a5edfd64b13bca5937267474e4747d832ec62e169fc2589d2ead63746875 +size 968401 diff --git a/mariadb-connector-c-3.1.13-src.tar.gz.asc b/mariadb-connector-c-3.1.13-src.tar.gz.asc new file mode 100644 index 0000000..25c84e9 --- /dev/null +++ b/mariadb-connector-c-3.1.13-src.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAABCAAGBQJgmsf1AAoJEM4aPdXjyU9JSokIAIt+QDFuH6do56ohf8ITyhG+ +9JEIvNo/q7DPEc6NyBB9PaI800apcyDbe9ief+TtiA8KECSopVOoW2LZsxGOBCiI +8+rjMJUPQ7IJyecBuCeIrfZyilVw0oU0R776rWsCT5uPWdo+cj8wtHJchgRsIHJa +I5ZptX76+cZwyf+j0I52Ihgp1BukJNUCLiygfaK5fGc/Wd3Wy4Q7b9h+hwQ+ZsqT +PcUzHvcpnq0wIgkA9fuzslIzKRaqAaIhsM1gEtkpQm4ncl189bXTOyzgrlR399eb +cjVUkTCZnJZU5reskEasp6XpAfEIAJZfROI6HSWz7ulRnL7lW8DdeuKplZtTXWA= +=jtOS +-----END PGP SIGNATURE----- diff --git a/mariadb-connector-c-3.2.3-src.tar.gz b/mariadb-connector-c-3.2.3-src.tar.gz deleted file mode 100644 index 3023d82..0000000 --- a/mariadb-connector-c-3.2.3-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b6aa38656438e092242a95d01d3a80a5ce95c7fc02ec81009f4f0f46262331f4 -size 992155 diff --git a/mariadb-connector-c-3.2.3-src.tar.gz.asc b/mariadb-connector-c-3.2.3-src.tar.gz.asc deleted file mode 100644 index e1551af..0000000 --- a/mariadb-connector-c-3.2.3-src.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEcBAABCAAGBQJg5fRYAAoJEM4aPdXjyU9JrdkIAMOL39K8XTgO/Ud8HzLknm9u -7QIsz0CJ2o/arc8KYfryP2Mg+V44Cq9mnTZ+mkn6X22foSt+zr/AnQ/vBw6GA2Zd -glqw3ioBc9Aj7uoG20xcObs88hks9Sg0YfIAva1bN+7A6g0wlnxcpUjVGofxKXET -6oHbPtys9MCckrfXslKQIfWwTT3OIkU49vBbE5E609ufVsDw5eNcYGL/UD9N1qCW -w1W8n9bvP8lkz3NipUpKqBBbZIqqtWz0JHBgIHaGw06qwGQYF0g0xqvU2y4damfo -h/H4Nr1wPyux4Se54QK048jUq7UjPstsKwRwyf9G2M+C/PNC5NMX/NL6anan6H0= -=mKTh ------END PGP SIGNATURE----- diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index e27ae64..c1b50c1 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,16 +1,3 @@ -------------------------------------------------------------------- -Wed Aug 4 10:16:00 UTC 2021 - Danilo Spinella - -- Update to 3.2.3: - * release notes and changelog: - https://mariadb.com/kb/en/library/mariadb-connector-c-323-release-notes - https://mariadb.com/kb/en/library/mariadb-connector-c-323-changelog - https://mariadb.com/kb/en/library/mariadb-connector-c-322-release-notes - https://mariadb.com/kb/en/library/mariadb-connector-c-322-changelog - https://mariadb.com/kb/en/library/mariadb-connector-c-320-release-notes - https://mariadb.com/kb/en/library/mariadb-connector-c-320-changelog -- Refresh private_library.patch - ------------------------------------------------------------------- Thu Jun 17 11:21:36 UTC 2021 - Dirk Müller diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 4c441f9..8a1cb2c 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -25,7 +25,7 @@ %endif %bcond_with sqlite3 Name: mariadb-connector-c -Version: 3.2.3 +Version: 3.1.13 Release: 0 Summary: MariaDB connector in C License: LGPL-2.1-or-later @@ -186,6 +186,5 @@ install -Dpm 0644 build/include/ma_config.h \ %{_libdir}/libmariadb.so %{_libdir}/libmysqlclient.so %{_libdir}/libmysqlclient_r.so -%{_mandir}/man3/* %changelog diff --git a/private_library.patch b/private_library.patch index e1e5e39..7b72a22 100644 --- a/private_library.patch +++ b/private_library.patch @@ -12,9 +12,9 @@ Index: mariadb-connector-c-3.1.13-src/libmariadb/CMakeLists.txt =================================================================== --- mariadb-connector-c-3.1.13-src.orig/libmariadb/CMakeLists.txt +++ mariadb-connector-c-3.1.13-src/libmariadb/CMakeLists.txt -@@ -414,6 +414,12 @@ TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE ${SYSTEM_LIBS}) - - SIGN_TARGET(libmariadb) +@@ -414,6 +414,12 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC) + SET_TARGET_PROPERTIES(mariadbclient PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64") + ENDIF() +ADD_LIBRARY(libmariadbprivate SHARED ${libmariadb_RC} $ ${EMPTY_FILE} ${EXPORT_LINK}) +TARGET_LINK_LIBRARIES(libmariadbprivate ${SYSTEM_LIBS})