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

- 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

OBS-URL: https://build.opensuse.org/request/show/721026
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb-connector-c?expand=0&rev=45

absolute_path_fix.patch

@@ -2,18 +2,18 @@ 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.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 @@
  #
  

mariadb-connector-c-3.1.2-src.tar.gz

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

mariadb-connector-c-3.1.2-src.tar.gz.asc

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

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

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

mariadb-connector-c.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+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>
 

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

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