This patch updates zabbix to version 2.2.0. This patch also fixes the
autostart of agentd daemon which could not start with default cfg
because of the nonexistence of /etc/zabbix_agentd.conf.d directory.
Signed-off-by: Jiri Slachta <slac...@cesnet.cz>
---
admin/zabbix/Makefile | 4 ++--
admin/zabbix/patches/001-cross_compile.patch | 2 +-
.../patches/002-fix-res_send-on-uclibc.patch | 6 +++---
admin/zabbix/patches/002-uclibc_loadavg.patch | 11 +++++------
.../zabbix/patches/010-change-agentd-config.patch | 10 +++++-----
5 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile
index 5ee8425..6183c4f 100644
--- a/admin/zabbix/Makefile
+++ b/admin/zabbix/Makefile
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=zabbix
-PKG_VERSION:=2.0.8
+PKG_VERSION:=2.2.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/zabbix
-PKG_MD5SUM:=8fef9e6f499295211dd9b2a9db96464b
+PKG_MD5SUM:=caec9b3b744dac0b171c0c6b0c240b69
PKG_INSTALL:=1
diff --git a/admin/zabbix/patches/001-cross_compile.patch
b/admin/zabbix/patches/001-cross_compile.patch
index 8716e84..780e618 100644
--- a/admin/zabbix/patches/001-cross_compile.patch
+++ b/admin/zabbix/patches/001-cross_compile.patch
@@ -1,6 +1,6 @@
--- a/configure.in 2012-06-21 21:32:23.707912790 +0000
+++ b/configure.in 2012-06-21 21:33:36.213554564 +0000
-@@ -802,25 +802,8 @@
+@@ -804,25 +804,8 @@
dnl Check for %qu format (FreeBSD 4.x)
dnl FreeBSD 4.x does not support %llu
diff --git a/admin/zabbix/patches/002-fix-res_send-on-uclibc.patch
b/admin/zabbix/patches/002-fix-res_send-on-uclibc.patch
index 3190659..a5fb677 100644
--- a/admin/zabbix/patches/002-fix-res_send-on-uclibc.patch
+++ b/admin/zabbix/patches/002-fix-res_send-on-uclibc.patch
@@ -1,6 +1,6 @@
--- a/configure.in 2013-02-14 18:29:28.145419003 +0100
+++ b/configure.in 2013-02-14 18:28:42.873418092 +0100
-@@ -149,6 +149,10 @@
+@@ -151,6 +151,10 @@
AC_MSG_ERROR([Unable to do DNS lookups (libresolv check failed)])
fi
LIBS="${LIBS} ${RESOLV_LIBS}"
@@ -13,7 +13,7 @@
dnl * *
--- a/src/libs/zbxsysinfo/common/net.c 2012-06-21 19:49:46.610567432 +0000
+++ b/src/libs/zbxsysinfo/common/net.c 2012-06-21 19:50:35.816628541 +0000
-@@ -418,6 +418,7 @@
+@@ -421,6 +421,7 @@
#else /* not _WINDOWS */
res_init(); /* initialize always, settings might have changed */
@@ -21,7 +21,7 @@
if (-1 == (res = res_mkquery(QUERY, zone, C_IN, type, NULL, 0, NULL,
buf, sizeof(buf))))
return SYSINFO_RET_FAIL;
-@@ -436,6 +437,11 @@
+@@ -439,6 +440,11 @@
_res.retry = retry;
res = res_send(buf, res, answer.buffer, sizeof(answer.buffer));
diff --git a/admin/zabbix/patches/002-uclibc_loadavg.patch
b/admin/zabbix/patches/002-uclibc_loadavg.patch
index 6effabb..66e93ca 100644
--- a/admin/zabbix/patches/002-uclibc_loadavg.patch
+++ b/admin/zabbix/patches/002-uclibc_loadavg.patch
@@ -1,10 +1,9 @@
---- a/src/libs/zbxsysinfo/linux/cpu.c 2013-02-12 12:27:22.000000000 +0100
-+++ b/src/libs/zbxsysinfo/linux/cpu.c 2013-02-14 18:38:02.517429349 +0100
-@@ -21,6 +21,45 @@
+--- zabbix-2.2.0/src/libs/zbxsysinfo/linux/cpu.c 2013-11-12
07:07:26.000000000 +0100
++++ zabbix-new/src/libs/zbxsysinfo/linux/cpu.c 2013-11-15 10:38:45.638488128
+0100
+@@ -21,6 +21,44 @@
#include "sysinfo.h"
#include "stats.h"
-+
+/* uclibc and dietlibc do not have this junk -ReneR */
+#if defined (__UCLIBC__) || defined (__dietlibc__)
+static int getloadavg (double loadavg[], int nelem)
@@ -43,6 +42,6 @@
+}
+#endif
+
- int SYSTEM_CPU_NUM(const char *cmd, const char *param, unsigned flags,
AGENT_RESULT *result)
+ int SYSTEM_CPU_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
{
- char tmp[16];
+ char *type;
diff --git a/admin/zabbix/patches/010-change-agentd-config.patch
b/admin/zabbix/patches/010-change-agentd-config.patch
index 58424e9..57ff815 100644
--- a/admin/zabbix/patches/010-change-agentd-config.patch
+++ b/admin/zabbix/patches/010-change-agentd-config.patch
@@ -24,7 +24,7 @@
### Option: LogFileSize
# Maximum size of log file in MB.
# 0 - disable automatic log rotation.
-@@ -105,6 +99,7 @@ Server=127.0.0.1
+@@ -104,6 +98,7 @@ Server=127.0.0.1
# Range: 0-100
# Default:
# StartAgents=3
@@ -32,7 +32,7 @@
##### Active checks related
-@@ -120,8 +115,6 @@ Server=127.0.0.1
+@@ -119,8 +114,6 @@ Server=127.0.0.1
# Default:
# ServerActive=
@@ -41,7 +41,7 @@
### Option: Hostname
# Unique, case sensitive hostname.
# Required for active checks and must match hostname as configured on the
server.
-@@ -131,8 +124,6 @@ ServerActive=127.0.0.1
+@@ -130,8 +123,6 @@ ServerActive=127.0.0.1
# Default:
# Hostname=
@@ -50,12 +50,12 @@
### Option: HostnameItem
# Item used for generating Hostname if it is undefined.
# Ignored if Hostname is defined.
-@@ -213,7 +204,7 @@ Hostname=Zabbix server
+@@ -234,7 +225,7 @@ Hostname=Zabbix server
# Include=
# Include=/usr/local/etc/zabbix_agentd.userparams.conf
-# Include=/usr/local/etc/zabbix_agentd.conf.d/
-+Include=/etc/zabbix_agentd.conf.d/
++# Include=/etc/zabbix_agentd.conf.d/
####### USER-DEFINED MONITORED PARAMETERS #######
--
1.7.9.5
---
Tato zpráva neobsahuje viry ani jiný škodlivý kód - avast! Antivirus je aktivní.
http://www.avast.com
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
