Accepting request 1143962 from home:dirkmueller:Factory

- add group provides needed by RPM 4.19

  + ZBX-22711 Fixed incorrectly displayed simple graphs with non-numeric items in Host graphs page
    entities; added possibility to update the uuid parameter for the Service API; fixed duplicate UUIDs
  zabbix-6.0.12-curl-fixes.patch zabbix-6.0.12-netsnmp-fixes.patch
  zabbix-6.0.12-new-m4-pgsql.patch
- add CVE-2022-35230 patch file CVE-2022-35230.patch
 + ZBX-20680 Fixed reflected XSS issues
  + ZBX-19457 	Fixed failed query when updating application names longer than 255 characters
  + ZBX-8999 Fixed exporting of images separately from other objects
  + ZBX-18688 Fixed schema name didnt show when available only postgresql
  + ZBXNEXT-5903 Added vmware datacenters discovery
- New Features and Improvements:
  + ZBX-17390 Fixed validation of the maximum selected period
  + ZBXNEXT-3604 Added support of user configurable ciphers for communication between zabbix components
  + ZBX-16548 Fixed sort order in plain text screen
  + ZBXNEXT-5422 Quoted numbers are now accepted by jsonpath aggregate functions
  + ZBX-16424 Fixed unable to create/update web scenario from internet explorer/edge
    period being overridden by global configuration
    and jqueryui v1.10.3 -> v1.12.1
    thanks to jose deniz for the patch
  + ZBX-15646 fixed web-server 'Request-URI Too Long' error in trigger description dialog
    metrics from an external Zabbix instance
  + ZBX-15456 fixed incorrect style property in Monitoring->Problems; removed unused id from filter form
    items vfs.dir.size[] and vfs.dir.count[]
    in item regexp preprocessing, general pcre code improvements
  + ZBXNEXT-4271 improved escalator performance by using nextcheck index instead of reading whole table
    remaining when zabbix daemon is terminated during startup
- fixed configuration paths

OBS-URL: https://build.opensuse.org/request/show/1143962
OBS-URL: https://build.opensuse.org/package/show/server:monitoring:zabbix/zabbix?expand=0&rev=52
This commit is contained in:
Boris Manojlovic 2024-03-22 07:36:38 +00:00 committed by Git OBS Bridge
parent f55aaafdd9
commit e8e04d7f0e
2 changed files with 50 additions and 46 deletions

View File

@ -4,6 +4,11 @@ Tue Feb 20 12:05:38 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Use %autosetup macro. Allows to eliminate the usage of deprecated
%patchN.
-------------------------------------------------------------------
Sun Feb 4 09:27:45 UTC 2024 - Dirk Müller <dmueller@suse.com>
- add group provides needed by RPM 4.19
-------------------------------------------------------------------
Sun Dec 24 09:21:51 UTC 2023 - Boris Manojlovic <boris@steki.net>

View File

