From ce9f01eb7c815c868c5dc084ce89845b12433b37d019b3c8da690c49a9b423ff Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Thu, 27 May 2021 10:56:47 +0000 Subject: [PATCH 1/3] Accepting request 895737 from home:kstreitova:branches:server:database - Update to release 3.1.13 [bsc#1185870], [bsc#1185872], [bsc#1185868] * CONC-537: Only read from MYSQL_HOME if MARIADB_HOME was not set * CONC-548: Symbol conflict with libsodium * CONC-490: Handshake error when CLIENT_CONNECT_WITH_DB flag was set without specifying database * CONC-543: Hash functions conflict with GnuTLS * CONC-539: Added cipher suites ECDHE-RSA-AES128-SHA256 (0xC027) and ECDHE-RSA-AES256-SHA384 (0xC028) to the cipher map which maps cipher suite names to the corresponding algorithm ids (Windows Schannel) * CONC-535: Disabled checksum ignored in events (replication/ binlog API) - Remove mariadb-connector-c-cmake-3.20.patch (upstreamed) OBS-URL: https://build.opensuse.org/request/show/895737 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb-connector-c?expand=0&rev=67 --- mariadb-connector-c-3.1.12-src.tar.gz | 3 --- mariadb-connector-c-3.1.12-src.tar.gz.asc | 11 ----------- mariadb-connector-c-3.1.13-src.tar.gz | 3 +++ mariadb-connector-c-3.1.13-src.tar.gz.asc | 11 +++++++++++ mariadb-connector-c-cmake-3.20.patch | 24 ----------------------- mariadb-connector-c.changes | 17 ++++++++++++++++ mariadb-connector-c.spec | 4 +--- 7 files changed, 32 insertions(+), 41 deletions(-) delete mode 100644 mariadb-connector-c-3.1.12-src.tar.gz delete mode 100644 mariadb-connector-c-3.1.12-src.tar.gz.asc create mode 100644 mariadb-connector-c-3.1.13-src.tar.gz create mode 100644 mariadb-connector-c-3.1.13-src.tar.gz.asc delete mode 100644 mariadb-connector-c-cmake-3.20.patch diff --git a/mariadb-connector-c-3.1.12-src.tar.gz b/mariadb-connector-c-3.1.12-src.tar.gz deleted file mode 100644 index 3b5119c..0000000 --- a/mariadb-connector-c-3.1.12-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2f5ae14708b4813e4ff6857d152c22e6fc0e551c9fa743c1ef81a68e3254fe63 -size 966702 diff --git a/mariadb-connector-c-3.1.12-src.tar.gz.asc b/mariadb-connector-c-3.1.12-src.tar.gz.asc deleted file mode 100644 index 32ec6ec..0000000 --- a/mariadb-connector-c-3.1.12-src.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEcBAABCAAGBQJgLnuNAAoJEM4aPdXjyU9JlggH/3xXZlm1Ftgf89DkMrRTHcOM -6cL0Ke9galIwttsyd/FTHsg9V6+LJFzhj/jT4FpG0vxhKD8C4kCbLJPgvxzKveD2 -Ma4CEd/EO1GylUOLtpqOORyhPPKYDOeDtPPq0ndj1GwaJF3hwIEKuvH04IQfGVm6 -7NgQqih15hCY6VPHl+CGvb1HrORSJe2sN1XXnl+BND34U5l3kNoghiC2IafpGEM3 -WQJctqo742rP0WeJ+3p3T+TpPj36Y/+gUiQ0HUq52LWfCbEp6BwmipJ2H4+tKyEt -CPtc6Dah63xupm8ItFQjZVSeblPJVmnMiaavTfcw9PBLD6OsJrd6qhVpxTlG/hU= -=cdLo ------END PGP SIGNATURE----- diff --git a/mariadb-connector-c-3.1.13-src.tar.gz b/mariadb-connector-c-3.1.13-src.tar.gz new file mode 100644 index 0000000..9752ff5 --- /dev/null +++ b/mariadb-connector-c-3.1.13-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0271a5edfd64b13bca5937267474e4747d832ec62e169fc2589d2ead63746875 +size 968401 diff --git a/mariadb-connector-c-3.1.13-src.tar.gz.asc b/mariadb-connector-c-3.1.13-src.tar.gz.asc new file mode 100644 index 0000000..25c84e9 --- /dev/null +++ b/mariadb-connector-c-3.1.13-src.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAABCAAGBQJgmsf1AAoJEM4aPdXjyU9JSokIAIt+QDFuH6do56ohf8ITyhG+ +9JEIvNo/q7DPEc6NyBB9PaI800apcyDbe9ief+TtiA8KECSopVOoW2LZsxGOBCiI +8+rjMJUPQ7IJyecBuCeIrfZyilVw0oU0R776rWsCT5uPWdo+cj8wtHJchgRsIHJa +I5ZptX76+cZwyf+j0I52Ihgp1BukJNUCLiygfaK5fGc/Wd3Wy4Q7b9h+hwQ+ZsqT +PcUzHvcpnq0wIgkA9fuzslIzKRaqAaIhsM1gEtkpQm4ncl189bXTOyzgrlR399eb +cjVUkTCZnJZU5reskEasp6XpAfEIAJZfROI6HSWz7ulRnL7lW8DdeuKplZtTXWA= +=jtOS +-----END PGP SIGNATURE----- diff --git a/mariadb-connector-c-cmake-3.20.patch b/mariadb-connector-c-cmake-3.20.patch deleted file mode 100644 index 10af29c..0000000 --- a/mariadb-connector-c-cmake-3.20.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 242cab8cbcd91af882233730a83627d3b12ced83 Mon Sep 17 00:00:00 2001 -From: Vladislav Vaintroub -Date: Fri, 12 Mar 2021 00:01:11 +0100 -Subject: [PATCH] Fix syntax error in cmake 3.20 - -https://github.com/mariadb-corporation/mariadb-connector-c/commit/242cab8cbc - ---- - cmake/ConnectorName.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/ConnectorName.cmake b/cmake/ConnectorName.cmake -index b7bbbad8..357b8ac0 100644 ---- a/cmake/ConnectorName.cmake -+++ b/cmake/ConnectorName.cmake -@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows") - SET(MACHINE_NAME "x64") - ELSE() - SET(MACHINE_NAME "32") -- END() -+ ENDIF() - ENDIF() - - SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}") diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index 6c4ddea..eb94eb5 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Thu May 27 09:31:16 UTC 2021 - Kristyna Streitova + +- Update to release 3.1.13 [bsc#1185870], [bsc#1185872], [bsc#1185868] + * CONC-537: Only read from MYSQL_HOME if MARIADB_HOME was not set + * CONC-548: Symbol conflict with libsodium + * CONC-490: Handshake error when CLIENT_CONNECT_WITH_DB flag was + set without specifying database + * CONC-543: Hash functions conflict with GnuTLS + * CONC-539: Added cipher suites ECDHE-RSA-AES128-SHA256 (0xC027) + and ECDHE-RSA-AES256-SHA384 (0xC028) to the cipher map which + maps cipher suite names to the corresponding algorithm ids + (Windows Schannel) + * CONC-535: Disabled checksum ignored in events (replication/ + binlog API) +- Remove mariadb-connector-c-cmake-3.20.patch (upstreamed) + ------------------------------------------------------------------- Thu Apr 29 12:04:20 UTC 2021 - Dominique Leuenberger diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index f7a88ce..a14f3b9 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.12 +Version: 3.1.13 Release: 0 Summary: MariaDB connector in C License: LGPL-2.1-or-later @@ -39,7 +39,6 @@ Source3: baselibs.conf Patch1: mariadb-connector-c-2.3.1_unresolved_symbols.patch Patch3: absolute_path_fix.patch Patch4: private_library.patch -Patch5: mariadb-connector-c-cmake-3.20.patch BuildRequires: cmake BuildRequires: curl-devel BuildRequires: pkgconfig @@ -116,7 +115,6 @@ This package holds the development files. %patch1 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 %build # plugin types seems to require no aliasing assumptions From eae9b5c259facbfb8478de9921ca4f2eb92ec67550fea83411910ed427793301 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 28 May 2021 07:35:43 +0000 Subject: [PATCH 2/3] Accepting request 895835 from home:kstreitova:branches:server:database - set INSTALL_LAYOUT=RPM and adjust libdir, includedir, plugindir and pcdir values to fix mariadb_config output. Also fix the missing "%s" in private_library.patch so it shows the correct path for plugindir [bsc#1179921] [bsc#1183878] OBS-URL: https://build.opensuse.org/request/show/895835 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb-connector-c?expand=0&rev=68 --- mariadb-connector-c.changes | 8 ++++++++ mariadb-connector-c.spec | 9 +++++---- private_library.patch | 14 +++++++------- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index eb94eb5..16882be 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu May 27 18:48:59 UTC 2021 - Kristyna Streitova + +- set INSTALL_LAYOUT=RPM and adjust libdir, includedir, plugindir + and pcdir values to fix mariadb_config output. Also fix the + missing "%s" in private_library.patch so it shows the correct + path for plugindir [bsc#1179921] [bsc#1183878] + ------------------------------------------------------------------- Thu May 27 09:31:16 UTC 2021 - Kristyna Streitova diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index a14f3b9..9f2445a 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -127,12 +127,13 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" %endif -DWITH_EXTERNAL_ZLIB:BOOL=ON \ -DMARIADB_UNIX_ADDR:STRING=%{_rundir}/mysql/mysql.sock \ - -DINSTALL_LIBDIR:STRING=%{_libdir} \ - -DINSTALL_INCLUDEDIR:STRING=%{_includedir}/mysql \ - -DINSTALL_PLUGINDIR:STRING=%{_libdir}/mysql/plugin/ \ + -DINSTALL_LAYOUT=RPM \ + -DINSTALL_LIBDIR:STRING=%{_lib} \ + -DINSTALL_INCLUDEDIR:STRING=include/mysql \ + -DINSTALL_PLUGINDIR:STRING=%{_lib}/mysql/plugin/ \ -DWITH_MYSQLCOMPAT=ON \ -DWITH_SSL=OPENSSL \ - -DINSTALL_PCDIR="%{_libdir}/pkgconfig" + -DINSTALL_PCDIR="%{_lib}/pkgconfig" %make_jobs %install diff --git a/private_library.patch b/private_library.patch index a15cd6c..7b72a22 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.11-src/libmariadb/CMakeLists.txt +Index: mariadb-connector-c-3.1.13-src/libmariadb/CMakeLists.txt =================================================================== ---- mariadb-connector-c-3.1.11-src.orig/libmariadb/CMakeLists.txt -+++ mariadb-connector-c-3.1.11-src/libmariadb/CMakeLists.txt +--- mariadb-connector-c-3.1.13-src.orig/libmariadb/CMakeLists.txt ++++ mariadb-connector-c-3.1.13-src/libmariadb/CMakeLists.txt @@ -414,6 +414,12 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC) SET_TARGET_PROPERTIES(mariadbclient PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64") ENDIF() @@ -50,15 +50,15 @@ Index: mariadb-connector-c-3.1.11-src/libmariadb/CMakeLists.txt IF(MSVC) # On Windows, install PDB -Index: mariadb-connector-c-3.1.11-src/mariadb_config/mariadb_config.c.in +Index: mariadb-connector-c-3.1.13-src/mariadb_config/mariadb_config.c.in =================================================================== ---- mariadb-connector-c-3.1.11-src.orig/mariadb_config/mariadb_config.c.in -+++ mariadb-connector-c-3.1.11-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.1.13-src/mariadb_config/mariadb_config.c.in @@ -30,6 +30,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@" -+#define PRIVATE_LIBS "-L@INSTALL_LIBDIR@ -lmariadbprivate " LIBS_SYS ++#define PRIVATE_LIBS "-L%s/@INSTALL_LIBDIR@ -lmariadbprivate " LIBS_SYS #define CFLAGS INCLUDE #define VERSION "@MARIADB_CLIENT_VERSION@" #define CC_VERSION "@CPACK_PACKAGE_VERSION@" From b2c9ce7217f2a8f6aee618be3a09a3463660c847060fe76418e9586f150b972a Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 17 Jun 2021 12:25:39 +0000 Subject: [PATCH 3/3] Accepting request 900561 from home:dirkmueller:Factory - drop absolute_path_fix.patch: obsolete after previous change (properly setting INSTALL_LAYOUT and libdir) OBS-URL: https://build.opensuse.org/request/show/900561 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb-connector-c?expand=0&rev=69 --- absolute_path_fix.patch | 32 -------------------------------- mariadb-connector-c.changes | 6 ++++++ mariadb-connector-c.spec | 2 -- 3 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 absolute_path_fix.patch diff --git a/absolute_path_fix.patch b/absolute_path_fix.patch deleted file mode 100644 index 5ae92af..0000000 --- a/absolute_path_fix.patch +++ /dev/null @@ -1,32 +0,0 @@ -Author: Adam Majer -Date: Fri Mar 3 15:59:09 CET 2017 -Summary: Remove pure ugliness with paths - -Index: mariadb-connector-c-3.1.11-src/mariadb_config/libmariadb.pc.in -=================================================================== ---- mariadb-connector-c-3.1.11-src.orig/mariadb_config/libmariadb.pc.in -+++ mariadb-connector-c-3.1.11-src/mariadb_config/libmariadb.pc.in -@@ -7,8 +7,8 @@ - # - - prefix=@CMAKE_INSTALL_PREFIX@ --includedir=${prefix}/@INSTALL_INCLUDEDIR@/@SUFFIX_INSTALL_DIR@ --libdir=${prefix}/@INSTALL_LIBDIR@/@SUFFIX_INSTALL_DIR@ -+includedir=@INSTALL_INCLUDEDIR@ -+libdir=@INSTALL_LIBDIR@ - - Name: libmariadb - Version: @CPACK_PACKAGE_VERSION@ -Index: mariadb-connector-c-3.1.11-src/mariadb_config/mariadb_config.c.in -=================================================================== ---- mariadb-connector-c-3.1.11-src.orig/mariadb_config/mariadb_config.c.in -+++ mariadb-connector-c-3.1.11-src/mariadb_config/mariadb_config.c.in -@@ -210,7 +210,7 @@ end: - } - if (!p || !p[0]) - { -- strncpy(installation_dir, "@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@", PATH_MAX - 1); -+ installation_dir[0] = 0; - return; - } - } diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index 16882be..79f40d7 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 17 11:21:36 UTC 2021 - Dirk Müller + +- drop absolute_path_fix.patch: obsolete after previous change + (properly setting INSTALL_LAYOUT and libdir) + ------------------------------------------------------------------- Thu May 27 18:48:59 UTC 2021 - Kristyna Streitova diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 9f2445a..8a1cb2c 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -37,7 +37,6 @@ Source1: https://downloads.mariadb.com/Connectors/c/connector-c-%{version Source2: mariadb.keyring Source3: baselibs.conf Patch1: mariadb-connector-c-2.3.1_unresolved_symbols.patch -Patch3: absolute_path_fix.patch Patch4: private_library.patch BuildRequires: cmake BuildRequires: curl-devel @@ -113,7 +112,6 @@ This package holds the development files. %prep %setup -q -n %{name}-%{version}-src %patch1 -p1 -%patch3 -p1 %patch4 -p1 %build