Accepting request 625058 from server:database

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/625058
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=12

absolute_path_fix.patch

@@ -2,19 +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.3-src/mariadb_config/mariadb_config.c.in
+Index: mariadb-connector-c-3.0.5-src/mariadb_config/mariadb_config.c.in
 ===================================================================
---- mariadb-connector-c-3.0.3-src.orig/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.3-src/mariadb_config/mariadb_config.c.in
++++ mariadb-connector-c-3.0.5-src/mariadb_config/mariadb_config.c.in
-@@ -5,14 +5,14 @@
+@@ -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 "\
+-#define LIBS    "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb @extra_dynamic_LDFLAGS@"
 +#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb"
-+#define LIBS    "-L@INSTALL_LIBDIR@ -lmariadb "\
++#define LIBS    "-L@INSTALL_LIBDIR@ -lmariadb @extra_dynamic_LDFLAGS@"
-                 "@extra_dynamic_LDFLAGS@"
  #define LIBS_SYS "@extra_dynamic_LDFLAGS@"
  #define CFLAGS  INCLUDE
  #define VERSION "@MARIADB_CLIENT_VERSION@"
@@ -24,10 +23,10 @@ Index: mariadb-connector-c-3.0.3-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.3-src/mariadb_config/libmariadb.pc.in
+Index: mariadb-connector-c-3.0.5-src/mariadb_config/libmariadb.pc.in
 ===================================================================
---- mariadb-connector-c-3.0.3-src.orig/mariadb_config/libmariadb.pc.in
+--- mariadb-connector-c-3.0.5-src.orig/mariadb_config/libmariadb.pc.in
-+++ mariadb-connector-c-3.0.3-src/mariadb_config/libmariadb.pc.in
++++ mariadb-connector-c-3.0.5-src/mariadb_config/libmariadb.pc.in
 @@ -6,14 +6,14 @@
  #  Dan Nicholson’s Guide to pkg-config (http://www.freedesktop.org/wiki/Software/pkg-config/)
  #

mariadb-connector-c-2.3.1_unresolved_symbols.patch

@@ -1,12 +1,14 @@
-Index: mariadb-connector-c-3.0.2-src/plugins/auth/CMakeLists.txt
+Index: mariadb-connector-c-3.0.5-src/plugins/auth/CMakeLists.txt
 ===================================================================
---- mariadb-connector-c-3.0.2-src.orig/plugins/auth/CMakeLists.txt
+--- mariadb-connector-c-3.0.5-src.orig/plugins/auth/CMakeLists.txt
-+++ mariadb-connector-c-3.0.2-src/plugins/auth/CMakeLists.txt
++++ mariadb-connector-c-3.0.5-src/plugins/auth/CMakeLists.txt
-@@ -21,6 +21,7 @@ IF(AUTH_DIALOG_PLUGIN_TYPE MATCHES "DYNA
+@@ -16,7 +16,8 @@ REGISTER_PLUGIN(TARGET dialog
-     SET(DIALOG_SOURCES ${DIALOG_SOURCES} ${CC_SOURCE_DIR}/plugins/plugin.def)
+                 CONFIGURATIONS DYNAMIC STATIC OFF
-   ENDIF()
+                 DEFAULT DYNAMIC
-   ADD_LIBRARY(dialog MODULE ${DIALOG_SOURCES})
+                 SOURCES ${CC_SOURCE_DIR}/plugins/auth/dialog.c
-+  TARGET_LINK_LIBRARIES(dialog dl)
+-                        ${CC_SOURCE_DIR}/libmariadb/get_password.c)
-   SET_TARGET_PROPERTIES(dialog PROPERTIES PREFIX "")
++                        ${CC_SOURCE_DIR}/libmariadb/get_password.c
-   SIGN_TARGET(dialog)
++                LIBRARIES dl)
-   INSTALL_PLUGIN(dialog ${CC_BINARY_DIR}/plugins/auth)
+ 
+ #GSSAPI client authentication plugin
+ IF(NOT WIN32)

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

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:210f0ee3414b235d3db8e98e9e5a0a98381ecf771e67ca4a688036368984eeea
-size 666928

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

