From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 6InKJy1TtmVAhAAA62LTzQ:P1 (envelope-from ) for ; Sun, 28 Jan 2024 14:14:21 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 6InKJy1TtmVAhAAA62LTzQ (envelope-from ) for ; Sun, 28 Jan 2024 14:14:21 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=2nbM7QDm; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1706447661; h=from:from:sender:sender:reply-to: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:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=dKhgf0zHbf8049lJ5R8C7WB2k6aUvF9CShShm9/madg=; b=q5JGjJ2H8nzhRniN+K2xe0TADoXUZ8oYjwFz/sXztfuU3O6FjhQDQ3gHX9bn/cfMpBXAcL pozz0Qw6BXFLfzhHoN+p7viiWEmprSJChJ4XL6MQaI/XDzwwIVDbpNKcjf9sjWzuuUaBrA qcEnvPH1rtbOjvGV3KS50XjHsXocApgD3FIX/0RQl+RrfL7bb723hPiPdvyei3dbklzVyV ja71aD2cFcYW3NKP23a0LcDHjRaSSqhA4fx/Uow484zt8+OQhQLYipGImyl03orWPAyNIc SDRx3EV+vlTSsVpPLk0jSTrFrjkQ+tubCCCnvz760dFcKiMj/M5PyTjvyXJjkQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=2nbM7QDm; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1706447661; a=rsa-sha256; cv=none; b=sa2AMFEGfJLojMR+JyAaRuClgPgKpdRDEZLW+uSQzKjLHuN6vleX9DTa9d1KckD1UbI/NL ptDCFBD70tgqIr6lvgt9LL4TFwo9FOwgFW6W1bRKJg7lo0ByX1FymMkztfZNLuI0U9U6SN 46MesX8BwPB0zc+fewrFM+oCp1SfEQGElP9VwI1Did/1ZTjYxn4NcKigJo3JQA1o+6CxiE Jv4UeBPkMBL0aubidFBcq3V8C9wUWgiN5vqpJLXf21Sb698HwkeEE1Iw7vdIbIkXdIhepu 0rLa7Brh+j45PQByLrC7QUPmS7uxn0XPo7kD1oGA9PPSO9uhiqUlsC+cpgriTA== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 576213C713 for ; Sun, 28 Jan 2024 14:14:21 +0100 (CET) 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== 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 From: Hilton Chain via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -7.15 X-Migadu-Queue-Id: 576213C713 X-Spam-Score: -7.15 X-Migadu-Scanner: mx11.migadu.com X-TUID: XxRQDbciyz0t * 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 -- 2.41.0