Accepting request 957416 from home:dspinella:branches:server:database

- Update to 3.2.6:
  * release notes and changelog:
    https://mariadb.com/kb/en/library/mariadb-connector-c-326-release-notes
    https://mariadb.com/kb/en/library/mariadb-connector-c-326-changelog
- Refresh private_library.patch

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

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

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:296b992aec9fdb63fb971163e00ff6d9299b09459fba2802a839e3185b8d0e70
-size 992580

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

@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQEcBAABCAAGBQJhjAgjAAoJEM4aPdXjyU9JmSgIANOfjQLOXgq7JSa+IDHwgBEg
-Tb0QTWvkWo/d75qgmy1U3fPRBnM8uXBgHnfga3CpSIRT/573EbiYSYVxMaatkfuj
-8hL5Di4u7Ut4R15hx3d2tBMKyuRknPuFbaTVgggoxGTT8JPEwInv0RnBSXHiVJK8
-NGGKi9hjbx7b8TJfrxhxlwfbLp/FMn3DWV0zcBGm2jZPjAZ/uce1yOh8h/NJBcpz
-X3oSYo/KV20+3EHnDnOhnRC70c01uD4cQirhlilqL2bLY7u+TL7mcSa+O8wLm9hW
-B+8qcTwV1XcZOo1zFKgUGCiQ9VzUV6pjqm3Qa76xmR9+DlV1sFThwDdFZri97zs=
-=0hmS
------END PGP SIGNATURE-----

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

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9c22fff9d18db7ebdcb63979882fb6b68d2036cf2eb62f043eac922cd36bdb91
+size 992992

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

@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAABCAAGBQJiCqfzAAoJEM4aPdXjyU9JYt0IAN4uRkqmf+yUnmQ3SuE0sGok
+hdxAT1X5Wm0HX0Ia8OWUjt8V0rVdE/WcFgqxq+X5wlYrCnHg9YW82sSRrMlaK1ZT
+bMEVs9B5gxaUWlhmjcLVKLQfuXoXPOLYN/kMVeWxrfMudwlCGmhRKAHcj5Bs+PRL
+XtlQhSCOwcmStbBdB4fHtdoX89YhrWLqhvJMZno2d3ietB30PoWXAWxcU9m2BXL4
+OwXMNMnSDC3bvVhvkU9zsmfUzYzSEsQX/gonHuJEyzSNByEZhejwDIeDnR9TmZnx
+Zvi/v1SHlxuqYzyFPxnKCg4VAMhW8Mg6oC6/c89gjyiJDFi7NdpDgrkVNOdKiOM=
+=y6Lw
+-----END PGP SIGNATURE-----

mariadb-connector-c.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Feb 24 14:05:48 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>
+
+- Update to 3.2.6:
+  * release notes and changelog:
+    https://mariadb.com/kb/en/library/mariadb-connector-c-326-release-notes
+    https://mariadb.com/kb/en/library/mariadb-connector-c-326-changelog
+- Refresh private_library.patch
+
 -------------------------------------------------------------------
 Thu Nov 18 15:55:18 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>
 

mariadb-connector-c.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package mariadb-connector-c
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@
 %endif
 %bcond_with sqlite3
 Name:           mariadb-connector-c
-Version:        3.2.5
+Version:        3.2.6
 Release:        0
 Summary:        MariaDB connector in C
 License:        LGPL-2.1-or-later
@@ -141,6 +141,7 @@ export CFLAGS="%{optflags} -fno-strict-aliasing"
 rm %{buildroot}%{_libdir}/libmariadbclient.a
 rm %{buildroot}%{_libdir}/libmysqlclient.a
 rm %{buildroot}%{_libdir}/libmysqlclient_r.a
+rm %{buildroot}%{_libdir}/libmariadb.a
 
 # add a compatibility symlinks
 ln -s mariadb_config %{buildroot}%{_bindir}/mysql_config

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.1.13-src/libmariadb/CMakeLists.txt
+Index: mariadb-connector-c-3.2.6-src/libmariadb/CMakeLists.txt
 ===================================================================
---- mariadb-connector-c-3.1.13-src.orig/libmariadb/CMakeLists.txt
+--- mariadb-connector-c-3.2.6-src.orig/libmariadb/CMakeLists.txt
-+++ mariadb-connector-c-3.1.13-src/libmariadb/CMakeLists.txt
++++ mariadb-connector-c-3.2.6-src/libmariadb/CMakeLists.txt
-@@ -414,6 +414,12 @@ TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE ${SYSTEM_LIBS})
+@@ -416,6 +416,12 @@ TARGET_LINK_LIBRARIES(libmariadb LINK_PR
  
  SIGN_TARGET(libmariadb)
  
@@ -25,7 +25,7 @@ Index: mariadb-connector-c-3.1.13-src/libmariadb/CMakeLists.txt
  IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR
     CMAKE_SYSTEM_NAME MATCHES "kFreeBSD" OR
     CMAKE_SYSTEM_NAME MATCHES "GNU")
-@@ -421,11 +427,13 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR
+@@ -423,11 +429,13 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR
      TARGET_LINK_LIBRARIES (libmariadb LINK_PRIVATE "-Wl,--no-undefined")
    ENDIF()
    SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINK_FLAGS "${CC_BINARY_DIR}/libmariadb/mariadbclient.def")
@@ -39,22 +39,21 @@ Index: mariadb-connector-c-3.1.13-src/libmariadb/CMakeLists.txt
  SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "")
  
  #
-@@ -461,7 +469,9 @@ INSTALL(TARGETS mariadbclient
+@@ -469,6 +477,9 @@ INSTALL(TARGETS libmariadb LIBRARY DESTI
- INSTALL(TARGETS libmariadb
+         COMPONENT SharedLibraries NAMELINK_SKIP)
-           COMPONENT SharedLibraries
+ INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR}
-         DESTINATION ${INSTALL_LIBDIR})
+         COMPONENT Development NAMELINK_ONLY)
--
 +INSTALL(TARGETS libmariadbprivate
-+          COMPONENT SharedLibraries
++        COMPONENT SharedLibraries
-+          DESTINATION ${INSTALL_LIBDIR})
++        DESTINATION ${INSTALL_LIBDIR})
  
  IF(MSVC)
     # On Windows, install PDB
-Index: mariadb-connector-c-3.1.13-src/mariadb_config/mariadb_config.c.in
+Index: mariadb-connector-c-3.2.6-src/mariadb_config/mariadb_config.c.in
 ===================================================================
---- mariadb-connector-c-3.1.13-src.orig/mariadb_config/mariadb_config.c.in
+--- mariadb-connector-c-3.2.6-src.orig/mariadb_config/mariadb_config.c.in
-+++ mariadb-connector-c-3.1.13-src/mariadb_config/mariadb_config.c.in
++++ mariadb-connector-c-3.2.6-src/mariadb_config/mariadb_config.c.in
-@@ -30,6 +30,7 @@ static char *mariadb_progname;
+@@ -33,6 +33,7 @@ static char *mariadb_progname;
  #define INCLUDE "-I%s/@INSTALL_INCLUDEDIR@ -I%s/@INSTALL_INCLUDEDIR@/mysql"
  #define LIBS    "-L%s/@INSTALL_LIBDIR@/ -lmariadb"
  #define LIBS_SYS "@extra_dynamic_LDFLAGS@"
@@ -62,15 +61,15 @@ Index: mariadb-connector-c-3.1.13-src/mariadb_config/mariadb_config.c.in
  #define CFLAGS  INCLUDE
  #define VERSION "@MARIADB_CLIENT_VERSION@"
  #define CC_VERSION "@CPACK_PACKAGE_VERSION@"
-@@ -65,6 +66,7 @@ static struct option long_options[]=
+@@ -72,6 +73,7 @@ static struct option long_options[]=
    {OPT_STRING_TYPE "plugindir", no_argument, 0, 'j'},
    {OPT_STRING_TYPE "tlsinfo", no_argument, 0, 'k'},
    {OPT_STRING_TYPE "variable", 2, 0, 'm'},
 +  {OPT_STRING_TYPE "privatelibs", no_argument, 0, 'z'},
-   {NULL, 0, 0, 0}
+ #ifdef HAVE_EMBEDDED
- };
+   {OPT_STRING_TYPE "libmysqld-libs", no_argument, 0, 'n' },
- 
+   {OPT_STRING_TYPE "embedded-libs", no_argument, 0, 'n' },
-@@ -92,6 +94,7 @@ static const char *values[]=
+@@ -104,6 +106,7 @@ static const char *values[]=
    CC_VERSION,
    SOCKET,
    PORT,
@@ -78,13 +77,13 @@ Index: mariadb-connector-c-3.1.13-src/mariadb_config/mariadb_config.c.in
    PLUGIN_DIR,
    TLS_LIBRARY_VERSION,
    "VAR  VAR is one of:"
-@@ -288,6 +291,9 @@ int main(int argc, char **argv)
+@@ -303,6 +306,9 @@ int main(int argc, char **argv)
        }
        break;
      }
 +    case 'z':
 +      puts(PRIVATE_LIBS);
 +      break;
-     default:
+ #ifdef HAVE_EMBEDDED
-       exit((c != -1));
+     case 'n':
-     }
+       puts(EMBEDDED_LIBS);