Rebase to 10.4.2
Sync-up with 10.3 in Rawhide
This commit is contained in:
parent
14c5e16b6f
commit
ff6cb12c8c
32
mariadb-myrocks-hotbackup.patch
Normal file
32
mariadb-myrocks-hotbackup.patch
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
Do not import commands library as it is not used
|
||||||
|
|
||||||
|
It also makes the script not work on python3, but since the script already uses
|
||||||
|
subprocess in practice, removing commands import is effectively no change and
|
||||||
|
fixes the python3 compatibility.
|
||||||
|
|
||||||
|
Upstream PR: https://github.com/MariaDB/server/pull/1080
|
||||||
|
|
||||||
|
From 9c89fd49a757a87ba5899b3548b0fb1d172c0ec3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Honza Horak <hhorak@redhat.com>
|
||||||
|
Date: Wed, 9 Jan 2019 15:05:02 +0100
|
||||||
|
Subject: [PATCH] Do not import commands library as it is not used
|
||||||
|
|
||||||
|
---
|
||||||
|
storage/rocksdb/myrocks_hotbackup.py | 1 -
|
||||||
|
1 file changed, 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/storage/rocksdb/myrocks_hotbackup.py b/storage/rocksdb/myrocks_hotbackup.py
|
||||||
|
index 69c75b7cbfd..906ba814776 100755
|
||||||
|
--- a/storage/rocksdb/myrocks_hotbackup.py
|
||||||
|
+++ b/storage/rocksdb/myrocks_hotbackup.py
|
||||||
|
@@ -8,7 +8,6 @@ import os
|
||||||
|
import stat
|
||||||
|
import sys
|
||||||
|
import re
|
||||||
|
-import commands
|
||||||
|
import subprocess
|
||||||
|
import logging
|
||||||
|
import logging.handlers
|
||||||
|
--
|
||||||
|
2.17.2
|
||||||
|
|
27
mariadb-pythonver.patch
Normal file
27
mariadb-pythonver.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
Upstream PR: https://github.com/MariaDB/server/pull/1081
|
||||||
|
|
||||||
|
From d2cbf56d36e422802aa7e53ec0f4e6be8fd53cf5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Honza Horak <hhorak@redhat.com>
|
||||||
|
Date: Wed, 9 Jan 2019 20:17:29 +0100
|
||||||
|
Subject: [PATCH] Make the PYTHON_SHEBANG value configurable
|
||||||
|
|
||||||
|
In Fedora 30 it is required to specify either /usr/bin/python2 or /usr/bin/python3 in the shebang, so we need a way to say explicit shebang, ideally in the cmake call.
|
||||||
|
---
|
||||||
|
CMakeLists.txt | 4 +++-
|
||||||
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index a139c9e5fa4..ccccb08bef1 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -342,7 +342,9 @@ MYSQL_CHECK_SSL()
|
||||||
|
MYSQL_CHECK_READLINE()
|
||||||
|
|
||||||
|
SET(MALLOC_LIBRARY "system")
|
||||||
|
-SET(PYTHON_SHEBANG "/usr/bin/env python" CACHE STRING "python shebang")
|
||||||
|
+IF(NOT DEFINED PYTHON_SHEBANG)
|
||||||
|
+ SET(PYTHON_SHEBANG "/usr/bin/env python")
|
||||||
|
+ENDIF()
|
||||||
|
MARK_AS_ADVANCED(PYTHON_SHEBANG)
|
||||||
|
|
||||||
|
CHECK_PCRE()
|
@ -4,11 +4,11 @@ Maintainer's note:
|
|||||||
This script is not python3 compatible:
|
This script is not python3 compatible:
|
||||||
ModuleNotFoundError: No module named 'commands'
|
ModuleNotFoundError: No module named 'commands'
|
||||||
|
|
||||||
diff -Naurp mariadb-10.3.10/storage/rocksdb/myrocks_hotbackup mariadb-10.3.10/storage/rocksdb/myrocks_hotbackup_patched
|
diff -Naurp mariadb-10.3.12/storage/rocksdb/myrocks_hotbackup.py mariadb-10.3.12/storage/rocksdb/myrocks_hotbackup.py_patched
|
||||||
--- mariadb-10.3.10/storage/rocksdb/myrocks_hotbackup 2018-10-02 11:45:43.000000000 +0200
|
--- mariadb-10.3.12/storage/rocksdb/myrocks_hotbackup.py 2019-01-04 16:28:50.000000000 +0100
|
||||||
+++ mariadb-10.3.10/storage/rocksdb/myrocks_hotbackup_patched 2018-10-05 14:27:02.960060700 +0200
|
+++ mariadb-10.3.12/storage/rocksdb/myrocks_hotbackup.py_patched 2019-01-08 12:00:54.468750863 +0100
|
||||||
@@ -1,4 +1,4 @@
|
@@ -1,4 +1,4 @@
|
||||||
-#!/usr/bin/env python
|
-#!@PYTHON_SHEBANG@
|
||||||
+#!/usr/bin/python2
|
+#!/usr/bin/python2
|
||||||
|
|
||||||
from __future__ import division
|
from __future__ import division
|
||||||
|
52
mariadb-ssl-cipher-tests.patch
Normal file
52
mariadb-ssl-cipher-tests.patch
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
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.9/mysql-test/main/ssl_cipher.test.fixtest 2019-01-27 19:39:19.610027153 +0100
|
||||||
|
+++ mariadb-10.3.9/mysql-test/main/ssl_cipher.test 2019-01-27 19:42:10.045430776 +0100
|
||||||
|
@@ -13,7 +13,9 @@
|
||||||
|
connect (ssl_con,localhost,root,,,,,SSL);
|
||||||
|
|
||||||
|
# Check Cipher Name and Cipher List
|
||||||
|
+--replace_regex /TLS_AES_.*/AES128-SHA/
|
||||||
|
SHOW STATUS LIKE 'Ssl_cipher';
|
||||||
|
+--replace_regex /TLS_AES_.*/AES128-SHA/
|
||||||
|
SHOW STATUS LIKE 'Ssl_cipher_list';
|
||||||
|
|
||||||
|
connection default;
|
||||||
|
diff -up mariadb-10.3.9/mysql-test/main/ssl.result.fixtestssl mariadb-10.3.9/mysql-test/main/ssl.result
|
||||||
|
--- mariadb-10.3.9/mysql-test/main/ssl.result.fixtestssl 2019-01-27 20:41:52.605213547 +0100
|
||||||
|
+++ mariadb-10.3.9/mysql-test/main/ssl.result 2019-01-27 20:42:03.977320005 +0100
|
||||||
|
@@ -2176,7 +2176,7 @@ still connected?
|
||||||
|
connection default;
|
||||||
|
disconnect ssl_con;
|
||||||
|
create user mysqltest_1@localhost;
|
||||||
|
-grant usage on mysqltest.* to mysqltest_1@localhost require cipher "AES256-SHA";
|
||||||
|
+grant usage on mysqltest.* to mysqltest_1@localhost require cipher "TLS_AES_256_GCM_SHA384";
|
||||||
|
Variable_name Value
|
||||||
|
-Ssl_cipher AES256-SHA
|
||||||
|
+Ssl_cipher TLS_AES_256_GCM_SHA384
|
||||||
|
drop user mysqltest_1@localhost;
|
||||||
|
diff -up mariadb-10.3.9/mysql-test/main/ssl.test.fixtestssl mariadb-10.3.9/mysql-test/main/ssl.test
|
||||||
|
--- mariadb-10.3.9/mysql-test/main/ssl.test.fixtestssl 2019-01-27 20:40:39.756531579 +0100
|
||||||
|
+++ mariadb-10.3.9/mysql-test/main/ssl.test 2019-01-27 20:41:02.631745724 +0100
|
||||||
|
@@ -33,8 +33,8 @@ connection default;
|
||||||
|
disconnect ssl_con;
|
||||||
|
|
||||||
|
create user mysqltest_1@localhost;
|
||||||
|
-grant usage on mysqltest.* to mysqltest_1@localhost require cipher "AES256-SHA";
|
||||||
|
---exec $MYSQL -umysqltest_1 --ssl-cipher=AES256-SHA -e "show status like 'ssl_cipher'" 2>&1
|
||||||
|
+grant usage on mysqltest.* to mysqltest_1@localhost require cipher "TLS_AES_256_GCM_SHA384";
|
||||||
|
+--exec $MYSQL -umysqltest_1 --ssl-cipher=TLS_AES_256_GCM_SHA384 -e "show status like 'ssl_cipher'" 2>&1
|
||||||
|
drop user mysqltest_1@localhost;
|
||||||
|
|
||||||
|
# Wait till all disconnects are completed
|
||||||
|
diff -up mariadb-10.3.9/mysql-test/main/ssl_cert_verify.test.fixcerttest mariadb-10.3.9/mysql-test/main/ssl_cert_verify.test
|
||||||
|
--- mariadb-10.3.9/mysql-test/main/ssl_cert_verify.test.fixcerttest 2019-01-27 21:11:12.280726041 +0100
|
||||||
|
+++ mariadb-10.3.9/mysql-test/main/ssl_cert_verify.test 2019-01-27 21:10:01.034041434 +0100
|
||||||
|
@@ -30,7 +30,7 @@ let $ssl_verify_pass_path = --ssl --ssl-
|
||||||
|
--enable_reconnect
|
||||||
|
--source include/wait_until_connected_again.inc
|
||||||
|
|
||||||
|
---replace_result TLSv1.2 TLS_VERSION TLSv1.1 TLS_VERSION TLSv1 TLS_VERSION
|
||||||
|
+--replace_result TLSv1.3 TLS_VERSION TLSv1.2 TLS_VERSION TLSv1.1 TLS_VERSION TLSv1 TLS_VERSION
|
||||||
|
--exec $MYSQL --protocol=tcp --ssl-ca=$MYSQL_TEST_DIR/std_data/ca-cert-verify.pem --ssl-verify-server-cert -e "SHOW STATUS like 'Ssl_version'"
|
||||||
|
|
||||||
|
--echo # restart server using restart
|
173
mariadb.spec
173
mariadb.spec
@ -8,6 +8,16 @@
|
|||||||
# Set this to 1 to see which tests fail, but 0 on production ready build
|
# Set this to 1 to see which tests fail, but 0 on production ready build
|
||||||
%global ignore_testsuite_result 1
|
%global ignore_testsuite_result 1
|
||||||
|
|
||||||
|
# The last version on which the full testsuite has been run
|
||||||
|
# In case of further rebuilds of that version, don't require full testsuite to be run
|
||||||
|
# run only "main" suite
|
||||||
|
%global last_tested_version 10.4.2
|
||||||
|
# Set to 1 to force run the testsuite even if it was already tested in current version
|
||||||
|
%global force_run_testsuite 0
|
||||||
|
|
||||||
|
# Aditional SELinux rules
|
||||||
|
%global require_mysql_selinux 0
|
||||||
|
|
||||||
# In f20+ use unversioned docdirs, otherwise the old versioned one
|
# In f20+ use unversioned docdirs, otherwise the old versioned one
|
||||||
%global _pkgdocdirname %{pkg_name}%{!?_pkgdocdir:-%{version}}
|
%global _pkgdocdirname %{pkg_name}%{!?_pkgdocdir:-%{version}}
|
||||||
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{pkg_name}-%{version}}
|
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{pkg_name}-%{version}}
|
||||||
@ -109,9 +119,15 @@
|
|||||||
%global pcre_bundled_version 8.42
|
%global pcre_bundled_version 8.42
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
# Use main python interpretter version
|
||||||
|
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||||
|
%global python_path /usr/bin/python3
|
||||||
|
%else
|
||||||
|
%global python_path /usr/bin/python2
|
||||||
|
%endif
|
||||||
|
|
||||||
# Include systemd files
|
# Include systemd files
|
||||||
%global daemon_name %{name}
|
%global daemon_name %{name}
|
||||||
%global daemondir %{_unitdir}
|
|
||||||
%global daemon_no_prefix %{pkg_name}
|
%global daemon_no_prefix %{pkg_name}
|
||||||
%global mysqld_pid_dir mariadb
|
%global mysqld_pid_dir mariadb
|
||||||
|
|
||||||
@ -142,7 +158,7 @@
|
|||||||
%global sameevr %{epoch}:%{version}-%{release}
|
%global sameevr %{epoch}:%{version}-%{release}
|
||||||
|
|
||||||
Name: mariadb
|
Name: mariadb
|
||||||
Version: 10.4.1
|
Version: 10.4.2
|
||||||
Release: 1.beta%{?with_debug:.debug}%{?dist}
|
Release: 1.beta%{?with_debug:.debug}%{?dist}
|
||||||
Epoch: 3
|
Epoch: 3
|
||||||
|
|
||||||
@ -176,8 +192,8 @@ Source71: LICENSE.clustercheck
|
|||||||
# https://jira.mariadb.org/browse/MDEV-12646
|
# https://jira.mariadb.org/browse/MDEV-12646
|
||||||
Source72: mariadb-server-galera.te
|
Source72: mariadb-server-galera.te
|
||||||
|
|
||||||
# Patch1: Fix python shebang to specificaly say the python version
|
# Patch2: Make the python interpretter be configurable
|
||||||
Patch1: %{pkgnamepatch}-shebang.patch
|
Patch2: %{pkgnamepatch}-pythonver.patch
|
||||||
# Patch4: Red Hat distributions specific logrotate fix
|
# Patch4: Red Hat distributions specific logrotate fix
|
||||||
# it would be big unexpected change, if we start shipping it now. Better wait for MariaDB 10.2
|
# it would be big unexpected change, if we start shipping it now. Better wait for MariaDB 10.2
|
||||||
Patch4: %{pkgnamepatch}-logrotate.patch
|
Patch4: %{pkgnamepatch}-logrotate.patch
|
||||||
@ -185,6 +201,8 @@ Patch4: %{pkgnamepatch}-logrotate.patch
|
|||||||
Patch7: %{pkgnamepatch}-scripts.patch
|
Patch7: %{pkgnamepatch}-scripts.patch
|
||||||
# Patch9: pre-configure to comply with guidelines
|
# Patch9: pre-configure to comply with guidelines
|
||||||
Patch9: %{pkgnamepatch}-ownsetup.patch
|
Patch9: %{pkgnamepatch}-ownsetup.patch
|
||||||
|
# Patch10: Fix cipher name in the SSL Cipher name test
|
||||||
|
Patch10: %{pkgnamepatch}-ssl-cipher-tests.patch
|
||||||
|
|
||||||
BuildRequires: cmake gcc-c++
|
BuildRequires: cmake gcc-c++
|
||||||
BuildRequires: multilib-rpm-config
|
BuildRequires: multilib-rpm-config
|
||||||
@ -387,10 +405,14 @@ Requires: %{name}-common%{?_isa} = %{sameevr}
|
|||||||
Requires: %{name}-errmsg%{?_isa} = %{sameevr}
|
Requires: %{name}-errmsg%{?_isa} = %{sameevr}
|
||||||
Recommends: %{name}-server-utils%{?_isa} = %{sameevr}
|
Recommends: %{name}-server-utils%{?_isa} = %{sameevr}
|
||||||
Recommends: %{name}-backup%{?_isa} = %{sameevr}
|
Recommends: %{name}-backup%{?_isa} = %{sameevr}
|
||||||
%{?with_cracklib:Recommends: %{name}-cracklib-password-check%{?_isa} = %{sameevr}}
|
%{?with_cracklib:Recommends: %{name}-cracklib-password-check%{?_isa} = %{sameevr}}
|
||||||
%{?with_gssapi:Recommends: %{name}-gssapi-server%{?_isa} = %{sameevr}}
|
%{?with_gssapi:Recommends: %{name}-gssapi-server%{?_isa} = %{sameevr}}
|
||||||
%{?with_rocksdb:Recommends: %{name}-rocksdb-engine%{?_isa} = %{sameevr}}
|
%{?with_rocksdb:Suggests: %{name}-rocksdb-engine%{?_isa} = %{sameevr}}
|
||||||
%{?with_tokudb:Recommends: %{name}-tokudb-engine%{?_isa} = %{sameevr}}
|
%{?with_tokudb:Suggests: %{name}-tokudb-engine%{?_isa} = %{sameevr}}
|
||||||
|
%{?with_sphinx:Suggests: %{name}-sphinx-engine%{?_isa} = %{sameevr}}
|
||||||
|
%{?with_oqgraph:Suggests: %{name}-oqgraph-engine%{?_isa} = %{sameevr}}
|
||||||
|
%{?with_connect:Suggests: %{name}-connect-engine%{?_isa} = %{sameevr}}
|
||||||
|
%{?with_cassandra:Suggests: %{name}-cassandra-engine%{?_isa} = %{sameevr}}
|
||||||
|
|
||||||
Suggests: mytop
|
Suggests: mytop
|
||||||
Suggests: logrotate
|
Suggests: logrotate
|
||||||
@ -398,6 +420,12 @@ Suggests: logrotate
|
|||||||
Requires: %{_sysconfdir}/my.cnf
|
Requires: %{_sysconfdir}/my.cnf
|
||||||
Requires: %{_sysconfdir}/my.cnf.d
|
Requires: %{_sysconfdir}/my.cnf.d
|
||||||
|
|
||||||
|
# Aditional SELinux rules (common for MariaDB & MySQL) shipped in a separate package
|
||||||
|
# For cases, where we want to fix a SELinux issues in MariaDB sooner than patched selinux-policy-targeted package is released
|
||||||
|
%if %require_mysql_selinux
|
||||||
|
Requires: (mysql-selinux if selinux-policy-targeted)
|
||||||
|
%endif
|
||||||
|
|
||||||
# for fuser in mysql-check-socket
|
# for fuser in mysql-check-socket
|
||||||
Requires: psmisc
|
Requires: psmisc
|
||||||
|
|
||||||
@ -676,10 +704,11 @@ sources.
|
|||||||
# Remove JAR files that upstream puts into tarball
|
# Remove JAR files that upstream puts into tarball
|
||||||
find . -name "*.jar" -type f -exec rm --verbose -f {} \;
|
find . -name "*.jar" -type f -exec rm --verbose -f {} \;
|
||||||
|
|
||||||
%patch1 -p1
|
%patch2 -p1
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
%patch7 -p1
|
%patch7 -p1
|
||||||
%patch9 -p1
|
%patch9 -p1
|
||||||
|
#%patch10 -p1
|
||||||
|
|
||||||
# workaround for upstream bug #56342
|
# workaround for upstream bug #56342
|
||||||
#rm mysql-test/t/ssl_8k_key-master.opt
|
#rm mysql-test/t/ssl_8k_key-master.opt
|
||||||
@ -755,10 +784,6 @@ rm -r storage/tokudb/mysql-test/tokudb/t/*.py
|
|||||||
CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
|
CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
|
||||||
# force PIC mode so that we can build libmysqld.so
|
# force PIC mode so that we can build libmysqld.so
|
||||||
CFLAGS="$CFLAGS -fPIC"
|
CFLAGS="$CFLAGS -fPIC"
|
||||||
# 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
|
|
||||||
# Override all optimization flags when making a debug build
|
# Override all optimization flags when making a debug build
|
||||||
%{?with_debug: CFLAGS="$CFLAGS -O0 -g"}
|
%{?with_debug: CFLAGS="$CFLAGS -O0 -g"}
|
||||||
|
|
||||||
@ -820,15 +845,16 @@ export CFLAGS CXXFLAGS
|
|||||||
-DPLUGIN_TOKUDB=%{?with_tokudb:DYNAMIC}%{!?with_tokudb:NO} \
|
-DPLUGIN_TOKUDB=%{?with_tokudb:DYNAMIC}%{!?with_tokudb:NO} \
|
||||||
-DPLUGIN_CONNECT=%{?with_connect:DYNAMIC}%{!?with_connect:NO} \
|
-DPLUGIN_CONNECT=%{?with_connect:DYNAMIC}%{!?with_connect:NO} \
|
||||||
-DWITH_CASSANDRA=%{?with_cassandra:TRUE}%{!?with_cassandra:FALSE} \
|
-DWITH_CASSANDRA=%{?with_cassandra:TRUE}%{!?with_cassandra:FALSE} \
|
||||||
-DPLUGIN_AWS_KEY_MANAGEMENT=NO \
|
-DPYTHON_SHEBANG=%{python_path} \
|
||||||
-DPLUGIN_CACHING_SHA2_PASSWORD=%{?with_clibrary:DYNAMIC}%{!?with_clibrary:OFF} \
|
-DPLUGIN_CACHING_SHA2_PASSWORD=%{?with_clibrary:DYNAMIC}%{!?with_clibrary:OFF} \
|
||||||
|
-DPLUGIN_AWS_KEY_MANAGEMENT=NO \
|
||||||
-DCONNECT_WITH_MONGO=OFF \
|
-DCONNECT_WITH_MONGO=OFF \
|
||||||
-DCONNECT_WITH_JDBC=OFF \
|
-DCONNECT_WITH_JDBC=OFF \
|
||||||
%{?with_debug: -DCMAKE_BUILD_TYPE=Debug -DWITH_ASAN=OFF -DWITH_INNODB_EXTRA_DEBUG=ON -DWITH_VALGRIND=ON}
|
%{?with_debug: -DCMAKE_BUILD_TYPE=Debug -DWITH_ASAN=OFF -DWITH_INNODB_EXTRA_DEBUG=ON -DWITH_VALGRIND=ON}
|
||||||
|
|
||||||
# Print all Cmake options values
|
# Print all Cmake options values
|
||||||
# cmake -LAH for List Advanced Help
|
# cmake ./ -LAH for List Advanced Help
|
||||||
cmake -L
|
cmake ./ -L
|
||||||
|
|
||||||
make %{?_smp_mflags} VERBOSE=1
|
make %{?_smp_mflags} VERBOSE=1
|
||||||
|
|
||||||
@ -864,7 +890,8 @@ fi
|
|||||||
# TODO: check, if it changes location inside that file depending on values passed to Cmake
|
# TODO: check, if it changes location inside that file depending on values passed to Cmake
|
||||||
mkdir -p %{buildroot}/%{_libdir}/pkgconfig
|
mkdir -p %{buildroot}/%{_libdir}/pkgconfig
|
||||||
mv %{buildroot}/%{_datadir}/pkgconfig/*.pc %{buildroot}/%{_libdir}/pkgconfig
|
mv %{buildroot}/%{_datadir}/pkgconfig/*.pc %{buildroot}/%{_libdir}/pkgconfig
|
||||||
rm %{buildroot}/usr/lib/pkgconfig/libmariadb.pc
|
# Client part should be included in package 'mariadb-connector-c'
|
||||||
|
rm %{buildroot}%{_libdir}/pkgconfig/libmariadb.pc
|
||||||
|
|
||||||
# install INFO_SRC, INFO_BIN into libdir (upstream thinks these are doc files,
|
# install INFO_SRC, INFO_BIN into libdir (upstream thinks these are doc files,
|
||||||
# but that's pretty wacko --- see also %%{name}-file-contents.patch)
|
# but that's pretty wacko --- see also %%{name}-file-contents.patch)
|
||||||
@ -982,7 +1009,7 @@ rm -r %{buildroot}%{_datadir}/%{pkg_name}/policy/apparmor
|
|||||||
chmod -x %{buildroot}%{_datadir}/sql-bench/myisam.cnf
|
chmod -x %{buildroot}%{_datadir}/sql-bench/myisam.cnf
|
||||||
|
|
||||||
# Disable plugins
|
# Disable plugins
|
||||||
%if %{with ggsapi}
|
%if %{with gssapi}
|
||||||
sed -i 's/^plugin-load-add/#plugin-load-add/' %{buildroot}%{_sysconfdir}/my.cnf.d/auth_gssapi.cnf
|
sed -i 's/^plugin-load-add/#plugin-load-add/' %{buildroot}%{_sysconfdir}/my.cnf.d/auth_gssapi.cnf
|
||||||
%endif
|
%endif
|
||||||
%if %{with cracklib}
|
%if %{with cracklib}
|
||||||
@ -1047,10 +1074,9 @@ rm %{buildroot}%{_mandir}/man1/tokuftdump.1*
|
|||||||
rm %{buildroot}%{_mandir}/man1/tokuft_logprint.1*
|
rm %{buildroot}%{_mandir}/man1/tokuft_logprint.1*
|
||||||
%else
|
%else
|
||||||
%if 0%{?fedora} >= 28 || 0%{?rhel} > 7
|
%if 0%{?fedora} >= 28 || 0%{?rhel} > 7
|
||||||
echo 'Environment="LD_PRELOAD=%{_libdir}/libjemalloc.so.2"' >> %{buildroot}%{_sysconfdir}/systemd/system/mariadb.service.d/tokudb.conf
|
mkdir -p %{buildroot}%{_unitdir}/mariadb.service.d
|
||||||
|
echo -e '[Service]\nEnvironment="LD_PRELOAD=%{_libdir}/libjemalloc.so.2"' >> %{buildroot}%{_unitdir}/mariadb.service.d/tokudb.conf
|
||||||
%endif
|
%endif
|
||||||
# Move to better location, systemd config files has to be in /lib/
|
|
||||||
mv %{buildroot}%{_sysconfdir}/systemd/system/mariadb.service.d %{buildroot}/usr/lib/systemd/system/
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{without config}
|
%if %{without config}
|
||||||
@ -1125,28 +1151,35 @@ export MTR_BUILD_THREAD=%{__isa_bits}
|
|||||||
|
|
||||||
(
|
(
|
||||||
set -ex
|
set -ex
|
||||||
|
|
||||||
cd mysql-test
|
cd mysql-test
|
||||||
perl ./mysql-test-run.pl --parallel=auto --force --retry=1 --ssl \
|
|
||||||
--suite-timeout=900 --testcase-timeout=30 \
|
|
||||||
--mysqld=--binlog-format=mixed --force-restart \
|
|
||||||
--shutdown-timeout=60 --max-test-fail=5 --big-test \
|
|
||||||
--skip-test=spider \
|
|
||||||
%if %{ignore_testsuite_result}
|
|
||||||
--max-test-fail=9999 || :
|
|
||||||
%else
|
|
||||||
--skip-test-list=unstable-tests
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# Second run for the SPIDER suites that fail with SCA (ssl self signed certificate)
|
export common_testsuite_arguments=" --parallel=auto --force --retry=1 --suite-timeout=900 --testcase-timeout=30 --mysqld=--binlog-format=mixed --force-restart --shutdown-timeout=60 --max-test-fail=5 "
|
||||||
perl ./mysql-test-run.pl --parallel=auto --force --retry=1 \
|
|
||||||
--suite-timeout=60 --testcase-timeout=10 \
|
# If full testsuite has already been run on this version and we don't explicitly want the full testsuite to be run
|
||||||
--mysqld=--binlog-format=mixed --force-restart \
|
if [[ "%{last_tested_version}" == "%{version}" ]] && [[ %{force_run_testsuite} -eq 0 ]]
|
||||||
--shutdown-timeout=60 --max-test-fail=0 --big-test \
|
then
|
||||||
--skip-ssl --suite=spider,spider/bg \
|
# in further rebuilds only run the basic "main" suite (~800 tests)
|
||||||
%if %{ignore_testsuite_result}
|
echo "running only base testsuite"
|
||||||
--max-test-fail=999 || :
|
perl ./mysql-test-run.pl $common_testsuite_arguments --ssl --suite=main --mem --skip-test-list=unstable-tests
|
||||||
%endif
|
fi
|
||||||
|
|
||||||
|
# If either this version wasn't marked as tested yet or I explicitly want to run the testsuite, run everything we have (~4000 test)
|
||||||
|
if [[ "%{last_tested_version}" != "%{version}" ]] || [[ %{force_run_testsuite} -ne 0 ]]
|
||||||
|
then
|
||||||
|
echo "running advanced testsuite"
|
||||||
|
perl ./mysql-test-run.pl $common_testsuite_arguments --ssl --big-test --skip-test=spider \
|
||||||
|
%if %{ignore_testsuite_result}
|
||||||
|
--max-test-fail=9999 || :
|
||||||
|
%else
|
||||||
|
--skip-test-list=unstable-tests
|
||||||
|
%endif
|
||||||
|
# Second run for the SPIDER suites that fail with SCA (ssl self signed certificate)
|
||||||
|
perl ./mysql-test-run.pl $common_testsuite_arguments --skip-ssl --big-test --mem --suite=spider,spider/bg \
|
||||||
|
%if %{ignore_testsuite_result}
|
||||||
|
--max-test-fail=999 || :
|
||||||
|
%endif
|
||||||
|
# blank line
|
||||||
|
fi
|
||||||
)
|
)
|
||||||
|
|
||||||
%endif # if dry run
|
%endif # if dry run
|
||||||
@ -1340,7 +1373,7 @@ fi
|
|||||||
%{?with_cracklib:%exclude %{_libdir}/%{pkg_name}/plugin/cracklib_password_check.so}
|
%{?with_cracklib:%exclude %{_libdir}/%{pkg_name}/plugin/cracklib_password_check.so}
|
||||||
%{?with_rocksdb:%exclude %{_libdir}/%{pkg_name}/plugin/ha_rocksdb.so}
|
%{?with_rocksdb:%exclude %{_libdir}/%{pkg_name}/plugin/ha_rocksdb.so}
|
||||||
%{?with_tokudb:%exclude %{_libdir}/%{pkg_name}/plugin/ha_tokudb.so}
|
%{?with_tokudb:%exclude %{_libdir}/%{pkg_name}/plugin/ha_tokudb.so}
|
||||||
%{?with_ggsapi:%exclude %{_libdir}/%{pkg_name}/plugin/auth_gssapi.so}
|
%{?with_gssapi:%exclude %{_libdir}/%{pkg_name}/plugin/auth_gssapi.so}
|
||||||
%{?with_sphinx:%exclude %{_libdir}/%{pkg_name}/plugin/ha_sphinx.so}
|
%{?with_sphinx:%exclude %{_libdir}/%{pkg_name}/plugin/ha_sphinx.so}
|
||||||
%{?with_cassandra:%exclude %{_libdir}/%{pkg_name}/plugin/ha_cassandra.so}
|
%{?with_cassandra:%exclude %{_libdir}/%{pkg_name}/plugin/ha_cassandra.so}
|
||||||
%if %{with clibrary}
|
%if %{with clibrary}
|
||||||
@ -1407,7 +1440,9 @@ fi
|
|||||||
%{_datadir}/%{pkg_name}/systemd/mariadb@.service
|
%{_datadir}/%{pkg_name}/systemd/mariadb@.service
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%{daemondir}/%{daemon_name}*
|
%{_unitdir}/%{daemon_name}*
|
||||||
|
%{?with_tokudb:%exclude %{_unitdir}/mariadb.service.d/tokudb.conf}
|
||||||
|
|
||||||
%{_libexecdir}/mysql-prepare-db-dir
|
%{_libexecdir}/mysql-prepare-db-dir
|
||||||
%{_libexecdir}/mysql-check-socket
|
%{_libexecdir}/mysql-check-socket
|
||||||
%{_libexecdir}/mysql-check-upgrade
|
%{_libexecdir}/mysql-check-upgrade
|
||||||
@ -1456,7 +1491,7 @@ fi
|
|||||||
%{_mandir}/man1/tokuft_logprint.1*
|
%{_mandir}/man1/tokuft_logprint.1*
|
||||||
%config(noreplace) %{_sysconfdir}/my.cnf.d/tokudb.cnf
|
%config(noreplace) %{_sysconfdir}/my.cnf.d/tokudb.cnf
|
||||||
%{_libdir}/%{pkg_name}/plugin/ha_tokudb.so
|
%{_libdir}/%{pkg_name}/plugin/ha_tokudb.so
|
||||||
/usr/lib/systemd/system/mariadb.service.d/tokudb.conf
|
%{_unitdir}/mariadb.service.d/tokudb.conf
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{with gssapi}
|
%if %{with gssapi}
|
||||||
@ -1563,10 +1598,60 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Feb 18 2019 Michal Schorm <mschorm@redhat.com> - 3:10.4.2-1
|
||||||
|
- Rebase to 10.4.2
|
||||||
|
- This is BETA release! use at your own risk.
|
||||||
|
|
||||||
|
* Mon Feb 11 2019 Michal Schorm <mschorm@redhat.com> - 3:10.3.12-10
|
||||||
|
- Disable the requirement of mysql-selinux, until its bug is solved for good; #1665643
|
||||||
|
|
||||||
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3:10.3.12-9
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jan 30 2019 Honza Horak <hhorak@redhat.com> - 3:10.3.12-8
|
||||||
|
- Fix several SSL tests that failed because of different SSL cipher expectation
|
||||||
|
|
||||||
|
* Wed Jan 23 2019 Michal Schorm <mschorm@redhat.com> - 3:10.3.12-7
|
||||||
|
- Fix TokuDB Jemalloc ld_preload
|
||||||
|
Resolves: #1668375
|
||||||
|
- Tweak macros usage
|
||||||
|
|
||||||
|
* Sat Jan 19 2019 Michal Schorm <mschorm@redhat.com> - 3:10.3.12-6
|
||||||
|
- Enable mysql-selinux requirement
|
||||||
|
- Tweak the testsuite execution, speed up the testsuite on rebuilds
|
||||||
|
- Change weak dependency of RocksDB and TokuDB storage engines
|
||||||
|
from Recommends to Suggests
|
||||||
|
- Add "Suggests" weak dependencies to more storage engines
|
||||||
|
|
||||||
|
* Wed Jan 16 2019 Michal Schorm <mschorm@redhat.com> - 3:10.3.12-5
|
||||||
|
- Tweak handling of the mysql-selinux requirement, leave disabled due to #1665643
|
||||||
|
|
||||||
|
* Mon Jan 14 2019 Björn Esser <besser82@fedoraproject.org> - 3:10.3.12-4
|
||||||
|
- Rebuilt for libcrypt.so.2 (#1666033)
|
||||||
|
|
||||||
|
* Fri Jan 11 2019 Kevin Fenzi <kevin@scrye.com> - 3:10.3.12-3
|
||||||
|
- Drop mysql-selinux recommends for now due to bug #1665643
|
||||||
|
|
||||||
|
* Wed Jan 09 2019 Honza Horak <hhorak@redhat.com> - 3:10.3.12-2
|
||||||
|
- Use specific python shebang
|
||||||
|
|
||||||
|
* Tue Jan 08 2019 Michal Schorm <mschorm@redhat.com> - 3:10.3.12-1
|
||||||
|
- Rebase to 10.3.12
|
||||||
|
- Disable building of the caching_sha2_password plugin, it is shipped
|
||||||
|
by 'mariadb-connector-c'
|
||||||
|
- Remove libmariadb.pc, is it shipped by 'mariadb-connector-c'
|
||||||
|
|
||||||
* Sun Jan 06 2019 Michal Schorm <mschorm@redhat.com> - 3:10.4.1-1
|
* Sun Jan 06 2019 Michal Schorm <mschorm@redhat.com> - 3:10.4.1-1
|
||||||
- Rebase to 10.4.1
|
- Rebase to 10.4.1
|
||||||
- This is BETA release! use at your own risk.
|
- This is BETA release! use at your own risk.
|
||||||
|
|
||||||
|
* Mon Dec 10 2018 Michal Schorm <mschorm@redhat.com> - 3:10.3.11-1
|
||||||
|
- Rebase to 10.3.11
|
||||||
|
- CVEs fixed:
|
||||||
|
CVE-2018-3282, CVE-2016-9843, CVE-2018-3174, CVE-2018-3143, CVE-2018-3156
|
||||||
|
CVE-2018-3251, CVE-2018-3185, CVE-2018-3277, CVE-2018-3162, CVE-2018-3173
|
||||||
|
CVE-2018-3200, CVE-2018-3284
|
||||||
|
|
||||||
* Fri Nov 16 2018 Michal Schorm <mschorm@redhat.com> - 3:10.4.0-1
|
* Fri Nov 16 2018 Michal Schorm <mschorm@redhat.com> - 3:10.4.0-1
|
||||||
- Rebase to 10.4.0
|
- Rebase to 10.4.0
|
||||||
- This is ALPHA release! use at your own risk.
|
- This is ALPHA release! use at your own risk.
|
||||||
|
@ -1,17 +1,10 @@
|
|||||||
# The SSL test are failing correctly. Fro more explanation, see:
|
# 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
|
# 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_7937 : #1399847
|
||||||
|
main.ssl_crl :
|
||||||
main.ssl_crl_clients : #1399847
|
main.ssl_crl_clients : #1399847
|
||||||
main.ssl_cert_verify :
|
|
||||||
|
|
||||||
main.ssl_8k_key :
|
main.ssl_8k_key :
|
||||||
|
|
||||||
# From 10.3.9
|
|
||||||
main.openssl_1 :
|
|
||||||
main.openssl_6975 :
|
|
||||||
main.ssl :
|
|
||||||
main.ssl_cipher :
|
|
||||||
|
|
||||||
#
|
#
|
||||||
perfschema.nesting : #1399847
|
perfschema.nesting : #1399847
|
||||||
perfschema.socket_summary_by_instance_func : #1399847
|
perfschema.socket_summary_by_instance_func : #1399847
|
||||||
@ -60,5 +53,6 @@ parts.partition_alter4_innodb :
|
|||||||
# Fails from 10.3.9
|
# Fails from 10.3.9
|
||||||
encryption.innodb-redo-badkey :
|
encryption.innodb-redo-badkey :
|
||||||
|
|
||||||
# 10.4.0
|
# Fails on 10.4.2
|
||||||
sys_vars.tcp_nodelay :
|
sys_vars.tcp_nodelay :
|
||||||
|
main.func_math :
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (mariadb-10.4.1.tar.gz) = 0422bbc4b3a38ff70bfc1cb61f8cb6582c7410a834a15bc593070aa206ca0103c0e4da04a36d02fcb6c21e3646d7920f6de7095b51a27136a7684d9ed54b5f8d
|
SHA512 (mariadb-10.4.2.tar.gz) = 31fffbc3223e0e52dcce08511904bef6a9d03b734773f46e864d5e8de8ceef352b2d8821614c6cc0ed12cdd0a3c60805c6815dbe7d07b8efec708df68eb05bd3
|
||||||
|
Loading…
Reference in New Issue
Block a user