diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile index e91cf986f0..c4f8c464ac 100644 --- a/admin/zabbix/Makefile +++ b/admin/zabbix/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zabbix -PKG_VERSION:=6.2.3 -PKG_RELEASE:=4 +PKG_VERSION:=6.4.7 +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:=2be7e57fb33a55fee71480598e317ffa6a8ee5a39639a7e1b42b2ea6872107b5 +PKG_HASH:=6b4e81f07de4c82c7994871bea51be4d6427683fa9a7fbe112fd7559b3670e49 PKG_MAINTAINER:=Etienne CHAMPETIER PKG_LICENSE:=GPL-2.0 @@ -157,6 +157,7 @@ define Package/zabbix-server/Default +ZABBIX_MYSQL:libmariadbclient \ @(!ZABBIX_SQLITE) \ +libevent2 \ + +libevent2-pthreads \ +fping endef @@ -209,6 +210,7 @@ define Package/zabbix-proxy/Default +ZABBIX_MYSQL:libmariadbclient \ +ZABBIX_SQLITE:libsqlite3 \ +libevent2 \ + +libevent2-pthreads \ +fping endef @@ -262,7 +264,7 @@ CONFIGURE_ARGS+= \ $(if $(CONFIG_ZABBIX_MYSQL),--with-mysql) \ $(if $(CONFIG_ZABBIX_POSTGRESQL),--with-postgresql) \ $(if $(CONFIG_ZABBIX_SQLITE),--with-sqlite3=$(STAGING_DIR)/usr) \ - --with-libevent=$(STAGING_DIR)/usr/include/libevent \ + --with-libevent=$(STAGING_DIR)/usr/include \ --with-libpcre2=$(STAGING_DIR)/usr/include \ --with-zlib=$(STAGING_DIR)/usr/include diff --git a/admin/zabbix/patches/110-reproducible-builds.patch b/admin/zabbix/patches/110-reproducible-builds.patch index 723ccfe146..471e1e6b14 100644 --- a/admin/zabbix/patches/110-reproducible-builds.patch +++ b/admin/zabbix/patches/110-reproducible-builds.patch @@ -1,6 +1,6 @@ ---- a/src/libs/zbxcommon/str.c -+++ b/src/libs/zbxcommon/str.c -@@ -49,7 +49,7 @@ static const char help_message_footer[] +--- a/src/libs/zbxcommon/misc.c ++++ b/src/libs/zbxcommon/misc.c +@@ -329,7 +329,7 @@ void zbx_help(void) void zbx_version(void) { printf("%s (Zabbix) %s\n", title_message, ZABBIX_VERSION);