import mariadb-10.5.8-2.module+el8.4.0+10077+caf70fad

SOURCES/README.mysql-cnf

@@ -1,13 +0,0 @@
-This directory contains prepared configuration files with .cnf extension,
-which provide a configuration for some common MariaDB deployment scenarios.
-These configuration files do not include the default configuration of datadir,
-log-file and pid-file locations, as specified in the default my.cnf file,
-provided in this distribution.
-
-Thus, it is recommended to use these configuration files as an addition to the
-default my.cnf configuration file.
-
-Since default my.cnf contains `!includedir @INSTALL_SYSCONF2DIR@` directive, it is
-recommended to copy required configuration under @INSTALL_SYSCONF2DIR@ directory,
-so the default my.cnf specifications will be extended.
-

SOURCES/mariadb-logrotate.patch

@@ -26,9 +26,15 @@ 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.5.4/support-files/mysql-log-rotate.sh.old	2020-09-16 13:36:57.247955135 +0200
+Update 02/2021
-+++ mariadb-10.5.4/support-files/mysql-log-rotate.sh	2020-09-16 13:40:59.744220908 +0200
+* Enhance the script as proposed in:
-@@ -3,23 +3,10 @@
+  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]
@@ -55,10 +61,12 @@ Update 6/2018
          notifempty
          daily
          rotate 3
-@@ -27,11 +14,9 @@
+         missingok
          compress
++        delaycompress
++        sharedscripts
      postrotate
-	# just if mariadbd is really running
+ 	# just if mariadbd is really running
 -	if test -x @bindir@/mysqladmin && \
 -	   @bindir@/mysqladmin ping &>/dev/null
 -	then

SOURCES/rh-skipped-tests-base.list

@@ -52,3 +52,9 @@ main.ssl_system_ca                           :
 # Fails since 10.5.7
 innodb.innodb_wl6326_big                     :
 plugins.feedback_plugin_load                 :
+
+# Fails only on i686
+main.myisampack                              :
+
+# Fails everywhere in 10.5.8
+rpl.rpl_innodb_mixed_dml                     :

SOURCES/rh-skipped-tests-ppc.list

@@ -1,5 +1,2 @@
 # Fails on ppc64le since 10.4.12
 oqgraph.social : 
-
-# Fails since 10.5.2
-rh-skipped-tests-ppc.list :

SPECS/mariadb.spec

@@ -152,7 +152,7 @@
 
 Name:             mariadb
 Version:          10.5.8
-Release:          1%{?with_debug:.debug}%{?dist}
+Release:          2%{?with_debug:.debug}%{?dist}
 Epoch:            3
 
 Summary:          A very fast and robust SQL database server
@@ -163,7 +163,6 @@ License:          GPLv2 with exceptions and LGPLv2 and BSD
 Source0:          https://downloads.mariadb.org/interstitial/mariadb-%{version}/source/mariadb-%{version}.tar.gz
 Source2:          mysql_config_multilib.sh
 Source3:          my.cnf.in
-Source5:          README.mysql-cnf
 Source6:          README.mysql-docs
 Source7:          README.mysql-license
 Source10:         mysql.tmpfiles.d.in
@@ -177,10 +176,25 @@ Source50:         rh-skipped-tests-base.list
 Source51:         rh-skipped-tests-arm.list
 Source52:         rh-skipped-tests-s390.list
 Source53:         rh-skipped-tests-ppc.list
-# Proposed upstream: https://jira.mariadb.org/browse/MDEV-12442
+# Red Hat OpenStack scripts:
-# General upstream response was slightly positive
+#   Clustercheck:
+#     Maintainer:
+#       Damien Ciabrini <dciabrin@redhat.com>
+#     Source / Upstream:
+#       Damien; based on https://github.com/olafz/percona-clustercheck
+#       not updated in 5 years; low-effort maintenance
+#     Purpose:
+#       In Openstack, galera is accessed like an A/P database, we have a
+#       load balancer (haproxy) that drives traffic to a single node and
+#       performs failover when the galera node monitor fails.
+#       clustercheck.sh is the monitoring script that is being called remotely
+#       by haproxy. It is a glue between haproxy and the local galera node that
+#       can run SQL commands to check whether the local galera is connected to the galera cluster.
+#     Proposed to MariaDB upstream: https://jira.mariadb.org/browse/MDEV-12442
+#       General upstream response was slightly positive
 Source70:         clustercheck.sh
 Source71:         LICENSE.clustercheck
+
 # Upstream said: "Generally MariaDB has more allows to allow for xtradb sst mechanism".
 # https://jira.mariadb.org/browse/MDEV-12646
 Source72:         mariadb-server-galera.te
@@ -202,6 +216,8 @@ Patch13:          %{pkgnamepatch}-spider_on_armv7hl.patch
 Patch15:          %{pkgnamepatch}-groonga.patch
 #   Patch16: Workaround for "chown 0" with priviledges dropped to "mysql" user
 Patch16:          %{pkgnamepatch}-auth_pam_tool_dir.patch
+#   Patch17: Revert of an upstream commit
+Patch17:          upstream_5cc2096f93b7f130b36f8bc0fc43440db9a848e4.patch
 
 BuildRequires:    cmake gcc-c++
 BuildRequires:    multilib-rpm-config
@@ -463,6 +479,10 @@ Conflicts:        community-mysql-server
 # Bench subpackage has been deprecated in F32
 Obsoletes: %{name}-bench <= %{sameevr}
 
+%if %{without tokudb}
+Obsoletes:      %{name}-tokudb-engine <= %{sameevr}
+%endif
+
 %description      server
 MariaDB is a multi-user, multi-threaded SQL database server. It is a
 client/server implementation consisting of a server daemon (mysqld)
@@ -667,6 +687,7 @@ Summary:          The test suite distributed with MariaDB
 Requires:         %{name}%{?_isa} = %{sameevr}
 Requires:         %{name}-common%{?_isa} = %{sameevr}
 Requires:         %{name}-server%{?_isa} = %{sameevr}
+Requires:         patch
 Requires:         perl(Env)
 Requires:         perl(Exporter)
 Requires:         perl(Fcntl)
@@ -715,9 +736,7 @@ rm -r storage/rocksdb/
 #%patch13 -p1
 %patch15 -p1
 %patch16 -p1
-
+%patch17 -R -p1
-# workaround for upstream bug #56342
-#rm mysql-test/t/ssl_8k_key-master.opt
 
 # generate a list of tests that fail, but are not disabled by upstream
 cat %{SOURCE50} | tee -a mysql-test/unstable-tests
@@ -871,16 +890,9 @@ export CFLAGS CXXFLAGS CPPFLAGS
 
 
 # Print all Cmake options values; "-LAH" means "List Advanced Help"
-cmake -LAH
+cmake -B %{_vpath_builddir} -LAH
-
-#%cmake_build
-
-# to safe disk space, do not use ccache
-export CCACHE_DISABLE=1
-# do not use %%{?_smp_mflags} to safe memory and avoid build failure due to not enough resources
-make -j2 VERBOSE=1
-
 
+%cmake_build
 
 # build selinux policy
 %if %{with galera}
@@ -891,8 +903,7 @@ make -f /usr/share/selinux/devel/Makefile %{name}-server-galera.pp
 
 
 %install
-#%cmake_install
+%cmake_install
-make DESTDIR=%{buildroot} install
 
 # multilib header support #1625157
 for header in mysql/server/my_config.h mysql/server/private/config.h; do
@@ -906,7 +917,7 @@ ln -s mysql_config.1.gz %{buildroot}%{_mandir}/man1/mariadb_config.1.gz
 if [ %multilib_capable ]
 then
 mv %{buildroot}%{_bindir}/mysql_config %{buildroot}%{_bindir}/mysql_config-%{__isa_bits}
-install -p -m 0755 scripts/mysql_config_multilib %{buildroot}%{_bindir}/mysql_config
+install -p -m 0755 %{_vpath_builddir}/scripts/mysql_config_multilib %{buildroot}%{_bindir}/mysql_config
 # Copy manual page for multilib mysql_config; https://jira.mariadb.org/browse/MDEV-11961
 ln -s mysql_config.1 %{buildroot}%{_mandir}/man1/mysql_config-%{__isa_bits}.1
 fi
@@ -918,8 +929,8 @@ rm %{buildroot}%{_libdir}/pkgconfig/libmariadb.pc
 
 # install INFO_SRC, INFO_BIN into libdir (upstream thinks these are doc files,
 # but that's pretty wacko --- see also %%{name}-file-contents.patch)
-install -p -m 644 Docs/INFO_SRC %{buildroot}%{_libdir}/%{pkg_name}/
+install -p -m 644 %{_vpath_builddir}/Docs/INFO_SRC %{buildroot}%{_libdir}/%{pkg_name}/
-install -p -m 644 Docs/INFO_BIN %{buildroot}%{_libdir}/%{pkg_name}/
+install -p -m 644 %{_vpath_builddir}/Docs/INFO_BIN %{buildroot}%{_libdir}/%{pkg_name}/
 rm -r %{buildroot}%{_datadir}/doc/%{_pkgdocdirname}/MariaDB-server-%{version}/
 
 # Logfile creation
@@ -934,9 +945,9 @@ mkdir -p %{buildroot}%{pidfiledir}
 install -p -m 0755 -d %{buildroot}%{dbdatadir}
 
 %if %{with config}
-install -D -p -m 0644 scripts/my.cnf %{buildroot}%{_sysconfdir}/my.cnf
+install -D -p -m 0644 %{_vpath_builddir}/scripts/my.cnf %{buildroot}%{_sysconfdir}/my.cnf
 %else
-rm scripts/my.cnf
+rm %{_vpath_builddir}/scripts/my.cnf
 %endif
 
 # use different config file name for each variant of server (mariadb / mysql)
@@ -945,20 +956,20 @@ mv %{buildroot}%{_sysconfdir}/my.cnf.d/server.cnf %{buildroot}%{_sysconfdir}/my.
 # remove SysV init script and a symlink to that, we use systemd
 rm %{buildroot}%{_libexecdir}/rcmysql
 # install systemd unit files and scripts for handling server startup
-install -D -p -m 644 scripts/mysql.service %{buildroot}%{_unitdir}/%{daemon_name}.service
+install -D -p -m 644 %{_vpath_builddir}/scripts/mysql.service %{buildroot}%{_unitdir}/%{daemon_name}.service
-install -D -p -m 644 scripts/mysql@.service %{buildroot}%{_unitdir}/%{daemon_name}@.service
+install -D -p -m 644 %{_vpath_builddir}/scripts/mysql@.service %{buildroot}%{_unitdir}/%{daemon_name}@.service
 
 # Install downstream version of tmpfiles
-install -D -p -m 0644 scripts/mysql.tmpfiles.d %{buildroot}%{_tmpfilesdir}/%{name}.conf
+install -D -p -m 0644 %{_vpath_builddir}/scripts/mysql.tmpfiles.d %{buildroot}%{_tmpfilesdir}/%{name}.conf
 %if 0%{?mysqld_pid_dir:1}
 echo "d %{pidfiledir} 0755 mysql mysql -" >>%{buildroot}%{_tmpfilesdir}/%{name}.conf
 %endif
 
 # helper scripts for service starting
-install -p -m 755 scripts/mysql-prepare-db-dir %{buildroot}%{_libexecdir}/mysql-prepare-db-dir
+install -p -m 755 %{_vpath_builddir}/scripts/mysql-prepare-db-dir %{buildroot}%{_libexecdir}/mysql-prepare-db-dir
-install -p -m 755 scripts/mysql-check-socket %{buildroot}%{_libexecdir}/mysql-check-socket
+install -p -m 755 %{_vpath_builddir}/scripts/mysql-check-socket %{buildroot}%{_libexecdir}/mysql-check-socket
-install -p -m 755 scripts/mysql-check-upgrade %{buildroot}%{_libexecdir}/mysql-check-upgrade
+install -p -m 755 %{_vpath_builddir}/scripts/mysql-check-upgrade %{buildroot}%{_libexecdir}/mysql-check-upgrade
-install -p -m 644 scripts/mysql-scripts-common %{buildroot}%{_libexecdir}/mysql-scripts-common
+install -p -m 644 %{_vpath_builddir}/scripts/mysql-scripts-common %{buildroot}%{_libexecdir}/mysql-scripts-common
 
 # install aditional galera selinux policy
 %if %{with galera}
@@ -1007,8 +1018,12 @@ mkdir -p %{buildroot}%{logrotateddir}
 mv %{buildroot}%{_datadir}/%{pkg_name}/mysql-log-rotate %{buildroot}%{logrotateddir}/%{daemon_name}
 chmod 644 %{buildroot}%{logrotateddir}/%{daemon_name}
 
+# for compatibility with upstream RPMs, create mysqld symlink in sbin
+mkdir -p %{buildroot}%{_sbindir}
+ln -s %{_libexecdir}/mysqld %{buildroot}%{_sbindir}/mysqld
+ln -s %{_libexecdir}/mariadbd %{buildroot}%{_sbindir}/mariadbd
+
 # copy additional docs into build tree so %%doc will find them
-install -p -m 0644 %{SOURCE5} %{basename:%{SOURCE5}}
 install -p -m 0644 %{SOURCE6} %{basename:%{SOURCE6}}
 install -p -m 0644 %{SOURCE7} %{basename:%{SOURCE7}}
 install -p -m 0644 %{SOURCE16} %{basename:%{SOURCE16}}
@@ -1022,13 +1037,13 @@ rm %{buildroot}/usr/lib/systemd/system/{mysql,mysqld}.service
 
 # install galera config file
 %if %{with galera}
-sed -i -r 's|^wsrep_provider=none|wsrep_provider=%{_libdir}/galera/libgalera_smm.so|' support-files/wsrep.cnf
+sed -i -r 's|^wsrep_provider=none|wsrep_provider=%{_libdir}/galera/libgalera_smm.so|' %{_vpath_builddir}/support-files/wsrep.cnf
-install -p -m 0644 support-files/wsrep.cnf %{buildroot}%{_sysconfdir}/my.cnf.d/galera.cnf
+install -p -m 0644 %{_vpath_builddir}/support-files/wsrep.cnf %{buildroot}%{_sysconfdir}/my.cnf.d/galera.cnf
 %endif
 # install the clustercheck script
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
 touch %{buildroot}%{_sysconfdir}/sysconfig/clustercheck
-install -p -m 0755 scripts/clustercheck %{buildroot}%{_bindir}/clustercheck
+install -p -m 0755 %{_vpath_builddir}/scripts/clustercheck %{buildroot}%{_bindir}/clustercheck
 
 # remove duplicate logrotate script
 rm %{buildroot}%{logrotateddir}/mysql
@@ -1141,7 +1156,6 @@ rm %{buildroot}%{_bindir}/{mariadb-client-test-embedded,mariadb-test-embedded}
 rm %{buildroot}%{_mandir}/man1/{mysql_client_test_embedded,mysqltest_embedded}.1*
 rm %{buildroot}%{_mandir}/man1/{mariadb-client-test-embedded,mariadb-test-embedded}.1*
 %endif # embedded
-rm %{buildroot}%{_bindir}/test-connect-t
 rm %{buildroot}%{_bindir}/{mysql_client_test,mysqltest}
 rm %{buildroot}%{_bindir}/{mariadb-client-test,mariadb-test}
 rm %{buildroot}%{_mandir}/man1/{mysql_client_test,mysqltest,my_safe_process}.1*
@@ -1152,7 +1166,6 @@ rm %{buildroot}/suite/plugins/pam/pam_mariadb_mtr.so
 %endif
 
 %if %{without galera}
