aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEtienne CHAMPETIER <champetier.etienne@gmail.com>2014-11-11 23:27:03 +0100
committerEtienne CHAMPETIER <champetier.etienne@gmail.com>2014-11-13 21:04:35 +0100
commit5dea9ae9e64db94465f7b9e3995f4a07e2c8a3d5 (patch)
tree431be5a50a41779e8c83075082b9bf6e5e44c173
parente044d612a008492cd3a1f6af11665704058da461 (diff)
zabbix: update to 2.4.2
Remove 001-cross_compile.patch, it's fixed upstream (ZBX-5561) Run tested on ar71xx Signed-off-by: Etienne CHAMPETIER <champetier.etienne@gmail.com>
-rw-r--r--admin/zabbix/Makefile4
-rw-r--r--admin/zabbix/patches/001-cross_compile.patch29
2 files changed, 2 insertions, 31 deletions
diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile
index 1b8a97fb4..148ed77a5 100644
--- a/admin/zabbix/Makefile
+++ b/admin/zabbix/Makefile
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=zabbix
-PKG_VERSION:=2.4.0
+PKG_VERSION:=2.4.2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/zabbix
-PKG_MD5SUM:=57d9bf72bf0732971e4540a402bfc6c6
+PKG_MD5SUM:=50530e52c08d4a81f9e6e781f1a170ca
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=COPYING
diff --git a/admin/zabbix/patches/001-cross_compile.patch b/admin/zabbix/patches/001-cross_compile.patch
deleted file mode 100644
index 77b9fe327..000000000
--- a/admin/zabbix/patches/001-cross_compile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -824,25 +824,8 @@ dnl ************************************
-
- dnl Check for %qu format (FreeBSD 4.x)
- dnl FreeBSD 4.x does not support %llu
--AC_MSG_CHECKING(for long long format)
--AC_TRY_RUN(
--[
--#include <sys/types.h>
--int main()
--{
-- uint64_t i;
--
-- sscanf("200000000010020", "%qu", &i);
--
-- if (i == 200000000010020) return 0;
-- else return -1;
--}
--],
--AC_DEFINE(HAVE_LONG_LONG_QU, 1 ,[Define to 1 if format '%qu' exists.])
--AC_MSG_RESULT(yes),
--AC_MSG_RESULT(no))
--
- dnl option -rdynamic is needed for readable backtraces
-+
- AC_MSG_CHECKING(for -rdynamic linking option)
- saved_LDFLAGS="$LDFLAGS"
- LDFLAGS="-rdynamic $LDFLAGS"