Hello community, here is the log from the commit of package mariadb for openSUSE:Factory checked in at 2017-11-30 12:44:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mariadb (Old) and /work/SRC/openSUSE:Factory/.mariadb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mariadb" Thu Nov 30 12:44:11 2017 rev:61 rq:546442 version:10.2.10 Changes: -------- --- /work/SRC/openSUSE:Factory/mariadb/mariadb.changes 2017-10-28 14:20:28.962188004 +0200 +++ /work/SRC/openSUSE:Factory/.mariadb.new/mariadb.changes 2017-11-30 12:44:15.516389656 +0100 @@ -1,0 +2,145 @@ +Wed Nov 29 12:54:23 UTC 2017 - [email protected] + +- Disable openssl compatibility checking + * the check uses CRYPTO_set_mem_functions() to set debugging + memory allocation function. The setting only succeeds if no allocation + was done before. Our fips self-tests, which are run from the library + constructor, however, do allocate memory, so the subsequent call to + CRYPTO_set_mem_functions causes the compatibility check to fail + * add mariadb-10.2.10-disable_openssl_compatibility_check.patch + +------------------------------------------------------------------- +Tue Oct 31 14:23:22 UTC 2017 - [email protected] + +- update to 10.2.10 GA + * release notes and changelogs + https://downloads.mariadb.org/mariadb/+releases/ + * fixes for the following security vulnerabilities + * 10.2.10: CVE-2017-10378, CVE-2017-10268 + * 10.2.8: CVE-2017-3636, CVE-2017-3641, CVE-2017-3653, + CVE-2017-10320, CVE-2017-10365, CVE-2017-10379, + CVE-2017-10384, CVE-2017-10286, CVE-2017-3257 + * 10.2.6: CVE-2017-3308, CVE-2017-3309, CVE-2017-3453, + CVE-2017-3456, CVE-2017-3464 + * 10.2.5: CVE-2017-3313, CVE-2017-3302 + * [bsc#1042632], [bsc#1043328], [bsc#1019948], [fate#323738] +- refresh and rename the following patches: + * mariadb-10.1.4-group.patch to + mariadb-10.2.3-group.patch + * mariadb-10.1.16-systemd-cmake.patch to + mariadb-10.2.8-systemd-cmake.patch + * mariadb-10.1.18-mysql_install_db-mariadb_dirs.patch to + mariadb-10.2.3-mysql_install_db-mariadb_dirs.patch + * mariadb-10.1.12-fortify-and-O.patch to + mariadb-10.2.4-fortify-and-O.patch + * mysql-community-server-5.1.46-logrotate.patch to + mariadb-10.2.4-logrotate.patch +- add mariadb-10.2.10.tar.gz.sig signature and mariadb.keyring files +- start building without client library part, use + mariadb-connector-c for getting libmariadb libraries. Remove + libmysclient* packages +- remove baselibs.conf because we no longer build client libraries + here +- update %{soname} to 19 (libmysqld soname) +- change '=' to '>=' in Requires:mariadb-errormessages for + libmysqld%{soname}. Versioned libraries shouldn't require regular + packages with '='. It also causes problems during update (Problem: + libmysqld18-10.1.25-3.1.x86_64 requires mariadb-errormessages = 10.1.25, + but this requirement cannot be provided). + Also add "Provides: mariadb-errormessages = 10.1.25" for errormessages + subpackage that solves this problem for the current update. +- pack new files, remove mysql specific files +- remove README.SUSE as it was outdated +- package cleaning + * run spec-cleaner + * renumber sources + * reorganize subpackages order and update summaries, descriptions + and groups + * tweak and add some comments to the specfile + * remove warning about mysql-packaging repository that is no longer + used for this package + * remove checks whether we build mysql or mariadb (we build mariadb + only) +- add galera subpackage + * add missing "Requires:" (lsof, net-tools, rsync, socat, + xtrabackup) for proper wsrep scripts functionality + * add mariadb-10.2.9-galera_cnf.patch that enhances galera.cnf + configuration file (add wsrep_on=OFF and set the location + of the wsrep library) + * rename README-wsrep to README.wsrep so it corresponds with the + other README names + * move galera_new_cluster, galera_recovery, + use_galera_new_cluster.conf, wsrep_* scripts to the galera + subpackage +- remove the following macros definitions: + * %{_tmpfilesdir} - it's been defined in systemd macros since + openSUSE 13.2 + * %{preferred} - we no longer need to distinguish between preferred + and not preferred version (we build mariadb only) + * %{with_mandatory_lz4} - mysql specific + * %{build_extras}, %{pretty_name}, %{build_readline}, + %{builtin_plugins} and {libname} - they are no longer needed +- add the following macros + * %{run_testsuite} macro that controls the run of the regression + testsuite + * %{ignore_testsuite_result} macro - when set to 1 it ignores + results from the regression testsuite (debug purposes) + * %{with_mroonga} macro (enable mroonga build for x86_64 archs only) +- rename %{with_jemalloc} to %{with_tokudb} and enable tokudb for + x86_64 architectures for openSUSE and SLE15 [fate#323280]. Don't + enable it for SLE12 (missing jemalloc dependency) +- add the following BuildRequires: + * unixODBC-devel to allow ODBC support for Connect engine [bsc#1039034] + * krb5-devel to build auth_gssapi.so plugin + * libarchive-devel + * use libboost_headers-devel instead of boost-devel for TW. Boost + package has been split up and will migrate to using multibuild. + This results in packages that unnecessarily build require + boost-devel to cause major bottlenecks [bsc#1062583] +- do not use "BuildRequires: lzo-devel" for i586 and arm because + it makes build fail +- add the following Requires: + * hostname - as mariadb_install_db depends on this tool [bsc#1060110] + * libaio-devel for libmysqld-devel because libmysqld depends + on libaio +- tweak build options: + * remove "DWITH_ASAN=OFF" - this option was added because of mysql + and it's no longer needed + * switch from "-DWITH_JEMALLOC=auto" to "-DWITH_JEMALLOC=system" + * use "DCMAKE_SKIP_INSTALL_RPATH" - this allows to link with -rpath + during build and fixes quite a few test suite failures. When + installing the file -rpath is still disabled, so this should + not have any effect on the installed binaries + * add "-DWITH_LIBARCHIVE=ON" and "-DWITH_MARIABACKUP=ON" + * remove -DWITH_BOOST=../boost/ as we use system boost now +- enable OQGRAPH to build (openSUSE only, SLE is missing Judy + requirement) +- disable Cassandra storage engine build as it's no longer actively + being developed (See MDEV-4695) [bsc#1055165] + * Remove "BuildRequires: libthrift-devel" and %{with_cassandra} + macros that are no longer needed now +- disable make test (Connector/C unit tests) as it requires a + running server. These tests are part of mysql-test-run + now (MDEV-12470) +- add suse_skipped_tests.list - the list of the tests that we want + to skip (they fail correctly or the fix is in progress) + * adjust mysql-test-run options to skip tests listed there + [bsc#1041891] +- remove mytop utility that is packaged separately +- remove *.jar files from mysql-test +- remove python scripts remains from tokudb upstream +- remove generating of the MySQL NDB Cluster filelists +- remove removing of manpages for MySQL Carrier Grade Edition +- provide a symlink for the my_safe_process executable that was + moved from its location to bindir +- update filename in /var/adm/update-messages to match + documentation and build-compare pattern +- README is now README.md +- fix "file listed twice" build error + +------------------------------------------------------------------- +Tue Oct 31 10:38:13 UTC 2017 - [email protected] + +- Also Require: libopenssl-1_0_0-devel from the libmysqlclient-devel package + +------------------------------------------------------------------- Old: ---- README.SUSE baselibs.conf mariadb-10.1.25.tar.gz New: ---- mariadb-10.2.10.tar.gz mariadb-10.2.10.tar.gz.sig mariadb.keyring suse_skipped_tests.list ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mariadb.spec ++++++ ++++ 963 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/mariadb/mariadb.spec ++++ and /work/SRC/openSUSE:Factory/.mariadb.new/mariadb.spec ++++++ configuration-tweaks.tar.xz ++++++ ++++++ mariadb-10.1.25.tar.gz -> mariadb-10.2.10.tar.gz ++++++ /work/SRC/openSUSE:Factory/mariadb/mariadb-10.1.25.tar.gz /work/SRC/openSUSE:Factory/.mariadb.new/mariadb-10.2.10.tar.gz differ: char 5, line 1 ++++++ mariadb.keyring ++++++ pub 1024D/1BB943DB 2010-02-02 uid [ unknown] MariaDB Package Signing Key <[email protected]> uid [ unknown] Daniel Bartholomew (Monty Program signing key) <[email protected]> sub 4096g/672557E6 2010-02-02 -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v2 mQGiBEtohJARBACxvZpWSIMTp/e7BUzSW+WDL7Pl0JDg6v7ZJFGJk9qo+5JXIiis 497Ul0FmVJ6EoyVzfpqe5FyUvqtLCkM6UP5adyvXTHi1KMiYacu2q5yRhDpMKbpM LkAg23Yyz1yK/d0TsAkerLJ6K1Bh8NIm44Op+qFrDxeYZDIR5Q8WaCdK8wCg/jc8 p/4XaKq74ghUHEX+35qk63UD/0YEsgHrsRQZ42wKNeO8ZUJKqCVHXYJrCq7DhRhn U5aYnuK3op0JusPN5fdIGkKwJy24dWRoRfNIIg0WvM8qUNrC2NvhomnZNudsI0Jb XapRemrIwbvrZToD6ei1awdVqa5fT6XIxV4MSQEwn47qmUNSz/0TkUmB3VZ2EL/j zfHUA/91ZfAdWCmRemTLWRrzIYYJKyEInZ0qwZVrkyMY8+T7b2/6RGR0f2oV1dOx cjbd0+N3vKrUkjuzkcVu/oB8wq9UBfuSHwsxYqub4gvIh0/LW+CsWa955sQ/Hj9H 48j3nUHaXqM9uJyMMgMlCdo3rLpnYCJH8w2kFfLHIDksMs1YtLQ9TWFyaWFEQiBQ YWNrYWdlIFNpZ25pbmcgS2V5IDxwYWNrYWdlLXNpZ25pbmcta2V5QG1hcmlhZGIu b3JnPohiBBMRAgAiBQJREUepAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK CRDLywgqG7lD28y4AJ0aByfYvJWqBm5PZjusZiG0vo9SRwCeM0izj/oryMu0fJi3 kRbTlojzCd20Q0RhbmllbCBCYXJ0aG9sb21ldyAoTW9udHkgUHJvZ3JhbSBzaWdu aW5nIGtleSkgPGRiYXJ0QGFza21vbnR5Lm9yZz6IYAQTEQIAIAUCS2iEkAIbAwYL CQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEMvLCCobuUPboDgAoNQVrK4i5LXTgwnW ke2MxsXCoHDnAJ93j733YuNkV64aHEUwWxNCkkwUkbkEDQRLaIS4EBAApZ0wvxpQ VlZ6OEFa9SBQ5eclRIOjXjKqkYGkvIx+jUmqCYfOgfPixOGYS5Q2KwHNz4XEOIOA 1kyClAoAAgOEGUxj8CxnbBk10IVo/JBONjdqKYPZ2YNdeIIrKXEmai4i5hK5AfZH oyqsV5aqxGkGeVUju/coyRJY6La8iL+RBuxiRuUPWymGjtISAR6fSiN8f/kRly/y 9LmMO8JcOpeieqLUFPK6KuzhI4F0nFkHJpZPDNOHHl+GmAZ+SqZxmIrpkGymd36h TKxW4nlnN6kqc1gMwdn1L/u/D+C/jhMbTTssqiMZeyP9uFmnMB3ls1NV8OxvbxcT BG0M7g4AlffUQKpUrNhIBoC3R7UbYQ3CTZX1Qp/TBzbfRAgGhdWBQDQEd3/Ll9G4 QaCs9I+4W68rkAr7e7IylHyfEi9oYQkXFIEeaAhiENmJBpcLpas/yNJoLayqzPsQ +lRNg3omFntPtZolkMi6orRNixrgXV64m/01YNjmBFTqsp5wOq2j0cmTkbOWqdnl mGPg2El1ufebJc6YWS1nFm6YRpN/B3QbtAnar1Cb+IHlr0haTOYhQp+XFN+k1brq s+Sufa8/rz6N5tsm+W5GjHKvHr24FTa02u3H4lIqNlNBkzZZKhzAhxEWiJzwc/f2 upG5vdplrM/YCU+XTotYPb5ZEXQe2mD/rXMAAwUP/0f1DOJIfnMrh1o/3RKqDq8k 7tlv2GEEv0VEnh8ty4dMb8Dos2M1Oc4Kv9QLB3DXcS4/L4JW5vF0QgSAzq1r5oBT 1zaMcqDS6OUlHrWUi8aDNt5EPQuEGdP2/iTDeAq4r8eCYrHRC7egldyRZrmWNfcZ N6/G9K+JSjhWfSWWSBRIqb+UxcQNCp6i6tvVSxCfLK1R4P4kA/Z4Co2vywIfVfPh Hd5nIWNl1yl9O3r04GCNTjzwsv/dhUGDFIVsghgehZuL0Bb7hDuyvZ2ShALumZ5t 7mU/SJ2hOk3klO+2bIJB0gquUkWn/4g1h2Tp9XVWrI1x6GUBxRYkwC4tWajzWeVC 5hcDVAdqYN0H0HVj/CEgrEWlCVv1hJ0JYAsjX8Cj1QuZB1i34fjEkgybMjo3oCU5 GCSiNmvtTeUpexyY/7iHAdyoZHFT+fQS84VMYKFT4tTYH+5jTa62yfPhn63TYPor rRyTqG8aJQLnczm0NN5R5mriYJQjr4Pj8PSSwWck/Gt8R5vb+C69+uXINB6OKqhG 6xU0bqnCIxt3OhVS7v0SfHjn0+il/JOc/ev9wm6G5FxmEWOoYwibmaDzHfc9N1HM RzjTENI7fyJPNFj9IDkpwk4E3ylrkuVl2KEmYDJ9T9ny4UMnQ7Sb6w59UhxMIFtR TPNpQJWCWXfhWUAo4WfCiEkEGBECAAkFAktohLgCGwwACgkQy8sIKhu5Q9vThgCg 7R7ImT+21phcbxVYBQZjiJVY/2YAnRKPeNKPNIviaUUV7kxMXt949GQX =zBws -----END PGP PUBLIC KEY BLOCK----- ++++++ mysql-patches.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-10.1.12-fortify-and-O.patch new/mysql-patches/mysql-patches/mariadb-10.1.12-fortify-and-O.patch --- old/mysql-patches/mysql-patches/mariadb-10.1.12-fortify-and-O.patch 2017-07-10 12:30:40.552003757 +0200 +++ new/mysql-patches/mysql-patches/mariadb-10.1.12-fortify-and-O.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,82 +0,0 @@ -PATCH-P0-FIX-HACK: Not enforcing specific flags - -Useing some CFLAGS from distribution and some enforced can and leads to the -conflicts like FORTIFY and -O0. Removing hardcoded options. - -Maintainer: Michal Hrusecky <[email protected]> - -Index: CMakeLists.txt -=================================================================== ---- CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -220,7 +220,6 @@ IF(SECURITY_HARDENED) - MY_CHECK_AND_SET_COMPILER_FLAG("-pie -fPIC") - MY_CHECK_AND_SET_COMPILER_FLAG("-Wl,-z,relro,-z,now") - MY_CHECK_AND_SET_COMPILER_FLAG("-fstack-protector --param=ssp-buffer-size=4") -- MY_CHECK_AND_SET_COMPILER_FLAG("-D_FORTIFY_SOURCE=2" RELEASE RELWITHDEBINFO) - ENDIF() - - # Always enable debug sync for debug builds. -Index: storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake -=================================================================== ---- storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake.orig -+++ storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake -@@ -26,11 +26,9 @@ endif () - if (CMAKE_VERSION VERSION_LESS 3.0) - set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG TOKU_PTHREAD_DEBUG=1 TOKU_DEBUG_TXN_SYNC=1) - set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DRD TOKU_PTHREAD_DEBUG=1 TOKU_DEBUG_TXN_SYNC=1) -- set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DRD _FORTIFY_SOURCE=2) - else () - set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS - $<$<OR:$<CONFIG:DEBUG>,$<CONFIG:DRD>>:TOKU_PTHREAD_DEBUG=1 TOKU_DEBUG_TXN_SYNC=1> -- $<$<CONFIG:DRD>:_FORTIFY_SOURCE=2> - ) - endif () - -@@ -102,23 +100,23 @@ set_cflags_if_supported( - ) - - ## set extra debugging flags and preprocessor definitions --set(CMAKE_C_FLAGS_DEBUG "-g3 -O0 ${CMAKE_C_FLAGS_DEBUG}") --set(CMAKE_CXX_FLAGS_DEBUG "-g3 -O0 ${CMAKE_CXX_FLAGS_DEBUG}") -+set(CMAKE_C_FLAGS_DEBUG "-g3 ${CMAKE_C_FLAGS_DEBUG}") -+set(CMAKE_CXX_FLAGS_DEBUG "-g3 ${CMAKE_CXX_FLAGS_DEBUG}") - - ## flags to use when we want to run DRD on the resulting binaries - ## DRD needs debugging symbols. - ## -O0 makes it too slow, and -O2 inlines too much for our suppressions to work. -O1 is just right. --set(CMAKE_C_FLAGS_DRD "-g3 -O1 ${CMAKE_C_FLAGS_DRD}") --set(CMAKE_CXX_FLAGS_DRD "-g3 -O1 ${CMAKE_CXX_FLAGS_DRD}") -+set(CMAKE_C_FLAGS_DRD "-g3 ${CMAKE_C_FLAGS_DRD}") -+set(CMAKE_CXX_FLAGS_DRD "-g3 ${CMAKE_CXX_FLAGS_DRD}") - - ## set extra release flags - ## need to set flags for RelWithDebInfo as well because we want the MySQL/MariaDB builds to use them - if (CMAKE_CXX_COMPILER_ID STREQUAL Clang) - # have tried -flto and -O4, both make our statically linked executables break apple's linker -- set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -O3 -UNDEBUG") -- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -O3 -UNDEBUG") -- set(CMAKE_C_FLAGS_RELEASE "-g -O3 ${CMAKE_C_FLAGS_RELEASE} -UNDEBUG") -- set(CMAKE_CXX_FLAGS_RELEASE "-g -O3 ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG") -+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -UNDEBUG") -+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -UNDEBUG") -+ set(CMAKE_C_FLAGS_RELEASE "-g ${CMAKE_C_FLAGS_RELEASE} -UNDEBUG") -+ set(CMAKE_CXX_FLAGS_RELEASE "-g ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG") - else () - if (APPLE) - set(FLTO_OPTS "-fwhole-program") -@@ -126,10 +124,10 @@ else () - set(FLTO_OPTS "-fuse-linker-plugin") - endif() - # we overwrite this because the default passes -DNDEBUG and we don't want that -- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-flto ${FLTO_OPTS} ${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -O3 -UNDEBUG") -- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-flto ${FLTO_OPTS} ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -O3 -UNDEBUG") -- set(CMAKE_C_FLAGS_RELEASE "-g -O3 -flto ${FLTO_OPTS} ${CMAKE_C_FLAGS_RELEASE} -UNDEBUG") -- set(CMAKE_CXX_FLAGS_RELEASE "-g -O3 -flto ${FLTO_OPTS} ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG") -+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "-flto ${FLTO_OPTS} ${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -UNDEBUG") -+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-flto ${FLTO_OPTS} ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -UNDEBUG") -+ set(CMAKE_C_FLAGS_RELEASE "-g -flto ${FLTO_OPTS} ${CMAKE_C_FLAGS_RELEASE} -UNDEBUG") -+ set(CMAKE_CXX_FLAGS_RELEASE "-g -flto ${FLTO_OPTS} ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG") - set(CMAKE_EXE_LINKER_FLAGS "-g ${FLTO_OPTS} ${CMAKE_EXE_LINKER_FLAGS}") - set(CMAKE_SHARED_LINKER_FLAGS "-g ${FLTO_OPTS} ${CMAKE_SHARED_LINKER_FLAGS}") - endif () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-10.1.16-systemd-cmake.patch new/mysql-patches/mysql-patches/mariadb-10.1.16-systemd-cmake.patch --- old/mysql-patches/mysql-patches/mariadb-10.1.16-systemd-cmake.patch 2017-03-15 18:14:43.247637250 +0100 +++ new/mysql-patches/mysql-patches/mariadb-10.1.16-systemd-cmake.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -PATCH-P1-FIX-HACK: Allow more case-insensitive values for 'WITH_SYSTEMD' - -Remove 'IF(WITH_SYSTEMD STREQUAL "yes")' and use 'IF(WITH_SYSTEMD)' -expression in order to allow more case-insensitive values to be used -here (1, ON, YES, TRUE or Y). - -Maintainer: Kristyna Streitova <[email protected]> - -Index: mariadb-10.1.22/cmake/systemd.cmake -=================================================================== ---- mariadb-10.1.22.orig/cmake/systemd.cmake -+++ mariadb-10.1.22/cmake/systemd.cmake -@@ -19,9 +19,9 @@ INCLUDE(FindPkgConfig) - MACRO(CHECK_SYSTEMD) - IF(UNIX) - SET(WITH_SYSTEMD "auto" CACHE STRING "Enable systemd scripts and notification support") -- IF(WITH_SYSTEMD STREQUAL "yes" OR WITH_SYSTEMD STREQUAL "auto") -+ IF(WITH_SYSTEMD OR WITH_SYSTEMD STREQUAL "auto") - IF(PKG_CONFIG_FOUND) -- IF(WITH_SYSTEMD STREQUAL "yes") -+ IF(WITH_SYSTEMD) - pkg_search_module(LIBSYSTEMD REQUIRED libsystemd libsystemd-daemon) - ELSE() - pkg_search_module(LIBSYSTEMD libsystemd libsystemd-daemon) -@@ -75,7 +75,7 @@ MACRO(CHECK_SYSTEMD) - UNSET(HAVE_SYSTEMD_SD_NOTIFY) - UNSET(HAVE_SYSTEMD_SD_NOTIFYF) - MESSAGE(STATUS "Systemd features not enabled") -- IF(WITH_SYSTEMD STREQUAL "yes") -+ IF(WITH_SYSTEMD) - MESSAGE(FATAL_ERROR "Requested WITH_SYSTEMD=YES however no dependencies installed/found") - ENDIF() - ENDIF() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-10.1.18-mysql_install_db-mariadb_dirs.patch new/mysql-patches/mysql-patches/mariadb-10.1.18-mysql_install_db-mariadb_dirs.patch --- old/mysql-patches/mysql-patches/mariadb-10.1.18-mysql_install_db-mariadb_dirs.patch 2016-11-03 14:56:24.808532600 +0100 +++ new/mysql-patches/mysql-patches/mariadb-10.1.18-mysql_install_db-mariadb_dirs.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -PATCH-P1-FIX-UPSTREAM: Fix mysql_install_db to find data files in mariadb directories - -Fix mysql_install_db.sh script to find data files in mariadb directories -when a user uses "--basedir" option [bsc#1006539] - -Maintainer: Kristyna Streitova <[email protected]> - -Index: mariadb-10.1.18/scripts/mysql_install_db.sh -=================================================================== ---- mariadb-10.1.18.orig/scripts/mysql_install_db.sh -+++ mariadb-10.1.18/scripts/mysql_install_db.sh -@@ -289,17 +289,17 @@ then - cannot_find_file mysqld $basedir/libexec $basedir/sbin $basedir/bin - exit 1 - fi -- langdir=`find_in_basedir --dir errmsg.sys share/english share/mysql/english` -+ langdir=`find_in_basedir --dir errmsg.sys share/english share/mysql/english share/mariadb/english` - if test -z "$langdir" - then -- cannot_find_file errmsg.sys $basedir/share/english $basedir/share/mysql/english -+ cannot_find_file errmsg.sys $basedir/share/english $basedir/share/mysql/english $basedir/share/mariadb/english - exit 1 - fi -- srcpkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql` -+ srcpkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql share/mariadb` - buildpkgdatadir=$srcpkgdatadir - if test -z "$srcpkgdatadir" - then -- cannot_find_file fill_help_tables.sql $basedir/share $basedir/share/mysql -+ cannot_find_file fill_help_tables.sql $basedir/share $basedir/share/mysql $basedir/share/mariadb - exit 1 - fi - scriptdir="$basedir/scripts" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-10.1.4-group.patch new/mysql-patches/mysql-patches/mariadb-10.1.4-group.patch --- old/mysql-patches/mysql-patches/mariadb-10.1.4-group.patch 2017-02-03 15:48:33.836935430 +0100 +++ new/mysql-patches/mysql-patches/mariadb-10.1.4-group.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,137 +0,0 @@ -PATCH-P0-FEATURE-UPSTREAM: Adds group option - -This patch let's you specify not only user to use but also group that MySQL -should use. - -Maintainer: Michal Hrusecky <[email protected]> - -Index: scripts/mysqld_safe.sh -=================================================================== ---- scripts/mysqld_safe.sh.orig -+++ scripts/mysqld_safe.sh -@@ -29,6 +29,7 @@ logging=init - want_syslog=0 - syslog_tag= - user='@MYSQLD_USER@' -+group='@MYSQLD_GROUP@' - pid_file= - err_log= - err_log_base= -@@ -308,6 +309,7 @@ parse_arguments() { - --pid[-_]file=*) pid_file="$val" ;; - --plugin[-_]dir=*) PLUGIN_DIR="$val" ;; - --user=*) user="$val"; SET_USER=1 ;; -+ --group=*) group="$val"; SET_USER=1 ;; - --log[-_]basename=*|--hostname=*|--loose[-_]log[-_]basename=*) - pid_file="$val.pid"; - err_log_base="$val"; -@@ -737,6 +739,7 @@ then - if test "$user" != "root" -o $SET_USER = 1 - then - USER_OPTION="--user=$user" -+ GROUP_OPTION="--group=$group" - fi - if test -n "$open_files" - then -@@ -759,7 +762,12 @@ then - log_error "Fatal error Can't create database directory '$mysql_unix_port'" - exit 1 - fi -- chown $user $mysql_unix_port_dir -+ if [ "$user" -a "$group" ]; then -+ chown $user:$group $mysql_unix_port_dir -+ else -+ [ "$user" ] && chown $user $mysql_unix_port_dir -+ [ "$group" ] && chgrp $group $mysql_unix_port_dir -+ fi - chmod 755 $mysql_unix_port_dir - fi - -Index: scripts/mysql_install_db.sh -=================================================================== ---- scripts/mysql_install_db.sh.orig -+++ scripts/mysql_install_db.sh -@@ -29,6 +29,7 @@ args="" - defaults="" - mysqld_opt="" - user="" -+group="" - - force=0 - in_rpm=0 -@@ -88,6 +89,11 @@ Usage: $0 [OPTIONS] - user. You must be root to use this option. By default - mysqld runs using your current login name and files and - directories that it creates will be owned by you. -+ --group=group_name The login group to use for running mysqld. Files and -+ directories created by mysqld will be owned by this -+ group. You must be root to use this option. By default -+ mysqld runs using your current group and files and -+ directories that it creates will be owned by you. - - All other options are passed to the mysqld program - -@@ -135,11 +141,11 @@ parse_arguments() - --builddir=*) builddir=`parse_arg "$arg"` ;; - --srcdir=*) srcdir=`parse_arg "$arg"` ;; - --ldata=*|--datadir=*|--data=*) ldata=`parse_arg "$arg"` ;; -- --user=*) - # Note that the user will be passed to mysqld so that it runs - # as 'user' (crucial e.g. if log-bin=/some_other_path/ - # where a chown of datadir won't help) -- user=`parse_arg "$arg"` ;; -+ --user=*) user=`parse_arg "$arg"` ;; -+ --group=*) group=`parse_arg "$arg"` ;; - --skip-name-resolve) ip_only=1 ;; - --verbose) verbose=1 ;; # Obsolete - --rpm) in_rpm=1 ;; -@@ -420,7 +426,12 @@ do - fi - if test -n "$user" - then -- chown $user "$dir" -+ if test -z "$group" -+ then -+ chown $user $dir -+ else -+ chown $user:$group $dir -+ fi - if test $? -ne 0 - then - echo "Cannot change ownership of the database directories to the '$user'" -@@ -435,6 +446,11 @@ then - args="$args --user=$user" - fi - -+if test -n "$group" -+then -+ args="$args --group=$group" -+fi -+ - # When doing a "cross bootstrap" install, no reference to the current - # host should be added to the system tables. So we filter out any - # lines which contain the current host name. -Index: scripts/CMakeLists.txt -=================================================================== ---- scripts/CMakeLists.txt.orig -+++ scripts/CMakeLists.txt -@@ -134,6 +134,7 @@ ENDIF() - - SET(HOSTNAME "hostname") - SET(MYSQLD_USER "mysql") -+SET(MYSQLD_GROUP "mysql") - - # Required for mysqlbug until autotools are deprecated, once done remove these - # and expand default cmake variables -Index: support-files/CMakeLists.txt -=================================================================== ---- support-files/CMakeLists.txt.orig -+++ support-files/CMakeLists.txt -@@ -29,6 +29,7 @@ ELSE() - SET(CFLAGS ${CMAKE_C_FLAGS}) - SET(CXXFLAGS ${CMAKE_CXX_FLAGS}) - SET(MYSQLD_USER "mysql") -+ SET(MYSQLD_GROUP "mysql") - SET(ini_file_extension "cnf") - SET(HOSTNAME "hostname") - ENDIF() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-10.2.10-disable_openssl_compatibility_check.patch new/mysql-patches/mysql-patches/mariadb-10.2.10-disable_openssl_compatibility_check.patch --- old/mysql-patches/mysql-patches/mariadb-10.2.10-disable_openssl_compatibility_check.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-10.2.10-disable_openssl_compatibility_check.patch 2017-11-29 14:08:42.265670469 +0100 @@ -0,0 +1,42 @@ +PATCH-P1-SUSE: Fix running with our patched openssl + +- Disable openssl compatibility checking + * the check uses CRYPTO_set_mem_functions() to set debugging + memory allocation function. The setting only succeeds if no allocation + was done before. Our fips self-tests, which are run from the library + constructor, however, do allocate memory, so the subsequent call to + CRYPTO_set_mem_functions causes the compatibility check to fail + +Maintainer: Vitezslav Cizek <[email protected]> + +Index: mariadb-10.2.10/mysys_ssl/openssl.c +=================================================================== +--- mariadb-10.2.10.orig/mysys_ssl/openssl.c 2017-10-30 09:10:45.000000000 +0100 ++++ mariadb-10.2.10/mysys_ssl/openssl.c 2017-11-29 13:43:20.022236791 +0100 +@@ -47,26 +47,6 @@ static void *coc_malloc(size_t size, con + + int check_openssl_compatibility() + { +- EVP_CIPHER_CTX *evp_ctx; +- EVP_MD_CTX *md5_ctx; +- +- if (!CRYPTO_set_mem_functions(coc_malloc, NULL, NULL)) +- return 1; +- +- testing= 1; +- alloc_size= alloc_count= 0; +- evp_ctx= EVP_CIPHER_CTX_new(); +- EVP_CIPHER_CTX_free(evp_ctx); +- if (alloc_count != 1 || !alloc_size || alloc_size > EVP_CIPHER_CTX_SIZE) +- return 1; +- +- alloc_size= alloc_count= 0; +- md5_ctx= EVP_MD_CTX_create(); +- EVP_MD_CTX_destroy(md5_ctx); +- if (alloc_count != 1 || !alloc_size || alloc_size > EVP_MD_CTX_SIZE) +- return 1; +- +- testing= 0; + return 0; + } + #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-10.2.3-group.patch new/mysql-patches/mysql-patches/mariadb-10.2.3-group.patch --- old/mysql-patches/mysql-patches/mariadb-10.2.3-group.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-10.2.3-group.patch 2017-03-15 19:27:49.000000000 +0100 @@ -0,0 +1,137 @@ +PATCH-P0-FEATURE-UPSTREAM: Adds group option + +This patch let's you specify not only user to use but also group that MySQL +should use. + +Maintainer: Michal Hrusecky <[email protected]> + +Index: scripts/mysqld_safe.sh +=================================================================== +--- scripts/mysqld_safe.sh.orig ++++ scripts/mysqld_safe.sh +@@ -28,6 +28,7 @@ logging=init + want_syslog=0 + syslog_tag= + user='@MYSQLD_USER@' ++group='@MYSQLD_GROUP@' + pid_file= + err_log= + err_log_base= +@@ -300,6 +301,7 @@ parse_arguments() { + --pid[-_]file=*) pid_file="$val" ;; + --plugin[-_]dir=*) PLUGIN_DIR="$val" ;; + --user=*) user="$val"; SET_USER=1 ;; ++ --group=*) group="$val"; SET_USER=1 ;; + --log[-_]basename=*|--hostname=*|--loose[-_]log[-_]basename=*) + pid_file="$val.pid"; + err_log_base="$val"; +@@ -713,6 +715,7 @@ then + if test "$user" != "root" -o $SET_USER = 1 + then + USER_OPTION="--user=$user" ++ GROUP_OPTION="--group=$group" + fi + if test -n "$open_files" + then +@@ -735,7 +738,12 @@ then + log_error "Fatal error Can't create database directory '$mysql_unix_port'" + exit 1 + fi +- chown $user $mysql_unix_port_dir ++ if [ "$user" -a "$group" ]; then ++ chown $user:$group $mysql_unix_port_dir ++ else ++ [ "$user" ] && chown $user $mysql_unix_port_dir ++ [ "$group" ] && chgrp $group $mysql_unix_port_dir ++ fi + chmod 755 $mysql_unix_port_dir + fi + +Index: scripts/mysql_install_db.sh +=================================================================== +--- scripts/mysql_install_db.sh.orig ++++ scripts/mysql_install_db.sh +@@ -29,6 +29,7 @@ args="" + defaults="" + mysqld_opt="" + user="" ++group="" + silent_startup="--silent-startup" + + force=0 +@@ -89,6 +90,11 @@ Usage: $0 [OPTIONS] + user. You must be root to use this option. By default + mysqld runs using your current login name and files and + directories that it creates will be owned by you. ++ --group=group_name The login group to use for running mysqld. Files and ++ directories created by mysqld will be owned by this ++ group. You must be root to use this option. By default ++ mysqld runs using your current group and files and ++ directories that it creates will be owned by you. + + All other options are passed to the mysqld program + +@@ -136,11 +142,11 @@ parse_arguments() + --builddir=*) builddir=`parse_arg "$arg"` ;; + --srcdir=*) srcdir=`parse_arg "$arg"` ;; + --ldata=*|--datadir=*|--data=*) ldata=`parse_arg "$arg"` ;; +- --user=*) + # Note that the user will be passed to mysqld so that it runs + # as 'user' (crucial e.g. if log-bin=/some_other_path/ + # where a chown of datadir won't help) +- user=`parse_arg "$arg"` ;; ++ --user=*) user=`parse_arg "$arg"` ;; ++ --group=*) group=`parse_arg "$arg"` ;; + --skip-name-resolve) ip_only=1 ;; + --verbose) verbose=1 ; silent_startup="" ;; + --rpm) in_rpm=1 ;; +@@ -421,7 +427,12 @@ do + fi + if test -n "$user" + then +- chown $user "$dir" ++ if test -z "$group" ++ then ++ chown $user $dir ++ else ++ chown $user:$group $dir ++ fi + if test $? -ne 0 + then + echo "Cannot change ownership of the database directories to the '$user'" +@@ -436,6 +447,11 @@ then + args="$args --user=$user" + fi + ++if test -n "$group" ++then ++ args="$args --group=$group" ++fi ++ + # When doing a "cross bootstrap" install, no reference to the current + # host should be added to the system tables. So we filter out any + # lines which contain the current host name. +Index: scripts/CMakeLists.txt +=================================================================== +--- scripts/CMakeLists.txt.orig ++++ scripts/CMakeLists.txt +@@ -134,6 +134,7 @@ ENDIF() + + SET(HOSTNAME "hostname") + SET(MYSQLD_USER "mysql") ++SET(MYSQLD_GROUP "mysql") + ENDIF(UNIX) + + # Really ugly, one script, "mysql_install_db", needs prefix set to ".", +Index: support-files/CMakeLists.txt +=================================================================== +--- support-files/CMakeLists.txt.orig ++++ support-files/CMakeLists.txt +@@ -29,6 +29,7 @@ ELSE() + SET(CFLAGS ${CMAKE_C_FLAGS}) + SET(CXXFLAGS ${CMAKE_CXX_FLAGS}) + SET(MYSQLD_USER "mysql") ++ SET(MYSQLD_GROUP "mysql") + SET(ini_file_extension "cnf") + SET(HOSTNAME "hostname") + ENDIF() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-10.2.3-mysql_install_db-mariadb_dirs.patch new/mysql-patches/mysql-patches/mariadb-10.2.3-mysql_install_db-mariadb_dirs.patch --- old/mysql-patches/mysql-patches/mariadb-10.2.3-mysql_install_db-mariadb_dirs.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-10.2.3-mysql_install_db-mariadb_dirs.patch 2017-11-01 18:12:53.000000000 +0100 @@ -0,0 +1,22 @@ +PATCH-P1-FIX-UPSTREAM: Fix mysql_install_db to find data files in mariadb directories + +Fix mysql_install_db.sh script to find data files in mariadb directories +when a user uses "--basedir" option [bsc#1006539] + +Maintainer: Kristyna Streitova <[email protected]> + +Index: mariadb-10.2.10/scripts/CMakeLists.txt +=================================================================== +--- mariadb-10.2.10.orig/scripts/CMakeLists.txt ++++ mariadb-10.2.10/scripts/CMakeLists.txt +@@ -188,8 +188,8 @@ ENDIF() + + SET(resolveip_locations "$basedir/${INSTALL_BINDIR} $basedir/bin") + SET(mysqld_locations "$basedir/${INSTALL_SBINDIR} $basedir/libexec $basedir/sbin $basedir/bin") +-SET(errmsg_locations "$basedir/${INSTALL_MYSQLSHAREDIR}/english $basedir/share/english $basedir/share/mysql/english") +-SET(pkgdata_locations "$basedir/${INSTALL_MYSQLSHAREDIR} $basedir/share $basedir/share/mysql") ++SET(errmsg_locations "$basedir/${INSTALL_MYSQLSHAREDIR}/english $basedir/share/english $basedir/share/mysql/english $basedir/share/mariadb/english") ++SET(pkgdata_locations "$basedir/${INSTALL_MYSQLSHAREDIR} $basedir/share $basedir/share/mysql $basedir/share/mariadb") + + IF(UNIX) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-10.2.4-fortify-and-O.patch new/mysql-patches/mysql-patches/mariadb-10.2.4-fortify-and-O.patch --- old/mysql-patches/mysql-patches/mariadb-10.2.4-fortify-and-O.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-10.2.4-fortify-and-O.patch 2017-07-28 15:06:34.000000000 +0200 @@ -0,0 +1,82 @@ +PATCH-P0-FIX-HACK: Not enforcing specific flags + +Useing some CFLAGS from distribution and some enforced can and leads to the +conflicts like FORTIFY and -O0. Removing hardcoded options. + +Maintainer: Michal Hrusecky <[email protected]> + +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt.orig ++++ CMakeLists.txt +@@ -217,7 +217,6 @@ IF(SECURITY_HARDENED) + MY_CHECK_AND_SET_COMPILER_FLAG("-pie -fPIC") + MY_CHECK_AND_SET_COMPILER_FLAG("-Wl,-z,relro,-z,now") + MY_CHECK_AND_SET_COMPILER_FLAG("-fstack-protector --param=ssp-buffer-size=4") +- MY_CHECK_AND_SET_COMPILER_FLAG("-D_FORTIFY_SOURCE=2" RELEASE RELWITHDEBINFO) + ENDIF() + + # Always enable debug sync for debug builds. +Index: storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake +=================================================================== +--- storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake.orig ++++ storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake +@@ -26,11 +26,9 @@ endif () + if (CMAKE_VERSION VERSION_LESS 3.0) + set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG TOKU_PTHREAD_DEBUG=1 TOKU_DEBUG_TXN_SYNC=1) + set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DRD TOKU_PTHREAD_DEBUG=1 TOKU_DEBUG_TXN_SYNC=1) +- set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DRD _FORTIFY_SOURCE=2) + else () + set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS + $<$<OR:$<CONFIG:DEBUG>,$<CONFIG:DRD>>:TOKU_PTHREAD_DEBUG=1 TOKU_DEBUG_TXN_SYNC=1> +- $<$<CONFIG:DRD>:_FORTIFY_SOURCE=2> + ) + endif () + +@@ -102,23 +100,23 @@ set_cflags_if_supported( + ) + + ## set extra debugging flags and preprocessor definitions +-set(CMAKE_C_FLAGS_DEBUG "-g3 -O0 ${CMAKE_C_FLAGS_DEBUG}") +-set(CMAKE_CXX_FLAGS_DEBUG "-g3 -O0 ${CMAKE_CXX_FLAGS_DEBUG}") ++set(CMAKE_C_FLAGS_DEBUG "-g3 ${CMAKE_C_FLAGS_DEBUG}") ++set(CMAKE_CXX_FLAGS_DEBUG "-g3 ${CMAKE_CXX_FLAGS_DEBUG}") + + ## flags to use when we want to run DRD on the resulting binaries + ## DRD needs debugging symbols. + ## -O0 makes it too slow, and -O2 inlines too much for our suppressions to work. -O1 is just right. +-set(CMAKE_C_FLAGS_DRD "-g3 -O1 ${CMAKE_C_FLAGS_DRD}") +-set(CMAKE_CXX_FLAGS_DRD "-g3 -O1 ${CMAKE_CXX_FLAGS_DRD}") ++set(CMAKE_C_FLAGS_DRD "-g3 ${CMAKE_C_FLAGS_DRD}") ++set(CMAKE_CXX_FLAGS_DRD "-g3 ${CMAKE_CXX_FLAGS_DRD}") + + ## set extra release flags + ## need to set flags for RelWithDebInfo as well because we want the MySQL/MariaDB builds to use them + if (CMAKE_CXX_COMPILER_ID STREQUAL Clang) + # have tried -flto and -O4, both make our statically linked executables break apple's linker +- set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -O3 -UNDEBUG") +- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -O3 -UNDEBUG") +- set(CMAKE_C_FLAGS_RELEASE "-g -O3 ${CMAKE_C_FLAGS_RELEASE} -UNDEBUG") +- set(CMAKE_CXX_FLAGS_RELEASE "-g -O3 ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG") ++ set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -UNDEBUG") ++ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -UNDEBUG") ++ set(CMAKE_C_FLAGS_RELEASE "-g ${CMAKE_C_FLAGS_RELEASE} -UNDEBUG") ++ set(CMAKE_CXX_FLAGS_RELEASE "-g ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG") + else () + if (APPLE) + set(FLTO_OPTS "-fwhole-program") +@@ -126,10 +124,10 @@ else () + set(FLTO_OPTS "-fuse-linker-plugin") + endif() + # we overwrite this because the default passes -DNDEBUG and we don't want that +- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-flto ${FLTO_OPTS} ${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -O3 -UNDEBUG") +- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-flto ${FLTO_OPTS} ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -O3 -UNDEBUG") +- set(CMAKE_C_FLAGS_RELEASE "-g -O3 -flto ${FLTO_OPTS} ${CMAKE_C_FLAGS_RELEASE} -UNDEBUG") +- set(CMAKE_CXX_FLAGS_RELEASE "-g -O3 -flto ${FLTO_OPTS} ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG") ++ set(CMAKE_C_FLAGS_RELWITHDEBINFO "-flto ${FLTO_OPTS} ${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -UNDEBUG") ++ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-flto ${FLTO_OPTS} ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -UNDEBUG") ++ set(CMAKE_C_FLAGS_RELEASE "-g -flto ${FLTO_OPTS} ${CMAKE_C_FLAGS_RELEASE} -UNDEBUG") ++ set(CMAKE_CXX_FLAGS_RELEASE "-g -flto ${FLTO_OPTS} ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG") + set(CMAKE_EXE_LINKER_FLAGS "-g ${FLTO_OPTS} ${CMAKE_EXE_LINKER_FLAGS}") + set(CMAKE_SHARED_LINKER_FLAGS "-g ${FLTO_OPTS} ${CMAKE_SHARED_LINKER_FLAGS}") + endif () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-10.2.4-logrotate.patch new/mysql-patches/mysql-patches/mariadb-10.2.4-logrotate.patch --- old/mysql-patches/mysql-patches/mariadb-10.2.4-logrotate.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-10.2.4-logrotate.patch 2017-07-28 15:04:54.000000000 +0200 @@ -0,0 +1,35 @@ +PATCH-P0-FIX-SUSE: Fix log file path for logrotate + +In SUSE we've got MySQL log in different directory. It's located in +/var/log/mysql by default. It also adds some extra error message. + +Maintainer: Michal Hrusecky <[email protected]> + +Index: support-files/mysql-log-rotate.sh +=================================================================== +--- support-files/mysql-log-rotate.sh.orig ++++ support-files/mysql-log-rotate.sh +@@ -18,7 +18,7 @@ + # ATTENTION: This /root/.my.cnf should be readable ONLY + # for root ! + +-@localstatedir@/mysqld.log { ++/var/log/mysql/mysqld.log { + # create 600 mysql mysql + notifempty + daily +@@ -32,6 +32,14 @@ + then + @bindir@/mysqladmin --local flush-error-log \ + flush-engine-log flush-general-log flush-slow-log ++ ret=$? ++ if test $ret -ne 0 ++ then ++ echo "/etc/logrotate.d/mariadb failed, probably because" >&2 ++ echo "the root acount is protected by password." >&2 ++ echo "See comments in /etc/logrotate.d/mariadb on how to fix this" >&2 ++ exit $ret ++ fi + fi + endscript + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-10.2.8-systemd-cmake.patch new/mysql-patches/mysql-patches/mariadb-10.2.8-systemd-cmake.patch --- old/mysql-patches/mysql-patches/mariadb-10.2.8-systemd-cmake.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-10.2.8-systemd-cmake.patch 2017-09-29 15:42:46.000000000 +0200 @@ -0,0 +1,33 @@ +PATCH-P1-FIX-HACK: Allow more case-insensitive values for 'WITH_SYSTEMD' + +Remove 'IF(WITH_SYSTEMD STREQUAL "yes")' and use 'IF(WITH_SYSTEMD)' +expression in order to allow more case-insensitive values to be used +here (1, ON, YES, TRUE or Y). + +Maintainer: Kristyna Streitova <[email protected]> + +Index: mariadb-10.2.9/cmake/systemd.cmake +=================================================================== +--- mariadb-10.2.9.orig/cmake/systemd.cmake ++++ mariadb-10.2.9/cmake/systemd.cmake +@@ -18,9 +18,9 @@ MACRO(CHECK_SYSTEMD) + INCLUDE(FindPkgConfig) + # http://www.cmake.org/cmake/help/v3.0/module/FindPkgConfig.html + SET(WITH_SYSTEMD "auto" CACHE STRING "Enable systemd scripts and notification support") +- IF(WITH_SYSTEMD STREQUAL "yes" OR WITH_SYSTEMD STREQUAL "auto") ++ IF(WITH_SYSTEMD OR WITH_SYSTEMD STREQUAL "auto") + IF(PKG_CONFIG_FOUND) +- IF(WITH_SYSTEMD STREQUAL "yes") ++ IF(WITH_SYSTEMD) + pkg_search_module(LIBSYSTEMD REQUIRED libsystemd libsystemd-daemon) + ELSE() + pkg_search_module(LIBSYSTEMD libsystemd libsystemd-daemon) +@@ -68,7 +68,7 @@ MACRO(CHECK_SYSTEMD) + UNSET(HAVE_SYSTEMD_SD_NOTIFY) + UNSET(HAVE_SYSTEMD_SD_NOTIFYF) + MESSAGE_ONCE(systemd "Systemd features not enabled") +- IF(WITH_SYSTEMD STREQUAL "yes") ++ IF(WITH_SYSTEMD ) + MESSAGE(FATAL_ERROR "Requested WITH_SYSTEMD=yes however no dependencies installed/found") + ENDIF() + ENDIF() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-10.2.9-galera_cnf.patch new/mysql-patches/mysql-patches/mariadb-10.2.9-galera_cnf.patch --- old/mysql-patches/mysql-patches/mariadb-10.2.9-galera_cnf.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-10.2.9-galera_cnf.patch 2017-09-29 17:29:30.000000000 +0200 @@ -0,0 +1,29 @@ +PATCH-P1-FIX-FEATURE: Enhance wsrep.cnf (galera configuration file) + +wsrep_on option defines whether or not wsrep replication is enabled. +It's set to OFF by default since MariaDB 10.1 but we want to mention +this option explicitly in galera configuration file in order to bring +it to the user's attention. + +Set the location of the wsrep library (wsrep_provider option). + +Maintainer: Kristyna Streitova <[email protected]> + + +Index: mariadb-10.2.9/support-files/wsrep.cnf.sh +=================================================================== +--- mariadb-10.2.9.orig/support-files/wsrep.cnf.sh ++++ mariadb-10.2.9/support-files/wsrep.cnf.sh +@@ -30,8 +30,11 @@ bind-address=0.0.0.0 + ## WSREP options + ## + ++# Whether or not wsrep replication is enabled ++wsrep_on=OFF ++ + # Full path to wsrep provider library or 'none' +-wsrep_provider=none ++wsrep_provider=%{_libdir}/galera/libgalera_smm.so + + # Provider specific configuration options + #wsrep_provider_options= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.46-logrotate.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.46-logrotate.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.46-logrotate.patch 2017-03-15 17:03:23.624761794 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.46-logrotate.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ -PATCH-P0-FIX-SUSE: Fix log file path for logrotate - -In SUSE we've got MySQL log in different directory. It's located in -/var/log/mysql by default. It also adds some extra error message. - -Maintainer: Michal Hrusecky <[email protected]> - -Index: support-files/mysql-log-rotate.sh -=================================================================== ---- support-files/mysql-log-rotate.sh.orig -+++ support-files/mysql-log-rotate.sh -@@ -18,7 +18,7 @@ - # ATTENTION: This /root/.my.cnf should be readable ONLY - # for root ! - --@localstatedir@/mysqld.log { -+/var/log/mysql/mysqld.log { - # create 600 mysql mysql - notifempty - daily -@@ -32,6 +32,14 @@ - then - @bindir@/mysqladmin --local flush-error-log \ - flush-engine-log flush-general-log flush-slow-log -+ ret=$? -+ if test $ret -ne 0 -+ then -+ echo "/etc/logrotate.d/mariadb failed, probably because" >&2 -+ echo "the root acount is protected by password." >&2 -+ echo "See comments in /etc/logrotate.d/mariadb on how to fix this" >&2 -+ exit $ret -+ fi - fi - endscript - } ++++++ series ++++++ --- /var/tmp/diff_new_pack.sORjoY/_old 2017-11-30 12:44:17.920302262 +0100 +++ /var/tmp/diff_new_pack.sORjoY/_new 2017-11-30 12:44:17.924302117 +0100 @@ -1,12 +1,14 @@ mysql-community-server-5.1.45-multi-configuration.patch -mysql-community-server-5.1.46-logrotate.patch +mariadb-10.2.4-logrotate.patch mariadb-5.5.28-install_db-quiet.patch mariadb-10.1.1-mysqld_multi-features.patch mariadb-5.2.3-cnf.patch mysql-community-server-5.5.6-safe-process-in-bin.patch -mariadb-10.1.4-group.patch +mariadb-10.2.3-group.patch mariadb-10.1.12-deharcode-libdir.patch mariadb-10.0.15-logrotate-su.patch -mariadb-10.1.12-fortify-and-O.patch -mariadb-10.1.16-systemd-cmake.patch -mariadb-10.1.18-mysql_install_db-mariadb_dirs.patch +mariadb-10.2.4-fortify-and-O.patch +mariadb-10.2.8-systemd-cmake.patch +mariadb-10.2.3-mysql_install_db-mariadb_dirs.patch +mariadb-10.2.9-galera_cnf.patch +mariadb-10.2.10-disable_openssl_compatibility_check.patch ++++++ suse_skipped_tests.list ++++++ #---------------------------------------------------------------- # The SSL tests that are failing correctly main.ssl_7937 : bsc#937835, MDEV-8404 main.ssl_crl_clients : bsc#937835, MDEV-8404 main.ssl_cert_verify : bsc#937835, MDEV-8404 main.ssl_8k_key : bsc#937835, MDEV-8404 # Main and perfschema tests main.userstat : bsc#937836, MDEV-8446 perfschema.nesting : bsc#937836, MDEV-8446 perfschema.socket_summary_by_event_name_func : bsc#937836, MDEV-8446 perfschema.socket_summary_by_instance_func : bsc#937836, MDEV-8446 #---------------------------------------------------------------- # Needs to be investigated (issues trackers will be added) plugins.show_all_plugins : perfschema.cnf_option : perfschema.privilege_table_io : rpl.rpl_row_img_blobs : rpl.rpl_row_img_eng_min : rpl.rpl_row_img_eng_noblob : sys_vars.slave_parallel_threads_basic : rocksdb.shutdown : rocksdb.deadlock : roles.acl_statistics : main.non_blocking_api : main.join_cache : main.explain_non_select : main.mdev-504 : (i586) sys_vars.innodb_change_buffer_max_size_basic : (i586)
