zabbix: update to 2.2.5, refresh patches

Signed-off-by: Etienne CHAMPETIER <champetier.etienne@gmail.com>

diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile
index 704b944c4b5e3aebd00d725df442bb7e5000f46f..f015aca276ff233e81f075dff14c76624bec03c9 100644 (file)
--- a/admin/zabbix/Makefile
+++ b/admin/zabbix/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zabbix
-PKG_VERSION:=2.2.3
-PKG_RELEASE:=2
+PKG_VERSION:=2.2.5
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/zabbix
-PKG_MD5SUM:=cb1bda41a742175a445e8d32d103a315
+PKG_MD5SUM:=e7b74a0208743f743585d9cc1d46eccf
 
 PKG_LICENSE:=GPLv2
 PKG_LICENSE_FILES:=

diff --git a/admin/zabbix/patches/001-cross_compile.patch b/admin/zabbix/patches/001-cross_compile.patch
index 26132c818227c049e732ea6d6eea91943c62e4d0..77b9fe327b8b34fd32877a83b5eaa55874c47ee8 100644 (file)
--- a/admin/zabbix/patches/001-cross_compile.patch
+++ b/admin/zabbix/patches/001-cross_compile.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -805,25 +805,8 @@ dnl ************************************
+@@ -824,25 +824,8 @@ dnl ************************************
  
  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 95b37b1aec054b16169d6b2d54a4ec33affa6102..3d84929450fb69dd25b19927229bd2373e966867 100644 (file)
--- a/admin/zabbix/patches/002-fix-res_send-on-uclibc.patch
+++ b/admin/zabbix/patches/002-fix-res_send-on-uclibc.patch
@@ -13,7 +13,7 @@
  dnl *                                                               *
 --- a/src/libs/zbxsysinfo/common/net.c
 +++ b/src/libs/zbxsysinfo/common/net.c
-@@ -424,6 +424,7 @@ static int dns_query(AGENT_REQUEST *requ
+@@ -425,6 +425,7 @@ static int dns_query(AGENT_REQUEST *requ
        if (-1 == res_init())   /* initialize always, settings might have changed */
                return SYSINFO_RET_FAIL;
  
@@ -21,7 +21,7 @@
        if (-1 == (res = res_mkquery(QUERY, zone, C_IN, type, NULL, 0, NULL, buf, sizeof(buf))))
                return SYSINFO_RET_FAIL;
  
-@@ -448,6 +449,11 @@ static int        dns_query(AGENT_REQUEST *requ
+@@ -449,6 +450,11 @@ static int        dns_query(AGENT_REQUEST *requ
        _res.retry = retry;
  
        res = res_send(buf, res, answer.buffer, sizeof(answer.buffer));