@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQEcBAABCAAGBQJaX2KNAAoJEM4aPdXjyU9JbowIAIov5HuFK79EHQgAdZ+s2AVZ
-ZdPb5VIR8ql3lbr36jPtD0x/Tpn9IsHSfxMEQ+MZBNp4wDurKTIsloSZsRCXfZuX
-5WxRKn6yeYHA6wwe9vJtydS4uRHxbZta8zfIHZqH5NR328Qrsn4Okj7vk5Ps/r8Z
-xXHE07eaEjl7bDX6ehLoaLazz3gIOlLl0CB2VWRN3OVQw31CgP9Ejmcl1uCMA33g
-kANYQZsZB5hyEBultpesuSvxnJmNBK15d77mS6erGBNPSMMms8u/Mju4kqgC8s32
-SXvkswFqFzgHpTK5V2e7//H+muGeaQBzR/L8Rs0Yi8oLmkT3u6qS2KlApn9N9ZU=
-=bU47
------END PGP SIGNATURE-----

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

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

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

@@ -0,0 +1,11 @@
+-----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-----

mariadb-connector-c.changes

@@ -1,3 +1,47 @@
+-------------------------------------------------------------------
+Fri Jun 29 15:12:47 UTC 2018 - kstreitova@suse.com
+
+- New upstream version 3.0.5
+- 3.0.5 important changes:
+  * CONC-336: Allow multiple initialization of client library
+  * Fixed string to MYSQL_TIME conversion (prepared statements)
+  * CONC-334: Copy all members of MYSQL_FIELD to internal
+    statement structure
+  * Fixed double free in dynamic column library
+  * Added checks for corrupted packets in protocol
+  * MDEV-15450: Added default connection attribute _server_host
+  * CONC-326: fixed wrong openssl thread id callback
+- 3.0.4 important changes:
+  * Added option MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS for
+    mysql_options()/mysql_optionsv():
+  * New plugin configuration interface: The default configuration
+    for a specific plugin can be specified via cmake parameter
+    -DCLIENT_PLUGIN_${PLUGIN}=[DYNAMIC|STATIC|OFF].
+  * Added support for linux abstract socket (MDEV-15655).
+  * CONC-320: Added asynchronous/non-blocking support for
+    OpenSSL and GnuTLS
+  * CONC-294: Access violation in mysql_close when using
+    a connection plugin.
+  * MDEV-14977: If built dynamically the old_password plugin
+    could not be located due to wrong filename (must be
+    mysql_old_password.so instead of old_password.so).
+  * CONC-315: If no default client character set was specified,
+    the utf8 character set will be used by default (instead of
+    setting the client character set to server character set)
+  * CONC-317: Parsing of configuration file fails if key/value
+    pairs contain white spaces.
+  * CONC-322: Correct handling of EAGAIN and EINPROGRESS in
+    internal_connect (socket) for non windows platforms.
+  * CONC-323: mariadb_stmt_execute_direct hangs forever if
+    compression used.
+  * CONC-324: Wrong codepage numbers for some collations.
+  * CONC-326: ssl_thread_init() uses wrong openssl threadid
+    callback
+- refresh the following patches:
+  * mariadb-connector-c-2.3.1_unresolved_symbols.patch
+  * absolute_path_fix.patch
+  * private_library.patch
+
 -------------------------------------------------------------------
 Fri Jun 29 10:00:42 UTC 2018 - adam.majer@suse.de
 

mariadb-connector-c.spec

@@ -25,7 +25,7 @@
 %endif
 %bcond_with sqlite3
 Name:           mariadb-connector-c
-Version:        3.0.3
+Version:        3.0.5
 Release:        0
 Summary:        MariaDB connector in C
 License:        LGPL-2.1-or-later

private_library.patch

@@ -8,11 +8,11 @@ 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.3-src/libmariadb/CMakeLists.txt
+Index: mariadb-connector-c-3.0.5-src/libmariadb/CMakeLists.txt
 ===================================================================
