From 4948edf6fff5af42707fdb9d6ae0d9bd02c31d79 Mon Sep 17 00:00:00 2001 From: Yanase Yuki Date: Wed, 5 Jun 2024 22:22:32 +0900 Subject: [PATCH] zabbix: update to 7.0.0 License has been changed to AGPL-3.0-only Signed-off-by: Yanase Yuki --- admin/zabbix/Makefile | 6 +++--- admin/zabbix/patches/010-change-agentd-config.patch | 2 +- admin/zabbix/patches/110-reproducible-builds.patch | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile index 392eaebff6..52f521127f 100644 --- a/admin/zabbix/Makefile +++ b/admin/zabbix/Makefile @@ -8,16 +8,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zabbix -PKG_VERSION:=6.4.15 +PKG_VERSION:=7.0.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://cdn.zabbix.com/zabbix/sources/stable/$(basename $(PKG_VERSION))/ \ https://cdn.zabbix.com/zabbix/sources/oldstable/$(basename $(PKG_VERSION))/ -PKG_HASH:=0ad98d0aecc355c8628e29d6728a779465135464b625b89009b9aeb325c142f6 +PKG_HASH:=520641483223f680ef6e685284b556ba34a496d886a38dc3bca085cde21031b1 PKG_MAINTAINER:=Etienne CHAMPETIER -PKG_LICENSE:=GPL-2.0 +PKG_LICENSE:=AGPL-3.0-only PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:zabbix:zabbix diff --git a/admin/zabbix/patches/010-change-agentd-config.patch b/admin/zabbix/patches/010-change-agentd-config.patch index 2f0085fd4a..7329113577 100644 --- a/admin/zabbix/patches/010-change-agentd-config.patch +++ b/admin/zabbix/patches/010-change-agentd-config.patch @@ -30,7 +30,7 @@ @@ -136,6 +133,7 @@ Server=127.0.0.1 # Range: 0-100 # Default: - # StartAgents=3 + # StartAgents=10 +StartAgents=1 ##### Active checks related diff --git a/admin/zabbix/patches/110-reproducible-builds.patch b/admin/zabbix/patches/110-reproducible-builds.patch index 471e1e6b14..76c24921ea 100644 --- a/admin/zabbix/patches/110-reproducible-builds.patch +++ b/admin/zabbix/patches/110-reproducible-builds.patch @@ -1,7 +1,7 @@ --- a/src/libs/zbxcommon/misc.c +++ b/src/libs/zbxcommon/misc.c -@@ -329,7 +329,7 @@ void zbx_help(void) - void zbx_version(void) +@@ -223,7 +223,7 @@ static const char copyright_message[] = + void zbx_print_version(const char *title_message) { printf("%s (Zabbix) %s\n", title_message, ZABBIX_VERSION); - printf("Revision %s %s, compilation time: %s %s\n\n", ZABBIX_REVISION, ZABBIX_REVDATE, __DATE__, __TIME__); -- 2.30.2