From patchwork Thu Aug 29 00:16:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Waldemar Brodkorb X-Patchwork-Id: 1978183 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WvMKh08Ypz1ydy for ; Thu, 29 Aug 2024 10:17:10 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 66A72819E6; Thu, 29 Aug 2024 00:17:06 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id DI6G9Pej6-vN; Thu, 29 Aug 2024 00:17:04 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 28B3181985 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 28B3181985; Thu, 29 Aug 2024 00:17:04 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id D29A51BF239 for ; Thu, 29 Aug 2024 00:17:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id BFDCD40179 for ; Thu, 29 Aug 2024 00:17:01 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id EsTuUiHp9Ahn for ; Thu, 29 Aug 2024 00:17:00 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1828:2000:679::23; helo=helium.openadk.org; envelope-from=wbx@openadk.org; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 5AF3740137 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 5AF3740137 Received: from helium.openadk.org (helium.openadk.org [IPv6:2a00:1828:2000:679::23]) by smtp2.osuosl.org (Postfix) with ESMTPS id 5AF3740137 for ; Thu, 29 Aug 2024 00:16:58 +0000 (UTC) Received: by helium.openadk.org (Postfix, from userid 1000) id 5112C352142E; Thu, 29 Aug 2024 02:16:55 +0200 (CEST) Date: Thu, 29 Aug 2024 02:16:55 +0200 From: Waldemar Brodkorb To: buildroot@buildroot.org Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Operating-System: Linux 5.10.0-31-amd64 x86_64 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=openadk.org; s=2022; t=1724890615; bh=clPkW2u69ThJ/YphH8z9I4OPgNPic7I0BGp301eCGjs=; h=Date:From:To:Subject:From; b=IBEXCI2N7NNZoh3Q7zNMmcFpGv14sfvLsCSXkTyshxKOWUH/IbLzubVylmdwi7u4H i/117cwyeCGqFNraU9fgrAOlg0ilZ72F3kWfdrwQfe+4sxcrnPh3Ym/UDDNdcrESUv ed1iWhz3HB8ka3E9a4s3JkCevi68EC7nNu1GTybRL1CL9gFUZkXcQB1dwGplZW1cr+ N6Hu1TvTvYADKDiv7or6daAt/tRvZYUXN6iOa+H+QVvkjfKMOtrAPR+0/8wgACLDpZ BDIKzpY734rwH41dBcK5SHmtTbKcVAWDt6Cp3bBbt/bDj1yBpO6K0ZpcPLNnslCl38 k6qNUkMm8mPog== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=none (p=none dis=none) header.from=openadk.org X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=openadk.org header.i=@openadk.org header.a=rsa-sha256 header.s=2022 header.b=IBEXCI2N Subject: [Buildroot] [PATCH next] package/zabbix: update to 7.0.3 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Update to maintained and stable 7.0.3 version. Patch 0002 does no longer apply. Libressl support is not supported for our version of Libressl. It is required to start the daemons with -f otherwise they are restarted every 30 seconds. Signed-off-by: Waldemar Brodkorb --- What is the correct way to disable libressl and only allow openssl? --- DEVELOPERS | 1 + .../0002-fix-build-with-libressl-3.5.0.patch | 71 ------------------- package/zabbix/zabbix-agent.service | 2 +- package/zabbix/zabbix-server.service | 2 +- package/zabbix/zabbix.hash | 2 +- package/zabbix/zabbix.mk | 6 +- 6 files changed, 7 insertions(+), 77 deletions(-) delete mode 100644 package/zabbix/0002-fix-build-with-libressl-3.5.0.patch diff --git a/DEVELOPERS b/DEVELOPERS index 570f4ff115..566be87949 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3308,6 +3308,7 @@ F: package/mksh/ F: package/ruby/ F: package/uclibc/ F: package/uclibc-ng-test/ +F: package/zabbix/ F: support/testing/tests/package/test_ruby.py N: Will Newton diff --git a/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch b/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch deleted file mode 100644 index ad6960f329..0000000000 --- a/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 5c8511384f1d41f9c2a131604d5cb2dbc1c0aec9 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 24 Feb 2023 12:23:56 +0100 -Subject: [PATCH] fix build with libressl >= 3.5.0 - -Fix the following build failure with libressl >= 3.5.0: - -tls.c:113:17: error: static declaration of 'OPENSSL_cleanup' follows non-static declaration - 113 | static void OPENSSL_cleanup(void) - | ^~~~~~~~~~~~~~~ -In file included from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/bio.h:69, - from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/evp.h:67, - from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/hmac.h:67, - from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/ssl.h:150, - from ../../../include/zbxcomms.h:65, - from tls.c:20: -/home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/crypto.h:565:6: note: previous declaration of 'OPENSSL_cleanup' with type 'void(void)' - 565 | void OPENSSL_cleanup(void); - | ^~~~~~~~~~~~~~~ -In file included from tls.c:20: -tls.c: In function 'zbx_log_ciphersuites': -../../../include/zbxcomms.h:222:75: error: invalid use of incomplete typedef 'SSL_CTX' {aka 'struct ssl_ctx_st'} - 222 | # define SSL_CTX_get_ciphers(ciphers) ((ciphers)->cipher_list) - | ^~ -tls.c:1415:31: note: in expansion of macro 'SSL_CTX_get_ciphers' - 1415 | cipher_list = SSL_CTX_get_ciphers(ciphers); - | ^~~~~~~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/acdfcb17b39d438ccf5e4621707a10f60577d233 - -Signed-off-by: Fabrice Fontaine -Upstream: not sent (no feedback on first patch) ---- - include/zbxcomms.h | 3 ++- - src/libs/zbxcomms/tls.c | 5 +++-- - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/include/zbxcomms.h b/include/zbxcomms.h -index e7d74dbd0f..d6efa358fe 100644 ---- a/include/zbxcomms.h -+++ b/include/zbxcomms.h -@@ -253,7 +253,8 @@ int zbx_telnet_execute(ZBX_SOCKET socket_fd, const char *command, AGENT_RESULT * - /* TLS BLOCK */ - #if defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL) - --#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) -+#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || \ -+ defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3050000fL - # if !defined(LIBRESSL_VERSION_NUMBER) - # define OPENSSL_INIT_LOAD_SSL_STRINGS 0 - # define OPENSSL_INIT_LOAD_CRYPTO_STRINGS 0 -diff --git a/src/libs/zbxcomms/tls.c b/src/libs/zbxcomms/tls.c -index 54ab0a6ef4..bd4075b3e4 100644 ---- a/src/libs/zbxcomms/tls.c -+++ b/src/libs/zbxcomms/tls.c -@@ -28,8 +28,9 @@ - #include "log.h" - #include "zbxcrypto.h" - --#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) --/* for OpenSSL 1.0.1/1.0.2 (before 1.1.0) or LibreSSL */ -+#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || \ -+ defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3050000fL -+/* for OpenSSL 1.0.1/1.0.2 (before 1.1.0) or LibreSSL (before 3.5.0) */ - - /* mutexes for multi-threaded OpenSSL (see "man 3ssl threads" and example in crypto/threads/mttest.c) */ - --- -2.39.1 - diff --git a/package/zabbix/zabbix-agent.service b/package/zabbix/zabbix-agent.service index 8b4f45a4fc..7e06636a2a 100644 --- a/package/zabbix/zabbix-agent.service +++ b/package/zabbix/zabbix-agent.service @@ -4,7 +4,7 @@ After=network.target [Service] Type=forking -ExecStart=/usr/sbin/zabbix_agentd +ExecStart=/usr/sbin/zabbix_agentd -f ExecReload=/usr/sbin/zabbix_agentd -R config_cache_reload RuntimeDirectory=zabbix PIDFile=/run/zabbix/zabbix_agentd.pid diff --git a/package/zabbix/zabbix-server.service b/package/zabbix/zabbix-server.service index b8ba0d1707..52ed5df1ea 100644 --- a/package/zabbix/zabbix-server.service +++ b/package/zabbix/zabbix-server.service @@ -4,7 +4,7 @@ After=network.target [Service] Type=forking -ExecStart=/usr/sbin/zabbix_server +ExecStart=/usr/sbin/zabbix_server -f ExecReload=/usr/sbin/zabbix_server -R config_cache_reload RuntimeDirectory=zabbix PIDFile=/run/zabbix/zabbix_server.pid diff --git a/package/zabbix/zabbix.hash b/package/zabbix/zabbix.hash index bb6127e5ec..4648ed8b71 100644 --- a/package/zabbix/zabbix.hash +++ b/package/zabbix/zabbix.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 6d423810667b948ed22052d9aa84a035e2d4b92cbe8efdb669cac529806b722d zabbix-6.2.7.tar.gz +sha256 173059f57f11716146da79345e5a6bc52eceee6a5c4410664b8500a955598b2a zabbix-7.0.3.tar.gz sha256 f8fc3fd12521b60d53d8c5d48a883eb3c9c5ddec9de986a273e1b77f69d811db README sha256 444fe54aecc95ac0f3314289c300afc73b3946a4dc9fbd7e022709b3e0924dd0 COPYING diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index 76568f5a18..9c21e9621d 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -4,8 +4,8 @@ # ################################################################################ -ZABBIX_VERSION_MAJOR = 6.2 -ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).7 +ZABBIX_VERSION_MAJOR = 7.0 +ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).3 ZABBIX_SITE = https://cdn.zabbix.com/zabbix/sources/stable/$(ZABBIX_VERSION_MAJOR) ZABBIX_SELINUX_MODULES = zabbix ZABBIX_LICENSE = GPL-2.0+ @@ -50,7 +50,7 @@ ZABBIX_CONF_OPTS += --without-libcurl endif ifeq ($(BR2_PACKAGE_LIBXML2),y) -ZABBIX_CONF_OPTS += --with-libxml2=$(STAGING_DIR)/usr/bin/xml2-config +ZABBIX_CONF_OPTS += --with-libxml2=$(STAGING_DIR)/usr ZABBIX_DEPENDENCIES += libxml2 else ZABBIX_CONF_OPTS += --without-libxml2