From 89fa774a191d41ed5d125d87d812ff3478902251 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 13 Feb 2023 19:15:23 +0100 Subject: [PATCH] package/zabbix: bump to version 6.2.7 - host-pkgconf is now mandatory - switch to pcre2 which is supported since version 6.0.0 and https://github.com/zabbix/zabbix/commit/18917f919a68abc863a5c79ba88c0cb156255fdc - Update hash of README (links updated with https://github.com/zabbix/zabbix/commit/067f5f873fb18ae7b22c5eaef40f0898b98edeb5 https://github.com/zabbix/zabbix/commit/499dbc81b987513233d579610335b8938f1ae91d) https://github.com/zabbix/zabbix/blob/6.2.7/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/zabbix/Config.in | 2 +- package/zabbix/zabbix.hash | 4 ++-- package/zabbix/zabbix.mk | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/zabbix/Config.in b/package/zabbix/Config.in index 0f7a0b0003..377c0ff692 100644 --- a/package/zabbix/Config.in +++ b/package/zabbix/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_ZABBIX bool "zabbix" depends on BR2_TOOLCHAIN_USES_GLIBC - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help Zabbix is an enterprise-class open source distributed monitoring solution. Zabbix is free of cost. Zabbix is diff --git a/package/zabbix/zabbix.hash b/package/zabbix/zabbix.hash index 42cc0bda57..bb6127e5ec 100644 --- a/package/zabbix/zabbix.hash +++ b/package/zabbix/zabbix.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 19686628df76e8d5ef7c2ed2975b258c7ca3ec7d151b1bb59d7e132f9fc7c941 zabbix-5.4.9.tar.gz -sha256 10d68ec3abacc29222c07748fc5e5cb9474fd7cd9ccdde1b92ff941ded946b78 README +sha256 6d423810667b948ed22052d9aa84a035e2d4b92cbe8efdb669cac529806b722d zabbix-6.2.7.tar.gz +sha256 f8fc3fd12521b60d53d8c5d48a883eb3c9c5ddec9de986a273e1b77f69d811db README sha256 444fe54aecc95ac0f3314289c300afc73b3946a4dc9fbd7e022709b3e0924dd0 COPYING diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index e00d693ba5..db9efed78b 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -4,8 +4,8 @@ # ################################################################################ -ZABBIX_VERSION_MAJOR = 5.4 -ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).9 +ZABBIX_VERSION_MAJOR = 6.2 +ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).7 ZABBIX_SITE = https://cdn.zabbix.com/zabbix/sources/stable/$(ZABBIX_VERSION_MAJOR) ZABBIX_LICENSE = GPL-2.0+ ZABBIX_LICENSE_FILES = README COPYING @@ -13,9 +13,8 @@ ZABBIX_CPE_ID_VENDOR = zabbix # We're patching m4/netsnmp.m4 ZABBIX_AUTORECONF = YES -ZABBIX_DEPENDENCIES = pcre +ZABBIX_DEPENDENCIES = host-pkgconf pcre2 ZABBIX_CONF_OPTS = \ - --with-libpcre=$(STAGING_DIR)/usr/bin/ \ --without-sqlite3 \ --enable-agent \ --disable-agent2 \