The package rpms/mariadb.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/mariadb.git/commit/?id=10445d7e27....
Change:
+%ifarch i686
Thanks.
Full change:
============
commit 33c8c26fc3317b6f49425e66a4e8af54e22dad2e
Author: Michal Schorm <mschorm(a)redhat.com>
Date: Thu Sep 21 07:07:59 2023 +0200
Testsuite verification for 10.5.22 version
diff --git a/mariadb.spec b/mariadb.spec
index a5ba922..a2ab7c1 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -11,7 +11,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.21
+%global last_tested_version 10.5.22
# Set to 1 to force run the testsuite even if it was already tested in current version
%global force_run_testsuite 0
diff --git a/rh-skipped-tests-base.list b/rh-skipped-tests-base.list
index 49f481c..160986b 100644
--- a/rh-skipped-tests-base.list
+++ b/rh-skipped-tests-base.list
@@ -88,3 +88,6 @@ rpl.rpl_row_img_sequence_min :
rpl.rpl_row_img_sequence_noblob :
rpl.rpl_xa_empty_transaction :
rpl.rpl_slave_shutdown_mdev20821 :
+
+# Unstable to 10.5.22
+main.init_connect :
commit 10445d7e27d67744622e6a9addcd7e42b787712a
Author: Michal Schorm <mschorm(a)redhat.com>
Date: Wed Sep 20 12:20:30 2023 +0200
WORKAROUND: disable LTO on i686 arch to mitigate Internal Compiler Error
https://bugzilla.redhat.com/show_bug.cgi?id=2239498
TODO: Remove when the issue is resolved
diff --git a/mariadb.spec b/mariadb.spec
index 21643cd..a5ba922 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -26,6 +26,12 @@
# Turn that off to ensure such files don't get included in RPMs (cf bz#884755).
%global _default_patch_flags --no-backup-if-mismatch
+# Temporary workaround to fix the "internal compiler error" described in
https://bugzilla.redhat.com/show_bug.cgi?id=2239498
+# TODO: Remove when the issue is resolved
+%ifarch i686
+%global _lto_cflags %{nil}
+%endif
+
# Mroonga engine
commit 635c377683e90bbe9ff0f45972153a7655e83042
Author: Michal Schorm <mschorm(a)redhat.com>
Date: Mon Sep 18 12:28:43 2023 +0200
Explanation added for a conditional requirement of mysql-selinux
diff --git a/mariadb.spec b/mariadb.spec
index 9945b68..21643cd 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -447,7 +447,10 @@ Requires: %{_sysconfdir}/my.cnf.d
# Additional SELinux rules (common for MariaDB & MySQL) shipped in a separate
package
# For cases, where we want to fix a SELinux issues in MariaDB sooner than patched
selinux-policy-targeted package is released
%if %require_mysql_selinux
+# The *-selinux package should only be required on SELinux enabled systems. Therefore the
following rich dependency syntax should be used:
Requires: (mysql-selinux if selinux-policy-targeted)
+# This ensures that the *-selinux package and all its dependencies are not pulled into
containers and other systems that do not use SELinux.
+#
https://fedoraproject.org/wiki/SELinux/IndependentPolicy#Adding_dependenc...
%endif
# for fuser in mysql-check-socket
commit 032692271dcccb95cf792b25c70d8cfa8346675e
Author: Michal Schorm <mschorm(a)redhat.com>
Date: Mon Sep 18 12:27:10 2023 +0200
Update 'mariadb-server-galera' SELinux policy packaging
https://fedoraproject.org/wiki/SELinux/IndependentPolicy
diff --git a/mariadb.spec b/mariadb.spec
index b24efbd..9945b68 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -397,8 +397,10 @@ Summary: The configuration files and scripts for galera
replication
Requires: %{name}-common%{?_isa} = %{sameevr}
Requires: %{name}-server%{?_isa} = %{sameevr}
Requires: galera >= 26.4.3
-Requires(post): libselinux-utils
-Requires(post): policycoreutils-python-utils
+BuildRequires: selinux-policy-devel
+Requires(post): (libselinux-utils if selinux-policy-targeted)
+Requires(post): (policycoreutils if selinux-policy-targeted)
+Requires(post): (policycoreutils-python-utils if selinux-policy-targeted)
# wsrep requirements
Requires: lsof
# Default wsrep_sst_method
@@ -991,7 +993,7 @@ echo "d %{pidfiledir} 0755 mysql mysql -"
>>%{buildroot}%{_tmpfilesdir}/%{name}.
# install additional galera selinux policy
%if %{with galera}
-install -p -m 644 -D selinux/%{name}-server-galera.pp
%{buildroot}%{_datadir}/selinux/packages/%{name}/%{name}-server-galera.pp
+install -p -m 644 -D selinux/%{name}-server-galera.pp
%{buildroot}%{_datadir}/selinux/packages/targeted/%{name}-server-galera.pp
%endif
# Install additional cracklib selinux policy
@@ -1291,21 +1293,31 @@ export MTR_BUILD_THREAD=$(( $(date +%s) % 1100 ))
%if %{with galera}
%post server-galera
-# Allow ports needed for the replication:
-#
https://mariadb.com/kb/en/library/configuring-mariadb-galera-cluster/#net...
-# Galera Replication Port
-semanage port -a -t mysqld_port_t -p tcp 4567 >/dev/null 2>&1 || :
-semanage port -a -t mysqld_port_t -p udp 4567 >/dev/null 2>&1 || :
-# IST Port
-semanage port -a -t mysqld_port_t -p tcp 4568 >/dev/null 2>&1 || :
-# SST Port
-semanage port -a -t mysqld_port_t -p tcp 4444 >/dev/null 2>&1 || :
+%selinux_modules_install -s "targeted"
%{_datadir}/selinux/packages/targeted/%{name}-server-galera.pp
-semodule -i %{_datadir}/selinux/packages/%{name}/%{name}-server-galera.pp >/dev/null
2>&1 || :
+# Allow ports needed for the replication:
+#
https://fedoraproject.org/wiki/SELinux/IndependentPolicy#Port_Labeling
+if [ $1 -eq 1 ]; then
+ #
https://mariadb.com/kb/en/library/configuring-mariadb-galera-cluster/#net...
+ # Galera Replication Port
+ semanage port -a -t mysqld_port_t -p tcp 4567 >/dev/null 2>&1 || :
+ semanage port -a -t mysqld_port_t -p udp 4567 >/dev/null 2>&1 || :
+ # IST Port
+ semanage port -a -t mysqld_port_t -p tcp 4568 >/dev/null 2>&1 || :
+ # SST Port
+ semanage port -a -t mysqld_port_t -p tcp 4444 >/dev/null 2>&1 || :
+fi
%postun server-galera
if [ $1 -eq 0 ]; then
- semodule -r %{name}-server-galera 2>/dev/null || :
+ %selinux_modules_uninstall -s "targeted" %{name}-server-galera
+
+ # Delete port labeling when the package is removed
+ #
https://fedoraproject.org/wiki/SELinux/IndependentPolicy#Port_Labeling
+ semanage port -d -t mysqld_port_t -p tcp 4567 >/dev/null 2>&1 || :
+ semanage port -d -t mysqld_port_t -p udp 4567 >/dev/null 2>&1 || :
+ semanage port -d -t mysqld_port_t -p tcp 4568 >/dev/null 2>&1 || :
+ semanage port -d -t mysqld_port_t -p tcp 4444 >/dev/null 2>&1 || :
fi
%endif
@@ -1402,7 +1414,7 @@ fi
%{_bindir}/galera_recovery
%config(noreplace) %{_sysconfdir}/my.cnf.d/galera.cnf
%attr(0640,root,root) %ghost %config(noreplace) %{_sysconfdir}/sysconfig/clustercheck
-%{_datadir}/selinux/packages/%{name}/%{name}-server-galera.pp
+%{_datadir}/selinux/packages/targeted/%{name}-server-galera.pp
%endif
%files server
commit 607eb71d53bfd0c9f645d22c9bf0348213a7d7ba
Author: Michal Schorm <mschorm(a)redhat.com>
Date: Mon Sep 18 12:25:39 2023 +0200
Regroup scriptlets
(should be no-op change)
diff --git a/mariadb.spec b/mariadb.spec
index d17e892..b24efbd 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -1280,6 +1280,15 @@ export MTR_BUILD_THREAD=$(( $(date +%s) % 1100 ))
/usr/sbin/useradd -M -N -g mysql -o -r -d %{mysqluserhome} -s /sbin/nologin \
-c "MySQL Server" -u 27 mysql >/dev/null 2>&1 || :
+%post server
+%systemd_post %{daemon_name}.service
+
+%preun server
+%systemd_preun %{daemon_name}.service
+
+%postun server
+%systemd_postun_with_restart %{daemon_name}.service
+
%if %{with galera}
%post server-galera
# Allow ports needed for the replication:
@@ -1293,6 +1302,11 @@ semanage port -a -t mysqld_port_t -p tcp 4568 >/dev/null
2>&1 || :
semanage port -a -t mysqld_port_t -p tcp 4444 >/dev/null 2>&1 || :
semodule -i %{_datadir}/selinux/packages/%{name}/%{name}-server-galera.pp >/dev/null
2>&1 || :
+
+%postun server-galera
+if [ $1 -eq 0 ]; then
+ semodule -r %{name}-server-galera 2>/dev/null || :
+fi
%endif
%if %{with cracklib}
@@ -1305,22 +1319,6 @@ if [ $1 -eq 0 ]; then
fi
%endif
-%post server
-%systemd_post %{daemon_name}.service
-
-%preun server
-%systemd_preun %{daemon_name}.service
-
-%if %{with galera}
-%postun server-galera
-if [ $1 -eq 0 ]; then
- semodule -r %{name}-server-galera 2>/dev/null || :
-fi
-%endif
-
-%postun server
-%systemd_postun_with_restart %{daemon_name}.service
-
%if %{with client}
commit 466e9bfd68ef5e91055cf0c8ce174103fe1f552c
Author: Michal Schorm <mschorm(a)redhat.com>
Date: Tue Sep 5 14:23:07 2023 +0200
[2/2] Rebase to version 10.5.22 - Pack aditional SELinux rules for the cracklib
plugin
https://jira.mariadb.org/browse/MDEV-18374
https://github.com/MariaDB/server/pull/1131/files
https://fedoraproject.org/wiki/SELinux/IndependentPolicy
diff --git a/mariadb.spec b/mariadb.spec
index 7a4a6cd..d17e892 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -544,6 +544,11 @@ Requires: %{name}-server%{?_isa} = %{sameevr}
BuildRequires: cracklib-dicts cracklib-devel
Requires: cracklib-dicts
+BuildRequires: selinux-policy-devel
+Requires(post): (libselinux-utils if selinux-policy-targeted)
+Requires(post): (policycoreutils if selinux-policy-targeted)
+Requires(post): (policycoreutils-python-utils if selinux-policy-targeted)
+
%description cracklib-password-check
CrackLib is a password strength checking library. It is installed by default
in many Linux distributions and is invoked automatically (by pam_cracklib.so)
@@ -989,6 +994,12 @@ echo "d %{pidfiledir} 0755 mysql mysql -"
>>%{buildroot}%{_tmpfilesdir}/%{name}.
install -p -m 644 -D selinux/%{name}-server-galera.pp
%{buildroot}%{_datadir}/selinux/packages/%{name}/%{name}-server-galera.pp
%endif
+# Install additional cracklib selinux policy
+%if %{with cracklib}
+mv
%{buildroot}%{_datadir}/mariadb/policy/selinux/mariadb-plugin-cracklib-password-check.pp
%{buildroot}%{_datadir}/selinux/packages/targeted/%{name}-plugin-cracklib-password-check.pp
+rm
%{buildroot}%{_datadir}/mariadb/policy/selinux/mariadb-plugin-cracklib-password-check.te
+%endif
+
%if %{with test}
# mysql-test includes one executable that doesn't belong under /usr/share, so move it
and provide a symlink
mv %{buildroot}%{_datadir}/mysql-test/lib/My/SafeProcess/my_safe_process
%{buildroot}%{_bindir}
@@ -1284,6 +1295,16 @@ semanage port -a -t mysqld_port_t -p tcp 4444 >/dev/null
2>&1 || :
semodule -i %{_datadir}/selinux/packages/%{name}/%{name}-server-galera.pp >/dev/null
2>&1 || :
%endif
+%if %{with cracklib}
+%post cracklib-password-check
+%selinux_modules_install -s "targeted"
%{_datadir}/selinux/packages/targeted/%{name}-plugin-cracklib-password-check.pp
+
+%postun cracklib-password-check
+if [ $1 -eq 0 ]; then
+ %selinux_modules_uninstall -s "targeted"
%{name}-plugin-cracklib-password-check
+fi
+%endif
+
%post server
%systemd_post %{daemon_name}.service
@@ -1523,6 +1544,7 @@ fi
%files cracklib-password-check
%config(noreplace) %{_sysconfdir}/my.cnf.d/cracklib_password_check.cnf
%{_libdir}/%{pkg_name}/plugin/cracklib_password_check.so
+%{_datadir}/selinux/packages/targeted/%{name}-plugin-cracklib-password-check.pp
%endif
%if %{with backup}
commit a0c21fd5cf0009dad3fc3364dea3a8d00d2f9c6e
Author: Michal Schorm <mschorm(a)redhat.com>
Date: Mon Sep 4 12:19:22 2023 +0200
[1/2] Rebase to version 10.5.22
Upstream Release notes:
https://mariadb.com/kb/en/mariadb-10-5-22-release-notes/
diff --git a/mariadb.spec b/mariadb.spec
index 76230fe..7a4a6cd 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -149,7 +149,7 @@
%global sameevr %{epoch}:%{version}-%{release}
Name: mariadb
-Version: 10.5.21
+Version: 10.5.22
Release: 1%{?with_debug:.debug}%{?dist}
Epoch: 3
@@ -1645,6 +1645,9 @@ fi
%endif
%changelog
+* Mon Sep 04 2023 Michal Schorm <mschorm(a)redhat.com> - 3:10.5.22-1
+- Rebase to 10.5.22
+
* Wed Jul 26 2023 Michal Schorm <mschorm(a)redhat.com> - 3:10.5.21-1
- Rebase to version 10.5.21
diff --git a/sources b/sources
index 1deb8ca..1e81b5e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mariadb-10.5.21-downstream_modified.tar.gz) =
954776d02d7746ab75431f87365d3608700b257ac327338749f06b5a0f96a5300f5644804a9581011e8abf5adc3bbb2276089a28ed621774e0bb28b740e7afa1
+SHA512 (mariadb-10.5.22-downstream_modified.tar.gz) =
8bbf5c17b7309f618a527d03170a06474a5e86d382baf6a2f9cb554778360dead9bf69392e4e2c4fa0249e43fb80d599dd610912d73fa64a27f8da791238be9c