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
This commit is contained in:
Adam Majer 2018-08-09 10:28:56 +00:00 committed by Git OBS Bridge
parent 3eeba96340
commit 90645df1a7
7 changed files with 43 additions and 26 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:940017f13a13846153eb9d36290824c4615c8a8be4142b6bbaeb698609f02667
size 664949

View File

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

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2b2d18dc969dc385f7f740e4db112300e11bc626c9ba9aa05c284704095b9e48
size 666819

View File

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

View File

@ -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 Fri Jun 29 15:12:47 UTC 2018 - kstreitova@suse.com

View File

@ -19,13 +19,13 @@
%define sover 3 %define sover 3
%define libname libmariadb %define libname libmariadb
# equivalent mariadb version # equivalent mariadb version
%define mariadb_version 10.2.10 %define mariadb_version 10.2.16
%if ! %{defined _rundir} %if ! %{defined _rundir}
%define _rundir %{_localstatedir}/run %define _rundir %{_localstatedir}/run
%endif %endif
%bcond_with sqlite3 %bcond_with sqlite3
Name: mariadb-connector-c Name: mariadb-connector-c
Version: 3.0.5 Version: 3.0.6
Release: 0 Release: 0
Summary: MariaDB connector in C Summary: MariaDB connector in C
License: LGPL-2.1-or-later License: LGPL-2.1-or-later

View File

@ -8,10 +8,10 @@ static linking, create a private shared library that simply
exports all symbols. With the exception of exported symbols, it is exports all symbols. With the exception of exported symbols, it is
identical to the regular library. 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.6-src.orig/libmariadb/CMakeLists.txt
+++ mariadb-connector-c-3.0.5-src/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) @@ -403,16 +403,24 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC)
SET_TARGET_PROPERTIES(mariadbclient PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64") SET_TARGET_PROPERTIES(mariadbclient PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64")
ENDIF() ENDIF()
@ -26,8 +26,8 @@ Index: mariadb-connector-c-3.0.5-src/libmariadb/CMakeLists.txt
IF (NOT WITH_ASAN) IF (NOT WITH_ASAN)
TARGET_LINK_LIBRARIES (libmariadb "-Wl,--no-undefined") TARGET_LINK_LIBRARIES (libmariadb "-Wl,--no-undefined")
ENDIF() ENDIF()
TARGET_LINK_LIBRARIES (libmariadb "${CC_BINARY_DIR}/libmariadb/mariadbclient.def") SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINK_FLAGS "${CC_BINARY_DIR}/libmariadb/mariadbclient.def")
+ TARGET_LINK_LIBRARIES (libmariadbprivate "-Wl,--no-undefined") + SET_TARGET_PROPERTIES(libmariadbprivate PROPERTIES LINK_FLAGS "-Wl,--no-undefined")
ENDIF() ENDIF()
SET_TARGET_PROPERTIES(mariadbclient PROPERTIES IMPORTED_INTERFACE_LINK_LIBRARIES "${SYSTEM_LIBS}") 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 "") SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "")
# #
@@ -442,6 +450,9 @@ INSTALL(TARGETS mariadbclient @@ -446,7 +454,9 @@ INSTALL(TARGETS mariadbclient
INSTALL(TARGETS libmariadb INSTALL(TARGETS libmariadb
COMPONENT SharedLibraries COMPONENT SharedLibraries
DESTINATION ${INSTALL_LIBDIR}) DESTINATION ${INSTALL_LIBDIR})
-
+INSTALL(TARGETS libmariadbprivate +INSTALL(TARGETS libmariadbprivate
+ COMPONENT SharedLibraries + COMPONENT SharedLibraries
+ DESTINATION ${INSTALL_LIBDIR}) + DESTINATION ${INSTALL_LIBDIR})
IF(WIN32) IF(WIN32)
# On Windows, install PDB IF(${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
Index: mariadb-connector-c-3.0.5-src/mariadb_config/mariadb_config.c.in 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.6-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/mariadb_config/mariadb_config.c.in
@@ -7,6 +7,8 @@ static char *mariadb_progname; @@ -7,6 +7,8 @@ static char *mariadb_progname;
#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb" #define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb"