diff options
| author | Etienne CHAMPETIER <champetier.etienne@gmail.com> | 2014-07-23 00:12:22 +0200 |
|---|---|---|
| committer | Etienne CHAMPETIER <champetier.etienne@gmail.com> | 2014-07-23 01:20:55 +0200 |
| commit | ad2aa7e1fef98d19448e8c5320620e73d32aa74c (patch) | |
| tree | fd47078d0f72a3d026fc7c0b31ad43ab62c01d44 /admin | |
| parent | 9a575ba0094cc07b02cc2a00823898cbb12dacf5 (diff) | |
zabbix: update to 2.2.5, refresh patches
Signed-off-by: Etienne CHAMPETIER <champetier.etienne@gmail.com>
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/zabbix/Makefile | 6 | ||||
| -rw-r--r-- | admin/zabbix/patches/001-cross_compile.patch | 2 | ||||
| -rw-r--r-- | admin/zabbix/patches/002-fix-res_send-on-uclibc.patch | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile index 704b944c4..f015aca27 100644 --- 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 26132c818..77b9fe327 100644 --- 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 95b37b1ae..3d8492945 100644 --- 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)); |