pool/mariadb-connector-c
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 482634 from server:database

Browse Source 
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
This commit is contained in:
Yuchen Lin 2017-04-11 07:33:06 +00:00 committed by Git OBS Bridge
parent ad83438339
commit e90a5ee629
11 changed files with 221 additions and 658 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
absolute_path_fix.patch Normal file
View File

@ -0,0 +1,41 @@
Author: Adam Majer <amajer@suse.de>
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 <getopt.h>
#include <stdio.h>
-#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})

3
baselibs.conf
View File

@ -1,3 +0,0 @@
libmariadb3
provides "libmysqlclient.so.18"
provides "libmysqlclient.so.18(libmysqlclient_18)"

25
bigendian_type_fixes.patch Normal file
View File

@ -0,0 +1,25 @@
Author: Adam Majer <amajer@suse.de>
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;
}

22
mariadb-connector-c-2.3.1_unresolved_symbols.patch
View File

@ -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

3
mariadb-connector-c-2.3.2-src.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4063c8655dc37608d4eade981e25b76f67f5d36e8426dc7f20d59e48ebba628a
size 538172

11
mariadb-connector-c-2.3.2-src.tar.gz.asc Normal file
View File

@ -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-----

3
mariadb-connector-c-3.2.3-src.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b6aa38656438e092242a95d01d3a80a5ce95c7fc02ec81009f4f0f46262331f4
size 992155

11
mariadb-connector-c-3.2.3-src.tar.gz.asc
View File

@ -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-----

466
mariadb-connector-c.changes
View File

@ -1,469 +1,3 @@
-------------------------------------------------------------------
Wed Aug 4 10:16:00 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>
- 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 <dmueller@suse.com>
- 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 <kstreitova@suse.com>
- 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 <kstreitova@suse.com>
- 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 <dimstar@opensuse.org>
- Add mariadb-connector-c-cmake-3.20.patch: Fix build with cmake
3.20.
-------------------------------------------------------------------
Wed Mar 3 23:31:24 UTC 2021 - Kristyna Streitova <kstreitova@suse.com>
- 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 <adam.majer@suse.de>
- 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 <kstreitova@suse.com>
- 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 <kstreitova@suse.com>
- 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 <kstreitova@suse.com>
- 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 <jengelh@inai.de>
- 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 <kstreitova@suse.com>
- 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 <kstreitova@suse.com>
- 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 <kstreitova@suse.com>
- 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 <kstreitova@suse.com>
- 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 <dimstar@opensuse.org>
- 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

165
mariadb-connector-c.spec
View File

@ -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

129
private_library.patch
View File

@ -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} $<TARGET_OBJECTS:mariadb_obj> ${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)