From 313a94436f0802f8b7d15f75a76ca13af9f5e3c2 Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Tue, 20 Nov 2018 22:50:02 +0100 Subject: [PATCH] upgrading package: mariadb 10.3.10 -> 10.3.11 --- mariadb/mariadb.patch | 60 +++++++++++++++++++++---------------------- mariadb/mariadb.spec | 4 +-- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/mariadb/mariadb.patch b/mariadb/mariadb.patch index 6f34a593fd..18f08e3da9 100644 --- a/mariadb/mariadb.patch +++ b/mariadb/mariadb.patch @@ -1,6 +1,6 @@ Index: CMakeLists.txt ---- CMakeLists.txt.orig 2018-08-14 02:43:38.000000000 +0200 -+++ CMakeLists.txt 2018-08-15 22:50:55.249422000 +0200 +--- CMakeLists.txt.orig 2018-11-16 19:04:48.000000000 +0100 ++++ CMakeLists.txt 2018-11-20 21:28:25.713341000 +0100 @@ -386,22 +386,16 @@ ADD_SUBDIRECTORY(sql/share) @@ -25,8 +25,8 @@ Index: CMakeLists.txt ADD_SUBDIRECTORY(win/upgrade_wizard) ADD_SUBDIRECTORY(win/packaging) Index: include/CMakeLists.txt ---- include/CMakeLists.txt.orig 2018-08-14 02:43:38.000000000 +0200 -+++ include/CMakeLists.txt 2018-08-15 22:50:55.249627000 +0200 +--- include/CMakeLists.txt.orig 2018-11-16 19:04:48.000000000 +0100 ++++ include/CMakeLists.txt 2018-11-20 21:28:25.713634000 +0100 @@ -22,6 +22,7 @@ ) @@ -36,8 +36,8 @@ Index: include/CMakeLists.txt mysql_com.h mysql_com_server.h Index: include/my_compare.h ---- include/my_compare.h.orig 2018-08-14 02:43:38.000000000 +0200 -+++ include/my_compare.h 2018-08-15 22:50:55.249810000 +0200 +--- include/my_compare.h.orig 2018-11-16 19:04:48.000000000 +0100 ++++ include/my_compare.h 2018-11-20 21:28:25.713941000 +0100 @@ -40,7 +40,7 @@ But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. */ @@ -48,8 +48,8 @@ Index: include/my_compare.h #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) Index: include/myisam.h ---- include/myisam.h.orig 2018-08-14 02:43:38.000000000 +0200 -+++ include/myisam.h 2018-08-15 22:50:55.250036000 +0200 +--- include/myisam.h.orig 2018-11-16 19:04:48.000000000 +0100 ++++ include/myisam.h 2018-11-20 21:28:25.714325000 +0100 @@ -45,7 +45,7 @@ The following defines can be increased if necessary. But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH. @@ -60,8 +60,8 @@ Index: include/myisam.h #define MI_NAME_IEXT ".MYI" Index: include/mysql/service_encryption.h ---- include/mysql/service_encryption.h.orig 2018-08-14 02:43:38.000000000 +0200 -+++ include/mysql/service_encryption.h 2018-08-15 22:50:55.250221000 +0200 +--- include/mysql/service_encryption.h.orig 2018-11-16 19:04:48.000000000 +0100 ++++ include/mysql/service_encryption.h 2018-11-20 21:28:25.714681000 +0100 @@ -37,7 +37,7 @@ #elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) #include @@ -72,22 +72,22 @@ Index: include/mysql/service_encryption.h #endif Index: libmariadb/mariadb_config/libmariadb.pc.in ---- libmariadb/mariadb_config/libmariadb.pc.in.orig 2018-08-14 02:43:38.000000000 +0200 -+++ libmariadb/mariadb_config/libmariadb.pc.in 2018-08-15 22:50:55.250438000 +0200 +--- libmariadb/mariadb_config/libmariadb.pc.in.orig 2018-11-20 21:28:25.715061000 +0100 ++++ libmariadb/mariadb_config/libmariadb.pc.in 2018-11-20 22:00:18.194976000 +0100 @@ -13,7 +13,7 @@ Name: libmariadb - Version: @LIBMARIADB_VERSION@ + Version: @CPACK_PACKAGE_VERSION@ Description: MariaDB Connector/C dynamic library --Cflags: -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ @CMAKE_C_FLAGS@ --Libs: -L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb @extra_dynamic_LDFLAGS@ -+Cflags: -pthread -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ @CMAKE_C_FLAGS@ -+Libs: -pthread -L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb -lstdc++ @extra_dynamic_LDFLAGS@ +-Cflags: -I${includedir} +-Libs: -L${libdir} -lmariadb @extra_dynamic_LDFLAGS@ ++Cflags: -pthreads -I${includedir} ++Libs: -pthreads -L${libdir} -lmariadb -lstdc++ @extra_dynamic_LDFLAGS@ Index: mysys/CMakeLists.txt ---- mysys/CMakeLists.txt.orig 2018-08-14 02:43:41.000000000 +0200 -+++ mysys/CMakeLists.txt 2018-08-15 22:50:55.250633000 +0200 -@@ -90,18 +90,6 @@ +--- mysys/CMakeLists.txt.orig 2018-11-16 19:04:51.000000000 +0100 ++++ mysys/CMakeLists.txt 2018-11-20 21:28:25.715500000 +0100 +@@ -91,18 +91,6 @@ TARGET_LINK_LIBRARIES(mysys pthread) ENDIF() @@ -107,8 +107,8 @@ Index: mysys/CMakeLists.txt INSTALL_DEBUG_TARGET(mysys DESTINATION ${INSTALL_LIBDIR}/debug) ENDIF() Index: scripts/mysql_config.sh ---- scripts/mysql_config.sh.orig 2018-08-14 02:43:41.000000000 +0200 -+++ scripts/mysql_config.sh 2018-08-15 22:50:55.250828000 +0200 +--- scripts/mysql_config.sh.orig 2018-11-16 19:04:52.000000000 +0100 ++++ scripts/mysql_config.sh 2018-11-20 21:28:25.715797000 +0100 @@ -86,14 +86,14 @@ fi @@ -127,8 +127,8 @@ Index: scripts/mysql_config.sh mariadb_config="$basedir/bin/mariadb_config" if test -x "$basedir/bin/mariadb_config"; then Index: scripts/mysql_install_db.sh ---- scripts/mysql_install_db.sh.orig 2018-08-15 22:50:55.251144000 +0200 -+++ scripts/mysql_install_db.sh 2018-08-15 22:52:36.585386000 +0200 +--- scripts/mysql_install_db.sh.orig 2018-11-16 19:04:52.000000000 +0100 ++++ scripts/mysql_install_db.sh 2018-11-20 21:28:25.716097000 +0100 @@ -345,7 +345,7 @@ else basedir="@prefix@" @@ -139,8 +139,8 @@ Index: scripts/mysql_install_db.sh srcpkgdatadir="@pkgdatadir@" buildpkgdatadir="@pkgdatadir@" Index: sql/CMakeLists.txt ---- sql/CMakeLists.txt.orig 2018-08-14 02:43:41.000000000 +0200 -+++ sql/CMakeLists.txt 2018-08-15 22:50:55.251544000 +0200 +--- sql/CMakeLists.txt.orig 2018-11-16 19:04:52.000000000 +0100 ++++ sql/CMakeLists.txt 2018-11-20 21:28:25.716386000 +0100 @@ -413,10 +413,6 @@ IF(INSTALL_LAYOUT STREQUAL "STANDALONE") @@ -153,8 +153,8 @@ Index: sql/CMakeLists.txt IF(WIN32 AND TARGET mysqld AND NOT CMAKE_CROSSCOMPILING) Index: sql/share/CMakeLists.txt ---- sql/share/CMakeLists.txt.orig 2018-08-14 02:43:41.000000000 +0200 -+++ sql/share/CMakeLists.txt 2018-08-15 22:50:55.251752000 +0200 +--- sql/share/CMakeLists.txt.orig 2018-11-16 19:04:52.000000000 +0100 ++++ sql/share/CMakeLists.txt 2018-11-20 21:28:25.716671000 +0100 @@ -15,30 +15,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA @@ -187,8 +187,8 @@ Index: sql/share/CMakeLists.txt SET(files Index: support-files/mariadb.pc.in ---- support-files/mariadb.pc.in.orig 2018-08-14 02:43:46.000000000 +0200 -+++ support-files/mariadb.pc.in 2018-08-15 22:50:55.251915000 +0200 +--- support-files/mariadb.pc.in.orig 2018-11-16 19:04:56.000000000 +0100 ++++ support-files/mariadb.pc.in 2018-11-20 21:28:25.716884000 +0100 @@ -19,5 +19,5 @@ Description: @CPACK_PACKAGE_DESCRIPTION_SUMMARY@ URL: @CPACK_PACKAGE_URL@ diff --git a/mariadb/mariadb.spec b/mariadb/mariadb.spec index 101223fdc9..d702ce5888 100644 --- a/mariadb/mariadb.spec +++ b/mariadb/mariadb.spec @@ -23,7 +23,7 @@ # package version %define V_major 10.3 -%define V_minor 10 +%define V_minor 11 %define V_mariadb %{V_major}.%{V_minor} %define V_opkg %{V_major}.%{V_minor} @@ -38,7 +38,7 @@ Class: EVAL Group: Database License: GPL Version: %{V_opkg} -Release: 20181005 +Release: 20181120 # package options %option with_server yes