Browse Source

zabbix: update to latest version

Updated to latest version and refreshed patches.

Compile tested: Yes, brcm2708
Run tested: Yes, brcm2708

Signed-off-by: Krystian Kozak <krystian.kozak20@gmail.com>
lilik-openwrt-22.03
Krystian Kozak 6 years ago
committed by Etienne Champetier
parent
commit
41f8c0a2da
4 changed files with 9 additions and 12 deletions
  1. +2
    -2
      admin/zabbix/Makefile
  2. +4
    -4
      admin/zabbix/patches/010-change-agentd-config.patch
  3. +0
    -1
      admin/zabbix/patches/100-musl-compat.patch
  4. +3
    -5
      admin/zabbix/patches/110-reproducible-builds.patch

+ 2
- 2
admin/zabbix/Makefile View File

@ -8,11 +8,11 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=zabbix PKG_NAME:=zabbix
PKG_VERSION:=3.4.10
PKG_VERSION:=3.4.14
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_HASH:=cdee0fd44e11ae214b2cc252974da22f3627c326ea2c61a0315af95165c52d1b
PKG_HASH:=7443873cc970672d3c884230d3aeb082f2d8afcc2b757506c2d684ffdd12d77e
PKG_SOURCE_URL:=@SF/zabbix PKG_SOURCE_URL:=@SF/zabbix
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0


+ 4
- 4
admin/zabbix/patches/010-change-agentd-config.patch View File

@ -27,7 +27,7 @@
### Option: LogFileSize ### Option: LogFileSize
# Maximum size of log file in MB. # Maximum size of log file in MB.
# 0 - disable automatic log rotation. # 0 - disable automatic log rotation.
@@ -114,6 +111,7 @@ Server=127.0.0.1
@@ -116,6 +113,7 @@ Server=127.0.0.1
# Range: 0-100 # Range: 0-100
# Default: # Default:
# StartAgents=3 # StartAgents=3
@ -35,7 +35,7 @@
##### Active checks related ##### Active checks related
@@ -129,8 +127,6 @@ Server=127.0.0.1
@@ -131,8 +129,6 @@ Server=127.0.0.1
# Default: # Default:
# ServerActive= # ServerActive=
@ -44,7 +44,7 @@
### Option: Hostname ### Option: Hostname
# Unique, case sensitive hostname. # Unique, case sensitive hostname.
# Required for active checks and must match hostname as configured on the server. # Required for active checks and must match hostname as configured on the server.
@@ -140,8 +136,6 @@ ServerActive=127.0.0.1
@@ -142,8 +138,6 @@ ServerActive=127.0.0.1
# Default: # Default:
# Hostname= # Hostname=
@ -53,7 +53,7 @@
### Option: HostnameItem ### Option: HostnameItem
# Item used for generating Hostname if it is undefined. Ignored if Hostname is defined. # Item used for generating Hostname if it is undefined. Ignored if Hostname is defined.
# Does not support UserParameters or aliases. # Does not support UserParameters or aliases.
@@ -259,8 +253,8 @@ Hostname=Zabbix server
@@ -261,8 +255,8 @@ Hostname=Zabbix server
# Include= # Include=
# Include=/usr/local/etc/zabbix_agentd.userparams.conf # Include=/usr/local/etc/zabbix_agentd.userparams.conf


+ 0
- 1
admin/zabbix/patches/100-musl-compat.patch View File

@ -9,4 +9,3 @@
sys/socket.h sys/loadavg.h arpa/inet.h \ sys/socket.h sys/loadavg.h arpa/inet.h \
sys/vmmeter.h strings.h vm/vm_param.h \ sys/vmmeter.h strings.h vm/vm_param.h \
sys/time.h kstat.h sys/syscall.h sys/sysmacros.h \ sys/time.h kstat.h sys/syscall.h sys/sysmacros.h \

+ 3
- 5
admin/zabbix/patches/110-reproducible-builds.patch View File

@ -1,8 +1,6 @@
Index: zabbix-3.2.7/src/libs/zbxcommon/str.c
===================================================================
--- zabbix-3.2.7.orig/src/libs/zbxcommon/str.c
+++ zabbix-3.2.7/src/libs/zbxcommon/str.c
@@ -51,7 +51,7 @@ static const char help_message_footer[]
--- a/src/libs/zbxcommon/str.c
+++ b/src/libs/zbxcommon/str.c
@@ -52,7 +52,7 @@ static const char help_message_footer[]
void version(void) void version(void)
{ {
printf("%s (Zabbix) %s\n", title_message, ZABBIX_VERSION); printf("%s (Zabbix) %s\n", title_message, ZABBIX_VERSION);


Loading…
Cancel
Save