From 59afc5a427ec8535a3e9142a720b0f40cdba8025738f573c351118ee6dcaa20e Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Tue, 24 Sep 2019 13:09:44 +0000 Subject: [PATCH] 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 | 12 ++++++------ mariadb-connector-c-3.1.3-src.tar.gz | 3 --- mariadb-connector-c-3.1.3-src.tar.gz.asc | 11 ----------- mariadb-connector-c-3.1.4-src.tar.gz | 3 +++ mariadb-connector-c-3.1.4-src.tar.gz.asc | 11 +++++++++++ mariadb-connector-c.changes | 9 +++++++++ mariadb-connector-c.spec | 2 +- private_library.patch | 14 +++++++------- 8 files changed, 37 insertions(+), 28 deletions(-) delete mode 100644 mariadb-connector-c-3.1.3-src.tar.gz delete mode 100644 mariadb-connector-c-3.1.3-src.tar.gz.asc create mode 100644 mariadb-connector-c-3.1.4-src.tar.gz create mode 100644 mariadb-connector-c-3.1.4-src.tar.gz.asc diff --git a/mariadb-connector-c-2.3.1_unresolved_symbols.patch b/mariadb-connector-c-2.3.1_unresolved_symbols.patch index 8c5a113..95526ff 100644 --- a/mariadb-connector-c-2.3.1_unresolved_symbols.patch +++ b/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.2-src/plugins/auth/CMakeLists.txt -@@ -16,7 +16,8 @@ REGISTER_PLUGIN(TARGET dialog +--- 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 @@ -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 diff --git a/mariadb-connector-c-3.1.3-src.tar.gz b/mariadb-connector-c-3.1.3-src.tar.gz deleted file mode 100644 index 796509e..0000000 --- a/mariadb-connector-c-3.1.3-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index ae0b662..0000000 --- a/mariadb-connector-c-3.1.3-src.tar.gz.asc +++ /dev/null @@ -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----- diff --git a/mariadb-connector-c-3.1.4-src.tar.gz b/mariadb-connector-c-3.1.4-src.tar.gz new file mode 100644 index 0000000..48eaff6 --- /dev/null +++ b/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 diff --git a/mariadb-connector-c-3.1.4-src.tar.gz.asc b/mariadb-connector-c-3.1.4-src.tar.gz.asc new file mode 100644 index 0000000..f30c325 --- /dev/null +++ b/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----- diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index e14fef9..2541c43 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Sep 24 10:59:32 UTC 2019 - Kristyna Streitova + +- 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 diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 7d11e2c..a2be7b4 100644 --- a/mariadb-connector-c.spec +++ b/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 diff --git a/private_library.patch b/private_library.patch index 9719821..3b860f3 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.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.3-src/libmariadb/CMakeLists.txt +--- mariadb-connector-c-3.1.4-src.orig/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.3-src/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.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"