From patchwork Sun Oct 2 00:49:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 1685301 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=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Mg53L2rMJz1yqj for ; Sun, 2 Oct 2022 11:50:06 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 2BA2641522; Sun, 2 Oct 2022 00:50:04 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 2BA2641522 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8_LfjVHu3CIm; Sun, 2 Oct 2022 00:50:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id B488A41523; Sun, 2 Oct 2022 00:50:01 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org B488A41523 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 B809D1BF977 for ; Sun, 2 Oct 2022 00:49:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 937324013C for ; Sun, 2 Oct 2022 00:49:53 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 937324013C X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id o0Ga7YdwPzrM for ; Sun, 2 Oct 2022 00:49:49 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org DD0F440139 Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) by smtp2.osuosl.org (Postfix) with ESMTPS id DD0F440139 for ; Sun, 2 Oct 2022 00:49:49 +0000 (UTC) Received: by mail-pl1-x62b.google.com with SMTP id f23so6951038plr.6 for ; Sat, 01 Oct 2022 17:49:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=c1TGncDDnOwjcha4HgiWrBe/V12ldh7QJnyX+oI/blA=; b=xHUPKdtIRzHazarXojMOMBq7RWRaAnCsTvH+/pw8VpB10jucr19G2vtyFfzTPI6CoL FvbzXQ/ByNVRBG1WCt6Xkw6on7BO4p6YQxIml5LH/HjhzxiYzOIgjqg+GPFpvQwrVVZF T1fLBtMLGJAAYkkYJnlggWzSJ/I+vRjz/TYJIbBwSlD5F2w2pJJgS5btrkJNzSXWsPZx P0inDWVLLaBcN21XrZ1hqoSszZm5tjGK6rBvixQjFMLkJvHmF332vp5ve5DLbLA2/Oys v+sIbbAmVjb2PGwid4jrb3qlOKI41ACx2dZIn1RPGILzCxcsGhb8ZzWSawxVC61ptB0r Z2yA== X-Gm-Message-State: ACrzQf3ZFhgWmJixfKF/o2ORTbrYLMLkoGN+oKTLymYJQQSWj4E7Jnig 7m89zKk/hvtxJqQCg6ViT5sXQ/cQ9kf1WA== X-Google-Smtp-Source: AMsMyM77PtehboYie/r6bbGIUr7cXynSMq2j2IRFLGXhJ1gCW2713eu7CKhcceyvJtT2ZPomfkhvWQ== X-Received: by 2002:a17:90b:180a:b0:202:ae1f:328a with SMTP id lw10-20020a17090b180a00b00202ae1f328amr5481290pjb.78.1664671788621; Sat, 01 Oct 2022 17:49:48 -0700 (PDT) Received: from chrisp-dl.atlnz.lc ([2001:df5:b000:22:f3f6:75b8:5739:f03d]) by smtp.gmail.com with ESMTPSA id x2-20020aa79562000000b0053dec787698sm1031611pfq.175.2022.10.01.17.49.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Oct 2022 17:49:47 -0700 (PDT) From: Chris Packham To: buildroot@buildroot.org Date: Sun, 2 Oct 2022 13:49:31 +1300 Message-Id: <20221002004931.1805825-2-judge.packham@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221002004931.1805825-1-judge.packham@gmail.com> References: <20221002004931.1805825-1-judge.packham@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=c1TGncDDnOwjcha4HgiWrBe/V12ldh7QJnyX+oI/blA=; b=kNT84wnieOkkXRdM2RAjsc6LEDmg+RQuBPiCOqYKPAOPbkkjhsGoMa0/ocoMPcm6ZZ 4sFMUiAlMZSGrnAeyj5rEr12JuOusIf6lIUwKpEXVJ1fVZ/NjruQNLOkqtJZN0FPU7cc I5pLLwW+87JXbf43lRrXvQ22JKQVP0Q9pIftdlaC8UmGCqlRCE3FlN+nb4V/1tnxEce/ H5x2fddyfKWlB5y8ZxTBHT06PWvveOuH8fS+QBZtXbjBnpVtfyA7Vwl7HPA4FcDcVkm0 Ehdn71+87pus6ndqomEXZdy+gfo4liusfIhdiziIMuoSUQkw4XpY4Q7JvNSwsVr/1XzV aB3g== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=kNT84wni Subject: [Buildroot] [PATCH 2/2] package/syslog-ng: Bump version to 3.38.1 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: , Cc: Chris Packham Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Add new version. Remove patch that has been applied upstream. Update hash for COPYING as it's text has changed to clarify some details but the license remains LGP-2.0+L/GPL-2.0+. Signed-off-by: Chris Packham --- ...-lib-tlscontext.c-fix-libressl-build.patch | 85 ------------------- package/syslog-ng/syslog-ng.hash | 4 +- package/syslog-ng/syslog-ng.mk | 2 +- 3 files changed, 3 insertions(+), 88 deletions(-) delete mode 100644 package/syslog-ng/0002-lib-tlscontext.c-fix-libressl-build.patch diff --git a/package/syslog-ng/0002-lib-tlscontext.c-fix-libressl-build.patch b/package/syslog-ng/0002-lib-tlscontext.c-fix-libressl-build.patch deleted file mode 100644 index 2c438627a4..0000000000 --- a/package/syslog-ng/0002-lib-tlscontext.c-fix-libressl-build.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 6f93484cea81ff8d45df213d5d2b4cffc4eadcad Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 16 Jul 2022 18:09:25 +0200 -Subject: [PATCH] lib/tlscontext.c: fix libressl build - -Fix the following build failure with libressl raised since version -3.37.1 and -https://github.com/syslog-ng/syslog-ng/commit/c7ba645918480da06b9e065c62ebd630312b0c7f: - -/nvmedata/autobuild/instance-5/output-1/host/lib/gcc/nios2-buildroot-linux-gnu/10.3.0/../../../../nios2-buildroot-linux-gnu/bin/ld: ./lib/.libs/libsyslog-ng.so: undefined reference to `SSL_CTX_set1_client_sigalgs_list' -/nvmedata/autobuild/instance-5/output-1/host/lib/gcc/nios2-buildroot-linux-gnu/10.3.0/../../../../nios2-buildroot-linux-gnu/bin/ld: ./lib/.libs/libsyslog-ng.so: undefined reference to `SSL_CTX_set1_sigalgs_list' - -Fixes: - - http://autobuild.buildroot.org/results/84cf9f6a0f6de831a685b73c42eab868952c8b15 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/syslog-ng/syslog-ng/pull/4081] ---- - cmake/openssl_functions.cmake | 4 +++- - configure.ac | 2 ++ - lib/tlscontext.c | 4 ++++ - syslog-ng-config.h.in | 2 ++ - 4 files changed, 11 insertions(+), 1 deletion(-) - -diff --git a/cmake/openssl_functions.cmake b/cmake/openssl_functions.cmake -index afd7b96bfe..319dcc2e23 100644 ---- a/cmake/openssl_functions.cmake -+++ b/cmake/openssl_functions.cmake -@@ -42,7 +42,9 @@ function (openssl_set_defines) - DH_set0_pqg - BN_get_rfc3526_prime_2048 - SSL_CTX_set_num_tickets -- SSL_CTX_set_ciphersuites) -+ SSL_CTX_set_ciphersuites -+ SSL_CTX_set1_sigalgs_list -+ SSL_CTX_set1_client_sigalgs_list) - - foreach (symbol ${symbol_list}) - string(TOUPPER ${symbol} SYMBOL_UPPERCASE) -diff --git a/configure.ac b/configure.ac -index 8cfab2251e..ecffb84f06 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1055,6 +1055,8 @@ AC_CHECK_DECLS([ASN1_STRING_get0_data], [], [], [[#include ]]) - AC_CHECK_DECLS([DH_set0_pqg], [], [], [[#include ]]) - AC_CHECK_DECLS([BN_get_rfc3526_prime_2048], [], [], [[#include ]]) - AC_CHECK_DECLS([SSL_CTX_set_num_tickets],[], [], [[#include ]]) -+AC_CHECK_DECLS([SSL_CTX_set1_sigalgs_list],[], [], [[#include ]]) -+AC_CHECK_DECLS([SSL_CTX_set1_client_sigalgs_list],[], [], [[#include ]]) - - CPPFLAGS="$CPPFLAGS_SAVE" - -diff --git a/lib/tlscontext.c b/lib/tlscontext.c -index ddde21dcaf..dedcf1ce5a 100644 ---- a/lib/tlscontext.c -+++ b/lib/tlscontext.c -@@ -598,11 +598,15 @@ tls_context_setup_cipher_suite(TLSContext *self) - static gboolean - tls_context_setup_sigalgs(TLSContext *self) - { -+#if SYSLOG_NG_HAVE_DECL_SSL_CTX_SET1_SIGALGS_LIST - if (self->sigalgs && !SSL_CTX_set1_sigalgs_list(self->ssl_ctx, self->sigalgs)) - return FALSE; -+#endif - -+#if SYSLOG_NG_HAVE_DECL_SSL_CTX_SET1_CLIENT_SIGALGS_LIST - if (self->client_sigalgs && !SSL_CTX_set1_client_sigalgs_list(self->ssl_ctx, self->client_sigalgs)) - return FALSE; -+#endif - - return TRUE; - } -diff --git a/syslog-ng-config.h.in b/syslog-ng-config.h.in -index 1817deea50..004b0a7be6 100644 ---- a/syslog-ng-config.h.in -+++ b/syslog-ng-config.h.in -@@ -57,6 +57,8 @@ - #cmakedefine01 SYSLOG_NG_HAVE_DECL_ASN1_STRING_GET0_DATA - #cmakedefine01 SYSLOG_NG_HAVE_DECL_SSL_CTX_GET0_PARAM - #cmakedefine01 SYSLOG_NG_HAVE_DECL_SSL_CTX_SET_CIPHERSUITES -+#cmakedefine01 SYSLOG_NG_HAVE_DECL_SSL_CTX_SET1_SIGALGS_LIST -+#cmakedefine01 SYSLOG_NG_HAVE_DECL_SSL_CTX_SET1_CLIENT_SIGALGS_LIST - #cmakedefine01 SYSLOG_NG_HAVE_DECL_X509_STORE_CTX_GET0_CERT - #cmakedefine01 SYSLOG_NG_HAVE_DECL_X509_GET_EXTENSION_FLAGS - #cmakedefine01 SYSLOG_NG_HAVE_DECL_DH_SET0_PQG diff --git a/package/syslog-ng/syslog-ng.hash b/package/syslog-ng/syslog-ng.hash index 764ff45733..6fce7be996 100644 --- a/package/syslog-ng/syslog-ng.hash +++ b/package/syslog-ng/syslog-ng.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 d67a320cb896cd5d62f24d9e1bec138847fa4618ae13a3946cae2b75c528ee14 syslog-ng-3.37.1.tar.gz -sha256 e912cf1e1c09b81d61c0154eb6c179588622c31ad07bfb4a90c612d07ff09d9b COPYING +sha256 5491f686d0b829b69b2e0fc0d66a62f51991aafaee005475bfa38fab399441f7 syslog-ng-3.38.1.tar.gz +sha256 c75dcbfc17ccf742f12042a370f825a40951085d2352dfc9d07e715dae3ca9bd COPYING sha256 ce3324c9f22299cfc7c281e5a6ab40fbe9c2ea1a67cee87226cb8cd39db1e1d2 GPL.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LGPL.txt diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index 64b3b24498..a7176ad129 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -6,7 +6,7 @@ # When updating the version, please check at runtime if the version in # syslog-ng.conf header needs to be updated -SYSLOG_NG_VERSION = 3.37.1 +SYSLOG_NG_VERSION = 3.38.1 SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOG_NG_VERSION) SYSLOG_NG_LICENSE = LGPL-2.1+ (syslog-ng core), GPL-2.0+ (modules) SYSLOG_NG_LICENSE_FILES = COPYING GPL.txt LGPL.txt