@ -1,7 +1,7 @@
#
# spec file for package zabbix
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -28,7 +28,7 @@ Release: 0
Summary: Distributed monitoring system
License: GPL-2.0-or-later
Group: System/Monitoring
URL: http://www.zabbix.com
URL: https://www.zabbix.com
Source0: https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-%{version}.tar.gz
Source1: rn6.0.0.html
Source2: zabbix-tmpfiles.conf
@ -60,9 +60,6 @@ BuildRequires: logrotate
BuildRequires: net-snmp-devel
BuildRequires: openldap2-devel
BuildRequires: pkgconfig
%if 0%{?suse_version} >= 1600 || 0%{?sle_version} > 150100
BuildRequires: postgresql-server-devel
%endif
BuildRequires: systemd-rpm-macros
BuildRequires: unixODBC-devel
BuildRequires: update-alternatives
@ -77,6 +74,9 @@ BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(zlib)
%{?systemd_requires}
%if 0%{?suse_version} >= 1600 || 0%{?sle_version} > 150100
BuildRequires: postgresql-server-devel
%endif
%description
Zabbix is a distributed monitoring system.
@ -103,6 +103,7 @@ Requires: logrotate
Requires(pre): %fillup_prereq
Requires(pre): shadow
Conflicts: zabbix-agent
Provides: group(zabbix)
%description agent
The Zabbix agent monitors local resources and relays information to the server.
@ -117,6 +118,7 @@ Requires: zabbix_server_binary = %{version}-%{release}
Requires(pre): %fillup_prereq
Requires(pre): shadow
Conflicts: zabbix-server
Provides: group(zabbix)
%description server
The Zabbix server component.
@ -131,6 +133,7 @@ Requires: zabbix_proxy_binary = %{version}-%{release}
Requires(pre): %fillup_prereq
Requires(pre): shadow
Conflicts: zabbix-proxy
Provides: group(zabbix)
%description proxy
The Zabbix proxy component.
@ -165,7 +168,7 @@ Group: System/Monitoring
Requires: %{name}-server = %{version}-%{release}
Requires: mariadb
Requires(post): update-alternatives
Requires(postun):update-alternatives
Requires(postun): update-alternatives
Conflicts: zabbix-server-mysql
Provides: %{name} = %{version}-%{release}
Provides: zabbix_server_binary = %{version}-%{release}
@ -179,7 +182,7 @@ Group: System/Monitoring
Requires: %{name}-server = %{version}-%{release}
Requires: postgresql
Requires(post): update-alternatives
Requires(postun):update-alternatives
Requires(postun): update-alternatives
Conflicts: zabbix-server-postgresql
Provides: %{name} = %{version}-%{release}
Provides: zabbix_server_binary = %{version}-%{release}
@ -193,7 +196,7 @@ Group: System/Monitoring
Requires: %{name}-proxy = %{version}-%{release}
Requires: mariadb
Requires(post): update-alternatives
Requires(postun):update-alternatives
Requires(postun): update-alternatives
Conflicts: zabbix-proxy-mysql
Provides: %{name} = %{version}-%{release}
Provides: zabbix_proxy_binary = %{version}-%{release}
@ -207,7 +210,7 @@ Group: System/Monitoring
Requires: %{name}-proxy = %{version}-%{release}
Requires: postgresql
Requires(post): update-alternatives
Requires(postun):update-alternatives
Requires(postun): update-alternatives
Conflicts: zabbix-proxy-postgresql
Provides: %{name} = %{version}-%{release}
Provides: zabbix_proxy_binary = %{version}-%{release}
@ -220,7 +223,7 @@ Summary: Zabbix proxy with SQLite support
Group: System/Monitoring
Requires: %{name}-proxy = %{version}-%{release}
Requires(post): update-alternatives
Requires(postun):update-alternatives
Requires(postun): update-alternatives
Conflicts: zabbix-proxy-sqlite
Provides: %{name} = %{version}-%{release}
Provides: zabbix_proxy_binary = %{version}-%{release}
@ -301,20 +304,20 @@ ZABBIX_BASIC_CONFIG="--enable-proxy --enable-server --enable-agent --sysconfdir
# configure MySQL repo (here)
autoreconf -fvi
%configure $ZABBIX_BASIC_CONFIG --with-mysql --without-postgresql --without-sqlite3
make %{?_smp_mflags}
%make_build
# configure PostgreSQL repo
cd ../zabbix-%{version}-postgresql
autoreconf -fvi
%configure $ZABBIX_BASIC_CONFIG --with-postgresql --without-mysql --without-sqlite3
make %{?_smp_mflags}
%make_build
cd -
# configure SQLite repo
cd ../zabbix-%{version}-sqlite
autoreconf -fvi
%configure $ZABBIX_BASIC_CONFIG --disable-server --enable-proxy --with-sqlite3 --without-postgresql --without-mysql
make %{?_smp_mflags}
%make_build
cd -
%install
@ -425,28 +428,24 @@ cp %{SOURCE15} .
%{_bindir}/getent group %{server_group} >/dev/null || %{_sbindir}/groupadd -r %{server_group}
%{_bindir}/getent passwd %{server_user} >/dev/null || %{_sbindir}/useradd -r -d %{_localstatedir}/lib/%{server_user} -s /bin/false -c "Zabbix Server Daemon" -g %{server_group} %{server_user}
%service_add_pre zabbix_server.service
exit 0
%pre proxy
# Proxy daemon
%{_bindir}/getent group %{server_group} >/dev/null || %{_sbindir}/groupadd -r %{server_group}
%{_bindir}/getent passwd %{server_user} >/dev/null || %{_sbindir}/useradd -r -d %{_localstatedir}/lib/%{server_user} -s /bin/false -c "Zabbix Proxy Daemon" -g %{server_group} %{server_user}
%service_add_pre zabbix_proxy.service
exit 0
%pre agent
# Agent daemon
%{_bindir}/getent group %{agent_group} >/dev/null || %{_sbindir}/groupadd -r %{agent_group}
%{_bindir}/getent passwd %{agent_user} >/dev/null || %{_sbindir}/useradd -r -d %{_localstatedir}/lib/%{agent_user} -s /bin/false -c "Zabbix Agent Daemon" -g %{agent_group} %{agent_user}
%service_add_pre zabbix_agentd.service
exit 0
%pre java-gateway
# Java daemon
%{_bindir}/getent group %{server_group} >/dev/null || %{_sbindir}/groupadd -r %{server_group}
%{_bindir}/getent passwd %{server_user} >/dev/null || %{_sbindir}/useradd -r -d %{_localstatedir}/lib/%{server_user} -s /bin/false -c "Zabbix Java Daemon" -g %{server_group} %{server_user}
%service_add_pre zabbix-java-gateway.service
exit 0
%post server
%service_add_post zabbix_server.service