Browse Source

Merge pull request #9782 from Rixerx/master

zabbix: update to 4.0.11
lilik-openwrt-22.03
Etienne Champetier 5 years ago
committed by GitHub
parent
commit
84ec80e0da
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 20 deletions
  1. +3
    -3
      admin/zabbix/Makefile
  2. +0
    -17
      admin/zabbix/patches/003-change-user-and-foreground.patch

+ 3
- 3
admin/zabbix/Makefile View File

@ -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 <champetier.etienne@gmail.com>
PKG_LICENSE:=GPL-2.0


+ 0
- 17
admin/zabbix/patches/003-change-user-and-foreground.patch View File

@ -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";

Loading…
Cancel
Save