zabbix: update to 2.4.6 (and refresh patches)

Signed-off-by: Etienne CHAMPETIER <champetier.etienne@gmail.com>

diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile
index 02e142164f8d0f32b9a78aad534f6fa6975b7a5c..098f3e3414efac3d427b761a021a51f30dadee8c 100644 (file)
--- a/admin/zabbix/Makefile
+++ b/admin/zabbix/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zabbix
-PKG_VERSION:=2.4.5
-PKG_RELEASE:=3
+PKG_VERSION:=2.4.6
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/zabbix
-PKG_MD5SUM:=a82eb0d55d3ca947e10a4a55238f4388
+PKG_MD5SUM:=06ad8d5808a0eddf2b9f0a256b6a5fde
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING

diff --git a/admin/zabbix/patches/015-daemon-foreground.patch b/admin/zabbix/patches/015-daemon-foreground.patch
index 20e13060e9d022c38e42db9c4c9c6d63e0a9bf4f..364e70360492959da1e7b2009cb84b48587eff49 100644 (file)
--- a/admin/zabbix/patches/015-daemon-foreground.patch
+++ b/admin/zabbix/patches/015-daemon-foreground.patch
@@ -1,8 +1,8 @@
 --- a/include/common.h
 +++ b/include/common.h
-@@ -1081,4 +1081,7 @@ int      parse_serveractive_element(char *str
- #define ZBX_SESSION_ACTIVE    0
- #define ZBX_SESSION_PASSIVE   1
+@@ -1083,4 +1083,7 @@ int      parse_serveractive_element(char *str
+ 
+ char  *zbx_dyn_escape_shell_single_quote(const char *text);
  
 +#define ZBX_RUN_BACKGROUND      0
 +#define ZBX_RUN_FOREGROUND      1