bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update zabbix to 2.2.2

Browse Source 
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)

Signed-off-by: Etienne CHAMPETIER <etienne.champetier@free.fr>


git-svn-id: svn://svn.openwrt.org/openwrt/packages@40639 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
hauke
2014-05-01 18:32:49 +00:00
parent db78659473
commit c599f49346
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
admin/zabbix/Makefile
View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=zabbix PKG_NAME:=zabbix
PKG_VERSION:=2.2.1 PKG_VERSION:=2.2.2
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/zabbix PKG_SOURCE_URL:=@SF/zabbix
PKG_MD5SUM:=558497839b13a548f533eb2fc951a4e3 PKG_MD5SUM:=7f680ad3ef7145840e3de5c7a0f19b7c
PKG_INSTALL:=1 PKG_INSTALL:=1

6
admin/zabbix/patches/001-cross_compile.patch
View File

@ -1,6 +1,6 @@
--- a/configure.in --- a/configure.ac
+++ b/configure.in +++ b/configure.ac
@@ -804,25 +804,8 @@ dnl ************************************ @@ -805,25 +805,8 @@ dnl ************************************
dnl Check for %qu format (FreeBSD 4.x) dnl Check for %qu format (FreeBSD 4.x)
dnl FreeBSD 4.x does not support %llu dnl FreeBSD 4.x does not support %llu

18
admin/zabbix/patches/002-fix-res_send-on-uclibc.patch
View File

@ -1,6 +1,6 @@
--- a/configure.in --- a/configure.ac
+++ b/configure.in +++ b/configure.ac
@@ -151,6 +151,10 @@ if test "x$found_resolv" != "xyes"; then @@ -152,6 +152,10 @@ if test "x$found_resolv" != "xyes"; then
AC_MSG_ERROR([Unable to do DNS lookups (libresolv check failed)]) AC_MSG_ERROR([Unable to do DNS lookups (libresolv check failed)])
fi fi
LIBS="${LIBS} ${RESOLV_LIBS}" LIBS="${LIBS} ${RESOLV_LIBS}"
@ -13,15 +13,15 @@
dnl * * dnl * *
--- a/src/libs/zbxsysinfo/common/net.c --- a/src/libs/zbxsysinfo/common/net.c
+++ b/src/libs/zbxsysinfo/common/net.c +++ b/src/libs/zbxsysinfo/common/net.c
@@ -421,6 +421,7 @@ static int dns_query(AGENT_REQUEST *requ @@ -424,6 +424,7 @@ static int dns_query(AGENT_REQUEST *requ
#else /* not _WINDOWS */ if (-1 == res_init()) /* initialize always, settings might have changed */
res_init(); /* initialize always, settings might have changed */ return SYSINFO_RET_FAIL;
+#if defined(HAVE_RES_MKQUERY) && defined(HAVE_RES_SEND) +#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)))) if (-1 == (res = res_mkquery(QUERY, zone, C_IN, type, NULL, 0, NULL, buf, sizeof(buf))))
return SYSINFO_RET_FAIL; 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.retry = retry;
res = res_send(buf, res, answer.buffer, sizeof(answer.buffer)); res = res_send(buf, res, answer.buffer, sizeof(answer.buffer));
@ -31,5 +31,5 @@
+ return SYSINFO_RET_FAIL; + return SYSINFO_RET_FAIL;
+#endif +#endif
hp = (HEADER *)answer.buffer; _res.retrans = saved_retrans;
_res.retry = saved_retry;

4
admin/zabbix/patches/010-change-agentd-config.patch
View File

@ -48,8 +48,8 @@
-Hostname=Zabbix server -Hostname=Zabbix server
- -
### Option: HostnameItem ### Option: HostnameItem
# Item used for generating Hostname if it is undefined. # Item used for generating Hostname if it is undefined. Ignored if Hostname is defined.
# Ignored if Hostname is defined. # Does not support UserParameters or aliases.
@@ -240,7 +231,7 @@ Hostname=Zabbix server @@ -240,7 +231,7 @@ Hostname=Zabbix server
# Include= # Include=