refresh patch (patch configure.ac instead of .in) zabbix-agentd tested on wr1043nd zabbix-* compile tested
zabbix-extra-wifi discovery still not working (need an suid helper to make ubus calls) don't forget this pending patch http://patchwork.openwrt.org/patch/4847/ Signed-off-by: Etienne CHAMPETIER <etienne.champet...@free.fr> --- admin/zabbix/Makefile | 4 ++-- admin/zabbix/patches/001-cross_compile.patch | 6 +++--- admin/zabbix/patches/002-fix-res_send-on-uclibc.patch | 18 +++++++++--------- admin/zabbix/patches/010-change-agentd-config.patch | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile index 9088447..a025c76 100644 --- a/admin/zabbix/Makefile +++ b/admin/zabbix/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zabbix -PKG_VERSION:=2.2.1 +PKG_VERSION:=2.2.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/zabbix -PKG_MD5SUM:=558497839b13a548f533eb2fc951a4e3 +PKG_MD5SUM:=7f680ad3ef7145840e3de5c7a0f19b7c PKG_INSTALL:=1 diff --git a/admin/zabbix/patches/001-cross_compile.patch b/admin/zabbix/patches/001-cross_compile.patch index cf8b6d8..26132c8 100644 --- a/admin/zabbix/patches/001-cross_compile.patch +++ b/admin/zabbix/patches/001-cross_compile.patch @@ -1,6 +1,6 @@ ---- a/configure.in -+++ b/configure.in -@@ -804,25 +804,8 @@ dnl ************************************ +--- a/configure.ac ++++ b/configure.ac +@@ -805,25 +805,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 7072f03..95b37b1 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 -+++ b/configure.in -@@ -151,6 +151,10 @@ if test "x$found_resolv" != "xyes"; then +--- a/configure.ac ++++ b/configure.ac +@@ -152,6 +152,10 @@ if test "x$found_resolv" != "xyes"; then AC_MSG_ERROR([Unable to do DNS lookups (libresolv check failed)]) fi LIBS="${LIBS} ${RESOLV_LIBS}" @@ -13,15 +13,15 @@ dnl * * --- a/src/libs/zbxsysinfo/common/net.c +++ b/src/libs/zbxsysinfo/common/net.c -@@ -421,6 +421,7 @@ static int dns_query(AGENT_REQUEST *requ - #else /* not _WINDOWS */ - res_init(); /* initialize always, settings might have changed */ +@@ -424,6 +424,7 @@ static int dns_query(AGENT_REQUEST *requ + if (-1 == res_init()) /* initialize always, settings might have changed */ + return SYSINFO_RET_FAIL; +#if defined(HAVE_RES_MKQUERY) && defined(HAVE_RES_SEND) if (-1 == (res = res_mkquery(QUERY, zone, C_IN, type, NULL, 0, NULL, buf, sizeof(buf)))) return SYSINFO_RET_FAIL; -@@ -439,6 +440,11 @@ static int dns_query(AGENT_REQUEST *requ +@@ -448,6 +449,11 @@ static int dns_query(AGENT_REQUEST *requ _res.retry = retry; res = res_send(buf, res, answer.buffer, sizeof(answer.buffer)); @@ -31,5 +31,5 @@ + return SYSINFO_RET_FAIL; +#endif - hp = (HEADER *)answer.buffer; - + _res.retrans = saved_retrans; + _res.retry = saved_retry; diff --git a/admin/zabbix/patches/010-change-agentd-config.patch b/admin/zabbix/patches/010-change-agentd-config.patch index cf5083e..ce584fb 100644 --- a/admin/zabbix/patches/010-change-agentd-config.patch +++ b/admin/zabbix/patches/010-change-agentd-config.patch @@ -48,8 +48,8 @@ -Hostname=Zabbix server - ### Option: HostnameItem - # Item used for generating Hostname if it is undefined. - # Ignored if Hostname is defined. + # Item used for generating Hostname if it is undefined. Ignored if Hostname is defined. + # Does not support UserParameters or aliases. @@ -240,7 +231,7 @@ Hostname=Zabbix server # Include= -- 1.8.5.3 _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
