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

- 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

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

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.4-src.orig/plugins/auth/CMakeLists.txt
-+++ mariadb-connector-c-3.1.2-src/plugins/auth/CMakeLists.txt
++++ mariadb-connector-c-3.1.4-src/plugins/auth/CMakeLists.txt
-@@ -16,7 +16,8 @@ REGISTER_PLUGIN(TARGET dialog
+@@ -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

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

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

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

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

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

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

mariadb-connector-c.changes

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

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

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.4-src.orig/libmariadb/CMakeLists.txt
-+++ mariadb-connector-c-3.1.3-src/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.4-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/mariadb_config/mariadb_config.c.in
 @@ -7,6 +7,8 @@ static char *mariadb_progname;
  
  #define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb"