From 312d757ba5fba5d4c57f52f6e5a10a68581e64fc94a014c439054147ab5e0b1d Mon Sep 17 00:00:00 2001 From: Boris Manojlovic Date: Sat, 30 Mar 2024 09:46:31 +0000 Subject: [PATCH] Accepting request 1163657 from home:bmanojlovic:branches:server:monitoring:zabbix - fix broken copypasta for system-user-zabbix source file and file itself to remove gecos (description) in file fixes bsc#1222169 Packaging Error in system-user-zabbix-6.0.27-1.1.noarch package prevents upgrade Thanks Andreas Stieger for pointing out and reporter himself OBS-URL: https://build.opensuse.org/request/show/1163657 OBS-URL: https://build.opensuse.org/package/show/server:monitoring:zabbix/zabbix?expand=0&rev=56 --- system-user-zabbix.conf | 4 ++-- zabbix.changes | 8 ++++++++ zabbix.spec | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/system-user-zabbix.conf b/system-user-zabbix.conf index f882a47..70bc0c6 100644 --- a/system-user-zabbix.conf +++ b/system-user-zabbix.conf @@ -1,6 +1,6 @@ #Type Name ID GECOS Home directory Shell -g zabbix - "Zabbix agent" -g zabbixs - "Zabbix server" +g zabbix - +g zabbixs - u zabbix - "Zabbix agent" /var/lib/zabbix - u zabbixs - "Zabbix agent" /var/lib/zabbixs - m zabbix zabbix diff --git a/zabbix.changes b/zabbix.changes index 9841773..8e887fd 100644 --- a/zabbix.changes +++ b/zabbix.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Mar 30 09:33:35 UTC 2024 - Boris Manojlovic + +- fix broken copypasta for system-user-zabbix source file and + file itself to remove gecos (description) in file + fixes bsc#1222169 Packaging Error in system-user-zabbix-6.0.27-1.1.noarch package prevents upgrade + Thanks Andreas Stieger for pointing out and reporter himself + ------------------------------------------------------------------- Fri Mar 22 16:11:33 UTC 2024 - Boris Manojlovic diff --git a/zabbix.spec b/zabbix.spec index 5341e8d..3e671a9 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -319,7 +319,7 @@ cp -r zabbix-%{version} zabbix-%{version}-sqlite cd - %build -%sysusers_generate_pre %{SOURCE1} zabbix system-user-zabbix.conf +%sysusers_generate_pre %{SOURCE16} zabbix system-user-zabbix.conf ZABBIX_BASIC_CONFIG="--enable-proxy --enable-server --enable-agent --sysconfdir=%{_sysconfdir}/zabbix \ --with-openipmi --enable-java --enable-ipv6 --with-ssh2 --with-ldap --with-unixodbc \ --with-libcurl --with-net-snmp --with-libxml2 --with-openssl --with-libpcre --with-libevent"