From 312d757ba5fba5d4c57f52f6e5a10a68581e64fc94a014c439054147ab5e0b1d Mon Sep 17 00:00:00 2001 From: Boris Manojlovic Date: Sat, 30 Mar 2024 09:46:31 +0000 Subject: [PATCH 1/2] 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" From 6779cb50bcd3793c575a7068f1f07806892ea5be922d78296833440e85f064be Mon Sep 17 00:00:00 2001 From: Boris Manojlovic Date: Sat, 30 Mar 2024 10:28:43 +0000 Subject: [PATCH 2/2] Accepting request 1163660 from home:AndreasStieger:branches:server:monitoring:zabbix 6.0.28, and really fix boo#1222169 OBS-URL: https://build.opensuse.org/request/show/1163660 OBS-URL: https://build.opensuse.org/package/show/server:monitoring:zabbix/zabbix?expand=0&rev=57 --- zabbix-6.0.27.tar.gz | 3 --- zabbix-6.0.28.tar.gz | 3 +++ zabbix.changes | 11 +++++++++++ zabbix.spec | 4 ++-- 4 files changed, 16 insertions(+), 5 deletions(-) delete mode 100644 zabbix-6.0.27.tar.gz create mode 100644 zabbix-6.0.28.tar.gz diff --git a/zabbix-6.0.27.tar.gz b/zabbix-6.0.27.tar.gz deleted file mode 100644 index 930b8b7..0000000 --- a/zabbix-6.0.27.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9593a32a1a6783dfcf7522835b09f93f6ef4bc554f517f140c4ac6f00e43d57c -size 44522147 diff --git a/zabbix-6.0.28.tar.gz b/zabbix-6.0.28.tar.gz new file mode 100644 index 0000000..276a20c --- /dev/null +++ b/zabbix-6.0.28.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d242696dddb1e4f2aeea29aff4ee4a81c0ee78e3c12c9d0b286e0aff16f608a +size 44803777 diff --git a/zabbix.changes b/zabbix.changes index 8e887fd..c1f4b58 100644 --- a/zabbix.changes +++ b/zabbix.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Mar 30 10:07:11 UTC 2024 - Andreas Stieger + +- update to 6.0.28: + * Added metadata in JavaScript for AWS templates + * Added AWS ELB Application Load Balancer by HTTP template + * Added Check Point Next Generation Firewall by SNMP template + * Added MSSQL by Zabbix agent 2 template + * Updated max supported TimescaleDB version to 2.14 + * bug fixes + ------------------------------------------------------------------- Sat Mar 30 09:33:35 UTC 2024 - Boris Manojlovic diff --git a/zabbix.spec b/zabbix.spec index 3e671a9..cedc524 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -22,7 +22,7 @@ %define agent_group zabbix Name: zabbix -Version: 6.0.27 +Version: 6.0.28 Release: 0 Summary: Distributed monitoring system License: GPL-2.0-or-later @@ -344,7 +344,7 @@ autoreconf -fvi cd - %install -install -D -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/system-user-zabbix.conf +install -D -m 0644 %{SOURCE16} %{buildroot}%{_sysusersdir}/system-user-zabbix.conf # install the binaries %make_install -C ../zabbix-%{version}-sqlite