From 90645df1a7558204196a96e3a564f4de9e5a84d6e91d2ea22231d9fdcf5158e1 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Thu, 9 Aug 2018 10:28:56 +0000 Subject: [PATCH] Accepting request 628004 from home:kstreitova:branches:server:database - New upstream version 3.0.6 * MDEV-15263: FIx IS_NUM() macro * CONC-297: local infile parameter must be unsigned int instead of my_bool * CONC-329: change return value of internal socket functions from my_bool to int * CONC-332: my_auth doesn't read/update server ok packet * CONC-344: reset internal row counter * CONC-345: invalid heap use after free * CONC-346: Remove old cmake policies * fixed crash in mysql_select_db if NULL parameter was provided - refresh private_library.patch OBS-URL: https://build.opensuse.org/request/show/628004 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb-connector-c?expand=0&rev=32 --- mariadb-connector-c-3.0.5-src.tar.gz | 3 --- mariadb-connector-c-3.0.5-src.tar.gz.asc | 11 ----------- mariadb-connector-c-3.0.6-src.tar.gz | 3 +++ mariadb-connector-c-3.0.6-src.tar.gz.asc | 11 +++++++++++ mariadb-connector-c.changes | 16 ++++++++++++++++ mariadb-connector-c.spec | 4 ++-- private_library.patch | 21 +++++++++++---------- 7 files changed, 43 insertions(+), 26 deletions(-) delete mode 100644 mariadb-connector-c-3.0.5-src.tar.gz delete mode 100644 mariadb-connector-c-3.0.5-src.tar.gz.asc create mode 100644 mariadb-connector-c-3.0.6-src.tar.gz create mode 100644 mariadb-connector-c-3.0.6-src.tar.gz.asc diff --git a/mariadb-connector-c-3.0.5-src.tar.gz b/mariadb-connector-c-3.0.5-src.tar.gz deleted file mode 100644 index 388d25a..0000000 --- a/mariadb-connector-c-3.0.5-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:940017f13a13846153eb9d36290824c4615c8a8be4142b6bbaeb698609f02667 -size 664949 diff --git a/mariadb-connector-c-3.0.5-src.tar.gz.asc b/mariadb-connector-c-3.0.5-src.tar.gz.asc deleted file mode 100644 index e09a63f..0000000 --- a/mariadb-connector-c-3.0.5-src.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEcBAABCAAGBQJbF/X+AAoJEM4aPdXjyU9JVhsIAL6jqJdmzBn3c0bQghD2na9R -uZlcr/z1V8xDotRE1fwXuO1+/EVM5E8TkWV+8CZIMxER6fobqZ2kZBKxpAF5lTgY -aO2q1udLZ4HoXVxCN55l20IwgD2VUk2Ib/oHK1beS/GSdpz+W5ZeSSfEEXR8/QHz -qh9/KQAb17qHZN6jij6P41N5MBOv98/mDPyNbKNPlVp0Lnx1PQCv3DxSUdyJG7Q8 -tUwpxF3v7C7/3sS7QK10WkYG6R0+tD7g9+++LH6JY7ysOgSpAUdc56GrkMBTNQ8j -PF5Ykwoi21K2CgyvRRL1IeYfTg3LPjEo5G1rlpsW132uZhXRdn3VCSyNImnLHmo= -=Wvvv ------END PGP SIGNATURE----- diff --git a/mariadb-connector-c-3.0.6-src.tar.gz b/mariadb-connector-c-3.0.6-src.tar.gz new file mode 100644 index 0000000..aa14c9f --- /dev/null +++ b/mariadb-connector-c-3.0.6-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b2d18dc969dc385f7f740e4db112300e11bc626c9ba9aa05c284704095b9e48 +size 666819 diff --git a/mariadb-connector-c-3.0.6-src.tar.gz.asc b/mariadb-connector-c-3.0.6-src.tar.gz.asc new file mode 100644 index 0000000..6315d91 --- /dev/null +++ b/mariadb-connector-c-3.0.6-src.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAABCAAGBQJbYhQoAAoJEM4aPdXjyU9JvaQH/0ehF7SIcto1OxLeEB8pVsnl +iIuA0OXiY2T85q9SgYS2bJr8uvP+jpNWlkioT5FMic223yZ/hego763Ybbsoo5i+ +IGpCMrPwD8qw5uPVl1MJOGN/jP+99nBaQ0wZp6LlP1MY0vADcF/ThrKuB2sNmQyi +RFRjgUGLAcpRJyFE4ClWhtD21SaFbaAel2FEYV5lWaQqAl55mFWdDjvgz2L97iPF +dlvjAE3ZmhJWifVHtOEaqw3rMaRzItgyYwUVNpxxRxIRYgKZ2kzCPRg1oO2R/orG +/332LcOqsMhvUiWkZWRylxssQGyU81ZHfVGNpC60uRk37YIFlR1teCIVudv8x0s= +=kgd5 +-----END PGP SIGNATURE----- diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index 506f88f..368aff8 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Aug 2 23:08:34 UTC 2018 - kstreitova@suse.com + +- New upstream version 3.0.6 + * MDEV-15263: FIx IS_NUM() macro + * CONC-297: local infile parameter must be unsigned int instead + of my_bool + * CONC-329: change return value of internal socket functions + from my_bool to int + * CONC-332: my_auth doesn't read/update server ok packet + * CONC-344: reset internal row counter + * CONC-345: invalid heap use after free + * CONC-346: Remove old cmake policies + * fixed crash in mysql_select_db if NULL parameter was provided +- refresh private_library.patch + ------------------------------------------------------------------- Fri Jun 29 15:12:47 UTC 2018 - kstreitova@suse.com diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 15e2420..3f917ae 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.10 +%define mariadb_version 10.2.16 %if ! %{defined _rundir} %define _rundir %{_localstatedir}/run %endif %bcond_with sqlite3 Name: mariadb-connector-c -Version: 3.0.5 +Version: 3.0.6 Release: 0 Summary: MariaDB connector in C License: LGPL-2.1-or-later diff --git a/private_library.patch b/private_library.patch index 8c4d6b4..5b370ea 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.0.5-src/libmariadb/CMakeLists.txt +Index: mariadb-connector-c-3.0.6-src/libmariadb/CMakeLists.txt =================================================================== ---- mariadb-connector-c-3.0.5-src.orig/libmariadb/CMakeLists.txt -+++ mariadb-connector-c-3.0.5-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 @@ -403,16 +403,24 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC) SET_TARGET_PROPERTIES(mariadbclient PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64") ENDIF() @@ -26,8 +26,8 @@ Index: mariadb-connector-c-3.0.5-src/libmariadb/CMakeLists.txt IF (NOT WITH_ASAN) TARGET_LINK_LIBRARIES (libmariadb "-Wl,--no-undefined") ENDIF() - TARGET_LINK_LIBRARIES (libmariadb "${CC_BINARY_DIR}/libmariadb/mariadbclient.def") -+ TARGET_LINK_LIBRARIES (libmariadbprivate "-Wl,--no-undefined") + SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINK_FLAGS "${CC_BINARY_DIR}/libmariadb/mariadbclient.def") ++ SET_TARGET_PROPERTIES(libmariadbprivate PROPERTIES LINK_FLAGS "-Wl,--no-undefined") ENDIF() SET_TARGET_PROPERTIES(mariadbclient PROPERTIES IMPORTED_INTERFACE_LINK_LIBRARIES "${SYSTEM_LIBS}") @@ -37,20 +37,21 @@ Index: mariadb-connector-c-3.0.5-src/libmariadb/CMakeLists.txt SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "") # -@@ -442,6 +450,9 @@ INSTALL(TARGETS mariadbclient +@@ -446,7 +454,9 @@ INSTALL(TARGETS mariadbclient INSTALL(TARGETS libmariadb COMPONENT SharedLibraries DESTINATION ${INSTALL_LIBDIR}) +- +INSTALL(TARGETS libmariadbprivate + COMPONENT SharedLibraries + DESTINATION ${INSTALL_LIBDIR}) IF(WIN32) - # On Windows, install PDB -Index: mariadb-connector-c-3.0.5-src/mariadb_config/mariadb_config.c.in + IF(${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo") +Index: mariadb-connector-c-3.0.6-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.6-src.orig/mariadb_config/mariadb_config.c.in ++++ mariadb-connector-c-3.0.6-src/mariadb_config/mariadb_config.c.in @@ -7,6 +7,8 @@ static char *mariadb_progname; #define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb"