From 9fc60a9334f2236a1f0e86521dc069d75d06714a Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Thu, 7 Aug 2025 15:09:40 +0800
Subject: [PATCH] 11.8.3

---
 ...adb-11.8.2.tar.gz => mariadb-11.8.3.tar.gz |  4 ++--
 mariadb-ownsetup.patch                        |  4 ++--
 mariadb.spec                                  | 22 +++++++++++++------
 mariadb.sysusers.conf                         |  1 +
 4 files changed, 20 insertions(+), 11 deletions(-)
 rename mariadb-11.8.2.tar.gz => mariadb-11.8.3.tar.gz (32%)
 create mode 100644 mariadb.sysusers.conf

diff --git a/mariadb-11.8.2.tar.gz b/mariadb-11.8.3.tar.gz
similarity index 32%
rename from mariadb-11.8.2.tar.gz
rename to mariadb-11.8.3.tar.gz
index 1e3af51..6788210 100644
--- a/mariadb-11.8.2.tar.gz
+++ b/mariadb-11.8.3.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b2162cdf5e9317d8a8621cbeda83999324fc0ac8944210e14abb5fe0a9fea3ef
-size 116456706
+oid sha256:1014a85c768de8f9e9c6d4bf0b42617f3b1588be1ad371f71674ea32b87119c0
+size 119640174
diff --git a/mariadb-ownsetup.patch b/mariadb-ownsetup.patch
index 9c15183..6413a78 100644
--- a/mariadb-ownsetup.patch
+++ b/mariadb-ownsetup.patch
@@ -14,8 +14,8 @@ diff --git a/support-files/rpm/server.cnf b/support-files/rpm/server.cnf
 index 98190e1..29c3976 100644
 --- a/support-files/rpm/server.cnf
 +++ b/support-files/rpm/server.cnf
-@@ -12,7 +12,15 @@
- [mariadb]
+@@ -21,7 +21,15 @@
+ #feedback=ON
  
  # This group is read by both MariaDB and MySQL servers
 +# Settings user and group are ignored when systemd is used.
diff --git a/mariadb.spec b/mariadb.spec
index cfcffee..92660fc 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -73,13 +73,13 @@
 %global sameevr   %{epoch}:%{version}-%{release}
 
 Name:             mariadb
-Version:          11.8.2
+Version:          11.8.3
 Release:          1
 Epoch:            4
 
 Summary:          A very fast and robust SQL database server
-URL:              http://mariadb.org
-License:          GPLv2 and LGPLv2
+URL:              https://mariadb.org
+License:          ( GPL-2.0-only OR Apache-2.0 ) AND ( GPL-2.0-or-later OR Apache-2.0 ) AND BSD-2-Clause AND BSD-3-Clause AND CC-BY-4.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-or-later AND ( GPL-3.0-or-later WITH Bison-exception-2.2 ) AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND OpenSSL AND MIT AND OFL-1.1 AND CC0-1.0 AND PHP-3.0 AND PHP-3.01 AND zlib AND dtoa AND FSFAP AND blessing AND Info-ZIP AND Boehm-GC
 
 Source0:          https://downloads.mariadb.org/interstitial/mariadb-%{version}/source/mariadb-%{version}.tar.gz
 
@@ -93,6 +93,7 @@ Source14:         mariadb-check-socket.sh
 Source15:         mariadb-scripts-common.sh
 Source16:         mariadb-check-upgrade.sh
 Source18:         mysql@.service.in
+Source19:         mariadb.sysusers.conf
 Source50:         skipped-tests-base.list
 Source51:         skipped-tests-arm.list
 
@@ -356,7 +357,7 @@ Requires:         (mysql-selinux if selinux-policy-targeted)
 Requires:         psmisc
 
 Requires:         coreutils
-Requires(pre):    /usr/sbin/useradd
+%{?sysusers_requires_compat}
 # We require this to be present for %%{_tmpfilesdir}
 Requires:         systemd
 # Make sure it's there when scriptlets run, too
@@ -713,6 +714,8 @@ export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
          -DMYSQL_DATADIR="%{dbdatadir}" \
          -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
          -DTMPDIR=/var/tmp \
+         -DINSTALL_SYSTEMD_TMPFILESDIR="" \
+         -DINSTALL_SYSTEMD_SYSUSERSDIR="" \
          -DGRN_DATA_DIR=share/%{name}-server/groonga \
          -DGROONGA_NORMALIZER_MYSQL_PROJECT_NAME=%{name}-server/groonga-normalizer-mysql \
          -DENABLED_LOCAL_INFILE=ON \
@@ -833,6 +836,9 @@ install -D -p -m 0644 %{_builddir}/mariadb-%{version}/scripts/mariadb.tmpfiles.d
 echo "d %{pidfiledir} 0755 mysql mysql -" >>%{buildroot}%{_tmpfilesdir}/%{name}.conf
 %endif
 
+# Install downstream version of sysusers.d config
+install -m0644 -D %{S:19} %{buildroot}%{_sysusersdir}/%{name}.conf
+
 # 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
@@ -1067,9 +1073,8 @@ export MTR_BUILD_THREAD=$(( $(date +%s) % 1100 ))
 
 
 %pre server
-/usr/sbin/groupadd -g 27 -o -r mysql >/dev/null 2>&1 || :
-/usr/sbin/useradd -M -N -g mysql -o -r -d %{mysqluserhome} -s /sbin/nologin \
-  -c "MySQL Server" -u 27 mysql >/dev/null 2>&1 || :
+%sysusers_create_compat %{S:19}
+
 
 %if %{with galera}
 %post server-galera
@@ -1456,6 +1461,9 @@ fi
 %endif
 
 %changelog
+* Thu Aug 07 2025 Funda Wang <fundawang@yeah.net> - 4:11.8.3-1
+- update to 11.8.3
+
 * Thu Jun 05 2025 Funda Wang <fundawang@yeah.net> - 4:11.8.2-1
 - update to 11.8.2 GA
 
diff --git a/mariadb.sysusers.conf b/mariadb.sysusers.conf
new file mode 100644
index 0000000..15965a4
--- /dev/null
+++ b/mariadb.sysusers.conf
@@ -0,0 +1 @@
+u mysql - 'MariaDB and MySQL Server' /var/lib/mysql -
-- 
Gitee