diff --git a/absolute_path_fix.patch b/absolute_path_fix.patch index 40f020d..5ae92af 100644 --- a/absolute_path_fix.patch +++ b/absolute_path_fix.patch @@ -2,31 +2,10 @@ Author: Adam Majer 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 @@ Index: mariadb-connector-c-3.1.8-src/mariadb_config/libmariadb.pc.in 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-3.1.11-src.tar.gz b/mariadb-connector-c-3.1.11-src.tar.gz new file mode 100644 index 0000000..9f2a92c --- /dev/null +++ b/mariadb-connector-c-3.1.11-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e6f6c399493fe90efdc21a3fe70c30434b7480e8195642a959f1dd7a0fa5b0f +size 752342 diff --git a/mariadb-connector-c-3.1.11-src.tar.gz.asc b/mariadb-connector-c-3.1.11-src.tar.gz.asc new file mode 100644 index 0000000..eb839b0 --- /dev/null +++ b/mariadb-connector-c-3.1.11-src.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAABCAAGBQJfouChAAoJEM4aPdXjyU9JppkH/1U+Cq9AH/AGumPfcjrCdJ73 +jGicuX1uRcA5m1Yg1S8Up8bvspchH143WAPrJ/Z6aGn6ZpjwAfPKN/SWtNXoPR2u +F1QAH8Kt0IGJvtr9/0fBZO537htS85sx81d3lnwxTznIfD2+9N1PCgZVksr7IMUE +SbnO0ZkI82u/kOKgFdI7pt3m6VeaTxsADbEI+8JaUziRnf6EPw6SVLqQW5OkUgZ6 +eXCRYnV9RaXzSmE2PliKvDYjzueARDG7AwSdsyGbqXn+WhGTQj8jG77vJYI9mgYY +OJvA4wDdtsqikVRrNCC/5nxPFeEpr33mLsrTpaJKrYJiProbh/kSykTvc4T/ngI= +=UYxL +-----END PGP SIGNATURE----- diff --git a/mariadb-connector-c-3.1.9-src.tar.gz b/mariadb-connector-c-3.1.9-src.tar.gz deleted file mode 100644 index 3035827..0000000 --- a/mariadb-connector-c-3.1.9-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:108d99bf2add434dcb3bd9526ba1d89a2b9a943b62dcd9d0a41fcbef8ffbf2c7 -size 745374 diff --git a/mariadb-connector-c-3.1.9-src.tar.gz.asc b/mariadb-connector-c-3.1.9-src.tar.gz.asc deleted file mode 100644 index d9a70f3..0000000 --- a/mariadb-connector-c-3.1.9-src.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEcBAABCAAGBQJe68dpAAoJEM4aPdXjyU9JYQIH/i3dCQNfvH1LXAlXuI9OcoSj -4xAvzTa1MAFU7IBjlMV4E57Z7t5fnX8MToDNUrhjacrmKPAxLKCe19a4+1XPz+f9 -7lViRUZzn5FjuBsYt14pLJ6cvCsqvBoeWH6N+W+Qj1Xk/54465BTKBElGzSLTeOy -WxtKy+zwQr6EbaA/AlgziCuU/wJw2+aTIka/APFKZXiD4l06rbVYj+YguCajzb/7 -yyS7+CQiO1v7ro1Xtk5DibE3YyXbTh0mciY2LOwLzIoofZlhOvgWwJpL9kEyMqzr -8nHzXgH54HK4CQnpaeI8JalKgBM/YXUyIYaInBeiawc+bsVbx8TKAxkx87YF2ok= -=jO6v ------END PGP SIGNATURE----- diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index 7f97b14..6426c47 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Thu Nov 5 13:53:30 UTC 2020 - Adam Majer + +- 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 + ------------------------------------------------------------------- Fri Jul 3 11:57:03 UTC 2020 - Kristyna Streitova diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 4b443af..a68b549 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.9 +Version: 3.1.11 Release: 0 Summary: MariaDB connector in C License: LGPL-2.1-or-later @@ -117,6 +117,10 @@ This package holds the development files. %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}/libmariadbclient.a 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 @@ install -Dpm 0644 build/include/ma_config.h \ %{_bindir}/mysql_config %dir %{_includedir}/mysql %{_includedir}/mysql/* +%{_includedir}/mariadb %{_libdir}/pkgconfig/libmariadb.pc %{_libdir}/libmariadb.so %{_libdir}/libmysqlclient.so diff --git a/private_library.patch b/private_library.patch index d8bec49..a15cd6c 100644 --- a/private_library.patch +++ b/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.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 @@ Index: mariadb-connector-c-3.1.9-src/libmariadb/CMakeLists.txt 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 @@ Index: mariadb-connector-c-3.1.9-src/libmariadb/CMakeLists.txt 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 @@ Index: mariadb-connector-c-3.1.9-src/libmariadb/CMakeLists.txt 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: