.gitignore

@@ -1 +1,2 @@
-SOURCES/mariadb-10.5.22-downstream_modified.tar.gz
+SOURCES/8.0.1.zip
+SOURCES/mariadb-10.11.6.tar.gz

.mariadb.metadata

@@ -1 +1,2 @@
-d767fc64fbf44da4e1a4174a9939356fac5fe19b SOURCES/mariadb-10.5.22-downstream_modified.tar.gz
+0e71402cb82eb84981ede3dc4d9be0b5924dc318 SOURCES/8.0.1.zip
+4be66f91b577a1663832459ab881f6ac541d2775 SOURCES/mariadb-10.11.6.tar.gz

SOURCES/mariadb-fmt_bundle.patch

@@ -0,0 +1,16 @@
+Currently, the CMAKE script is able to aither use the system library, or download a bundle.
+We don't have FMT as a system library in RHEL, and we can't *download* a bundle during build time.
+So we download the bundle ourselves, add it as additional package sources, and redirect the CMAKE
+so it would search for it on the correct - local - location.
+
+--- mariadb-10.11.6/cmake/libfmt.cmake	2023-11-08 16:51:39.000000000 +0100
++++ mariadb-10.11.6/cmake/libfmt.cmake_patched	2024-01-10 17:29:18.004421343 +0100
+@@ -15,7 +15,7 @@ MACRO(BUNDLE_LIBFMT)
+   ExternalProject_Add(
+     libfmt
+     PREFIX   "${dir}"
+-    URL      "https://github.com/fmtlib/fmt/archive/refs/tags/8.0.1.zip"
++    URL      "${CMAKE_BINARY_DIR}/bundles/8.0.1.zip"
+     URL_MD5  e77873199e897ca9f780479ad68e25b1
+     INSTALL_COMMAND ""
+     CONFIGURE_COMMAND ""

SOURCES/mariadb-logrotate.patch

@@ -1,82 +1,32 @@
-Adjust the mysql-log-rotate script in several ways:
+Adjust the 'mariadb.logrotate.sh' 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
+* Remove Debian specific code
-* Note they are from Fedora 15 / 16
+  for the very unlikely, but possible scenario
+  in which the debian config file would exist.
 
-Update 3/2017
+--- mariadb-10.11.6/support-files/mariadb.logrotate.sh	2023-11-08 16:51:43.000000000 +0100
-* it would be big unexpected change for anyone upgrading, if we start shipping it now.
++++ mariadb-10.11.6/support-files/mariadb.logrotate.sh_patched	2023-12-17 18:03:36.955861025 +0100
-  Maybe it is good candidate for shipping with MariaDB 10.2 ?
+@@ -6,7 +6,7 @@
-* the 'mysqladmin flush logs' doesn´t guarantee, no entries are lost
+ # Read https://mariadb.com/kb/en/error-log/ to learn more about logging and
-  during flushing, the operation is not atomic.
+ # https://mariadb.com/kb/en/rotating-logs-on-unix-and-linux/ about rotating logs.
-  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.13-downstream_modified/support-files/mysql-log-rotate.sh	2022-02-22 04:56:35.571185622 +0100
-+++ mariadb-10.5.13-downstream_modified/support-files/mysql-log-rotate.sh_patched	2022-02-22 04:56:15.121003580 +0100
-@@ -3,36 +3,23 @@
- # 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 {
+-@localstatedir@/mysqld.log @localstatedir@/mariadb.log @logdir@/*.log {
--        # create 600 mysql mysql
 +@LOG_LOCATION@ {
-+        create 600 mysql mysql
+ 
-         su mysql mysql
+   # Depends on a mysql@localhost unix_socket authenticated user with RELOAD privilege
-         notifempty
+   @su_user@
-         daily
+@@ -45,11 +45,6 @@
-         rotate 3
+   # has thanks to the default use of Unix socket authentication for the 'mysql'
-         missingok
+   # (or root on Debian) account used everywhere since MariaDB 10.4.
-         compress
+   postrotate
-+        delaycompress
+-    if test -r /etc/mysql/debian.cnf
-+        sharedscripts
+-    then
-     postrotate
+-      EXTRAPARAM='--defaults-file=/etc/mysql/debian.cnf'
- 	# just if mariadbd is really running
+-    fi
--	if test -x @bindir@/mysqladmin && \
+-
--	   @bindir@/mysqladmin ping &>/dev/null
+     if test -x @bindir@/mariadb-admin
--	then
+     then
--	   @bindir@/mysqladmin --local flush-error-log \
+       @bindir@/mariadb-admin $EXTRAPARAM --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
- }

SOURCES/rh-skipped-tests-base.list

@@ -96,3 +96,21 @@ rpl.rpl_row_img_sequence_min                :
 rpl.rpl_row_img_sequence_noblob             :
 rpl.rpl_xa_empty_transaction                :
 rpl.rpl_slave_shutdown_mdev20821            :
+
+# Fails on 10.11.6
+main.plugin_auth                            :
+
+binlog_encryption.rpl_gtid_basic            :
+multi_source.info_logs                      :
+perfschema.threads_mysql                    :
+rpl.rpl_cant_read_event_incident            :
+rpl.rpl_change_master_demote                :
+rpl.rpl_domain_id_filter_restart            :
+rpl.rpl_gtid_basic                          :
+rpl.rpl_mdev6020                            :
+rpl.rpl_old_master                          :
+rpl.rpl_perfschema_applier_status_by_coordinator :
+rpl.rpl_rewrite_db_sys_vars                 :
+rpl.rpl_semi_sync_wait_point                :
+rpl.rpl_trigger                             :
+rpl.rpl_upgrade_master_info                 :

SOURCES/rh-skipped-tests-ppc.list

@@ -5,3 +5,6 @@ oqgraph.social :
 innodb.innodb_defrag_concurrent        :
 parts.partition_alter4_innodb          :
 rpl.rpl_parallel_optimistic_xa_lsu_off :
+
+# Fails on 10.11.6
+perfschema.threads_innodb :

SOURCES/rh-skipped-tests-s390.list

@@ -1,3 +1,11 @@
 # Fails since 10.5.2
 perfschema.memory_aggregate_32bit :
 period.overlaps :
+
+# Fails on 10.11.6
+main.func_json_notembedded :
+
+innodb_gis.rtree_rollback1 :
+mariabackup.encrypted_page_corruption :
+mariabackup.huge_lsn :
+mariabackup.xb_file_key_management :

SPECS/mariadb.spec

@@ -1,3 +1,6 @@
+# To both save infrastrucutre resources and workaround for i686 FTBFS
+ExcludeArch: %{ix86}
+
 # Prefix that is used for patches
 %global pkg_name %{name}
 %global pkgnamepatch mariadb
@@ -11,7 +14,7 @@
 # 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.5.22
+%global last_tested_version 10.11.6
 # Set to 1 to force run the testsuite even if it was already tested in current version
 %global force_run_testsuite 0
 
@@ -154,7 +157,7 @@
 %global sameevr   %{epoch}:%{version}-%{release}
 
 Name:             mariadb
-Version:          10.5.22
+Version:          10.11.6
 Release:          1%{?with_debug:.debug}%{?dist}
 Epoch:            3
 
@@ -162,12 +165,8 @@ Summary:          A very fast and robust SQL database server
 URL:              http://mariadb.org
 License:          GPLv2 and LGPLv2
 
-# Original upstream sources archive URL
+Source0:          https://downloads.mariadb.org/interstitial/mariadb-%{version}/source/mariadb-%{version}.tar.gz
-# Source0:          https://downloads.mariadb.org/interstitial/mariadb-%{version}/source/mariadb-%{version}.tar.gz
+Source1:          https://github.com/fmtlib/fmt/archive/refs/tags/8.0.1.zip
-# Non-existent URL containing correct archive name
-#   The archive was created by executing the "generate-modified-sources.sh" script
-Source0:          https://fedoraproject.org/mariadb-%{version}-downstream_modified.tar.gz
-
 Source2:          mysql_config_multilib.sh
 Source3:          my.cnf.in
 Source6:          README.mariadb-docs
@@ -220,6 +219,8 @@ Patch9:           %{pkgnamepatch}-ownsetup.patch
 #   Patch10: Fix cipher name in the SSL Cipher name test
 Patch10:          %{pkgnamepatch}-ssl-cipher-tests.patch
 
+Patch11:          %{pkgnamepatch}-fmt_bundle.patch
+
 BuildRequires:    make
 BuildRequires:    cmake gcc-c++
 BuildRequires:    multilib-rpm-config
@@ -292,6 +293,8 @@ BuildRequires:    perl(warnings)
 # for running some openssl tests rhbz#1189180
 BuildRequires:    openssl openssl-devel
 
+#BuildRequires:    fmt-devel
+
 %if %{with debug}
 BuildRequires:    valgrind-devel
 %endif
@@ -729,7 +732,7 @@ sources.
 
 
 %prep
-%setup -q -n mariadb-%{version}-downstream_modified
+%setup -q -n %{pkg_name}-%{version}
 
 # Remove JAR files that upstream puts into tarball
 find . -name "*.jar" -type f -exec rm --verbose -f {} \;
@@ -744,6 +747,7 @@ rm -r storage/rocksdb/
 %patch4 -p1
 %patch7 -p1
 %patch9 -p1
+%patch11 -p1
 # The test in Patch 10 has been recently updated by upstream
 # and the test was disabled in the testuite run
 #   main.ssl_cipher     [ disabled ]  MDEV-17184 - Failures with OpenSSL 1.1.1
@@ -767,6 +771,9 @@ cat %{SOURCE52} | tee -a mysql-test/unstable-tests
 cat %{SOURCE53} | tee -a mysql-test/unstable-tests
 %endif
 
+mkdir -p %{_vpath_builddir}/bundles
+cp %{SOURCE1} %{_vpath_builddir}/bundles/
+
 cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} \
    %{SOURCE14} %{SOURCE15} %{SOURCE16} %{SOURCE18} %{SOURCE70} %{SOURCE73} scripts
 
@@ -851,6 +858,7 @@ fi
          -DCONC_WITH_SSL=%{?with_clibrary:ON}%{!?with_clibrary:NO} \
          -DWITH_SSL=system \
          -DWITH_ZLIB=system \
+         -DWITH_LIBFMT=bundled \
          -DLZ4_LIBS=%{_libdir}/liblz4.so \
          -DLZ4_LIBS=%{?with_lz4:%{_libdir}/liblz4.so}%{!?with_lz4:} \
          -DWITH_INNODB_LZ4=%{?with_lz4:ON}%{!?with_lz4:OFF} \
@@ -871,6 +879,8 @@ fi
          -DPLUGIN_AWS_KEY_MANAGEMENT=NO \
          -DCONNECT_WITH_MONGO=OFF \
          -DCONNECT_WITH_JDBC=OFF \
+         -DPLUGIN_PROVIDER_LZMA=NO \
+         -DPLUGIN_HASHICORP_KEY_MANAGEMENT=NO \
 %{?with_debug: -DCMAKE_BUILD_TYPE=Debug -DWITH_ASAN=OFF -DWITH_INNODB_EXTRA_DEBUG=ON -DWITH_VALGRIND=ON}
 
 # The -DSECURITY_HARDENED is used to force a set of compilation flags for hardening
@@ -1032,11 +1042,6 @@ rm %{buildroot}%{_mandir}/man1/mytop.1*
 # Should be shipped with mariadb-connector-c
 rm %{buildroot}%{_mandir}/man1/mariadb_config.1*
 
-# put logrotate script where it needs to be
-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
@@ -1059,7 +1064,7 @@ touch %{buildroot}%{_sysconfdir}/sysconfig/clustercheck
 install -p -m 0755 %{_vpath_builddir}/scripts/clustercheck %{buildroot}%{_bindir}/clustercheck
 
 # remove duplicate logrotate script
-rm %{buildroot}%{logrotateddir}/mysql
+rm %{buildroot}%{_datadir}/mariadb/mariadb.logrotate
 # Remove AppArmor files
 rm -r %{buildroot}%{_datadir}/%{pkg_name}/policy/apparmor
 
@@ -1071,6 +1076,11 @@ mv %{buildroot}/%{_lib}/security %{buildroot}%{_libdir}
 # Add wsrep_sst_rsync_tunnel script
 install -p -m 0755 scripts/wsrep_sst_rsync_tunnel %{buildroot}%{_bindir}/wsrep_sst_rsync_tunnel
 
+# Remove systemd socket files from %%{_unitdir}
+# We ship them in %%{_datadir}, so users can try them out on their own risk
+mkdir -p %{buildroot}%{_datadir}/%{daemon_name}/systemd
+mv %{buildroot}%{_unitdir}/%{daemon_name}*.socket %{buildroot}%{_datadir}/%{daemon_name}/systemd
+
 # Disable plugins
 %if %{with gssapi}
 sed -i 's/^plugin-load-add/#plugin-load-add/' %{buildroot}%{_sysconfdir}/my.cnf.d/auth_gssapi.cnf
@@ -1099,6 +1109,7 @@ rm %{buildroot}%{_libdir}/libmariadb.so.*
 unlink %{buildroot}%{_libdir}/libmysqlclient.so
 unlink %{buildroot}%{_libdir}/libmysqlclient_r.so
 unlink %{buildroot}%{_libdir}/libmariadb.so
+rm %{buildroot}%{_mandir}/man3/*
 # Client plugins
 rm %{buildroot}%{_libdir}/%{pkg_name}/plugin/{dialog.so,mysql_clear_password.so,sha256_password.so}
 %if %{with gssapi}
@@ -1159,7 +1170,7 @@ rm %{buildroot}%{_datadir}/%{pkg_name}/errmsg-utf8.txt
 rm -r %{buildroot}%{_datadir}/%{pkg_name}/{english,czech,danish,dutch,estonian,\
 french,german,greek,hungarian,italian,japanese,korean,norwegian,norwegian-ny,\
 polish,portuguese,romanian,russian,serbian,slovak,spanish,swedish,ukrainian,hindi,\
-bulgarian,chinese}
+bulgarian,chinese,georgian}
 %endif
 
 %if %{without test}
@@ -1253,7 +1264,7 @@ export MTR_BUILD_THREAD=$(( $(date +%s) % 1100 ))
       --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 --suite=spider,spider/bg,spider/bugfix,spider/handler \
+    perl ./mysql-test-run.pl $common_testsuite_arguments --skip-ssl --big-test --suite=spider,spider/bg,spider/bugfix \
     %if %{ignore_testsuite_result}
       --max-test-fail=999 || :
     %else
@@ -1264,6 +1275,8 @@ export MTR_BUILD_THREAD=$(( $(date +%s) % 1100 ))
 
   # There might be a dangling symlink left from the testing, remove it to not be installed
   rm -rf ./var
+  # Remove temporary files created by the testsuite execution
+  find ./ -type f -name '*~' -exec rm {} +
 )
 
 # NOTE: the Spider SE has 2 more hidden testsuites "oracle" and "oracle2".
@@ -1382,6 +1395,7 @@ fi
 %lang(uk) %{_datadir}/%{pkg_name}/ukrainian
 %lang(bg) %{_datadir}/%{pkg_name}/bulgarian
 %lang(zh) %{_datadir}/%{pkg_name}/chinese
+%lang(ka) %{_datadir}/%{pkg_name}/georgian
 %endif
 
 %if %{with galera}
@@ -1427,6 +1441,11 @@ fi
 %config(noreplace) %{_sysconfdir}/my.cnf.d/enable_encryption.preset
 %config(noreplace) %{_sysconfdir}/my.cnf.d/spider.cnf
 
+%config(noreplace) %{_sysconfdir}/my.cnf.d/provider_lz4.cnf
+#%config(noreplace) %{_sysconfdir}/my.cnf.d/provider_lzma.cnf
+
+#%config(noreplace) %{_sysconfdir}/my.cnf.d/hashicorp_key_management.cnf
+
 %{_sbindir}/mysqld
 %{_sbindir}/mariadbd
 %{_libexecdir}/{mysqld,mariadbd}
@@ -1484,10 +1503,12 @@ fi
 
 %{_mandir}/man1/mysql.server.1*
 
+%{_datadir}/%{pkg_name}/mini-benchmark
 %{_datadir}/%{pkg_name}/fill_help_tables.sql
 %{_datadir}/%{pkg_name}/maria_add_gis_sp.sql
 %{_datadir}/%{pkg_name}/maria_add_gis_sp_bootstrap.sql
 %{_datadir}/%{pkg_name}/mysql_system_tables.sql
+%{_datadir}/%{pkg_name}/mysql_sys_schema.sql
 %{_datadir}/%{pkg_name}/mysql_system_tables_data.sql
 %{_datadir}/%{pkg_name}/mysql_test_data_timezone.sql
 %{_datadir}/%{pkg_name}/mysql_performance_tables.sql
@@ -1511,6 +1532,8 @@ fi
 %{_datadir}/%{pkg_name}/policy/selinux/README
 %{_datadir}/%{pkg_name}/policy/selinux/mariadb-server.*
 %{_datadir}/%{pkg_name}/policy/selinux/mariadb.*
+%dir %{_datadir}/%{pkg_name}/systemd
+%{_datadir}/%{pkg_name}/systemd/*.socket
 
 %{_unitdir}/%{daemon_name}*
 
@@ -1617,6 +1640,7 @@ fi
 %{_datadir}/aclocal/mysql.m4
 %{_libdir}/pkgconfig/*mariadb.pc
 %if %{with clibrary}
+%{_mandir}/man3/*
 %{_libdir}/{libmysqlclient.so.18,libmariadb.so,libmysqlclient.so,libmysqlclient_r.so}
 %{_bindir}/mysql_config*
 %{_bindir}/mariadb_config*
@@ -1656,6 +1680,24 @@ fi
 %endif
 
 %changelog
+* Mon Dec 18 2023 Michal Schorm <mschorm@redhat.com> - 3:10.11.6-1
+- Rebase to 10.11.6
+
+* Mon Dec 18 2023 Michal Schorm <mschorm@redhat.com> - 3:10.10.7-1
+- Rebase to 10.10.7
+
+* Mon Dec 18 2023 Michal Schorm <mschorm@redhat.com> - 3:10.9.8-1
+- Rebase to 10.9.8
+
+* Mon Dec 18 2023 Michal Schorm <mschorm@redhat.com> - 3:10.8.8-1
+- Rebase to 10.8.8
+
+* Mon Dec 18 2023 Michal Schorm <mschorm@redhat.com> - 3:10.7.8-1
+- Rebase to 10.7.8
+
+* Mon Dec 18 2023 Michal Schorm <mschorm@redhat.com> - 3:10.6.16-1
+- Rebase to 10.6.16
+
 * Mon Sep 04 2023 Michal Schorm <mschorm@redhat.com> - 3:10.5.22-1
 - Rebase to 10.5.22