From 22f1cc9470fe496429bbc3bbfce8a256c63e1db4 Mon Sep 17 00:00:00 2001 From: Krystian Kozak Date: Thu, 22 Aug 2019 22:19:03 +0200 Subject: [PATCH] zabbix: update to 4.0.11 Updated to 4.0.11 LTS version. Deleted 003-change-user-and-foreground.patch in according to [ZBX-10611] fixed changing process user owner on startup in foreground when AllowRoot disabled. Compile tested: Yes, lantiq Run tested: Yes, lantiq Signed-off-by: Krystian Kozak --- admin/zabbix/Makefile | 6 +++--- .../003-change-user-and-foreground.patch | 17 ----------------- 2 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 admin/zabbix/patches/003-change-user-and-foreground.patch diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile index 8dadb21a67..e5e6826bd2 100644 --- a/admin/zabbix/Makefile +++ b/admin/zabbix/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zabbix -PKG_VERSION:=4.0.6 -PKG_RELEASE:=2 +PKG_VERSION:=4.0.11 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/zabbix -PKG_HASH:=2890851b3a4b0f70f69ef754aa0d07070b42440f56d280113a9474bc4ed75e5b +PKG_HASH:=b0af25c31c622d14cb7780db5941d76579b9f9a6ee449613d847b0b505628409 PKG_MAINTAINER:=Etienne CHAMPETIER PKG_LICENSE:=GPL-2.0 diff --git a/admin/zabbix/patches/003-change-user-and-foreground.patch b/admin/zabbix/patches/003-change-user-and-foreground.patch deleted file mode 100644 index 6779e47194..0000000000 --- a/admin/zabbix/patches/003-change-user-and-foreground.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/src/libs/zbxnix/daemon.c -+++ b/src/libs/zbxnix/daemon.c -@@ -300,11 +300,14 @@ int daemon_start(int allow_root, const c - - if (0 == allow_root && 0 == getuid()) /* running as root? */ - { -+#if 0 -+/* allow changing user and foreground */ - if (0 != (flags & ZBX_TASK_FLAG_FOREGROUND)) - { - zbx_error("cannot run as root!"); - exit(EXIT_FAILURE); - } -+#endif - - if (NULL == user) - user = "zabbix"; -- 2.30.2