diff --git a/.gitignore b/.gitignore index a0ad606..47349ad 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/mariadb-10.3.28.tar.gz +SOURCES/mariadb-10.3.32.tar.gz diff --git a/.rh-mariadb103-mariadb.metadata b/.rh-mariadb103-mariadb.metadata index 813d9bf..0a968da 100644 --- a/.rh-mariadb103-mariadb.metadata +++ b/.rh-mariadb103-mariadb.metadata @@ -1 +1 @@ -eaf7fbf7878103601f3bbecbdbfc25ffb39e65f1 SOURCES/mariadb-10.3.28.tar.gz +ad2b6d16fcbcdc3e0a131e75efe72ec695054be3 SOURCES/mariadb-10.3.32.tar.gz diff --git a/SOURCES/mariadb-logrotate.patch b/SOURCES/mariadb-logrotate.patch index 6af9466..14ef932 100644 --- a/SOURCES/mariadb-logrotate.patch +++ b/SOURCES/mariadb-logrotate.patch @@ -26,9 +26,13 @@ Update 6/2018 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 ---- mariadb-10.3.19/support-files/mysql-log-rotate.sh 2019-11-03 17:03:27.000000000 +0100 -+++ mariadb-10.3.19/support-files/mysql-log-rotate.sh_patched 2019-11-06 15:07:54.205379672 +0100 -@@ -3,23 +3,10 @@ +Update 01/2022 +* added delaycompress option +* see https://mariadb.com/kb/en/rotating-logs-on-unix-and-linux + +--- mariadb-10.3.32/support-files/mysql-log-rotate.sh 2022-01-14 17:03:27.000000000 +0100 ++++ mariadb-10.3.32/support-files/mysql-log-rotate.sh_patched 2022-01-17 15:07:54.205379672 +0100 +@@ -3,35 +3,21 @@ # in the [mysqld] section as follows: # # [mysqld] @@ -55,8 +59,9 @@ Update 6/2018 notifempty daily rotate 3 -@@ -27,11 +14,9 @@ + missingok compress ++ delaycompress postrotate # just if mysqld is really running - if test -x @bindir@/mysqladmin && \ diff --git a/SOURCES/mariadb-scl-env-check.patch b/SOURCES/mariadb-scl-env-check.patch index 3a882ac..a767635 100644 --- a/SOURCES/mariadb-scl-env-check.patch +++ b/SOURCES/mariadb-scl-env-check.patch @@ -26,13 +26,13 @@ diff -up mariadb-10.3.11/scripts/mysqld_safe.sh.p90 mariadb-10.3.11/scripts/mysq # Initialize script globals KILL_MYSQLD=1; MYSQLD= -diff -up mariadb-10.3.11/scripts/mysql_install_db.sh.p90 mariadb-10.3.11/scripts/mysql_install_db.sh ---- mariadb-10.3.11/scripts/mysql_install_db.sh.p90 2018-12-18 17:45:20.906974130 +0100 -+++ mariadb-10.3.11/scripts/mysql_install_db.sh 2018-12-18 17:45:20.910974165 +0100 +diff -up mariadb-10.3.29/scripts/mysql_install_db.sh.old mariadb-10.3.29/scripts/mysql_install_db.sh +--- mariadb-10.3.29/scripts/mysql_install_db.sh.old 2021-08-03 14:57:30.144255502 +0200 ++++ mariadb-10.3.29/scripts/mysql_install_db.sh 2021-08-03 15:02:27.024746475 +0200 @@ -19,6 +19,12 @@ # # All unrecognized arguments to this script are passed to mysqld. - + +# we want start daemon only inside "scl enable" invocation +if ! scl_enabled @SCL_NAME@ ; then + echo "Use \"scl enable @SCL_NAME@ 'service ...'\" invocation" @@ -42,7 +42,7 @@ diff -up mariadb-10.3.11/scripts/mysql_install_db.sh.p90 mariadb-10.3.11/scripts basedir="" builddir="" ldata="@localstatedir@" -@@ -514,16 +520,16 @@ else +@@ -534,16 +540,16 @@ else echo "The problem could be conflicting information in an external" echo "my.cnf files. You can ignore these by doing:" echo @@ -62,7 +62,7 @@ diff -up mariadb-10.3.11/scripts/mysql_install_db.sh.p90 mariadb-10.3.11/scripts echo " mysql> show tables;" echo echo "Try 'mysqld --help' if you have problems with paths. Using" -@@ -543,10 +549,6 @@ fi +@@ -563,10 +569,6 @@ fi # the screen. if test "$cross_bootstrap" -eq 0 && test -z "$srcdir" then @@ -73,29 +73,23 @@ diff -up mariadb-10.3.11/scripts/mysql_install_db.sh.p90 mariadb-10.3.11/scripts if test "$auth_root_authentication_method" = normal then echo -@@ -554,11 +556,11 @@ then +@@ -574,7 +576,7 @@ then echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MariaDB root USER !" - echo "To do so, start the server, then issue the following commands:" - echo -- echo "'$bindir/mysqladmin' -u root password 'new-password'" -- echo "'$bindir/mysqladmin' -u root -h $hostname password 'new-password'" -+ echo "scl enable @SCL_NAME@ -- '$bindir/mysqladmin' -u root password 'new-password'" -+ echo "scl enable @SCL_NAME@ -- '$bindir/mysqladmin' -u root -h $hostname password 'new-password'" + echo "To do so, start the server, then issue the following command:" echo - echo "Alternatively you can run:" - echo "'$bindir/mysql_secure_installation'" + echo "scl enable @SCL_NAME@ -- '$bindir/mysql_secure_installation'" echo echo "which will also give you the option of removing the test" echo "databases and anonymous user created by default. This is" -@@ -577,6 +579,8 @@ then +@@ -593,6 +595,8 @@ then echo echo "You can test the MariaDB daemon with mysql-test-run.pl" echo "cd '$basedir/mysql-test' ; perl mysql-test-run.pl" + echo "after installing @SCL_NAME@-mariadb-test package." + echo "See @prefix@/share/mysql-test/README for instructions." fi - + echo diff -up mariadb-10.3.11/scripts/mysql.service.in.p90 mariadb-10.3.11/scripts/mysql.service.in --- mariadb-10.3.11/scripts/mysql.service.in.p90 2018-12-18 17:45:20.909974156 +0100 diff --git a/SPECS/mariadb.spec b/SPECS/mariadb.spec index 27cf927..4d38ed8 100644 --- a/SPECS/mariadb.spec +++ b/SPECS/mariadb.spec @@ -36,7 +36,8 @@ # Experimental version of the Cassandra storage engine # The tests needs running cassandra server # Do not build it for now -%if %_arch == x86_64 && 0%{?fedora} +%ifarch x86_64 +%if 0%{?fedora} %bcond_without tokudb %bcond_without mroonga %bcond_without rocksdb @@ -47,6 +48,7 @@ %bcond_with rocksdb %bcond_with cassandra %endif +%endif # The Open Query GRAPH engine (OQGRAPH) is a computation engine allowing # hierarchies and more complex graph structures to be handled in a relational fashion @@ -110,7 +112,14 @@ %bcond_without unbundled_pcre %else %bcond_with unbundled_pcre -%global pcre_bundled_version 8.44 +%global pcre_bundled_version 8.45 +%endif + +# Use main python interpretter version +%if 0%{?fedora} || 0%{?rhel} > 7 +%define __python /usr/bin/python3 +%else +%define __python /usr/bin/python2 %endif # Include systemd files @@ -160,7 +169,7 @@ %endif Name: %{?scl_prefix}mariadb -Version: 10.3.28 +Version: 10.3.32 Release: 2%{?with_debug:.debug}%{?dist} Epoch: 3 @@ -1352,7 +1361,7 @@ export MTR_BUILD_THREAD=%{__isa_bits} cd mysql-test perl ./mysql-test-run.pl --parallel=auto --force --retry=1 --ssl --mem \ - --suite-timeout=900 --testcase-timeout=30 \ + --suite-timeout=5000 --testcase-timeout=50 \ --mysqld=--binlog-format=mixed --force-restart \ --shutdown-timeout=60 --max-test-fail=10 \ --skip-test=spider \ @@ -1591,7 +1600,7 @@ fi %dir %{_libdir}/%{pkg_name}/plugin %{_libdir}/%{pkg_name}/plugin/* %{_libdir}/security/pam_user_map.so -%{_sysconfdir}/security/user_map.conf +%config(noreplace) %{_sysconfdir}/security/user_map.conf %{?with_oqgraph:%exclude %{_libdir}/%{pkg_name}/plugin/ha_oqgraph.so} %{?with_connect:%exclude %{_libdir}/%{pkg_name}/plugin/ha_connect.so} %{?with_cracklib:%exclude %{_libdir}/%{pkg_name}/plugin/cracklib_password_check.so} @@ -1647,7 +1656,6 @@ fi %{_datadir}/%{pkg_name}/mysql_system_tables.sql %{_datadir}/%{pkg_name}/mysql_system_tables_data.sql %{_datadir}/%{pkg_name}/mysql_test_data_timezone.sql -%{_datadir}/%{pkg_name}/mysql_to_mariadb.sql %{_datadir}/%{pkg_name}/mysql_performance_tables.sql %{_datadir}/%{pkg_name}/mysql_test_db.sql %if %{with mroonga} @@ -1839,6 +1847,28 @@ fi %endif %changelog +* Mon Jan 17 2022 Zuzana Miklankova - 3:10.3.32-2 +- Add delaycompress option to the logrotate script +- Resolves: rhbz:#2050538 + +* Fri Nov 26 2021 Zuzana Miklankova - 3:10.3.32-1 +- Rebase to 10.3.32 +- Increase test suite and test case timeout +- Relates: rhbz:#1991341 + +* Fri Nov 26 2021 Zuzana Miklankova - 3:10.3.31-1 +- Rebase to 10.3.31 + +* Fri Sep 24 2021 Lukas Javorsky - 3:10.3.30-1 +- Rebase to 10.3.30 + +* Mon Aug 09 2021 Lukas Javorsky - 3:10.3.29-2 +- Set user_map.conf file to be noreplace config file + +* Fri Jun 25 2021 Lukas Javorsky - 3:10.3.29-1 +- Rebase to 10.3.29 +- Resolves: rhbz#1976002 + * Thu Apr 01 2021 Lukas Javorsky - 3:10.3.28-2 - Release bump