Accepting request 828938 from home:kstreitova:branches:server:database
- Update to 10.4.14 [bsc#1175596] * release notes and changelog: https://mariadb.com/kb/en/library/mariadb-10414-release-notes https://mariadb.com/kb/en/library/mariadb-10414-changelog * fixes for the following security vulnerabilities: none * the update fixes [bsc#1174559] and [bsc#1173516] (MariaDB crashes at db_sync from Keystone) - refresh mariadb-10.2.4-fortify-and-O.patch - fix patch sequence - run spec-cleaner - build galera for openSUSE only - update suse_skipped_tests.list - tune the testsuite to avoid randomly failing tests OBS-URL: https://build.opensuse.org/request/show/828938 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=258
This commit is contained in:
parent
4d3e511b12
commit
a7015b1d07
@ -9,9 +9,9 @@ Index: CMakeLists.txt
|
||||
===================================================================
|
||||
--- CMakeLists.txt.orig
|
||||
+++ CMakeLists.txt
|
||||
@@ -238,7 +238,6 @@ IF(SECURITY_HARDENED AND NOT WITH_ASAN A
|
||||
@@ -242,7 +242,6 @@ IF(SECURITY_HARDENED AND NOT WITH_ASAN A
|
||||
MY_CHECK_AND_SET_COMPILER_FLAG("-pie -fPIC")
|
||||
MY_CHECK_AND_SET_COMPILER_FLAG("-Wl,-z,relro,-z,now")
|
||||
MY_CHECK_AND_SET_LINKER_FLAG("-Wl,-z,relro,-z,now")
|
||||
MY_CHECK_AND_SET_COMPILER_FLAG("-fstack-protector --param=ssp-buffer-size=4")
|
||||
- MY_CHECK_AND_SET_COMPILER_FLAG("-D_FORTIFY_SOURCE=2" RELEASE RELWITHDEBINFO)
|
||||
ENDIF()
|
||||
@ -33,7 +33,7 @@ Index: storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake
|
||||
)
|
||||
endif ()
|
||||
|
||||
@@ -102,23 +100,23 @@ set_cflags_if_supported(
|
||||
@@ -93,23 +91,23 @@ endif ()
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions")
|
||||
|
||||
## set extra debugging flags and preprocessor definitions
|
||||
@ -65,7 +65,7 @@ Index: storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake
|
||||
else ()
|
||||
if (APPLE)
|
||||
set(FLTO_OPTS "-fwhole-program")
|
||||
@@ -126,10 +124,10 @@ else ()
|
||||
@@ -117,10 +115,10 @@ else ()
|
||||
set(FLTO_OPTS "-fuse-linker-plugin")
|
||||
endif()
|
||||
# we overwrite this because the default passes -DNDEBUG and we don't want that
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:45bbbb12d1de8febd9edf630e940c23cf14efd60570c743b268069516a5d91df
|
||||
size 80608459
|
@ -1,6 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iF0EABECAB0WIQQZk2nlQEvV/H0v5DvLywgqG7lD2wUCXrlggQAKCRDLywgqG7lD
|
||||
25PwAJwIvy0vHelea4DgezeXxfVoYR5vdQCg8HwZZpKXEfC0s4FEjxLSw3cjdsI=
|
||||
=Dl39
|
||||
-----END PGP SIGNATURE-----
|
3
mariadb-10.4.14.tar.gz
Normal file
3
mariadb-10.4.14.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f92fcd59e0122461482f28c67c5ea01c7cf6979494a571db68074396864c86fc
|
||||
size 80789865
|
6
mariadb-10.4.14.tar.gz.sig
Normal file
6
mariadb-10.4.14.tar.gz.sig
Normal file
@ -0,0 +1,6 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iF0EABECAB0WIQQZk2nlQEvV/H0v5DvLywgqG7lD2wUCXy2clQAKCRDLywgqG7lD
|
||||
2+m7AJ9R9x3CftzhU4Pnco28oFMhYpV9IgCg5QWuTZ5EzhSu20eIpo7LO2lxJkU=
|
||||
=WF1y
|
||||
-----END PGP SIGNATURE-----
|
@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 16:43:40 UTC 2020 - Kristyna Streitova <kstreitova@suse.com>
|
||||
|
||||
- Update to 10.4.14 [bsc#1175596]
|
||||
* release notes and changelog:
|
||||
https://mariadb.com/kb/en/library/mariadb-10414-release-notes
|
||||
https://mariadb.com/kb/en/library/mariadb-10414-changelog
|
||||
* fixes for the following security vulnerabilities: none
|
||||
* the update fixes [bsc#1174559] and [bsc#1173516] (MariaDB crashes
|
||||
at db_sync from Keystone)
|
||||
- refresh mariadb-10.2.4-fortify-and-O.patch
|
||||
- fix patch sequence
|
||||
- run spec-cleaner
|
||||
- build galera for openSUSE only
|
||||
- update suse_skipped_tests.list
|
||||
- tune the testsuite to avoid randomly failing tests
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 3 07:49:32 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
|
76
mariadb.spec
76
mariadb.spec
@ -42,6 +42,11 @@
|
||||
%define with_mroonga 0
|
||||
%define with_rocksdb 0
|
||||
%endif
|
||||
%if 0%{?is_opensuse}
|
||||
%define with_galera 1
|
||||
%else
|
||||
%define with_galera 0
|
||||
%endif
|
||||
# Define python interpreter version
|
||||
%if 0%{?suse_version} >= 1500
|
||||
%define python_path %{_bindir}/python3
|
||||
@ -51,7 +56,7 @@
|
||||
# Build with cracklib plugin when cracklib-dict-full >= 2.9.0 is available
|
||||
%define with_cracklib_plugin 0
|
||||
Name: mariadb
|
||||
Version: 10.4.13
|
||||
Version: 10.4.14
|
||||
Release: 0
|
||||
Summary: Server part of MariaDB
|
||||
License: SUSE-GPL-2.0-with-FLOSS-exception
|
||||
@ -73,13 +78,13 @@ Source19: macros.mariadb-test
|
||||
Source50: suse_skipped_tests.list
|
||||
Source51: mariadb-rpmlintrc
|
||||
Patch1: mariadb-10.2.4-logrotate.patch
|
||||
Patch3: mariadb-10.1.1-mysqld_multi-features.patch
|
||||
Patch7: mariadb-10.0.15-logrotate-su.patch
|
||||
Patch8: mariadb-10.2.4-fortify-and-O.patch
|
||||
Patch9: mariadb-10.2.19-link-and-enable-c++11-atomics.patch
|
||||
Patch10: mariadb-10.4.12-harden_setuid.patch
|
||||
Patch11: mariadb-10.4.12-fix-install-db.patch
|
||||
Patch12: mariadb-10.5-fix-prevent-optimizing-out-buf-argument-in-ch.patch
|
||||
Patch2: mariadb-10.1.1-mysqld_multi-features.patch
|
||||
Patch3: mariadb-10.0.15-logrotate-su.patch
|
||||
Patch4: mariadb-10.2.4-fortify-and-O.patch
|
||||
Patch5: mariadb-10.2.19-link-and-enable-c++11-atomics.patch
|
||||
Patch6: mariadb-10.4.12-harden_setuid.patch
|
||||
Patch7: mariadb-10.4.12-fix-install-db.patch
|
||||
Patch8: mariadb-10.5-fix-prevent-optimizing-out-buf-argument-in-ch.patch
|
||||
# needed for bison SQL parser and wsrep API
|
||||
BuildRequires: bison
|
||||
BuildRequires: cmake
|
||||
@ -112,6 +117,8 @@ BuildRequires: procps
|
||||
# Some tests and myrocks_hotbackup script need python3
|
||||
BuildRequires: python3
|
||||
BuildRequires: sqlite
|
||||
BuildRequires: sysuser-shadow
|
||||
BuildRequires: sysuser-tools
|
||||
BuildRequires: tcpd-devel
|
||||
# Tests requires time and ps and some perl modules
|
||||
# Keep in sync with Requires of mysql-testsuite
|
||||
@ -133,11 +140,6 @@ BuildRequires: perl(Test::More)
|
||||
BuildRequires: perl(Time::HiRes)
|
||||
# Do not ever switch away from BuildRequires: pkgconfig(libsystemd); BuildRequires systemd/systemd-devel causes build cycles
|
||||
BuildRequires: pkgconfig(libsystemd)
|
||||
BuildRequires: sysuser-shadow
|
||||
BuildRequires: sysuser-tools
|
||||
# Require mysql user
|
||||
Requires(pre): user(mysql)
|
||||
Requires: user(mysql)
|
||||
#!BuildIgnore: user(mysql)
|
||||
# Required by rcmysql
|
||||
Requires: %{name}-client
|
||||
@ -148,7 +150,10 @@ Requires: /bin/hostname
|
||||
Requires: perl-base
|
||||
# myrocks_hotbackup needs MySQLdb - if we want to use it under python3, we need python3-mysqlclient
|
||||
Requires: python3-mysqlclient
|
||||
Requires: user(mysql)
|
||||
Requires(post): permissions
|
||||
# Require mysql user
|
||||
Requires(pre): user(mysql)
|
||||
Recommends: logrotate
|
||||
Conflicts: mariadb-server
|
||||
Conflicts: mysql
|
||||
@ -243,6 +248,7 @@ Obsoletes: mysql-client < %{version}
|
||||
%description client
|
||||
This package contains the standard clients for MariaDB.
|
||||
|
||||
%if 0%{with_galera} > 0
|
||||
%package galera
|
||||
Summary: The configuration files and scripts for galera replication
|
||||
Group: Productivity/Databases/Tools
|
||||
@ -264,6 +270,7 @@ Conflicts: mariadb-tools <= 10.1.25
|
||||
%description galera
|
||||
This package contains configuration files and scripts that are
|
||||
needed for running MariaDB Galera Cluster.
|
||||
%endif
|
||||
|
||||
%package errormessages
|
||||
Summary: The error messages files required by server, client and libmariadbd
|
||||
@ -360,13 +367,13 @@ PAM module.
|
||||
# Remove JAR files from the tarball (used for testing from the source)
|
||||
find . -name "*.jar" -type f -exec rm --verbose -f {} \;
|
||||
%patch1
|
||||
%patch2
|
||||
%patch3
|
||||
%patch7
|
||||
%patch8
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
%patch11 -p1
|
||||
%patch12 -p1
|
||||
%patch4
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
|
||||
cp %{_sourcedir}/suse-test-run .
|
||||
|
||||
@ -449,8 +456,10 @@ export CXXFLAGS="$CFLAGS -felide-constructors"
|
||||
-DWITH_HANDLERSOCKET_STORAGE_ENGINE=1 \
|
||||
-DWITH_INNODB_MEMCACHED=ON \
|
||||
-DWITH_EMBEDDED_SERVER=true \
|
||||
%if 0%{with_galera} > 0
|
||||
-DWITH_WSREP=ON \
|
||||
-DWITH_INNODB_DISALLOW_WRITES=1 \
|
||||
%endif
|
||||
-DWITH_LIBARCHIVE=ON \
|
||||
-DWITH_MARIABACKUP=ON \
|
||||
-DCOMPILATION_COMMENT="MariaDB package" \
|
||||
@ -470,7 +479,7 @@ export CXXFLAGS="$CFLAGS -felide-constructors"
|
||||
-DCMAKE_SKIP_RPATH=OFF \
|
||||
-DCMAKE_SKIP_INSTALL_RPATH=ON \
|
||||
-Wno-dev "$@" ..
|
||||
make %{?_smp_mflags}
|
||||
%make_build
|
||||
nm --numeric-sort sql/mysqld > sql/mysqld.sym
|
||||
cd ..
|
||||
%sysusers_generate_pre %{SOURCE12} mysql
|
||||
@ -582,8 +591,10 @@ if [ -f scripts/mysqlaccess.conf ] ; then
|
||||
echo '%config(noreplace) %attr(0640, root, mysql) %{_sysconfdir}/mysqlaccess.conf' >> mariadb-client.files
|
||||
fi
|
||||
|
||||
%if 0%{with_galera} > 0
|
||||
# mariadb-galera.files
|
||||
filelist galera_new_cluster galera_recovery wsrep_sst_common wsrep_sst_mariabackup wsrep_sst_mysqldump wsrep_sst_rsync wsrep_sst_rsync_wan >mariadb-galera.files
|
||||
%endif
|
||||
|
||||
# mariadb-bench.files
|
||||
filelist mysqlslap mariadb-slap >mariadb-bench.files
|
||||
@ -668,9 +679,11 @@ ln -s mysqlcheck '%{buildroot}'%{_bindir}/mysqloptimize
|
||||
rm -rf '%{buildroot}'%{_sysconfdir}/my.cnf.d
|
||||
install -d -m 755 '%{buildroot}'%{_sysconfdir}/my.cnf.d
|
||||
|
||||
%if 0%{with_galera} > 0
|
||||
# Install galera config file and script
|
||||
install -p -m 644 build/support-files/wsrep.cnf %{buildroot}%{_sysconfdir}/my.cnf.d/50-galera.cnf
|
||||
install -p -m 755 build/scripts/galera_new_cluster %{buildroot}%{_bindir}/galera_new_cluster
|
||||
%endif
|
||||
|
||||
# Documentation that was copied to wrong folder
|
||||
rm -f '%{buildroot}'%{_datadir}/doc/* 2> /dev/null || true
|
||||
@ -700,16 +713,16 @@ cd build
|
||||
%if 0%{run_testsuite} > 0
|
||||
cd mysql-test
|
||||
./mysql-test-run.pl \
|
||||
--parallel=%{?jobs:%{jobs}} \
|
||||
--force \
|
||||
--retry=0 \
|
||||
--ssl \
|
||||
--suite-timeout=720 \
|
||||
--testcase-timeout=30 \
|
||||
--mysqld=--binlog-format=mixed \
|
||||
--force-restart \
|
||||
--shutdown-timeout=60 \
|
||||
--max-test-fail=0 \
|
||||
--parallel=%{?jobs:%{jobs}} \
|
||||
--force \
|
||||
--retry=3 \
|
||||
--ssl \
|
||||
--suite-timeout=900 \
|
||||
--testcase-timeout=30 \
|
||||
--mysqld=--binlog-format=mixed \
|
||||
--force-restart \
|
||||
--shutdown-timeout=60 \
|
||||
--max-test-fail=0 \
|
||||
%if 0%{ignore_testsuite_result} > 0
|
||||
|| :
|
||||
%else
|
||||
@ -719,7 +732,6 @@ cd mysql-test
|
||||
|
||||
# client does not require server and needs the user too
|
||||
%pre client -f mysql.pre
|
||||
|
||||
%pre
|
||||
%service_add_pre mariadb.service
|
||||
|
||||
@ -880,11 +892,13 @@ exit 0
|
||||
%{_libdir}/mysql/plugin/dialog_examples.so
|
||||
%{_sysusersdir}/mysql-user.conf
|
||||
|
||||
%if 0%{with_galera} > 0
|
||||
%files galera -f mariadb-galera.files
|
||||
%doc Docs/README.wsrep
|
||||
%config(noreplace) %{_sysconfdir}/my.cnf.d/50-galera.cnf
|
||||
%{_datadir}/mysql/systemd/use_galera_new_cluster.conf
|
||||
%{_datadir}/mysql/wsrep_notify
|
||||
%endif
|
||||
|
||||
%files errormessages -f mariadb-errormessages.files
|
||||
%{_datadir}/%{name}/*/errmsg.sys
|
||||
|
@ -45,15 +45,5 @@ main.gis_notembedded : since 10.4.10 - all
|
||||
funcs_1.is_columns_mysql : since 10.4.10 - all
|
||||
sys_vars.tcp_nodelay : since 10.4.10 - all
|
||||
oqgraph.social : since 10.4.12 - i586 (MDEV-22280)
|
||||
sys_vars.have_rtree_keys_basic : since 10.4.13 - x86_64
|
||||
main.func_int : since 10.4.13 - i586
|
||||
perfschema.dml_tlws_by_table : since 10.4.13 - x86_64
|
||||
sys_vars.aria_used_for_temp_tables_basic : since 10.4.13 - ppc64
|
||||
main.subselect_no_opts : since 10.4.13 - aarch64
|
||||
igcol.main_mysqldump : since 10.4.13 - aarch64
|
||||
main.timezone_grant : since 10.4.13 - ppc64
|
||||
perfschema.ddl_setup_consumers : since 10.4.13 - i586
|
||||
main.subselect_sj_nonmerged : since 10.4.13 - i586
|
||||
sys_vars.innodb_encryption_rotation_iops_basic : since 10.4.13 - i586
|
||||
main.symlink-myisam-11902 : since 10.4.13 - i586
|
||||
sys_vars.innodb_fast_shutdown_basic : since 10.4.13 - i586
|
||||
main.ssl_system_ca : since 10.4.14 - all
|
||||
|
Loading…
Reference in New Issue
Block a user