From b5756c77ef9a33f49387c8c212b420d5449e32ec Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Sun, 27 Apr 2025 15:29:17 +0800
Subject: [PATCH] 7.0.12

---
 zabbix-7.0.11.tar.gz => zabbix-7.0.12.tar.gz |  4 ++--
 zabbix.spec                                  | 18 +++++++++++-------
 zabbix.sysusers.conf                         |  1 +
 3 files changed, 14 insertions(+), 9 deletions(-)
 rename zabbix-7.0.11.tar.gz => zabbix-7.0.12.tar.gz (32%)
 create mode 100644 zabbix.sysusers.conf

diff --git a/zabbix-7.0.11.tar.gz b/zabbix-7.0.12.tar.gz
similarity index 32%
rename from zabbix-7.0.11.tar.gz
rename to zabbix-7.0.12.tar.gz
index 057d588..950a6b1 100644
--- a/zabbix-7.0.11.tar.gz
+++ b/zabbix-7.0.12.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:afd54dcb76d1b85bc900bf994046ca8c2012dfe02f7ad9d60301632f1155b865
-size 45305649
+oid sha256:6069ed604aa5e33fe631ccc68b782654a697071952a1cf365151655a0a122b05
+size 45617597
diff --git a/zabbix.spec b/zabbix.spec
index 821e213..e9c1d17 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -13,7 +13,7 @@
 %bcond_with java
 
 Name:           zabbix
-Version:        7.0.11
+Version:        7.0.12
 Release:        1
 Summary:        Open-source monitoring solution for your IT infrastructure
 License:        AGPL-3.0-only AND MIT AND GPL-2.0-or-later AND Zlib AND BSD-3-Clause AND BSD-2-Clause AND ISC
@@ -21,6 +21,7 @@ URL:            https://www.zabbix.com
 Source0:        https://cdn.zabbix.com/zabbix/sources/stable/7.0/zabbix-%{version}.tar.gz
 Source1:        %{name}-web.conf
 Source2:        %{name}-php-fpm.conf
+Source3:        %{name}.sysusers.conf
 Source5:        %{name}-logrotate.in
 Source9:        %{name}-tmpfiles-zabbix.conf
 # systemd units -- Alternatives switches between them (they state their dependencies)
@@ -178,7 +179,7 @@ Zabbix server compiled to use PostgreSQL
 %package agent
 Summary:             Zabbix agent
 Requires:            %{name} = %{version}-%{release}
-Requires(pre):       shadow-utils
+%{?sysusers_requires_compat}
 %{?systemd_requires}
 
 %description agent
@@ -472,6 +473,8 @@ install -m 0644 -p %{S:1} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
 mkdir -p %{buildroot}%{_sysconfdir}/php-fpm.d
 install -m 0644 -p %{S:2} %{buildroot}%{_sysconfdir}/php-fpm.d/%{name}.conf
 
+install -m0644 -D %{S:3} %{buildroot}%{_sysusersdir}/zabbix.conf
+
 # Install log rotation
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
 sed -e 's|COMPONENT|agentd|g; s|USER|zabbix|g' %{S:5} > \
@@ -581,11 +584,7 @@ fi
 %endif
 
 %pre agent
-getent group zabbix > /dev/null || groupadd -r zabbix
-getent passwd zabbix > /dev/null || \
-    useradd -r -g zabbix -d %{_sharedstatedir}/zabbix -s /sbin/nologin \
-    -c "Zabbix Monitoring System" zabbix
-:
+%sysusers_create_compat %{S:3}
 
 %post agent
 %systemd_post zabbix-agent.service
@@ -724,6 +723,7 @@ fi
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-agent
 %attr(750,zabbix,zabbix) %dir %{_sharedstatedir}/zabbix
 %{_unitdir}/zabbix-agent.service
+%{_sysusersdir}/zabbix.conf
 %{_sbindir}/zabbix_agentd
 %{_mandir}/man8/zabbix_agentd.8*
 
@@ -767,6 +767,10 @@ fi
 %files web-pgsql
 
 %changelog
+* Sun Apr 27 2025 Funda Wang <fundawang@yeah.net> - 7.0.12-1
+- update to 7.0.12
+- change user and group creation to systemd style
+
 * Fri Mar 28 2025 Funda Wang <fundawang@yeah.net> - 7.0.11-1
 - update to 7.0.11
 
diff --git a/zabbix.sysusers.conf b/zabbix.sysusers.conf
new file mode 100644
index 0000000..18aaef3
--- /dev/null
+++ b/zabbix.sysusers.conf
@@ -0,0 +1 @@
+u zabbix - 'Zabbix Monitoring System' %{_sharedstatedir}/zabbix -
-- 
Gitee