-rm %{buildroot}%{_sysconfdir}/my.cnf.d/galera.cnf
 rm %{buildroot}%{_sysconfdir}/sysconfig/clustercheck
 rm %{buildroot}%{_bindir}/{clustercheck,galera_new_cluster}
 rm %{buildroot}%{_bindir}/galera_recovery
@@ -1164,13 +1177,21 @@ rm %{buildroot}%{_mandir}/man1/{mysql_,mariadb-}ldb.1*
 rm %{buildroot}%{_mandir}/man1/myrocks_hotbackup.1*
 %endif
 
+%if %{without backup}
+rm %{buildroot}%{_mandir}/man1/maria{,db-}backup.1*
+rm %{buildroot}%{_mandir}/man1/mbstream.1*
+%endif
+
 %check
 %if %{with test}
 %if %runselftest
 # hack to let 32- and 64-bit tests run concurrently on same build machine
 export MTR_PARALLEL=1
-# builds might happen at the same host, avoid collision
+# Builds might happen at the same host, avoid collision
-export MTR_BUILD_THREAD=%{__isa_bits}
+#   The port used is calculated as 20 * MTR_BUILD_THREAD + 10000
+#   The resulting port must be between 5000 and 32767
+#   This is the same as using option "--build-thread" for the "mysql-test-run.pl"
+export MTR_BUILD_THREAD=$(( $(date +%s) % 1100 ))
 
 # The cmake build scripts don't provide any simple way to control the
 # options for mysql-test-run, so ignore the make target and just call it
@@ -1219,6 +1240,9 @@ export MTR_BUILD_THREAD=%{__isa_bits}
     %endif
   # blank line
   fi
+
+  # There might be a dangling symlink left from the testing, remove it to not be installed
+  rm -rf ./var
 )
 
 # NOTE: the Spider SE has 2 more hidden testsuites "oracle" and "oracle2".
@@ -1351,7 +1375,6 @@ fi
 %endif
 
 %files server
-%doc README.mysql-cnf
 
 %{_bindir}/aria_{chk,dump_log,ftdump,pack,read_log}
 %{_bindir}/mariadb-service-convert
@@ -1372,13 +1395,17 @@ fi
 %{_bindir}/replace
 %{_bindir}/resolve_stack_dump
 %{_bindir}/resolveip
+%if %{with galera}
 # wsrep_sst_common should be moved to /usr/share/mariadb: https://jira.mariadb.org/browse/MDEV-14296
 %{_bindir}/wsrep_*
+%endif
 
 %config(noreplace) %{_sysconfdir}/my.cnf.d/%{pkg_name}-server.cnf
 %config(noreplace) %{_sysconfdir}/my.cnf.d/enable_encryption.preset
 %config(noreplace) %{_sysconfdir}/my.cnf.d/spider.cnf
 
+%{_sbindir}/mysqld
+%{_sbindir}/mariadbd
 %{_libexecdir}/{mysqld,mariadbd}
 
 %{_libdir}/%{pkg_name}/INFO_SRC
@@ -1479,7 +1506,7 @@ fi
 %attr(0750,mysql,mysql) %dir %{logfiledir}
 # This does what it should.
 # RPMLint error "conffile-without-noreplace-flag /var/log/mariadb/mariadb.log" is false positive.
-%attr(0640,mysql,mysql) %config %ghost %verify(not md5 size mtime) %{logfile}
+%attr(0660,mysql,mysql) %config %ghost %verify(not md5 size mtime) %{logfile}
 %config(noreplace) %{logrotateddir}/%{daemon_name}
 
 %{_tmpfilesdir}/%{name}.conf
@@ -1604,6 +1631,9 @@ fi
 %endif
 
 %changelog
+* Tue Feb 16 2021 Michal Schorm <mschorm@redhat.com> - 10.5.8-2
+- Bump release after several commits cherry-picked from Fedora Rawhide
+
 * Wed Nov 11 2020 Michal Schorm <mschorm@redhat.com> - 10.5.8-1
 - Rebase to 10.5.8