diff --git a/centos_pkg_dirs b/centos_pkg_dirs index d57618a..3457ccc 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -1,2 +1 @@ iptables -mariadb diff --git a/mariadb/centos/README b/mariadb/centos/README deleted file mode 100644 index 963b66b..0000000 --- a/mariadb/centos/README +++ /dev/null @@ -1,6 +0,0 @@ -The upstream mariadb includes TokuDB source code with AGPL license. -As AGPL-3.0 is considered a prohibited license by WR, we've modified -the source tarball to delete the storage/tokudb directory and remove -the AGPL reference from the EXCEPTIONS-CLIENT Foss License file. The -spec file has also been modified to compile without tokudb support. - diff --git a/mariadb/centos/build_srpm.data b/mariadb/centos/build_srpm.data deleted file mode 100644 index 4563119..0000000 --- a/mariadb/centos/build_srpm.data +++ /dev/null @@ -1,4 +0,0 @@ -COPY_LIST="$CGCS_BASE/downloads/mariadb-10.1.28.tar.gz $PKG_BASE/centos/files/*" -TIS_PATCH_VER=15 -BUILD_IS_BIG=7 -BUILD_IS_SLOW=19 diff --git a/mariadb/centos/files/LICENSE.clustercheck b/mariadb/centos/files/LICENSE.clustercheck deleted file mode 100644 index 609015d..0000000 --- a/mariadb/centos/files/LICENSE.clustercheck +++ /dev/null @@ -1,27 +0,0 @@ -Copyright (c) 2012-2014, Olaf van Zandwijk -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its contributors - may be used to endorse or promote products derived from this software without - specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/mariadb/centos/files/README.mysql-cnf b/mariadb/centos/files/README.mysql-cnf deleted file mode 100644 index 3700c7f..0000000 --- a/mariadb/centos/files/README.mysql-cnf +++ /dev/null @@ -1,13 +0,0 @@ -This directory contains prepared configuration files with .cnf extension, -which provide a configuration for some common MariaDB deployment scenarios. -These configuration files do not include the default configuration of datadir, -log-file and pid-file locations, as specified in the default my.cnf file, -provided in this distribution. - -Thus, it is recommended to use these configuration files as an addition to the -default my.cnf configuration file. - -Since default my.cnf contains `!includedir @INSTALL_SYSCONF2DIR@` directive, it is -recommended to copy required configuration under @INSTALL_SYSCONF2DIR@ directory, -so the default my.cnf specifications will be extended. - diff --git a/mariadb/centos/files/README.mysql-docs b/mariadb/centos/files/README.mysql-docs deleted file mode 100644 index dd894a7..0000000 --- a/mariadb/centos/files/README.mysql-docs +++ /dev/null @@ -1,4 +0,0 @@ -The official MySQL documentation is not freely redistributable, so we cannot -include it in RHEL or Fedora. You can find it on-line at - -http://dev.mysql.com/doc/ diff --git a/mariadb/centos/files/README.mysql-license b/mariadb/centos/files/README.mysql-license deleted file mode 100644 index ceabbcf..0000000 --- a/mariadb/centos/files/README.mysql-license +++ /dev/null @@ -1,9 +0,0 @@ -MySQL is distributed under GPL v2, but there are some licensing exceptions -that allow the client libraries to be linked with a non-GPL application, -so long as the application is under a license approved by Oracle. -For details see - -http://www.mysql.com/about/legal/licensing/foss-exception/ - -Some innobase code from Percona and Google is under BSD license. -Some code related to test-suite is under LGPLv2. diff --git a/mariadb/centos/files/clustercheck.sh b/mariadb/centos/files/clustercheck.sh deleted file mode 100644 index 782dbb6..0000000 --- a/mariadb/centos/files/clustercheck.sh +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/bash -# -# Script to make a proxy (ie HAProxy) capable of monitoring Galera cluster nodes properly -# -# Author: Olaf van Zandwijk -# Author: Raghavendra Prabhu -# Author: Ryan O'Hara -# -# Documentation and download: https://github.com/olafz/percona-clustercheck -# -# Based on the original script from Unai Rodriguez -# - -if [ -f @INSTALL_SYSCONFDIR@/sysconfig/clustercheck ]; then - . @INSTALL_SYSCONFDIR@/sysconfig/clustercheck -fi - -MYSQL_USERNAME="${MYSQL_USERNAME-clustercheckuser}" -MYSQL_PASSWORD="${MYSQL_PASSWORD-clustercheckpassword!}" -MYSQL_HOST="${MYSQL_HOST:-127.0.0.1}" -MYSQL_PORT="${MYSQL_PORT:-3306}" -ERR_FILE="${ERR_FILE:-/dev/null}" -AVAILABLE_WHEN_DONOR=${AVAILABLE_WHEN_DONOR:-0} -AVAILABLE_WHEN_READONLY=${AVAILABLE_WHEN_READONLY:-1} -DEFAULTS_EXTRA_FILE=${DEFAULTS_EXTRA_FILE:-@INSTALL_SYSCONFDIR@/my.cnf} - -#Timeout exists for instances where mysqld may be hung -TIMEOUT=10 - -if [[ -r $DEFAULTS_EXTRA_FILE ]];then - MYSQL_CMDLINE="mysql --defaults-extra-file=$DEFAULTS_EXTRA_FILE -nNE \ - --connect-timeout=$TIMEOUT \ - --user=${MYSQL_USERNAME} --password=${MYSQL_PASSWORD} \ - --host=${MYSQL_HOST} --port=${MYSQL_PORT}" -else - MYSQL_CMDLINE="mysql -nNE --connect-timeout=$TIMEOUT \ - --user=${MYSQL_USERNAME} --password=${MYSQL_PASSWORD} \ - --host=${MYSQL_HOST} --port=${MYSQL_PORT}" -fi -# -# Perform the query to check the wsrep_local_state -# -WSREP_STATUS=$($MYSQL_CMDLINE -e "SHOW STATUS LIKE 'wsrep_local_state';" \ - 2>${ERR_FILE} | tail -1 2>>${ERR_FILE}) - -if [[ "${WSREP_STATUS}" == "4" ]] || [[ "${WSREP_STATUS}" == "2" && ${AVAILABLE_WHEN_DONOR} == 1 ]] -then - # Check only when set to 0 to avoid latency in response. - if [[ $AVAILABLE_WHEN_READONLY -eq 0 ]];then - READ_ONLY=$($MYSQL_CMDLINE -e "SHOW GLOBAL VARIABLES LIKE 'read_only';" \ - 2>${ERR_FILE} | tail -1 2>>${ERR_FILE}) - - if [[ "${READ_ONLY}" == "ON" ]];then - # Galera cluster node local state is 'Synced', but it is in - # read-only mode. The variable AVAILABLE_WHEN_READONLY is set to 0. - # => return HTTP 503 - # Shell return-code is 1 - echo -en "HTTP/1.1 503 Service Unavailable\r\n" - echo -en "Content-Type: text/plain\r\n" - echo -en "Connection: close\r\n" - echo -en "Content-Length: 35\r\n" - echo -en "\r\n" - echo -en "Galera cluster node is read-only.\r\n" - sleep 0.1 - exit 1 - fi - fi - # Galera cluster node local state is 'Synced' => return HTTP 200 - # Shell return-code is 0 - echo -en "HTTP/1.1 200 OK\r\n" - echo -en "Content-Type: text/plain\r\n" - echo -en "Connection: close\r\n" - echo -en "Content-Length: 32\r\n" - echo -en "\r\n" - echo -en "Galera cluster node is synced.\r\n" - sleep 0.1 - exit 0 -else - # Galera cluster node local state is not 'Synced' => return HTTP 503 - # Shell return-code is 1 - echo -en "HTTP/1.1 503 Service Unavailable\r\n" - echo -en "Content-Type: text/plain\r\n" - echo -en "Connection: close\r\n" - echo -en "Content-Length: 36\r\n" - echo -en "\r\n" - echo -en "Galera cluster node is not synced.\r\n" - sleep 0.1 - exit 1 -fi diff --git a/mariadb/centos/files/mariadb-admincrash.patch b/mariadb/centos/files/mariadb-admincrash.patch deleted file mode 100644 index cc2b10d..0000000 --- a/mariadb/centos/files/mariadb-admincrash.patch +++ /dev/null @@ -1,32 +0,0 @@ -mysqladmin crash on execution of below command: - - #> mysqladmin -u root -p - ... - Segmentation fault (core dumped) - -This is probably caused by memory corruption based on working with temp_argv[-1]. - -RHBZ: #1207041 -Upstream report: https://mariadb.atlassian.net/browse/MDEV-7883 - ---- - client/mysqladmin.cc | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc -index ffdc73f..cb0c558 100644 ---- a/client/mysqladmin.cc -+++ b/client/mysqladmin.cc -@@ -1361,7 +1361,8 @@ static char **mask_password(int argc, char ***argv) - } - argc--; - } -- temp_argv[argc]= my_strdup((*argv)[argc], MYF(MY_FAE)); -+ if (argc >= 0) -+ temp_argv[argc]= my_strdup((*argv)[argc], MYF(MY_FAE)); - return(temp_argv); - } - --- -1.9.1 - diff --git a/mariadb/centos/files/mariadb-basedir.patch b/mariadb/centos/files/mariadb-basedir.patch deleted file mode 100644 index d1f4c10..0000000 --- a/mariadb/centos/files/mariadb-basedir.patch +++ /dev/null @@ -1,24 +0,0 @@ -Don't guess basedir in mysql_config; we place it under _libdir because -of multilib conflicts, so use rather configured @prefix@ path directly. - ---- - scripts/mysql_config.sh | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh -index 52f6d56..df63365 100644 ---- a/scripts/mysql_config.sh -+++ b/scripts/mysql_config.sh -@@ -76,8 +76,7 @@ get_full_path () - - me=`get_full_path $0` - --# Script might have been renamed but assume mysql_config --basedir=`echo $me | sed -e 's;/bin/mysql_.*config.*;;'` -+basedir='@prefix@' - - ldata='@localstatedir@' - execdir='@libexecdir@' --- -1.9.1 - diff --git a/mariadb/centos/files/mariadb-errno.patch b/mariadb/centos/files/mariadb-errno.patch deleted file mode 100644 index 5ff34f0..0000000 --- a/mariadb/centos/files/mariadb-errno.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- - include/my_sys.h | 8 +------- - 1 file changed, 1 insertion(+), 7 deletions(-) - -diff --git a/include/my_sys.h b/include/my_sys.h -index 110a2ee..a90ac5c 100644 ---- a/include/my_sys.h -+++ b/include/my_sys.h -@@ -212,13 +212,7 @@ - #define my_safe_afree(ptr, size) my_afree(ptr) - #endif /* HAVE_ALLOCA */ - --#ifndef errno /* did we already get it? */ --#ifdef HAVE_ERRNO_AS_DEFINE --#include /* errno is a define */ --#else --extern int errno; /* declare errno */ --#endif --#endif /* #ifndef errno */ -+#include /* errno is a define */ - extern char *home_dir; /* Home directory for user */ - extern MYSQL_PLUGIN_IMPORT char *mysql_data_home; - extern const char *my_progname; /* program-name (printed in errors) */ --- -1.9.1 - diff --git a/mariadb/centos/files/mariadb-example-config-files.patch b/mariadb/centos/files/mariadb-example-config-files.patch deleted file mode 100644 index f29d129..0000000 --- a/mariadb/centos/files/mariadb-example-config-files.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- - support-files/my-huge.cnf.sh | 1 + - support-files/my-innodb-heavy-4G.cnf.sh | 2 +- - support-files/my-large.cnf.sh | 1 + - support-files/my-medium.cnf.sh | 1 + - support-files/my-small.cnf.sh | 1 + - 5 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh -index 4e08348..d8bf29e 100644 ---- a/support-files/my-huge.cnf.sh -+++ b/support-files/my-huge.cnf.sh -@@ -25,6 +25,7 @@ socket = @MYSQL_UNIX_ADDR@ - - # The MySQL server - [mysqld] -+log-error = @LOG_LOCATION@ - port = @MYSQL_TCP_PORT@ - socket = @MYSQL_UNIX_ADDR@ - skip-external-locking -diff --git a/support-files/my-innodb-heavy-4G.cnf.sh b/support-files/my-innodb-heavy-4G.cnf.sh -index 2590ff5..85fd33a 100644 ---- a/support-files/my-innodb-heavy-4G.cnf.sh -+++ b/support-files/my-innodb-heavy-4G.cnf.sh -@@ -42,7 +42,7 @@ socket = @MYSQL_UNIX_ADDR@ - # The MariaDB server - # - [mysqld] -- -+log-error = @LOG_LOCATION@ - # generic configuration options - port = @MYSQL_TCP_PORT@ - socket = @MYSQL_UNIX_ADDR@ -diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh -index 6f8dab0..e8c5f74 100644 ---- a/support-files/my-large.cnf.sh -+++ b/support-files/my-large.cnf.sh -@@ -25,6 +25,7 @@ socket = @MYSQL_UNIX_ADDR@ - - # The MariaDB server - [mysqld] -+log-error = @LOG_LOCATION@ - port = @MYSQL_TCP_PORT@ - socket = @MYSQL_UNIX_ADDR@ - skip-external-locking -diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh -index 19ab8df..fc8fc78 100644 ---- a/support-files/my-medium.cnf.sh -+++ b/support-files/my-medium.cnf.sh -@@ -26,6 +26,7 @@ socket = @MYSQL_UNIX_ADDR@ - - # The MariaDB server - [mysqld] -+log-error = @LOG_LOCATION@ - port = @MYSQL_TCP_PORT@ - socket = @MYSQL_UNIX_ADDR@ - skip-external-locking -diff --git a/support-files/my-small.cnf.sh b/support-files/my-small.cnf.sh -index 8c78072..6777431 100644 ---- a/support-files/my-small.cnf.sh -+++ b/support-files/my-small.cnf.sh -@@ -24,6 +24,7 @@ socket = @MYSQL_UNIX_ADDR@ - - # The MySQL server - [mysqld] -+log-error = @LOG_LOCATION@ - port = @MYSQL_TCP_PORT@ - socket = @MYSQL_UNIX_ADDR@ - skip-external-locking --- -1.9.1 - diff --git a/mariadb/centos/files/mariadb-file-contents.patch b/mariadb/centos/files/mariadb-file-contents.patch deleted file mode 100644 index 5f438fc..0000000 --- a/mariadb/centos/files/mariadb-file-contents.patch +++ /dev/null @@ -1,49 +0,0 @@ -Upstream chooses to install INFO_SRC and INFO_BIN into the docs dir, which -breaks at least two packaging commandments, so we put them into $libdir -instead. That means we have to hack the file_contents regression test -to know about this. - -Recommendation they change is at http://bugs.mysql.com/bug.php?id=61425 - ---- - mysql-test/t/file_contents.test | 13 ++++++++++-- - 1 files changed, 11 insertions(+), 2 deletions(-) - -diff --git a/mysql-test/t/file_contents.test b/mysql-test/t/file_contents.test -index 4734a02..a892297 100644 ---- a/mysql-test/t/file_contents.test -+++ b/mysql-test/t/file_contents.test -@@ -11,7 +11,7 @@ - --perl - print "\nChecking 'INFO_SRC' and 'INFO_BIN'\n"; - $dir_bin = $ENV{'MYSQL_BINDIR'}; --if ($dir_bin eq '/usr/') { -+if ($dir_bin =~ '.*/usr/$') { - # RPM package - $dir_docs = $dir_bin; - $dir_docs =~ s|/lib|/share/doc|; -@@ -22,7 +22,7 @@ if ($dir_bin eq '/usr/') { - # RedHat: version number in directory name - $dir_docs = glob "$dir_docs/MariaDB-server*"; - } --} elsif ($dir_bin eq '/usr') { -+} elsif ($dir_bin =~ '.*/usr$') { - # RPM build during development - $dir_docs = "$dir_bin/share/doc"; - if(-d "$dir_docs/packages") { -@@ -32,6 +32,15 @@ if ($dir_bin eq '/usr/') { - # RedHat/Debian: version number in directory name - $dir_docs = glob "$dir_docs/mariadb-server-*"; - $dir_docs = glob "$dir_docs/MariaDB-server*" unless -d $dir_docs; -+ -+ # All the above is entirely wacko, because these files are not docs; -+ # they should be kept in libdir instead. mtr does not provide a nice -+ # way to find libdir though, so we have to kluge it like this: -+ if (-d "$dir_bin/lib64/mysql") { -+ $dir_docs = "$dir_bin/lib64/mysql"; -+ } else { -+ $dir_docs = "$dir_bin/lib/mysql"; -+ } - } - # Slackware - $dir_docs = glob "$dir_bin/doc/mariadb-[0-9]*" unless -d $dir_docs; diff --git a/mariadb/centos/files/mariadb-galera.cnf.patch b/mariadb/centos/files/mariadb-galera.cnf.patch deleted file mode 100644 index e03ee88..0000000 --- a/mariadb/centos/files/mariadb-galera.cnf.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- - support-files/wsrep.cnf.sh | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/support-files/wsrep.cnf.sh b/support-files/wsrep.cnf.sh -index a539085..51ce3dc 100644 ---- a/support-files/wsrep.cnf.sh -+++ b/support-files/wsrep.cnf.sh -@@ -30,6 +30,9 @@ bind-address=0.0.0.0 - ## WSREP options - ## - -+# Enable wsrep -+wsrep_on=1 -+ - # Full path to wsrep provider library or 'none' - wsrep_provider=none - --- -1.9.1 - diff --git a/mariadb/centos/files/mariadb-install-db-sharedir.patch b/mariadb/centos/files/mariadb-install-db-sharedir.patch deleted file mode 100644 index 44dbd6e..0000000 --- a/mariadb/centos/files/mariadb-install-db-sharedir.patch +++ /dev/null @@ -1,49 +0,0 @@ -Use configured value instead of hardcoded path - ---- - scripts/mysql_install_db.pl.in | 2 +- - scripts/mysql_install_db.sh | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in -index 9d2c1f6..0accdd1 100644 ---- a/scripts/mysql_install_db.pl.in -+++ b/scripts/mysql_install_db.pl.in -@@ -320,7 +320,7 @@ elsif ( $opt->{basedir} ) - find_in_basedir($opt,"file","mysqld-nt", - "bin"); # ,"sql" - $srcpkgdatadir = find_in_basedir($opt,"dir","fill_help_tables.sql", -- "share","share/mysql"); # ,"scripts" -+ "share","@INSTALL_MYSQLSHAREDIR@"); # ,"scripts" - $buildpkgdir = $srcpkgdatadir; - $scriptdir = "$opt->{basedir}/scripts"; - } -diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh -index 364cc4f..eaa7a89 100644 ---- a/scripts/mysql_install_db.sh -+++ b/scripts/mysql_install_db.sh -@@ -311,17 +311,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 @INSTALL_MYSQLSHAREDIR@/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/@INSTALL_MYSQLSHAREDIR@/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 @INSTALL_MYSQLSHAREDIR@` - 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/@INSTALL_MYSQLSHAREDIR@ - exit 1 - fi - scriptdir="$basedir/scripts" --- -1.9.1 - diff --git a/mariadb/centos/files/mariadb-install-test.patch b/mariadb/centos/files/mariadb-install-test.patch deleted file mode 100644 index 2bbfc47..0000000 --- a/mariadb/centos/files/mariadb-install-test.patch +++ /dev/null @@ -1,62 +0,0 @@ -Improve the documentation that will be installed in the mysql-test RPM. - ---- - mysql-test/README | 36 +++++++++++++++++++++++++----------- - 1 file changed, 25 insertions(+), 11 deletions(-) - -diff --git a/mysql-test/README b/mysql-test/README -index 0fba1cc..2e756e9 100644 ---- a/mysql-test/README -+++ b/mysql-test/README -@@ -1,15 +1,28 @@ --This directory contains a test suite for the MySQL daemon. To run --the currently existing test cases, simply execute ./mysql-test-run in --this directory. It will fire up the newly built mysqld and test it. -+This directory contains a test suite for the MariaDB daemon. To run -+the currently existing test cases, execute ./mysql-test-run in -+this directory. - --Note that you do not have to have to do "make install", and you could --actually have a co-existing MySQL installation. The tests will not --conflict with it. To run the test suite in a source directory, you --must do make first. -+For use in Red Hat distributions, you should run the script as user mysql, -+who is created with nologin shell however, so the best bet is something like -+ $ su - -+ # cd /usr/share/mysql-test -+ # su -s /bin/bash mysql -c "./mysql-test-run --skip-test-list=rh-skipped-tests.list" - --All tests must pass. If one or more of them fail on your system, please --read the following manual section for instructions on how to report the --problem: -+This will use the installed mysql executables, but will run a private copy -+of the server process (using data files within /usr/share/mysql-test), -+so you need not start the mysqld service beforehand. -+ -+The "--skip-test-list=rh-skipped-tests.list" option excludes tests that are -+known to fail on one or more Red-Hat-supported platforms. You can omit it -+if you want to check whether such failures occur for you. Documentation -+about the reasons for omitting such tests can be found in the file -+rh-skipped-tests.list. -+ -+To clean up afterwards, remove the created "var" subdirectory, eg -+ # su -s /bin/bash - mysql -c "rm -rf /usr/share/mysql-test/var" -+ -+If one or more tests fail on your system, please read the following manual -+section for instructions on how to report the problem: - - https://mariadb.com/kb/en/reporting-bugs - -@@ -26,7 +39,8 @@ other relevant options. - - With no test cases named on the command line, mysql-test-run falls back - to the normal "non-extern" behavior. The reason for this is that some --tests cannot run with an external server. -+tests cannot run with an external server (because they need to control the -+options with which the server is started). - - You can create your own test cases. To create a test case, create a new - file in the t subdirectory using a text editor. The file should have a .test --- -1.9.1 - diff --git a/mariadb/centos/files/mariadb-logrotate.patch b/mariadb/centos/files/mariadb-logrotate.patch deleted file mode 100644 index e87240c..0000000 --- a/mariadb/centos/files/mariadb-logrotate.patch +++ /dev/null @@ -1,80 +0,0 @@ -Adjust the mysql-log-rotate script in several ways: - -* Use the correct log file pathname for Red Hat installations. -* Enable creation of the log file by logrotate (needed since - /var/log/ isn't writable by mysql user); and set the same 640 - permissions we normally use. -* Comment out the actual rotation commands, so that user must edit - the file to enable rotation. This is unfortunate, but the fact - that the script will probably fail without manual configuration - (to set a root password) means that we can't really have it turned - on by default. Fortunately, in most configurations the log file - is low-volume and so rotation is not critical functionality. - -See discussions at RH bugs 799735, 547007 - ---- - support-files/mysql-log-rotate.sh | 44 ++++++++++++++++++++------------------- - 1 files changed, 23 insertions(+), 21 deletions(-) - -diff --git a/support-files/mysql-log-rotate.sh b/support-files/mysql-log-rotate.sh -index 5d1b30b..425c591 100644 ---- a/support-files/mysql-log-rotate.sh -+++ b/support-files/mysql-log-rotate.sh -@@ -1,9 +1,9 @@ - # This logname can be set in /etc/my.cnf --# by setting the variable "err-log" --# in the [safe_mysqld] section as follows: -+# by setting the variable "log-error" -+# in the [mysqld_safe] section as follows: - # --# [safe_mysqld] --# err-log=@localstatedir@/mysqld.log -+# [mysqld_safe] -+# log-error=@LOG_LOCATION@ - # - # If the root user has a password you have to create a - # /root/.my.cnf configuration file with the following -@@ -18,20 +18,22 @@ - # ATTENTION: This /root/.my.cnf should be readable ONLY - # for root ! - --@localstatedir@/mysqld.log { -- # create 600 mysql mysql -- notifempty -- daily -- rotate 3 -- missingok -- compress -- postrotate -- # just if mysqld is really running -- if test -x @bindir@/mysqladmin && \ -- @bindir@/mysqladmin ping &>/dev/null -- then -- @bindir@/mysqladmin --local flush-error-log \ -- flush-engine-log flush-general-log flush-slow-log -- fi -- endscript --} -+# Then, un-comment the following lines to enable rotation of mysql's log file: -+ -+#@LOG_LOCATION@ { -+# # create 600 mysql mysql -+# notifempty -+# daily -+# rotate 3 -+# missingok -+# compress -+# postrotate -+# # just if mysqld is really running -+# if test -x @bindir@/mysqladmin && \ -+# @bindir@/mysqladmin ping &>/dev/null -+# then -+# @bindir@/mysqladmin --local flush-error-log \ -+# flush-engine-log flush-general-log flush-slow-log -+# fi -+# endscript -+#} --- -1.9.1 - diff --git a/mariadb/centos/files/mariadb-notestdb.patch b/mariadb/centos/files/mariadb-notestdb.patch deleted file mode 100644 index b6ea1f5..0000000 --- a/mariadb/centos/files/mariadb-notestdb.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- - scripts/mysql_install_db.pl.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in -index 0accdd1..3ab2786 100644 ---- a/scripts/mysql_install_db.pl.in -+++ b/scripts/mysql_install_db.pl.in -@@ -399,10 +399,10 @@ if ( $opt->{'skip-name-resolve'} and $resolved and $resolved =~ /\s/ ) - } - - # ---------------------------------------------------------------------- --# Create database directories mysql & test -+# Create database directories mysql - # ---------------------------------------------------------------------- - --foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql", "$opt->{ldata}/test" ) -+foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql" ) - { - # FIXME not really the same as original "mkdir -p", but ok? - mkdir($dir, 0700) unless -d $dir; --- -1.9.1 - diff --git a/mariadb/centos/files/mariadb-ownsetup.patch b/mariadb/centos/files/mariadb-ownsetup.patch deleted file mode 100644 index b54c24a..0000000 --- a/mariadb/centos/files/mariadb-ownsetup.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- - support-files/CMakeLists.txt | 1 + - support-files/rpm/server.cnf | 9 +++++++++ - 2 files changed, 10 insertions(+) - -diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt -index 71e9b3f..5f3b2a6 100644 ---- a/support-files/CMakeLists.txt -+++ b/support-files/CMakeLists.txt -@@ -81,6 +81,7 @@ IF(UNIX) - ENDIF() - - CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY) -+ CONFIGURE_FILE(rpm/server.cnf ${CMAKE_CURRENT_BINARY_DIR}/rpm/server.cnf @ONLY) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_SHAREDIR}/pkgconfig COMPONENT Development) - - INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) -diff --git a/support-files/rpm/server.cnf b/support-files/rpm/server.cnf -index 9682d2b..6f398d4 100644 ---- a/support-files/rpm/server.cnf -+++ b/support-files/rpm/server.cnf -@@ -9,7 +9,16 @@ - [server] - - # this is only for the mysqld standalone daemon -+# Settings user and group are ignored when systemd is used. -+# If you need to run mysqld under a different user or group, -+# customize your systemd unit file for mysqld/mariadb according to the -+# instructions in http://fedoraproject.org/wiki/Systemd - [mysqld] -+datadir=@MYSQL_DATADIR@ -+socket=@MYSQL_UNIX_ADDR@ -+log-error=@LOG_LOCATION@ -+pid-file=@PID_FILE_DIR@/@DAEMON_NO_PREFIX@.pid -+ - - # - # * Galera-related settings --- -1.9.1 - diff --git a/mariadb/centos/files/mariadb-revert-stdouterr-closing.patch b/mariadb/centos/files/mariadb-revert-stdouterr-closing.patch deleted file mode 100644 index 96274c3..0000000 --- a/mariadb/centos/files/mariadb-revert-stdouterr-closing.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- - scripts/mysqld_safe.sh | 2 +- - support-files/mysql.server.sh | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh -index 5564f92..fe77d97 100644 ---- a/scripts/mysqld_safe.sh -+++ b/scripts/mysqld_safe.sh -@@ -756,7 +756,7 @@ if [ ! -d $mysql_unix_port_dir ] - then - if ! `mkdir -p $mysql_unix_port_dir` - then -- log_error "Fatal error Can't create database directory '$mysql_unix_port'" -+ echo "Fatal error Can't create database directory '$mysql_unix_port'" - exit 1 - fi - chown $user $mysql_unix_port_dir -diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh -index ed0da3c..312f2b2 100644 ---- a/support-files/mysql.server.sh -+++ b/support-files/mysql.server.sh -@@ -296,7 +296,7 @@ case "$mode" in - then - # Give extra arguments to mysqld with the my.cnf file. This script - # may be overwritten at next upgrade. -- $bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" "$@" & -+ $bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" "$@" >dev/null & - wait_for_ready; return_value=$? - - # Make lock for RedHat / SuSE --- -1.9.1 - diff --git a/mariadb/centos/files/mariadb-scripts.patch b/mariadb/centos/files/mariadb-scripts.patch deleted file mode 100644 index fe51eb7..0000000 --- a/mariadb/centos/files/mariadb-scripts.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- - scripts/CMakeLists.txt | 29 +++++++++++++++++++++++++++++ - 1 file changed, 29 insertions(+) - -diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt -index 2f9c185..a6e4d49 100644 ---- a/scripts/CMakeLists.txt -+++ b/scripts/CMakeLists.txt -@@ -362,6 +362,35 @@ ELSE() - ) - ENDFOREACH() - -+ # files for systemd -+ SET(SYSTEMD_SCRIPTS -+ mysql.tmpfiles.d -+ mysql.service -+ mysql@.service -+ mysql-prepare-db-dir -+ mysql-wait-ready -+ mysql-wait-stop -+ mysql-check-socket -+ mysql-check-upgrade -+ mysql-scripts-common -+ mysql_config_multilib -+ clustercheck -+ mysql.init -+ my.cnf -+ ) -+ FOREACH(file ${SYSTEMD_SCRIPTS}) -+ IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) -+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh -+ ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY) -+ ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.in) -+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.in -+ ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY) -+ ELSE() -+ MESSAGE(FATAL_ERROR "Can not find ${file}.sh or ${file}.in in " -+ "${CMAKE_CURRENT_SOURCE_DIR}" ) -+ ENDIF() -+ ENDFOREACH() -+ - FOREACH(file ${WSREP_SOURCE}) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh - ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY) --- -1.9.1 - diff --git a/mariadb/centos/files/mariadb-server-galera.te b/mariadb/centos/files/mariadb-server-galera.te deleted file mode 100644 index bdce127..0000000 --- a/mariadb/centos/files/mariadb-server-galera.te +++ /dev/null @@ -1,23 +0,0 @@ - -module mariadb-server-galera 1.0; - -require { - type mysqld_t; - type rsync_exec_t; - type anon_inodefs_t; - type proc_net_t; - type kerberos_port_t; - class file { read execute execute_no_trans getattr open }; - class tcp_socket { name_bind name_connect }; - class process { setpgid siginh rlimitinh noatsecure }; -} - -# allow mysqld to run rsyncd -allow mysqld_t self:process setpgid; -allow mysqld_t rsync_exec_t:file { read execute execute_no_trans getattr open }; -allow mysqld_t anon_inodefs_t:file getattr; -allow mysqld_t proc_net_t:file { read open }; - -# allow rsyncd to listen on port 4444 -allow mysqld_t kerberos_port_t:tcp_socket { name_bind name_connect }; - diff --git a/mariadb/centos/files/mariadb-ssl-cypher.patch b/mariadb/centos/files/mariadb-ssl-cypher.patch deleted file mode 100644 index 9ff9e02..0000000 --- a/mariadb/centos/files/mariadb-ssl-cypher.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- - mysql-test/r/ssl_8k_key.result | 4 ++-- - mysql-test/t/ssl_8k_key.test | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/mysql-test/r/ssl_8k_key.result b/mysql-test/r/ssl_8k_key.result -index b33a1d2..ff9d0cc 100644 ---- a/mysql-test/r/ssl_8k_key.result -+++ b/mysql-test/r/ssl_8k_key.result -@@ -1,2 +1,2 @@ --Variable_name Value --Ssl_cipher DHE-RSA-AES256-SHA -+have_ssl -+1 -diff --git a/mysql-test/t/ssl_8k_key.test b/mysql-test/t/ssl_8k_key.test -index 27cffdc..4b81648 100644 ---- a/mysql-test/t/ssl_8k_key.test -+++ b/mysql-test/t/ssl_8k_key.test -@@ -5,7 +5,7 @@ - # - # Bug#29784 YaSSL assertion failure when reading 8k key. - # ----exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1 -+--exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher'" 2>&1 - - ## This test file is for testing encrypted communication only, not other - ## encryption routines that the SSL library happens to provide! --- -1.9.1 - diff --git a/mariadb/centos/files/mariadb-strmov.patch b/mariadb/centos/files/mariadb-strmov.patch deleted file mode 100644 index cdd2f8b..0000000 --- a/mariadb/centos/files/mariadb-strmov.patch +++ /dev/null @@ -1,40 +0,0 @@ -Remove overly optimistic definition of strmov() as stpcpy(). - -mysql uses this macro with overlapping source and destination strings, -which is verboten per spec, and fails on some Red Hat platforms. -Deleting the definition is sufficient to make it fall back to a -byte-at-a-time copy loop, which should consistently give the -expected behavior. - -Note: the particular case that prompted this patch is reported and fixed -at http://bugs.mysql.com/bug.php?id=48864. However, my faith in upstream's -ability to detect this type of error is low, and I also see little evidence -of any real performance gain from optimizing these calls. So I'm keeping -this patch. - ---- - include/m_string.h | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/include/m_string.h b/include/m_string.h -index 7437ea8..bb3ab57 100644 ---- a/include/m_string.h -+++ b/include/m_string.h -@@ -73,14 +73,6 @@ - extern void *(*my_str_realloc)(void *, size_t); - extern void (*my_str_free)(void *); - --#ifdef DBUG_OFF --#if defined(HAVE_STPCPY) && MY_GNUC_PREREQ(3, 4) && !defined(__INTEL_COMPILER) --#define strmov(A,B) __builtin_stpcpy((A),(B)) --#elif defined(HAVE_STPCPY) --#define strmov(A,B) stpcpy((A),(B)) --#endif --#endif -- - /* Declared in int2str() */ - extern const char _dig_vec_upper[]; - extern const char _dig_vec_lower[]; --- -1.9.1 - diff --git a/mariadb/centos/files/my.cnf.in b/mariadb/centos/files/my.cnf.in deleted file mode 100644 index 247e12d..0000000 --- a/mariadb/centos/files/my.cnf.in +++ /dev/null @@ -1,18 +0,0 @@ -# -# This group is read both both by the client and the server -# use it for options that affect everything -# -[client-server] - -# -# This group is read by the server -# -[mysqld] -# Disabling symbolic-links is recommended to prevent assorted security risks -symbolic-links=0 - -# -# include all files from the config directory -# -!includedir @INSTALL_SYSCONF2DIR@ - diff --git a/mariadb/centos/files/mysql-check-socket.sh b/mariadb/centos/files/mysql-check-socket.sh deleted file mode 100644 index b15cd32..0000000 --- a/mariadb/centos/files/mysql-check-socket.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -# We check if there is already a process using the socket file, -# since otherwise the systemd service file could report false -# positive result when starting and mysqld_safe could remove -# a socket file, which is actually being used by a different daemon. - -source "`dirname ${BASH_SOURCE[0]}`/mysql-scripts-common" - -if test -e "$socketfile" ; then - echo "Socket file $socketfile exists." >&2 - - # no write permissions - if ! test -w "$socketfile" ; then - echo "Not enough permission to write to the socket file $socketfile, which is suspicious." >&2 - echo "Please, remove $socketfile manually to start the service." >&2 - exit 1 - fi - - # not a socket file - if ! test -S "$socketfile" ; then - echo "The file $socketfile is not a socket file, which is suspicious." >&2 - echo "Please, remove $socketfile manually to start the service." >&2 - exit 1 - fi - - # some process uses the socket file - if fuser "$socketfile" &>/dev/null ; then - socketpid=$(fuser "$socketfile" 2>/dev/null) - echo "Is another MySQL daemon already running with the same unix socket?" >&2 - echo "Please, stop the process $socketpid or remove $socketfile manually to start the service." >&2 - exit 1 - fi - - # socket file is a garbage - echo "No process is using $socketfile, which means it is a garbage, so it will be removed automatically." >&2 -fi - -exit 0 diff --git a/mariadb/centos/files/mysql-check-upgrade.sh b/mariadb/centos/files/mysql-check-upgrade.sh deleted file mode 100644 index 1bfd3bc..0000000 --- a/mariadb/centos/files/mysql-check-upgrade.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -source "`dirname ${BASH_SOURCE[0]}`/mysql-scripts-common" - -upgrade_info_file="$datadir/mysql_upgrade_info" -version=0 -# get version as integer from mysql_upgrade_info file -if [ -f "$upgrade_info_file" ] && [ -r "$upgrade_info_file" ] ; then - version_major=$(cat "$upgrade_info_file" | head -n 1 | sed -e 's/\([0-9]*\)\.\([0-9]*\)\..*$/\1/') - version_minor=$(cat "$upgrade_info_file" | head -n 1 | sed -e 's/\([0-9]*\)\.\([0-9]*\)\..*$/\2/') - if [[ $version_major =~ ^[0-9]+$ ]] && [[ $version_minor =~ ^[0-9]+$ ]] ; then - version=$((version_major*100+version_minor)) - fi -fi - -# compute current version as integer -thisversion=$((@MAJOR_VERSION@*100+@MINOR_VERSION@)) - -# provide warning in cases we should run mysql_upgrade -if [ $version -ne $thisversion ] ; then - - # give extra warning if some version seems to be skipped - if [ $version -gt 0 ] && [ $version -lt 505 ] ; then - echo "The datadir located at $datadir seems to be older than of a version 5.5. Please, mind that as a general rule, to upgrade from one release series to another, go to the next series rather than skipping a series." >&2 - fi - - cat <&2 -The datadir located at $datadir needs to be upgraded using 'mysql_upgrade' tool. This can be done using the following steps: - - 1. Back-up your data before with 'mysql_upgrade' - 2. Start the database daemon using 'service @DAEMON_NAME@ start' - 3. Run 'mysql_upgrade' with a database user that has sufficient privileges - -Read more about 'mysql_upgrade' usage at: -https://mariadb.com/kb/en/mariadb/documentation/sql-commands/table-commands/mysql_upgrade/ -EOF -fi - -exit 0 diff --git a/mariadb/centos/files/mysql-embedded-check.c b/mariadb/centos/files/mysql-embedded-check.c deleted file mode 100644 index 8bf8ca5..0000000 --- a/mariadb/centos/files/mysql-embedded-check.c +++ /dev/null @@ -1,26 +0,0 @@ -/* simple test program to see if we can link the embedded server library */ - -#include -#include -#include - -#include "mysql.h" - -MYSQL *mysql; - -static char *server_options[] = \ - { "mysql_test", "--defaults-file=my.cnf", NULL }; -int num_elements = (sizeof(server_options) / sizeof(char *)) - 1; - -static char *server_groups[] = { "libmysqld_server", - "libmysqld_client", NULL }; - -int main(int argc, char **argv) -{ - mysql_library_init(num_elements, server_options, server_groups); - mysql = mysql_init(NULL); - mysql_close(mysql); - mysql_library_end(); - - return 0; -} diff --git a/mariadb/centos/files/mysql-prepare-db-dir.sh b/mariadb/centos/files/mysql-prepare-db-dir.sh deleted file mode 100644 index b47fa9b..0000000 --- a/mariadb/centos/files/mysql-prepare-db-dir.sh +++ /dev/null @@ -1,137 +0,0 @@ -#!/bin/sh - -# This script creates the mysql data directory during first service start. -# In subsequent starts, it does nothing much. - -source "`dirname ${BASH_SOURCE[0]}`/mysql-scripts-common" - -# Returns content of the specified directory -# If listing files fails, fake-file is returned so which means -# we'll behave like there was some data initialized -# @param datadir -ls_check_datadir () -{ - ls -A "$1" 2>/dev/null - test $? -eq 0 || echo "fake-file" -} - -# Checks whether datadir should be initialized -# @param datadir -should_initialize () -{ - case `ls_check_datadir "$1"` in - ""|lost+found|*.err) true ;; - *) false ;; - esac -} - -# If two args given first is user, second is group -# otherwise the arg is the systemd service file -if [ "$#" -eq 2 ] -then - myuser="$1" - mygroup="$2" -else - # Absorb configuration settings from the specified systemd service file, - # or the default service if not specified - SERVICE_NAME="$1" - if [ x"$SERVICE_NAME" = x ] - then - SERVICE_NAME=@DAEMON_NAME@.service - fi - - myuser=`systemctl show -p User "${SERVICE_NAME}" | - sed 's/^User=//'` - if [ x"$myuser" = x ] - then - myuser=mysql - fi - - mygroup=`systemctl show -p Group "${SERVICE_NAME}" | - sed 's/^Group=//'` - if [ x"$mygroup" = x ] - then - mygroup=mysql - fi -fi - -# Set up the errlogfile with appropriate permissions -touch "$errlogfile" -ret=$? -# Provide some advice if the log file cannot be touched -if [ $ret -ne 0 ] ; then - errlogdir=$(dirname $errlogfile) - if ! [ -d "$errlogdir" ] ; then - echo "The directory $errlogdir does not exist." - elif [ -f "$errlogfile" ] ; then - echo "The log file $errlogfile cannot be touched, please, fix its permissions." - else - echo "The log file $errlogfile could not be created." - fi - echo "The daemon will be run under $myuser:$mygroup" - exit 1 -fi -chown "$myuser:$mygroup" "$errlogfile" -chmod 0640 "$errlogfile" -[ -x /sbin/restorecon ] && /sbin/restorecon "$errlogfile" - -# Make the data directory if doesn't exist or empty -if should_initialize "$datadir" ; then - # First, make sure $datadir is there with correct permissions - # (note: if it's not, and we're not root, this'll fail ...) - if [ ! -e "$datadir" -a ! -h "$datadir" ] - then - mkdir -p "$datadir" || exit 1 - fi - chown "$myuser:$mygroup" "$datadir" - chmod 0755 "$datadir" - [ -x /sbin/restorecon ] && /sbin/restorecon "$datadir" - - # Now create the database - echo "Initializing @NICE_PROJECT_NAME@ database" - # Avoiding deletion of files not created by mysql_install_db is - # guarded by time check and sleep should help work-arounded - # potential issues on systems with 1 second resolution timestamps - # https://bugzilla.redhat.com/show_bug.cgi?id=1335849#c19 - INITDB_TIMESTAMP=`LANG=C date -u` - sleep 1 - @bindir@/mysql_install_db --rpm --datadir="$datadir" --user="$myuser" - ret=$? - if [ $ret -ne 0 ] ; then - echo "Initialization of @NICE_PROJECT_NAME@ database failed." >&2 - echo "Perhaps @sysconfdir@/my.cnf is misconfigured or there is some problem with permissions of $datadir." >&2 - # Clean up any partially-created database files - if [ ! -e "$datadir/mysql/user.frm" ] && [ -d "$datadir" ] ; then - echo "Initialization of @NICE_PROJECT_NAME@ database was not finished successfully." >&2 - echo "Files created so far will be removed." >&2 - find "$datadir" -mindepth 1 -maxdepth 1 -newermt "$INITDB_TIMESTAMP" \ - -not -name "lost+found" -exec rm -rf {} + - if [ $? -ne 0 ] ; then - echo "Removing of created files was not successfull." >&2 - echo "Please, clean directory $datadir manually." >&2 - fi - else - echo "However, part of data has been initialized and those will not be removed." >&2 - echo "Please, clean directory $datadir manually." >&2 - fi - exit $ret - fi - # upgrade does not need to be run on a fresh datadir - echo "@VERSION@-MariaDB" >"$datadir/mysql_upgrade_info" - # In case we're running as root, make sure files are owned properly - chown -R "$myuser:$mygroup" "$datadir" -else - if [ -d "$datadir/mysql/" ] ; then - # mysql dir exists, it seems data are initialized properly - echo "Database @NICE_PROJECT_NAME@ is probably initialized in $datadir already, nothing is done." - echo "If this is not the case, make sure the $datadir is empty before running `basename $0`." - else - # if the directory is not empty but mysql/ directory is missing, then - # print error and let user to initialize manually or empty the directory - echo "Database @NICE_PROJECT_NAME@ is not initialized, but the directory $datadir is not empty, so initialization cannot be done." - echo "Make sure the $datadir is empty before running `basename $0`." - exit 1 - fi -fi - -exit 0 diff --git a/mariadb/centos/files/mysql-scripts-common.sh b/mariadb/centos/files/mysql-scripts-common.sh deleted file mode 100644 index bf2888f..0000000 --- a/mariadb/centos/files/mysql-scripts-common.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh - -# Some useful functions used in other MySQL helper scripts -# This scripts defines variables datadir, errlogfile, socketfile - -export LC_ALL=C - -# extract value of a MySQL option from config files -# Usage: get_mysql_option VARNAME DEFAULT SECTION [ SECTION, ... ] -# result is returned in $result -# We use my_print_defaults which prints all options from multiple files, -# with the more specific ones later; hence take the last match. -get_mysql_option(){ - if [ $# -ne 3 ] ; then - echo "get_mysql_option requires 3 arguments: section option default_value" - return - fi - sections="$1" - option_name="$2" - default_value="$3" - result=`@bindir@/my_print_defaults $sections | sed -n "s/^--${option_name}=//p" | tail -n 1` - if [ -z "$result" ]; then - # not found, use default - result="${default_value}" - fi -} - -# Defaults here had better match what mysqld_safe will default to -# The option values are generally defined on three important places -# on the default installation: -# 1) default values are hardcoded in the code of mysqld daemon or -# mysqld_safe script -# 2) configurable values are defined in @sysconfdir@/my.cnf -# 3) default values for helper scripts are specified bellow -# So, in case values are defined in my.cnf, we need to get that value. -# In case they are not defined in my.cnf, we need to get the same value -# in the daemon, as in the helper scripts. Thus, default values here -# must correspond with values defined in mysqld_safe script and source -# code itself. - -server_sections="mysqld_safe mysqld server mysqld-@MAJOR_VERSION@.@MINOR_VERSION@ mariadb mariadb-@MAJOR_VERSION@.@MINOR_VERSION@ client-server" - -get_mysql_option "$server_sections" datadir "@MYSQL_DATADIR@" -datadir="$result" - -# if there is log_error in the my.cnf, my_print_defaults still -# returns log-error -# log-error might be defined in mysqld_safe and mysqld sections, -# the former has bigger priority -get_mysql_option "$server_sections" log-error "$datadir/`uname -n`.err" -errlogfile="$result" - -get_mysql_option "$server_sections" socket "@MYSQL_UNIX_ADDR@" -socketfile="$result" - -get_mysql_option "$server_sections" pid-file "$datadir/`uname -n`.pid" -pidfile="$result" - diff --git a/mariadb/centos/files/mysql-wait-ready.sh b/mariadb/centos/files/mysql-wait-ready.sh deleted file mode 100644 index 2ed5fe1..0000000 --- a/mariadb/centos/files/mysql-wait-ready.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh - -source "`dirname ${BASH_SOURCE[0]}`/mysql-scripts-common" - -# This script waits for mysqld to be ready to accept connections -# (which can be many seconds or even minutes after launch, if there's -# a lot of crash-recovery work to do). -# Running this as ExecStartPost is useful so that services declared as -# "After mysqld" won't be started until the database is really ready. - -if [ $# -ne 1 ] ; then - echo "You need to pass daemon pid as an argument for this script." - exit 20 -fi - -# Service file passes us the daemon's PID (actually, mysqld_safe's PID) -daemon_pid="$1" - -# Wait for the server to come up or for the mysqld process to disappear -ret=0 -while /bin/true; do - # Check process still exists - if ! [ -d "/proc/${daemon_pid}" ] ; then - ret=1 - break - fi - RESPONSE=`@bindir@/mysqladmin --no-defaults --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1` - mret=$? - if [ $mret -eq 0 ] ; then - break - fi - # exit codes 1, 11 (EXIT_CANNOT_CONNECT_TO_SERVICE) are expected, - # anything else suggests a configuration error - if [ $mret -ne 1 -a $mret -ne 11 ]; then - echo "Cannot check for @NICE_PROJECT_NAME@ Daemon startup because of mysqladmin failure." >&2 - ret=$mret - break - fi - # "Access denied" also means the server is alive - echo "$RESPONSE" | grep -q "Access denied for user" && break - - sleep 1 -done - -exit $ret diff --git a/mariadb/centos/files/mysql-wait-stop.sh b/mariadb/centos/files/mysql-wait-stop.sh deleted file mode 100644 index 62bde30..0000000 --- a/mariadb/centos/files/mysql-wait-stop.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -source "`dirname ${BASH_SOURCE[0]}`/mysql-scripts-common" - -# This script waits for mysqld to be properly stopped -# (which can be many seconds in some large load). -# Running this as ExecStopPost is useful so that starting which is done -# as part of restart doesn't see the former process still running. - -# Wait for the server to properly end the main server -ret=0 -TIMEOUT=60 -SECONDS=0 - -if ! [ -f "$pidfile" ]; then - exit 0 -fi - -MYSQLPID=`cat "$pidfile" 2>/dev/null` -if [ -z "$MYSQLPID" ] ; then - exit 2 -fi - -while /bin/true; do - # Check process still exists - if ! [ -d "/proc/${MYSQLPID}" ] ; then - break - fi - if [ $SECONDS -gt $TIMEOUT ] ; then - ret=3 - break - fi - sleep 1 -done - -exit $ret diff --git a/mariadb/centos/files/mysql.init.in b/mariadb/centos/files/mysql.init.in deleted file mode 100644 index 0a022af..0000000 --- a/mariadb/centos/files/mysql.init.in +++ /dev/null @@ -1,186 +0,0 @@ -#!/bin/sh -# -# @DAEMON_NAME@ This shell script takes care of starting and stopping -# the MySQL subsystem (mysqld). -# -# chkconfig: - 64 36 -# description: MySQL database server. -# processname: mysqld -# config: @sysconfdir@/my.cnf -# pidfile: /var/run/@DAEMON_NAME@/@DAEMON_NAME@.pid -### BEGIN INIT INFO -# Provides: mysqld -# Required-Start: $local_fs $remote_fs $network $named $syslog $time -# Required-Stop: $local_fs $remote_fs $network $named $syslog $time -# Short-Description: start and stop MySQL server -# Description: MySQL database server -### END INIT INFO - -# Source function library. -. /etc/rc.d/init.d/functions - -# Source networking configuration. -. /etc/sysconfig/network - - -exec="@bindir@/mysqld_safe" -prog="@DAEMON_NAME@" - -# Set timeouts here so they can be overridden from @sysconfdir@/sysconfig/@DAEMON_NO_PREFIX@ -STARTTIMEOUT=300 -STOPTIMEOUT=60 - -# User and group the daemon will run under -MYUSER=mysql -MYGROUP=mysql - -# Edit the following file in order to re-write some of the environment -# variables defined above, like $STARTTIMEOUT, $STOPTIMEOUT, $exec -[ -e @sysconfdir@/sysconfig/@DAEMON_NO_PREFIX@ ] && . @sysconfdir@/sysconfig/@DAEMON_NO_PREFIX@ - -lockfile=/var/lock/subsys/$prog - -# get options from my.cnf -source "@libexecdir@/mysql-scripts-common" - -start(){ - [ -x $exec ] || exit 5 - - # check permissions - if ! touch $(dirname $socketfile) &>/dev/null ; then - action $"Starting $prog: " /bin/false - return 4 - fi - - # check to see if it's already running - MYSQLDRUNNING=0 - if [ -f "$pidfile" ]; then - MYSQLPID=`cat "$pidfile" 2>/dev/null` - if [ -n "$MYSQLPID" ] && [ -d "/proc/$MYSQLPID" ] ; then - MYSQLDRUNNING=1 - fi - fi - RESPONSE=`@bindir@/mysqladmin --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1` - if [ $MYSQLDRUNNING = 1 ] && [ $? = 0 ]; then - # already running, do nothing - action $"Starting $prog: " /bin/true - ret=0 - elif [ $MYSQLDRUNNING = 1 ] && echo "$RESPONSE" | grep -q "Access denied for user" - then - # already running, do nothing - action $"Starting $prog: " /bin/true - ret=0 - else - @libexecdir@/mysql-prepare-db-dir $MYUSER $MYGROUP || return 4 - @libexecdir@/mysql-check-socket || return 1 - - # Pass all the options determined above, to ensure consistent behavior. - # In many cases mysqld_safe would arrive at the same conclusions anyway - # but we need to be sure. (An exception is that we don't force the - # log-error setting, since this script doesn't really depend on that, - # and some users might prefer to configure logging to syslog.) - # Note: set --basedir to prevent probes that might trigger SELinux - # alarms, per bug #547485 - $exec --datadir="$datadir" --socket="$socketfile" \ - --pid-file="$pidfile" \ - --basedir=@prefix@ --user=$MYUSER >/dev/null 2>&1 & - safe_pid=$! - - # Wait until the daemon is up - @libexecdir@/mysql-wait-ready "$safe_pid" - ret=$? - - if [ $ret -eq 0 ]; then - action $"Starting $prog: " /bin/true - chmod o+r $pidfile >/dev/null 2>&1 - touch $lockfile - else - action $"Starting $prog: " /bin/false - fi - fi - return $ret -} - -stop(){ - if [ ! -f "$pidfile" ]; then - # not running; per LSB standards this is "ok" - action $"Stopping $prog: " /bin/true - return 0 - fi - MYSQLPID=`cat "$pidfile" 2>/dev/null` - if [ -n "$MYSQLPID" ]; then - if ! [ -d "/proc/$MYSQLPID" ] ; then - # process doesn't run anymore - action $"Stopping $prog: " /bin/true - return 0 - fi - /bin/kill "$MYSQLPID" >/dev/null 2>&1 - ret=$? - if [ $ret -eq 0 ]; then - TIMEOUT="$STOPTIMEOUT" - while [ $TIMEOUT -gt 0 ]; do - /bin/kill -0 "$MYSQLPID" >/dev/null 2>&1 || break - sleep 1 - let TIMEOUT=${TIMEOUT}-1 - done - if [ $TIMEOUT -eq 0 ]; then - echo "Timeout error occurred trying to stop MySQL Daemon." - ret=1 - action $"Stopping $prog: " /bin/false - else - rm -f $lockfile - rm -f "$socketfile" - action $"Stopping $prog: " /bin/true - fi - else - # kill command failed, probably insufficient permissions - action $"Stopping $prog: " /bin/false - ret=4 - fi - else - # failed to read pidfile, probably insufficient permissions - action $"Stopping $prog: " /bin/false - ret=4 - fi - return $ret -} - -restart(){ - stop - start -} - -condrestart(){ - [ -e $lockfile ] && restart || : -} - - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status -p "$pidfile" $prog - ;; - restart) - restart - ;; - condrestart|try-restart) - condrestart - ;; - reload) - exit 3 - ;; - force-reload) - restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" - exit 2 -esac - -exit $? diff --git a/mariadb/centos/files/mysql.service.in b/mariadb/centos/files/mysql.service.in deleted file mode 100644 index c385b4a..0000000 --- a/mariadb/centos/files/mysql.service.in +++ /dev/null @@ -1,70 +0,0 @@ -# It's not recommended to modify this file in-place, because it will be -# overwritten during package upgrades. If you want to customize, the -# best way is to create a file "/etc/systemd/system/@DAEMON_NAME@.service", -# containing -# .include /usr/lib/systemd/system/@DAEMON_NAME@.service -# ...make your changes here... -# or create a file "/etc/systemd/system/@DAEMON_NAME@.service.d/foo.conf", -# which doesn't need to include ".include" call and which will be parsed -# after the file @DAEMON_NAME@.service itself is parsed. -# -# For more info about custom unit files, see systemd.unit(5) or -# http://fedoraproject.org/wiki/Systemd#How_do_I_customize_a_unit_file.2F_add_a_custom_unit_file.3F - -# For example, if you want to increase mysql's open-files-limit to 10000, -# you need to increase systemd's LimitNOFILE setting, so create a file named -# "/etc/systemd/system/@DAEMON_NAME@.service.d/limits.conf" containing: -# [Service] -# LimitNOFILE=10000 - -# Note: /usr/lib/... is recommended in the .include line though /lib/... -# still works. -# Don't forget to reload systemd daemon after you change unit configuration: -# root> systemctl --system daemon-reload - -# Use [mysqld.INSTANCENAME] as sections in my.cnf to configure this instance. - -[Unit] -Description=@NICE_PROJECT_NAME@ @MAJOR_VERSION@.@MINOR_VERSION@ database server -After=syslog.target -After=network.target - -[Service] -Type=notify -User=mysql -Group=mysql - -ExecStartPre=@libexecdir@/mysql-check-socket -ExecStartPre=@libexecdir@/mysql-prepare-db-dir %n -# MYSQLD_OPTS here is for users to set in /etc/systemd/system/@DAEMON_NAME@@.service.d/MY_SPECIAL.conf -# Note: we set --basedir to prevent probes that might trigger SELinux alarms, -# per bug #547485 -ExecStart=@libexecdir@/mysqld --basedir=@prefix@ $MYSQLD_OPTS $_WSREP_NEW_CLUSTER -ExecStartPost=@libexecdir@/mysql-check-upgrade -ExecStopPost=@libexecdir@/mysql-wait-stop - -# Setting this to true can break replication and the Type=notify settings -# See also bind-address mysqld option. -PrivateNetwork=false - -KillMode=process -KillSignal=SIGTERM - -# Don't want to see an automated SIGKILL ever -SendSIGKILL=no - -# Restart crashed server only, on-failure would also restart, for example, when -# my.cnf contains unknown option -Restart=on-abort -RestartSec=5s - -UMask=007 - -# Give a reasonable amount of time for the server to start up/shut down -TimeoutSec=300 - -# Place temp files in a secure directory, not /tmp -PrivateTmp=true - -[Install] -WantedBy=multi-user.target diff --git a/mariadb/centos/files/mysql.tmpfiles.d.in b/mariadb/centos/files/mysql.tmpfiles.d.in deleted file mode 100644 index 9e6b6e8..0000000 --- a/mariadb/centos/files/mysql.tmpfiles.d.in +++ /dev/null @@ -1,3 +0,0 @@ -# Do not edit this file. -# To override this, put /etc/tmpfiles.d/mariadb.conf instead. -d @PID_FILE_DIR@ 0755 mysql mysql - diff --git a/mariadb/centos/files/mysql@.service.in b/mariadb/centos/files/mysql@.service.in deleted file mode 100644 index ab9a7cd..0000000 --- a/mariadb/centos/files/mysql@.service.in +++ /dev/null @@ -1,77 +0,0 @@ -# Multi instance version of mariadb. For if you run mutiple verions at once. -# Also used for @DAEMON_NAME@@bootstrap to bootstrap Galera. -# -# To use multi instance variant, use [mysqld.INSTANCENAME] as sections in my.cnf -# and start the service via: -# systemctl start @DAEMON_NAME@@{instancename}.server -# -# It's not recommended to modify this file in-place, because it will be -# overwritten during package upgrades. If you want to customize, the -# best way is to create a file "/etc/systemd/system/@DAEMON_NAME@.service", -# containing -# .include /usr/lib/systemd/system/@DAEMON_NAME@.service -# ...make your changes here... -# or create a file "/etc/systemd/system/@DAEMON_NAME@.service.d/foo.conf", -# which doesn't need to include ".include" call and which will be parsed -# after the file @DAEMON_NAME@.service itself is parsed. -# -# For more info about custom unit files, see systemd.unit(5) or -# http://fedoraproject.org/wiki/Systemd#How_do_I_customize_a_unit_file.2F_add_a_custom_unit_file.3F - -# For example, if you want to increase mysql's open-files-limit to 10000, -# you need to increase systemd's LimitNOFILE setting, so create a file named -# "/etc/systemd/system/@DAEMON_NAME@.service.d/limits.conf" containing: -# [Service] -# LimitNOFILE=10000 - -# Note: /usr/lib/... is recommended in the .include line though /lib/... -# still works. -# Don't forget to reload systemd daemon after you change unit configuration: -# root> systemctl --system daemon-reload - -# Use [mysqld.INSTANCENAME] as sections in my.cnf to configure this instance. - -[Unit] -Description=@NICE_PROJECT_NAME@ @MAJOR_VERSION@.@MINOR_VERSION@ database server -After=syslog.target -After=network.target - -[Service] -Type=notify -User=mysql -Group=mysql - -ExecStartPre=@libexecdir@/mysql-check-socket -ExecStartPre=@libexecdir@/mysql-prepare-db-dir %n -# MYSQLD_OPTS here is for users to set in /etc/systemd/system/@DAEMON_NAME@@.service.d/MY_SPECIAL.conf -# Note: we set --basedir to prevent probes that might trigger SELinux alarms, -# per bug #547485 -ExecStart=@libexecdir@/mysqld --defaults-group-suffix=.%I --basedir=@prefix@ $MYSQLD_OPTS $_WSREP_NEW_CLUSTER -ExecStartPost=@libexecdir@/mysql-check-upgrade -ExecStopPost=@libexecdir@/mysql-wait-stop - -# Setting this to true can break replication and the Type=notify settings -# See also bind-address mysqld option. -PrivateNetwork=false - -KillMode=process -KillSignal=SIGTERM - -# Don't want to see an automated SIGKILL ever -SendSIGKILL=no - -# Restart crashed server only, on-failure would also restart, for example, when -# my.cnf contains unknown option -Restart=on-abort -RestartSec=5s - -UMask=007 - -# Give a reasonable amount of time for the server to start up/shut down -TimeoutSec=300 - -# Place temp files in a secure directory, not /tmp -PrivateTmp=true - -[Install] -WantedBy=multi-user.target diff --git a/mariadb/centos/files/mysql_config_multilib.sh b/mariadb/centos/files/mysql_config_multilib.sh deleted file mode 100644 index 06c2a2b..0000000 --- a/mariadb/centos/files/mysql_config_multilib.sh +++ /dev/null @@ -1,26 +0,0 @@ -#! /bin/sh -# -# Wrapper script for mysql_config to support multilib -# -# This command respects setarch - -bits=$(rpm --eval %__isa_bits) - -case $bits in - 32|64) status=known ;; - *) status=unknown ;; -esac - -if [ "$status" = "unknown" ] ; then - echo "$0: error: command 'rpm --eval %__isa_bits' returned unknown value: $bits" - exit 1 -fi - - -if [ -x @bindir@/mysql_config-$bits ] ; then - @bindir@/mysql_config-$bits "$@" -else - echo "$0: error: needed binary: @bindir@/mysql_config-$bits is missing" - exit 1 -fi - diff --git a/mariadb/centos/files/rh-skipped-tests-arm.list b/mariadb/centos/files/rh-skipped-tests-arm.list deleted file mode 100644 index d7e0b58..0000000 --- a/mariadb/centos/files/rh-skipped-tests-arm.list +++ /dev/null @@ -1,8 +0,0 @@ -main.partition_exchange : #1399847 -main.analyze_stmt_orderby : #1399847 -main.explain_json_innodb : #1399847 -main.explain_json_format_partitions : #1399847 -main.analyze_format_json : #1399847 -main.explain_json : #1399847 -main.subselect_cache : #1399847 -main.type_year : #1399847 diff --git a/mariadb/centos/files/rh-skipped-tests-base.list b/mariadb/centos/files/rh-skipped-tests-base.list deleted file mode 100644 index 2992d7e..0000000 --- a/mariadb/centos/files/rh-skipped-tests-base.list +++ /dev/null @@ -1,9 +0,0 @@ -main.userstat : #1399847 -main.multi_update : #1399847 -main.set_statement_notembedded_binlog : #1399847 -main.ssl_7937 : #1399847 -main.ssl_crl_clients : #1399847 -main.ssl_cert_verify : #1399847 -perfschema.nesting : #1399847 -perfschema.socket_summary_by_event_name_func : #1399847 -perfschema.socket_summary_by_instance_func : #1399847 diff --git a/mariadb/centos/files/rh-skipped-tests-ppc-s390.list b/mariadb/centos/files/rh-skipped-tests-ppc-s390.list deleted file mode 100644 index e69de29..0000000 diff --git a/mariadb/centos/mariadb.spec b/mariadb/centos/mariadb.spec deleted file mode 100644 index 5a1a82a..0000000 --- a/mariadb/centos/mariadb.spec +++ /dev/null @@ -1,2033 +0,0 @@ -# Prefix that is used for patches -%global pkg_name %{name} -%global pkgnamepatch mariadb - -# Regression tests may take a long time (many cores recommended), skip them by -# passing --nocheck to rpmbuild or by setting runselftest to 0 if defining -# --nocheck is not possible (e.g. in koji build) -%{!?runselftest:%global runselftest 0} - -# Set this to 1 to see which tests fail, but 0 on production ready build -%global ignore_testsuite_result 0 - -# In f20+ use unversioned docdirs, otherwise the old versioned one -%global _pkgdocdirname %{pkg_name}%{!?_pkgdocdir:-%{version}} -%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{pkg_name}-%{version}} - -# Use Full RELRO for all binaries (RHBZ#1092548) -%global _hardened_build 1 - -# By default, patch(1) creates backup files when chunks apply with offsets. -# Turn that off to ensure such files don't get included in RPMs (cf bz#884755). -%global _default_patch_flags --no-backup-if-mismatch - -# TokuDB engine is now part of MariaDB, but it is available only for x86_64; -# variable tokudb allows to build with TokuDB storage engine -# Temporarily disabled in F21+ for https://mariadb.atlassian.net/browse/MDEV-6446 -# WRS: TokuDB has AGPL license, so disable it -%ifarch 0 #x86_64 -%bcond_without tokudb -%else -%bcond_with tokudb -%endif - -# Mroonga engine is now part of MariaDB, but it only builds for x86_64; -# variable mroonga allows to build with Mroonga storage engine -%ifarch x86_64 i686 -%bcond_without mroonga -%else -%bcond_with mroonga -%endif - -# The Open Query GRAPH engine (OQGRAPH) is a computation engine allowing -# hierarchies and more complex graph structures to be handled in a relational -# fashion; enabled by default -# Temporarily disabling oqgraph: https://mariadb.atlassian.net/browse/MDEV-9479 -%bcond_with oqgraph - -# For some use cases we do not need some parts of the package -%bcond_without clibrary -%bcond_without embedded -%bcond_without devel -%bcond_without client -%bcond_without common -%bcond_without errmsg -%bcond_without bench -%bcond_without test -%bcond_without connect -%bcond_without galera - -# When there is already another package that ships /etc/my.cnf, -# rather include it than ship the file again, since conflicts between -# those files may create issues -%bcond_without config - -# For deep debugging we need to build binaries with extra debug info -%bcond_with debug - -# Include files for SysV init or systemd -%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 -%bcond_without init_systemd -%bcond_with init_sysv -%global daemon_name %{name} -%global daemondir %{_unitdir} -%global daemon_no_prefix %{pkg_name} -%global mysqld_pid_dir mysqld -%else -%bcond_with init_systemd -%bcond_without init_sysv -%global daemon_name mysqld -%global daemondir %{_sysconfdir}/rc.d/init.d -%global daemon_no_prefix mysqld -%endif - -# MariaDB 10.0 and later requires pcre >= 8.35, otherwise we need to use -# the bundled library, since the package cannot be build with older version -%global pcre_version 8.41 -%if 0%{?fedora} >= 21 -%bcond_without pcre -%else -%bcond_with pcre -%endif - -# We define some system's well known locations here so we can use them easily -# later when building to another location (like SCL) -%global logrotateddir %{_sysconfdir}/logrotate.d -%global logfiledir %{_localstatedir}/log/%{daemon_name} -%global logfile %{logfiledir}/%{daemon_name}.log - -# Directory for storing pid file -%global pidfiledir %{_localstatedir}/run/%{daemon_name} - -# Defining where database data live -%global dbdatadir %{_localstatedir}/lib/mysql - -# Home directory of mysql user should be same for all packages that create it -%global mysqluserhome /var/lib/mysql - -# The evr of mysql we want to obsolete -%global obsoleted_mysql_evr 5.6-0 -%global obsoleted_mysql_case_evr 5.5.30-5 - -# The evr of mariadb-galera we want to obsolete -%global obsoleted_mariadb_galera_evr 1:10.0.17-6 -%global obsoleted_mariadb_galera_common_evr 5.5.36-10 -%global obsoleted_mariadb_galera_server_evr 1:10.0.17-6 - -# Provide mysql names for compatibility -%bcond_without mysql_names -%bcond_without conflicts - -# Make long macros shorter -%global sameevr %{epoch}:%{version}-%{release} -%global compatver 10.1 -%global bugfixver 28 - -Name: mariadb -Version: %{compatver}.%{bugfixver} -Release: 1.el7%{?_tis_dist}.%{tis_patch_ver} -Epoch: 3 - -Summary: A community developed branch of MySQL -Group: Applications/Databases -URL: http://mariadb.org -# Exceptions allow client libraries to be linked with most open source SW, -# not only GPL code. See README.mysql-license -License: GPLv2 with exceptions and LGPLv2 and BSD - -#Source0: http://mirrors.syringanetworks.net/mariadb/mariadb-%{version}/source/mariadb-%{version}.tar.gz -Source0: mariadb-%{version}.tar.gz -Source2: mysql_config_multilib.sh -Source3: my.cnf.in -Source5: README.mysql-cnf -Source6: README.mysql-docs -Source7: README.mysql-license -Source9: mysql-embedded-check.c -Source10: mysql.tmpfiles.d.in -Source11: mysql.service.in -Source12: mysql-prepare-db-dir.sh -Source13: mysql-wait-ready.sh -Source14: mysql-check-socket.sh -Source15: mysql-scripts-common.sh -Source16: mysql-check-upgrade.sh -Source17: mysql-wait-stop.sh -Source18: mysql@.service.in -Source19: mysql.init.in -Source50: rh-skipped-tests-base.list -Source51: rh-skipped-tests-arm.list -Source52: rh-skipped-tests-ppc-s390.list -# TODO: clustercheck contains some hard-coded paths, these should be expanded using template system -Source70: clustercheck.sh -Source71: LICENSE.clustercheck -Source72: mariadb-server-galera.te - -# Comments for these patches are in the patch files -# Patches common for more mysql-like packages -Patch1: %{pkgnamepatch}-strmov.patch -Patch2: %{pkgnamepatch}-install-test.patch -Patch4: %{pkgnamepatch}-logrotate.patch -Patch5: %{pkgnamepatch}-file-contents.patch -Patch7: %{pkgnamepatch}-scripts.patch -Patch8: %{pkgnamepatch}-install-db-sharedir.patch -Patch9: %{pkgnamepatch}-ownsetup.patch -Patch12: %{pkgnamepatch}-admincrash.patch -Patch13: %{pkgnamepatch}-ssl-cypher.patch -Patch14: %{pkgnamepatch}-example-config-files.patch - -# Patches specific for this mysql package -Patch30: %{pkgnamepatch}-errno.patch -# Patch31: %{pkgnamepatch}-string-overflow.patch -Patch32: %{pkgnamepatch}-basedir.patch -# Patch34: %{pkgnamepatch}-covscan-stroverflow.patch -Patch37: %{pkgnamepatch}-notestdb.patch -# Due to LP https://bugs.launchpad.net/tripleo/+bug/1638864 -# Reverts 7497ebf8a49bfe30bb4110f2ac20a30f804b7946 until we fix the -# galera resource agent to cope with this change -# When RHBZ#1391470 gets fixed and released in centos we can remove this patch -Patch38: %{pkgnamepatch}-revert-stdouterr-closing.patch - -# Patches for galera -Patch40: %{pkgnamepatch}-galera.cnf.patch -# Patch41: %{pkgnamepatch}-galera-new-cluster-help.patch - -BuildRequires: cmake -BuildRequires: bison -BuildRequires: gcc-c++ -BuildRequires: libaio-devel -BuildRequires: libedit-devel -BuildRequires: ncurses-devel -BuildRequires: perl -%if 0%{?fedora} >= 22 || 0%{?rhel} > 7 -BuildRequires: perl-generators -%endif -BuildRequires: systemtap-sdt-devel -BuildRequires: zlib-devel -BuildRequires: multilib-rpm-config - -# Mariabackup -BuildRequires: libarchive libarchive-devel -# auth_pam.so plugin will be build if pam-devel is installed -BuildRequires: pam-devel -# use either new enough version of pcre or provide bundles(pcre) -%{?with_pcre:BuildRequires: pcre-devel >= 8.35} -%{!?with_pcre:Provides: bundled(pcre) = %{pcre_version}} -# Tests requires time and ps and some perl modules -BuildRequires: procps -BuildRequires: time -BuildRequires: perl(Env) -BuildRequires: perl(Exporter) -BuildRequires: perl(Fcntl) -BuildRequires: perl(File::Temp) -BuildRequires: perl(Data::Dumper) -BuildRequires: perl(Getopt::Long) -BuildRequires: perl(IPC::Open3) -BuildRequires: perl(Memoize) -BuildRequires: perl(Socket) -BuildRequires: perl(Sys::Hostname) -BuildRequires: perl(Test::More) -BuildRequires: perl(Time::HiRes) -BuildRequires: perl(Symbol) - -# Temporary workaound to build with OpenSSL 1.0 on Fedora >=26 (wich requires OpenSSL 1.1) -%if 0%{?fedora} >= 26 -BuildRequires: compat-openssl10-devel -Requires: compat-openssl10 -%else -# for running some openssl tests rhbz#1189180 -BuildRequires: openssl -BuildRequires: openssl-devel -%endif - -BuildRequires: krb5-devel - -BuildRequires: selinux-policy-devel -%{?with_init_systemd:BuildRequires: systemd systemd-devel} - -BuildRequires: krb5-devel - -Requires: bash -Requires: fileutils -Requires: grep -Requires: %{name}-common%{?_isa} = %{sameevr} - -# Explicit EVR requirement for -libs is needed for -# https://bugzilla.redhat.com/show_bug.cgi?id=1406320 -Requires: %{name}-libs%{?_isa} = %{sameevr} - -%if %{with mysql_names} -Provides: mysql = %{sameevr} -Provides: mysql%{?_isa} = %{sameevr} -Provides: mysql-compat-client = %{sameevr} -Provides: mysql-compat-client%{?_isa} = %{sameevr} -%endif - - - -# MySQL (with caps) is upstream's spelling of their own RPMs for mysql -%{?obsoleted_mysql_case_evr:Obsoletes: MySQL < %{obsoleted_mysql_case_evr}} -%{?obsoleted_mysql_evr:Obsoletes: mysql < %{obsoleted_mysql_evr}} -%{?with_conflicts:Conflicts: community-mysql} - -# obsoletion of mariadb-galera -Provides: mariadb-galera = %{sameevr} -Obsoletes: mariadb-galera < %{obsoleted_mariadb_galera_evr} - -# Filtering: https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering -%if 0%{?fedora} > 14 || 0%{?rhel} > 6 -%global __requires_exclude ^perl\\((hostnames|lib::mtr|lib::v1|mtr_|My::) -%global __provides_exclude_from ^(%{_datadir}/(mysql|mysql-test)/.*|%{_libdir}/mysql/plugin/.*\\.so)$ -%else -%filter_from_requires /perl(\(hostnames\|lib::mtr\|lib::v1\|mtr_\|My::\)/d -%filter_provides_in -P (%{_datadir}/(mysql|mysql-test)/.*|%{_libdir}/mysql/plugin/.*\.so) -%filter_setup -%endif - -# Define license macro if not present -%{!?_licensedir:%global license %doc} - -%description -MariaDB is a community developed branch of MySQL. -MariaDB is a multi-user, multi-threaded SQL database server. -It is a client/server implementation consisting of a server daemon (mysqld) -and many different client programs and libraries. The base package -contains the standard MariaDB/MySQL client programs and generic MySQL files. - - -%if %{with clibrary} -%package libs -Summary: The shared libraries required for MariaDB/MySQL clients -Group: Applications/Databases -Requires: %{name}-common%{?_isa} = %{sameevr} -%if %{with mysql_names} -Provides: mysql-libs = %{sameevr} -Provides: mysql-libs%{?_isa} = %{sameevr} -%endif -%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-libs < %{obsoleted_mysql_case_evr}} -%{?obsoleted_mysql_evr:Obsoletes: mysql-libs < %{obsoleted_mysql_evr}} - -%description libs -The mariadb-libs package provides the essential shared libraries for any -MariaDB/MySQL client program or interface. You will need to install this -package to use any other MariaDB package or any clients that need to connect -to a MariaDB/MySQL server. MariaDB is a community developed branch of MySQL. -%endif - - -%if %{with config} -%package config -Summary: The config files required by server and client -Group: Applications/Databases - -%description config -The package provides the config file my.cnf and my.cnf.d directory used by any -MariaDB or MySQL program. You will need to install this package to use any -other MariaDB or MySQL package if the config files are not provided in the -package itself. -%endif - - -%if %{with common} -%package common -Summary: The shared files required by server and client -Group: Applications/Databases -Requires: %{_sysconfdir}/my.cnf - -# obsoletion of mariadb-galera-common -Provides: mariadb-galera-common = %{sameevr} -Obsoletes: mariadb-galera-common < %{obsoleted_mariadb_galera_common_evr} - -%description common -The package provides the essential shared files for any MariaDB program. -You will need to install this package to use any other MariaDB package. -%endif - - -%if %{with errmsg} -%package errmsg -Summary: The error messages files required by server and embedded -Group: Applications/Databases -Requires: %{name}-common%{?_isa} = %{sameevr} - -%description errmsg -The package provides error messages files for the MariaDB daemon and the -embedded server. You will need to install this package to use any of those -MariaDB packages. -%endif - - -%if %{with galera} -%package server-galera -Summary: The configuration files and scripts for galera replication -Group: Applications/Databases -Requires: %{name}-common%{?_isa} = %{sameevr} -Requires: %{name}-server%{?_isa} = %{sameevr} -Requires: galera >= 25.3.3 -Requires(post): libselinux-utils -Requires(post): policycoreutils-python - -# obsoletion of mariadb-galera-server -Provides: mariadb-galera-server = %{sameevr} -Obsoletes: mariadb-galera-server <= %{obsoleted_mariadb_galera_server_evr} - -%description server-galera -MariaDB is a multi-user, multi-threaded SQL database server. It is a -client/server implementation consisting of a server daemon (mysqld) -and many different client programs and libraries. This package contains -the MariaDB server and some accompanying files and directories. -MariaDB is a community developed branch of MySQL. -%endif - - -%package server -Summary: The MariaDB server and related files -Group: Applications/Databases - -# note: no version here = %%{version}-%%{release} -%if %{with mysql_names} -Requires: mysql-compat-client%{?_isa} -Requires: mysql%{?_isa} -%else -Requires: %{name}%{?_isa} -%endif -Requires: %{name}-common%{?_isa} = %{sameevr} -Requires: %{_sysconfdir}/my.cnf -Requires: %{_sysconfdir}/my.cnf.d -Requires: %{name}-errmsg%{?_isa} = %{sameevr} -Requires: sh-utils -Requires(pre): /usr/sbin/useradd -%if %{with init_systemd} -# We require this to be present for %%{_tmpfilesdir} -Requires: systemd -# Make sure it's there when scriptlets run, too -Requires(pre): systemd -Requires(posttrans): systemd -%{?systemd_requires: %systemd_requires} -%endif -# mysqlhotcopy needs DBI/DBD support -Requires: perl(DBI) -Requires: perl(DBD::mysql) -# wsrep requirements -Requires: lsof -Requires: net-tools -Requires: sh-utils -Requires: rsync -%if %{with mysql_names} -Provides: mysql-server = %{sameevr} -Provides: mysql-server%{?_isa} = %{sameevr} -Provides: mysql-compat-server = %{sameevr} -Provides: mysql-compat-server%{?_isa} = %{sameevr} -%endif -%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-server < %{obsoleted_mysql_case_evr}} -%{?with_conflicts:Conflicts: community-mysql-server} -%{?with_conflicts:Conflicts: mariadb-galera-server <= %{obsoleted_mariadb_galera_server_evr}} -%{?obsoleted_mysql_evr:Obsoletes: mysql-server < %{obsoleted_mysql_evr}} - -%description server -MariaDB is a multi-user, multi-threaded SQL database server. It is a -client/server implementation consisting of a server daemon (mysqld) -and many different client programs and libraries. This package contains -the MariaDB server and some accompanying files and directories. -MariaDB is a community developed branch of MySQL. - - -%if %{with oqgraph} -%package oqgraph-engine -Summary: The Open Query GRAPH engine for MariaDB -Group: Applications/Databases -Requires: %{name}-server%{?_isa} = %{sameevr} -# boost and Judy required for oograph -BuildRequires: boost-devel -BuildRequires: Judy-devel - -%description oqgraph-engine -The package provides Open Query GRAPH engine (OQGRAPH) as plugin for MariaDB -database server. OQGRAPH is a computation engine allowing hierarchies and more -complex graph structures to be handled in a relational fashion. In a nutshell, -tree structures and friend-of-a-friend style searches can now be done using -standard SQL syntax, and results joined onto other tables. -%endif - - -%if %{with connect} -%package connect-engine -Summary: The CONNECT storage engine for MariaDB -Group: Applications/Databases -Requires: %{name}-server%{?_isa} = %{sameevr} - -%description connect-engine -The CONNECT storage engine enables MariaDB to access external local or -remote data (MED). This is done by defining tables based on different data -types, in particular files in various formats, data extracted from other DBMS -or products (such as Excel), or data retrieved from the environment -(for example DIR, WMI, and MAC tables). -%endif - - -%if %{with devel} -%package devel -Summary: Files for development of MariaDB/MySQL applications -Group: Applications/Databases -%{?with_clibrary:Requires: %{name}-libs%{?_isa} = %{sameevr}} -# avoid issues with openssl1.0 / openssl1.1 / compat -Requires: pkgconfig(openssl) -%if %{with mysql_names} -Provides: mysql-devel = %{sameevr} -Provides: mysql-devel%{?_isa} = %{sameevr} -%endif -%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-devel < %{obsoleted_mysql_case_evr}} -%{?obsoleted_mysql_evr:Obsoletes: mysql-devel < %{obsoleted_mysql_evr}} -%{?with_conflicts:Conflicts: community-mysql-devel} - -%description devel -MariaDB is a multi-user, multi-threaded SQL database server. This -package contains the libraries and header files that are needed for -developing MariaDB/MySQL client applications. -MariaDB is a community developed branch of MySQL. -%endif - - -%if %{with embedded} -%package embedded -Summary: MariaDB as an embeddable library -Group: Applications/Databases -Requires: %{name}-common%{?_isa} = %{sameevr} -Requires: %{name}-errmsg%{?_isa} = %{sameevr} -%if %{with mysql_names} -Provides: mysql-embedded = %{sameevr} -Provides: mysql-embedded%{?_isa} = %{sameevr} -%endif -%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-embedded < %{obsoleted_mysql_case_evr}} -%{?obsoleted_mysql_evr:Obsoletes: mysql-embedded < %{obsoleted_mysql_evr}} - -%description embedded -MariaDB is a multi-user, multi-threaded SQL database server. This -package contains a version of the MariaDB server that can be embedded -into a client application instead of running as a separate process. -MariaDB is a community developed branch of MySQL. - - -%package embedded-devel -Summary: Development files for MariaDB as an embeddable library -Group: Applications/Databases -Requires: %{name}-embedded%{?_isa} = %{sameevr} -Requires: %{name}-devel%{?_isa} = %{sameevr} -# embedded-devel should require libaio-devel (rhbz#1290517) -Requires: libaio-devel -%if %{with mysql_names} -Provides: mysql-embedded-devel = %{sameevr} -Provides: mysql-embedded-devel%{?_isa} = %{sameevr} -%endif -%{?with_conflicts:Conflicts: community-mysql-embedded-devel} -%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-embedded-devel < %{obsoleted_mysql_case_evr}} -%{?obsoleted_mysql_evr:Obsoletes: mysql-embedded-devel < %{obsoleted_mysql_evr}} - -%description embedded-devel -MariaDB is a multi-user, multi-threaded SQL database server. This -package contains files needed for developing and testing with -the embedded version of the MariaDB server. -MariaDB is a community developed branch of MySQL. -%endif - - -%if %{with bench} -%package bench -Summary: MariaDB benchmark scripts and data -Group: Applications/Databases -Requires: %{name}%{?_isa} = %{sameevr} -%if %{with mysql_names} -Provides: mysql-bench = %{sameevr} -Provides: mysql-bench%{?_isa} = %{sameevr} -%endif -%{?with_conflicts:Conflicts: community-mysql-bench} -%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-bench < %{obsoleted_mysql_case_evr}} -%{?obsoleted_mysql_evr:Obsoletes: mysql-bench < %{obsoleted_mysql_evr}} - -%description bench -MariaDB is a multi-user, multi-threaded SQL database server. This -package contains benchmark scripts and data for use when benchmarking -MariaDB. -MariaDB is a community developed branch of MySQL. -%endif - - -%if %{with test} -%package test -Summary: The test suite distributed with MariaDB -Group: Applications/Databases -Requires: %{name}%{?_isa} = %{sameevr} -Requires: %{name}-common%{?_isa} = %{sameevr} -Requires: %{name}-server%{?_isa} = %{sameevr} -Requires: perl(Env) -Requires: perl(Exporter) -Requires: perl(Fcntl) -Requires: perl(File::Temp) -Requires: perl(Data::Dumper) -Requires: perl(Getopt::Long) -Requires: perl(IPC::Open3) -Requires: perl(Socket) -Requires: perl(Sys::Hostname) -Requires: perl(Test::More) -Requires: perl(Time::HiRes) -%{?with_conflicts:Conflicts: community-mysql-test} -%if %{with mysql_names} -Provides: mysql-test = %{sameevr} -Provides: mysql-test%{?_isa} = %{sameevr} -%endif -%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-test < %{obsoleted_mysql_case_evr}} -%{?obsoleted_mysql_evr:Obsoletes: mysql-test < %{obsoleted_mysql_evr}} - -%description test -MariaDB is a multi-user, multi-threaded SQL database server. This -package contains the regression test suite distributed with -the MariaDB sources. -MariaDB is a community developed branch of MySQL. -%endif - -%prep -%setup -q -n mariadb-%{version} - -%patch1 -p1 -%patch2 -p1 -%patch4 -p1 -%patch5 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch30 -p1 -# %patch31 -p1 -%patch32 -p1 -# %patch34 -p1 -%patch37 -p1 -%patch38 -p1 -%patch40 -p1 -# %patch41 -p1 - -sed -i -e 's/2.8.7/2.6.4/g' cmake/cpack_rpm.cmake -# workaround to deploy mariadb@.service on EL7 -sed -i 's/IF(NOT CMAKE_VERSION VERSION_LESS 3.3.0 OR NOT RPM)/IF(TRUE)/g' support-files/CMakeLists.txt - -# workaround for upstream bug #56342 -rm -f mysql-test/t/ssl_8k_key-master.opt - -# generate a list of tests that fail, but are not disabled by upstream -cat %{SOURCE50} | tee mysql-test/rh-skipped-tests.list - -# disable some tests failing on different architectures -%ifarch %{arm} aarch64 -cat %{SOURCE51} | tee -a mysql-test/rh-skipped-tests.list -%endif - -%ifarch ppc ppc64 ppc64p7 s390 s390x -cat %{SOURCE52} | tee -a mysql-test/rh-skipped-tests.list -%endif - -cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \ - %{SOURCE14} %{SOURCE15} %{SOURCE16} %{SOURCE17} %{SOURCE18} %{SOURCE19} \ - %{SOURCE70} scripts - -%if %{with galera} -# prepare selinux policy -mkdir selinux -sed 's/mariadb-server-galera/%{name}-server-galera/' %{SOURCE72} > selinux/%{name}-server-galera.te -cat selinux/%{name}-server-galera.te -%endif - -# Check if PCRE version is actual -%{!?with_pcre: -pcre_maj=`grep '^m4_define(pcre_major' pcre/configure.ac | sed -r 's/^m4_define\(pcre_major, \[([0-9]+)\]\)/\1/'` -pcre_min=`grep '^m4_define(pcre_minor' pcre/configure.ac | sed -r 's/^m4_define\(pcre_minor, \[([0-9]+)\]\)/\1/'` - -if [ %{pcre_version} != "$pcre_maj.$pcre_min" ] -then - echo "\n PCRE version is outdated. \n\tIncluded version:%{pcre_version} \n\tUpstream version: $pcre_maj.$pcre_min\n" - exit 1 -fi -} - - - -%build - -# fail quickly and obviously if user tries to build as root -%if %runselftest - if [ x"$(id -u)" = "x0" ]; then - echo "mysql's regression tests fail if run as root." - echo "If you really need to build the RPM as root, use" - echo "--nocheck to skip the regression tests." - exit 1 - fi -%endif - -CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" -# force PIC mode so that we can build libmysqld.so -CFLAGS="$CFLAGS -fPIC" -# GCC 4.9 causes segfaults: https://mariadb.atlassian.net/browse/MDEV-6360 -CFLAGS="$CFLAGS -fno-delete-null-pointer-checks" -# gcc seems to have some bugs on sparc as of 4.4.1, back off optimization -# submitted as bz #529298 -%ifarch sparc sparcv9 sparc64 -CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" ` -%endif -# significant performance gains can be achieved by compiling with -O3 optimization -# rhbz#1051069 -%ifarch ppc64 -CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O3|g" ` -%endif -CXXFLAGS="$CFLAGS" -export CFLAGS CXXFLAGS - -%if 0%{?_hardened_build} -# building with PIE -LDFLAGS="$LDFLAGS -pie -Wl,-z,relro,-z,now" -export LDFLAGS -%endif - -# The INSTALL_xxx macros have to be specified relative to CMAKE_INSTALL_PREFIX -# so we can't use %%{_datadir} and so forth here. -%cmake . \ - -DBUILD_CONFIG=mysql_release \ - -DFEATURE_SET="community" \ - -DINSTALL_LAYOUT=RPM \ - -DDAEMON_NAME="%{daemon_name}" \ - -DDAEMON_NO_PREFIX="%{daemon_no_prefix}" \ - -DLOG_LOCATION="%{logfile}" \ - -DPID_FILE_DIR="%{pidfiledir}" \ - -DNICE_PROJECT_NAME="MariaDB" \ - -DRPM="%{?rhel:rhel%{rhel}}%{!?rhel:fedora%{fedora}}" \ - -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ - -DINSTALL_SYSCONFDIR="%{_sysconfdir}" \ - -DINSTALL_SYSCONF2DIR="%{_sysconfdir}/my.cnf.d" \ - -DINSTALL_DOCDIR="share/doc/%{_pkgdocdirname}" \ - -DINSTALL_DOCREADMEDIR="share/doc/%{_pkgdocdirname}" \ - -DINSTALL_INCLUDEDIR=include/mysql \ - -DINSTALL_INFODIR=share/info \ - -DINSTALL_LIBDIR="%{_lib}/mysql" \ - -DINSTALL_MANDIR=share/man \ - -DINSTALL_MYSQLSHAREDIR=share/%{pkg_name} \ - -DINSTALL_MYSQLTESTDIR=share/mysql-test \ - -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \ - -DINSTALL_SBINDIR=libexec \ - -DINSTALL_SCRIPTDIR=bin \ - -DINSTALL_SQLBENCHDIR=share \ - -DINSTALL_SUPPORTFILESDIR=share/%{pkg_name} \ - -DMYSQL_DATADIR="%{dbdatadir}" \ - -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \ - -DENABLED_LOCAL_INFILE=ON \ - -DENABLE_DTRACE=ON \ - -DWITH_EMBEDDED_SERVER=ON \ - -DWITH_SSL=system \ - -DWITH_ZLIB=system \ -%{?with_pcre: -DWITH_PCRE=system}\ - -DWITH_JEMALLOC=no \ -%{!?with_tokudb: -DWITHOUT_TOKUDB=ON}\ -%{!?with_mroonga: -DWITHOUT_MROONGA=ON}\ -%{!?with_oqgraph: -DWITHOUT_OQGRAPH=ON}\ - -DTMPDIR=/var/tmp \ -%{?with_debug: -DCMAKE_BUILD_TYPE=Debug}\ - %{?_hardened_build:-DWITH_MYSQLD_LDFLAGS="-pie -Wl,-z,relro,-z,now"} - -make %{?_smp_mflags} VERBOSE=1 - -# debuginfo extraction scripts fail to find source files in their real -# location -- satisfy them by copying these files into location, which -# is expected by scripts -for e in innobase xtradb ; do - for f in pars0grm.y pars0lex.l ; do - cp -p "storage/$e/pars/$f" "storage/$e/$f" - done -done - -# build selinux policy -%if %{with galera} -pushd selinux -make -f /usr/share/selinux/devel/Makefile %{name}-server-galera.pp -%endif - -%install -make DESTDIR=%{buildroot} install - -# cmake generates some completely wacko references to -lprobes_mysql when -# building with dtrace support. Haven't found where to shut that off, -# so resort to this blunt instrument. While at it, let's not reference -# libmysqlclient_r anymore either. -sed -e 's/-lprobes_mysql//' -e 's/-lmysqlclient_r/-lmysqlclient/' \ - %{buildroot}%{_bindir}/mysql_config >mysql_config.tmp -cp -p -f mysql_config.tmp %{buildroot}%{_bindir}/mysql_config -chmod 755 %{buildroot}%{_bindir}/mysql_config - -# multilib header support -for header in mysql/my_config.h mysql/private/config.h; do -%multilib_fix_c_header --file %{_includedir}/$header -done - -# multilib support for shell scripts -# we only apply this to known Red Hat multilib arches, per bug #181335 -if %multilib_capable; then -mv %{buildroot}%{_bindir}/mysql_config %{buildroot}%{_bindir}/mysql_config-%{__isa_bits} -install -p -m 0755 scripts/mysql_config_multilib %{buildroot}%{_bindir}/mysql_config -fi - -# Upstream install this into arch-independent directory, TODO: report -mkdir -p %{buildroot}/%{_libdir}/pkgconfig -mv %{buildroot}/%{_datadir}/pkgconfig/*.pc %{buildroot}/%{_libdir}/pkgconfig - -# install INFO_SRC, INFO_BIN into libdir (upstream thinks these are doc files, -# but that's pretty wacko --- see also %%{name}-file-contents.patch) -install -p -m 644 Docs/INFO_SRC %{buildroot}%{_libdir}/mysql/ -install -p -m 644 Docs/INFO_BIN %{buildroot}%{_libdir}/mysql/ -rm -r %{buildroot}%{_datadir}/doc/%{_pkgdocdirname}/MariaDB-server-%{version}/ - -mkdir -p %{buildroot}%{logfiledir} -chmod 0750 %{buildroot}%{logfiledir} -touch %{buildroot}%{logfile} - -# current setting in my.cnf is to use /var/run/mariadb for creating pid file, -# however since my.cnf is not updated by RPM if changed, we need to create mysqld -# as well because users can have odd settings in their /etc/my.cnf -mkdir -p %{buildroot}%{pidfiledir} -install -p -m 0755 -d %{buildroot}%{dbdatadir} - -%if %{with config} -install -D -p -m 0644 scripts/my.cnf %{buildroot}%{_sysconfdir}/my.cnf -%else -rm -f %{buildroot}%{_sysconfdir}/my.cnf.d/mysql-clients.cnf -rm -f %{buildroot}%{_sysconfdir}/my.cnf -%endif - -# use different config file name for each variant of server -mv %{buildroot}%{_sysconfdir}/my.cnf.d/server.cnf %{buildroot}%{_sysconfdir}/my.cnf.d/%{pkg_name}-server.cnf - -# install systemd unit files and scripts for handling server startup -%if %{with init_systemd} -install -D -p -m 644 scripts/mysql.service %{buildroot}%{_unitdir}/%{daemon_name}.service -install -D -p -m 644 scripts/mysql@.service %{buildroot}%{_unitdir}/%{daemon_name}@.service -install -D -p -m 0644 scripts/mysql.tmpfiles.d %{buildroot}%{_tmpfilesdir}/%{name}.conf -%if 0%{?mysqld_pid_dir:1} -echo "d %{_localstatedir}/run/%{mysqld_pid_dir} 0755 mysql mysql -" >>%{buildroot}%{_tmpfilesdir}/%{name}.conf -%endif -%endif - -# install SysV init script -%if %{with init_sysv} -install -D -p -m 755 scripts/mysql.init %{buildroot}%{daemondir}/%{daemon_name} -%endif - -# helper scripts for service starting -install -p -m 755 scripts/mysql-prepare-db-dir %{buildroot}%{_libexecdir}/mysql-prepare-db-dir -install -p -m 755 scripts/mysql-wait-ready %{buildroot}%{_libexecdir}/mysql-wait-ready -install -p -m 755 scripts/mysql-wait-stop %{buildroot}%{_libexecdir}/mysql-wait-stop -install -p -m 755 scripts/mysql-check-socket %{buildroot}%{_libexecdir}/mysql-check-socket -install -p -m 755 scripts/mysql-check-upgrade %{buildroot}%{_libexecdir}/mysql-check-upgrade -install -p -m 644 scripts/mysql-scripts-common %{buildroot}%{_libexecdir}/mysql-scripts-common - -# install selinux policy -%if %{with galera} -install -p -m 644 -D selinux/%{name}-server-galera.pp %{buildroot}%{_datadir}/selinux/packages/%{name}/%{name}-server-galera.pp -%endif -# install -p -m 644 -D selinux/%{name}.pp %{buildroot}%{_datadir}/selinux/packages/%{name}/%{name}.pp -# install -p -m 644 -D selinux/%{name}.te %{buildroot}%{_datadir}/selinux/packages/%{name}/%{name}.te - - -# Remove libmysqld.a -rm -f %{buildroot}%{_libdir}/mysql/libmysqld.a - -# libmysqlclient_r is no more. Upstream tries to replace it with symlinks -# but that really doesn't work (wrong soname in particular). We'll keep -# just the devel libmysqlclient_r.so link, so that rebuilding without any -# source change is enough to get rid of dependency on libmysqlclient_r. -rm -f %{buildroot}%{_libdir}/mysql/libmysqlclient_r.so* -ln -s libmysqlclient.so %{buildroot}%{_libdir}/mysql/libmysqlclient_r.so - -# mysql-test includes one executable that doesn't belong under /usr/share, -# so move it and provide a symlink -mv %{buildroot}%{_datadir}/mysql-test/lib/My/SafeProcess/my_safe_process %{buildroot}%{_bindir} -ln -s ../../../../../bin/my_safe_process %{buildroot}%{_datadir}/mysql-test/lib/My/SafeProcess/my_safe_process - -# should move this to /etc/ ? -rm -f %{buildroot}%{_bindir}/mysql_embedded -rm -f %{buildroot}%{_libdir}/mysql/*.a -rm -f %{buildroot}%{_datadir}/%{pkg_name}/binary-configure -rm -f %{buildroot}%{_datadir}/%{pkg_name}/magic -rm -f %{buildroot}%{_datadir}/%{pkg_name}/ndb-config-2-node.ini -rm -f %{buildroot}%{_datadir}/%{pkg_name}/mysql.server -rm -f %{buildroot}%{_datadir}/%{pkg_name}/mysqld_multi.server -rm -f %{buildroot}%{_mandir}/man1/mysql-stress-test.pl.1* -rm -f %{buildroot}%{_mandir}/man1/mysql-test-run.pl.1* -rm -f %{buildroot}%{_bindir}/mytop - -#WRS -rm -rf %{buildroot}/usr/DESTINATION/JdbcInterface.jar - -# put logrotate script where it needs to be -mkdir -p %{buildroot}%{logrotateddir} -mv %{buildroot}%{_datadir}/%{pkg_name}/mysql-log-rotate %{buildroot}%{logrotateddir}/%{daemon_name} -chmod 644 %{buildroot}%{logrotateddir}/%{daemon_name} - -mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d -echo "%{_libdir}/mysql" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf - -# copy additional docs into build tree so %%doc will find them -install -p -m 0644 %{SOURCE5} %{basename:%{SOURCE5}} -install -p -m 0644 %{SOURCE6} %{basename:%{SOURCE6}} -install -p -m 0644 %{SOURCE7} %{basename:%{SOURCE7}} -install -p -m 0644 %{SOURCE16} %{basename:%{SOURCE16}} -install -p -m 0644 %{SOURCE71} %{basename:%{SOURCE71}} - -# install galera config file -sed -i -r 's|^wsrep_provider=none|wsrep_provider=%{_libdir}/galera/libgalera_smm.so|' support-files/wsrep.cnf -install -p -m 0644 support-files/wsrep.cnf %{buildroot}%{_sysconfdir}/my.cnf.d/galera.cnf - -# install the clustercheck script -mkdir -p %{buildroot}%{_sysconfdir}/sysconfig -touch %{buildroot}%{_sysconfdir}/sysconfig/clustercheck -install -p -m 0755 scripts/clustercheck %{buildroot}%{_bindir}/clustercheck - -# install the list of skipped tests to be available for user runs -install -p -m 0644 mysql-test/rh-skipped-tests.list %{buildroot}%{_datadir}/mysql-test - -# remove unneeded RHEL-4 SELinux stuff -rm -rf %{buildroot}%{_datadir}/%{pkg_name}/SELinux/ - -# remove SysV init script and a symlink to that -rm -f %{buildroot}%{_sysconfdir}/init.d/mysql -rm -f %{buildroot}%{_libexecdir}/rcmysql - -# remove duplicate logrotate script -rm -f %{buildroot}%{_sysconfdir}/logrotate.d/mysql - -# remove solaris files -rm -rf %{buildroot}%{_datadir}/%{pkg_name}/solaris/ - -# rename the wsrep README so it corresponds with the other README names -mv Docs/README-wsrep Docs/README.wsrep - -# remove *.jar file from mysql-test -rm -rf %{buildroot}%{_datadir}/mysql-test/plugin/connect/connect/std_data/JdbcMariaDB.jar - -%if %{without clibrary} -unlink %{buildroot}%{_libdir}/mysql/libmysqlclient.so -unlink %{buildroot}%{_libdir}/mysql/libmysqlclient_r.so -rm -rf %{buildroot}%{_libdir}/mysql/libmysqlclient*.so.* -rm -rf %{buildroot}%{_sysconfdir}/ld.so.conf.d -rm -f %{buildroot}%{_sysconfdir}/my.cnf.d/client.cnf -%endif - -%if %{without embedded} -rm -f %{buildroot}%{_libdir}/mysql/libmysqld.so* -rm -f %{buildroot}%{_bindir}/{mysql_client_test_embedded,mysqltest_embedded} -rm -f %{buildroot}%{_mandir}/man1/{mysql_client_test_embedded,mysqltest_embedded}.1* -%endif - -%if %{without devel} -rm -f %{buildroot}%{_bindir}/mysql_config* -rm -rf %{buildroot}%{_includedir}/mysql -rm -f %{buildroot}%{_datadir}/aclocal/mysql.m4 -rm -f %{buildroot}%{_libdir}/pkgconfig/mariadb.pc -rm -f %{buildroot}%{_libdir}/mysql/libmysqlclient*.so -rm -f %{buildroot}%{_mandir}/man1/mysql_config.1* -%endif - -%if %{without client} -rm -f %{buildroot}%{_bindir}/{msql2mysql,mysql,mysql_find_rows,\ -mysql_plugin,mysql_waitpid,mysqlaccess,mysqladmin,mysqlbinlog,mysqlcheck,\ -mysqldump,mysqlimport,mysqlshow,mysqlslap,my_print_defaults} -rm -f %{buildroot}%{_mandir}/man1/{msql2mysql,mysql,mysql_find_rows,\ -mysql_plugin,mysql_waitpid,mysqlaccess,mysqladmin,mysqlbinlog,mysqlcheck,\ -mysqldump,mysqlimport,mysqlshow,mysqlslap,my_print_defaults}.1* -%endif - -%if %{without connect} -rm -f %{buildroot}%{_sysconfdir}/my.cnf.d/connect.cnf -%endif - -%if %{without oqgraph} -rm -f %{buildroot}%{_sysconfdir}/my.cnf.d/oqgraph.cnf -%endif - -%if %{without config} -rm -f %{buildroot}%{_sysconfdir}/my.cnf -rm -f %{buildroot}%{_sysconfdir}/my.cnf.d/mysql-clients.cnf -%endif - -%if %{without common} -rm -rf %{buildroot}%{_datadir}/%{pkg_name}/charsets -%endif - -%if %{without errmsg} -rm -f %{buildroot}%{_datadir}/%{pkg_name}/errmsg-utf8.txt -rm -rf %{buildroot}%{_datadir}/%{pkg_name}/{english,czech,danish,dutch,estonian,\ -french,german,greek,hungarian,italian,japanese,korean,norwegian,norwegian-ny,\ -polish,portuguese,romanian,russian,serbian,slovak,spanish,swedish,ukrainian} -%endif - -%if %{without bench} -rm -rf %{buildroot}%{_datadir}/sql-bench -%endif - -%if %{without test} -rm -f %{buildroot}%{_bindir}/{mysql_client_test,my_safe_process} -rm -rf %{buildroot}%{_datadir}/mysql-test -rm -f %{buildroot}%{_mandir}/man1/mysql_client_test.1* -%endif - -%if %{without tokudb} -rm -f %{buildroot}%{_sysconfdir}/my.cnf.d/cracklib_password_check.cnf -%endif - -%check -%if %{with test} -%if %runselftest -make test VERBOSE=1 -# hack to let 32- and 64-bit tests run concurrently on same build machine -export MTR_PARALLEL=1 -# builds might happen at the same host, avoid collision -export MTR_BUILD_THREAD=%{__isa_bits} - -# The cmake build scripts don't provide any simple way to control the -# options for mysql-test-run, so ignore the make target and just call it -# manually. Nonstandard options chosen are: -# --force to continue tests after a failure -# no retries please -# test SSL with --ssl -# skip tests that are listed in rh-skipped-tests.list -# avoid redundant test runs with --binlog-format=mixed -# increase timeouts to prevent unwanted failures during mass rebuilds -( - set -e - cd mysql-test - perl ./mysql-test-run.pl --force --retry=0 --ssl \ - --suite-timeout=720 --testcase-timeout=30 --skip-rpl \ - --mysqld=--binlog-format=mixed --force-restart \ - --shutdown-timeout=60 --max-test-fail=0 \ -%if %{ignore_testsuite_result} - || : -%else - --skip-test-list=rh-skipped-tests.list -%endif - # cmake build scripts will install the var cruft if left alone :-( - rm -rf var -) -%endif -%endif - -%pre server -/usr/sbin/groupadd -g 27 -o -r mysql >/dev/null 2>&1 || : -/usr/sbin/useradd -M -N -g mysql -o -r -d %{mysqluserhome} -s /sbin/nologin \ - -c "MySQL Server" -u 27 mysql >/dev/null 2>&1 || : - -%if %{with clibrary} -%post libs -p /sbin/ldconfig -%endif - -%if %{with embedded} -%post embedded -p /sbin/ldconfig -%endif - -%if %{with galera} -%post server-galera -semanage port -a -t mysqld_port_t -p tcp 4568 >/dev/null 2>&1 || : -semodule -i %{_datadir}/selinux/packages/%{name}/%{name}-server-galera.pp >/dev/null 2>&1 || : -%endif - -%post server -%if %{with init_systemd} -%systemd_post %{daemon_name}.service -%endif -%if %{with init_sysv} -if [ $1 = 1 ]; then - /sbin/chkconfig --add %{daemon_name} -fi -%endif - -%preun server -%if %{with init_systemd} -%systemd_preun %{daemon_name}.service -%endif -%if %{with init_sysv} -if [ $1 = 0 ]; then - /sbin/service %{daemon_name} stop >/dev/null 2>&1 - /sbin/chkconfig --del %{daemon_name} -fi -%endif - -%if %{with clibrary} -%postun libs -p /sbin/ldconfig -%endif - -%if %{with embedded} -%postun embedded -p /sbin/ldconfig -%endif - -%if %{with galera} -%postun server-galera -if [ $1 -eq 0 ]; then - semodule -r %{name}-server-galera 2>/dev/null || : -fi -%endif - -%postun server -%if %{with init_systemd} -%systemd_postun_with_restart %{daemon_name}.service -%endif -%if %{with init_sysv} -if [ $1 -ge 1 ]; then - /sbin/service %{daemon_name} condrestart >/dev/null 2>&1 || : -fi -%endif - -%if %{with client} -%files -%{_bindir}/msql2mysql -%{_bindir}/mysql -%{_bindir}/mysql_find_rows -%{_bindir}/mysql_plugin -%{_bindir}/mysql_waitpid -%{_bindir}/mysqlaccess -%{_bindir}/mysqladmin -%{_bindir}/mysqlbinlog -%{_bindir}/mysqlcheck -%{_bindir}/mysqldump -%{_bindir}/mysqlimport -%{_bindir}/mysqlshow -%{_bindir}/mysqlslap -%{_bindir}/my_print_defaults - -%{_mandir}/man1/msql2mysql.1* -%{_mandir}/man1/mysql.1* -%{_mandir}/man1/mysql_find_rows.1* -%{_mandir}/man1/mysql_plugin.1* -%{_mandir}/man1/mysql_waitpid.1* -%{_mandir}/man1/mysqlaccess.1* -%{_mandir}/man1/mysqladmin.1* -%{_mandir}/man1/mysqlbinlog.1* -%{_mandir}/man1/mysqlcheck.1* -%{_mandir}/man1/mysqldump.1* -%{_mandir}/man1/mysqlimport.1* -%{_mandir}/man1/mysqlshow.1* -%{_mandir}/man1/mysqlslap.1* -%{_mandir}/man1/my_print_defaults.1* -%endif - -%if %{with clibrary} -%files libs -%{_libdir}/mysql/libmysqlclient.so.* -%{_sysconfdir}/ld.so.conf.d/* -%config(noreplace) %{_sysconfdir}/my.cnf.d/client.cnf -%endif - -%if %{with config} -%files config -# although the default my.cnf contains only server settings, we put it in the -# common package because it can be used for client settings too. -%dir %{_sysconfdir}/my.cnf.d -%config(noreplace) %{_sysconfdir}/my.cnf -%config(noreplace) %{_sysconfdir}/my.cnf.d/mysql-clients.cnf -%config(noreplace) %{_sysconfdir}/my.cnf.d/enable_encryption.preset -%endif - -%if %{with common} -%files common -%license COPYING -%license storage/innobase/COPYING.Percona storage/innobase/COPYING.Google -%doc README README.mysql-license README.mysql-docs -%dir %{_libdir}/mysql -%dir %{_libdir}/mysql/plugin -%dir %{_datadir}/%{pkg_name} -%{_libdir}/mysql/plugin/dialog.so -%{_libdir}/mysql/plugin/mysql_clear_password.so -%{_datadir}/%{pkg_name}/charsets -%endif - -%if %{with errmsg} -%files errmsg -%{_datadir}/%{pkg_name}/errmsg-utf8.txt -%{_datadir}/%{pkg_name}/english -%lang(cs) %{_datadir}/%{pkg_name}/czech -%lang(da) %{_datadir}/%{pkg_name}/danish -%lang(nl) %{_datadir}/%{pkg_name}/dutch -%lang(et) %{_datadir}/%{pkg_name}/estonian -%lang(fr) %{_datadir}/%{pkg_name}/french -%lang(de) %{_datadir}/%{pkg_name}/german -%lang(el) %{_datadir}/%{pkg_name}/greek -%lang(hu) %{_datadir}/%{pkg_name}/hungarian -%lang(it) %{_datadir}/%{pkg_name}/italian -%lang(ja) %{_datadir}/%{pkg_name}/japanese -%lang(ko) %{_datadir}/%{pkg_name}/korean -%lang(no) %{_datadir}/%{pkg_name}/norwegian -%lang(no) %{_datadir}/%{pkg_name}/norwegian-ny -%lang(pl) %{_datadir}/%{pkg_name}/polish -%lang(pt) %{_datadir}/%{pkg_name}/portuguese -%lang(ro) %{_datadir}/%{pkg_name}/romanian -%lang(ru) %{_datadir}/%{pkg_name}/russian -%lang(sr) %{_datadir}/%{pkg_name}/serbian -%lang(sk) %{_datadir}/%{pkg_name}/slovak -%lang(es) %{_datadir}/%{pkg_name}/spanish -%lang(sv) %{_datadir}/%{pkg_name}/swedish -%lang(uk) %{_datadir}/%{pkg_name}/ukrainian -%endif - -%if %{with galera} -%files server-galera -%doc Docs/README.wsrep -%license LICENSE.clustercheck -%{_bindir}/clustercheck -%if %{with init_systemd} -%{_bindir}/galera_new_cluster -%{_bindir}/galera_recovery -%{_datadir}/%{pkg_name}/systemd/use_galera_new_cluster.conf -%endif -%config(noreplace) %{_sysconfdir}/my.cnf.d/galera.cnf -%attr(0640,root,root) %ghost %config(noreplace) %{_sysconfdir}/sysconfig/clustercheck -%{_datadir}/selinux/packages/%{name}/%{name}-server-galera.pp -%endif - -%files server -%doc README.mysql-cnf - -%{_bindir}/aria_chk -%{_bindir}/aria_dump_log -%{_bindir}/aria_ftdump -%{_bindir}/aria_pack -%{_bindir}/aria_read_log -%{_bindir}/mariabackup -%{_bindir}/mariadb-service-convert -%{_bindir}/mbstream -%{_bindir}/myisamchk -%{_bindir}/myisam_ftdump -%{_bindir}/myisamlog -%{_bindir}/myisampack -%{_bindir}/mysql_convert_table_format -%{_bindir}/mysql_fix_extensions -%{_bindir}/mysql_install_db -%{_bindir}/mysql_secure_installation -%{_bindir}/mysql_setpermission -%{_bindir}/mysql_tzinfo_to_sql -%{_bindir}/mysql_upgrade -%{_bindir}/mysql_zap -%{_bindir}/mysqlbug -%{_bindir}/mysqldumpslow -%{_bindir}/mysqld_multi -%{_bindir}/mysqld_safe -%{_bindir}/mysqlhotcopy -%{_bindir}/mysqltest -%{_bindir}/innochecksum -%{_bindir}/perror -%{_bindir}/replace -%{_bindir}/resolve_stack_dump -%{_bindir}/resolveip -%{_bindir}/wsrep_sst_common -%{_bindir}/wsrep_sst_mariabackup -%{_bindir}/wsrep_sst_mysqldump -%{_bindir}/wsrep_sst_rsync -%{_bindir}/wsrep_sst_xtrabackup -%{_bindir}/wsrep_sst_xtrabackup-v2 -%{?with_tokudb:%{_bindir}/tokuftdump} -%{?with_tokudb:%{_bindir}/tokuft_logprint} - -%config(noreplace) %{_sysconfdir}/my.cnf.d/%{pkg_name}-server.cnf -%config(noreplace) %{_sysconfdir}/my.cnf.d/auth_gssapi.cnf -%{?with_tokudb:%config(noreplace) %{_sysconfdir}/my.cnf.d/tokudb.cnf} - -%{_libexecdir}/mysqld - -%{_libdir}/mysql/INFO_SRC -%{_libdir}/mysql/INFO_BIN -%if %{without common} -%dir %{_datadir}/%{pkg_name} -%endif - -%{_libdir}/mysql/plugin/* -%{?with_oqgraph:%exclude %{_libdir}/mysql/plugin/ha_oqgraph.so} -%{?with_connect:%exclude %{_libdir}/mysql/plugin/ha_connect.so} -%exclude %{_libdir}/mysql/plugin/dialog.so -%exclude %{_libdir}/mysql/plugin/mysql_clear_password.so - -%{_mandir}/man1/aria_chk.1* -%{_mandir}/man1/aria_dump_log.1* -%{_mandir}/man1/aria_ftdump.1* -%{_mandir}/man1/aria_pack.1* -%{_mandir}/man1/aria_read_log.1* -%{_mandir}/man1/galera_new_cluster.1* -%{_mandir}/man1/galera_recovery.1* -%{_mandir}/man1/mariadb-service-convert.1* -%{_mandir}/man1/myisamchk.1* -%{_mandir}/man1/myisamlog.1* -%{_mandir}/man1/myisampack.1* -%{_mandir}/man1/mysql_convert_table_format.1* -%{_mandir}/man1/myisam_ftdump.1* -%{_mandir}/man1/mysql.server.1* -%{_mandir}/man1/mysql_fix_extensions.1* -%{_mandir}/man1/mysql_install_db.1* -%{_mandir}/man1/mysql_secure_installation.1* -%{_mandir}/man1/mysql_upgrade.1* -%{_mandir}/man1/mysql_zap.1* -%{_mandir}/man1/mysqlbug.1* -%{_mandir}/man1/mysqldumpslow.1* -%{_mandir}/man1/mysqld_multi.1* -%{_mandir}/man1/mysqld_safe.1* -%{_mandir}/man1/mysqld_safe_helper.1* -%{_mandir}/man1/my_safe_process.1* -%{_mandir}/man1/innochecksum.1* -%{_mandir}/man1/perror.1* -%{_mandir}/man1/replace.1* -%{_mandir}/man1/resolve_stack_dump.1* -%{_mandir}/man1/resolveip.1* -%{_mandir}/man1/mysql_tzinfo_to_sql.1* -%{_mandir}/man8/mysqld.8* -%{_mandir}/man1/wsrep_sst_common.1* -%{_mandir}/man1/wsrep_sst_mysqldump.1* -%{_mandir}/man1/wsrep_sst_rsync.1* -%{_mandir}/man1/wsrep_sst_xtrabackup.1* -%{_mandir}/man1/wsrep_sst_xtrabackup-v2.1* - -%{_datadir}/%{pkg_name}/fill_help_tables.sql -%{_datadir}/%{pkg_name}/install_spider.sql -%{_datadir}/%{pkg_name}/maria_add_gis_sp.sql -%{_datadir}/%{pkg_name}/maria_add_gis_sp_bootstrap.sql -%{_datadir}/%{pkg_name}/mysql_system_tables.sql -%{_datadir}/%{pkg_name}/mysql_system_tables_data.sql -%{_datadir}/%{pkg_name}/mysql_test_data_timezone.sql -%{_datadir}/%{pkg_name}/mysql_to_mariadb.sql -%{_datadir}/%{pkg_name}/mysql_performance_tables.sql -%{?with_mroonga:%{_datadir}/%{pkg_name}/mroonga/install.sql} -%{?with_mroonga:%{_datadir}/%{pkg_name}/mroonga/uninstall.sql} -%{_datadir}/%{pkg_name}/my-*.cnf -%{_datadir}/%{pkg_name}/wsrep.cnf -%{_datadir}/%{pkg_name}/wsrep_notify -%dir %{_datadir}/%{pkg_name}/policy -%dir %{_datadir}/%{pkg_name}/policy/apparmor -%dir %{_datadir}/%{pkg_name}/policy/selinux -%{_datadir}/%{pkg_name}/policy/apparmor/README -%{_datadir}/%{pkg_name}/policy/apparmor/usr.sbin.mysqld* -%{_datadir}/%{pkg_name}/policy/selinux/README -%{_datadir}/%{pkg_name}/policy/selinux/mariadb-server.* -%{_datadir}/%{pkg_name}/policy/selinux/mariadb.* -%{_datadir}/%{pkg_name}/systemd/mariadb.service -# mariadb@ is installed only when we have cmake newer than 3.3 -%if 0%{?fedora} > 22 || 0%{?rhel} > 6 -%{_datadir}/%{pkg_name}/systemd/mariadb@.service -%endif - -%{daemondir}/%{daemon_name}* -%{_libexecdir}/mysql-prepare-db-dir -%{_libexecdir}/mysql-wait-ready -%{_libexecdir}/mysql-wait-stop -%{_libexecdir}/mysql-check-socket -%{_libexecdir}/mysql-check-upgrade -%{_libexecdir}/mysql-scripts-common - -%{?with_init_systemd:%{_tmpfilesdir}/%{name}.conf} -%attr(0755,mysql,mysql) %dir %{pidfiledir} -%attr(0755,mysql,mysql) %dir %{dbdatadir} -%attr(0750,mysql,mysql) %dir %{logfiledir} -%attr(0640,mysql,mysql) %config %ghost %verify(not md5 size mtime) %{logfile} -%config(noreplace) %{logrotateddir}/%{daemon_name} - -%if %{with oqgraph} -%files oqgraph-engine -%config(noreplace) %{_sysconfdir}/my.cnf.d/oqgraph.cnf -%{_libdir}/mysql/plugin/ha_oqgraph.so -%endif - -%if %{with connect} -%files connect-engine -%config(noreplace) %{_sysconfdir}/my.cnf.d/connect.cnf -%{_libdir}/mysql/plugin/ha_connect.so -%endif - -%{_mandir}/man1/mysqlhotcopy.1* -%{_mandir}/man1/mysql_setpermission.1* -%{_mandir}/man1/mysqltest.1* - -# Other utilities -%{_bindir}/mysqld_safe_helper - -%if %{with devel} -%files devel -%{_bindir}/mysql_config* -%{_includedir}/mysql -%{_datadir}/aclocal/mysql.m4 -%{_libdir}/pkgconfig/mariadb.pc -%if %{with clibrary} -%{_libdir}/mysql/libmysqlclient.so -%{_libdir}/mysql/libmysqlclient_r.so -%endif -%{_mandir}/man1/mysql_config.1* -%endif - -%if %{with embedded} -%files embedded -%{_libdir}/mysql/libmysqld.so.* - -%files embedded-devel -%{_libdir}/mysql/libmysqld.so -%{_bindir}/mysql_client_test_embedded -%{_bindir}/mysqltest_embedded -%{_mandir}/man1/mysql_client_test_embedded.1* -%{_mandir}/man1/mysqltest_embedded.1* -%endif - -%if %{with bench} -%files bench -%{_datadir}/sql-bench -%endif - -%if %{with test} -%files test -%{_bindir}/mysql_client_test -%{_bindir}/my_safe_process -%attr(-,mysql,mysql) %{_datadir}/mysql-test -%{_mandir}/man1/mysql_client_test.1* -%endif - -%changelog -* Tue Jan 10 2017 Michael Bayer - 3:10.1.20-1 -- Update to version 10.1.20 -- Add explicit EVR requirement in main package for -libs - Related: #1406320 -- Use correct macro when removing doc files - Resolves: #1400981 -- JdbcMariaDB.jar test removed -- PCRE version check added - Related: #1382988, #1396945, #1096787 -- added temporary support to build with OpenSSL 1.0 on Fedora >= 26 -- added krb5-devel pkg as Buldrquires to prevent gssapi failure - -* Thu Nov 03 2016 Michele Baldessari - 3:10.1.18-3 -- Actually apply the revert added as patch in the previous release - -* Thu Nov 03 2016 Michele Baldessari - 3:10.1.18-2 -- Back out upstream commit 7497ebf8a49bfe30bb4110f2ac20a30f804b7946 as it - breaks the resource agent - -* Tue Oct 4 2016 Jakub Dorňák - 3:10.1.18-1 -- Update to 10.1.18 - -* Wed Aug 31 2016 Jakub Dorňák - 3:10.1.17-1 -- Update to 10.1.17 - -* Mon Aug 29 2016 Jakub Dorňák - 3:10.1.16-2 -- Fixed galera replication - Resolves: #1352946 - -* Tue Jul 19 2016 Jakub Dorňák - 3:10.1.16-1 -- Update to 10.1.16 - -* Fri Jul 15 2016 Honza Horak - 3:10.1.14-5 -- Fail build when test-suite fails -- Use license macro for inclusion of licenses - -* Thu Jul 14 2016 Honza Horak - 3:10.1.14-4 -- Revert Update to 10.1.15, this release is broken - https://lists.launchpad.net/maria-discuss/msg03691.html - -* Thu Jul 14 2016 Honza Horak - 2:10.1.15-3 -- Check datadir more carefully to avoid unwanted data corruption - Related: #1335849 - -* Thu Jul 7 2016 Jakub Dorňák - 2:10.1.15-2 -- Bump epoch - (related to the downgrade from the pre-release version) - -* Fri Jul 1 2016 Jakub Dorňák - 1:10.1.15-1 -- Update to 10.1.15 - -* Fri Jul 1 2016 Jakub Dorňák - 1:10.1.14-3 - Revert "Update to 10.2.0" - It is possible that MariaDB 10.2.0 won't be stable till f25 GA. - -* Tue Jun 21 2016 Pavel Raiskup - 1:10.1.14-3 -- BR multilib-rpm-config and use it for multilib workarounds -- install architecture dependant pc file to arch-dependant location - -* Thu May 26 2016 Jakub Dorňák - 1:10.2.0-2 -- Fix mysql-prepare-db-dir - Resolves: #1335849 - -* Thu May 12 2016 Jakub Dorňák - 1:10.2.0-1 -- Update to 10.2.0 - -* Thu May 12 2016 Jakub Dorňák - 1:10.1.14-1 -- Add selinux policy -- Update to 10.1.14 (includes various bug fixes) -- Add -h and --help options to galera_new_cluster - -* Thu Apr 7 2016 Jakub Dorňák - 1:10.1.13-3 -- wsrep_on in galera.cnf - -* Tue Apr 5 2016 Jakub Dorňák - 1:10.1.13-2 -- Moved /etc/sysconfig/clustercheck - and /usr/share/mariadb/systemd/use_galera_new_cluster.conf - to mariadb-server-galera - -* Tue Mar 29 2016 Jakub Dorňák - 1:10.1.13-1 -- Update to 10.1.13 - -* Wed Mar 23 2016 Jakub Dorňák - 1:10.1.12-4 -- Fixed conflict with mariadb-galera-server - -* Tue Mar 22 2016 Jakub Dorňák - 1:10.1.12-3 -- Add subpackage mariadb-server-galera - Resolves: 1310622 - -* Tue Mar 01 2016 Honza Horak - 1:10.1.12-2 -- Rebuild for BZ#1309199 (symbol versioning) - -* Mon Feb 29 2016 Jakub Dorňák - 1:10.1.12-1 -- Update to 10.1.12 - -* Tue Feb 16 2016 Honza Horak - 1:10.1.11-9 -- Remove dangling symlink to /etc/init.d/mysql - -* Sat Feb 13 2016 Honza Horak - 1:10.1.11-8 -- Use epoch for obsoleting mariadb-galera-server - -* Fri Feb 12 2016 Honza Horak - 1:10.1.11-7 -- Add Provides: bundled(pcre) in case we build with bundled pcre - Related: #1302296 -- embedded-devel should require libaio-devel - Resolves: #1290517 - -* Fri Feb 12 2016 Honza Horak - 1:10.1.11-6 -- Fix typo s/obsolate/obsolete/ - -* Thu Feb 11 2016 Honza Horak - 1:10.1.11-5 -- Add missing requirements for proper wsrep functionality -- Obsolate mariadb-galera & mariadb-galera-server (thanks Tomas Repik) - Resolves: #1279753 -- Re-enable using libedit, which should be now fixed - Related: #1201988 -- Remove mariadb-wait-ready call from systemd unit, we have now systemd notify support -- Make mariadb@.service similar to mariadb.service - -* Mon Feb 08 2016 Honza Horak - 1:10.1.11-4 -- Use systemd unit file more compatible with upstream - -* Sun Feb 07 2016 Honza Horak - 1:10.1.11-3 -- Temporarily disabling oqgraph for - https://mariadb.atlassian.net/browse/MDEV-9479 - -* Thu Feb 04 2016 Fedora Release Engineering - 1:10.1.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Feb 3 2016 Jakub Dorňák - 1:10.1.11-1 -- Update to 10.1.11 - -* Tue Jan 19 2016 Jakub Dorňák - 1:10.1.10-1 -- Update to 10.1.10 - -* Mon Dec 07 2015 Dan Horák - 1:10.1.8-3 -- rebuilt for s390(x) - -* Tue Nov 03 2015 Honza Horak - 1:10.1.8-2 -- Expand variables in server.cnf - -* Thu Oct 22 2015 Jakub Dorňák - 1:10.1.8-1 -- Update to 10.1.8 - -* Thu Aug 27 2015 Jonathan Wakely - 1:10.0.21-2 -- Rebuilt for Boost 1.59 - -* Mon Aug 10 2015 Jakub Dorňák - 1:10.0.21-1 -- Update to 10.0.21 - -* Wed Jul 29 2015 Fedora Release Engineering - 1:10.0.20-3 -- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 - -* Wed Jul 22 2015 David Tardon - 1:10.0.20-2 -- rebuild for Boost 1.58 - -* Tue Jun 23 2015 Honza Horak - 1:10.0.20-1 -- Update to 10.0.20 - -* Wed Jun 17 2015 Fedora Release Engineering - 1:10.0.19-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Jun 03 2015 Dan Horák - 1:10.0.19-2 -- Update lists of failing tests (jdornak) - Related: #1149647 - -* Mon May 11 2015 Honza Horak - 1:10.0.19-1 -- Update to 10.0.19 - -* Thu May 07 2015 Honza Horak - 1:10.0.18-1 -- Update to 10.0.18 - -* Thu May 07 2015 Honza Horak - 1:10.0.17-4 -- Include client plugins into -common package since they are used by both -libs - and base packages. -- Do not use libedit - Related: #1201988 -- Let plugin dir to be owned by -common -- Use correct comment in the init script - Related: #1184604 -- Add openssl as BuildRequires to run some openssl tests during build - Related: #1189180 -- Fail in case any command in check fails - Related: #1124791 -- Fix mysqladmin crash if run with -u root -p - Resolves: #1207170 - -* Sat May 02 2015 Kalev Lember - 1:10.0.17-3 -- Rebuilt for GCC 5 C++11 ABI change - -* Fri Mar 06 2015 Honza Horak - 1:10.0.17-2 -- Wait for daemon ends - Resolves: #1072958 -- Do not include symlink to libmysqlclient if not shipping the library -- Do not use scl prefix more than once in paths - Based on https://www.redhat.com/archives/sclorg/2015-February/msg00038.html - -* Wed Mar 04 2015 Honza Horak - 1:10.0.17-1 -- Rebase to version 10.0.17 -- Added variable for turn off skipping some tests - -* Tue Mar 03 2015 Honza Horak - 1:10.0.16-6 -- Check permissions when starting service on RHEL-6 - Resolves: #1194699 -- Do not create test database by default - Related: #1194611 - -* Fri Feb 13 2015 Matej Muzila - 1:10.0.16-4 -- Enable tokudb - -* Tue Feb 10 2015 Honza Horak - 1:10.0.16-3 -- Fix openssl_1 test - -* Wed Feb 4 2015 Jakub Dorňák - 1:10.0.16-2 -- Include new certificate for tests -- Update lists of failing tests - Related: #1186110 - -* Tue Feb 3 2015 Jakub Dorňák - 1:10.0.16-9 -- Rebase to version 10.0.16 - Resolves: #1187895 - -* Tue Jan 27 2015 Petr Machata - 1:10.0.15-9 -- Rebuild for boost 1.57.0 - -* Mon Jan 26 2015 Honza Horak - 1:10.0.15-8 -- Fix typo in the config file - -* Sun Jan 25 2015 Honza Horak - 1:10.0.15-7 -- Do not create log file in post script - -* Sat Jan 24 2015 Honza Horak - 1:10.0.15-6 -- Move server settings to config file under my.cnf.d dir - -* Sat Jan 24 2015 Honza Horak - 1:10.0.15-5 -- Fix path for sysconfig file - Filter provides in el6 properly - Fix initscript file location - -* Tue Jan 06 2015 Honza Horak - 1:10.0.15-4 -- Disable failing tests connect.mrr, connect.updelx2 on ppc and s390 - -* Mon Dec 22 2014 Honza Horak - 1:10.0.15-3 -- Fix macros paths in my.cnf -- Create old location for pid file if it remained in my.cnf - -* Fri Dec 05 2014 Honza Horak - 1:10.0.15-2 -- Rework usage of macros and remove some compatibility artefacts - -* Thu Nov 27 2014 Jakub Dorňák - 1:10.0.15-1 -- Update to 10.0.15 - -* Thu Nov 20 2014 Jan Stanek - 1:10.0.14-8 -- Applied upstream fix for mysql_config --cflags output. - Resolves: #1160845 - -* Fri Oct 24 2014 Jan Stanek - 1:10.0.14-7 -- Fixed compat service file. - Resolves: #1155700 - -* Mon Oct 13 2014 Honza Horak - 1:10.0.14-6 -- Remove bundled cmd-line-utils - Related: #1079637 -- Move mysqlimport man page to proper package -- Disable main.key_cache test on s390 - Releated: #1149647 - -* Wed Oct 08 2014 Honza Horak - 1:10.0.14-5 -- Disable tests connect.part_file, connect.part_table - and connect.updelx - Related: #1149647 - -* Wed Oct 01 2014 Honza Horak - 1:10.0.14-4 -- Add bcond_without mysql_names - Use more correct path when deleting mysql logrotate script - -* Wed Oct 01 2014 Honza Horak - 1:10.0.14-3 -- Build with system libedit - Resolves: #1079637 - -* Mon Sep 29 2014 Honza Horak - 1:10.0.14-2 -- Add with_debug option - -* Mon Sep 29 2014 Honza Horak - 1:10.0.14-1 -- Update to 10.0.14 - -* Wed Sep 24 2014 Honza Horak - 1:10.0.13-8 -- Move connect engine to a separate package - Rename oqgraph engine to align with upstream packages -- Move some files to correspond with MariaDB upstream packages - client.cnf into -libs, mysql_plugin and msql2mysql into base, - tokuftdump and aria_* into -server, errmsg-utf8.txt into -errmsg -- Remove duplicate cnf files packaged using %%doc -- Check upgrade script added to warn about need for mysql_upgrade - -* Wed Sep 24 2014 Matej Muzila - 1:10.0.13-7 -- Client related libraries moved from mariadb-server to mariadb-libs - Related: #1138843 - -* Mon Sep 08 2014 Honza Horak - 1:10.0.13-6 -- Disable vcol_supported_sql_funcs_myisam test on all arches - Related: #1096787 -- Install systemd service file on RHEL-7+ - Server requires any mysql package, so it should be fine with older client - -* Thu Sep 04 2014 Honza Horak - 1:10.0.13-5 -- Fix paths in mysql_install_db script - Resolves: #1134328 -- Use %%cmake macro - -* Tue Aug 19 2014 Honza Horak - 1:10.0.13-4 -- Build config subpackage everytime -- Disable failing tests: innodb_simulate_comp_failures_small, key_cache - rhbz#1096787 - -* Sun Aug 17 2014 Fedora Release Engineering - 1:10.0.13-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Thu Aug 14 2014 Honza Horak - 1:10.0.13-2 -- Include mysqld_unit only if required; enable tokudb in f20- - -* Wed Aug 13 2014 Honza Horak - 1:10.0.13-1 -- Rebase to version 10.0.13 - -* Tue Aug 12 2014 Honza Horak - 1:10.0.12-8 -- Introduce -config subpackage and ship base config files here - -* Tue Aug 5 2014 Honza Horak - 1:10.0.12-7 -- Adopt changes from mysql, thanks Bjorn Munch - -* Mon Jul 28 2014 Honza Horak - 1:10.0.12-6 -- Use explicit sysconfdir -- Absolut path for default value for pid file and error log - -* Tue Jul 22 2014 Honza Horak - 1:10.0.12-5 -- Hardcoded paths removed to work fine in chroot -- Spec rewrite to be more similar to oterh MySQL implementations -- Use variable for daemon unit name -- Include SysV init script if built on older system -- Add possibility to not ship some sub-packages - -* Mon Jul 21 2014 Honza Horak - 1:10.0.12-4 -- Reformating spec and removing unnecessary snippets - -* Tue Jul 15 2014 Honza Horak - 1:10.0.12-3 -- Enable OQGRAPH engine and package it as a sub-package -- Add support for TokuDB engine for x86_64 (currently still disabled) -- Re-enable tokudb_innodb_xa_crash again, seems to be fixed now -- Drop superfluous -libs and -embedded ldconfig deps (thanks Ville Skyttä) -- Separate -lib and -common sub-packages -- Require /etc/my.cnf instead of shipping it -- Include README.mysql-cnf -- Multilib support re-worked -- Introduce new option with_mysqld_unit -- Removed obsolete mysql-cluster, the package should already be removed -- Improve error message when log file is not writable -- Compile all binaries with full RELRO (RHBZ#1092548) -- Use modern symbol filtering with compatible backup -- Add more groupnames for server's my.cnf -- Error messages now provided by a separate package (thanks Alexander Barkov) -- Expand paths in helper scripts using cmake - -* Wed Jun 18 2014 Mikko Tiihonen - 1:10.0.12-2 -- Use -fno-delete-null-pointer-checks to avoid segfaults with gcc 4.9 - -* Tue Jun 17 2014 Jakub Dorňák - 1:10.0.12-1 -- Rebase to version 10.0.12 - -* Sat Jun 07 2014 Fedora Release Engineering - 1:10.0.11-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Jun 3 2014 Jakub Dorňák - 1:10.0.11-4 -- rebuild with tests failing on different arches disabled (#1096787) - -* Thu May 29 2014 Dan Horák - 1:10.0.11-2 -- rebuild with tests failing on big endian arches disabled (#1096787) - -* Wed May 14 2014 Jakub Dorňák - 1:10.0.11-1 -- Rebase to version 10.0.11 - -* Mon May 05 2014 Honza Horak - 1:10.0.10-3 -- Script for socket check enhanced - -* Thu Apr 10 2014 Jakub Dorňák - 1:10.0.10-2 -- use system pcre library - -* Thu Apr 10 2014 Jakub Dorňák - 1:10.0.10-1 -- Rebase to version 10.0.10 - -* Wed Mar 12 2014 Honza Horak - 1:5.5.36-2 -- Server crashes on SQL select containing more group by and left join statements using innodb tables - Resolves: #1065676 -- Fix paths in helper scripts -- Move language files into mariadb directory - -* Thu Mar 06 2014 Honza Horak - 1:5.5.36-1 -- Rebase to 5.5.36 - https://kb.askmonty.org/en/mariadb-5536-changelog/ - -* Tue Feb 25 2014 Honza Horak 1:5.5.35-5 -- Daemon helper scripts sanity changes and spec files clean-up - -* Tue Feb 11 2014 Honza Horak 1:5.5.35-4 -- Fix typo in mysqld.service - Resolves: #1063981 - -* Wed Feb 5 2014 Honza Horak 1:5.5.35-3 -- Do not touch the log file in post script, so it does not get wrong owner - Resolves: #1061045 - -* Thu Jan 30 2014 Honza Horak 1:5.5.35-1 -- Rebase to 5.5.35 - https://kb.askmonty.org/en/mariadb-5535-changelog/ - Also fixes: CVE-2014-0001, CVE-2014-0412, CVE-2014-0437, CVE-2013-5908, - CVE-2014-0420, CVE-2014-0393, CVE-2013-5891, CVE-2014-0386, CVE-2014-0401, - CVE-2014-0402 - Resolves: #1054043 - Resolves: #1059546 - -* Tue Jan 14 2014 Honza Horak - 1:5.5.34-9 -- Adopt compatible system versioning - Related: #1045013 -- Use compatibility mysqld.service instead of link - Related: #1014311 - -* Mon Jan 13 2014 Rex Dieter 1:5.5.34-8 -- move mysql_config alternatives scriptlets to -devel too - -* Fri Jan 10 2014 Honza Horak 1:5.5.34-7 -- Build with -O3 on ppc64 - Related: #1051069 -- Move mysql_config to -devel sub-package and remove Require: mariadb - Related: #1050920 - -* Fri Jan 10 2014 Marcin Juszkiewicz 1:5.5.34-6 -- Disable main.gis-precise test also for AArch64 -- Disable perfschema.func_file_io and perfschema.func_mutex for AArch64 - (like it is done for 32-bit ARM) - -* Fri Jan 10 2014 Honza Horak 1:5.5.34-5 -- Clean all non-needed doc files properly - -* Wed Jan 8 2014 Honza Horak 1:5.5.34-4 -- Read socketfile location in mariadb-prepare-db-dir script - -* Mon Jan 6 2014 Honza Horak 1:5.5.34-3 -- Don't test EDH-RSA-DES-CBC-SHA cipher, it seems to be removed from openssl - which now makes mariadb/mysql FTBFS because openssl_1 test fails - Related: #1044565 -- Use upstream's layout for symbols version in client library - Related: #1045013 -- Check if socket file is not being used by another process at a time - of starting the service - Related: #1045435 -- Use %%ghost directive for the log file - Related: 1043501 - -* Wed Nov 27 2013 Honza Horak 1:5.5.34-2 -- Fix mariadb-wait-ready script - -* Fri Nov 22 2013 Honza Horak 1:5.5.34-1 -- Rebase to 5.5.34 - -* Mon Nov 4 2013 Honza Horak 1:5.5.33a-4 -- Fix spec file to be ready for backport by Oden Eriksson - Resolves: #1026404 - -* Mon Nov 4 2013 Honza Horak 1:5.5.33a-3 -- Add pam-devel to build-requires in order to build - Related: #1019945 -- Check if correct process is running in mysql-wait-ready script - Related: #1026313 - -* Mon Oct 14 2013 Honza Horak 1:5.5.33a-2 -- Turn on test suite - -* Thu Oct 10 2013 Honza Horak 1:5.5.33a-1 -- Rebase to 5.5.33a - https://kb.askmonty.org/en/mariadb-5533-changelog/ - https://kb.askmonty.org/en/mariadb-5533a-changelog/ -- Enable outfile_loaddata test -- Disable tokudb_innodb_xa_crash test - -* Mon Sep 2 2013 Honza Horak - 1:5.5.32-12 -- Re-organize my.cnf to include only generic settings - Resolves: #1003115 -- Move pid file location to /var/run/mariadb -- Make mysqld a symlink to mariadb unit file rather than the opposite way - Related: #999589 - -* Thu Aug 29 2013 Honza Horak - 1:5.5.32-11 -- Move log file into /var/log/mariadb/mariadb.log -- Rename logrotate script to mariadb -- Resolves: #999589 - -* Wed Aug 14 2013 Rex Dieter 1:5.5.32-10 -- fix alternatives usage - -* Tue Aug 13 2013 Honza Horak - 1:5.5.32-9 -- Multilib issues solved by alternatives - Resolves: #986959 - -* Sat Aug 03 2013 Petr Pisar - 1:5.5.32-8 -- Perl 5.18 rebuild - -* Wed Jul 31 2013 Honza Horak - 1:5.5.32-7 -- Do not use login shell for mysql user - -* Tue Jul 30 2013 Honza Horak - 1:5.5.32-6 -- Remove unneeded systemd-sysv requires -- Provide mysql-compat-server symbol -- Create mariadb.service symlink -- Fix multilib header location for arm -- Enhance documentation in the unit file -- Use scriptstub instead of links to avoid multilib conflicts -- Add condition for doc placement in F20+ - -* Sun Jul 28 2013 Dennis Gilmore - 1:5.5.32-5 -- remove "Requires(pretrans): systemd" since its not possible -- when installing mariadb and systemd at the same time. as in a new install - -* Sat Jul 27 2013 Kevin Fenzi 1:5.5.32-4 -- Set rpm doc macro to install docs in unversioned dir - -* Fri Jul 26 2013 Dennis Gilmore 1:5.5.32-3 -- add Requires(pre) on systemd for the server package - -* Tue Jul 23 2013 Dennis Gilmore 1:5.5.32-2 -- replace systemd-units requires with systemd -- remove solaris files - -* Fri Jul 19 2013 Honza Horak 1:5.5.32-1 -- Rebase to 5.5.32 - https://kb.askmonty.org/en/mariadb-5532-changelog/ -- Clean-up un-necessary systemd snippets - -* Wed Jul 17 2013 Petr Pisar - 1:5.5.31-7 -- Perl 5.18 rebuild - -* Mon Jul 1 2013 Honza Horak 1:5.5.31-6 -- Test suite params enhanced to decrease server condition influence -- Fix misleading error message when uninstalling built-in plugins - Related: #966873 - -* Thu Jun 27 2013 Honza Horak 1:5.5.31-5 -- Apply fixes found by Coverity static analysis tool - -* Wed Jun 19 2013 Honza Horak 1:5.5.31-4 -- Do not use pretrans scriptlet, which doesn't work in anaconda - Resolves: #975348 - -* Fri Jun 14 2013 Honza Horak 1:5.5.31-3 -- Explicitly enable mysqld if it was enabled in the beginning - of the transaction. - -* Thu Jun 13 2013 Honza Horak 1:5.5.31-2 -- Apply man page fix from Jan Stanek - -* Fri May 24 2013 Honza Horak 1:5.5.31-1 -- Rebase to 5.5.31 - https://kb.askmonty.org/en/mariadb-5531-changelog/ -- Preserve time-stamps in case of installed files -- Use /var/tmp instead of /tmp, since the later is using tmpfs, - which can cause problems - Resolves: #962087 -- Fix test suite requirements - -* Sun May 5 2013 Honza Horak 1:5.5.30-2 -- Remove mytop utility, which is packaged separately -- Resolve multilib conflicts in mysql/private/config.h - -* Fri Mar 22 2013 Honza Horak 1:5.5.30-1 -- Rebase to 5.5.30 - https://kb.askmonty.org/en/mariadb-5530-changelog/ - -* Fri Mar 22 2013 Honza Horak 1:5.5.29-11 -- Obsolete MySQL since it is now renamed to community-mysql -- Remove real- virtual names - -* Thu Mar 21 2013 Honza Horak 1:5.5.29-10 -- Adding epoch to have higher priority than other mysql implementations - when comes to provider comparison - -* Wed Mar 13 2013 Honza Horak 5.5.29-9 -- Let mariadb-embedded-devel conflict with MySQL-embedded-devel -- Adjust mariadb-sortbuffer.patch to correspond with upstream patch - -* Mon Mar 4 2013 Honza Horak 5.5.29-8 -- Mask expected warnings about setrlimit in test suite - -* Thu Feb 28 2013 Honza Horak 5.5.29-7 -- Use configured prefix value instead of guessing basedir - in mysql_config -Resolves: #916189 -- Export dynamic columns and non-blocking API functions documented - by upstream - -* Wed Feb 27 2013 Honza Horak 5.5.29-6 -- Fix sort_buffer_length option type - -* Wed Feb 13 2013 Honza Horak 5.5.29-5 -- Suppress warnings in tests and skip tests also on ppc64p7 - -* Tue Feb 12 2013 Honza Horak 5.5.29-4 -- Suppress warning in tests on ppc -- Enable fixed index_merge_myisam test case - -* Thu Feb 07 2013 Honza Horak 5.5.29-3 -- Packages need to provide also %%_isa version of mysql package -- Provide own symbols with real- prefix to distinguish from mysql - unambiguously -- Fix format for buffer size in error messages (MDEV-4156) -- Disable some tests that fail on ppc and s390 -- Conflict only with real-mysql, otherwise mariadb conflicts with ourself - -* Tue Feb 05 2013 Honza Horak 5.5.29-2 -- Let mariadb-libs to own /etc/my.cnf.d - -* Thu Jan 31 2013 Honza Horak 5.5.29-1 -- Rebase to 5.5.29 - https://kb.askmonty.org/en/mariadb-5529-changelog/ -- Fix inaccurate default for socket location in mysqld-wait-ready - Resolves: #890535 - -* Thu Jan 31 2013 Honza Horak 5.5.28a-8 -- Enable obsoleting mysql - -* Wed Jan 30 2013 Honza Horak 5.5.28a-7 -- Adding necessary hacks for perl dependency checking, rpm is still - not wise enough -- Namespace sanity re-added for symbol default_charset_info - -* Mon Jan 28 2013 Honza Horak 5.5.28a-6 -- Removed %%{_isa} from provides/obsoletes, which doesn't allow - proper obsoleting -- Do not obsolete mysql at the time of testing - -* Thu Jan 10 2013 Honza Horak 5.5.28a-5 -- Added licenses LGPLv2 and BSD -- Removed wrong usage of %%{epoch} -- Test-suite is run in %%check -- Removed perl dependency checking adjustment, rpm seems to be smart enough -- Other minor spec file fixes - -* Tue Dec 18 2012 Honza Horak 5.5.28a-4 -- Packaging of MariaDB based on MySQL package - diff --git a/mariadb/centos/mariadb.spec.unmodified b/mariadb/centos/mariadb.spec.unmodified deleted file mode 100644 index 0ed5cc9..0000000 --- a/mariadb/centos/mariadb.spec.unmodified +++ /dev/null @@ -1,1998 +0,0 @@ -# Prefix that is used for patches -%global pkg_name %{name} -%global pkgnamepatch mariadb - -# Regression tests may take a long time (many cores recommended), skip them by -# passing --nocheck to rpmbuild or by setting runselftest to 0 if defining -# --nocheck is not possible (e.g. in koji build) -%{!?runselftest:%global runselftest 0} - -# Set this to 1 to see which tests fail, but 0 on production ready build -%global ignore_testsuite_result 0 - -# In f20+ use unversioned docdirs, otherwise the old versioned one -%global _pkgdocdirname %{pkg_name}%{!?_pkgdocdir:-%{version}} -%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{pkg_name}-%{version}} - -# Use Full RELRO for all binaries (RHBZ#1092548) -%global _hardened_build 1 - -# By default, patch(1) creates backup files when chunks apply with offsets. -# Turn that off to ensure such files don't get included in RPMs (cf bz#884755). -%global _default_patch_flags --no-backup-if-mismatch - -# TokuDB engine is now part of MariaDB, but it is available only for x86_64; -# variable tokudb allows to build with TokuDB storage engine -# Temporarily disabled in F21+ for https://mariadb.atlassian.net/browse/MDEV-6446 -%ifarch x86_64 -%bcond_without tokudb -%else -%bcond_with tokudb -%endif - -# Mroonga engine is now part of MariaDB, but it only builds for x86_64; -# variable mroonga allows to build with Mroonga storage engine -%ifarch x86_64 i686 -%bcond_without mroonga -%else -%bcond_with mroonga -%endif - -# The Open Query GRAPH engine (OQGRAPH) is a computation engine allowing -# hierarchies and more complex graph structures to be handled in a relational -# fashion; enabled by default -# Temporarily disabling oqgraph: https://mariadb.atlassian.net/browse/MDEV-9479 -%bcond_with oqgraph - -# For some use cases we do not need some parts of the package -%bcond_without clibrary -%bcond_without embedded -%bcond_without devel -%bcond_without client -%bcond_without common -%bcond_without errmsg -%bcond_without bench -%bcond_without test -%bcond_without connect -%bcond_without galera - -# When there is already another package that ships /etc/my.cnf, -# rather include it than ship the file again, since conflicts between -# those files may create issues -%bcond_without config - -# For deep debugging we need to build binaries with extra debug info -%bcond_with debug - -# Include files for SysV init or systemd -%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 -%bcond_without init_systemd -%bcond_with init_sysv -%global daemon_name %{name} -%global daemondir %{_unitdir} -%global daemon_no_prefix %{pkg_name} -%global mysqld_pid_dir mysqld -%else -%bcond_with init_systemd -%bcond_without init_sysv -%global daemon_name mysqld -%global daemondir %{_sysconfdir}/rc.d/init.d -%global daemon_no_prefix mysqld -%endif - -# MariaDB 10.0 and later requires pcre >= 8.35, otherwise we need to use -# the bundled library, since the package cannot be build with older version -%global pcre_version 8.39 -%if 0%{?fedora} >= 21 -%bcond_without pcre -%else -%bcond_with pcre -%endif - -# We define some system's well known locations here so we can use them easily -# later when building to another location (like SCL) -%global logrotateddir %{_sysconfdir}/logrotate.d -%global logfiledir %{_localstatedir}/log/%{daemon_name} -%global logfile %{logfiledir}/%{daemon_name}.log - -# Directory for storing pid file -%global pidfiledir %{_localstatedir}/run/%{daemon_name} - -# Defining where database data live -%global dbdatadir %{_localstatedir}/lib/mysql - -# Home directory of mysql user should be same for all packages that create it -%global mysqluserhome /var/lib/mysql - -# The evr of mysql we want to obsolete -%global obsoleted_mysql_evr 5.6-0 -%global obsoleted_mysql_case_evr 5.5.30-5 - -# The evr of mariadb-galera we want to obsolete -%global obsoleted_mariadb_galera_evr 1:10.0.17-6 -%global obsoleted_mariadb_galera_common_evr 5.5.36-10 -%global obsoleted_mariadb_galera_server_evr 1:10.0.17-6 - -# Provide mysql names for compatibility -%bcond_without mysql_names -%bcond_without conflicts - -# Make long macros shorter -%global sameevr %{epoch}:%{version}-%{release} -%global compatver 10.1 -%global bugfixver 20 - -Name: mariadb -Version: %{compatver}.%{bugfixver} -Release: 1%{?with_debug:.debug}%{?dist} -Epoch: 3 - -Summary: A community developed branch of MySQL -Group: Applications/Databases -URL: http://mariadb.org -# Exceptions allow client libraries to be linked with most open source SW, -# not only GPL code. See README.mysql-license -License: GPLv2 with exceptions and LGPLv2 and BSD - -Source0: http://mirrors.syringanetworks.net/mariadb/mariadb-%{version}/source/mariadb-%{version}.tar.gz -Source2: mysql_config_multilib.sh -Source3: my.cnf.in -Source5: README.mysql-cnf -Source6: README.mysql-docs -Source7: README.mysql-license -Source9: mysql-embedded-check.c -Source10: mysql.tmpfiles.d.in -Source11: mysql.service.in -Source12: mysql-prepare-db-dir.sh -Source13: mysql-wait-ready.sh -Source14: mysql-check-socket.sh -Source15: mysql-scripts-common.sh -Source16: mysql-check-upgrade.sh -Source17: mysql-wait-stop.sh -Source18: mysql@.service.in -Source19: mysql.init.in -Source50: rh-skipped-tests-base.list -Source51: rh-skipped-tests-arm.list -Source52: rh-skipped-tests-ppc-s390.list -# TODO: clustercheck contains some hard-coded paths, these should be expanded using template system -Source70: clustercheck.sh -Source71: LICENSE.clustercheck -Source72: mariadb-server-galera.te - -# Comments for these patches are in the patch files -# Patches common for more mysql-like packages -Patch1: %{pkgnamepatch}-strmov.patch -Patch2: %{pkgnamepatch}-install-test.patch -Patch4: %{pkgnamepatch}-logrotate.patch -Patch5: %{pkgnamepatch}-file-contents.patch -Patch7: %{pkgnamepatch}-scripts.patch -Patch8: %{pkgnamepatch}-install-db-sharedir.patch -Patch9: %{pkgnamepatch}-ownsetup.patch -Patch12: %{pkgnamepatch}-admincrash.patch -Patch13: %{pkgnamepatch}-ssl-cypher.patch -Patch14: %{pkgnamepatch}-example-config-files.patch - -# Patches specific for this mysql package -Patch30: %{pkgnamepatch}-errno.patch -Patch31: %{pkgnamepatch}-string-overflow.patch -Patch32: %{pkgnamepatch}-basedir.patch -Patch34: %{pkgnamepatch}-covscan-stroverflow.patch -Patch37: %{pkgnamepatch}-notestdb.patch -# Due to LP https://bugs.launchpad.net/tripleo/+bug/1638864 -# Reverts 7497ebf8a49bfe30bb4110f2ac20a30f804b7946 until we fix the -# galera resource agent to cope with this change -# When RHBZ#1391470 gets fixed and released in centos we can remove this patch -Patch38: %{pkgnamepatch}-10.1.20-revert-stdouterr-closing.patch - -# Patches for galera -Patch40: %{pkgnamepatch}-galera.cnf.patch -Patch41: %{pkgnamepatch}-galera-new-cluster-help.patch - -BuildRequires: cmake -BuildRequires: libaio-devel -BuildRequires: libedit-devel -BuildRequires: ncurses-devel -BuildRequires: perl -%if 0%{?fedora} >= 22 || 0%{?rhel} > 7 -BuildRequires: perl-generators -%endif -BuildRequires: systemtap-sdt-devel -BuildRequires: zlib-devel -BuildRequires: multilib-rpm-config -# auth_pam.so plugin will be build if pam-devel is installed -BuildRequires: pam-devel -# use either new enough version of pcre or provide bundles(pcre) -%{?with_pcre:BuildRequires: pcre-devel >= 8.35} -%{!?with_pcre:Provides: bundled(pcre) = %{pcre_version}} -# Tests requires time and ps and some perl modules -BuildRequires: procps -BuildRequires: time -BuildRequires: perl(Env) -BuildRequires: perl(Exporter) -BuildRequires: perl(Fcntl) -BuildRequires: perl(File::Temp) -BuildRequires: perl(Data::Dumper) -BuildRequires: perl(Getopt::Long) -BuildRequires: perl(IPC::Open3) -BuildRequires: perl(Memoize) -BuildRequires: perl(Socket) -BuildRequires: perl(Sys::Hostname) -BuildRequires: perl(Test::More) -BuildRequires: perl(Time::HiRes) -BuildRequires: perl(Symbol) - -# Temporary workaound to build with OpenSSL 1.0 on Fedora >=26 (wich requires OpenSSL 1.1) -%if 0%{?fedora} >= 26 -BuildRequires: compat-openssl10-devel -Requires: compat-openssl10 -%else -# for running some openssl tests rhbz#1189180 -BuildRequires: openssl -BuildRequires: openssl-devel -%endif - -BuildRequires: krb5-devel - -BuildRequires: selinux-policy-devel -%{?with_init_systemd:BuildRequires: systemd systemd-devel} - -BuildRequires: krb5-devel - -Requires: bash -Requires: fileutils -Requires: grep -Requires: %{name}-common%{?_isa} = %{sameevr} - -# Explicit EVR requirement for -libs is needed for -# https://bugzilla.redhat.com/show_bug.cgi?id=1406320 -Requires: %{name}-libs%{?_isa} = %{sameevr} - -%if %{with mysql_names} -Provides: mysql = %{sameevr} -Provides: mysql%{?_isa} = %{sameevr} -Provides: mysql-compat-client = %{sameevr} -Provides: mysql-compat-client%{?_isa} = %{sameevr} -%endif - - - -# MySQL (with caps) is upstream's spelling of their own RPMs for mysql -%{?obsoleted_mysql_case_evr:Obsoletes: MySQL < %{obsoleted_mysql_case_evr}} -%{?obsoleted_mysql_evr:Obsoletes: mysql < %{obsoleted_mysql_evr}} -%{?with_conflicts:Conflicts: community-mysql} - -# obsoletion of mariadb-galera -Provides: mariadb-galera = %{sameevr} -Obsoletes: mariadb-galera < %{obsoleted_mariadb_galera_evr} - -# Filtering: https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering -%if 0%{?fedora} > 14 || 0%{?rhel} > 6 -%global __requires_exclude ^perl\\((hostnames|lib::mtr|lib::v1|mtr_|My::) -%global __provides_exclude_from ^(%{_datadir}/(mysql|mysql-test)/.*|%{_libdir}/mysql/plugin/.*\\.so)$ -%else -%filter_from_requires /perl(\(hostnames\|lib::mtr\|lib::v1\|mtr_\|My::\)/d -%filter_provides_in -P (%{_datadir}/(mysql|mysql-test)/.*|%{_libdir}/mysql/plugin/.*\.so) -%filter_setup -%endif - -# Define license macro if not present -%{!?_licensedir:%global license %doc} - -%description -MariaDB is a community developed branch of MySQL. -MariaDB is a multi-user, multi-threaded SQL database server. -It is a client/server implementation consisting of a server daemon (mysqld) -and many different client programs and libraries. The base package -contains the standard MariaDB/MySQL client programs and generic MySQL files. - - -%if %{with clibrary} -%package libs -Summary: The shared libraries required for MariaDB/MySQL clients -Group: Applications/Databases -Requires: %{name}-common%{?_isa} = %{sameevr} -%if %{with mysql_names} -Provides: mysql-libs = %{sameevr} -Provides: mysql-libs%{?_isa} = %{sameevr} -%endif -%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-libs < %{obsoleted_mysql_case_evr}} -%{?obsoleted_mysql_evr:Obsoletes: mysql-libs < %{obsoleted_mysql_evr}} - -%description libs -The mariadb-libs package provides the essential shared libraries for any -MariaDB/MySQL client program or interface. You will need to install this -package to use any other MariaDB package or any clients that need to connect -to a MariaDB/MySQL server. MariaDB is a community developed branch of MySQL. -%endif - - -%if %{with config} -%package config -Summary: The config files required by server and client -Group: Applications/Databases - -%description config -The package provides the config file my.cnf and my.cnf.d directory used by any -MariaDB or MySQL program. You will need to install this package to use any -other MariaDB or MySQL package if the config files are not provided in the -package itself. -%endif - - -%if %{with common} -%package common -Summary: The shared files required by server and client -Group: Applications/Databases -Requires: %{_sysconfdir}/my.cnf - -# obsoletion of mariadb-galera-common -Provides: mariadb-galera-common = %{sameevr} -Obsoletes: mariadb-galera-common < %{obsoleted_mariadb_galera_common_evr} - -%description common -The package provides the essential shared files for any MariaDB program. -You will need to install this package to use any other MariaDB package. -%endif - - -%if %{with errmsg} -%package errmsg -Summary: The error messages files required by server and embedded -Group: Applications/Databases -Requires: %{name}-common%{?_isa} = %{sameevr} - -%description errmsg -The package provides error messages files for the MariaDB daemon and the -embedded server. You will need to install this package to use any of those -MariaDB packages. -%endif - - -%if %{with galera} -%package server-galera -Summary: The configuration files and scripts for galera replication -Group: Applications/Databases -Requires: %{name}-common%{?_isa} = %{sameevr} -Requires: %{name}-server%{?_isa} = %{sameevr} -Requires: galera >= 25.3.3 -Requires(post): libselinux-utils -Requires(post): policycoreutils-python - -# obsoletion of mariadb-galera-server -Provides: mariadb-galera-server = %{sameevr} -Obsoletes: mariadb-galera-server <= %{obsoleted_mariadb_galera_server_evr} - -%description server-galera -MariaDB is a multi-user, multi-threaded SQL database server. It is a -client/server implementation consisting of a server daemon (mysqld) -and many different client programs and libraries. This package contains -the MariaDB server and some accompanying files and directories. -MariaDB is a community developed branch of MySQL. -%endif - - -%package server -Summary: The MariaDB server and related files -Group: Applications/Databases - -# note: no version here = %%{version}-%%{release} -%if %{with mysql_names} -Requires: mysql-compat-client%{?_isa} -Requires: mysql%{?_isa} -%else -Requires: %{name}%{?_isa} -%endif -Requires: %{name}-common%{?_isa} = %{sameevr} -Requires: %{_sysconfdir}/my.cnf -Requires: %{_sysconfdir}/my.cnf.d -Requires: %{name}-errmsg%{?_isa} = %{sameevr} -Requires: sh-utils -Requires(pre): /usr/sbin/useradd -%if %{with init_systemd} -# We require this to be present for %%{_tmpfilesdir} -Requires: systemd -# Make sure it's there when scriptlets run, too -Requires(pre): systemd -Requires(posttrans): systemd -%{?systemd_requires: %systemd_requires} -%endif -# mysqlhotcopy needs DBI/DBD support -Requires: perl(DBI) -Requires: perl(DBD::mysql) -# wsrep requirements -Requires: lsof -Requires: net-tools -Requires: sh-utils -Requires: rsync -%if %{with mysql_names} -Provides: mysql-server = %{sameevr} -Provides: mysql-server%{?_isa} = %{sameevr} -Provides: mysql-compat-server = %{sameevr} -Provides: mysql-compat-server%{?_isa} = %{sameevr} -%endif -%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-server < %{obsoleted_mysql_case_evr}} -%{?with_conflicts:Conflicts: community-mysql-server} -%{?with_conflicts:Conflicts: mariadb-galera-server <= %{obsoleted_mariadb_galera_server_evr}} -%{?obsoleted_mysql_evr:Obsoletes: mysql-server < %{obsoleted_mysql_evr}} - -%description server -MariaDB is a multi-user, multi-threaded SQL database server. It is a -client/server implementation consisting of a server daemon (mysqld) -and many different client programs and libraries. This package contains -the MariaDB server and some accompanying files and directories. -MariaDB is a community developed branch of MySQL. - - -%if %{with oqgraph} -%package oqgraph-engine -Summary: The Open Query GRAPH engine for MariaDB -Group: Applications/Databases -Requires: %{name}-server%{?_isa} = %{sameevr} -# boost and Judy required for oograph -BuildRequires: boost-devel -BuildRequires: Judy-devel - -%description oqgraph-engine -The package provides Open Query GRAPH engine (OQGRAPH) as plugin for MariaDB -database server. OQGRAPH is a computation engine allowing hierarchies and more -complex graph structures to be handled in a relational fashion. In a nutshell, -tree structures and friend-of-a-friend style searches can now be done using -standard SQL syntax, and results joined onto other tables. -%endif - - -%if %{with connect} -%package connect-engine -Summary: The CONNECT storage engine for MariaDB -Group: Applications/Databases -Requires: %{name}-server%{?_isa} = %{sameevr} - -%description connect-engine -The CONNECT storage engine enables MariaDB to access external local or -remote data (MED). This is done by defining tables based on different data -types, in particular files in various formats, data extracted from other DBMS -or products (such as Excel), or data retrieved from the environment -(for example DIR, WMI, and MAC tables). -%endif - - -%if %{with devel} -%package devel -Summary: Files for development of MariaDB/MySQL applications -Group: Applications/Databases -%{?with_clibrary:Requires: %{name}-libs%{?_isa} = %{sameevr}} -# avoid issues with openssl1.0 / openssl1.1 / compat -Requires: pkgconfig(openssl) -%if %{with mysql_names} -Provides: mysql-devel = %{sameevr} -Provides: mysql-devel%{?_isa} = %{sameevr} -%endif -%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-devel < %{obsoleted_mysql_case_evr}} -%{?obsoleted_mysql_evr:Obsoletes: mysql-devel < %{obsoleted_mysql_evr}} -%{?with_conflicts:Conflicts: community-mysql-devel} - -%description devel -MariaDB is a multi-user, multi-threaded SQL database server. This -package contains the libraries and header files that are needed for -developing MariaDB/MySQL client applications. -MariaDB is a community developed branch of MySQL. -%endif - - -%if %{with embedded} -%package embedded -Summary: MariaDB as an embeddable library -Group: Applications/Databases -Requires: %{name}-common%{?_isa} = %{sameevr} -Requires: %{name}-errmsg%{?_isa} = %{sameevr} -%if %{with mysql_names} -Provides: mysql-embedded = %{sameevr} -Provides: mysql-embedded%{?_isa} = %{sameevr} -%endif -%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-embedded < %{obsoleted_mysql_case_evr}} -%{?obsoleted_mysql_evr:Obsoletes: mysql-embedded < %{obsoleted_mysql_evr}} - -%description embedded -MariaDB is a multi-user, multi-threaded SQL database server. This -package contains a version of the MariaDB server that can be embedded -into a client application instead of running as a separate process. -MariaDB is a community developed branch of MySQL. - - -%package embedded-devel -Summary: Development files for MariaDB as an embeddable library -Group: Applications/Databases -Requires: %{name}-embedded%{?_isa} = %{sameevr} -Requires: %{name}-devel%{?_isa} = %{sameevr} -# embedded-devel should require libaio-devel (rhbz#1290517) -Requires: libaio-devel -%if %{with mysql_names} -Provides: mysql-embedded-devel = %{sameevr} -Provides: mysql-embedded-devel%{?_isa} = %{sameevr} -%endif -%{?with_conflicts:Conflicts: community-mysql-embedded-devel} -%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-embedded-devel < %{obsoleted_mysql_case_evr}} -%{?obsoleted_mysql_evr:Obsoletes: mysql-embedded-devel < %{obsoleted_mysql_evr}} - -%description embedded-devel -MariaDB is a multi-user, multi-threaded SQL database server. This -package contains files needed for developing and testing with -the embedded version of the MariaDB server. -MariaDB is a community developed branch of MySQL. -%endif - - -%if %{with bench} -%package bench -Summary: MariaDB benchmark scripts and data -Group: Applications/Databases -Requires: %{name}%{?_isa} = %{sameevr} -%if %{with mysql_names} -Provides: mysql-bench = %{sameevr} -Provides: mysql-bench%{?_isa} = %{sameevr} -%endif -%{?with_conflicts:Conflicts: community-mysql-bench} -%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-bench < %{obsoleted_mysql_case_evr}} -%{?obsoleted_mysql_evr:Obsoletes: mysql-bench < %{obsoleted_mysql_evr}} - -%description bench -MariaDB is a multi-user, multi-threaded SQL database server. This -package contains benchmark scripts and data for use when benchmarking -MariaDB. -MariaDB is a community developed branch of MySQL. -%endif - - -%if %{with test} -%package test -Summary: The test suite distributed with MariaDB -Group: Applications/Databases -Requires: %{name}%{?_isa} = %{sameevr} -Requires: %{name}-common%{?_isa} = %{sameevr} -Requires: %{name}-server%{?_isa} = %{sameevr} -Requires: perl(Env) -Requires: perl(Exporter) -Requires: perl(Fcntl) -Requires: perl(File::Temp) -Requires: perl(Data::Dumper) -Requires: perl(Getopt::Long) -Requires: perl(IPC::Open3) -Requires: perl(Socket) -Requires: perl(Sys::Hostname) -Requires: perl(Test::More) -Requires: perl(Time::HiRes) -%{?with_conflicts:Conflicts: community-mysql-test} -%if %{with mysql_names} -Provides: mysql-test = %{sameevr} -Provides: mysql-test%{?_isa} = %{sameevr} -%endif -%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-test < %{obsoleted_mysql_case_evr}} -%{?obsoleted_mysql_evr:Obsoletes: mysql-test < %{obsoleted_mysql_evr}} - -%description test -MariaDB is a multi-user, multi-threaded SQL database server. This -package contains the regression test suite distributed with -the MariaDB sources. -MariaDB is a community developed branch of MySQL. -%endif - -%prep -%setup -q -n mariadb-%{version} - -%patch1 -p1 -%patch2 -p1 -%patch4 -p1 -%patch5 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch34 -p1 -%patch37 -p1 -%patch38 -p1 -%patch40 -p1 -%patch41 -p1 - -sed -i -e 's/2.8.7/2.6.4/g' cmake/cpack_rpm.cmake -# workaround to deploy mariadb@.service on EL7 -sed -i 's/IF(NOT CMAKE_VERSION VERSION_LESS 3.3.0 OR NOT RPM)/IF(TRUE)/g' support-files/CMakeLists.txt - -# workaround for upstream bug #56342 -rm -f mysql-test/t/ssl_8k_key-master.opt - -# generate a list of tests that fail, but are not disabled by upstream -cat %{SOURCE50} | tee mysql-test/rh-skipped-tests.list - -# disable some tests failing on different architectures -%ifarch %{arm} aarch64 -cat %{SOURCE51} | tee -a mysql-test/rh-skipped-tests.list -%endif - -%ifarch ppc ppc64 ppc64p7 s390 s390x -cat %{SOURCE52} | tee -a mysql-test/rh-skipped-tests.list -%endif - -cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \ - %{SOURCE14} %{SOURCE15} %{SOURCE16} %{SOURCE17} %{SOURCE18} %{SOURCE19} \ - %{SOURCE70} scripts - -%if %{with galera} -# prepare selinux policy -mkdir selinux -sed 's/mariadb-server-galera/%{name}-server-galera/' %{SOURCE72} > selinux/%{name}-server-galera.te -cat selinux/%{name}-server-galera.te -%endif - -# Check if PCRE version is actual -%{!?with_pcre: -pcre_maj=`grep '^m4_define(pcre_major' pcre/configure.ac | sed -r 's/^m4_define\(pcre_major, \[([0-9]+)\]\)/\1/'` -pcre_min=`grep '^m4_define(pcre_minor' pcre/configure.ac | sed -r 's/^m4_define\(pcre_minor, \[([0-9]+)\]\)/\1/'` - -if [ %{pcre_version} != "$pcre_maj.$pcre_min" ] -then - echo "\n PCRE version is outdated. \n\tIncluded version:%{pcre_version} \n\tUpstream version: $pcre_maj.$pcre_min\n" - exit 1 -fi -} - - - -%build - -# fail quickly and obviously if user tries to build as root -%if %runselftest - if [ x"$(id -u)" = "x0" ]; then - echo "mysql's regression tests fail if run as root." - echo "If you really need to build the RPM as root, use" - echo "--nocheck to skip the regression tests." - exit 1 - fi -%endif - -CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" -# force PIC mode so that we can build libmysqld.so -CFLAGS="$CFLAGS -fPIC" -# GCC 4.9 causes segfaults: https://mariadb.atlassian.net/browse/MDEV-6360 -CFLAGS="$CFLAGS -fno-delete-null-pointer-checks" -# gcc seems to have some bugs on sparc as of 4.4.1, back off optimization -# submitted as bz #529298 -%ifarch sparc sparcv9 sparc64 -CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" ` -%endif -# significant performance gains can be achieved by compiling with -O3 optimization -# rhbz#1051069 -%ifarch ppc64 -CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O3|g" ` -%endif -CXXFLAGS="$CFLAGS" -export CFLAGS CXXFLAGS - -%if 0%{?_hardened_build} -# building with PIE -LDFLAGS="$LDFLAGS -pie -Wl,-z,relro,-z,now" -export LDFLAGS -%endif - -# The INSTALL_xxx macros have to be specified relative to CMAKE_INSTALL_PREFIX -# so we can't use %%{_datadir} and so forth here. -%cmake . \ - -DBUILD_CONFIG=mysql_release \ - -DFEATURE_SET="community" \ - -DINSTALL_LAYOUT=RPM \ - -DDAEMON_NAME="%{daemon_name}" \ - -DDAEMON_NO_PREFIX="%{daemon_no_prefix}" \ - -DLOG_LOCATION="%{logfile}" \ - -DPID_FILE_DIR="%{pidfiledir}" \ - -DNICE_PROJECT_NAME="MariaDB" \ - -DRPM="%{?rhel:rhel%{rhel}}%{!?rhel:fedora%{fedora}}" \ - -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ - -DINSTALL_SYSCONFDIR="%{_sysconfdir}" \ - -DINSTALL_SYSCONF2DIR="%{_sysconfdir}/my.cnf.d" \ - -DINSTALL_DOCDIR="share/doc/%{_pkgdocdirname}" \ - -DINSTALL_DOCREADMEDIR="share/doc/%{_pkgdocdirname}" \ - -DINSTALL_INCLUDEDIR=include/mysql \ - -DINSTALL_INFODIR=share/info \ - -DINSTALL_LIBDIR="%{_lib}/mysql" \ - -DINSTALL_MANDIR=share/man \ - -DINSTALL_MYSQLSHAREDIR=share/%{pkg_name} \ - -DINSTALL_MYSQLTESTDIR=share/mysql-test \ - -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \ - -DINSTALL_SBINDIR=libexec \ - -DINSTALL_SCRIPTDIR=bin \ - -DINSTALL_SQLBENCHDIR=share \ - -DINSTALL_SUPPORTFILESDIR=share/%{pkg_name} \ - -DMYSQL_DATADIR="%{dbdatadir}" \ - -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \ - -DENABLED_LOCAL_INFILE=ON \ - -DENABLE_DTRACE=ON \ - -DWITH_EMBEDDED_SERVER=ON \ - -DWITH_SSL=system \ - -DWITH_ZLIB=system \ -%{?with_pcre: -DWITH_PCRE=system}\ - -DWITH_JEMALLOC=no \ -%{!?with_tokudb: -DWITHOUT_TOKUDB=ON}\ -%{!?with_mroonga: -DWITHOUT_MROONGA=ON}\ -%{!?with_oqgraph: -DWITHOUT_OQGRAPH=ON}\ - -DTMPDIR=/var/tmp \ -%{?with_debug: -DCMAKE_BUILD_TYPE=Debug}\ - %{?_hardened_build:-DWITH_MYSQLD_LDFLAGS="-pie -Wl,-z,relro,-z,now"} - -make %{?_smp_mflags} VERBOSE=1 - -# debuginfo extraction scripts fail to find source files in their real -# location -- satisfy them by copying these files into location, which -# is expected by scripts -for e in innobase xtradb ; do - for f in pars0grm.y pars0lex.l ; do - cp -p "storage/$e/pars/$f" "storage/$e/$f" - done -done - -# build selinux policy -%if %{with galera} -pushd selinux -make -f /usr/share/selinux/devel/Makefile %{name}-server-galera.pp -%endif - -%install -make DESTDIR=%{buildroot} install - -# cmake generates some completely wacko references to -lprobes_mysql when -# building with dtrace support. Haven't found where to shut that off, -# so resort to this blunt instrument. While at it, let's not reference -# libmysqlclient_r anymore either. -sed -e 's/-lprobes_mysql//' -e 's/-lmysqlclient_r/-lmysqlclient/' \ - %{buildroot}%{_bindir}/mysql_config >mysql_config.tmp -cp -p -f mysql_config.tmp %{buildroot}%{_bindir}/mysql_config -chmod 755 %{buildroot}%{_bindir}/mysql_config - -# multilib header support -for header in mysql/my_config.h mysql/private/config.h; do -%multilib_fix_c_header --file %{_includedir}/$header -done - -# multilib support for shell scripts -# we only apply this to known Red Hat multilib arches, per bug #181335 -if %multilib_capable; then -mv %{buildroot}%{_bindir}/mysql_config %{buildroot}%{_bindir}/mysql_config-%{__isa_bits} -install -p -m 0755 scripts/mysql_config_multilib %{buildroot}%{_bindir}/mysql_config -fi - -# Upstream install this into arch-independent directory, TODO: report -mkdir -p %{buildroot}/%{_libdir}/pkgconfig -mv %{buildroot}/%{_datadir}/pkgconfig/*.pc %{buildroot}/%{_libdir}/pkgconfig - -# install INFO_SRC, INFO_BIN into libdir (upstream thinks these are doc files, -# but that's pretty wacko --- see also %%{name}-file-contents.patch) -install -p -m 644 Docs/INFO_SRC %{buildroot}%{_libdir}/mysql/ -install -p -m 644 Docs/INFO_BIN %{buildroot}%{_libdir}/mysql/ -rm -r %{buildroot}%{_datadir}/doc/%{_pkgdocdirname}/MariaDB-server-%{version}/ - -mkdir -p %{buildroot}%{logfiledir} -chmod 0750 %{buildroot}%{logfiledir} -touch %{buildroot}%{logfile} - -# current setting in my.cnf is to use /var/run/mariadb for creating pid file, -# however since my.cnf is not updated by RPM if changed, we need to create mysqld -# as well because users can have odd settings in their /etc/my.cnf -mkdir -p %{buildroot}%{pidfiledir} -install -p -m 0755 -d %{buildroot}%{dbdatadir} - -%if %{with config} -install -D -p -m 0644 scripts/my.cnf %{buildroot}%{_sysconfdir}/my.cnf -%else -rm -f %{buildroot}%{_sysconfdir}/my.cnf.d/mysql-clients.cnf -rm -f %{buildroot}%{_sysconfdir}/my.cnf -%endif - -# use different config file name for each variant of server -mv %{buildroot}%{_sysconfdir}/my.cnf.d/server.cnf %{buildroot}%{_sysconfdir}/my.cnf.d/%{pkg_name}-server.cnf - -# install systemd unit files and scripts for handling server startup -%if %{with init_systemd} -install -D -p -m 644 scripts/mysql.service %{buildroot}%{_unitdir}/%{daemon_name}.service -install -D -p -m 644 scripts/mysql@.service %{buildroot}%{_unitdir}/%{daemon_name}@.service -install -D -p -m 0644 scripts/mysql.tmpfiles.d %{buildroot}%{_tmpfilesdir}/%{name}.conf -%if 0%{?mysqld_pid_dir:1} -echo "d %{_localstatedir}/run/%{mysqld_pid_dir} 0755 mysql mysql -" >>%{buildroot}%{_tmpfilesdir}/%{name}.conf -%endif -%endif - -# install SysV init script -%if %{with init_sysv} -install -D -p -m 755 scripts/mysql.init %{buildroot}%{daemondir}/%{daemon_name} -%endif - -# helper scripts for service starting -install -p -m 755 scripts/mysql-prepare-db-dir %{buildroot}%{_libexecdir}/mysql-prepare-db-dir -install -p -m 755 scripts/mysql-wait-ready %{buildroot}%{_libexecdir}/mysql-wait-ready -install -p -m 755 scripts/mysql-wait-stop %{buildroot}%{_libexecdir}/mysql-wait-stop -install -p -m 755 scripts/mysql-check-socket %{buildroot}%{_libexecdir}/mysql-check-socket -install -p -m 755 scripts/mysql-check-upgrade %{buildroot}%{_libexecdir}/mysql-check-upgrade -install -p -m 644 scripts/mysql-scripts-common %{buildroot}%{_libexecdir}/mysql-scripts-common - -# install selinux policy -%if %{with galera} -install -p -m 644 -D selinux/%{name}-server-galera.pp %{buildroot}%{_datadir}/selinux/packages/%{name}/%{name}-server-galera.pp -%endif - -# Remove libmysqld.a -rm -f %{buildroot}%{_libdir}/mysql/libmysqld.a - -# libmysqlclient_r is no more. Upstream tries to replace it with symlinks -# but that really doesn't work (wrong soname in particular). We'll keep -# just the devel libmysqlclient_r.so link, so that rebuilding without any -# source change is enough to get rid of dependency on libmysqlclient_r. -rm -f %{buildroot}%{_libdir}/mysql/libmysqlclient_r.so* -ln -s libmysqlclient.so %{buildroot}%{_libdir}/mysql/libmysqlclient_r.so - -# mysql-test includes one executable that doesn't belong under /usr/share, -# so move it and provide a symlink -mv %{buildroot}%{_datadir}/mysql-test/lib/My/SafeProcess/my_safe_process %{buildroot}%{_bindir} -ln -s ../../../../../bin/my_safe_process %{buildroot}%{_datadir}/mysql-test/lib/My/SafeProcess/my_safe_process - -# should move this to /etc/ ? -rm -f %{buildroot}%{_bindir}/mysql_embedded -rm -f %{buildroot}%{_libdir}/mysql/*.a -rm -f %{buildroot}%{_datadir}/%{pkg_name}/binary-configure -rm -f %{buildroot}%{_datadir}/%{pkg_name}/magic -rm -f %{buildroot}%{_datadir}/%{pkg_name}/ndb-config-2-node.ini -rm -f %{buildroot}%{_datadir}/%{pkg_name}/mysql.server -rm -f %{buildroot}%{_datadir}/%{pkg_name}/mysqld_multi.server -rm -f %{buildroot}%{_mandir}/man1/mysql-stress-test.pl.1* -rm -f %{buildroot}%{_mandir}/man1/mysql-test-run.pl.1* -rm -f %{buildroot}%{_bindir}/mytop - -# put logrotate script where it needs to be -mkdir -p %{buildroot}%{logrotateddir} -mv %{buildroot}%{_datadir}/%{pkg_name}/mysql-log-rotate %{buildroot}%{logrotateddir}/%{daemon_name} -chmod 644 %{buildroot}%{logrotateddir}/%{daemon_name} - -mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d -echo "%{_libdir}/mysql" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf - -# copy additional docs into build tree so %%doc will find them -install -p -m 0644 %{SOURCE5} %{basename:%{SOURCE5}} -install -p -m 0644 %{SOURCE6} %{basename:%{SOURCE6}} -install -p -m 0644 %{SOURCE7} %{basename:%{SOURCE7}} -install -p -m 0644 %{SOURCE16} %{basename:%{SOURCE16}} -install -p -m 0644 %{SOURCE71} %{basename:%{SOURCE71}} - -# install galera config file -sed -i -r 's|^wsrep_provider=none|wsrep_provider=%{_libdir}/galera/libgalera_smm.so|' support-files/wsrep.cnf -install -p -m 0644 support-files/wsrep.cnf %{buildroot}%{_sysconfdir}/my.cnf.d/galera.cnf - -# install the clustercheck script -mkdir -p %{buildroot}%{_sysconfdir}/sysconfig -touch %{buildroot}%{_sysconfdir}/sysconfig/clustercheck -install -p -m 0755 scripts/clustercheck %{buildroot}%{_bindir}/clustercheck - -# install the list of skipped tests to be available for user runs -install -p -m 0644 mysql-test/rh-skipped-tests.list %{buildroot}%{_datadir}/mysql-test - -# remove unneeded RHEL-4 SELinux stuff -rm -rf %{buildroot}%{_datadir}/%{pkg_name}/SELinux/ - -# remove SysV init script and a symlink to that -rm -f %{buildroot}%{_sysconfdir}/init.d/mysql -rm -f %{buildroot}%{_libexecdir}/rcmysql - -# remove duplicate logrotate script -rm -f %{buildroot}%{_sysconfdir}/logrotate.d/mysql - -# remove solaris files -rm -rf %{buildroot}%{_datadir}/%{pkg_name}/solaris/ - -# rename the wsrep README so it corresponds with the other README names -mv Docs/README-wsrep Docs/README.wsrep - -# remove *.jar file from mysql-test -rm -rf %{buildroot}%{_datadir}/mysql-test/plugin/connect/connect/std_data/JdbcMariaDB.jar - -%if %{without clibrary} -unlink %{buildroot}%{_libdir}/mysql/libmysqlclient.so -unlink %{buildroot}%{_libdir}/mysql/libmysqlclient_r.so -rm -rf %{buildroot}%{_libdir}/mysql/libmysqlclient*.so.* -rm -rf %{buildroot}%{_sysconfdir}/ld.so.conf.d -rm -f %{buildroot}%{_sysconfdir}/my.cnf.d/client.cnf -%endif - -%if %{without embedded} -rm -f %{buildroot}%{_libdir}/mysql/libmysqld.so* -rm -f %{buildroot}%{_bindir}/{mysql_client_test_embedded,mysqltest_embedded} -rm -f %{buildroot}%{_mandir}/man1/{mysql_client_test_embedded,mysqltest_embedded}.1* -%endif - -%if %{without devel} -rm -f %{buildroot}%{_bindir}/mysql_config* -rm -rf %{buildroot}%{_includedir}/mysql -rm -f %{buildroot}%{_datadir}/aclocal/mysql.m4 -rm -f %{buildroot}%{_libdir}/pkgconfig/mariadb.pc -rm -f %{buildroot}%{_libdir}/mysql/libmysqlclient*.so -rm -f %{buildroot}%{_mandir}/man1/mysql_config.1* -%endif - -%if %{without client} -rm -f %{buildroot}%{_bindir}/{msql2mysql,mysql,mysql_find_rows,\ -mysql_plugin,mysql_waitpid,mysqlaccess,mysqladmin,mysqlbinlog,mysqlcheck,\ -mysqldump,mysqlimport,mysqlshow,mysqlslap,my_print_defaults} -rm -f %{buildroot}%{_mandir}/man1/{msql2mysql,mysql,mysql_find_rows,\ -mysql_plugin,mysql_waitpid,mysqlaccess,mysqladmin,mysqlbinlog,mysqlcheck,\ -mysqldump,mysqlimport,mysqlshow,mysqlslap,my_print_defaults}.1* -%endif - -%if %{without connect} -rm -f %{buildroot}%{_sysconfdir}/my.cnf.d/connect.cnf -%endif - -%if %{without oqgraph} -rm -f %{buildroot}%{_sysconfdir}/my.cnf.d/oqgraph.cnf -%endif - -%if %{without config} -rm -f %{buildroot}%{_sysconfdir}/my.cnf -rm -f %{buildroot}%{_sysconfdir}/my.cnf.d/mysql-clients.cnf -%endif - -%if %{without common} -rm -rf %{buildroot}%{_datadir}/%{pkg_name}/charsets -%endif - -%if %{without errmsg} -rm -f %{buildroot}%{_datadir}/%{pkg_name}/errmsg-utf8.txt -rm -rf %{buildroot}%{_datadir}/%{pkg_name}/{english,czech,danish,dutch,estonian,\ -french,german,greek,hungarian,italian,japanese,korean,norwegian,norwegian-ny,\ -polish,portuguese,romanian,russian,serbian,slovak,spanish,swedish,ukrainian} -%endif - -%if %{without bench} -rm -rf %{buildroot}%{_datadir}/sql-bench -%endif - -%if %{without test} -rm -f %{buildroot}%{_bindir}/{mysql_client_test,my_safe_process} -rm -rf %{buildroot}%{_datadir}/mysql-test -rm -f %{buildroot}%{_mandir}/man1/mysql_client_test.1* -%endif - -%check -%if %{with test} -%if %runselftest -make test VERBOSE=1 -# hack to let 32- and 64-bit tests run concurrently on same build machine -export MTR_PARALLEL=1 -# builds might happen at the same host, avoid collision -export MTR_BUILD_THREAD=%{__isa_bits} - -# The cmake build scripts don't provide any simple way to control the -# options for mysql-test-run, so ignore the make target and just call it -# manually. Nonstandard options chosen are: -# --force to continue tests after a failure -# no retries please -# test SSL with --ssl -# skip tests that are listed in rh-skipped-tests.list -# avoid redundant test runs with --binlog-format=mixed -# increase timeouts to prevent unwanted failures during mass rebuilds -( - set -e - cd mysql-test - perl ./mysql-test-run.pl --force --retry=0 --ssl \ - --suite-timeout=720 --testcase-timeout=30 --skip-rpl \ - --mysqld=--binlog-format=mixed --force-restart \ - --shutdown-timeout=60 --max-test-fail=0 \ -%if %{ignore_testsuite_result} - || : -%else - --skip-test-list=rh-skipped-tests.list -%endif - # cmake build scripts will install the var cruft if left alone :-( - rm -rf var -) -%endif -%endif - -%pre server -/usr/sbin/groupadd -g 27 -o -r mysql >/dev/null 2>&1 || : -/usr/sbin/useradd -M -N -g mysql -o -r -d %{mysqluserhome} -s /sbin/nologin \ - -c "MySQL Server" -u 27 mysql >/dev/null 2>&1 || : - -%if %{with clibrary} -%post libs -p /sbin/ldconfig -%endif - -%if %{with embedded} -%post embedded -p /sbin/ldconfig -%endif - -%if %{with galera} -%post server-galera -semanage port -a -t mysqld_port_t -p tcp 4568 >/dev/null 2>&1 || : -semodule -i %{_datadir}/selinux/packages/%{name}/%{name}-server-galera.pp >/dev/null 2>&1 || : -%endif - -%post server -%if %{with init_systemd} -%systemd_post %{daemon_name}.service -%endif -%if %{with init_sysv} -if [ $1 = 1 ]; then - /sbin/chkconfig --add %{daemon_name} -fi -%endif - -%preun server -%if %{with init_systemd} -%systemd_preun %{daemon_name}.service -%endif -%if %{with init_sysv} -if [ $1 = 0 ]; then - /sbin/service %{daemon_name} stop >/dev/null 2>&1 - /sbin/chkconfig --del %{daemon_name} -fi -%endif - -%if %{with clibrary} -%postun libs -p /sbin/ldconfig -%endif - -%if %{with embedded} -%postun embedded -p /sbin/ldconfig -%endif - -%if %{with galera} -%postun server-galera -if [ $1 -eq 0 ]; then - semodule -r %{name}-server-galera 2>/dev/null || : -fi -%endif - -%postun server -%if %{with init_systemd} -%systemd_postun_with_restart %{daemon_name}.service -%endif -%if %{with init_sysv} -if [ $1 -ge 1 ]; then - /sbin/service %{daemon_name} condrestart >/dev/null 2>&1 || : -fi -%endif - -%if %{with client} -%files -%{_bindir}/msql2mysql -%{_bindir}/mysql -%{_bindir}/mysql_find_rows -%{_bindir}/mysql_plugin -%{_bindir}/mysql_waitpid -%{_bindir}/mysqlaccess -%{_bindir}/mysqladmin -%{_bindir}/mysqlbinlog -%{_bindir}/mysqlcheck -%{_bindir}/mysqldump -%{_bindir}/mysqlimport -%{_bindir}/mysqlshow -%{_bindir}/mysqlslap -%{_bindir}/my_print_defaults - -%{_mandir}/man1/msql2mysql.1* -%{_mandir}/man1/mysql.1* -%{_mandir}/man1/mysql_find_rows.1* -%{_mandir}/man1/mysql_plugin.1* -%{_mandir}/man1/mysql_waitpid.1* -%{_mandir}/man1/mysqlaccess.1* -%{_mandir}/man1/mysqladmin.1* -%{_mandir}/man1/mysqlbinlog.1* -%{_mandir}/man1/mysqlcheck.1* -%{_mandir}/man1/mysqldump.1* -%{_mandir}/man1/mysqlimport.1* -%{_mandir}/man1/mysqlshow.1* -%{_mandir}/man1/mysqlslap.1* -%{_mandir}/man1/my_print_defaults.1* -%endif - -%if %{with clibrary} -%files libs -%{_libdir}/mysql/libmysqlclient.so.* -%{_sysconfdir}/ld.so.conf.d/* -%config(noreplace) %{_sysconfdir}/my.cnf.d/client.cnf -%endif - -%if %{with config} -%files config -# although the default my.cnf contains only server settings, we put it in the -# common package because it can be used for client settings too. -%dir %{_sysconfdir}/my.cnf.d -%config(noreplace) %{_sysconfdir}/my.cnf -%config(noreplace) %{_sysconfdir}/my.cnf.d/mysql-clients.cnf -%config(noreplace) %{_sysconfdir}/my.cnf.d/enable_encryption.preset -%endif - -%if %{with common} -%files common -%license COPYING COPYING.LESSER -%license storage/innobase/COPYING.Percona storage/innobase/COPYING.Google -%doc README README.mysql-license README.mysql-docs -%dir %{_libdir}/mysql -%dir %{_libdir}/mysql/plugin -%dir %{_datadir}/%{pkg_name} -%{_libdir}/mysql/plugin/dialog.so -%{_libdir}/mysql/plugin/mysql_clear_password.so -%{_datadir}/%{pkg_name}/charsets -%endif - -%if %{with errmsg} -%files errmsg -%{_datadir}/%{pkg_name}/errmsg-utf8.txt -%{_datadir}/%{pkg_name}/english -%lang(cs) %{_datadir}/%{pkg_name}/czech -%lang(da) %{_datadir}/%{pkg_name}/danish -%lang(nl) %{_datadir}/%{pkg_name}/dutch -%lang(et) %{_datadir}/%{pkg_name}/estonian -%lang(fr) %{_datadir}/%{pkg_name}/french -%lang(de) %{_datadir}/%{pkg_name}/german -%lang(el) %{_datadir}/%{pkg_name}/greek -%lang(hu) %{_datadir}/%{pkg_name}/hungarian -%lang(it) %{_datadir}/%{pkg_name}/italian -%lang(ja) %{_datadir}/%{pkg_name}/japanese -%lang(ko) %{_datadir}/%{pkg_name}/korean -%lang(no) %{_datadir}/%{pkg_name}/norwegian -%lang(no) %{_datadir}/%{pkg_name}/norwegian-ny -%lang(pl) %{_datadir}/%{pkg_name}/polish -%lang(pt) %{_datadir}/%{pkg_name}/portuguese -%lang(ro) %{_datadir}/%{pkg_name}/romanian -%lang(ru) %{_datadir}/%{pkg_name}/russian -%lang(sr) %{_datadir}/%{pkg_name}/serbian -%lang(sk) %{_datadir}/%{pkg_name}/slovak -%lang(es) %{_datadir}/%{pkg_name}/spanish -%lang(sv) %{_datadir}/%{pkg_name}/swedish -%lang(uk) %{_datadir}/%{pkg_name}/ukrainian -%endif - -%if %{with galera} -%files server-galera -%doc Docs/README.wsrep -%license LICENSE.clustercheck -%{_bindir}/clustercheck -%if %{with init_systemd} -%{_bindir}/galera_new_cluster -%{_bindir}/galera_recovery -%{_datadir}/%{pkg_name}/systemd/use_galera_new_cluster.conf -%endif -%config(noreplace) %{_sysconfdir}/my.cnf.d/galera.cnf -%attr(0640,root,root) %ghost %config(noreplace) %{_sysconfdir}/sysconfig/clustercheck -%{_datadir}/selinux/packages/%{name}/%{name}-server-galera.pp -%endif - -%files server -%doc README.mysql-cnf - -%{_bindir}/aria_chk -%{_bindir}/aria_dump_log -%{_bindir}/aria_ftdump -%{_bindir}/aria_pack -%{_bindir}/aria_read_log -%{_bindir}/mariadb-service-convert -%{_bindir}/myisamchk -%{_bindir}/myisam_ftdump -%{_bindir}/myisamlog -%{_bindir}/myisampack -%{_bindir}/mysql_convert_table_format -%{_bindir}/mysql_fix_extensions -%{_bindir}/mysql_install_db -%{_bindir}/mysql_secure_installation -%{_bindir}/mysql_setpermission -%{_bindir}/mysql_tzinfo_to_sql -%{_bindir}/mysql_upgrade -%{_bindir}/mysql_zap -%{_bindir}/mysqlbug -%{_bindir}/mysqldumpslow -%{_bindir}/mysqld_multi -%{_bindir}/mysqld_safe -%{_bindir}/mysqlhotcopy -%{_bindir}/mysqltest -%{_bindir}/innochecksum -%{_bindir}/perror -%{_bindir}/replace -%{_bindir}/resolve_stack_dump -%{_bindir}/resolveip -%{_bindir}/wsrep_sst_common -%{_bindir}/wsrep_sst_mysqldump -%{_bindir}/wsrep_sst_rsync -%{_bindir}/wsrep_sst_xtrabackup -%{_bindir}/wsrep_sst_xtrabackup-v2 -%{?with_tokudb:%{_bindir}/tokuftdump} -%{?with_tokudb:%{_bindir}/tokuft_logprint} - -%config(noreplace) %{_sysconfdir}/my.cnf.d/%{pkg_name}-server.cnf -%config(noreplace) %{_sysconfdir}/my.cnf.d/auth_gssapi.cnf -%{?with_tokudb:%config(noreplace) %{_sysconfdir}/my.cnf.d/tokudb.cnf} - -%{_libexecdir}/mysqld - -%{_libdir}/mysql/INFO_SRC -%{_libdir}/mysql/INFO_BIN -%if %{without common} -%dir %{_datadir}/%{pkg_name} -%endif - -%{_libdir}/mysql/plugin/* -%{?with_oqgraph:%exclude %{_libdir}/mysql/plugin/ha_oqgraph.so} -%{?with_connect:%exclude %{_libdir}/mysql/plugin/ha_connect.so} -%exclude %{_libdir}/mysql/plugin/dialog.so -%exclude %{_libdir}/mysql/plugin/mysql_clear_password.so - -%{_mandir}/man1/aria_chk.1* -%{_mandir}/man1/aria_dump_log.1* -%{_mandir}/man1/aria_ftdump.1* -%{_mandir}/man1/aria_pack.1* -%{_mandir}/man1/aria_read_log.1* -%{_mandir}/man1/myisamchk.1* -%{_mandir}/man1/myisamlog.1* -%{_mandir}/man1/myisampack.1* -%{_mandir}/man1/mysql_convert_table_format.1* -%{_mandir}/man1/myisam_ftdump.1* -%{_mandir}/man1/mysql.server.1* -%{_mandir}/man1/mysql_fix_extensions.1* -%{_mandir}/man1/mysql_install_db.1* -%{_mandir}/man1/mysql_secure_installation.1* -%{_mandir}/man1/mysql_upgrade.1* -%{_mandir}/man1/mysql_zap.1* -%{_mandir}/man1/mysqlbug.1* -%{_mandir}/man1/mysqldumpslow.1* -%{_mandir}/man1/mysqld_multi.1* -%{_mandir}/man1/mysqld_safe.1* -%{_mandir}/man1/mysqlhotcopy.1* -%{_mandir}/man1/mysql_setpermission.1* -%{_mandir}/man1/mysqltest.1* -%{_mandir}/man1/innochecksum.1* -%{_mandir}/man1/perror.1* -%{_mandir}/man1/replace.1* -%{_mandir}/man1/resolve_stack_dump.1* -%{_mandir}/man1/resolveip.1* -%{_mandir}/man1/mysql_tzinfo_to_sql.1* -%{_mandir}/man8/mysqld.8* - -%{_datadir}/%{pkg_name}/fill_help_tables.sql -%{_datadir}/%{pkg_name}/install_spider.sql -%{_datadir}/%{pkg_name}/maria_add_gis_sp.sql -%{_datadir}/%{pkg_name}/maria_add_gis_sp_bootstrap.sql -%{_datadir}/%{pkg_name}/mysql_system_tables.sql -%{_datadir}/%{pkg_name}/mysql_system_tables_data.sql -%{_datadir}/%{pkg_name}/mysql_test_data_timezone.sql -%{_datadir}/%{pkg_name}/mysql_to_mariadb.sql -%{_datadir}/%{pkg_name}/mysql_performance_tables.sql -%{?with_mroonga:%{_datadir}/%{pkg_name}/mroonga/install.sql} -%{?with_mroonga:%{_datadir}/%{pkg_name}/mroonga/uninstall.sql} -%{_datadir}/%{pkg_name}/my-*.cnf -%{_datadir}/%{pkg_name}/wsrep.cnf -%{_datadir}/%{pkg_name}/wsrep_notify -%dir %{_datadir}/%{pkg_name}/policy -%dir %{_datadir}/%{pkg_name}/policy/apparmor -%dir %{_datadir}/%{pkg_name}/policy/selinux -%{_datadir}/%{pkg_name}/policy/apparmor/README -%{_datadir}/%{pkg_name}/policy/apparmor/usr.sbin.mysqld* -%{_datadir}/%{pkg_name}/policy/selinux/README -%{_datadir}/%{pkg_name}/policy/selinux/mariadb-server.* -%{_datadir}/%{pkg_name}/systemd/mariadb.service -# mariadb@ is installed only when we have cmake newer than 3.3 -%if 0%{?fedora} > 22 || 0%{?rhel} > 6 -%{_datadir}/%{pkg_name}/systemd/mariadb@.service -%endif - -%{daemondir}/%{daemon_name}* -%{_libexecdir}/mysql-prepare-db-dir -%{_libexecdir}/mysql-wait-ready -%{_libexecdir}/mysql-wait-stop -%{_libexecdir}/mysql-check-socket -%{_libexecdir}/mysql-check-upgrade -%{_libexecdir}/mysql-scripts-common - -%{?with_init_systemd:%{_tmpfilesdir}/%{name}.conf} -%attr(0755,mysql,mysql) %dir %{pidfiledir} -%attr(0755,mysql,mysql) %dir %{dbdatadir} -%attr(0750,mysql,mysql) %dir %{logfiledir} -%attr(0640,mysql,mysql) %config %ghost %verify(not md5 size mtime) %{logfile} -%config(noreplace) %{logrotateddir}/%{daemon_name} - -%if %{with oqgraph} -%files oqgraph-engine -%config(noreplace) %{_sysconfdir}/my.cnf.d/oqgraph.cnf -%{_libdir}/mysql/plugin/ha_oqgraph.so -%endif - -%if %{with connect} -%files connect-engine -%config(noreplace) %{_sysconfdir}/my.cnf.d/connect.cnf -%{_libdir}/mysql/plugin/ha_connect.so -%endif - -%if %{with devel} -%files devel -%{_bindir}/mysql_config* -%{_includedir}/mysql -%{_datadir}/aclocal/mysql.m4 -%{_libdir}/pkgconfig/mariadb.pc -%if %{with clibrary} -%{_libdir}/mysql/libmysqlclient.so -%{_libdir}/mysql/libmysqlclient_r.so -%endif -%{_mandir}/man1/mysql_config.1* -%endif - -%if %{with embedded} -%files embedded -%{_libdir}/mysql/libmysqld.so.* - -%files embedded-devel -%{_libdir}/mysql/libmysqld.so -%{_bindir}/mysql_client_test_embedded -%{_bindir}/mysqltest_embedded -%{_mandir}/man1/mysql_client_test_embedded.1* -%{_mandir}/man1/mysqltest_embedded.1* -%endif - -%if %{with bench} -%files bench -%{_datadir}/sql-bench -%endif - -%if %{with test} -%files test -%{_bindir}/mysql_client_test -%{_bindir}/my_safe_process -%attr(-,mysql,mysql) %{_datadir}/mysql-test -%{_mandir}/man1/mysql_client_test.1* -%endif - -%changelog -* Tue Jan 10 2017 Michael Bayer - 3:10.1.20-1 -- Update to version 10.1.20 -- Add explicit EVR requirement in main package for -libs - Related: #1406320 -- Use correct macro when removing doc files - Resolves: #1400981 -- JdbcMariaDB.jar test removed -- PCRE version check added - Related: #1382988, #1396945, #1096787 -- added temporary support to build with OpenSSL 1.0 on Fedora >= 26 -- added krb5-devel pkg as Buldrquires to prevent gssapi failure - -* Thu Nov 03 2016 Michele Baldessari - 3:10.1.18-3 -- Actually apply the revert added as patch in the previous release - -* Thu Nov 03 2016 Michele Baldessari - 3:10.1.18-2 -- Back out upstream commit 7497ebf8a49bfe30bb4110f2ac20a30f804b7946 as it - breaks the resource agent - -* Tue Oct 4 2016 Jakub Dorňák - 3:10.1.18-1 -- Update to 10.1.18 - -* Wed Aug 31 2016 Jakub Dorňák - 3:10.1.17-1 -- Update to 10.1.17 - -* Mon Aug 29 2016 Jakub Dorňák - 3:10.1.16-2 -- Fixed galera replication - Resolves: #1352946 - -* Tue Jul 19 2016 Jakub Dorňák - 3:10.1.16-1 -- Update to 10.1.16 - -* Fri Jul 15 2016 Honza Horak - 3:10.1.14-5 -- Fail build when test-suite fails -- Use license macro for inclusion of licenses - -* Thu Jul 14 2016 Honza Horak - 3:10.1.14-4 -- Revert Update to 10.1.15, this release is broken - https://lists.launchpad.net/maria-discuss/msg03691.html - -* Thu Jul 14 2016 Honza Horak - 2:10.1.15-3 -- Check datadir more carefully to avoid unwanted data corruption - Related: #1335849 - -* Thu Jul 7 2016 Jakub Dorňák - 2:10.1.15-2 -- Bump epoch - (related to the downgrade from the pre-release version) - -* Fri Jul 1 2016 Jakub Dorňák - 1:10.1.15-1 -- Update to 10.1.15 - -* Fri Jul 1 2016 Jakub Dorňák - 1:10.1.14-3 - Revert "Update to 10.2.0" - It is possible that MariaDB 10.2.0 won't be stable till f25 GA. - -* Tue Jun 21 2016 Pavel Raiskup - 1:10.1.14-3 -- BR multilib-rpm-config and use it for multilib workarounds -- install architecture dependant pc file to arch-dependant location - -* Thu May 26 2016 Jakub Dorňák - 1:10.2.0-2 -- Fix mysql-prepare-db-dir - Resolves: #1335849 - -* Thu May 12 2016 Jakub Dorňák - 1:10.2.0-1 -- Update to 10.2.0 - -* Thu May 12 2016 Jakub Dorňák - 1:10.1.14-1 -- Add selinux policy -- Update to 10.1.14 (includes various bug fixes) -- Add -h and --help options to galera_new_cluster - -* Thu Apr 7 2016 Jakub Dorňák - 1:10.1.13-3 -- wsrep_on in galera.cnf - -* Tue Apr 5 2016 Jakub Dorňák - 1:10.1.13-2 -- Moved /etc/sysconfig/clustercheck - and /usr/share/mariadb/systemd/use_galera_new_cluster.conf - to mariadb-server-galera - -* Tue Mar 29 2016 Jakub Dorňák - 1:10.1.13-1 -- Update to 10.1.13 - -* Wed Mar 23 2016 Jakub Dorňák - 1:10.1.12-4 -- Fixed conflict with mariadb-galera-server - -* Tue Mar 22 2016 Jakub Dorňák - 1:10.1.12-3 -- Add subpackage mariadb-server-galera - Resolves: 1310622 - -* Tue Mar 01 2016 Honza Horak - 1:10.1.12-2 -- Rebuild for BZ#1309199 (symbol versioning) - -* Mon Feb 29 2016 Jakub Dorňák - 1:10.1.12-1 -- Update to 10.1.12 - -* Tue Feb 16 2016 Honza Horak - 1:10.1.11-9 -- Remove dangling symlink to /etc/init.d/mysql - -* Sat Feb 13 2016 Honza Horak - 1:10.1.11-8 -- Use epoch for obsoleting mariadb-galera-server - -* Fri Feb 12 2016 Honza Horak - 1:10.1.11-7 -- Add Provides: bundled(pcre) in case we build with bundled pcre - Related: #1302296 -- embedded-devel should require libaio-devel - Resolves: #1290517 - -* Fri Feb 12 2016 Honza Horak - 1:10.1.11-6 -- Fix typo s/obsolate/obsolete/ - -* Thu Feb 11 2016 Honza Horak - 1:10.1.11-5 -- Add missing requirements for proper wsrep functionality -- Obsolate mariadb-galera & mariadb-galera-server (thanks Tomas Repik) - Resolves: #1279753 -- Re-enable using libedit, which should be now fixed - Related: #1201988 -- Remove mariadb-wait-ready call from systemd unit, we have now systemd notify support -- Make mariadb@.service similar to mariadb.service - -* Mon Feb 08 2016 Honza Horak - 1:10.1.11-4 -- Use systemd unit file more compatible with upstream - -* Sun Feb 07 2016 Honza Horak - 1:10.1.11-3 -- Temporarily disabling oqgraph for - https://mariadb.atlassian.net/browse/MDEV-9479 - -* Thu Feb 04 2016 Fedora Release Engineering - 1:10.1.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Feb 3 2016 Jakub Dorňák - 1:10.1.11-1 -- Update to 10.1.11 - -* Tue Jan 19 2016 Jakub Dorňák - 1:10.1.10-1 -- Update to 10.1.10 - -* Mon Dec 07 2015 Dan Horák - 1:10.1.8-3 -- rebuilt for s390(x) - -* Tue Nov 03 2015 Honza Horak - 1:10.1.8-2 -- Expand variables in server.cnf - -* Thu Oct 22 2015 Jakub Dorňák - 1:10.1.8-1 -- Update to 10.1.8 - -* Thu Aug 27 2015 Jonathan Wakely - 1:10.0.21-2 -- Rebuilt for Boost 1.59 - -* Mon Aug 10 2015 Jakub Dorňák - 1:10.0.21-1 -- Update to 10.0.21 - -* Wed Jul 29 2015 Fedora Release Engineering - 1:10.0.20-3 -- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 - -* Wed Jul 22 2015 David Tardon - 1:10.0.20-2 -- rebuild for Boost 1.58 - -* Tue Jun 23 2015 Honza Horak - 1:10.0.20-1 -- Update to 10.0.20 - -* Wed Jun 17 2015 Fedora Release Engineering - 1:10.0.19-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Jun 03 2015 Dan Horák - 1:10.0.19-2 -- Update lists of failing tests (jdornak) - Related: #1149647 - -* Mon May 11 2015 Honza Horak - 1:10.0.19-1 -- Update to 10.0.19 - -* Thu May 07 2015 Honza Horak - 1:10.0.18-1 -- Update to 10.0.18 - -* Thu May 07 2015 Honza Horak - 1:10.0.17-4 -- Include client plugins into -common package since they are used by both -libs - and base packages. -- Do not use libedit - Related: #1201988 -- Let plugin dir to be owned by -common -- Use correct comment in the init script - Related: #1184604 -- Add openssl as BuildRequires to run some openssl tests during build - Related: #1189180 -- Fail in case any command in check fails - Related: #1124791 -- Fix mysqladmin crash if run with -u root -p - Resolves: #1207170 - -* Sat May 02 2015 Kalev Lember - 1:10.0.17-3 -- Rebuilt for GCC 5 C++11 ABI change - -* Fri Mar 06 2015 Honza Horak - 1:10.0.17-2 -- Wait for daemon ends - Resolves: #1072958 -- Do not include symlink to libmysqlclient if not shipping the library -- Do not use scl prefix more than once in paths - Based on https://www.redhat.com/archives/sclorg/2015-February/msg00038.html - -* Wed Mar 04 2015 Honza Horak - 1:10.0.17-1 -- Rebase to version 10.0.17 -- Added variable for turn off skipping some tests - -* Tue Mar 03 2015 Honza Horak - 1:10.0.16-6 -- Check permissions when starting service on RHEL-6 - Resolves: #1194699 -- Do not create test database by default - Related: #1194611 - -* Fri Feb 13 2015 Matej Muzila - 1:10.0.16-4 -- Enable tokudb - -* Tue Feb 10 2015 Honza Horak - 1:10.0.16-3 -- Fix openssl_1 test - -* Wed Feb 4 2015 Jakub Dorňák - 1:10.0.16-2 -- Include new certificate for tests -- Update lists of failing tests - Related: #1186110 - -* Tue Feb 3 2015 Jakub Dorňák - 1:10.0.16-9 -- Rebase to version 10.0.16 - Resolves: #1187895 - -* Tue Jan 27 2015 Petr Machata - 1:10.0.15-9 -- Rebuild for boost 1.57.0 - -* Mon Jan 26 2015 Honza Horak - 1:10.0.15-8 -- Fix typo in the config file - -* Sun Jan 25 2015 Honza Horak - 1:10.0.15-7 -- Do not create log file in post script - -* Sat Jan 24 2015 Honza Horak - 1:10.0.15-6 -- Move server settings to config file under my.cnf.d dir - -* Sat Jan 24 2015 Honza Horak - 1:10.0.15-5 -- Fix path for sysconfig file - Filter provides in el6 properly - Fix initscript file location - -* Tue Jan 06 2015 Honza Horak - 1:10.0.15-4 -- Disable failing tests connect.mrr, connect.updelx2 on ppc and s390 - -* Mon Dec 22 2014 Honza Horak - 1:10.0.15-3 -- Fix macros paths in my.cnf -- Create old location for pid file if it remained in my.cnf - -* Fri Dec 05 2014 Honza Horak - 1:10.0.15-2 -- Rework usage of macros and remove some compatibility artefacts - -* Thu Nov 27 2014 Jakub Dorňák - 1:10.0.15-1 -- Update to 10.0.15 - -* Thu Nov 20 2014 Jan Stanek - 1:10.0.14-8 -- Applied upstream fix for mysql_config --cflags output. - Resolves: #1160845 - -* Fri Oct 24 2014 Jan Stanek - 1:10.0.14-7 -- Fixed compat service file. - Resolves: #1155700 - -* Mon Oct 13 2014 Honza Horak - 1:10.0.14-6 -- Remove bundled cmd-line-utils - Related: #1079637 -- Move mysqlimport man page to proper package -- Disable main.key_cache test on s390 - Releated: #1149647 - -* Wed Oct 08 2014 Honza Horak - 1:10.0.14-5 -- Disable tests connect.part_file, connect.part_table - and connect.updelx - Related: #1149647 - -* Wed Oct 01 2014 Honza Horak - 1:10.0.14-4 -- Add bcond_without mysql_names - Use more correct path when deleting mysql logrotate script - -* Wed Oct 01 2014 Honza Horak - 1:10.0.14-3 -- Build with system libedit - Resolves: #1079637 - -* Mon Sep 29 2014 Honza Horak - 1:10.0.14-2 -- Add with_debug option - -* Mon Sep 29 2014 Honza Horak - 1:10.0.14-1 -- Update to 10.0.14 - -* Wed Sep 24 2014 Honza Horak - 1:10.0.13-8 -- Move connect engine to a separate package - Rename oqgraph engine to align with upstream packages -- Move some files to correspond with MariaDB upstream packages - client.cnf into -libs, mysql_plugin and msql2mysql into base, - tokuftdump and aria_* into -server, errmsg-utf8.txt into -errmsg -- Remove duplicate cnf files packaged using %%doc -- Check upgrade script added to warn about need for mysql_upgrade - -* Wed Sep 24 2014 Matej Muzila - 1:10.0.13-7 -- Client related libraries moved from mariadb-server to mariadb-libs - Related: #1138843 - -* Mon Sep 08 2014 Honza Horak - 1:10.0.13-6 -- Disable vcol_supported_sql_funcs_myisam test on all arches - Related: #1096787 -- Install systemd service file on RHEL-7+ - Server requires any mysql package, so it should be fine with older client - -* Thu Sep 04 2014 Honza Horak - 1:10.0.13-5 -- Fix paths in mysql_install_db script - Resolves: #1134328 -- Use %%cmake macro - -* Tue Aug 19 2014 Honza Horak - 1:10.0.13-4 -- Build config subpackage everytime -- Disable failing tests: innodb_simulate_comp_failures_small, key_cache - rhbz#1096787 - -* Sun Aug 17 2014 Fedora Release Engineering - 1:10.0.13-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Thu Aug 14 2014 Honza Horak - 1:10.0.13-2 -- Include mysqld_unit only if required; enable tokudb in f20- - -* Wed Aug 13 2014 Honza Horak - 1:10.0.13-1 -- Rebase to version 10.0.13 - -* Tue Aug 12 2014 Honza Horak - 1:10.0.12-8 -- Introduce -config subpackage and ship base config files here - -* Tue Aug 5 2014 Honza Horak - 1:10.0.12-7 -- Adopt changes from mysql, thanks Bjorn Munch - -* Mon Jul 28 2014 Honza Horak - 1:10.0.12-6 -- Use explicit sysconfdir -- Absolut path for default value for pid file and error log - -* Tue Jul 22 2014 Honza Horak - 1:10.0.12-5 -- Hardcoded paths removed to work fine in chroot -- Spec rewrite to be more similar to oterh MySQL implementations -- Use variable for daemon unit name -- Include SysV init script if built on older system -- Add possibility to not ship some sub-packages - -* Mon Jul 21 2014 Honza Horak - 1:10.0.12-4 -- Reformating spec and removing unnecessary snippets - -* Tue Jul 15 2014 Honza Horak - 1:10.0.12-3 -- Enable OQGRAPH engine and package it as a sub-package -- Add support for TokuDB engine for x86_64 (currently still disabled) -- Re-enable tokudb_innodb_xa_crash again, seems to be fixed now -- Drop superfluous -libs and -embedded ldconfig deps (thanks Ville Skyttä) -- Separate -lib and -common sub-packages -- Require /etc/my.cnf instead of shipping it -- Include README.mysql-cnf -- Multilib support re-worked -- Introduce new option with_mysqld_unit -- Removed obsolete mysql-cluster, the package should already be removed -- Improve error message when log file is not writable -- Compile all binaries with full RELRO (RHBZ#1092548) -- Use modern symbol filtering with compatible backup -- Add more groupnames for server's my.cnf -- Error messages now provided by a separate package (thanks Alexander Barkov) -- Expand paths in helper scripts using cmake - -* Wed Jun 18 2014 Mikko Tiihonen - 1:10.0.12-2 -- Use -fno-delete-null-pointer-checks to avoid segfaults with gcc 4.9 - -* Tue Jun 17 2014 Jakub Dorňák - 1:10.0.12-1 -- Rebase to version 10.0.12 - -* Sat Jun 07 2014 Fedora Release Engineering - 1:10.0.11-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Jun 3 2014 Jakub Dorňák - 1:10.0.11-4 -- rebuild with tests failing on different arches disabled (#1096787) - -* Thu May 29 2014 Dan Horák - 1:10.0.11-2 -- rebuild with tests failing on big endian arches disabled (#1096787) - -* Wed May 14 2014 Jakub Dorňák - 1:10.0.11-1 -- Rebase to version 10.0.11 - -* Mon May 05 2014 Honza Horak - 1:10.0.10-3 -- Script for socket check enhanced - -* Thu Apr 10 2014 Jakub Dorňák - 1:10.0.10-2 -- use system pcre library - -* Thu Apr 10 2014 Jakub Dorňák - 1:10.0.10-1 -- Rebase to version 10.0.10 - -* Wed Mar 12 2014 Honza Horak - 1:5.5.36-2 -- Server crashes on SQL select containing more group by and left join statements using innodb tables - Resolves: #1065676 -- Fix paths in helper scripts -- Move language files into mariadb directory - -* Thu Mar 06 2014 Honza Horak - 1:5.5.36-1 -- Rebase to 5.5.36 - https://kb.askmonty.org/en/mariadb-5536-changelog/ - -* Tue Feb 25 2014 Honza Horak 1:5.5.35-5 -- Daemon helper scripts sanity changes and spec files clean-up - -* Tue Feb 11 2014 Honza Horak 1:5.5.35-4 -- Fix typo in mysqld.service - Resolves: #1063981 - -* Wed Feb 5 2014 Honza Horak 1:5.5.35-3 -- Do not touch the log file in post script, so it does not get wrong owner - Resolves: #1061045 - -* Thu Jan 30 2014 Honza Horak 1:5.5.35-1 -- Rebase to 5.5.35 - https://kb.askmonty.org/en/mariadb-5535-changelog/ - Also fixes: CVE-2014-0001, CVE-2014-0412, CVE-2014-0437, CVE-2013-5908, - CVE-2014-0420, CVE-2014-0393, CVE-2013-5891, CVE-2014-0386, CVE-2014-0401, - CVE-2014-0402 - Resolves: #1054043 - Resolves: #1059546 - -* Tue Jan 14 2014 Honza Horak - 1:5.5.34-9 -- Adopt compatible system versioning - Related: #1045013 -- Use compatibility mysqld.service instead of link - Related: #1014311 - -* Mon Jan 13 2014 Rex Dieter 1:5.5.34-8 -- move mysql_config alternatives scriptlets to -devel too - -* Fri Jan 10 2014 Honza Horak 1:5.5.34-7 -- Build with -O3 on ppc64 - Related: #1051069 -- Move mysql_config to -devel sub-package and remove Require: mariadb - Related: #1050920 - -* Fri Jan 10 2014 Marcin Juszkiewicz 1:5.5.34-6 -- Disable main.gis-precise test also for AArch64 -- Disable perfschema.func_file_io and perfschema.func_mutex for AArch64 - (like it is done for 32-bit ARM) - -* Fri Jan 10 2014 Honza Horak 1:5.5.34-5 -- Clean all non-needed doc files properly - -* Wed Jan 8 2014 Honza Horak 1:5.5.34-4 -- Read socketfile location in mariadb-prepare-db-dir script - -* Mon Jan 6 2014 Honza Horak 1:5.5.34-3 -- Don't test EDH-RSA-DES-CBC-SHA cipher, it seems to be removed from openssl - which now makes mariadb/mysql FTBFS because openssl_1 test fails - Related: #1044565 -- Use upstream's layout for symbols version in client library - Related: #1045013 -- Check if socket file is not being used by another process at a time - of starting the service - Related: #1045435 -- Use %%ghost directive for the log file - Related: 1043501 - -* Wed Nov 27 2013 Honza Horak 1:5.5.34-2 -- Fix mariadb-wait-ready script - -* Fri Nov 22 2013 Honza Horak 1:5.5.34-1 -- Rebase to 5.5.34 - -* Mon Nov 4 2013 Honza Horak 1:5.5.33a-4 -- Fix spec file to be ready for backport by Oden Eriksson - Resolves: #1026404 - -* Mon Nov 4 2013 Honza Horak 1:5.5.33a-3 -- Add pam-devel to build-requires in order to build - Related: #1019945 -- Check if correct process is running in mysql-wait-ready script - Related: #1026313 - -* Mon Oct 14 2013 Honza Horak 1:5.5.33a-2 -- Turn on test suite - -* Thu Oct 10 2013 Honza Horak 1:5.5.33a-1 -- Rebase to 5.5.33a - https://kb.askmonty.org/en/mariadb-5533-changelog/ - https://kb.askmonty.org/en/mariadb-5533a-changelog/ -- Enable outfile_loaddata test -- Disable tokudb_innodb_xa_crash test - -* Mon Sep 2 2013 Honza Horak - 1:5.5.32-12 -- Re-organize my.cnf to include only generic settings - Resolves: #1003115 -- Move pid file location to /var/run/mariadb -- Make mysqld a symlink to mariadb unit file rather than the opposite way - Related: #999589 - -* Thu Aug 29 2013 Honza Horak - 1:5.5.32-11 -- Move log file into /var/log/mariadb/mariadb.log -- Rename logrotate script to mariadb -- Resolves: #999589 - -* Wed Aug 14 2013 Rex Dieter 1:5.5.32-10 -- fix alternatives usage - -* Tue Aug 13 2013 Honza Horak - 1:5.5.32-9 -- Multilib issues solved by alternatives - Resolves: #986959 - -* Sat Aug 03 2013 Petr Pisar - 1:5.5.32-8 -- Perl 5.18 rebuild - -* Wed Jul 31 2013 Honza Horak - 1:5.5.32-7 -- Do not use login shell for mysql user - -* Tue Jul 30 2013 Honza Horak - 1:5.5.32-6 -- Remove unneeded systemd-sysv requires -- Provide mysql-compat-server symbol -- Create mariadb.service symlink -- Fix multilib header location for arm -- Enhance documentation in the unit file -- Use scriptstub instead of links to avoid multilib conflicts -- Add condition for doc placement in F20+ - -* Sun Jul 28 2013 Dennis Gilmore - 1:5.5.32-5 -- remove "Requires(pretrans): systemd" since its not possible -- when installing mariadb and systemd at the same time. as in a new install - -* Sat Jul 27 2013 Kevin Fenzi 1:5.5.32-4 -- Set rpm doc macro to install docs in unversioned dir - -* Fri Jul 26 2013 Dennis Gilmore 1:5.5.32-3 -- add Requires(pre) on systemd for the server package - -* Tue Jul 23 2013 Dennis Gilmore 1:5.5.32-2 -- replace systemd-units requires with systemd -- remove solaris files - -* Fri Jul 19 2013 Honza Horak 1:5.5.32-1 -- Rebase to 5.5.32 - https://kb.askmonty.org/en/mariadb-5532-changelog/ -- Clean-up un-necessary systemd snippets - -* Wed Jul 17 2013 Petr Pisar - 1:5.5.31-7 -- Perl 5.18 rebuild - -* Mon Jul 1 2013 Honza Horak 1:5.5.31-6 -- Test suite params enhanced to decrease server condition influence -- Fix misleading error message when uninstalling built-in plugins - Related: #966873 - -* Thu Jun 27 2013 Honza Horak 1:5.5.31-5 -- Apply fixes found by Coverity static analysis tool - -* Wed Jun 19 2013 Honza Horak 1:5.5.31-4 -- Do not use pretrans scriptlet, which doesn't work in anaconda - Resolves: #975348 - -* Fri Jun 14 2013 Honza Horak 1:5.5.31-3 -- Explicitly enable mysqld if it was enabled in the beginning - of the transaction. - -* Thu Jun 13 2013 Honza Horak 1:5.5.31-2 -- Apply man page fix from Jan Stanek - -* Fri May 24 2013 Honza Horak 1:5.5.31-1 -- Rebase to 5.5.31 - https://kb.askmonty.org/en/mariadb-5531-changelog/ -- Preserve time-stamps in case of installed files -- Use /var/tmp instead of /tmp, since the later is using tmpfs, - which can cause problems - Resolves: #962087 -- Fix test suite requirements - -* Sun May 5 2013 Honza Horak 1:5.5.30-2 -- Remove mytop utility, which is packaged separately -- Resolve multilib conflicts in mysql/private/config.h - -* Fri Mar 22 2013 Honza Horak 1:5.5.30-1 -- Rebase to 5.5.30 - https://kb.askmonty.org/en/mariadb-5530-changelog/ - -* Fri Mar 22 2013 Honza Horak 1:5.5.29-11 -- Obsolete MySQL since it is now renamed to community-mysql -- Remove real- virtual names - -* Thu Mar 21 2013 Honza Horak 1:5.5.29-10 -- Adding epoch to have higher priority than other mysql implementations - when comes to provider comparison - -* Wed Mar 13 2013 Honza Horak 5.5.29-9 -- Let mariadb-embedded-devel conflict with MySQL-embedded-devel -- Adjust mariadb-sortbuffer.patch to correspond with upstream patch - -* Mon Mar 4 2013 Honza Horak 5.5.29-8 -- Mask expected warnings about setrlimit in test suite - -* Thu Feb 28 2013 Honza Horak 5.5.29-7 -- Use configured prefix value instead of guessing basedir - in mysql_config -Resolves: #916189 -- Export dynamic columns and non-blocking API functions documented - by upstream - -* Wed Feb 27 2013 Honza Horak 5.5.29-6 -- Fix sort_buffer_length option type - -* Wed Feb 13 2013 Honza Horak 5.5.29-5 -- Suppress warnings in tests and skip tests also on ppc64p7 - -* Tue Feb 12 2013 Honza Horak 5.5.29-4 -- Suppress warning in tests on ppc -- Enable fixed index_merge_myisam test case - -* Thu Feb 07 2013 Honza Horak 5.5.29-3 -- Packages need to provide also %%_isa version of mysql package -- Provide own symbols with real- prefix to distinguish from mysql - unambiguously -- Fix format for buffer size in error messages (MDEV-4156) -- Disable some tests that fail on ppc and s390 -- Conflict only with real-mysql, otherwise mariadb conflicts with ourself - -* Tue Feb 05 2013 Honza Horak 5.5.29-2 -- Let mariadb-libs to own /etc/my.cnf.d - -* Thu Jan 31 2013 Honza Horak 5.5.29-1 -- Rebase to 5.5.29 - https://kb.askmonty.org/en/mariadb-5529-changelog/ -- Fix inaccurate default for socket location in mysqld-wait-ready - Resolves: #890535 - -* Thu Jan 31 2013 Honza Horak 5.5.28a-8 -- Enable obsoleting mysql - -* Wed Jan 30 2013 Honza Horak 5.5.28a-7 -- Adding necessary hacks for perl dependency checking, rpm is still - not wise enough -- Namespace sanity re-added for symbol default_charset_info - -* Mon Jan 28 2013 Honza Horak 5.5.28a-6 -- Removed %%{_isa} from provides/obsoletes, which doesn't allow - proper obsoleting -- Do not obsolete mysql at the time of testing - -* Thu Jan 10 2013 Honza Horak 5.5.28a-5 -- Added licenses LGPLv2 and BSD -- Removed wrong usage of %%{epoch} -- Test-suite is run in %%check -- Removed perl dependency checking adjustment, rpm seems to be smart enough -- Other minor spec file fixes - -* Tue Dec 18 2012 Honza Horak 5.5.28a-4 -- Packaging of MariaDB based on MySQL package -