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

Accepting request 662777 from home:kstreitova:branches:server:database

Browse Source 
- 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
- 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

OBS-URL: https://build.opensuse.org/request/show/662777
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb-connector-c?expand=0&rev=34
This commit is contained in:
Adam Majer 2019-01-07 09:50:38 +00:00 committed by Git OBS Bridge
parent 90645df1a7
commit 5f839cd41d
9 changed files with 75 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
absolute_path_fix.patch
View File

@ -2,10 +2,10 @@ 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-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@

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

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

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

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

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

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

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

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

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

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

29
mariadb-connector-c.changes
View File

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

10
mariadb-connector-c.spec
View File

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

16
private_library.patch
View File

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