import mariadb-10.5.12-2.el9
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
commit
0286734d47
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
SOURCES/mariadb-10.5.12-downstream_modified.tar.gz
|
||||||
1
.mariadb.metadata
Normal file
1
.mariadb.metadata
Normal file
@ -0,0 +1 @@
|
|||||||
|
4408b5954760239031b0738d78baf6020163b6e4 SOURCES/mariadb-10.5.12-downstream_modified.tar.gz
|
||||||
27
SOURCES/LICENSE.clustercheck
Normal file
27
SOURCES/LICENSE.clustercheck
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
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.
|
||||||
9
SOURCES/README.mariadb-docs
Normal file
9
SOURCES/README.mariadb-docs
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
MariaDB haven't yet made a document package available for offline.
|
||||||
|
|
||||||
|
You can create your own copy with the instructions here:
|
||||||
|
|
||||||
|
https://mariadb.com/kb/en/meta/mirroring-the-mariadb-knowledge-base/
|
||||||
|
|
||||||
|
You can find view the on-line documentation at:
|
||||||
|
|
||||||
|
https://mariadb.com/kb/en/documentation/
|
||||||
89
SOURCES/clustercheck.sh
Normal file
89
SOURCES/clustercheck.sh
Normal file
@ -0,0 +1,89 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
#
|
||||||
|
# Script to make a proxy (ie HAProxy) capable of monitoring Galera cluster nodes properly
|
||||||
|
#
|
||||||
|
# Author: Olaf van Zandwijk <olaf.vanzandwijk@nedap.com>
|
||||||
|
# Author: Raghavendra Prabhu <raghavendra.prabhu@percona.com>
|
||||||
|
# Author: Ryan O'Hara <rohara@redhat.com>
|
||||||
|
#
|
||||||
|
# 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
|
||||||
39
SOURCES/mariadb-check-socket.sh
Normal file
39
SOURCES/mariadb-check-socket.sh
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
#!/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]}`/mariadb-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
|
||||||
|
response=`@bindir@/mariadb-admin --no-defaults --socket="$socketfile" --user=UNKNOWN_MYSQL_USER --connect-timeout="${CHECKSOCKETTIMEOUT:-10}" ping 2>&1`
|
||||||
|
if [ $? -eq 0 ] || echo "$response" | grep -q "Access denied for user" ; then
|
||||||
|
echo "Is another MariaDB daemon already running with the same unix socket?" >&2
|
||||||
|
echo "Please, stop the process using the socket $socketfile or remove the file 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
|
||||||
39
SOURCES/mariadb-check-upgrade.sh
Normal file
39
SOURCES/mariadb-check-upgrade.sh
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
source "`dirname ${BASH_SOURCE[0]}`/mariadb-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 <<EOF >&2
|
||||||
|
The datadir located at $datadir needs to be upgraded using 'mariadb-upgrade' tool. This can be done using the following steps:
|
||||||
|
|
||||||
|
1. Back-up your data before with 'mariadb-upgrade'
|
||||||
|
2. Start the database daemon using 'systemctl start @DAEMON_NAME@.service'
|
||||||
|
3. Run 'mariadb-upgrade' with a database user that has sufficient privileges
|
||||||
|
|
||||||
|
Read more about 'mariadb-upgrade' usage at:
|
||||||
|
https://mariadb.com/kb/en/mysql_upgrade/
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
|
|
||||||
|
exit 0
|
||||||
30
SOURCES/mariadb-groonga.patch
Normal file
30
SOURCES/mariadb-groonga.patch
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
# Fixing conflict with groonga package
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1763287
|
||||||
|
|
||||||
|
--- mariadb-10.3.18/storage/mroonga/vendor/groonga/CMakeLists.txt.withoutoption 2019-11-11 14:01:07.762595716 +0100
|
||||||
|
+++ mariadb-10.3.18/storage/mroonga/vendor/groonga/CMakeLists.txt 2019-11-11 14:33:05.224012458 +0100
|
||||||
|
@@ -86,7 +86,9 @@
|
||||||
|
set(INCLUDE_DIR "include")
|
||||||
|
set(GRN_INCLUDE_DIR "include/groonga")
|
||||||
|
set(DATA_DIR "share")
|
||||||
|
-set(GRN_DATA_DIR "${DATA_DIR}/${GRN_PROJECT_NAME}")
|
||||||
|
+if(NOT DEFINED GRN_DATA_DIR)
|
||||||
|
+ set(GRN_DATA_DIR "${DATA_DIR}/${GRN_PROJECT_NAME}")
|
||||||
|
+endif()
|
||||||
|
set(CONFIG_DIR "etc")
|
||||||
|
set(GRN_CONFIG_DIR "${CONFIG_DIR}/${GRN_PROJECT_NAME}")
|
||||||
|
set(GRN_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/${GRN_CONFIG_DIR}/groonga.conf")
|
||||||
|
|
||||||
|
--- mariadb-10.3.18/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt.withoutoption 2019-11-11 14:34:22.661005715 +0100
|
||||||
|
+++ mariadb-10.3.18/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt 2019-11-11 14:35:59.962244120 +0100
|
||||||
|
@@ -16,7 +16,9 @@
|
||||||
|
# MA 02110-1335 USA
|
||||||
|
|
||||||
|
cmake_minimum_required(VERSION 2.6)
|
||||||
|
-set(GROONGA_NORMALIZER_MYSQL_PROJECT_NAME "groonga-normalizer-mysql")
|
||||||
|
+if (NOT DEFINED GROONGA_NORMALIZER_MYSQL_PROJECT_NAME)
|
||||||
|
+ set(GROONGA_NORMALIZER_MYSQL_PROJECT_NAME "groonga-normalizer-mysql")
|
||||||
|
+endif()
|
||||||
|
project("${GROONGA_NORMALIZER_MYSQL_PROJECT_NAME}")
|
||||||
|
|
||||||
|
if(DEFINED GROONGA_NORMALIZER_MYSQL_EMBED)
|
||||||
81
SOURCES/mariadb-logrotate.patch
Normal file
81
SOURCES/mariadb-logrotate.patch
Normal file
@ -0,0 +1,81 @@
|
|||||||
|
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
|
||||||
|
* Note they are from Fedora 15 / 16
|
||||||
|
|
||||||
|
Update 3/2017
|
||||||
|
* it would be big unexpected change for anyone upgrading, if we start shipping it now.
|
||||||
|
Maybe it is good candidate for shipping with MariaDB 10.2 ?
|
||||||
|
* the 'mysqladmin flush logs' doesn´t guarantee, no entries are lost
|
||||||
|
during flushing, the operation is not atomic.
|
||||||
|
We should not ship it in that state
|
||||||
|
|
||||||
|
Update 6/2018
|
||||||
|
* the SIGHUP causes server to flush all logs. No password admin needed, the only constraint is
|
||||||
|
beeing able to send the SIGHUP to the process and read the mysqld pid file, which root can.
|
||||||
|
* Submited as PR: https://github.com/MariaDB/server/pull/807
|
||||||
|
|
||||||
|
Update 02/2021
|
||||||
|
* Enhance the script as proposed in:
|
||||||
|
https://mariadb.com/kb/en/rotating-logs-on-unix-and-linux/
|
||||||
|
* Discussion continues in:
|
||||||
|
https://jira.mariadb.org/browse/MDEV-16621
|
||||||
|
|
||||||
|
--- mariadb-10.5.8/support-files/mysql-log-rotate.sh 2021-02-12 08:37:47.857289694 +0100
|
||||||
|
+++ mariadb-10.5.8/support-files/mysql-log-rotate.sh_pacthed 2021-02-12 08:40:26.420372325 +0100
|
||||||
|
@@ -3,35 +3,22 @@
|
||||||
|
# in the [mysqld] section as follows:
|
||||||
|
#
|
||||||
|
# [mysqld]
|
||||||
|
-# log-error=@localstatedir@/mysqld.log
|
||||||
|
-#
|
||||||
|
-# If the root user has a password you have to create a
|
||||||
|
-# /root/.my.cnf configuration file with the following
|
||||||
|
-# content:
|
||||||
|
-#
|
||||||
|
-# [mysqladmin]
|
||||||
|
-# password = <secret>
|
||||||
|
-# user= root
|
||||||
|
-#
|
||||||
|
-# where "<secret>" is the password.
|
||||||
|
-#
|
||||||
|
-# ATTENTION: This /root/.my.cnf should be readable ONLY
|
||||||
|
-# for root !
|
||||||
|
+# log-error=@LOG_LOCATION@
|
||||||
|
|
||||||
|
-@localstatedir@/mysqld.log {
|
||||||
|
- # create 600 mysql mysql
|
||||||
|
+@LOG_LOCATION@ {
|
||||||
|
+ create 600 mysql mysql
|
||||||
|
notifempty
|
||||||
|
daily
|
||||||
|
rotate 3
|
||||||
|
missingok
|
||||||
|
compress
|
||||||
|
+ delaycompress
|
||||||
|
+ sharedscripts
|
||||||
|
postrotate
|
||||||
|
# just if mariadbd 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
|
||||||
|
+ if [ -e @PID_FILE_DIR@/@DAEMON_NO_PREFIX@.pid ]
|
||||||
|
+ then
|
||||||
|
+ kill -1 $(<@PID_FILE_DIR@/@DAEMON_NO_PREFIX@.pid)
|
||||||
|
+ fi
|
||||||
|
endscript
|
||||||
|
}
|
||||||
183
SOURCES/mariadb-openssl3.patch
Normal file
183
SOURCES/mariadb-openssl3.patch
Normal file
@ -0,0 +1,183 @@
|
|||||||
|
diff -rup mariadb-10.5.9-orig/mysql-test/main/tls_version1.opt mariadb-10.5.9/mysql-test/main/tls_version1.opt
|
||||||
|
--- mariadb-10.5.9-orig/mysql-test/main/tls_version1.opt 2021-05-19 18:52:49.627469097 +0200
|
||||||
|
+++ mariadb-10.5.9/mysql-test/main/tls_version1.opt 2021-05-21 22:34:44.131913619 +0200
|
||||||
|
@@ -1 +1 @@
|
||||||
|
---tls_version=TLSv1.0
|
||||||
|
+--tls_version=TLSv1.2
|
||||||
|
diff -rup mariadb-10.5.9-orig/mysql-test/main/tls_version1.result mariadb-10.5.9/mysql-test/main/tls_version1.result
|
||||||
|
--- mariadb-10.5.9-orig/mysql-test/main/tls_version1.result 2021-05-19 18:52:49.592468722 +0200
|
||||||
|
+++ mariadb-10.5.9/mysql-test/main/tls_version1.result 2021-05-21 22:34:44.131913619 +0200
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
Variable_name Value
|
||||||
|
-Ssl_version TLSv1
|
||||||
|
+Ssl_version TLSv1.2
|
||||||
|
Variable_name Value
|
||||||
|
-Ssl_version TLSv1
|
||||||
|
+Ssl_version TLSv1.2
|
||||||
|
@@tls_version
|
||||||
|
-TLSv1.0
|
||||||
|
+TLSv1.2
|
||||||
|
diff -rup mariadb-10.5.9-orig/mysql-test/main/tls_version1.test mariadb-10.5.9/mysql-test/main/tls_version1.test
|
||||||
|
--- mariadb-10.5.9-orig/mysql-test/main/tls_version1.test 2021-05-19 18:52:49.577468561 +0200
|
||||||
|
+++ mariadb-10.5.9/mysql-test/main/tls_version1.test 2021-05-21 22:34:44.131913619 +0200
|
||||||
|
@@ -3,10 +3,10 @@
|
||||||
|
|
||||||
|
-- source include/have_ssl_communication.inc
|
||||||
|
--exec $MYSQL --host=localhost --ssl -e "show status like 'ssl_version';"
|
||||||
|
---error 1
|
||||||
|
--exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.2 -e "show status like 'ssl_version';"
|
||||||
|
--error 1
|
||||||
|
--exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.1 -e "show status like 'ssl_version';"
|
||||||
|
+--error 1
|
||||||
|
--exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.0 -e "show status like 'ssl_version';"
|
||||||
|
--exec $MYSQL --host=localhost --ssl -e "select @@tls_version;"
|
||||||
|
|
||||||
|
diff -rup mariadb-10.5.9-orig/mysys_ssl/my_crypt.cc mariadb-10.5.9/mysys_ssl/my_crypt.cc
|
||||||
|
--- mariadb-10.5.9-orig/mysys_ssl/my_crypt.cc 2021-05-19 18:52:49.167464162 +0200
|
||||||
|
+++ mariadb-10.5.9/mysys_ssl/my_crypt.cc 2021-05-21 22:34:44.132913630 +0200
|
||||||
|
@@ -38,22 +38,14 @@
|
||||||
|
class MyCTX
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
- char ctx_buf[EVP_CIPHER_CTX_SIZE + CTX_ALIGN];
|
||||||
|
- EVP_CIPHER_CTX* ctx;
|
||||||
|
+ EVP_CIPHER_CTX* ctx= NULL;
|
||||||
|
MyCTX()
|
||||||
|
{
|
||||||
|
-#if CTX_ALIGN > 0
|
||||||
|
- uintptr_t p= ((uintptr_t)ctx_buf + (CTX_ALIGN - 1)) & ~(CTX_ALIGN - 1);
|
||||||
|
- ctx = reinterpret_cast<EVP_CIPHER_CTX*>(p);
|
||||||
|
-#else
|
||||||
|
- ctx = (EVP_CIPHER_CTX*)ctx_buf;
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
- EVP_CIPHER_CTX_init(ctx);
|
||||||
|
+ ctx = EVP_CIPHER_CTX_new();
|
||||||
|
}
|
||||||
|
virtual ~MyCTX()
|
||||||
|
{
|
||||||
|
- EVP_CIPHER_CTX_reset(ctx);
|
||||||
|
+ EVP_CIPHER_CTX_free(ctx);
|
||||||
|
ERR_remove_state(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
diff -rup mariadb-10.5.9-orig/mysys_ssl/my_md5.cc mariadb-10.5.9/mysys_ssl/my_md5.cc
|
||||||
|
--- mariadb-10.5.9-orig/mysys_ssl/my_md5.cc 2021-05-19 18:52:49.167464162 +0200
|
||||||
|
+++ mariadb-10.5.9/mysys_ssl/my_md5.cc 2021-05-24 15:25:11.365769072 +0200
|
||||||
|
@@ -52,12 +52,13 @@ static void md5_result(EVP_MD_CTX *conte
|
||||||
|
|
||||||
|
static void md5_init(EVP_MD_CTX *context)
|
||||||
|
{
|
||||||
|
- EVP_MD_CTX_init(context);
|
||||||
|
+ const EVP_MD *md;
|
||||||
|
#ifdef EVP_MD_CTX_FLAG_NON_FIPS_ALLOW
|
||||||
|
/* Ok to ignore FIPS: MD5 is not used for crypto here */
|
||||||
|
EVP_MD_CTX_set_flags(context, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
|
||||||
|
#endif
|
||||||
|
- EVP_DigestInit_ex(context, EVP_md5(), NULL);
|
||||||
|
+ md = EVP_get_digestbyname("MD5");
|
||||||
|
+ EVP_DigestInit_ex(context, md, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void md5_input(EVP_MD_CTX *context, const uchar *buf, unsigned len)
|
||||||
|
@@ -68,7 +69,6 @@ static void md5_input(EVP_MD_CTX *contex
|
||||||
|
static void md5_result(EVP_MD_CTX *context, uchar digest[MD5_HASH_SIZE])
|
||||||
|
{
|
||||||
|
EVP_DigestFinal_ex(context, digest, NULL);
|
||||||
|
- EVP_MD_CTX_reset(context);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif /* HAVE_WOLFSSL */
|
||||||
|
@@ -84,11 +84,13 @@ static void md5_result(EVP_MD_CTX *conte
|
||||||
|
*/
|
||||||
|
void my_md5(uchar *digest, const char *buf, size_t len)
|
||||||
|
{
|
||||||
|
- char ctx_buf[EVP_MD_CTX_SIZE];
|
||||||
|
- EVP_MD_CTX * const ctx= (EVP_MD_CTX*)ctx_buf;
|
||||||
|
+ EVP_MD_CTX * const ctx= EVP_MD_CTX_new();
|
||||||
|
+
|
||||||
|
md5_init(ctx);
|
||||||
|
md5_input(ctx, (const uchar *)buf, (uint) len);
|
||||||
|
md5_result(ctx, digest);
|
||||||
|
+
|
||||||
|
+ EVP_MD_CTX_free(ctx);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -108,8 +110,7 @@ void my_md5_multi(uchar *digest, ...)
|
||||||
|
{
|
||||||
|
va_list args;
|
||||||
|
const uchar *str;
|
||||||
|
- char ctx_buf[EVP_MD_CTX_SIZE];
|
||||||
|
- EVP_MD_CTX * const ctx= (EVP_MD_CTX*)ctx_buf;
|
||||||
|
+ EVP_MD_CTX * const ctx= EVP_MD_CTX_new();
|
||||||
|
va_start(args, digest);
|
||||||
|
|
||||||
|
md5_init(ctx);
|
||||||
|
@@ -118,6 +119,7 @@ void my_md5_multi(uchar *digest, ...)
|
||||||
|
|
||||||
|
md5_result(ctx, digest);
|
||||||
|
va_end(args);
|
||||||
|
+ EVP_MD_CTX_free(ctx);
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t my_md5_context_size()
|
||||||
|
Only in mariadb-10.5.9-orig/mysys_ssl: my_md5.cc.patchmd5
|
||||||
|
diff -rup mariadb-10.5.9-orig/mysys_ssl/my_sha.ic mariadb-10.5.9/mysys_ssl/my_sha.ic
|
||||||
|
--- mariadb-10.5.9-orig/mysys_ssl/my_sha.ic 2021-05-19 18:52:49.167464162 +0200
|
||||||
|
+++ mariadb-10.5.9/mysys_ssl/my_sha.ic 2021-05-21 22:34:44.132913630 +0200
|
||||||
|
@@ -146,11 +146,11 @@ static void sha_result(CONTEXT *context,
|
||||||
|
*/
|
||||||
|
void my_sha(uchar *digest, const char *buf, size_t len)
|
||||||
|
{
|
||||||
|
- CONTEXT context;
|
||||||
|
+ CONTEXT *context= (CONTEXT *)alloca(sizeof(CONTEXT));
|
||||||
|
|
||||||
|
- sha_init_fast(&context);
|
||||||
|
- sha_input(&context, (const uchar *)buf, (unsigned int)len);
|
||||||
|
- sha_result(&context, digest);
|
||||||
|
+ sha_init_fast(context);
|
||||||
|
+ sha_input(context, (const uchar *)buf, (unsigned int)len);
|
||||||
|
+ sha_result(context, digest);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -171,14 +171,14 @@ void my_sha_multi(uchar *digest, ...)
|
||||||
|
va_list args;
|
||||||
|
va_start(args, digest);
|
||||||
|
|
||||||
|
- CONTEXT context;
|
||||||
|
+ CONTEXT *context= (CONTEXT *)alloca(sizeof(CONTEXT));
|
||||||
|
const uchar *str;
|
||||||
|
|
||||||
|
- sha_init_fast(&context);
|
||||||
|
+ sha_init_fast(context);
|
||||||
|
for (str= va_arg(args, const uchar*); str; str= va_arg(args, const uchar*))
|
||||||
|
- sha_input(&context, str, (uint) va_arg(args, size_t));
|
||||||
|
+ sha_input(context, str, (uint) va_arg(args, size_t));
|
||||||
|
|
||||||
|
- sha_result(&context, digest);
|
||||||
|
+ sha_result(context, digest);
|
||||||
|
va_end(args);
|
||||||
|
}
|
||||||
|
|
||||||
|
diff -up mariadb-10.5.10-downstream_modified/storage/innobase/handler/ha_innodb.cc.md5galera mariadb-10.5.10-downstream_modified/storage/innobase/handler/ha_innodb.cc
|
||||||
|
--- mariadb-10.5.10-downstream_modified/storage/innobase/handler/ha_innodb.cc.md5galera 2021-07-26 17:32:23.649932748 +0200
|
||||||
|
+++ mariadb-10.5.10-downstream_modified/storage/innobase/handler/ha_innodb.cc 2021-07-27 09:14:46.413734421 +0200
|
||||||
|
@@ -8279,7 +8279,7 @@ wsrep_calc_row_hash(
|
||||||
|
dictionary */
|
||||||
|
row_prebuilt_t* prebuilt) /*!< in: InnoDB prebuilt struct */
|
||||||
|
{
|
||||||
|
- void *ctx = alloca(my_md5_context_size());
|
||||||
|
+ void * const ctx= (void *)EVP_MD_CTX_new();
|
||||||
|
my_md5_init(ctx);
|
||||||
|
|
||||||
|
for (uint i = 0; i < table->s->fields; i++) {
|
||||||
|
@@ -8335,6 +8335,7 @@ wsrep_calc_row_hash(
|
||||||
|
}
|
||||||
|
|
||||||
|
my_md5_result(ctx, digest);
|
||||||
|
+ EVP_MD_CTX_free((EVP_MD_CTX *)ctx);
|
||||||
|
|
||||||
|
return(0);
|
||||||
|
}
|
||||||
31
SOURCES/mariadb-ownsetup.patch
Normal file
31
SOURCES/mariadb-ownsetup.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
--- mariadb-10.4.14/support-files/CMakeLists.txt 2020-08-06 17:28:28.000000000 +0200
|
||||||
|
+++ mariadb-10.4.14/support-files/CMakeLists.txt_patched 2020-09-03 13:21:07.826658279 +0200
|
||||||
|
@@ -187,6 +187,7 @@ IF(UNIX)
|
||||||
|
COMPONENT SharedLibraries)
|
||||||
|
INSTALL(FILES rpm/mysql-clients.cnf DESTINATION ${INSTALL_SYSCONF2DIR}
|
||||||
|
COMPONENT Client)
|
||||||
|
+ CONFIGURE_FILE(rpm/server.cnf ${CMAKE_CURRENT_SOURCE_DIR}/rpm/server.cnf @ONLY)
|
||||||
|
INSTALL(FILES rpm/server.cnf DESTINATION ${INSTALL_SYSCONF2DIR}
|
||||||
|
COMPONENT IniFiles)
|
||||||
|
INSTALL(FILES rpm/enable_encryption.preset DESTINATION ${INSTALL_SYSCONF2DIR}
|
||||||
|
|
||||||
|
diff -up mariadb-10.0.15/support-files/rpm/server.cnf.ownsetup mariadb-10.0.15/support-files/rpm/server.cnf
|
||||||
|
--- mariadb-10.0.15/support-files/rpm/server.cnf.ownsetup 2015-01-24 23:55:55.110063592 +0100
|
||||||
|
+++ mariadb-10.0.15/support-files/rpm/server.cnf 2015-01-24 23:57:42.308114387 +0100
|
||||||
|
@@ -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
|
||||||
19
SOURCES/mariadb-pcdir.patch
Normal file
19
SOURCES/mariadb-pcdir.patch
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
Use PCDIR CMake option, if configured
|
||||||
|
|
||||||
|
Upstream install the server pkgconfig file into arch-independent directory
|
||||||
|
Reported to upstream as: https://jira.mariadb.org/browse/MDEV-14340
|
||||||
|
|
||||||
|
--- mariadb-10.5.5/support-files/CMakeLists.txt.old 2020-09-30 10:36:08.582490318 +0200
|
||||||
|
+++ mariadb-10.5.5/support-files/CMakeLists.txt 2020-09-30 10:38:58.079710848 +0200
|
||||||
|
@@ -91,7 +91,11 @@
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
|
CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY)
|
||||||
|
+IF(INSTALL_PCDIR)
|
||||||
|
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_PCDIR} COMPONENT Development)
|
||||||
|
+ELSE()
|
||||||
|
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_LIBDIR}/pkgconfig COMPONENT Development)
|
||||||
|
+ENDIF()
|
||||||
|
|
||||||
|
INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
|
||||||
|
|
||||||
137
SOURCES/mariadb-prepare-db-dir.sh
Normal file
137
SOURCES/mariadb-prepare-db-dir.sh
Normal file
@ -0,0 +1,137 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
# This script creates the MariaDB data directory during first service start.
|
||||||
|
# In subsequent starts, it does nothing much.
|
||||||
|
|
||||||
|
source "`dirname ${BASH_SOURCE[0]}`/mariadb-scripts-common"
|
||||||
|
|
||||||
|
export LC_ALL=C
|
||||||
|
|
||||||
|
# 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
|
||||||
|
# Some files or directories are fine to be there, so those are
|
||||||
|
# explicitly removed from the listing
|
||||||
|
# @param <dir> datadir
|
||||||
|
list_datadir ()
|
||||||
|
{
|
||||||
|
( ls -1A "$1" 2>/dev/null || echo "fake-file" ) | grep -v \
|
||||||
|
-e '^lost+found$' \
|
||||||
|
-e '\.err$' \
|
||||||
|
-e '^.bash_history$'
|
||||||
|
}
|
||||||
|
|
||||||
|
# Checks whether datadir should be initialized
|
||||||
|
# @param <dir> datadir
|
||||||
|
should_initialize ()
|
||||||
|
{
|
||||||
|
test -z "$(list_datadir "$1")"
|
||||||
|
}
|
||||||
|
|
||||||
|
# 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
|
||||||
|
if [ ! -e "$errlogfile" -a ! -h "$errlogfile" -a x$(dirname "$errlogfile") = "x/var/log" ]; then
|
||||||
|
case $(basename "$errlogfile") in
|
||||||
|
mysql*.log|mariadb*.log) install /dev/null -m0640 -o$myuser -g$mygroup "$errlogfile" ;;
|
||||||
|
*) ;;
|
||||||
|
esac
|
||||||
|
else
|
||||||
|
# Provide some advice if the log file cannot be created by this script
|
||||||
|
errlogdir=$(dirname "$errlogfile")
|
||||||
|
if ! [ -d "$errlogdir" ] ; then
|
||||||
|
echo "The directory $errlogdir does not exist." >&2
|
||||||
|
exit 1
|
||||||
|
elif [ -e "$errlogfile" -a ! -w "$errlogfile" ] ; then
|
||||||
|
echo "The log file $errlogfile cannot be written, please, fix its permissions." >&2
|
||||||
|
echo "The daemon will be run under $myuser:$mygroup" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 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" >&2
|
||||||
|
# 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@/mariadb-install-db --rpm --datadir="$datadir" --user="$myuser" --skip-test-db >&2
|
||||||
|
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"
|
||||||
|
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." >&2
|
||||||
|
echo "Make sure the $datadir is empty before running `basename $0`." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
exit 0
|
||||||
68
SOURCES/mariadb-scripts-common.sh
Normal file
68
SOURCES/mariadb-scripts-common.sh
Normal file
@ -0,0 +1,68 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
# Some useful functions used in other MariaDB helper scripts
|
||||||
|
# This scripts defines variables datadir, errlogfile, socketfile
|
||||||
|
|
||||||
|
export LC_ALL=C
|
||||||
|
|
||||||
|
# extract value of a MariaDB 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 $my_print_defaults_extra_args $sections | sed -n "s/^--${option_name}=//p" | tail -n 1`
|
||||||
|
if [ -z "$result" ]; then
|
||||||
|
# not found, use default
|
||||||
|
result="${default_value}"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# For the case of running more instances via systemd, scripts that source
|
||||||
|
# this file can get --default-group-suffix or similar option as the first
|
||||||
|
# argument. The utility my_print_defaults needs to use it as well, so the
|
||||||
|
# scripts sourcing this file work with the same options as the daemon.
|
||||||
|
my_print_defaults_extra_args=''
|
||||||
|
while echo "$1" | grep -q '^--defaults' ; do
|
||||||
|
my_print_defaults_extra_args="${my_print_defaults_extra_args} $1"
|
||||||
|
shift
|
||||||
|
done
|
||||||
|
|
||||||
|
# Defaults here had better match what mariadbd-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 mariadbd daemon or
|
||||||
|
# mariadbd-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 mariadbd-safe script and source
|
||||||
|
# code itself.
|
||||||
|
|
||||||
|
server_sections="mysqld_safe mysqld server mysqld-@MAJOR_VERSION@.@MINOR_VERSION@ mariadb mariadb-@MAJOR_VERSION@.@MINOR_VERSION@ mariadbd mariadbd-@MAJOR_VERSION@.@MINOR_VERSION@ client-server galera"
|
||||||
|
|
||||||
|
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"
|
||||||
|
|
||||||
41
SOURCES/mariadb-scripts.patch
Normal file
41
SOURCES/mariadb-scripts.patch
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
We have some downstream patches and other scripts that include variables to
|
||||||
|
be expanded by cmake. Cmake needs to know about them, so adding them manually.
|
||||||
|
|
||||||
|
# Install libgcc as mylibgcc.a
|
||||||
|
--- mariadb-10.5.5/scripts/CMakeLists.txt.old 2020-09-24 10:13:35.272589689 +0200
|
||||||
|
+++ mariadb-10.5.5/scripts/CMakeLists.txt 2020-09-24 10:17:31.428985798 +0200
|
||||||
|
@@ -377,6 +377,34 @@
|
||||||
|
INSTALL_LINK(${file} ${binname} ${INSTALL_BINDIR} ${${file}_COMPONENT})
|
||||||
|
ENDIF()
|
||||||
|
ENDFOREACH()
|
||||||
|
+
|
||||||
|
+ # files for systemd
|
||||||
|
+ SET(SYSTEMD_SCRIPTS
|
||||||
|
+ mariadb.tmpfiles.d
|
||||||
|
+ mysql.service
|
||||||
|
+ mysql@.service
|
||||||
|
+ mariadb-prepare-db-dir
|
||||||
|
+ mariadb-check-socket
|
||||||
|
+ mariadb-check-upgrade
|
||||||
|
+ mariadb-scripts-common
|
||||||
|
+ mysql_config_multilib
|
||||||
|
+ clustercheck
|
||||||
|
+ galera_new_cluster
|
||||||
|
+ 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()
|
||||||
|
+
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
|
# Install libgcc as mylibgcc.a
|
||||||
23
SOURCES/mariadb-server-galera.te
Normal file
23
SOURCES/mariadb-server-galera.te
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
|
||||||
|
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 };
|
||||||
|
|
||||||
13
SOURCES/mariadb-ssl-cipher-tests.patch
Normal file
13
SOURCES/mariadb-ssl-cipher-tests.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff -up mariadb-10.3.9/mysql-test/main/ssl_cipher.test.fixtest mariadb-10.3.9/mysql-test/main/ssl_cipher.test
|
||||||
|
--- mariadb-10.3.13/mysql-test/main/ssl_cipher.test 2019-02-20 08:59:09.000000000 +0100
|
||||||
|
+++ mariadb-10.3.13/mysql-test/main/ssl_cipher.test_patched 2019-02-22 11:22:01.250256060 +0100
|
||||||
|
@@ -97,7 +97,9 @@ drop user mysqltest_1@localhost;
|
||||||
|
let $restart_parameters=--ssl-cipher=AES128-SHA;
|
||||||
|
source include/restart_mysqld.inc;
|
||||||
|
connect (ssl_con,localhost,root,,,,,SSL);
|
||||||
|
+--replace_regex /TLS_AES_.*/AES128-SHA/
|
||||||
|
SHOW STATUS LIKE 'Ssl_cipher';
|
||||||
|
+--replace_regex /TLS_AES_.*/AES128-SHA/
|
||||||
|
SHOW STATUS LIKE 'Ssl_cipher_list';
|
||||||
|
disconnect ssl_con;
|
||||||
|
connection default;
|
||||||
3
SOURCES/mariadb.tmpfiles.d.in
Normal file
3
SOURCES/mariadb.tmpfiles.d.in
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
# Do not edit this file.
|
||||||
|
# To override this, put /etc/tmpfiles.d/mariadb.conf instead.
|
||||||
|
d @PID_FILE_DIR@ 0755 mysql mysql -
|
||||||
18
SOURCES/my.cnf.in
Normal file
18
SOURCES/my.cnf.in
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
#
|
||||||
|
# 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@
|
||||||
|
|
||||||
64
SOURCES/mysql.service.in
Normal file
64
SOURCES/mysql.service.in
Normal file
@ -0,0 +1,64 @@
|
|||||||
|
# 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:
|
||||||
|
#
|
||||||
|
# root> systemctl edit @DAEMON_NAME@.service
|
||||||
|
#
|
||||||
|
# Then add additonal directives under a section (probably [Service]).
|
||||||
|
#
|
||||||
|
# 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 MariaDB's open-files-limit to 10000,
|
||||||
|
# you need to increase systemd's LimitNOFILE setting, use the contents below:
|
||||||
|
#
|
||||||
|
# [Service]
|
||||||
|
# LimitNOFILE=10000
|
||||||
|
#
|
||||||
|
|
||||||
|
[Unit]
|
||||||
|
Description=@NICE_PROJECT_NAME@ @MAJOR_VERSION@.@MINOR_VERSION@ database server
|
||||||
|
Documentation=man:mariadbd(8)
|
||||||
|
Documentation=https://mariadb.com/kb/en/library/systemd/
|
||||||
|
After=network.target
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
Alias=mysql.service
|
||||||
|
Alias=mysqld.service
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=notify
|
||||||
|
User=mysql
|
||||||
|
Group=mysql
|
||||||
|
|
||||||
|
ExecStartPre=@libexecdir@/mariadb-check-socket
|
||||||
|
# '%n' expands to 'Full unit name'; man systemd.unit
|
||||||
|
ExecStartPre=@libexecdir@/mariadb-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@/mariadbd --basedir=@prefix@ $MYSQLD_OPTS $_WSREP_NEW_CLUSTER
|
||||||
|
ExecStartPost=@libexecdir@/mariadb-check-upgrade
|
||||||
|
|
||||||
|
# Setting this to true can break replication and the Type=notify settings
|
||||||
|
# See also bind-address MariaDB option.
|
||||||
|
PrivateNetwork=false
|
||||||
|
|
||||||
|
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
|
||||||
85
SOURCES/mysql@.service.in
Normal file
85
SOURCES/mysql@.service.in
Normal file
@ -0,0 +1,85 @@
|
|||||||
|
# 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 [mariadbd.INSTANCENAME] as sections in
|
||||||
|
# @sysconfdir@/@my.cnf to change per instance settings. A minimumal necessary
|
||||||
|
# configuration items to change to avoid conflicts between instances is:
|
||||||
|
#
|
||||||
|
# [mariadbd.instancename]
|
||||||
|
# # TCP port to make available for clients
|
||||||
|
# port=3306
|
||||||
|
# # Socket to make available for clients
|
||||||
|
# socket=/tmp/mariadb-instancename.sock
|
||||||
|
# # Where MariaDB should store all its data
|
||||||
|
# datadir=/usr/local/mariadb-instancename/data
|
||||||
|
#
|
||||||
|
# and start the service via:
|
||||||
|
#
|
||||||
|
# root> 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, for
|
||||||
|
# all instances, the best way is:
|
||||||
|
#
|
||||||
|
# root> systemctl edit @DAEMON_NAME@@.service
|
||||||
|
#
|
||||||
|
# Then add additonal directives under a section (probably [Service]).
|
||||||
|
#
|
||||||
|
# If you only want to change a specific instance:
|
||||||
|
#
|
||||||
|
# root> systemctl edit @DAEMON_NAME@@{instancename}.server
|
||||||
|
#
|
||||||
|
# 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 MariaDB's open-files-limit to 10000,
|
||||||
|
# you need to increase systemd's LimitNOFILE setting, use the contents below:
|
||||||
|
#
|
||||||
|
# [Service]
|
||||||
|
# LimitNOFILE=10000
|
||||||
|
|
||||||
|
[Unit]
|
||||||
|
Description=@NICE_PROJECT_NAME@ @MAJOR_VERSION@.@MINOR_VERSION@ database server
|
||||||
|
Documentation=man:mariadbd(8)
|
||||||
|
Documentation=https://mariadb.com/kb/en/library/systemd/
|
||||||
|
After=network.target
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
Alias=mysql.service
|
||||||
|
Alias=mysqld.service
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=notify
|
||||||
|
User=mysql
|
||||||
|
Group=mysql
|
||||||
|
|
||||||
|
ExecStartPre=@libexecdir@/mariadb-check-socket --defaults-group-suffix=.%I
|
||||||
|
ExecStartPre=@libexecdir@/mariadb-prepare-db-dir --defaults-group-suffix=.%I %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@/mariadbd --defaults-group-suffix=.%I --basedir=@prefix@ $MYSQLD_OPTS $_WSREP_NEW_CLUSTER
|
||||||
|
ExecStartPost=@libexecdir@/mariadb-check-upgrade --defaults-group-suffix=.%I
|
||||||
|
|
||||||
|
# Setting this to true can break replication and the Type=notify settings
|
||||||
|
# See also bind-address MariaDB option.
|
||||||
|
PrivateNetwork=false
|
||||||
|
|
||||||
|
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
|
||||||
26
SOURCES/mysql_config_multilib.sh
Normal file
26
SOURCES/mysql_config_multilib.sh
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
#! /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
|
||||||
|
|
||||||
5
SOURCES/rh-skipped-tests-arm.list
Normal file
5
SOURCES/rh-skipped-tests-arm.list
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
# Fails since 10.3.17, only on armv7hl
|
||||||
|
versioning.partition :
|
||||||
|
|
||||||
|
# Fail since 10.4.16 only on armv7hl
|
||||||
|
versioning.partition_rotation :
|
||||||
57
SOURCES/rh-skipped-tests-base.list
Normal file
57
SOURCES/rh-skipped-tests-base.list
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
# The SSL test are failing correctly. Fro more explanation, see:
|
||||||
|
# https://jira.mariadb.org/browse/MDEV-8404?focusedCommentId=84275&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-84275
|
||||||
|
main.ssl_7937 : #1399847
|
||||||
|
main.ssl_8k_key :
|
||||||
|
main.ssl_crl : #1399847
|
||||||
|
|
||||||
|
# ------------------------------
|
||||||
|
# Tests that fails because of 'Self Signed Certificate in the Certificate Chain'
|
||||||
|
perfschema.cnf_option :
|
||||||
|
|
||||||
|
rpl.rpl_row_img_blobs :
|
||||||
|
rpl.rpl_row_img_eng_min :
|
||||||
|
rpl.rpl_row_img_eng_noblob :
|
||||||
|
|
||||||
|
sys_vars.slave_parallel_threads_basic :
|
||||||
|
|
||||||
|
# ------------------------------
|
||||||
|
# Expected to fail, the plugin is not build with server, but 'mariadb-connector-c' instead
|
||||||
|
plugins.auth_ed25519 :
|
||||||
|
plugins.multiauth :
|
||||||
|
|
||||||
|
# ------------------------------
|
||||||
|
perfschema.nesting : #1399847
|
||||||
|
perfschema.socket_summary_by_instance_func : #1399847
|
||||||
|
perfschema.socket_summary_by_event_name_func :
|
||||||
|
|
||||||
|
# ------------------------------
|
||||||
|
# Fails since 10.1.12
|
||||||
|
innodb.innodb_defrag_binlog :
|
||||||
|
|
||||||
|
# Fails everywhere since 10.2.15
|
||||||
|
main.userstat :
|
||||||
|
|
||||||
|
# Fails everywhere since 10.4.11
|
||||||
|
main.events_bugs :
|
||||||
|
sys_vars.tcp_nodelay :
|
||||||
|
|
||||||
|
# Fails on i686
|
||||||
|
encryption.innodb-redo-badkey :
|
||||||
|
|
||||||
|
# Fails since 10.5.2
|
||||||
|
main.mysqld--help2 :
|
||||||
|
disks.disks :
|
||||||
|
disks.disks_notembedded :
|
||||||
|
|
||||||
|
# Fails since 10.5.3
|
||||||
|
main.mysqld--help-aria :
|
||||||
|
|
||||||
|
# Fails since 10.5.4
|
||||||
|
main.ssl_system_ca :
|
||||||
|
|
||||||
|
# Fails since 10.5.7
|
||||||
|
innodb.innodb_wl6326_big :
|
||||||
|
plugins.feedback_plugin_load :
|
||||||
|
|
||||||
|
# Fails only on RHEL 9 BETA on i686 architecture
|
||||||
|
main.myisampack :
|
||||||
5
SOURCES/rh-skipped-tests-ppc.list
Normal file
5
SOURCES/rh-skipped-tests-ppc.list
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
# Fails on ppc64le since 10.4.12
|
||||||
|
oqgraph.social :
|
||||||
|
|
||||||
|
# Fails since 10.5.2
|
||||||
|
rh-skipped-tests-ppc.list :
|
||||||
3
SOURCES/rh-skipped-tests-s390.list
Normal file
3
SOURCES/rh-skipped-tests-s390.list
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
# Fails since 10.5.2
|
||||||
|
perfschema.memory_aggregate_32bit :
|
||||||
|
period.overlaps :
|
||||||
2876
SPECS/mariadb.spec
Normal file
2876
SPECS/mariadb.spec
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user