From patchwork Sat Nov 18 06:49:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 56595 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BE6D027BBEC; Sat, 18 Nov 2023 06:51:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CC39D27BBE2 for ; Sat, 18 Nov 2023 06:51:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r4FAX-0002CF-4o; Sat, 18 Nov 2023 01:51:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r4FAU-0002BX-IC for guix-patches@gnu.org; Sat, 18 Nov 2023 01:51:02 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r4FAU-00037Q-9w for guix-patches@gnu.org; Sat, 18 Nov 2023 01:51:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r4FAU-0003p2-SU; Sat, 18 Nov 2023 01:51:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66718] [PATCH v2 3/6] gnu: mbedtls-apache: Update to 2.28.6. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, guix-patches@gnu.org Resent-Date: Sat, 18 Nov 2023 06:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66718 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66718@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain X-Debbugs-Original-Xcc: Hilton Chain Received: via spool by 66718-submit@debbugs.gnu.org id=B66718.170029024014610 (code B ref 66718); Sat, 18 Nov 2023 06:51:02 +0000 Received: (at 66718) by debbugs.gnu.org; 18 Nov 2023 06:50:40 +0000 Received: from localhost ([127.0.0.1]:47645 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4FA4-0003nR-Ao for submit@debbugs.gnu.org; Sat, 18 Nov 2023 01:50:39 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:41232) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4FA2-0003nH-VV for 66718@debbugs.gnu.org; Sat, 18 Nov 2023 01:50:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1700290029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=R3lk4+IFKRTAsRlnvSaoqmPoia/4mB5iKoCpZJHB+V0=; b=tDCuEGRwnQ38fzSgKFtAEpsNx9IoYRdz/BwQAU+QtgZHhJsrEkA2Ekg4CUQw8e9qWhF548 KdCJnmgZJNArCMwMHCeW0rdjuKqdEzkEOJLNAyueijuWWSKM3kiFrM2KABa5V8IrsPOdsz pRQRbdrool0Y7mI6LpfgZ2IlmGrnIFGLypf4jk7t2V/Hpl6BZ4QS2Fgdg+Tm/Pl65ZsiKN Zf2VFsf6xOq1YvNLzdGObocaEwwH3Il5/VFI9YrCAesJ4PPV85/xXWuumHQLjtbMkh5Sah d7tFgcvHoL6FEJFbkNYqtCKmcD429b/ypJxa1B0G5djTVgiteGUk8iy3fm7lrw== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Sat, 18 Nov 2023 14:49:15 +0800 Message-ID: <9d34d533188e47e02db96e52c02f0c20995914f6.1700289538.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tls.scm (mbedtls-apache): Update to 2.28.6. [license]: Add gpl2+. Change-Id: I946aa1436214a11ab3faa08b3ddf9c937a0462a9 --- gnu/packages/tls.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 998860569a..7f4332244c 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -984,12 +984,10 @@ (define-public perl-crypt-openssl-random number generator") (license license:perl-license))) -;; The "-apache" variant is the upstreamed prefered variant. A "-gpl" -;; variant exists in addition to the "-apache" one. (define-public mbedtls-apache (package (name "mbedtls-apache") - (version "2.28.0") + (version "2.28.6") (source (origin (method git-fetch) @@ -998,7 +996,7 @@ (define-public mbedtls-apache (commit (string-append "mbedtls-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0s37dsi29v7146fi9k4frvx5rz2snxdm6c3rwq2fvnca2r80hfjl")))) + (base32 "1zzcrnp5vs9iwpx03dg2v7zbhphqrim3dqfagzfb9frzxpf8136m")))) (build-system cmake-build-system) (arguments `(#:configure-flags @@ -1018,7 +1016,7 @@ (define-public mbedtls-apache (embedded) products, facilitating this functionality with a minimal coding footprint.") (home-page "https://www.trustedfirmware.org/projects/mbed-tls/") - (license license:asl2.0))) + (license (list license:asl2.0 license:gpl2+)))) ;dual licensed ;; The Hiawatha Web server requires some specific features to be enabled. (define-public mbedtls-for-hiawatha