Hello community,
here is the log from the commit of package mariadb-connector-c for
openSUSE:Factory checked in at 2020-11-09 13:57:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mariadb-connector-c (Old)
and /work/SRC/openSUSE:Factory/.mariadb-connector-c.new.11331 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mariadb-connector-c"
Mon Nov 9 13:57:13 2020 rev:26 rq:846503 version:3.1.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/mariadb-connector-c/mariadb-connector-c.changes
2020-07-09 17:49:05.597448271 +0200
+++
/work/SRC/openSUSE:Factory/.mariadb-connector-c.new.11331/mariadb-connector-c.changes
2020-11-09 13:58:34.963810830 +0100
@@ -1,0 +2,29 @@
+Thu Nov 5 13:53:30 UTC 2020 - Adam Majer <[email protected]>
+
+- Update to release 3.1.11:
+ * CONC-513: MSAN use-of-uninitialized-value in strstr()
+ * CONC-512: truncation check for float values fails on i386 due
+ * to Intel FPU optimization bug in gcc
+ * CONC-510: Fix crash when loading plugins in mysql_server_init()
+ * CONC-508: Added support for passwords > 255 characters
+ * CONC-507: Fixed race condition in ma_net_init
+ * CONC-501: Added support for TLS v1.3 cipher suites
+ * MDEV-21612: Removed unused command COM_MULTI
+
+- changes in release 3.1.10:
+ * CONC-500: Fixed error when loading intermediate chained certificates
+ * MDEV-18818: Fixed wrong zlib in mariadb_config when building
+ inside server package
+ * CONC-498: MYSQL_UNIX_ADDR and MYSQL_PORT are now defined
+ * Added new build option WIITH_ICONV=ON/OFF. When set to OFF (default)
+ API function mariadb_convert_string will always return -1 and
+ sets errorcode to ENOTSUP.
+ * mariadb_config now tries to determine the path of execution or
+ uses MARIADB_CONFIG environment variable before falling back and
+ using CMAKE_INSTALL_PREFIX for location of libraries and include files
+ * added --variables option for mariadb_config.
+ Supported values are pkgincludedir, pkglibdir and pkgplugindir.
+
+- absolute_path_fix.patch, private_library.patch: refreshed
+
+-------------------------------------------------------------------
Old:
----
mariadb-connector-c-3.1.9-src.tar.gz
mariadb-connector-c-3.1.9-src.tar.gz.asc
New:
----
mariadb-connector-c-3.1.11-src.tar.gz
mariadb-connector-c-3.1.11-src.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mariadb-connector-c.spec ++++++
--- /var/tmp/diff_new_pack.KUwp9z/_old 2020-11-09 13:58:36.411807672 +0100
+++ /var/tmp/diff_new_pack.KUwp9z/_new 2020-11-09 13:58:36.415807663 +0100
@@ -25,7 +25,7 @@
%endif
%bcond_with sqlite3
Name: mariadb-connector-c
-Version: 3.1.9
+Version: 3.1.11
Release: 0
Summary: MariaDB connector in C
License: LGPL-2.1-or-later
@@ -117,6 +117,10 @@
%patch4 -p1
%build
+# plugin types seems to require no aliasing assumptions
+%define _lto_cflags %{nil}
+export CFLAGS="%{optflags} -fno-strict-aliasing"
+
%cmake \
%if %{with sqlite3}
-DWITH_SQLITE:BOOL=ON \
@@ -139,10 +143,12 @@
rm %{buildroot}%{_libdir}/libmysqlclient.a
rm %{buildroot}%{_libdir}/libmysqlclient_r.a
-# add a compatibility symlink
+# add a compatibility symlinks
ln -s mariadb_config %{buildroot}%{_bindir}/mysql_config
ln -s mariadb_version.h %{buildroot}%{_includedir}/mysql/mysql_version.h
+ln -s %{_includedir}/mysql %{buildroot}%{_includedir}/mariadb
+
# install some extra required header file
install -Dpm 0644 build/include/ma_config.h \
%{buildroot}%{_includedir}/mysql/my_config.h
@@ -176,6 +182,7 @@
%{_bindir}/mysql_config
%dir %{_includedir}/mysql
%{_includedir}/mysql/*
+%{_includedir}/mariadb
%{_libdir}/pkgconfig/libmariadb.pc
%{_libdir}/libmariadb.so
%{_libdir}/libmysqlclient.so
++++++ absolute_path_fix.patch ++++++
--- /var/tmp/diff_new_pack.KUwp9z/_old 2020-11-09 13:58:36.439807611 +0100
+++ /var/tmp/diff_new_pack.KUwp9z/_new 2020-11-09 13:58:36.443807603 +0100
@@ -2,31 +2,10 @@
Date: Fri Mar 3 15:59:09 CET 2017
Summary: Remove pure ugliness with paths
-Index: mariadb-connector-c-3.1.8-src/mariadb_config/mariadb_config.c.in
+Index: mariadb-connector-c-3.1.11-src/mariadb_config/libmariadb.pc.in
===================================================================
---- mariadb-connector-c-3.1.8-src.orig/mariadb_config/mariadb_config.c.in
-+++ mariadb-connector-c-3.1.8-src/mariadb_config/mariadb_config.c.in
-@@ -5,13 +5,13 @@
-
- static char *mariadb_progname;
-
--#define INCLUDE "-I@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@
-I@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql"
--#define LIBS "-L@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/
-lmariadb"
-+#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb"
-+#define LIBS "-L@INSTALL_LIBDIR@ -lmariadb"
- #define LIBS_SYS "@extra_dynamic_LDFLAGS@"
- #define CFLAGS INCLUDE
- #define VERSION "@MARIADB_CLIENT_VERSION@"
- #define CC_VERSION "@CPACK_PACKAGE_VERSION@"
--#define PLUGIN_DIR "@CMAKE_INSTALL_PREFIX@/@INSTALL_PLUGINDIR@"
-+#define PLUGIN_DIR "@INSTALL_PLUGINDIR@"
- #define SOCKET "@MARIADB_UNIX_ADDR@"
- #define PORT "@MARIADB_PORT@"
- #define TLS_LIBRARY_VERSION "@TLS_LIBRARY_VERSION@"
-Index: mariadb-connector-c-3.1.8-src/mariadb_config/libmariadb.pc.in
-===================================================================
---- mariadb-connector-c-3.1.8-src.orig/mariadb_config/libmariadb.pc.in
-+++ mariadb-connector-c-3.1.8-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 @@
#
@@ -38,3 +17,16 @@
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;
+ }
+ }
++++++ mariadb-connector-c-3.1.9-src.tar.gz ->
mariadb-connector-c-3.1.11-src.tar.gz ++++++
++++ 11469 lines of diff (skipped)
++++++ private_library.patch ++++++
--- /var/tmp/diff_new_pack.KUwp9z/_old 2020-11-09 13:58:36.651807148 +0100
+++ /var/tmp/diff_new_pack.KUwp9z/_new 2020-11-09 13:58:36.651807148 +0100
@@ -8,11 +8,11 @@
exports all symbols. With the exception of exported symbols, it is
identical to the regular library.
-Index: mariadb-connector-c-3.1.9-src/libmariadb/CMakeLists.txt
+Index: mariadb-connector-c-3.1.11-src/libmariadb/CMakeLists.txt
===================================================================
---- mariadb-connector-c-3.1.9-src.orig/libmariadb/CMakeLists.txt
-+++ mariadb-connector-c-3.1.9-src/libmariadb/CMakeLists.txt
-@@ -411,6 +411,12 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC)
+--- mariadb-connector-c-3.1.11-src.orig/libmariadb/CMakeLists.txt
++++ mariadb-connector-c-3.1.11-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()
@@ -25,7 +25,7 @@
IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR
CMAKE_SYSTEM_NAME MATCHES "kFreeBSD" OR
CMAKE_SYSTEM_NAME MATCHES "GNU")
-@@ -418,11 +424,13 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR
+@@ -421,11 +427,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,7 +39,7 @@
SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "")
#
-@@ -456,7 +464,9 @@ INSTALL(TARGETS mariadbclient
+@@ -461,7 +469,9 @@ INSTALL(TARGETS mariadbclient
INSTALL(TARGETS libmariadb
COMPONENT SharedLibraries
DESTINATION ${INSTALL_LIBDIR})
@@ -50,40 +50,39 @@
IF(MSVC)
# On Windows, install PDB
-Index: mariadb-connector-c-3.1.9-src/mariadb_config/mariadb_config.c.in
+Index: mariadb-connector-c-3.1.11-src/mariadb_config/mariadb_config.c.in
===================================================================
---- mariadb-connector-c-3.1.9-src.orig/mariadb_config/mariadb_config.c.in
-+++ mariadb-connector-c-3.1.9-src/mariadb_config/mariadb_config.c.in
-@@ -7,6 +7,8 @@ static char *mariadb_progname;
-
- #define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb"
- #define LIBS "-L@INSTALL_LIBDIR@ -lmariadb"
-+#define PRIVATE_LIBS "-L@INSTALL_LIBDIR@ -lmariadbprivate " \
-+ "@extra_dynamic_LDFLAGS@"
+--- 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
+@@ -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 CFLAGS INCLUDE
#define VERSION "@MARIADB_CLIENT_VERSION@"
-@@ -35,6 +37,7 @@ static struct option long_options[]=
- {OPT_STRING_TYPE "port", no_argument, 0, 'i'},
+ #define CC_VERSION "@CPACK_PACKAGE_VERSION@"
+@@ -65,6 +66,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 "privatelibs", no_argument, 0, 'm'},
+ {OPT_STRING_TYPE "variable", 2, 0, 'm'},
++ {OPT_STRING_TYPE "privatelibs", no_argument, 0, 'z'},
{NULL, 0, 0, 0}
};
-@@ -50,6 +53,7 @@ static const char *values[]=
+@@ -92,6 +94,7 @@ static const char *values[]=
CC_VERSION,
SOCKET,
PORT,
+ PRIVATE_LIBS,
PLUGIN_DIR,
- TLS_LIBRARY_VERSION
- };
-@@ -120,6 +124,9 @@ int main(int argc, char **argv)
- case 'l':
- puts(LIBS_SYS);
+ TLS_LIBRARY_VERSION,
+ "VAR VAR is one of:"
+@@ -288,6 +291,9 @@ int main(int argc, char **argv)
+ }
break;
-+ case 'm':
+ }
++ case 'z':
+ puts(PRIVATE_LIBS);
+ break;
default:
