Changeset 40639


Ignore:
Timestamp:
2014-05-01T20:32:49+02:00 (4 years ago)
Author:
hauke
Message:

Update zabbix to 2.2.2

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@…>

Location:
packages/admin/zabbix
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • packages/admin/zabbix/Makefile

    r40638 r40639  
    99 
    1010PKG_NAME:=zabbix 
    11 PKG_VERSION:=2.2.1 
    12 PKG_RELEASE:=2 
     11PKG_VERSION:=2.2.2 
     12PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1515PKG_SOURCE_URL:=@SF/zabbix 
    16 PKG_MD5SUM:=558497839b13a548f533eb2fc951a4e3 
     16PKG_MD5SUM:=7f680ad3ef7145840e3de5c7a0f19b7c 
    1717 
    1818PKG_INSTALL:=1 
  • packages/admin/zabbix/patches/001-cross_compile.patch

    r39489 r40639  
    1 --- a/configure.in 
    2 +++ b/configure.in 
    3 @@ -804,25 +804,8 @@ dnl ************************************ 
     1--- a/configure.ac 
     2+++ b/configure.ac 
     3@@ -805,25 +805,8 @@ dnl ************************************ 
    44  
    55 dnl Check for %qu format (FreeBSD 4.x) 
  • packages/admin/zabbix/patches/002-fix-res_send-on-uclibc.patch

    r39489 r40639  
    1 --- a/configure.in 
    2 +++ b/configure.in 
    3 @@ -151,6 +151,10 @@ if test "x$found_resolv" != "xyes"; then 
     1--- a/configure.ac 
     2+++ b/configure.ac 
     3@@ -152,6 +152,10 @@ if test "x$found_resolv" != "xyes"; then 
    44        AC_MSG_ERROR([Unable to do DNS lookups (libresolv check failed)]) 
    55 fi 
     
    1414--- a/src/libs/zbxsysinfo/common/net.c 
    1515+++ b/src/libs/zbxsysinfo/common/net.c 
    16 @@ -421,6 +421,7 @@ static int  dns_query(AGENT_REQUEST *requ 
    17  #else  /* not _WINDOWS */ 
    18         res_init();     /* initialize always, settings might have changed */ 
     16@@ -424,6 +424,7 @@ static int  dns_query(AGENT_REQUEST *requ 
     17        if (-1 == res_init())   /* initialize always, settings might have changed */ 
     18                return SYSINFO_RET_FAIL; 
    1919  
    2020+#if defined(HAVE_RES_MKQUERY) && defined(HAVE_RES_SEND)  
     
    2222                return SYSINFO_RET_FAIL; 
    2323  
    24 @@ -439,6 +440,11 @@ static int dns_query(AGENT_REQUEST *requ 
     24@@ -448,6 +449,11 @@ static int dns_query(AGENT_REQUEST *requ 
    2525        _res.retry = retry; 
    2626  
     
    3232+#endif  
    3333  
    34         hp = (HEADER *)answer.buffer; 
    35   
     34        _res.retrans = saved_retrans; 
     35        _res.retry = saved_retry; 
  • packages/admin/zabbix/patches/010-change-agentd-config.patch

    r39489 r40639  
    4949- 
    5050 ### Option: HostnameItem 
    51  #      Item used for generating Hostname if it is undefined. 
    52  #      Ignored if Hostname is defined. 
     51 #      Item used for generating Hostname if it is undefined. Ignored if Hostname is defined. 
     52 #      Does not support UserParameters or aliases. 
    5353@@ -240,7 +231,7 @@ Hostname=Zabbix server 
    5454 # Include= 
Note: See TracChangeset for help on using the changeset viewer.