From patchwork Mon May 20 08:58:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 64683 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 1033127BBEA; Mon, 20 May 2024 10:03:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 102B027BBE9 for ; Mon, 20 May 2024 10:03:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s8yuv-0001Sj-QK; Mon, 20 May 2024 05:02:49 -0400 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 1s8yta-0000cB-Fs for guix-patches@gnu.org; Mon, 20 May 2024 05:01:26 -0400 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 1s8ytS-0006t9-Ca for guix-patches@gnu.org; Mon, 20 May 2024 05:01:25 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s8ytW-0007K9-Ro; Mon, 20 May 2024 05:01:22 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71076] [PATCH 47/81] gnu: Add rust-rustls-0.23. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Mon, 20 May 2024 09:01:22 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71076 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71076@debbugs.gnu.org Cc: Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 71076-submit@debbugs.gnu.org id=B71076.171619566627701 (code B ref 71076); Mon, 20 May 2024 09:01:22 +0000 Received: (at 71076) by debbugs.gnu.org; 20 May 2024 09:01:06 +0000 Received: from localhost ([127.0.0.1]:41219 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s8ytF-0007CU-Sr for submit@debbugs.gnu.org; Mon, 20 May 2024 05:01:06 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:43493 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s8ysZ-00072t-Eq for 71076@debbugs.gnu.org; Mon, 20 May 2024 05:00:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1716195612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=C0NGuijq73+4vp9xexJs2NMtt05Z/hRn655GNJZyNc0=; b=o+keWCsUzOdI5z/8wKMgWFPJAdjjg3m0+KRG3Tj25awtcSFPtoG4x+GDsjZ+/FrLbTDpyS HN78eSIkQM4E0ym8Un/REcLpdXygxNkM+VrUqt7pcgASTZV2KQVJaLdX8WPh/sgamFx2x+ a/sUUlYNgYJIXb3aHxWBvreh1fmdnu+jtTKbtr99lRdX91lU0cc6tMOyffTNjPgb/03+BM xreFXfg0TNAOqe++PtZIqak/oVjDfTP9NpFVPiFIO8D86DR0OTVrbBZyUdsYjoIRO8b/bG GMWGrdLPyX4aWvUnyJ3iKmsZvmJgM+Ew5ZI607D8sGree5i0cJZeGDlY2+V5Kw== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 5e690893 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <71076@debbugs.gnu.org>; Mon, 20 May 2024 09:00:12 +0000 (UTC) Date: Mon, 20 May 2024 10:58:52 +0200 Message-ID: <39cf73266f499d1a9acfca67103c704395c6dec2.1716193123.git.herman@rimm.ee> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm 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/crates-tls.scm (rust-rustls-0.23): Add variable. (rust-rustls-0.22): Inherit from rust-rustls-0.23. Change-Id: I0f75c871cd6d0c66304796e3bfed395380f8ec0e --- gnu/packages/crates-tls.scm | 64 ++++++++++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 12 deletions(-) diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm index 382a162dad..05f5d5538c 100644 --- a/gnu/packages/crates-tls.scm +++ b/gnu/packages/crates-tls.scm @@ -40,6 +40,7 @@ (define-module (gnu packages crates-tls) #:use-module (gnu packages crates-windows) #:use-module (gnu packages crypto) #:use-module (gnu packages golang) + #:use-module (gnu packages jemalloc) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages rust-apps) @@ -1146,8 +1147,52 @@ (define-public rust-rcgen-0.8 ("rust-webpki" ,rust-webpki-0.22) ("rust-x509-parser" ,rust-x509-parser-0.12)))))) +(define-public rust-rustls-0.23 + (package + (name "rust-rustls") + (version "0.23.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustls" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0yv7bh16rwhn6fnlb3wnixb2y4in9gf3z3ysa8k3zbgh3nbdpfzb")))) + (build-system cargo-build-system) + (arguments + (list + #:tests? #f ; Not all files included. + #:cargo-inputs (list rust-aws-lc-rs-1 + rust-hashbrown-0.14 + rust-log-0.4 + rust-once-cell-1 + rust-ring-0.17 + rust-rustls-pki-types-1 + rust-rustls-webpki-0.102 + rust-rustversion-1 + rust-subtle-2 + rust-zeroize-1) + #:cargo-development-inputs (list rust-base64-0.22 + rust-bencher-0.1 + rust-env-logger-0.10 + rust-log-0.4 + rust-num-bigint-0.4 + rust-rcgen-0.13 + rust-rustls-pemfile-2 + rust-tikv-jemallocator-0.5 + rust-time-0.3 + rust-webpki-roots-0.26) + #:phases override-jemalloc)) + (native-inputs (list cmake-minimal pkg-config jemalloc)) + (home-page "https://github.com/rustls/rustls") + (synopsis "Modern TLS library written in Rust") + (description + "This package provides a modern TLS library written in Rust.") + (license (list license:asl2.0 license:isc license:expat)))) + (define-public rust-rustls-0.22 (package + (inherit rust-rustls-0.23) (name "rust-rustls") (version "0.22.2") (source @@ -1157,7 +1202,6 @@ (define-public rust-rustls-0.22 (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0hcxyhq6ynvws9v5b2h81s1nwmijmya7a3vyyyhsy1wqpmb9jz78")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; Not all files included. #:cargo-inputs (("rust-aws-lc-rs" ,rust-aws-lc-rs-1) @@ -1168,17 +1212,13 @@ (define-public rust-rustls-0.22 ("rust-rustversion" ,rust-rustversion-1) ("rust-subtle" ,rust-subtle-2) ("rust-zeroize" ,rust-zeroize-1)) - #:cargo-development-inputs (("rust-base64" ,rust-base64-0.21) - ("rust-bencher" ,rust-bencher-0.1) - ("rust-env-logger" ,rust-env-logger-0.10) - ("rust-log" ,rust-log-0.4) - ("rust-rustls-pemfile" ,rust-rustls-pemfile-2) - ("rust-webpki-roots" ,rust-webpki-roots-0.26)))) - (home-page "https://github.com/rustls/rustls") - (synopsis "Modern TLS library written in Rust") - (description - "This package provides a modern TLS library written in Rust.") - (license (list license:asl2.0 license:isc license:expat)))) + #:cargo-development-inputs + (("rust-base64" ,rust-base64-0.21) + ("rust-bencher" ,rust-bencher-0.1) + ("rust-env-logger" ,rust-env-logger-0.10) + ("rust-log" ,rust-log-0.4) + ("rust-rustls-pemfile" ,rust-rustls-pemfile-2) + ("rust-webpki-roots" ,rust-webpki-roots-0.26)))))) (define-public rust-rustls-0.21 (package