From patchwork Sat Aug 5 13:18:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 52535 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 848BC27BBEC; Sat, 5 Aug 2023 14:21:28 +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=-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 9233627BBE2 for ; Sat, 5 Aug 2023 14:21:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qSHDV-0003RR-CL; Sat, 05 Aug 2023 09:21:13 -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 1qSHDR-0003QJ-KU for guix-patches@gnu.org; Sat, 05 Aug 2023 09:21:09 -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 1qSHDR-0003ZF-CQ for guix-patches@gnu.org; Sat, 05 Aug 2023 09:21:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qSHDK-00066W-G4; Sat, 05 Aug 2023 09:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v6 01/10] gnu: mbedtls-apache: Rename to mbedtls-apache-lts. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, leo@famulari.name, liliana.prikler@gmail.com, zimon.toutoune@gmail.com, me@tobias.gr, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sat, 05 Aug 2023 13:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63765 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63765@debbugs.gnu.org Cc: Hilton Chain , Efraim Flashner , Leo Famulari , Liliana Marie Prikler , Simon Tournier , Tobias Geerinckx-Rice , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Efraim Flashner , Leo Famulari , Liliana Marie Prikler , Simon Tournier , Tobias Geerinckx-Rice , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 63765-submit@debbugs.gnu.org id=B63765.169124162523315 (code B ref 63765); Sat, 05 Aug 2023 13:21:02 +0000 Received: (at 63765) by debbugs.gnu.org; 5 Aug 2023 13:20:25 +0000 Received: from localhost ([127.0.0.1]:56124 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSHCi-00063y-MA for submit@debbugs.gnu.org; Sat, 05 Aug 2023 09:20:25 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:44114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSHCf-00063p-Tr for 63765@debbugs.gnu.org; Sat, 05 Aug 2023 09:20:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1691241614; 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=urL2wneKo2jfa4jn6N9iqc+1wtZLlKuPfvTGcNoLHns=; b=vlyw6HnWjpP41sMEbRC714C2jPeo8GBXQd3Mji3kKfQOqAO6pdPA6eAKS4tSeu1vAurA92 IAd32DaC1KIl3e8AxCvcwhYDCK/82/pAsOylQAEvAkU18DNs/CpFu/+FG3TRt3aZX1H9OX IfxdI8TfIFdL0a9DJyjG7qH3EklwpAJC3pscxljnDt2T7WAWV39PP69aRgSrWinCsdHzgX AbrP3oQutsxdsSthop4cb2Tgt6TqhL4fNCLoFeBJbON9Ln4ty8YjTn4mf+yj7x1C/LQ5jV WzxC9/8yZXPW88uMkdQYn08KzS7VouJ9asZFx3whEeM4PTlMEEBeE55ZrNDXAg== Date: Sat, 5 Aug 2023 21:18:57 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space 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 from this... (mbedtls-apache-lts): ... to this. (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. --- 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 | 6 +++--- gnu/packages/video.scm | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 67950c1603..8123ec764b 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -341,7 +341,7 @@ (define-public dolphin-emu libxi libxrandr lzo - mbedtls-apache + mbedtls-apache-lts mesa miniupnpc openal diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 5771b7530f..dffdf18aed 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1971,7 +1971,7 @@ (define-public godot-lts libxi libxinerama libxrandr - mbedtls-apache + mbedtls-apache-lts mesa opusfile pcre2 @@ -2213,7 +2213,7 @@ (define-public godot libxinerama libxkbcommon libxrandr - mbedtls-apache + mbedtls-apache-lts mesa openxr opusfile diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index ab343d1dac..02db432810 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -692,7 +692,7 @@ (define-public hueplusplus (arguments `(#:tests? #f)) ;; Tests require Google's gtest and gmock (inputs - (list mbedtls-apache)) + (list mbedtls-apache-lts)) (synopsis "C++ library to control Philips Hue lights") (description "Hueplusplus is a library for controlling Philips Hue lights. Features: @@ -1058,7 +1058,7 @@ (define-public openrgb hueplusplus nlohmann-json libusb - mbedtls-apache + mbedtls-apache-lts qtbase-5)) (native-inputs (list pkg-config diff --git a/gnu/packages/haxe.scm b/gnu/packages/haxe.scm index 6fc30ce02f..60495630b9 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-apache-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-apache-lts neko ocaml-extlib ocaml-luv @@ -255,7 +255,7 @@ (define-public hashlink libpng libuv libvorbis - mbedtls-apache + mbedtls-apache-lts mikktspace minimp3 openal diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index f966724022..407d3f4b08 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -815,7 +815,7 @@ (define-public inspircd (list argon2 gnutls libmaxminddb - mbedtls-apache + mbedtls-apache-lts (list mariadb "dev") openldap openssl diff --git a/gnu/packages/julia-jll.scm b/gnu/packages/julia-jll.scm index 2320b03595..78ec186bf2 100644 --- a/gnu/packages/julia-jll.scm +++ b/gnu/packages/julia-jll.scm @@ -1404,7 +1404,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-apache-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 ba54175822..82891525c2 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -511,7 +511,7 @@ (define-public julia ("libunwind" ,libunwind-julia) ("libuv" ,libuv-julia) ("llvm" ,llvm-julia) - ("mbedtls-apache" ,mbedtls-apache) + ("mbedtls-apache" ,mbedtls-apache-lts) ("mpfr" ,mpfr) ("openblas" ,openblas) ("openlibm" ,openlibm) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 7d87ee602c..f26c5efd3c 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -188,7 +188,7 @@ (define-public bctoolbox (with-directory-excursion "tester" (invoke "./bctoolbox_tester")))))))) (inputs - (list bcunit libdecaf mbedtls-apache)) + (list bcunit libdecaf mbedtls-apache-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 9c49cc0b3a..40e24c39bc 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2309,7 +2309,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-apache-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 488d015107..e1d48a82f0 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -822,7 +822,7 @@ (define-public nng (native-inputs `(("ksh" ,oksh))) (inputs - `(("mbedtls" ,mbedtls-apache))) + `(("mbedtls" ,mbedtls-apache-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 3e3e8e00c6..a0640799bc 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-apache-lts postgresql zlib)) (synopsis "Feature rich search engine") diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index f51c47db04..a986d2e578 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -955,7 +955,7 @@ (define-public perl-crypt-openssl-random ;; The "-apache" variant is the upstreamed prefered variant. A "-gpl" ;; variant exists in addition to the "-apache" one. -(define-public mbedtls-apache +(define-public mbedtls-apache-lts (package (name "mbedtls-apache") ;; XXX Check whether ‘-Wformat-signedness’ still breaks mbedtls-for-hiawatha @@ -995,7 +995,7 @@ (define-public mbedtls-apache (define-public mbedtls-for-hiawatha (hidden-package (package - (inherit mbedtls-apache) + (inherit mbedtls-apache-lts) (name "mbedtls-apache") (version "2.26.0") (source @@ -1017,7 +1017,7 @@ (define-public mbedtls-for-hiawatha (("Wformat-truncation=2") "Wformat-truncation")) #t)))) (arguments - (substitute-keyword-arguments (package-arguments mbedtls-apache) + (substitute-keyword-arguments (package-arguments mbedtls-apache-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 f75a528b13..38489beea7 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3505,7 +3505,7 @@ (define-public obs libxcomposite libxkbcommon luajit - mbedtls-apache + mbedtls-apache-lts mesa pciutils pipewire