From patchwork Sun Jan 28 13:12:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 59529 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 63AE627BBEA; Sun, 28 Jan 2024 13:14:21 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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 BDB8127BBE2 for ; Sun, 28 Jan 2024 13:14:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rU4z0-0005r7-0H; Sun, 28 Jan 2024 08:13:58 -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 1rU4yx-0005qZ-8v for guix-patches@gnu.org; Sun, 28 Jan 2024 08:13:55 -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 1rU4yx-0007xO-0q for guix-patches@gnu.org; Sun, 28 Jan 2024 08:13:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rU4z4-0004OK-HG for guix-patches@gnu.org; Sun, 28 Jan 2024 08:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66718] [PATCH v3 1/6] gnu: mbedtls-for-hiawatha: Use inherited source. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Jan 2024 13:14: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 Received: via spool by 66718-submit@debbugs.gnu.org id=B66718.170644760716766 (code B ref 66718); Sun, 28 Jan 2024 13:14:02 +0000 Received: (at 66718) by debbugs.gnu.org; 28 Jan 2024 13:13:27 +0000 Received: from localhost ([127.0.0.1]:56817 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rU4yU-0004ML-Mb for submit@debbugs.gnu.org; Sun, 28 Jan 2024 08:13:26 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:41202) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rU4yS-0004MC-Fp for 66718@debbugs.gnu.org; Sun, 28 Jan 2024 08:13:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1706447553; 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=fqcypwNI8omrovaRtjP4cjzIhIBjEBKbA4d3cmW83bE=; b=sjivNHAwWdW1N3LPrGypnJBrQDYm3NsgAF0bBSeRV4QceYgp6U6oRID1qKYCyAw8P1AvCz bG68iFeze4sYU8um4AZyDF3NQ7v5aX7pZV8fHb4VV8Q8gsPtv+nJYVKMtBDl0kGrRLMA8P nsLxj5oI47xmUFhHFFBS/s5Ftq2gF8zs9lIGTT4zoMr8BKi9LvctY0VQE2lnKuRgBOOe5Q XfLEw9st/L99SeS/0IoJqh3uNuGsorUeada8KKCExA6DyZWZX5l4U2AEVK0olKGAswvwbL z5PYtHbKjk5TLnsrl/o/TmRd4aMTTq1AdKdv8xL36zBX2ZSgnwbkCJpuLNzvrQ== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Sun, 28 Jan 2024 21:12:52 +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-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 6ba2effa5d..4fbb35cc58 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -978,8 +978,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.5") (source (origin @@ -1016,26 +1014,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) @@ -1046,9 +1024,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 Sun Jan 28 13:12:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 59534 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 D735C27BBEA; Sun, 28 Jan 2024 13:14:29 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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 7725F27BBE2 for ; Sun, 28 Jan 2024 13:14:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rU4z2-0005tQ-9D; Sun, 28 Jan 2024 08:14:00 -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 1rU4yx-0005qp-Mo for guix-patches@gnu.org; Sun, 28 Jan 2024 08:13:55 -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 1rU4yx-0007xT-B0 for guix-patches@gnu.org; Sun, 28 Jan 2024 08:13:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rU4z4-0004OT-VW for guix-patches@gnu.org; Sun, 28 Jan 2024 08:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66718] [PATCH v3 2/6] gnu: mbedtls-for-hiawatha: Update package style. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Jan 2024 13:14: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 Received: via spool by 66718-submit@debbugs.gnu.org id=B66718.170644761216797 (code B ref 66718); Sun, 28 Jan 2024 13:14:02 +0000 Received: (at 66718) by debbugs.gnu.org; 28 Jan 2024 13:13:32 +0000 Received: from localhost ([127.0.0.1]:56822 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rU4ya-0004Mq-0z for submit@debbugs.gnu.org; Sun, 28 Jan 2024 08:13:32 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:41206) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rU4yV-0004MM-1m for 66718@debbugs.gnu.org; Sun, 28 Jan 2024 08:13:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1706447556; 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=rLgSqAs3e6XvW3NpRXrCod2pG6nIfykvO3Krq0xrHO0=; b=h9IiwSOIgRgBAMv44q/DeqQYNx6iEpwOomL61DeQXsKkr26WhBlkB3gu4Kp6vAkn4baqAj BI/QrSlJYP3dAEKBb3eYBYr+7HJKwRLzJTk1aEWteuemLL5nZzx+v4E4WhB4CUBdhW9gZy A27WaxZrILUHLE8cA7ffUNze8Cpm9oehEKEDu6Wt0h2NRt4G4RTMxtHR+uskE1F35Jq5Ir lv2ksxPG3m9WVb4i0mQOkBdih44N7Yr4e9DWuzfPJwMCU1Mwm7LOTOjYZ+JdVQ93fUnl3c IMQALRb761td7pQwti/w5r7GMBtas0viVaJSyFJgpoog9xUDdQ1ZsozFP6zArg== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Sun, 28 Jan 2024 21:12:53 +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-for-hiawatha)[arguments]: Use gexps. 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 4fbb35cc58..d2bedd3d2b 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -1017,14 +1017,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 Sun Jan 28 13:12:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 59533 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 EA96927BBEA; Sun, 28 Jan 2024 13:14:26 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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 9317127BBE2 for ; Sun, 28 Jan 2024 13:14:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rU4z4-0005ut-Ay; Sun, 28 Jan 2024 08:14:02 -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 1rU4yy-0005qz-2u for guix-patches@gnu.org; Sun, 28 Jan 2024 08:13:56 -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 1rU4yx-0007xc-Qu for guix-patches@gnu.org; Sun, 28 Jan 2024 08:13:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rU4z5-0004Oa-Fk for guix-patches@gnu.org; Sun, 28 Jan 2024 08:14:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66718] [PATCH v3 3/6] gnu: mbedtls-apache: Update to 2.28.7. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Jan 2024 13:14: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 Received: via spool by 66718-submit@debbugs.gnu.org id=B66718.170644761216804 (code B ref 66718); Sun, 28 Jan 2024 13:14:03 +0000 Received: (at 66718) by debbugs.gnu.org; 28 Jan 2024 13:13:32 +0000 Received: from localhost ([127.0.0.1]:56824 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rU4ya-0004Ms-C2 for submit@debbugs.gnu.org; Sun, 28 Jan 2024 08:13:32 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:54974) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rU4yX-0004Mb-FI for 66718@debbugs.gnu.org; Sun, 28 Jan 2024 08:13:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1706447559; 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=aQX7Uurqojp1btV3qrB2ZyDclG7qnkZzjzjzyxrLZfA=; b=sHx5oQGn+ROXEOBppR764MbpMwuPNms8jvEwaLj4K/h3m2b8gMxowgeBHHIK9a6HjhCR4W zP5QToTTFxWlWkXb2wTdFMGzdzum/p3TceqN6MbRH0u6BHwtGvkH+ONACCtrxIfUTP7Z5e NWxVqqz2RKhMquV+Aiseey1oUxrLTR/sxxnD4S1g9gAXQTM9Eask8eOKTp8LAp2IbG1Fhz Suxj7BJuJBilRCLmFl3+UQJaTl/TFvgqIXYFJt42FyTOlNS0OEiNWBEwquT02Ry5qUMHVZ vChkzU69DLzeTeY62GKOhyJr3s0pJD/T87C5fqNbieGcA6drsFGepAWU6srCWA== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Sun, 28 Jan 2024 21:12:54 +0800 Message-ID: <7a6f6cd3a949b368750dc5189a85afa1c4f1cf5c.1706445676.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.7. [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 d2bedd3d2b..e6d8c98722 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -973,12 +973,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.5") + (version "2.28.7") (source (origin (method git-fetch) @@ -987,7 +985,7 @@ (define-public mbedtls-apache (commit (string-append "mbedtls-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1jlkvvyigpjvv404b8vmx68f1v6g1h2zr6rd78dhc0xgqi018phs")))) + (base32 "070i5pxciw04swfqk1rmdprhsafn4cias3dlmkm467pqpjnhb394")))) (build-system cmake-build-system) (arguments `(#:configure-flags @@ -1007,7 +1005,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 Sun Jan 28 13:12:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 59532 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 51F0F27BBE2; Sun, 28 Jan 2024 13:14:26 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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 AF94227BBE9 for ; Sun, 28 Jan 2024 13:14:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rU4z3-0005th-1u; Sun, 28 Jan 2024 08:14:01 -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 1rU4yy-0005r8-Gi for guix-patches@gnu.org; Sun, 28 Jan 2024 08:13:57 -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 1rU4yy-0007xk-8L for guix-patches@gnu.org; Sun, 28 Jan 2024 08:13:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rU4z5-0004Oh-TU for guix-patches@gnu.org; Sun, 28 Jan 2024 08:14:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66718] [PATCH v3 4/6] gnu: mbedtls-apache: Use gexps. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Jan 2024 13:14: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 Received: via spool by 66718-submit@debbugs.gnu.org id=B66718.170644762116831 (code B ref 66718); Sun, 28 Jan 2024 13:14:03 +0000 Received: (at 66718) by debbugs.gnu.org; 28 Jan 2024 13:13:41 +0000 Received: from localhost ([127.0.0.1]:56828 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rU4yi-0004NP-Nz for submit@debbugs.gnu.org; Sun, 28 Jan 2024 08:13:40 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:54984) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rU4yZ-0004Mj-AL for 66718@debbugs.gnu.org; Sun, 28 Jan 2024 08:13:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1706447561; 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=zBluN0YuOizT/KE42koC9TyG3NyvWhzThAWyiYFk6Xo=; b=lnERyQ0KvuZ6vLYO1hqCSTz5lmk4O/dwCC3ggRQv+RdvjwstIwIpTHpr5SmoOwJPKd31Hs 7ZtIw/Q7+W//AAFH5nYN9iPZfjW2kHaLce/xfyo+oaHOw35+nzMargqFcx4DNo7tUXOSrf ifph+svfvXFIFWWqzeuYIvXFd7Yexxi3KEwmWQ0cBC1AnWAbxAjhU1+GNpcfFmQULCOX+i f9a7HJiR73LHPttw2aelsG6Hw1gGDIvIMnvEcMOBDLByD2kDx+cTgQYO7q+v7JbuWIYFmM b9GntVHq2rZ0EXpvXJ3DCt54dRrjTX6MFnxl+8e5EugkU+axB4ifs1di2zmh9g== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Sun, 28 Jan 2024 21:12:55 +0800 Message-ID: <35deac9b4406a17514ee32115b8ca28b327f6cd5.1706445676.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 gexps. 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 e6d8c98722..29b3da6f3d 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -988,14 +988,14 @@ (define-public mbedtls-apache (base32 "070i5pxciw04swfqk1rmdprhsafn4cias3dlmkm467pqpjnhb394")))) (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 Sun Jan 28 13:12:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 59531 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 BA05E27BBE9; Sun, 28 Jan 2024 13:14:24 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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 7FFCB27BBEC for ; Sun, 28 Jan 2024 13:14:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rU4z4-0005w7-Ne; Sun, 28 Jan 2024 08:14:02 -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 1rU4z0-0005ss-5n for guix-patches@gnu.org; Sun, 28 Jan 2024 08:13:58 -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 1rU4yy-0007xp-No for guix-patches@gnu.org; Sun, 28 Jan 2024 08:13:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rU4z6-0004Op-Ck for guix-patches@gnu.org; Sun, 28 Jan 2024 08:14:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66718] [PATCH v3 5/6] gnu: mbedtls-apache: Rename to mbedtls-lts. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Jan 2024 13:14:04 +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 Received: via spool by 66718-submit@debbugs.gnu.org id=B66718.170644762716844 (code B ref 66718); Sun, 28 Jan 2024 13:14:04 +0000 Received: (at 66718) by debbugs.gnu.org; 28 Jan 2024 13:13:47 +0000 Received: from localhost ([127.0.0.1]:56830 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rU4yo-0004Nb-1T for submit@debbugs.gnu.org; Sun, 28 Jan 2024 08:13:46 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:54986) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rU4yd-0004N7-L2 for 66718@debbugs.gnu.org; Sun, 28 Jan 2024 08:13:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1706447564; 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=dKhgf0zHbf8049lJ5R8C7WB2k6aUvF9CShShm9/madg=; b=2nbM7QDmFH4lGhBfI9YXdeN+L0EqhIxiaCGa254iFQJhpT9BmFuewJTUGsoDj9c+eIAiRC iLz+rHH2Q06glzQjprN4XMFyJdd6jjSTMRvo3QbB2J9r/mY+fcc3c8ewZ+L2Fa40MPuNWh Bwgx+FduAjwMxP4jeiplsvgZY00NayZdIdsYGcPuDqiEbXCVBQZ8mB6momv0UHtCqqDzbj ZSeEOHq9x6HjoviG7CzDJVQE6trKhQ0xbU7Myg2DvFfZul63W9UgwXzQufumZ89QfG+DM6 HA34o0BY36l7hsvqd5/eYgR6RS+Jsh1daqjCsY3q46n9ZQckK5A2jk544BaphQ== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Sun, 28 Jan 2024 21:12:56 +0800 Message-ID: <0414b1a5c2d7bc33a1c5170943aae04e35ec918f.1706445676.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): Rename package to "mbedtls". Rename variable to… (mbedtls-lts): …this. (mbedtls-apache): Define as deprecated by mbedtls-lts. (mbedtls-for-hiawatha): Adjust accordingly. * doc/guix.texi: Likewise. * gnu/packages/emulators.scm (dolphin-emu,retroarch)[inputs]: Likewise. * 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)[arguments]<#:phases>,[inputs]: Likewise. * gnu/packages/julia.scm (julia)[arguments]<#:phases>,[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. * gnu/packages/web.scm (hiawatha)[arguments]<#:phases>: Likewise. Change-Id: I0c58b3cd0bcf6e44e7b16a69f6d2739aa3c1545b --- doc/guix.texi | 2 +- gnu/packages/emulators.scm | 4 ++-- 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 | 4 ++-- gnu/packages/julia.scm | 12 ++++++------ 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 +- gnu/packages/web.scm | 2 +- 15 files changed, 32 insertions(+), 29 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index c458befb76..24b31dfb40 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -9850,7 +9850,7 @@ Build Systems (("generate_wrapper_header.*") (string-append "generate_wrapper_header(\"MbedTLS\", \"" - (assoc-ref inputs "mbedtls-apache") "\")\n")))) + (assoc-ref inputs "mbedtls") "\")\n")))) ;; There's a Julia file for each platform, override them all. (find-files "src/wrappers/" "\\.jl$")))) @end lisp diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index cde3ee052c..17d981a9d8 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -351,7 +351,7 @@ (define-public dolphin-emu libxi libxrandr lzo - mbedtls-apache + mbedtls-lts mesa miniupnpc openal @@ -1490,7 +1490,7 @@ (define-public retroarch libxml2 libxrandr libxv - mbedtls-apache + mbedtls-lts mesa openal openssl diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 3697f1391c..47df2df70b 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2038,7 +2038,7 @@ (define-public godot-lts libxi libxinerama libxrandr - mbedtls-apache + mbedtls-lts mesa opusfile pcre2 @@ -2280,7 +2280,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 4765d1c55d..72b6decd81 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -703,7 +703,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: @@ -1112,7 +1112,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..50bbd40a84 100644 --- a/gnu/packages/julia-jll.scm +++ b/gnu/packages/julia-jll.scm @@ -1399,11 +1399,11 @@ (define-public julia-mbedtls-jll (("generate_wrapper_header.*") (string-append "generate_wrapper_header(\"MbedTLS\", \"" - (assoc-ref inputs "mbedtls-apache") "\")\n")))) + (assoc-ref inputs "mbedtls") "\")\n")))) ;; 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..18f0d6c7d3 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -186,7 +186,7 @@ (define-public julia "gmp" "lapack" "libssh2" "libnghttp2" "libgit2" "libblastrampoline" - "mbedtls-apache" "mpfr" + "mbedtls" "mpfr" "openblas" "openlibm" "pcre2" "suitesparse" "gfortran:lib")) ":")))) @@ -263,9 +263,9 @@ (define-public julia (substitute* (jlpath "MPFR") (((from "libmpfr")) (to "mpfr" "libmpfr"))) (substitute* (jlpath "MbedTLS") - (((from "libmbedcrypto")) (to "mbedtls-apache" "libmbedcrypto")) - (((from "libmbedtls")) (to "mbedtls-apache" "libmbedtls")) - (((from "libmbedx509")) (to "mbedtls-apache" "libmbedx509"))) + (((from "libmbedcrypto")) (to "mbedtls" "libmbedcrypto")) + (((from "libmbedtls")) (to "mbedtls" "libmbedtls")) + (((from "libmbedx509")) (to "mbedtls" "libmbedx509"))) (substitute* (jlpath "nghttp2") (((from "libnghttp2")) (to "libnghttp2" "libnghttp2"))) (substitute* (jlpath "OpenBLAS") @@ -318,7 +318,7 @@ (define-public julia (substitute* "stdlib/PCRE2_jll/test/runtests.jl" (("10.40.0") ,(package-version (this-package-input "pcre2")))) (substitute* "stdlib/MbedTLS_jll/test/runtests.jl" - (("2.28.0") ,(package-version (this-package-input "mbedtls-apache")))) + (("2.28.0") ,(package-version (this-package-input "mbedtls")))) (substitute* "stdlib/MPFR_jll/test/runtests.jl" (("4.1.0") ,(package-version (this-package-input "mpfr")))) (substitute* "stdlib/GMP_jll/test/runtests.jl" @@ -515,7 +515,7 @@ (define-public julia ("libunwind" ,libunwind-julia) ("libuv" ,libuv-julia) ("llvm" ,llvm-julia) - ("mbedtls-apache" ,mbedtls-apache) + ("mbedtls" ,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 e748b2cb8e..a50e52b537 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2335,7 +2335,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 fb0de2da22..474a723c82 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -832,7 +832,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 cdf4a50b5d..78a735c96a 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -374,7 +374,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 29b3da6f3d..69136db6f3 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -973,9 +973,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.7") (source (origin @@ -1007,13 +1007,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 b182b2d9f3..2cf8133d7d 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3936,7 +3936,7 @@ (define-public obs libxcomposite libxkbcommon luajit - mbedtls-apache + mbedtls-lts mesa pciutils pipewire diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 1a97dd8dec..43a8e7ad15 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6490,7 +6490,7 @@ (define-public hiawatha ;; Make sure 'hiawatha' finds 'mbedtls'. (let* ((out (assoc-ref outputs "out")) (sbin (string-append out "/sbin")) - (mbed (assoc-ref inputs "mbedtls-apache"))) + (mbed (assoc-ref inputs "mbedtls"))) (wrap-program (string-append sbin "/hiawatha") `("PATH" ":" prefix (,mbed))))))))) (inputs From patchwork Sun Jan 28 13:12:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 59530 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 489A427BBEA; Sun, 28 Jan 2024 13:14:23 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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 71F8C27BBEB for ; Sun, 28 Jan 2024 13:14:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rU4z3-0005um-BX; Sun, 28 Jan 2024 08:14:01 -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 1rU4z0-0005st-6E for guix-patches@gnu.org; Sun, 28 Jan 2024 08:13:58 -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 1rU4yz-0007xq-63 for guix-patches@gnu.org; Sun, 28 Jan 2024 08:13:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rU4z6-0004Ow-RN for guix-patches@gnu.org; Sun, 28 Jan 2024 08:14:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66718] [PATCH v3 6/6] gnu: Add mbedtls, version 3.5.2. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Jan 2024 13:14:04 +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 Received: via spool by 66718-submit@debbugs.gnu.org id=B66718.170644762716851 (code B ref 66718); Sun, 28 Jan 2024 13:14:04 +0000 Received: (at 66718) by debbugs.gnu.org; 28 Jan 2024 13:13:47 +0000 Received: from localhost ([127.0.0.1]:56832 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rU4yo-0004Nd-Rh for submit@debbugs.gnu.org; Sun, 28 Jan 2024 08:13:47 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:54998) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rU4yf-0004NF-Qm for 66718@debbugs.gnu.org; Sun, 28 Jan 2024 08:13:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1706447567; 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=zzp3RHP8ia1zuifdS3iqCdpvPcOpnDbH31OAyKcKe34=; b=i0LqGEjL5Rmd4iDrjfxrqlO1SnszP8detw9ujoLWMNaPh4F14Rs2+5gcB6XSZvxtMr60F7 t7/AA0vMPBbeN7h2wUhi3HGTJ//EUH49KfUqDFoWsrCcHOc7EtUg3uuaO4D6EdKYDLhVuq LcLq9au3WpTN5/DcwN/nJEgkW8+C0GjNa85fg7LERLM7FLS6Gx8Ix7YCG9xwYlx8N4Whwo Cr3XOCbouw+IAwB157XoMGDmm7wb0zOcKBuHhwysD83ebCY1MobMm8KlhK0cUlqKVAucaR p/LA3++25rQBbTAQ0O0Dpk5/BR2c7hOyu2Al+FrXG0ORybSGVxnqaTY354Gzwg== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Sun, 28 Jan 2024 21:12:57 +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): 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 69136db6f3..2f212e9f90 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -1007,6 +1007,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.2") + (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 + "1wsjrx98h74q0q4zqwsghiqvjz4aqgvigpxb9f8xjw0w4sfsclcm")))))) + (define-public mbedtls-apache (deprecated-package "mbedtls-apache" mbedtls-lts))