From 3ec318e2ca1b0d74e8e77ddb97ea53ac750fad0e5f026923f66efc0a1e0e74b7 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 15 Aug 2019 10:25:31 +0000 Subject: [PATCH] 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@"