---- mariadb-connector-c-3.0.3-src.orig/libmariadb/CMakeLists.txt
+--- mariadb-connector-c-3.0.5-src.orig/libmariadb/CMakeLists.txt
-+++ mariadb-connector-c-3.0.3-src/libmariadb/CMakeLists.txt
++++ mariadb-connector-c-3.0.5-src/libmariadb/CMakeLists.txt
-@@ -391,16 +391,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")
  ENDIF()
  
@@ -23,7 +23,7 @@ Index: mariadb-connector-c-3.0.3-src/libmariadb/CMakeLists.txt
 +ENDIF()
 +
  IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-   IF (NOT WITH_ASAN AND NOT WITH_TSAN)
+   IF (NOT WITH_ASAN)
      TARGET_LINK_LIBRARIES (libmariadb "-Wl,--no-undefined")
    ENDIF()
    TARGET_LINK_LIBRARIES (libmariadb "${CC_BINARY_DIR}/libmariadb/mariadbclient.def")
@@ -36,8 +36,8 @@ Index: mariadb-connector-c-3.0.3-src/libmariadb/CMakeLists.txt
 +SET_TARGET_PROPERTIES(libmariadbprivate PROPERTIES PREFIX "")
  SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "")
  
- SET_TARGET_PROPERTIES(libmariadb PROPERTIES VERSION
+ #
-@@ -434,6 +442,9 @@ INSTALL(TARGETS mariadbclient
+@@ -442,6 +450,9 @@ INSTALL(TARGETS mariadbclient
  INSTALL(TARGETS libmariadb
            COMPONENT SharedLibraries
          DESTINATION ${INSTALL_LIBDIR})
@@ -47,20 +47,20 @@ Index: mariadb-connector-c-3.0.3-src/libmariadb/CMakeLists.txt
  
  IF(WIN32)
     # On Windows, install PDB
-Index: mariadb-connector-c-3.0.3-src/mariadb_config/mariadb_config.c.in
+Index: mariadb-connector-c-3.0.5-src/mariadb_config/mariadb_config.c.in
 ===================================================================
---- mariadb-connector-c-3.0.3-src.orig/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.3-src/mariadb_config/mariadb_config.c.in
++++ mariadb-connector-c-3.0.5-src/mariadb_config/mariadb_config.c.in
-@@ -8,6 +8,8 @@ static char *mariadb_progname;
+@@ -7,6 +7,8 @@ static char *mariadb_progname;
+ 
  #define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb"
- #define LIBS    "-L@INSTALL_LIBDIR@ -lmariadb "\
+ #define LIBS    "-L@INSTALL_LIBDIR@ -lmariadb @extra_dynamic_LDFLAGS@"
-                 "@extra_dynamic_LDFLAGS@"
 +#define PRIVATE_LIBS "-L@INSTALL_LIBDIR@ -lmariadbprivate " \
 +                "@extra_dynamic_LDFLAGS@"
  #define LIBS_SYS "@extra_dynamic_LDFLAGS@"
  #define CFLAGS  INCLUDE
  #define VERSION "@MARIADB_CLIENT_VERSION@"
-@@ -31,6 +33,7 @@ static struct option long_options[]=
+@@ -30,6 +32,7 @@ static struct option long_options[]=
    {"port", no_argument, 0, 'i'},
    {"plugindir", no_argument, 0, 'j'},
    {"tlsinfo", no_argument, 0, 'k'},
@@ -68,7 +68,7 @@ Index: mariadb-connector-c-3.0.3-src/mariadb_config/mariadb_config.c.in
    {NULL, 0, 0, 0}
  };
  
-@@ -46,6 +49,7 @@ static const char *values[]=
+@@ -45,6 +48,7 @@ static const char *values[]=
    CC_VERSION,
    SOCKET,
    PORT,
@@ -76,7 +76,7 @@ Index: mariadb-connector-c-3.0.3-src/mariadb_config/mariadb_config.c.in
    PLUGIN_DIR,
    TLS_LIBRARY_VERSION
  };
-@@ -116,6 +120,9 @@ int main(int argc, char **argv)
+@@ -115,6 +119,9 @@ int main(int argc, char **argv)
      case 'l':
        puts(LIBS_SYS);
        break;