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