|
@@ -13,12 +13,13 @@
|
|
|
%endif
|
|
|
|
|
|
%bcond_without agent
|
|
|
+%bcond_with agent2
|
|
|
|
|
|
%global php_pkgname php74
|
|
|
|
|
|
Summary: The Enterprise-class Monitoring Solution for Everyone
|
|
|
Name: zabbix
|
|
|
-Version: 6.0.22
|
|
|
+Version: 7.0.1
|
|
|
Release: 1%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
Group: system
|
|
|
Vendor: Project Vine
|
|
@@ -51,8 +52,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
|
|
BuildRequires: libpq-devel
|
|
|
BuildRequires: libmariadb-devel
|
|
|
%endif
|
|
|
+%if %{with agent2}
|
|
|
+BuildRequires: golang
|
|
|
+%endif
|
|
|
BuildRequires: libevent-devel
|
|
|
-BuildRequires: pcre-devel
|
|
|
+BuildRequires: pcre2-devel
|
|
|
BuildRequires: curl-devel
|
|
|
BuildRequires: net-snmp-devel
|
|
|
BuildRequires: OpenIPMI-devel
|
|
@@ -240,6 +244,7 @@ perl -pi -e 's|/usr/bin/traceroute|/bin/traceroute|' \
|
|
|
%{?with_server:--enable-server} \
|
|
|
%{?with_proxy:--enable-proxy} \
|
|
|
%{?with_agent:--enable-agent} \
|
|
|
+ %{?with_agent2:--enable-agent2} \
|
|
|
--enable-ipv6 \
|
|
|
--sysconfdir=%{_sysconfdir}/zabbix \
|
|
|
--with-libcurl \
|
|
@@ -248,6 +253,7 @@ perl -pi -e 's|/usr/bin/traceroute|/bin/traceroute|' \
|
|
|
--with-unixodbc \
|
|
|
--with-ssh2 \
|
|
|
--with-openssl \
|
|
|
+ --with-libpcre2 \
|
|
|
$@
|
|
|
|
|
|
%__make
|
|
@@ -422,7 +428,7 @@ exit 0
|
|
|
%if %{with systemd}
|
|
|
%systemd_preun zabbix-server-mysql.service
|
|
|
%else
|
|
|
-if [ "$1" -eq 0 -o -x /bin/systemctl ]; then
|
|
|
+if [ "$1" -eq 0 -o -x /usr/bin/systemctl ]; then
|
|
|
/sbin/service zabbix_server stop >/dev/null 2>&1
|
|
|
/sbin/chkconfig --del zabbix_server
|
|
|
/sbin/update-alternatives --remove zabbix_server \
|
|
@@ -434,7 +440,7 @@ fi
|
|
|
%if %{with systemd}
|
|
|
%systemd_preun zabbix-server-pgysql.service
|
|
|
%else
|
|
|
-if [ "$1" -eq 0 -o -x /bin/systemctl ]; then
|
|
|
+if [ "$1" -eq 0 -o -x /usr/bin/systemctl ]; then
|
|
|
/sbin/service zabbix_server stop >/dev/null 2>&1
|
|
|
/sbin/chkconfig --del zabbix_server
|
|
|
/sbin/update-alternatives --remove zabbix_server \
|
|
@@ -448,7 +454,7 @@ fi
|
|
|
%if %{with systemd}
|
|
|
%systemd_preun zabbix-proxy-mysql.service
|
|
|
%else
|
|
|
-if [ "$1" -eq 0 -o -x /bin/systemctl ]; then
|
|
|
+if [ "$1" -eq 0 -o -x /usr/bin/systemctl ]; then
|
|
|
/sbin/service zabbix_proxy stop >/dev/null 2>&1
|
|
|
/sbin/chkconfig --del zabbix_proxy
|
|
|
/sbin/update-alternatives --remove zabbix_proxy \
|
|
@@ -460,7 +466,7 @@ fi
|
|
|
%if %{with systemd}
|
|
|
%systemd_preun zabbix-proxy-pgsql.service
|
|
|
%else
|
|
|
-if [ "$1" -eq 0 -o -x /bin/systemctl ]; then
|
|
|
+if [ "$1" -eq 0 -o -x /usr/bin/systemctl ]; then
|
|
|
/sbin/service zabbix_proxy stop >/dev/null 2>&1
|
|
|
/sbin/chkconfig --del zabbix_proxy
|
|
|
/sbin/update-alternatives --remove zabbix_proxy \
|
|
@@ -474,7 +480,7 @@ fi
|
|
|
%if %{with systemd}
|
|
|
%systemd_preun zabbix-agent.service
|
|
|
%else
|
|
|
-if [ "$1" -eq 0 -o -x /bin/systemctl ]; then
|
|
|
+if [ "$1" -eq 0 -o -x /usr/bin/systemctl ]; then
|
|
|
/sbin/service zabbix_agentd stop >/dev/null 2>&1
|
|
|
/sbin/chkconfig --del zabbix_agentd
|
|
|
fi
|
|
@@ -486,7 +492,7 @@ fi
|
|
|
%if %{with systemd}
|
|
|
%systemd_postun_with_restart zabbix-server-mysql.service
|
|
|
%else
|
|
|
-if [ "$1" -ge "1" -a ! -x /bin/systemctl ]; then
|
|
|
+if [ "$1" -ge "1" -a ! -x /usr/bin/systemctl ]; then
|
|
|
/sbin/service zabbix_server condrestart >/dev/null 2>&1 || :
|
|
|
fi
|
|
|
%endif
|
|
@@ -495,7 +501,7 @@ fi
|
|
|
%if %{with systemd}
|
|
|
%systemd_postun_with_restart zabbix-server-pgsql.service
|
|
|
%else
|
|
|
-if [ "$1" -ge "1" -a ! -x /bin/systemctl ]; then
|
|
|
+if [ "$1" -ge "1" -a ! -x /usr/bin/systemctl ]; then
|
|
|
/sbin/service zabbix_server condrestart >/dev/null 2>&1 || :
|
|
|
fi
|
|
|
%endif
|
|
@@ -506,7 +512,7 @@ fi
|
|
|
%if %{with systemd}
|
|
|
%systemd_postun_with_restart zabbix-proxy-mysql.service
|
|
|
%else
|
|
|
-if [ "$1" -ge "1" -a ! -x /bin/systemctl ]; then
|
|
|
+if [ "$1" -ge "1" -a ! -x /usr/bin/systemctl ]; then
|
|
|
/sbin/service zabbix_proxy condrestart >/dev/null 2>&1 || :
|
|
|
fi
|
|
|
%endif
|
|
@@ -515,7 +521,7 @@ fi
|
|
|
%if %{with systemd}
|
|
|
%systemd_postun_with_restart zabbix-proxy-pgsql.service
|
|
|
%else
|
|
|
-if [ "$1" -ge "1" -a ! -x /bin/systemctl ]; then
|
|
|
+if [ "$1" -ge "1" -a ! -x /usr/bin/systemctl ]; then
|
|
|
/sbin/service zabbix_proxy condrestart >/dev/null 2>&1 || :
|
|
|
fi
|
|
|
%endif
|
|
@@ -524,7 +530,7 @@ fi
|
|
|
%if %{with systemd}
|
|
|
%systemd_postun_with_restart zabbix-agent.service
|
|
|
%else
|
|
|
-if [ "$1" -ge "1" -a ! -x /bin/systemctl ]; then
|
|
|
+if [ "$1" -ge "1" -a ! -x /usr/bin/systemctl ]; then
|
|
|
/sbin/service zabbix_agentd condrestart >/dev/null 2>&1 || :
|
|
|
fi
|
|
|
%endif
|
|
@@ -638,6 +644,9 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Jul 24 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.0.1-1
|
|
|
+- new upstream release.
|
|
|
+
|
|
|
* Wed Oct 18 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.0.22-1
|
|
|
- new upstream release.
|
|
|
|