Mark RISC-V64 as 64-bit architecture

import UBI mariadb10.11-10.11.15-2.el10_1
import UBI mariadb10.11-10.11.15-1.el10_1
2026-04-22 13:18:14 +00:00 · 2026-03-17 10:23:24 -04:00 · 2026-01-06 17:19:03 +00:00 · 2025-05-14 15:09:10 +00:00
19 changed files with 186 additions and 400 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -1 +0,0 @@
-1
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1,2 @@
-/*/
-/*.rpm
-/*.tar.gz
-/*.zip
+fmt-11.0.2.zip
+mariadb-10.11.15.tar.gz
--- a/README.md
+++ b/README.md
@ -1,3 +0,0 @@
-# mariadb10.11
-
-The mariadb10.11 package
--- a/gating.yaml
+++ b/gating.yaml
@ -1,7 +0,0 @@
--- !Policy
-product_versions:
-  - rhel-10
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
--- a/mariadb-ssl-cypher.patch
+++ b/mariadb-ssl-cypher.patch
@ -1,21 +0,0 @@
-diff -up mariadb-10.1.19/mysql-test/r/ssl_8k_key.result.sslbak mariadb-10.1.19/mysql-test/r/ssl_8k_key.result
--- mariadb-10.1.19/mysql-test/r/ssl_8k_key.result.sslbak	2016-11-24 08:55:21.637000000 -0500
-+++ mariadb-10.1.19/mysql-test/r/ssl_8k_key.result	2016-11-24 08:55:55.853000000 -0500
-@@ -1,2 +1,2 @@
-Variable_name	Value
-Ssl_cipher	DHE-RSA-AES256-SHA
-+have_ssl
-+1
-diff -up mariadb-10.1.19/mysql-test/t/ssl_8k_key.test.sslbak mariadb-10.1.19/mysql-test/t/ssl_8k_key.test
--- mariadb-10.1.19/mysql-test/t/ssl_8k_key.test.sslbak	2016-11-24 08:54:10.485000000 -0500
-+++ mariadb-10.1.19/mysql-test/t/ssl_8k_key.test	2016-11-24 08:54:35.724000000 -0500
-@@ -5,7 +5,7 @@
- #
- # Bug#29784 YaSSL assertion failure when reading 8k key.
- #
---exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1
-+--exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher'" 2>&1
- 
- ##  This test file is for testing encrypted communication only, not other
- ##  encryption routines that the SSL library happens to provide!
-
--- a/mariadb.rpmlintrc
+++ b/mariadb.rpmlintrc
@ -1,79 +0,0 @@
-# THIS FILE SERVES FOR WHITELISTING RPMLINT ERRORS AND WARNINGS IN TASKOTRON
-# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#Whitelisting_errors
-
-# (same file in python3 package served as a great example)
-
-
-
-# Spelling errors
-addFilter(r'spelling-error .* en_US (cnf|mysqld|benchmarking|pam|passwordless|subpackage|libmariadb|mariadbd) ')
-
-# Debugsource
-addFilter(r'^mariadb.*debugsource\.[^:]+: (E|W): no-documentation')
-# Debuginfo
-addFilter(r'^mariadb.*debuginfo\.[^:]+: (E|W): useless-provides debuginfo\(build-id\)')
-# Debug symlinks
-addFilter(r'dangling-relative-symlink /usr/lib/.build-id')
-
-# Testsuite
-#   Some expected tests results are zero-length files
-addFilter(r'(zero-length|pem-certificate) /usr/share/mysql-test/*')
-
-# Chroot function
-#   False positive; checked by upstream
-addFilter(r'missing-call-to-chdir-with-chroot')
-
-# Missing documentation
-#   I don't think that's on the upstream priority list
-addFilter(r'no-documentation')
-addFilter(r'no-manual-page-for-binary')
-
-# Obsoleted not provided
-#   Obsoleting upstream packages, not providing them is expected to not mix them up
-addFilter(r'obsolete-not-provided MySQL')
-#   Provided by mariadb-connector-c
-addFilter(r'obsolete-not-provided mariadb-libs')
-#   Upstream dropped support
-addFilter(r'obsolete-not-provided mariadb-bench')
-addFilter(r'obsolete-not-provided mariadb-tokudb-engine')
-
-# Config file without noreplace flag
-#   Don't replace logs that may contain old entries
-addFilter(r'conffile-without-noreplace-flag /var/log/mariadb/mariadb.log')
-
-# Log rotation
-#   MariaDB log rotation script is commented out, because it is still not ready for big industry usage.
-#   Let the user decide, if they want to enable it (uncomment it)
-addFilter(r'incoherent-logrotate-file /etc/logrotate.d/mariadb')
-
-# Permissions
-# wsrep_sst_common
-#   It contains a parser of arguments for other sst scripts.
-#   It is meant to be sourced, not to be executed alone.
-#   So it correctly does not have shebang nor executable bit.
-addFilter(r'non-executable-in-bin /usr/bin/wsrep_sst_common 644')
-addFilter(r'script-without-shebang /usr/bin/wsrep_sst_common')
-addFilter(r'non-executable-script /usr/bin/wsrep_sst_common 644 None')
-# mariadb-scripts-common has a similar issue
-addFilter(r'non-executable-script /usr/libexec/mariadb-scripts-common 644 /bin/sh')
-# Seems pretty standard to me ...
-addFilter(r'non-standard-dir-perm /var/log/mariadb 750')
-# 640 is IMO also prety OK
-addFilter(r'non-readable /etc/sysconfig/clustercheck 640')
-
-# Unversioned bundles
-#  RocksDB has so rapid developement, it it not compatible through versions.
-#  That means we need to stick to the exact verison upstream use.
-addFilter(r'unversioned-explicit-provides bundled\(rocksdb\)')
-
-# Testsuite errors
-addFilter(r'non-executable-script /usr/share/mysql-test')
-addFilter(r'arch-dependent-file-in-usr-share /usr/share/mysql-test')
-
-# Comments at the end of RPM %endif tags
-addFilter(r'extra tokens at the end of %endif directive')
-
-# PAM plugin specialities - all expected
-addFilter(r'non-conffile-in-etc /etc/security/user_map.conf')
-addFilter(r'setuid-binary /usr/lib64/mariadb/plugin/auth_pam_tool_dir/auth_pam_tool')
-addFilter(r'non-standard-executable-perm /usr/lib64/mariadb/plugin/auth_pam_tool_dir/auth_pam_tool')
--- a/mariadb.tmpfiles.d.in
+++ b/mariadb.tmpfiles.d.in
@ -1,3 +1,8 @@
 # Do not edit this file.
 # To override this, put /etc/tmpfiles.d/mariadb.conf instead.
 d @PID_FILE_DIR@ 0755 mysql mysql -
+
+# Rules for ephemeral file systems (ImageMode)
+d /var/lib/mysql 0755 mysql mysql -
+d /var/log/mariadb 0750 mysql mysql -
+f /var/log/mariadb/mariadb.log 0660 mysql mysql -
--- a/mariadb10.11.spec
+++ b/mariadb10.11.spec
@ -1,6 +1,6 @@
 # Plain package name for cases, where %%{name} differs (e.g. for versioned packages)
 %global majorname mariadb
-%define package_version 10.11.11
+%define package_version 10.11.15
 %define majorversion %(echo %{package_version} | cut -d'.' -f1-2 )

 # Set if this package will be the default one in distribution
@ -15,7 +15,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.11.11
+%global last_tested_version 10.11.15
 # Set to 1 to force run the testsuite even if it was already tested in current version
 %global force_run_testsuite 0

@ -116,12 +116,8 @@
 # MariaDB 10.0 and later requires pcre >= 10.34, otherwise we need to use
 # the bundled library, since the package cannot be build with older version
 #   https://mariadb.com/kb/en/pcre/
-%if 0%{?fedora} || 0%{?rhel} > 8
-%bcond_without unbundled_pcre
-%else
 %bcond_with unbundled_pcre
-%global pcre_bundled_version 10.44
-%endif
+%global pcre_bundled_version 10.46

 # To avoid issues with a breaking change in FMT library, bundle it on systems where FMT wasn't fixed yet
 # See mariadb-libfmt.patch for detailed description.
@ -157,7 +153,7 @@

 Name:             %{majorname}%{majorversion}
 Version:          %{package_version}
-Release:          1%{?with_debug:.debug}%{?dist}
+Release:          2%{?with_debug:.debug}%{?dist}.alma.1
 Epoch:            3

 Summary:          A very fast and robust SQL database server
@ -223,6 +219,11 @@ Patch12:          rocksdb-6.8-gcc13.patch
 Patch13:          %{majorname}-libfmt.patch
 #   Patch14: make MTR port calculation reasonably predictable
 Patch14:          %{majorname}-mtr.patch
+#   Patch15: fix bundled pcre version to 10.46 because of CVE-2025-58050
+Patch15:          pcre_bundling.patch
+
+# AlmaLinux Patch
+Patch1001: mark-RISC-V64-as-64-bit-architecture.patch

 # This macro is used for package/sub-package names in the entire specfile
 %if %?mariadb_default
@ -331,10 +332,10 @@ Recommends:       %{pkgname}-client-utils

 Suggests:         %{pkgname}-server%{?_isa} = %{sameevr}

-%{?with_conflicts_mysql:Conflicts: mysql}
+%{?with_conflicts_mysql:Conflicts: mysql-any}
 %{?with_conflicts_community_mysql:Conflicts: community-mysql}
 # Explicitly disallow combination mariadb + mysql-server
-%{?with_conflicts_mysql:Conflicts: mysql-server}
+%{?with_conflicts_mysql:Conflicts: mysql-server-any}
 %{?with_conflicts_community_mysql:Conflicts: community-mysql-server}

 %define conflict_with_other_streams() %{expand:\
@ -366,13 +367,14 @@ a server daemon (mariadbd) and many different client programs and libraries.
 The base package contains the standard MariaDB/MySQL client programs and
 utilities.

+%if %?mariadb_default
 %description -n %{pkgname}
 MariaDB is a community developed fork from MySQL - a multi-user, multi-threaded
 SQL database server. It is a client/server implementation consisting of
 a server daemon (mariadbd) and many different client programs and libraries.
 The base package contains the standard MariaDB/MySQL client programs and
 utilities.
-
+%endif

 %package          -n %{pkgname}-client-utils
 Summary:          Non-essential client utilities for MariaDB/MySQL applications
@ -395,7 +397,7 @@ Requires:         %{pkgname}-common = %{sameevr}

 %virtual_conflicts_and_provides libs

-%{?with_conflicts_mysql:Conflicts: mysql-libs}
+%{?with_conflicts_mysql:Conflicts: mysql-libs-any}
 %{?with_conflicts_community_mysql:Conflicts: community-mysql-libs}

 %description      -n %{pkgname}-libs
@ -543,11 +545,13 @@ Requires:         systemd
 %{?systemd_requires}
 # RHBZ#1496131; use 'iproute' instead of 'net-tools'
 Requires:         iproute
+# The 'wsrep_sst_common' and 'wsrep_sst_rsync_tunnel' calls 'which' utility
+%{?with_galera:Requires: which}

-%{?with_conflicts_mysql:Conflicts: mysql-server}
+%{?with_conflicts_mysql:Conflicts: mysql-server-any}
 %{?with_conflicts_community_mysql:Conflicts: community-mysql-server}
 # Explicitly disallow combination mariadb-server + mysql
-%{?with_conflicts_mysql:Conflicts: mysql}
+%{?with_conflicts_mysql:Conflicts: mysql-any}
 %{?with_conflicts_community_mysql:Conflicts: community-mysql}

 %description      -n %{pkgname}-server
@ -616,6 +620,7 @@ For InnoDB, "hot online" backups are possible.
 Summary:          The RocksDB storage engine for MariaDB
 Requires:         %{pkgname}-server%{?_isa} = %{sameevr}
 Provides:         bundled(rocksdb)
+Conflicts:        rocksdb-tools

 %virtual_conflicts_and_provides rocksdb-engine

@ -716,7 +721,7 @@ Requires:         perl(DBI) perl(DBD::MariaDB)

 %virtual_conflicts_and_provides server-utils

-%{?with_conflicts_mysql:Conflicts: mysql-server}
+%{?with_conflicts_mysql:Conflicts: mysql-server-any}
 %{?with_conflicts_community_mysql:Conflicts: community-mysql-server}

 %description      -n %{pkgname}-server-utils
@ -737,7 +742,7 @@ Requires:         mariadb-connector-c-devel >= 3.0

 %virtual_conflicts_and_provides devel

-%{?with_conflicts_mysql:Conflicts: mysql-devel}
+%{?with_conflicts_mysql:Conflicts: mysql-devel-any}
 %{?with_conflicts_community_mysql:Conflicts: community-mysql-devel}

 %description      -n %{pkgname}-devel
@ -810,7 +815,7 @@ Requires:         perl(Time::HiRes)

 %virtual_conflicts_and_provides test

-%{?with_conflicts_mysql:Conflicts: mysql-test}
+%{?with_conflicts_mysql:Conflicts: mysql-test-any}
 %{?with_conflicts_community_mysql:Conflicts: community-mysql-test}

 %description      -n %{pkgname}-test
@ -840,7 +845,7 @@ mv %{SOURCE1} redhat-linux-build/extra/libfmt/
 # Remove JAR files that upstream puts into tarball
 find . -name "*.jar" -type f -exec rm --verbose -f {} \;
 # Remove testsuite for the mariadb-connector-c
-rm -rf libmariadb/unittest
+rm -r libmariadb/unittest
 %if %{without rocksdb}
 rm -r storage/rocksdb/
 %endif
@ -857,6 +862,12 @@ rm -r storage/rocksdb/
 %endif

 %patch -P14 -p1
+%if %{without unbundled_pcre}
+%patch -P15 -p1
+%endif
+
+# Applying AlmaLinux Patch
+%patch -P1001 -p1 -b .mark-RISC-V64-as-64-bit-architecture

 # generate a list of tests that fail, but are not disabled by upstream
 cat %{SOURCE50} | tee -a mysql-test/unstable-tests
@ -877,6 +888,12 @@ cat %{SOURCE53} | tee -a mysql-test/unstable-tests
 cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} \
   %{SOURCE14} %{SOURCE15} %{SOURCE16} %{SOURCE18} %{SOURCE70} %{SOURCE73} scripts

+# Create a sysusers.d config file
+# We no longer enforce the hardcoded UID/GID 27.
+cat > support-files/%{name}.sysusers.conf << EOF
+u mysql 27 'MariaDB and MySQL Server' %{dbdatadir} -
+EOF
+
 %if %{with galera}
 # prepare selinux policy
 mkdir selinux
@ -885,7 +902,7 @@ sed 's/mariadb-server-galera/%{majorname}-server-galera/' %{SOURCE72} > selinux/


 # Get version of PCRE, that upstream use
-pcre_version=`grep -e "https://github.com/PCRE2Project/pcre2/releases/download" cmake/pcre.cmake | sed -r "s;.*pcre2-([[:digit:]]+\.[[:digit:]]+).*;\1;" `
+pcre_version=`grep -e "URL \"" cmake/pcre.cmake | sed -r "s;.*pcre2-([[:digit:]]+\.[[:digit:]]+).*;\1;" `

 # Check if the PCRE version in macro 'pcre_bundled_version', used in Provides: bundled(...), is the same version as upstream actually bundles
 %if %{without unbundled_pcre}
@ -915,6 +932,27 @@ fi
    fi
 %endif

+
+# Adjust the compliation flags:
+# First initialize the distribution default values
+%{set_build_flags}
+# Add custom tweaks
+CFLAGS="$CFLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
+# Force the 'PIC' mode so that we can build libmysqld.so
+CFLAGS="$CFLAGS -fPIC"
+
+# When making a debug build, remove all optimizations
+%if %{with debug}
+# -D_FORTIFY_SOURCE requires optimizations enabled. Disable the fortify.
+%undefine _fortify_level
+CFLAGS=`echo "$CFLAGS" | sed -r 's/-O[0123]//'`
+CFLAGS="$CFLAGS -O0 -g"
+%endif
+
+# Apply the updated values
+CXXFLAGS="$CFLAGS"; CPPFLAGS="$CFLAGS"; export CFLAGS CXXFLAGS CPPFLAGS
+
+
 # The INSTALL_xxx macros have to be specified relative to CMAKE_INSTALL_PREFIX
 # so we can't use %%{_datadir} and so forth here.
 %cmake \
@ -943,8 +981,7 @@ fi
         -DINSTALL_SCRIPTDIR=bin \
         -DINSTALL_SUPPORTFILESDIR=share/%{majorname} \
         -DMYSQL_DATADIR="%{dbdatadir}" \
-         -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
-         -DTMPDIR=/var/tmp \
+         -DTMPDIR=%{_localstatedir}/tmp \
         -DGRN_DATA_DIR=share/%{majorname}-server/groonga \
         -DGROONGA_NORMALIZER_MYSQL_PROJECT_NAME=%{majorname}-server/groonga-normalizer-mysql \
         -DENABLED_LOCAL_INFILE=ON \
@ -972,6 +1009,7 @@ fi
         -DPLUGIN_SPHINX=%{?with_sphinx:DYNAMIC}%{!?with_sphinx:NO} \
         -DPLUGIN_CONNECT=%{?with_connect:DYNAMIC}%{!?with_connect:NO} \
         -DPLUGIN_S3=%{?with_s3:DYNAMIC}%{!?with_s3:NO} \
+         -DPLUGIN_AUTH_GSSAPI=%{?with_gssapi:DYNAMIC}%{!?with_gssapi:NO} \
         -DPLUGIN_AUTH_PAM=%{?with_pam:YES}%{!?with_pam:NO} \
         -DPLUGIN_AUTH_PAM_V1=%{?with_pam:DYNAMIC}%{!?with_pam:NO} \
         -DPLUGIN_COLUMNSTORE=NO \
@ -987,35 +1025,8 @@ fi
 # The issue is that the MariaDB upstream level of hardening is lower than expected by Red Hat
 # We disable this option to the default compilation flags (which have higher level of hardening) will be used

-
-CFLAGS="$CFLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
-# force PIC mode so that we can build libmysqld.so
-CFLAGS="$CFLAGS -fPIC"
-
-%if %{with debug}
-# Override all optimization flags when making a debug build
-# -D_FORTIFY_SOURCE requires optimizations enabled. Disable the fortify.
-%undefine _fortify_level
-CFLAGS=`echo "$CFLAGS" | sed -r 's/-O[0123]//'`
-
-CFLAGS="$CFLAGS -O0 -g"
-
-# Fixes for Fedora 32 & Rawhide (GCC 10.0):
-%if 0%{?fedora} >= 32
-CFLAGS="$CFLAGS -Wno-error=class-memaccess"
-CFLAGS="$CFLAGS -Wno-error=enum-conversion"
-# endif f32
-%endif
-# endif debug
-%endif
-
-CXXFLAGS="$CFLAGS"
-CPPFLAGS="$CFLAGS"
-export CFLAGS CXXFLAGS CPPFLAGS
-
-
-# Print all Cmake options values; "-LAH" means "List Advanced Help"
-cmake -B %{_vpath_builddir} -LAH
+# Print all cached CMake options values; "-N" means to run in read-only mode; "-LAH" means "List Advanced Help" for each option
+cmake -B %{_vpath_builddir} -N -LAH

 %cmake_build

@ -1078,9 +1089,6 @@ mv %{buildroot}%{_sysconfdir}/my.cnf.d/server.cnf %{buildroot}%{_sysconfdir}/my.
 rm %{buildroot}%{_libexecdir}/rcmysql
 # Remove upstream Systemd service files
 rm -r %{buildroot}%{_datadir}/%{majorname}/systemd
-# Our downstream Systemd service file have set aliases to the "mysql" names in the [Install] section.
-# They can be enabled / disabled by "systemctl enable / diable <service_name>"
-rm %{buildroot}%{_unitdir}/{mysql,mysqld}.service

 # install systemd unit files and scripts for handling server startup
 install -D -p -m 644 %{_vpath_builddir}/scripts/mysql.service %{buildroot}%{_unitdir}/%{daemon_name}.service
@ -1094,7 +1102,9 @@ install -p -m 644 %{_vpath_builddir}/scripts/mariadb-scripts-common %{buildroot}

 # Install downstream version of tmpfiles
 install -D -p -m 0644 %{_vpath_builddir}/scripts/mariadb.tmpfiles.d %{buildroot}%{_tmpfilesdir}/%{majorname}.conf
-echo "d %{pidfiledir} 0755 mysql mysql -" >>%{buildroot}%{_tmpfilesdir}/%{majorname}.conf
+
+# Install downstream version of sysusers.d config
+install -m0644 -D support-files/%{name}.sysusers.conf %{buildroot}%{_sysusersdir}/%{majorname}.conf

 # Install additional cracklib selinux policy
 %if %{with cracklib}
@ -1211,7 +1221,7 @@ unlink %{buildroot}%{_libdir}/libmariadb.so
 rm %{buildroot}%{_mandir}/man3/*
 # Client plugins
 rm %{buildroot}%{_libdir}/%{majorname}/plugin/{dialog.so,mysql_clear_password.so,sha256_password.so}
-%if %{with gssapi}
+%if %{with gssapi} || %{with hashicorp}
 rm %{buildroot}%{_libdir}/%{majorname}/plugin/auth_gssapi_client.so
 %endif
 %endif
@ -1654,6 +1664,7 @@ fi
 # More on socket activation or extra port service at
 # https://mariadb.com/kb/en/systemd/
 %{_unitdir}/%{daemon_name}.service
+%{_unitdir}/mysql{,d}.service
 %{_unitdir}/%{daemon_name}@.service
 %{_unitdir}/%{daemon_name}.socket
 %{_unitdir}/%{daemon_name}@.socket
@ -1666,6 +1677,7 @@ fi
 %{_libexecdir}/mariadb-check-upgrade
 %{_libexecdir}/mariadb-scripts-common

+# Remember to also update the mariadb.tmpfiles.d.in file when updating these permissions
 %attr(0755,mysql,mysql) %dir %{pidfiledir}
 %attr(0755,mysql,mysql) %dir %{dbdatadir}
 %attr(0750,mysql,mysql) %dir %{logfiledir}
@ -1805,6 +1817,32 @@ fi
 %endif

 %changelog
+* Wed Apr 22 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 3:10.11.15-2.alma.1
+- Mark RISC-V64 as 64-bit architecture
+
+* Tue Jan 20 2026 Petr Khartskhaev <pkhartsk@redhat.com> - 3:10.11.15-2
+- Updated service files to work with environment files
+
+* Mon Dec 01 2025 Petr Khartskhaev <pkhartsk@redhat.com> - 3:10.11.15-1
+- Rebase to 10.11.15
+- Resolves: RHBZ#2417697
+
+* Wed Nov 19 2025 Petr Khartskhaev <pkhartsk@redhat.com> - 3:10.11.14-3
+- Add installation of downstream sysusers.d config file in place of the upstream one
+
+* Wed Oct 29 2025 Nikola Davidova <ndavidov@redhat.com> - 3:10.11.14-3
+- Bump release for tmpfiles.d change
+
+* Mon Oct 27 2025 Lukas Javorsky <ljavorsk@redhat.com> - 3:10.11.14-2
+- Revert to soft static allocation of MariaDB and MySQL sysusers.d files
+
+* Tue Aug 12 2025 Pavol Sloboda <psloboda@redhat.com> - 3:10.11.14-1
+- Rebase to 10.11.14
+- Resolves: RHBZ#2386961
+
+* Fri Jun 06 2025 Pavol Sloboda <psloboda@redhat.com> - 3:10.11.13-1
+- Rebase to 10.11.13
+
 * Fri Feb 07 2025 Michal Schorm <mschorm@redhat.com> - 3:10.11.11-1
 - Rebase to 10.11.11

--- a/mark-RISC-V64-as-64-bit-architecture.patch
+++ b/mark-RISC-V64-as-64-bit-architecture.patch
@ -0,0 +1,30 @@
+Upstream-status: https://github.com/mariadb-corporation/mariadb-connector-c/pull/295
+
+
+From d43c1ac8479431281ee524a754fd17126e08f0d5 Mon Sep 17 00:00:00 2001
+Message-ID: <d43c1ac8479431281ee524a754fd17126e08f0d5.1764580375.git.mjuszkiewicz@redhat.com>
+From: Marcin Juszkiewicz <mjuszkiewicz@redhat.com>
+Date: Mon, 1 Dec 2025 10:10:17 +0100
+Subject: [PATCH] mark RISC-V64 as 64-bit architecture
+
+Signed-off-by: Marcin Juszkiewicz <mjuszkiewicz@redhat.com>
+---
+ cmake/install.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libmariadb/cmake/install.cmake b/libmariadb/cmake/install.cmake
+index 90bae8b5..264e2ace 100644
+--- a/libmariadb/cmake/install.cmake
+++ b/libmariadb/cmake/install.cmake
+@@ -76,7 +76,7 @@ SET(LIBMARIADB_STATIC_DEFAULT "mariadbclient")
+ # RPM layout
+ #
+ SET(INSTALL_BINDIR_RPM "bin")
+-IF((CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le" OR CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "s390x") AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+IF((CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le" OR CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "s390x" OR CMAKE_SYSTEM_PROCESSOR MATCHES "riscv64") AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+   SET(INSTALL_LIBDIR_RPM "lib64/mariadb")
+   SET(INSTALL_PCDIR_RPM "lib64/pkgconfig")
+   SET(INSTALL_PLUGINDIR_RPM "lib64/mariadb/plugin")
+-- 
+2.52.0
+
--- a/mysql.service.in
+++ b/mysql.service.in
@ -32,15 +32,34 @@ Type=notify
 User=mysql
 Group=mysql

+# Use an environment file to pass variable _WSREP_NEW_CLUSTER
+EnvironmentFile=-@INSTALL_RUNDATADIR@/wsrep-new-cluster
+# Use an environment file to pass variable _WSREP_START_POSITION
+EnvironmentFile=-@INSTALL_RUNDATADIR@/wsrep-start-position
+
 ExecStartPre=@libexecdir@/mariadb-check-socket
 # '%n' expands to 'Full unit name'; man systemd.unit
 ExecStartPre=@libexecdir@/mariadb-prepare-db-dir %n
+
+# Perform automatic wsrep recovery. When server is started without wsrep,
+# galera_recovery simply returns an empty string. In any case, however,
+# the script is not expected to return with a non-zero status.
+# It is always safe to remove @INSTALL_RUNDATADIR@/wsrep-start-position
+# environment file.
+# Do not panic if galera_recovery script is not available. (MDEV-10538)
+ExecStartPre=/bin/sh -c "[ ! -e @bindir@/galera_recovery ] && VAR= || \
+ VAR=`@bindir@/galera_recovery`; [ $? -eq 0 ] \
+ && echo _WSREP_START_POSITION=$VAR > @INSTALL_RUNDATADIR@/wsrep-start-position || exit 1"
+
 # MYSQLD_OPTS here is for users to set in /etc/systemd/system/@DAEMON_NAME@@.service.d/MY_SPECIAL.conf
 # Note: we set --basedir to prevent probes that might trigger SELinux alarms,
 # per bug #547485
-ExecStart=@libexecdir@/mariadbd --basedir=@prefix@ $MYSQLD_OPTS $_WSREP_NEW_CLUSTER
+ExecStart=@libexecdir@/mariadbd --basedir=@prefix@ $MYSQLD_OPTS $_WSREP_NEW_CLUSTER $_WSREP_START_POSITION
 ExecStartPost=@libexecdir@/mariadb-check-upgrade

+# Unset _WSREP_START_POSITION environment variable.
+ExecStartPost=/bin/rm -f @INSTALL_RUNDATADIR@/wsrep-start-position
+
 # Setting this to true can break replication and the Type=notify settings
 # See also bind-address MariaDB option.
 PrivateNetwork=false
--- a/mysql@.service.in
+++ b/mysql@.service.in
@ -54,14 +54,33 @@ Type=notify
 User=mysql
 Group=mysql

+# Use an environment file to pass variable _WSREP_NEW_CLUSTER
+EnvironmentFile=-@INSTALL_RUNDATADIR@/wsrep-new-cluster
+# Use an environment file to pass variable _WSREP_START_POSITION
+EnvironmentFile=-@INSTALL_RUNDATADIR@/wsrep-start-position
+
 ExecStartPre=@libexecdir@/mariadb-check-socket --defaults-group-suffix=.%I
 ExecStartPre=@libexecdir@/mariadb-prepare-db-dir --defaults-group-suffix=.%I %n
+
+# Perform automatic wsrep recovery. When server is started without wsrep,
+# galera_recovery simply returns an empty string. In any case, however,
+# the script is not expected to return with a non-zero status.
+# It is always safe to remove @INSTALL_RUNDATADIR@/wsrep-start-position
+# environment file.
+# Do not panic if galera_recovery script is not available. (MDEV-10538)
+ExecStartPre=/bin/sh -c "[ ! -e @bindir@/galera_recovery ] && VAR= || \
+ VAR=`@bindir@/galera_recovery`; [ $? -eq 0 ] \
+ && echo _WSREP_START_POSITION=$VAR > @INSTALL_RUNDATADIR@/wsrep-start-position || exit 1"
+
 # MYSQLD_OPTS here is for users to set in /etc/systemd/system/@DAEMON_NAME@@.service.d/MY_SPECIAL.conf
 # Note: we set --basedir to prevent probes that might trigger SELinux alarms,
 # per bug #547485
-ExecStart=@libexecdir@/mariadbd --defaults-group-suffix=.%I --basedir=@prefix@ $MYSQLD_OPTS $_WSREP_NEW_CLUSTER
+ExecStart=@libexecdir@/mariadbd --defaults-group-suffix=.%I --basedir=@prefix@ $MYSQLD_OPTS $_WSREP_NEW_CLUSTER $_WSREP_START_POSITION
 ExecStartPost=@libexecdir@/mariadb-check-upgrade --defaults-group-suffix=.%I

+# Unset _WSREP_START_POSITION environment variable.
+ExecStartPost=/bin/rm -f @INSTALL_RUNDATADIR@/wsrep-start-position
+
 # Setting this to true can break replication and the Type=notify settings
 # See also bind-address MariaDB option.
 PrivateNetwork=false
--- a/pcre_bundling.patch
+++ b/pcre_bundling.patch
@ -0,0 +1,15 @@
+diff --git a/cmake/pcre.cmake b/cmake/pcre.cmake
+index 08353e92..fc869ba9 100644
+--- a/cmake/pcre.cmake
+++ b/cmake/pcre.cmake
+@@ -64,8 +64,8 @@ MACRO(BUNDLE_PCRE2)
+   ExternalProject_Add(
+     pcre2
+     PREFIX   "${dir}"
+-    URL "https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.45/pcre2-10.45.zip"
+-    URL_MD5 873da56c6469ec207ca5c5ae9688b83a
+    URL "file:///${dir}/pcre2-10.46.zip"
+    URL_MD5 261f3f9e14b6ce175103c5118a189faa
+     INSTALL_COMMAND ""
+     CMAKE_ARGS
+       "-DCMAKE_WARN_DEPRECATED=FALSE"
--- a/plans/tier1-internal.fmf
+++ b/plans/tier1-internal.fmf
@ -1,10 +0,0 @@
-summary: Internal Tier1 tests plan
-discover:
-    how: fmf
-    filter: 'tier: 1'
-    url: https://pkgs.devel.redhat.com/git/tests/mariadb55
-execute:
-    how: tmt
-adjust:
-    enabled: false
-    when: distro == centos-stream or distro == fedora
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@ -1,50 +0,0 @@
-# Set up global ignore list
-ignore:
-    # mysql-test/ directory contains an extensive test-suite of about 20.000 files;
-    # It is very time consuming to be fully analysed and the results aren't useful anyway
-    # It is expected the tests change during rebases, as the underlying functionality the test evolve
-    # Some of the tests contain broken or problematic code, however that is on purpose
-    - /usr/share/mysql-test/
-
-# based on https://lists.launchpad.net/maria-discuss/msg06133.html discussion
-# are the invalid xmls (except for Index.xml) present in the sources on purpose
-# and they can be removed from xmllint rpminspect check in the CI process.
-#
-# A bug report [https://jira.mariadb.org/browse/MDEV-26905] was created in the upstream
-# for the Index.xml file.
-#
-# Fedora CI picks up the rpmlimspect.yaml for specific package in the dist-git repo
-#[ref: https://rpminspect.readthedocs.io/en/latest/configuration.html#rpminspect-yaml]
-#
-xml:
-  ignore:
-    - /usr/share/mysql-test/std_data/loadxml.dat
-    - /usr/share/mysql-test/std_data/loaddata/mdev9874.xml
-    - /usr/share/mysql-test/std_data/ldml/Index.xml
-    - /usr/share/mysql-test/plugin/sphinx/sphinx/testdata.xml
-    - /usr/share/mysql-test/plugin/connect/connect/std_data/nocs.xml
-    - /usr/share/mariadb/charsets/Index.xml
-
-# ignore bad functions in resolveip binary, based on BZ1973194
-# all forbidden functions listed in main rpminspect config
-# have to be menioned also here, else it would not be checked for them
-badfuncs:
-    - gethostbyname
-    - gethostbyname2
-    - gethostbyaddr
-    - inet_addr
-    - inet_aton
-    - inet_nsap_addr
-    - inet_ntoa
-    - inet_nsap_ntoa
-    - inet_makeaddr
-    - inet_netof
-    - inet_network
-    - inet_neta
-    - inet_net_ntop
-    - inet_net_pton
-    - rcmd
-    - rexec
-    - rresvport
-    ignore:
-        - /usr/bin/resolveip
--- a/2
+++ b/2
@ -1,2 +1,2 @@
-SHA512 (mariadb-10.11.11.tar.gz) = d9c154207a9f435ce08d5fbfe31814a739e577c656ef9996cf7e60c2cad8b4c07e2de8d94b6191fefa2b5cbde56437b586f85f144d3b4fcec8533449ed8411ac
 SHA512 (fmt-11.0.2.zip) = 06eba9a2a8d1c2269801e10a00ed26a9344b79bca0391a6b10f35e9716682f8345125fceb96e9ca36ffbd4c0558b0e63e4c45a9dff09a8ee186458ec68e34198
+SHA512 (mariadb-10.11.15.tar.gz) = 98d1e54954b69cf87a96be7d76f80333f27832a29279e6b0a9615b830e171713222abcb9ec9b9a545c0fc4a0f9f8e3d4774babcabf534a6fa3cb3dfdaed0dedc
--- a/tests/basic_service/Makefile
+++ b/tests/basic_service/Makefile
@ -1,62 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /CoreOS/tests/Sanity/basic_service
-#   Description: The very basic service testing
-#   Author: Michal Schorm <mschorm@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2018 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=basic_service
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	test -x runtest.sh || chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Michal Schorm <mschorm@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     The very basic service testing" >> $(METADATA)
-	@echo "Type:            Sanity" >> $(METADATA)
-	@echo "TestTime:        5m" >> $(METADATA)
-	@echo "RunFor:          mariadb" >> $(METADATA)
-	@echo "Requires:        mariadb" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2+" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-
-	rhts-lint $(METADATA)
--- a/tests/basic_service/PURPOSE
+++ b/tests/basic_service/PURPOSE
@ -1,3 +0,0 @@
-PURPOSE of basic_service
-Description: The very basic service testing
-Author: Michal Schorm <mschorm@redhat.com>
--- a/tests/basic_service/runtest.sh
+++ b/tests/basic_service/runtest.sh
@ -1,72 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of basic_service
-#   Description: The very basic service testing
-#   Author: Michal Schorm <mschorm@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2018 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="mariadb"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm $PACKAGE
-        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-        rlRun "systemctl stop mariadb"
-        rlRun "pushd $TmpDir"
-    rlPhaseEnd
-
-
-
-    rlPhaseStartTest
-        rlRun "systemctl -q status mariadb" 3 "Test status of dead service"
-        rlRun "systemctl -q start mariadb" 0 "Start mariadb service"
-        rlRun "systemctl -q status mariadb" 0 "Test status of running mariadb service"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "systemctl -q restart mariadb" 0 "Restart running mariadb service"
-        rlRun "systemctl -q status mariadb" 0 "Test status of running mariadb service"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "systemctl -q stop mariadb" 0 "Stop mariadb service"
-        rlRun "systemctl -q status mariadb" 3 "Test status of dead mariadb service"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "systemctl -q start mariadb" 0 "Start mariadb service"
-        rlRun "systemctl -q status mariadb" 0 "Test status of running mariadb service"
-    rlPhaseEnd
-
-
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
--- a/tests/tests.yml
+++ b/tests/tests.yml
@ -1,30 +0,0 @@
---
-
-# --------------------------------------------------
-# This is an experiment with Fedora CI
-#
-# Refer to:
-# https://fedoraproject.org/wiki/CI/Tests
-#
-# TL;DR you have to, as root:
-#  1) # dnf install ansible python2-dnf libselinux-python standard-test-roles
-#  2) install the packages to be tested
-#  3) # ansible-playbook tests.yml
-#
-# Warning !!
-#  DO NOT run it on a machine that SHOULD NOT be destroyed.
-#
-# --------------------------------------------------
-
-# Tests that run in classic context
- hosts: localhost
-  roles:
-  - role: standard-test-beakerlib
-    tags:
-    - classic
-    tests:
-    - basic_service
-    required_packages:
-    - mariadb
-
-
Author	SHA1	Message	Date
Andrew Lukoshko	97b335e1ae	Mark RISC-V64 as 64-bit architecture	2026-04-22 13:18:14 +00:00
AlmaLinux RelEng Bot	4065211fed	import UBI mariadb10.11-10.11.15-2.el10_1	2026-03-17 10:23:24 -04:00
eabdullin	54ac430cd9	import UBI mariadb10.11-10.11.15-1.el10_1	2026-01-06 17:19:03 +00:00
eabdullin	cfd22272c3	import UBI mariadb10.11-10.11.11-1.el10	2025-05-14 15:09:10 +00:00