This patch update openwrt zabbix package from 1.6 to 1.8.11 the new version support also ipv6 in the agent
Signed-off-by: Gioacchino Mazzurco <gmazzurc...@gmail.com>
Index: admin/zabbix/patches/005-uclibc_dn_skipname.patch =================================================================== --- admin/zabbix/patches/005-uclibc_dn_skipname.patch (revision 0) +++ admin/zabbix/patches/005-uclibc_dn_skipname.patch (revision 0) @@ -0,0 +1,47 @@ +--- a/src/libs/zbxsysinfo/common/net.c ++++ b/src/libs/zbxsysinfo/common/net.c +@@ -26,6 +26,44 @@ + + #include "net.h" + ++ ++#ifndef HAVE_DN_SKIPNAME ++ ++/* Fix found on kde bug tracker at https://bugs.kde.org/show_bug.cgi?id=185492 */ ++ ++#include <sys/types.h> ++#include <arpa/nameser.h> ++ ++/* lifted from openbsd source */ ++int dn_skipname(const u_char *comp_dn, const u_char *eom) ++{ ++ const u_char *cp; ++ int n; ++ ++ cp = comp_dn; ++ while (cp < eom && (n = *cp++)) { ++ /* ++ * check for indirection ++ */ ++ switch (n & INDIR_MASK) { ++ case 0: /* normal case, n == len */ ++ cp += n; ++ continue; ++ case INDIR_MASK: /* indirection */ ++ cp++; ++ break; ++ default: /* illegal type */ ++ return (-1); ++ } ++ break; ++ } ++ if (cp > eom) ++ return (-1); ++ return (cp - comp_dn); ++} ++ ++#endif ++ + /* + * 0 - NOT OK + * 1 - OK Index: admin/zabbix/patches/001-cross_compile.patch =================================================================== --- admin/zabbix/patches/001-cross_compile.patch (revision 31202) +++ admin/zabbix/patches/001-cross_compile.patch (working copy) @@ -1,13 +1,13 @@ -diff -urN zabbix-1.6/configure zabbix-1.6.new/configure ---- zabbix-1.6/configure 2008-09-18 22:15:39.000000000 +0200 -+++ zabbix-1.6.new/configure 2008-09-30 19:20:43.000000000 +0200 -@@ -4826,8 +4826,7 @@ - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+See \`config.log' for more details." >&2;} } +--- a/configure ++++ b/configure +@@ -6815,8 +6815,8 @@ $as_echo_n "checking for long long forma + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run test program while cross compiling +-See \`config.log' for more details" "$LINENO" 5; } ++$as_echo "cannot run test program while cross compiling ++See \`config.log' for more details"; } else - cat >conftest.$ac_ext <<_ACEOF - + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ Index: admin/zabbix/Makefile =================================================================== --- admin/zabbix/Makefile (revision 31202) +++ admin/zabbix/Makefile (working copy) @@ -8,17 +8,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zabbix -PKG_VERSION:=1.6 -PKG_RELEASE:=3 +PKG_VERSION:=1.8.11 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/zabbix -PKG_MD5SUM:=39d4c871439b1b4f0429964b4abbfc45 +PKG_MD5SUM:=6b6ced84024f18f22ce5e0e902e91936 -PKG_BUILD_DEPENDS:=libsqlite3 +PKG_BUILD_DEPENDS:=libsqlite3 libiconv PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk define Package/zabbix/Default SECTION:=admin @@ -26,7 +27,6 @@ TITLE:=Zabbix URL:=http://www.zabbix.com/ SUBMENU:=zabbix - DEPENDS:=+libcurl endef define Package/zabbix-agent @@ -42,7 +42,7 @@ define Package/zabbix-server $(call Package/zabbix/Default) TITLE+= server - DEPENDS += +libsqlite3 + DEPENDS += +libsqlite3 +libcurl endef @@ -52,7 +52,8 @@ CONFIGURE_ARGS+= \ --bindir="/usr/sbin" \ - --enable-agent + --enable-agent \ + $(if $(CONFIG_IPV6),--enable-ipv6,--disable-ipv6) ifneq ($(CONFIG_PACKAGE_zabbix-server),) CONFIGURE_ARGS+= \
_______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
