|
|
@@ -16,8 +16,8 @@
|
|
|
|
|
|
Summary: The Enterprise-class Monitoring Solution for Everyone
|
|
|
Name: zabbix
|
|
|
-Version: 4.0.19
|
|
|
-Release: 2%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
+Version: 5.0.2
|
|
|
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
Group: Applications/Services
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
|
@@ -25,7 +25,8 @@ Packager: iwaim
|
|
|
|
|
|
License: GPLv2
|
|
|
URL: https://www.zabbix.com/
|
|
|
-Source0: https://cdn.zabbix.com/stable/%{version}/%{name}-%{version}.tar.gz
|
|
|
+%global shortver %(echo %{version} | sed -e 's/\.[0-9]*$//')
|
|
|
+Source0: https://cdn.zabbix.com/zabbix/sources/stable/%{shortver}/%{name}-%{version}.tar.gz
|
|
|
Source1: zabbix_server.init
|
|
|
Source2: zabbix_proxy.init
|
|
|
Source3: zabbix_agentd.init
|
|
|
@@ -43,8 +44,6 @@ Source14: %{name}-server-mysql.service
|
|
|
Source15: %{name}-server-pgsql.service
|
|
|
Source17: %{name}-tmpfiles-zabbixsrv.conf
|
|
|
|
|
|
-Patch1: 0001-change-the-font-for-Vine-Linux.patch
|
|
|
-Patch2: 0002-modified-config-files-for-Vine-Linux.patch
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
|
|
%if %{with server}%{with proxy}
|
|
|
BuildRequires: libpq-devel
|
|
|
@@ -57,6 +56,8 @@ BuildRequires: net-snmp-devel
|
|
|
BuildRequires: OpenIPMI-devel
|
|
|
BuildRequires: unixODBC-devel
|
|
|
BuildRequires: libssh2-devel
|
|
|
+BuildRequires: openssl-devel
|
|
|
+
|
|
|
Requires(pre): glibc-common
|
|
|
Requires(pre): shadow-utils
|
|
|
%if %{with systemd}
|
|
|
@@ -66,6 +67,7 @@ BuildRequires: systemd
|
|
|
%description
|
|
|
The Enterprise-class Monitoring Solution for Everyone.
|
|
|
|
|
|
+
|
|
|
%if %{with server}
|
|
|
%package server-common
|
|
|
Summary: common files for Zabbix Server
|
|
|
@@ -80,6 +82,7 @@ Requires(preun,postun): initscripts
|
|
|
%description server-common
|
|
|
This package include common files for Zabbix Server.
|
|
|
|
|
|
+
|
|
|
%package server-mysql
|
|
|
Summary: Zabbix Server for MySQL/MariaDB
|
|
|
Provides: %{name}-server
|
|
|
@@ -88,6 +91,7 @@ Requires: %{name}-server-common == %{version}-%{release}
|
|
|
%description server-mysql
|
|
|
Zabbix Server for MySQL/MariaDB
|
|
|
|
|
|
+
|
|
|
%package server-postgresql
|
|
|
Summary: Zabbix Server for PostgreSQL
|
|
|
Provides: %{name}-server
|
|
|
@@ -98,6 +102,7 @@ Zabbix Server for PostgreSQL
|
|
|
|
|
|
%endif
|
|
|
|
|
|
+
|
|
|
%if %{with agent}
|
|
|
%package agent
|
|
|
Summary: Zabbix Agent
|
|
|
@@ -114,6 +119,7 @@ Zabbix Agent
|
|
|
|
|
|
%endif
|
|
|
|
|
|
+
|
|
|
%if %{with proxy}
|
|
|
%package proxy-common
|
|
|
Summary: common files for Zabbix Proxy
|
|
|
@@ -128,6 +134,7 @@ Requires(preun,postun): initscripts
|
|
|
%description proxy-common
|
|
|
This package include common files for Zabbix Proxy
|
|
|
|
|
|
+
|
|
|
%package proxy-mysql
|
|
|
Summary: Zabbix Proxy for MySQL/MariaDB
|
|
|
Provides: %{name}-proxy
|
|
|
@@ -136,6 +143,7 @@ Requires: %{name}-proxy-common == %{version}-%{release}
|
|
|
%description proxy-mysql
|
|
|
Zabbix Proxy for MySQL/MariaDB
|
|
|
|
|
|
+
|
|
|
%package proxy-postgresql
|
|
|
Summary: Zabbix Proxy for PostgreSQL
|
|
|
Provides: %{name}-proxy
|
|
|
@@ -146,6 +154,7 @@ Zabbix Proxy for PostgreSQL
|
|
|
|
|
|
%endif
|
|
|
|
|
|
+
|
|
|
%if %{with frontend}
|
|
|
%package frontend-php
|
|
|
Summary: Zabbix web frontend with PHP
|
|
|
@@ -156,6 +165,7 @@ Requires: TrueType-vlgothic
|
|
|
%description frontend-php
|
|
|
Zabbix web frontend with PHP.
|
|
|
|
|
|
+
|
|
|
%package frontend-php-mysql
|
|
|
Summary: Zabbix web frontend with PHP and MySQL/MariaDB
|
|
|
Group: Applications/Internet
|
|
|
@@ -165,6 +175,7 @@ Requires: php74-mysql
|
|
|
%description frontend-php-mysql
|
|
|
Zabbix web frontend with PHP and MySQL/MariaDB.
|
|
|
|
|
|
+
|
|
|
%package frontend-php-postgresql
|
|
|
Summary: Zabbix web frontend with PHP and PostgreSQL
|
|
|
Group: Applications/Internet
|
|
|
@@ -176,27 +187,20 @@ Zabbix web frontend with PHP and PostgreSQL.
|
|
|
|
|
|
%endif
|
|
|
|
|
|
+
|
|
|
%prep
|
|
|
%setup -q -T -a 0 -c -n zabbix-%{version}
|
|
|
mv zabbix-%{version} zabbix_mysql
|
|
|
-pushd zabbix_mysql
|
|
|
-%patch1 -p 1
|
|
|
-%patch2 -p 1
|
|
|
-popd
|
|
|
|
|
|
%if %{with server}%{with proxy}
|
|
|
%setup -q -D -T -a 0 -n zabbix-%{version}
|
|
|
mv zabbix-%{version} zabbix_pgsql
|
|
|
-pushd zabbix_pgsql
|
|
|
-%patch1 -p 1
|
|
|
-%patch2 -p 1
|
|
|
-popd
|
|
|
%endif
|
|
|
|
|
|
-%if %{with systemd}
|
|
|
-# Specific
|
|
|
for v in mysql pgsql; do
|
|
|
pushd zabbix_$v
|
|
|
+sed -i -e 's/DejaVuSans/VL-Gothic-Regular/g' ./ui/include/defines.inc.php
|
|
|
+
|
|
|
sed -i \
|
|
|
-e '\|^# PidFile=.*|a PidFile=/run/zabbix/zabbix_agentd.pid' \
|
|
|
-e 's|^LogFile=.*|LogFile=%{_localstatedir}/log/zabbix/zabbix_agentd.log|' \
|
|
|
@@ -214,10 +218,8 @@ sed -i \
|
|
|
popd
|
|
|
done
|
|
|
|
|
|
-%endif
|
|
|
|
|
|
%build
|
|
|
-
|
|
|
Build()
|
|
|
{
|
|
|
perl -pi -e 's|/usr/bin/traceroute|/bin/traceroute|' \
|
|
|
@@ -234,6 +236,7 @@ perl -pi -e 's|/usr/bin/traceroute|/bin/traceroute|' \
|
|
|
--with-net-snmp \
|
|
|
--with-unixodbc \
|
|
|
--with-ssh2 \
|
|
|
+ --with-openssl \
|
|
|
$@
|
|
|
|
|
|
%__make
|
|
|
@@ -253,6 +256,7 @@ Build
|
|
|
popd
|
|
|
%endif
|
|
|
|
|
|
+
|
|
|
%install
|
|
|
%__rm -rf %{buildroot}
|
|
|
pushd zabbix_mysql
|
|
|
@@ -318,7 +322,7 @@ install -m 0644 -p %{SOURCE9} %{buildroot}%{_prefix}/lib/tmpfiles.d/zabbix.conf
|
|
|
%if %{with frontend}
|
|
|
# frontend-php
|
|
|
%__mkdir_p %{buildroot}%{_datadir}/zabbix-frontend
|
|
|
-%__cp -a frontends/php %{buildroot}%{_datadir}/zabbix-frontend/
|
|
|
+%__cp -a ui %{buildroot}%{_datadir}/zabbix-frontend/php
|
|
|
%__rm -f %{buildroot}%{_datadir}/zabbix-frontend/php/assets/fonts/DejaVuSans.ttf
|
|
|
|
|
|
ln -s /usr/share/fonts/TrueType-vlgothic/VL-Gothic-Regular.ttf \
|
|
|
@@ -341,9 +345,11 @@ install -m755 src/zabbix_proxy/zabbix_proxy %{buildroot}%{_sbindir}/zabbix_proxy
|
|
|
popd
|
|
|
%endif
|
|
|
|
|
|
+
|
|
|
%clean
|
|
|
%__rm -rf %{buildroot}
|
|
|
|
|
|
+
|
|
|
%pre
|
|
|
getent group zabbix >/dev/null || groupadd -r zabbix
|
|
|
getent passwd zabbix >/dev/null || \
|
|
|
@@ -454,8 +460,8 @@ fi
|
|
|
|
|
|
%if %{with agent}
|
|
|
%preun agent
|
|
|
-%systemd_preun zabbix-agent.service
|
|
|
%if %{with systemd}
|
|
|
+%systemd_preun zabbix-agent.service
|
|
|
%else
|
|
|
if [ "$1" -eq 0 -o -x /bin/systemctl ]; then
|
|
|
/sbin/service zabbix_agentd stop >/dev/null 2>&1
|
|
|
@@ -514,12 +520,12 @@ fi
|
|
|
|
|
|
%endif
|
|
|
|
|
|
+
|
|
|
%files
|
|
|
%defattr(-,root,root,-)
|
|
|
%license zabbix_mysql/COPYING
|
|
|
%doc zabbix_mysql/AUTHORS zabbix_mysql/ChangeLog zabbix_mysql/NEWS zabbix_mysql/README
|
|
|
%attr(0755,zabbix,zabbix) %dir %{_localstatedir}/log/%{name}
|
|
|
-%attr(0755,zabbix,zabbix) %dir %{_localstatedir}/run/%{name}
|
|
|
%dir %{_datadir}/zabbix
|
|
|
%if %{with server}%{with proxy}
|
|
|
%{_datadir}/zabbix/mysql
|
|
|
@@ -528,6 +534,7 @@ fi
|
|
|
%if %{with systemd}
|
|
|
%{_prefix}/lib/tmpfiles.d/zabbix.conf
|
|
|
%endif
|
|
|
+%{_bindir}/zabbix_js
|
|
|
|
|
|
%if %{with server}
|
|
|
%files server-common
|
|
|
@@ -618,7 +625,12 @@ fi
|
|
|
|
|
|
%endif
|
|
|
|
|
|
+
|
|
|
%changelog
|
|
|
+* Thu Jul 23 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.0.2-1
|
|
|
+- new upstream release.
|
|
|
+- dropped all patches: made to get the same effect by another method.
|
|
|
+
|
|
|
* Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.0.19-2
|
|
|
- rebuilt with libevent-2.1.11.
|
|
|
|
tomop