From patchwork Sat Nov 18 06:49:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 56599 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 04DD327BBE9; Sat, 18 Nov 2023 06:51:39 +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 6376F27BBE2 for ; Sat, 18 Nov 2023 06:51:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r4FAY-0002CT-Aq; 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-0002BV-EO 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 1r4FAT-00036P-Un 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-0003ol-1o; Sat, 18 Nov 2023 01:51:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66718] [PATCH v2 1/6] gnu: mbedtls-for-hiawatha: Use inherited source. 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.170029023114568 (code B ref 66718); Sat, 18 Nov 2023 06:51:02 +0000 Received: (at 66718) by debbugs.gnu.org; 18 Nov 2023 06:50:31 +0000 Received: from localhost ([127.0.0.1]:47639 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4F9y-0003mu-KH for submit@debbugs.gnu.org; Sat, 18 Nov 2023 01:50:30 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:40580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4F9v-0003mk-Sm for 66718@debbugs.gnu.org; Sat, 18 Nov 2023 01:50:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1700290021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZWPIN24UGpevlzNDJZPF3puhBEEbkwyVGZxllKctyKI=; b=xVphbK/CJilUmc27mfKVQD6P48fA8G0LceomMLzvqo1Sz3aY2PRkIERlrK0xg2jbcm/L3V dUAyKLGq9OQ2nWJbEkAc6TOhTymjjgGJ2Lsfd78DxnwcmihIOYv19WCvNEUnARJiCdy7kx 56nfO/qaD8JcRhs6tv2cSmQtLBlxZ18kVU1dhED/2930mDPpeWyOi9PgQRFrUVp2BEjRsz kfDeS5ZPuW7HZBgte0GiHPioT+vWjSl/Ke3Q9l7Mr+n33kcZFQ4GpT83PWwS1jQAtprl/A agGSYrEOtdhYgmIkBMwnQtWKvxaapY/q4IyycN+rELWm4yXggiV9/YyDOsBWpw== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Sat, 18 Nov 2023 14:49:13 +0800 Message-ID: <25db53767b5c4d1af4e2f1e8a7b86a27678a0779.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-for-hiawatha): Use inherited source. [arguments]<#:phases>: Keep "-Wformat-signedness". Change-Id: I562ae6533b518a853b9b59f8fb69c0135364277f --- gnu/packages/tls.scm | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 6a0aaf7f14..37650f632d 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -989,8 +989,6 @@ (define-public perl-crypt-openssl-random (define-public mbedtls-apache (package (name "mbedtls-apache") - ;; XXX Check whether ‘-Wformat-signedness’ still breaks mbedtls-for-hiawatha - ;; when updating. (version "2.28.0") (source (origin @@ -1027,26 +1025,6 @@ (define-public mbedtls-for-hiawatha (hidden-package (package (inherit mbedtls-apache) - (name "mbedtls-apache") - (version "2.26.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ARMmbed/mbedtls") - (commit (string-append "mbedtls-" version)))) - (sha256 - (base32 "0scwpmrgvg6q7rvqkc352d2fqlsx0aylcbyibcp1f1rsn8iiif2m")) - (file-name (git-file-name name version)) - (modules '((guix build utils))) - (snippet - '(begin - ;; Can be removed with the next version. - ;; Reduce level of format truncation warnings due to false positives. - ;; https://github.com/ARMmbed/mbedtls/commit/2065a8d8af27c6cb1e40c9462b5933336dca7434 - (substitute* "CMakeLists.txt" - (("Wformat-truncation=2") "Wformat-truncation")) - #t)))) (arguments (substitute-keyword-arguments (package-arguments mbedtls-apache) ((#:phases phases) @@ -1057,9 +1035,6 @@ (define-public mbedtls-for-hiawatha (invoke "scripts/config.pl" "set" feature)) (list "MBEDTLS_THREADING_C" "MBEDTLS_THREADING_PTHREAD")) - ;; XXX The above enables code that breaks with -Werror… - (substitute* "CMakeLists.txt" - ((" -Wformat-signedness") "")) #t))))))))) (define-public dehydrated From patchwork Sat Nov 18 06:49:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 56598 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 BFF2527BBE9; Sat, 18 Nov 2023 06:51:33 +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 176D227BBE2 for ; Sat, 18 Nov 2023 06:51:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r4FAY-0002CZ-Of; 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-0002BW-G7 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 1r4FAT-00036T-Sv 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-0003ot-GH; Sat, 18 Nov 2023 01:51:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66718] [PATCH v2 2/6] gnu: mbedtls-for-hiawatha: Update package style. 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.170029023314583 (code B ref 66718); Sat, 18 Nov 2023 06:51:02 +0000 Received: (at 66718) by debbugs.gnu.org; 18 Nov 2023 06:50:33 +0000 Received: from localhost ([127.0.0.1]:47642 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4FA0-0003n9-VQ for submit@debbugs.gnu.org; Sat, 18 Nov 2023 01:50:33 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:41230) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4F9z-0003n1-Hc for 66718@debbugs.gnu.org; Sat, 18 Nov 2023 01:50:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1700290025; 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=SJ7vCAb6+udzvlRTIJBmH2aNZpMKC4zx/zQocvhyjFY=; b=T8VY1OF9OgE280MQaT5kONEkTprmdIKXiQo4iBHQRGw6ewVq5+rT6GFi8snw0ICJioeQgh q6lILI6cmGkuVGwgn3ttgz2hYAgZPmm+v0Q/Md2uMBdzkIkxpJauxGrzEAokR0uIEwlIxX ZogQm3mZKveAe3g8ufnC/HmIHNr716IIbv7cy8Xc5JaPasrkZrE/+g3R/opU6x3UelEW0/ db8aKjWvnHcOgPhSN/BVfrMvnlqGE5GRZjHZHh0LqBLqTg1yBPxgm5iwWOQOWgntDDV1HK IZdqEEqDY0LPb7aD/KoCidYQW5IxPnOsx5Q1QndWap+s/CrXz+RT5OZYGZF9UA== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Sat, 18 Nov 2023 14:49:14 +0800 Message-ID: <1566c139264c6e80e0565679403b0d7240d600a7.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-for-hiawatha)[arguments]: Use gexp. Remove trailing #t. Change-Id: I0af54b6fb7319bc811ce38c001b47686fb45b1bd --- gnu/packages/tls.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 37650f632d..998860569a 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -1028,14 +1028,13 @@ (define-public mbedtls-for-hiawatha (arguments (substitute-keyword-arguments (package-arguments mbedtls-apache) ((#:phases phases) - `(modify-phases ,phases - (add-before 'configure 'configure-extra-features - (lambda _ - (for-each (lambda (feature) - (invoke "scripts/config.pl" "set" feature)) - (list "MBEDTLS_THREADING_C" - "MBEDTLS_THREADING_PTHREAD")) - #t))))))))) + #~(modify-phases #$phases + (add-before 'configure 'configure-extra-features + (lambda _ + (for-each (lambda (feature) + (invoke "scripts/config.pl" "set" feature)) + (list "MBEDTLS_THREADING_C" + "MBEDTLS_THREADING_PTHREAD"))))))))))) (define-public dehydrated (package 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 From patchwork Sat Nov 18 06:49:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 56600 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 CDE9B27BBEA; Sat, 18 Nov 2023 06:51:42 +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 69ADA27BBE2 for ; Sat, 18 Nov 2023 06:51:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r4FAY-0002CW-O9; 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-0002Bq-SX 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-00037z-KE 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 1r4FAV-0003pB-82; Sat, 18 Nov 2023 01:51:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66718] [PATCH v2 4/6] gnu: mbedtls-apache: Use gexp. 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:03 +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.170029024114618 (code B ref 66718); Sat, 18 Nov 2023 06:51:03 +0000 Received: (at 66718) by debbugs.gnu.org; 18 Nov 2023 06:50:41 +0000 Received: from localhost ([127.0.0.1]:47648 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4FA9-0003ni-0m for submit@debbugs.gnu.org; Sat, 18 Nov 2023 01:50:41 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:41244) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4FA6-0003nU-L5 for 66718@debbugs.gnu.org; Sat, 18 Nov 2023 01:50:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1700290033; 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=pCDAgSLkYurmfT9+pVVykGHzlXMSWmuV4TDodsaau0o=; b=Nat5CWq3u0h75CVTmLLSXy/XapEhYcKGUnJ5DyRsmeMlokRgr7DQyaTjqmAIK0GV4sgJrT GdLH44qVIr8jEg6TVHeRVh95E99pZjhKf/lHcTAcJ/tKkfa2r3LkKWm+uvbRzqFy+4ToUj hFvCDAXU85j5fSkhkRokvMlnM5N8dbGhnTn39qpdHhd6RFcAsDbUhC6av1KDLF1zjgdVwb VCMRuuvS454yimab2j5khSM8QZ4yKR2ZzHyziePEw04e/x+m/WKytfAF764Pu3D2QIwPYQ 2u6StfLppbd25XMM0GQw2077nijChKp35jWF+tBx7iE4uyB3C7Tck7yyq3qEaQ== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Sat, 18 Nov 2023 14:49:16 +0800 Message-ID: <437592d0e983b4e6488c1a0b4ba342b9e19ed4ae.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)[arguments]: Use gexp. Change-Id: Idefca03b8eea0d3f18497afccc4a3a081caac87e --- gnu/packages/tls.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 7f4332244c..9038a546f4 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -999,14 +999,14 @@ (define-public mbedtls-apache (base32 "1zzcrnp5vs9iwpx03dg2v7zbhphqrim3dqfagzfb9frzxpf8136m")))) (build-system cmake-build-system) (arguments - `(#:configure-flags - (list "-DUSE_SHARED_MBEDTLS_LIBRARY=ON" - "-DUSE_STATIC_MBEDTLS_LIBRARY=OFF") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'make-source-writable - (lambda _ - (for-each make-file-writable (find-files "."))))))) + (list #:configure-flags + #~(list "-DUSE_SHARED_MBEDTLS_LIBRARY=ON" + "-DUSE_STATIC_MBEDTLS_LIBRARY=OFF") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'make-source-writable + (lambda _ + (for-each make-file-writable (find-files "."))))))) (native-inputs (list perl python)) (synopsis "Small TLS library") From patchwork Sat Nov 18 06:49:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 56596 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 6671827BBE2; Sat, 18 Nov 2023 06:51:15 +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 F3DF027BBEA 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 1r4FAc-0002Di-98; Sat, 18 Nov 2023 01:51:10 -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 1r4FAY-0002CU-As for guix-patches@gnu.org; Sat, 18 Nov 2023 01:51:06 -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 1r4FAX-0003DA-Uz for guix-patches@gnu.org; Sat, 18 Nov 2023 01:51:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r4FAV-0003pJ-Jh; Sat, 18 Nov 2023 01:51:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66718] [PATCH v2 5/6] gnu: mbedtls-apache: Rename to mbedtls-lts. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, efraim@flashner.co.il, leo@famulari.name, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, zimon.toutoune@gmail.com, me@tobias.gr, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sat, 18 Nov 2023 06:51:03 +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 , Efraim Flashner , Leo Famulari , Liliana Marie Prikler , Maxim Cournoyer , Simon Tournier , Tobias Geerinckx-Rice , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Hilton Chain , Efraim Flashner , Leo Famulari , Liliana Marie Prikler , Maxim Cournoyer , Simon Tournier , Tobias Geerinckx-Rice , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 66718-submit@debbugs.gnu.org id=B66718.170029024514636 (code B ref 66718); Sat, 18 Nov 2023 06:51:03 +0000 Received: (at 66718) by debbugs.gnu.org; 18 Nov 2023 06:50:45 +0000 Received: from localhost ([127.0.0.1]:47651 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4FAC-0003nz-Ao for submit@debbugs.gnu.org; Sat, 18 Nov 2023 01:50:44 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:40136) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4FAA-0003nr-Eo for 66718@debbugs.gnu.org; Sat, 18 Nov 2023 01:50:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1700290036; 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=nYtMP/pSEaiyzSpJsPRYBu+MGAsB3wuyEyQSpfRYVbI=; b=mlZZZVxGCx/SxJyHZ2jMjOcZqW2v8Y5KtSzgYUKIz2LeXhLSXLj52/Yol8ES8BTpPiPxIb Cw6I0ZSsy7dDoVV8B5Cb0YSJemgWhTtZ/Rvw0VxAPn/9pS8hCaVkgpN30+e2FivRNViPg8 0XskCmEmZVGc9sTE1k+1VN/Y+2kUn4eXqnAGBmbcpATg3pQ4FtLW/gXjOo3+QVAi7mmK8H HpT3A9FeZIJNtPmNFl8RZR2jWHX+wXRm6cYLyaYCjmn3K4oxU9NihBu1vK9bteSv+GSF9k /K0crPsqxbUsiErCs6CeeNNM7YM2hK5aaT1WjLYxA5koOuj5rhS1rryzCquy5A== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Sat, 18 Nov 2023 14:49:17 +0800 Message-ID: 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): Rename package to "mbedtls". Rename variable to... (mbedtls-lts): ...this. (mbedtls-apache): Define as deprecated by mbedtls-lts. (mbedtls-for-hiawatha): Adjust accordingly. * gnu/packages/emulators.scm (dolphin-emu)[inputs]: Adjust inputs accordingly. * gnu/packages/game-development.scm (godot-lts,godot)[inputs]: Likewise. * gnu/packages/hardware.scm (hueplusplus,openrgb)[inputs]: Likewise. * gnu/packages/haxe.scm (neko,haxe,hashlink)[inputs]: Likewise. * gnu/packages/irc.scm (inspircd)[inputs]: Likewise. * gnu/packages/julia-jll.scm (julia-mbedtls-jll)[inputs]: Likewise. * gnu/packages/julia.scm (julia)[inputs]: Likewise. * gnu/packages/linphone.scm (bctoolbox)[inputs]: Likewise. * gnu/packages/linux.scm (dislocker)[inputs]: Likewise. * gnu/packages/networking.scm (nng)[inputs]: Likewise. * gnu/packages/search.scm (dataparksearch)[inputs]: Likewise. * gnu/packages/video.scm (obs)[inputs]: Likewise. Change-Id: I0c58b3cd0bcf6e44e7b16a69f6d2739aa3c1545b --- gnu/packages/emulators.scm | 2 +- gnu/packages/game-development.scm | 4 ++-- gnu/packages/hardware.scm | 4 ++-- gnu/packages/haxe.scm | 6 +++--- gnu/packages/irc.scm | 2 +- gnu/packages/julia-jll.scm | 2 +- gnu/packages/julia.scm | 2 +- gnu/packages/linphone.scm | 2 +- gnu/packages/linux.scm | 2 +- gnu/packages/networking.scm | 2 +- gnu/packages/search.scm | 2 +- gnu/packages/tls.scm | 11 +++++++---- gnu/packages/video.scm | 2 +- 13 files changed, 23 insertions(+), 20 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 0729feb071..8f62aa87bf 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -349,7 +349,7 @@ (define-public dolphin-emu libxi libxrandr lzo - mbedtls-apache + mbedtls-lts mesa miniupnpc openal diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 1d9abd9705..51952714b6 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2034,7 +2034,7 @@ (define-public godot-lts libxi libxinerama libxrandr - mbedtls-apache + mbedtls-lts mesa opusfile pcre2 @@ -2276,7 +2276,7 @@ (define-public godot libxinerama libxkbcommon libxrandr - mbedtls-apache + mbedtls-lts mesa openxr opusfile diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 0652e2933d..93d46e53e1 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -695,7 +695,7 @@ (define-public hueplusplus (arguments `(#:tests? #f)) ;; Tests require Google's gtest and gmock (inputs - (list mbedtls-apache)) + (list mbedtls-lts)) (synopsis "C++ library to control Philips Hue lights") (description "Hueplusplus is a library for controlling Philips Hue lights. Features: @@ -1103,7 +1103,7 @@ (define-public openrgb hueplusplus nlohmann-json libusb - mbedtls-apache + mbedtls-lts qtbase-5)) (native-inputs (list pkg-config diff --git a/gnu/packages/haxe.scm b/gnu/packages/haxe.scm index 6fc30ce02f..859941df70 100644 --- a/gnu/packages/haxe.scm +++ b/gnu/packages/haxe.scm @@ -78,7 +78,7 @@ (define-public neko apr-util gtk+-2 libgc - mbedtls-apache + mbedtls-lts (list mariadb "dev") (list mariadb "lib") openssl @@ -171,7 +171,7 @@ (define-public haxe (lambda _ (invoke "make" "install")))))) (inputs (list libuv - mbedtls-apache + mbedtls-lts neko ocaml-extlib ocaml-luv @@ -255,7 +255,7 @@ (define-public hashlink libpng libuv libvorbis - mbedtls-apache + mbedtls-lts mikktspace minimp3 openal diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 46961ccb7e..3200ccc135 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -912,7 +912,7 @@ (define-public inspircd (list argon2 gnutls libmaxminddb - mbedtls-apache + mbedtls-lts (list mariadb "dev") openldap openssl diff --git a/gnu/packages/julia-jll.scm b/gnu/packages/julia-jll.scm index 1c03b7e589..bbf6f70584 100644 --- a/gnu/packages/julia-jll.scm +++ b/gnu/packages/julia-jll.scm @@ -1403,7 +1403,7 @@ (define-public julia-mbedtls-jll ;; There's a Julia file for each platform, override them all (find-files "src/wrappers/" "\\.jl$")) #t))))) - (inputs (list mbedtls-apache)) + (inputs (list mbedtls-lts)) (propagated-inputs (list julia-jllwrappers)) (home-page "https://github.com/JuliaBinaryWrappers/MbedTLS_jll.jl") (synopsis "Apache's mbed TLS binary wrappers") diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 8ba2b480ce..3d9a53048a 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -515,7 +515,7 @@ (define-public julia ("libunwind" ,libunwind-julia) ("libuv" ,libuv-julia) ("llvm" ,llvm-julia) - ("mbedtls-apache" ,mbedtls-apache) + ("mbedtls-apache" ,mbedtls-lts) ("mpfr" ,mpfr) ,@(if (target-x86-64?) `(("openblas" ,openblas-ilp64)) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 48a30f32d0..be011fd976 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -184,7 +184,7 @@ (define-public bctoolbox (with-directory-excursion "tester" (invoke "./bctoolbox_tester")))))))) (inputs - (list bcunit libdecaf mbedtls-apache)) + (list bcunit libdecaf mbedtls-lts)) (synopsis "Belledonne Communications Tool Box") (description "BcToolBox is an utilities library used by Belledonne Communications software like belle-sip, mediastreamer2 and linphone.") diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2024163a08..44cf4c5f25 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2378,7 +2378,7 @@ (define-public dislocker (build-system cmake-build-system) (arguments '(#:tests? #f)) ;no test suite - (inputs (list fuse-2 mbedtls-apache)) + (inputs (list fuse-2 mbedtls-lts)) (synopsis "FUSE driver to read/write Windows BitLocker drives") (description "This package provides means to to read BitLocker encrypted diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 2028830087..673450390d 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -841,7 +841,7 @@ (define-public nng (substitute* "src/supplemental/websocket/CMakeLists.txt" (("nng_test\\(wssfile_test\\)") ""))))))) (native-inputs (list oksh)) - (inputs (list mbedtls-apache)) + (inputs (list mbedtls-lts)) (synopsis "Lightweight messaging library") (description "NNG project is a rewrite of the scalability protocols library known as libnanomsg, and adds significant new capabilities, while retaining diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index 5e86d1a76c..794a12890e 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -373,7 +373,7 @@ (define-public dataparksearch (list aspell c-ares libextractor - mbedtls-apache + mbedtls-lts postgresql zlib)) (synopsis "Feature rich search engine") diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 9038a546f4..d53893ec5a 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -984,9 +984,9 @@ (define-public perl-crypt-openssl-random number generator") (license license:perl-license))) -(define-public mbedtls-apache +(define-public mbedtls-lts (package - (name "mbedtls-apache") + (name "mbedtls") (version "2.28.6") (source (origin @@ -1018,13 +1018,16 @@ (define-public mbedtls-apache (home-page "https://www.trustedfirmware.org/projects/mbed-tls/") (license (list license:asl2.0 license:gpl2+)))) ;dual licensed +(define-public mbedtls-apache + (deprecated-package "mbedtls-apache" mbedtls-lts)) + ;; The Hiawatha Web server requires some specific features to be enabled. (define-public mbedtls-for-hiawatha (hidden-package (package - (inherit mbedtls-apache) + (inherit mbedtls-lts) (arguments - (substitute-keyword-arguments (package-arguments mbedtls-apache) + (substitute-keyword-arguments (package-arguments mbedtls-lts) ((#:phases phases) #~(modify-phases #$phases (add-before 'configure 'configure-extra-features diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 561268aabd..92c055bf2b 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3591,7 +3591,7 @@ (define-public obs libxcomposite libxkbcommon luajit - mbedtls-apache + mbedtls-lts mesa pciutils pipewire From patchwork Sat Nov 18 06:49:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 56597 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 3266127BBE9; Sat, 18 Nov 2023 06:51:32 +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 9B04027BBE2 for ; Sat, 18 Nov 2023 06:51:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r4FAb-0002Db-S8; Sat, 18 Nov 2023 01:51:09 -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 1r4FAV-0002C0-K5 for guix-patches@gnu.org; Sat, 18 Nov 2023 01:51:04 -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 1r4FAV-0003BQ-CA for guix-patches@gnu.org; Sat, 18 Nov 2023 01:51:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r4FAW-0003pQ-0O; Sat, 18 Nov 2023 01:51:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66718] [PATCH v2 6/6] gnu: Add mbedtls, version 3.5.1. 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:03 +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.170029024814652 (code B ref 66718); Sat, 18 Nov 2023 06:51:03 +0000 Received: (at 66718) by debbugs.gnu.org; 18 Nov 2023 06:50:48 +0000 Received: from localhost ([127.0.0.1]:47654 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4FAG-0003oF-1f for submit@debbugs.gnu.org; Sat, 18 Nov 2023 01:50:48 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:40148) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4FAE-0003o8-G6 for 66718@debbugs.gnu.org; Sat, 18 Nov 2023 01:50:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1700290040; 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=hM1FG9T/LkL1AYjDp4VngNFUrhE+1Cml6Q3RDOv+wh8=; b=LsQlU60l9nmBLAjC4sUL6QEkUrDSg9uPbFPT5X9spQgNjI0X58/2f7zSv+8HZpFl2jZDkD DlAz0LLhibjFYecJBjsK/BbEU00O6mRrhaYiW0l/ELSPz0rbaYHZ/lNxT3Ej/oqN9mgZpM U6gVJmkzhzEpijhufRa0NXidOrGcNY6FSm+EDHY06+yCELVKdXNmaGu4dsUQJURzEhjIGh qwWorX9CF2GePwfmWMtJQE5QIFx+czQ20nOkC8awFr6eFxq7HTgWyECIewfNV2CN00d8Om FYnS+ZzCPUYF0TjaMNSl8jyQ1aqGjCubSedaT0gbYdE441T/llZNEUZusGT2yg== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Sat, 18 Nov 2023 14:49:18 +0800 Message-ID: <629df4cf55c74e163a433ce93b8d9c2f5c7d52c4.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): New variable. Change-Id: I09c86ce04734bd5b44441d7749688a5c39389ece --- gnu/packages/tls.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index d53893ec5a..5d1468df58 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -1018,6 +1018,21 @@ (define-public mbedtls-lts (home-page "https://www.trustedfirmware.org/projects/mbed-tls/") (license (list license:asl2.0 license:gpl2+)))) ;dual licensed +(define-public mbedtls + (package + (inherit mbedtls-lts) + (name "mbedtls") + (version "3.5.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ARMmbed/mbedtls") + (commit (string-append "mbedtls-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1b1xq1fpsw1ywl6xm6577biwnhyyr4gk2wkfd1sil4yjcrq0f6qz")))))) + (define-public mbedtls-apache (deprecated-package "mbedtls-apache" mbedtls-lts))