[zabbix20/el6] New upstream release, /var/run ownership
Volker Fröhlich
volter at fedoraproject.org
Thu Sep 11 15:49:56 UTC 2014
commit fe5ba0f154c2d37405461f5eea8304f1b55239c7
Author: Volker Fröhlich <volker27 at gmx.at>
Date: Thu Sep 11 17:48:42 2014 +0200
New upstream release, /var/run ownership
- Use the upstream tarball, now that non-free json was replaced with android-json
- Clean between builds, otherwise zabbix_{proxy,server} are compiled
again on install; make server and proxy package noarch now
- Harmonize package descriptions and summaries
- Sort out /var/run ownership issue when only installing the agent
.gitignore | 1 +
sources | 2 +-
zabbix-2.0.12-zbx8151.patch | 53 -------------------------------------------
zabbix-2.0.12-zbx8238.patch | 24 -------------------
zabbix20.spec | 42 ++++++++++++++++++++-------------
5 files changed, 27 insertions(+), 95 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8befb92..61c2654 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
/zabbix-2.0.10-free.tar.gz
/zabbix-2.0.11-free.tar.gz
/zabbix-2.0.12-free.tar.gz
+/zabbix-2.0.13.tar.gz
diff --git a/sources b/sources
index b9ea480..821c330 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8d497bc9eca83d59ba5633645b86584e zabbix-2.0.12-free.tar.gz
+538e973109c36aaa8c1f2bc7925fb1c4 zabbix-2.0.13.tar.gz
diff --git a/zabbix20.spec b/zabbix20.spec
index 0300238..202a72a 100644
--- a/zabbix20.spec
+++ b/zabbix20.spec
@@ -18,16 +18,14 @@
%global srcname zabbix
Name: zabbix20
-Version: 2.0.12
-Release: 2%{?dist}
+Version: 2.0.13
+Release: 1%{?dist}
Summary: Open-source monitoring solution for your IT infrastructure
Group: Applications/Internet
License: GPLv2+
URL: http://www.zabbix.com
-#Source0: http://downloads.sourceforge.net/%{srcname}/%{srcname}-%{version}.tar.gz
-# upstream tarball minus src/zabbix_java/lib/org-json-2010-12-28.jar
-Source0: %{srcname}-%{version}-free.tar.gz
+Source0: http://downloads.sourceforge.net/%{srcname}/%{srcname}-%{version}.tar.gz
Source1: %{srcname}-web.conf
Source2: %{srcname}-server.init
Source3: %{srcname}-agent.init
@@ -54,11 +52,6 @@ Patch1: %{srcname}-2.0.3-fonts-config.patch
Patch2: %{srcname}-2.0.1-no-flash.patch
# adapt for fping3 - https://support.zabbix.com/browse/ZBX-4894
Patch3: %{srcname}-1.8.12-fping3.patch
-# logrt may continue reading an old file repeatedly.
-Patch4: %{srcname}-2.0.12-zbx8238.patch
-# Local file inclusion via XXE attack (CVE-2014-3005)
-# https://support.zabbix.com/browse/ZBX-8151
-Patch5: %{srcname}-2.0.12-zbx8151.patch
BuildRequires: mysql-devel
BuildRequires: postgresql-devel
@@ -104,6 +97,7 @@ multitude of servers.
%package server
Summary: Zabbix server common files
Group: Applications/Internet
+BuildArch: noarch
Requires: %{name} = %{version}-%{release}
Requires: %{name}-server-implementation = %{version}-%{release}
Requires: fping
@@ -150,7 +144,7 @@ Provides: %{name}-server-implementation = %{version}-%{release}
Zabbix server compiled to use PostgresSQL
%package agent
-Summary: Zabbix Agent
+Summary: Zabbix agent
Group: Applications/Internet
Requires: %{name} = %{version}-%{release}
Requires(pre): shadow-utils
@@ -166,11 +160,12 @@ Requires(postun): /sbin/service
%endif
%description agent
-The Zabbix client agent, to be installed on monitored systems.
+Zabbix agent, to be installed on monitored systems
%package proxy
-Summary: Zabbix Proxy
+Summary: Zabbix proxy common files
Group: Applications/Internet
+BuildArch: noarch
Requires: %{name} = %{version}-%{release}
Requires: %{name}-proxy-implementation = %{version}-%{release}
Requires(pre): shadow-utils
@@ -282,9 +277,6 @@ Zabbix web frontend for PostgreSQL
%patch2 -p1
rm -f frontends/php/images/flash/zbxclock.swf
-%patch4 -p1
-%patch5 -p0
-
# Remove bundled java libs
rm -rf src/zabbix_java/lib/*.jar
@@ -382,11 +374,13 @@ make %{?_smp_mflags}
mv src/zabbix_proxy/zabbix_proxy src/zabbix_proxy/zabbix_proxy_sqlite3
%configure $common_flags --with-mysql --enable-server
+make clean
make %{?_smp_mflags}
mv src/zabbix_server/zabbix_server src/zabbix_server/zabbix_server_mysql
mv src/zabbix_proxy/zabbix_proxy src/zabbix_proxy/zabbix_proxy_mysql
%configure $common_flags --with-postgresql --enable-server
+make clean
make %{?_smp_mflags}
mv src/zabbix_server/zabbix_server src/zabbix_server/zabbix_server_pgsql
mv src/zabbix_proxy/zabbix_proxy src/zabbix_proxy/zabbix_proxy_pgsql
@@ -606,7 +600,10 @@ if [ $1 -eq 1 ] ; then
fi
%pre server
-getent group zabbix > /dev/null || groupadd -r zabbix
+etent group zabbix > /dev/null || groupadd -r zabbix
+getent passwd zabbix > /dev/null || \
+ useradd -r -g zabbix -d %{_sharedstatedir}/zabbix -s /sbin/nologin \
+ -c "Zabbix Monitoring System" zabbix
getent passwd zabbixsrv > /dev/null || \
useradd -r -g zabbix -d %{_sharedstatedir}/zabbixsrv -s /sbin/nologin \
-c "Zabbix Monitoring System -- Proxy or server" zabbixsrv
@@ -628,6 +625,9 @@ fi
#TODO: Update path from 1.8.6 with wrongly set home dir?
%pre proxy
getent group zabbix > /dev/null || groupadd -r zabbix
+getent passwd zabbix > /dev/null || \
+ useradd -r -g zabbix -d %{_sharedstatedir}/zabbix -s /sbin/nologin \
+ -c "Zabbix Monitoring System" zabbix
getent passwd zabbixsrv > /dev/null || \
useradd -r -g zabbix -d %{_sharedstatedir}/zabbixsrv -s /sbin/nologin \
-c "Zabbix Monitoring System -- Proxy or server" zabbixsrv
@@ -843,6 +843,14 @@ fi
%files web-pgsql
%changelog
+* Thu Sep 11 2014 Volker Fröhlich <volker27 at gmx.at> - 2.0.13-1
+- New upstream release; Remove obsolete patches for ZBX-8151 and ZBX-8238
+- Use the upstream tarball, now that non-free json was replaced with android-json
+- Clean between builds, otherwise zabbix_{proxy,server} are compiled
+ again on install; make server and proxy package noarch now
+- Harmonize package descriptions and summaries
+- Sort out /var/run ownership issue when only installing the agent
+
* Fri Jun 20 2014 Volker Fröhlich <volker27 at gmx.at> - 2.0.12-2
- Patch for ZBX-8151 (Local file inclusion via XXE attack) -- CVE-2014-3005
More information about the scm-commits
mailing list