From unknown Tue Jun 24 15:41:49 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#66718 <66718@debbugs.gnu.org> To: bug#66718 <66718@debbugs.gnu.org> Subject: Status: [PATCH 0/6] gnu: mbedtls-apache: Update to 3.5.0. Reply-To: bug#66718 <66718@debbugs.gnu.org> Date: Tue, 24 Jun 2025 22:41:49 +0000 retitle 66718 [PATCH 0/6] gnu: mbedtls-apache: Update to 3.5.0. reassign 66718 guix-patches submitter 66718 Hilton Chain severity 66718 normal tag 66718 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 23 20:22:59 2023 Received: (at submit) by debbugs.gnu.org; 24 Oct 2023 00:23:00 +0000 Received: from localhost ([127.0.0.1]:52541 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qv5C0-00047L-P9 for submit@debbugs.gnu.org; Mon, 23 Oct 2023 20:22:59 -0400 Received: from lists.gnu.org ([2001:470:142::17]:49844) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qv5Bx-000471-2h for submit@debbugs.gnu.org; Mon, 23 Oct 2023 20:22:43 -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 1qv5BO-00054n-5f for guix-patches@gnu.org; Mon, 23 Oct 2023 20:22:06 -0400 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qv5BH-0001NJ-QH for guix-patches@gnu.org; Mon, 23 Oct 2023 20:22:05 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1698106762; 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; bh=30//Ba8ILLgM3bziZiufxMx6Q1YAVo0BlowxVsoCCu8=; b=BT7ae5A55jNWdYGUeoyciA29HbHYVgFOJm5mTa/BnBXP24PM9bKPEB44y6NvU+YocK1YKH yFceGM2nQQlUkDgmMYWHLe6nlOLEy6kq6F2E4eheEAcp0LyCLpY0W5GyUBhM9cL+Osc7oq HkLRNahn/4orxkYZaVW3soV0glc3syEpFlOgg+nd02SQbeiiS5CGm8qYuLk1gg06+0rqo+ dTk25fkvT4YLoWu7ePi0MeCthLkCBoHEenZqT0HZMRyqsIKyXWNWammA++MrnI49xEdnhw 4zSjF9kJQnsMJN+jQ4u4iB/CUaH7XnZhJqe2Y0ddV/2icoJPRtvpnvVHnBAAOw== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space To: guix-patches@gnu.org Subject: [PATCH 0/6] gnu: mbedtls-apache: Update to 3.5.0. Date: Tue, 24 Oct 2023 08:20:48 +0800 Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Level: * X-Spamd-Bar: + Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) *** BLURB HERE *** Hilton Chain (6): gnu: mbedtls-apache: Rename to mbedtls-apache-lts. gnu: mbedtls-apache-for-hiawatha: Use inherited source. gnu: mbedtls-for-hiawatha: Update package style. gnu: mbedtls-apache-lts: Update to 2.28.5. gnu: mbedtls-apache-lts: Use gexp. gnu: Add mbedtls-apache, version 3.5.0. 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 | 81 +++++++++++++------------------ gnu/packages/video.scm | 2 +- 13 files changed, 51 insertions(+), 62 deletions(-) base-commit: 4d748d344bb1891e2e32bf15db24131703d2f78c -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 23 20:30:27 2023 Received: (at 66718) by debbugs.gnu.org; 24 Oct 2023 00:30:27 +0000 Received: from localhost ([127.0.0.1]:52548 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qv5JS-0004NU-HO for submit@debbugs.gnu.org; Mon, 23 Oct 2023 20:30:27 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:36468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qv5JQ-0004NJ-17 for 66718@debbugs.gnu.org; Mon, 23 Oct 2023 20:30:24 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1698107239; 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=0S6DAQvHdp/6yIF2oYb+QuNoDImqsDxVlGlbdkTy8HI=; b=Hm4MBkwF22flzK3vLz2m9bBiDx35yUIuXFJjVxOJS+wG6Xc57Ryy8OSAXFFrVzJgW2GwMy FXSMUQQ9kBI3YQ3rsl6lASEVtHGmBcNpYWS6L4M3dzednOadUd7FAdY48p5hLxo+rdseNb bf0rWrCdF18UcbUvCs42xU2gsepBhUOyQ1n09+kKIapfh/lPGuasgunnUmMz0rZQjdQURd ij2jAoFCPh1sozmdvfRSaY5y6x3SsujbghnTGahj926ubLZQhyK5oE69WaSAZiSX3umh8G k5L8Ta3YFI47jx1rfLdWL352fOAUWxGEgnRiUDTvip4hXtUqxrlLm68eunc45w== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space To: 66718@debbugs.gnu.org Subject: [PATCH 1/6] gnu: mbedtls-apache: Rename to mbedtls-apache-lts. Date: Tue, 24 Oct 2023 08:28:00 +0800 Message-ID: <1cac11485e5583829bbe97d1e1aa87e03debff4f.1698107129.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Hilton Chain , Efraim Flashner , Leo Famulari , Liliana Marie Prikler , Maxim Cournoyer , Simon Tournier , Tobias Geerinckx-Rice , 宋文武 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spamd-Bar: --- X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66718 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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. 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 | 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 0cb947c58a..7d64ed996b 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-apache-lts mesa miniupnpc openal diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index eb1d74d1e1..2155fe8254 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-apache-lts mesa opusfile pcre2 @@ -2276,7 +2276,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 e1514fb40b..c9fbbf8f6e 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-apache-lts)) (synopsis "C++ library to control Philips Hue lights") (description "Hueplusplus is a library for controlling Philips Hue lights. Features: @@ -1097,7 +1097,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 46961ccb7e..1c44bb6d54 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-apache-lts (list mariadb "dev") openldap openssl diff --git a/gnu/packages/julia-jll.scm b/gnu/packages/julia-jll.scm index 1c03b7e589..9bd1c1e57a 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-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 8ba2b480ce..3ee11d73f8 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-apache-lts) ("mpfr" ,mpfr) ,@(if (target-x86-64?) `(("openblas" ,openblas-ilp64)) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 48a30f32d0..3ce92f2c6e 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-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 f02577d2d5..ee66be7fab 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2345,7 +2345,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 86309e4ab3..3722f07b49 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -842,7 +842,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-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 5e86d1a76c..4331c14121 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 6a0aaf7f14..72b53e004e 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -986,7 +986,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 @@ -1026,7 +1026,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 @@ -1048,7 +1048,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 b4dd7c27ae..145d0ec1a2 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3503,7 +3503,7 @@ (define-public obs libxcomposite libxkbcommon luajit - mbedtls-apache + mbedtls-apache-lts mesa pciutils pipewire base-commit: 4d748d344bb1891e2e32bf15db24131703d2f78c -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 23 20:30:30 2023 Received: (at 66718) by debbugs.gnu.org; 24 Oct 2023 00:30:30 +0000 Received: from localhost ([127.0.0.1]:52551 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qv5JW-0004Nm-4c for submit@debbugs.gnu.org; Mon, 23 Oct 2023 20:30:30 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:40816) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qv5JT-0004Nc-PK for 66718@debbugs.gnu.org; Mon, 23 Oct 2023 20:30:28 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1698107243; 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=Na1YtuGY3Eh8DBr6y/JBKeNwR3VOpefkM7LDzzWCit0=; b=m70Ac+fhW1E8+ul8WBcBFu8viRjnNh2BYccxjMDsmCNcJoAJzaCihNTCWb4qEoQdCx5S/o qb6Mv6fORZIY+MGPFN8vq7+HMlTfYMGjOkjkfJdCxVdRFvbgmih+xasPGSt+housIFchja 8SDBTF8xYf2TIhnL2T7G9Z+mI5mgYmkX2VfvGS/d58H4fJmJ/BDytL4L34OtYfXB7N1BwX OlRG5os2oa37kQ2R+G2sjZJNsfioIr4thIXOFVyQpBR5pTZxd3leko19ROxXvewBxahvao +wndPLap/SIOTKgmmTGeccjEpm34cgXbQA8I4EuwWRIO2XLmVxvgdAL2qyugKw== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space To: 66718@debbugs.gnu.org Subject: [PATCH 2/6] gnu: mbedtls-for-hiawatha: Use inherited source. Date: Tue, 24 Oct 2023 08:28:01 +0800 Message-ID: In-Reply-To: <1cac11485e5583829bbe97d1e1aa87e03debff4f.1698107129.git.hako@ultrarare.space> References: <1cac11485e5583829bbe97d1e1aa87e03debff4f.1698107129.git.hako@ultrarare.space> MIME-Version: 1.0 X-Debbugs-Cc: Hilton Chain Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spamd-Bar: --- X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66718 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 72b53e004e..92828db4c8 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -989,8 +989,6 @@ (define-public perl-crypt-openssl-random (define-public mbedtls-apache-lts (package (name "mbedtls-apache") - ;; XXX Check whether ‘-Wformat-signedness’ still breaks mbedtls-for-hiawatha - ;; when updating. (version "2.28.0") (source (origin @@ -1027,26 +1025,6 @@ (define-public mbedtls-for-hiawatha (hidden-package (package (inherit mbedtls-apache-lts) - (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-lts) ((#:phases phases) @@ -1057,9 +1035,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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 23 20:30:36 2023 Received: (at 66718) by debbugs.gnu.org; 24 Oct 2023 00:30:36 +0000 Received: from localhost ([127.0.0.1]:52554 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qv5Jb-0004OC-Kr for submit@debbugs.gnu.org; Mon, 23 Oct 2023 20:30:36 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:40828) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qv5JZ-0004O3-HN for 66718@debbugs.gnu.org; Mon, 23 Oct 2023 20:30:33 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1698107248; 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=JtheW0X845eQEM+39raXRePfT3sOE0wXVbkoTpJ0KSw=; b=q9NAxo93JEtaoVt0nzydd9XQSPWbhGWl+z3+Zc6C21uI4YKcNGy434OkVeuJtR3OdEJee8 CH9zf6gpxwK2f4qLWCgphor3iRIe/8B8iWpWI5vxp/qgYc32B59n75kzypW4VmhaD/pMOv ZA2+FVJAWivin1gbCAhIQCnzjuc6pwmvW4UUQDAD8zE1qCA1SlHvvZIo6bHJ/hCDzOLthR KGScd0jaGcACBPGlHDpZqZbTtuj6rgIBbMFZgm8ot74/gVUsKZEZnip4p3JiWy1Biuhpaf cRzG68fVJhBXJQqROZC7lvoYEZFjor2jw3e1NuJNDOSAoxzSev2R8jx84ZZedw== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space To: 66718@debbugs.gnu.org Subject: [PATCH 3/6] gnu: mbedtls-for-hiawatha: Update package style. Date: Tue, 24 Oct 2023 08:28:02 +0800 Message-ID: <3603eaf826cb800ec60cd73db47c53673118e9e9.1698107129.git.hako@ultrarare.space> In-Reply-To: <1cac11485e5583829bbe97d1e1aa87e03debff4f.1698107129.git.hako@ultrarare.space> References: <1cac11485e5583829bbe97d1e1aa87e03debff4f.1698107129.git.hako@ultrarare.space> MIME-Version: 1.0 X-Debbugs-Cc: Hilton Chain Content-Transfer-Encoding: 8bit X-Spamd-Bar: -- X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66718 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/tls.scm (mbedtls-for-hiawatha)[arguments]: Use gexp. 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 92828db4c8..bc87db5f18 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -1028,14 +1028,13 @@ (define-public mbedtls-for-hiawatha (arguments (substitute-keyword-arguments (package-arguments mbedtls-apache-lts) ((#: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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 23 20:30:40 2023 Received: (at 66718) by debbugs.gnu.org; 24 Oct 2023 00:30:40 +0000 Received: from localhost ([127.0.0.1]:52557 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qv5Jg-0004OX-CL for submit@debbugs.gnu.org; Mon, 23 Oct 2023 20:30:40 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:36664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qv5Je-0004OM-BZ for 66718@debbugs.gnu.org; Mon, 23 Oct 2023 20:30:38 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1698107253; 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=lsmNJqtcnU1jMB9w+PMyGDmtFou5xYQkpR25mEa0mwE=; b=T7ALQ6wfYyd80ZYVKwdX+mXtF94CEsxuYYrx3W5OFuIt0fmhD/tAB3I/zaaLtN5ngaaSEU DlRDliZxz2WyA6rtD+uym60/ICDbzK7CUIcq3e/6zgTfxitvvDL+lLi2PdRyS5GAk1dT9N LDE8Wwi2bowWO2EDLIPC4SemCR7Nq13I3GF2v/5KTSkOtaxPSFF58xZyF+Rjayr3VOU3Kb asuZtV1UhpzfsLfb1KL2IZKAEJyEmYllr+L30RgW/uXXrclVqsHWgLXhad9aa9fnJbgAwU ERrwJ/zYMJDCGSHJA9poyQpMr3Jz2Z7FD0tanpXqUegJzKbOXylIHufWG99buA== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space To: 66718@debbugs.gnu.org Subject: [PATCH 4/6] gnu: mbedtls-apache-lts: Update to 2.28.5. Date: Tue, 24 Oct 2023 08:28:03 +0800 Message-ID: In-Reply-To: <1cac11485e5583829bbe97d1e1aa87e03debff4f.1698107129.git.hako@ultrarare.space> References: <1cac11485e5583829bbe97d1e1aa87e03debff4f.1698107129.git.hako@ultrarare.space> MIME-Version: 1.0 X-Debbugs-Cc: Hilton Chain Content-Transfer-Encoding: 8bit X-Spamd-Bar: -- X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66718 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/tls.scm (mbedtls-apache-lts): Update to 2.28.5. Change-Id: I946aa1436214a11ab3faa08b3ddf9c937a0462a9 --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index bc87db5f18..ab64b4eeaf 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -989,7 +989,7 @@ (define-public perl-crypt-openssl-random (define-public mbedtls-apache-lts (package (name "mbedtls-apache") - (version "2.28.0") + (version "2.28.5") (source (origin (method git-fetch) @@ -998,7 +998,7 @@ (define-public mbedtls-apache-lts (commit (string-append "mbedtls-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0s37dsi29v7146fi9k4frvx5rz2snxdm6c3rwq2fvnca2r80hfjl")))) + (base32 "1jlkvvyigpjvv404b8vmx68f1v6g1h2zr6rd78dhc0xgqi018phs")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 23 20:30:43 2023 Received: (at 66718) by debbugs.gnu.org; 24 Oct 2023 00:30:44 +0000 Received: from localhost ([127.0.0.1]:52560 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qv5Jj-0004Os-Mh for submit@debbugs.gnu.org; Mon, 23 Oct 2023 20:30:43 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:36678) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qv5Jh-0004Oi-QX for 66718@debbugs.gnu.org; Mon, 23 Oct 2023 20:30:42 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1698107257; 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=mP2G/14W+ftxHE+9ZJRh63Ic25BOySlsN9dRjaInYJY=; b=qL0oucZLFmuzAyHTIhEr6GgKU7eisvzjldHRtoboN8bERf2VEikQiGOLdxz93O8zYQgsZU bLzm7RUmiqgzeVD8HGNQkPzNMzFk6d4+HI8WvjSclmnRHIdjQfN049MhY5Wb0/B8BIcXdj jLpwC7GDz/JPE+i0B2Ulex9sJSmXcSDNQ/1/453vRwH23PHi4PT4esTfW5M9ZlhRPRs+ox RLncigixJmulEOKoQ6W5xeELJYUyAVdsR4JR0z/ToMUgMfGESMLKxx3YPc+x98KM4a3K5m KJfC5fq4QMe9y8Eu1V1NuKY4V7aJ4nd6M4OKu/zlX7OO6QExCQCZ40eYHusuyA== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space To: 66718@debbugs.gnu.org Subject: [PATCH 5/6] gnu: mbedtls-apache-lts: Use gexp. Date: Tue, 24 Oct 2023 08:28:04 +0800 Message-ID: <9da6be5fcdccd296161b2ebfc297363035198cf1.1698107129.git.hako@ultrarare.space> In-Reply-To: <1cac11485e5583829bbe97d1e1aa87e03debff4f.1698107129.git.hako@ultrarare.space> References: <1cac11485e5583829bbe97d1e1aa87e03debff4f.1698107129.git.hako@ultrarare.space> MIME-Version: 1.0 X-Debbugs-Cc: Hilton Chain Content-Transfer-Encoding: 8bit X-Spamd-Bar: -- X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66718 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/tls.scm (mbedtls-apache-lts)[arguments]: Use gexp. 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 ab64b4eeaf..41ce452d66 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -1001,14 +1001,14 @@ (define-public mbedtls-apache-lts (base32 "1jlkvvyigpjvv404b8vmx68f1v6g1h2zr6rd78dhc0xgqi018phs")))) (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") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 23 20:30:51 2023 Received: (at 66718) by debbugs.gnu.org; 24 Oct 2023 00:30:51 +0000 Received: from localhost ([127.0.0.1]:52563 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qv5Jr-0004PF-27 for submit@debbugs.gnu.org; Mon, 23 Oct 2023 20:30:51 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:36690) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qv5Jl-0004P2-QR for 66718@debbugs.gnu.org; Mon, 23 Oct 2023 20:30:49 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1698107261; 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=oxUI+XsEAkF53PD94oJrBh8bCjimpJ5/uXOBbW9wA50=; b=o/uBTAjHmcEJYKm1gypZ5YwkjaImFZtsUfjJWRRZyZlJSwU9bK5Lzu0m0X9+wdAgipYT2a 2m8hBEldoshSb/j7iSHUclOsMp9m4Xslo0v3jDfyivefKnMYs2KrkwnJb+xzx0TcJxKF24 GqBlO1fmqqyZ+ZtKv4mZ9qL0hn/Q3NO9o4ANk9pqaMxf7K9vtvuEepiFe1ap9g5djwZXNJ o93Zpjs79zoRgctg3nTx5bhfG8y0Nn5iz5sGSathYmHf8OC2bgSO9rnfxA2CuzDQd8C8w1 X1EsA76TL8ix/wdPKIidrlw92hGWJSyP5IhP6ZuMT2bZgG/zAHAOiDFa253p5w== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space To: 66718@debbugs.gnu.org Subject: [PATCH 6/6] gnu: Add mbedtls-apache, version 3.5.0. Date: Tue, 24 Oct 2023 08:28:05 +0800 Message-ID: <3c5f4e9d4ee79b82661b54ef9161547acc4caf0f.1698107129.git.hako@ultrarare.space> In-Reply-To: <1cac11485e5583829bbe97d1e1aa87e03debff4f.1698107129.git.hako@ultrarare.space> References: <1cac11485e5583829bbe97d1e1aa87e03debff4f.1698107129.git.hako@ultrarare.space> MIME-Version: 1.0 X-Debbugs-Cc: Hilton Chain Content-Transfer-Encoding: 8bit X-Spamd-Bar: -- X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66718 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/tls.scm (mbedtls-apache): 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 41ce452d66..613f734ef3 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -1020,6 +1020,21 @@ (define-public mbedtls-apache-lts (home-page "https://www.trustedfirmware.org/projects/mbed-tls/") (license license:asl2.0))) +(define-public mbedtls-apache + (package + (inherit mbedtls-apache-lts) + (name "mbedtls-apache") + (version "3.5.0") + (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 + "1mg8fp3mkids1g0sbvs9ga5qvribd7s03sxkfwajy596l2cx0wdq")))))) + ;; The Hiawatha Web server requires some specific features to be enabled. (define-public mbedtls-for-hiawatha (hidden-package -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 18 01:48:56 2023 Received: (at 66718) by debbugs.gnu.org; 18 Nov 2023 06:48:56 +0000 Received: from localhost ([127.0.0.1]:47634 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4F8S-0003kD-6j for submit@debbugs.gnu.org; Sat, 18 Nov 2023 01:48:56 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:38534) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4F8P-0003jo-DJ for 66718@debbugs.gnu.org; Sat, 18 Nov 2023 01:48:55 -0500 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1700289925; 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=iKstM2CUK3ixDFYgDH+qGGgAnJydrDGasuh1GIBK2vE=; b=GuJ3Z8XGYRDtp/2pS317499KbR9ru6TJ9ISf04DJKl+GPke8iztL/HMGfWAhMiAADnIDC3 WqStjUiNCdoV5y+4kZRJoP29UyaXHWp6wn88MZ4MtkQdyPiMsyfxK8e2zJ91IAqVsWObvr yZcuOOctqCI/4uuYg5R2aQztjh9/rGPy/3C/iZybrCWczlsu9dC71oBIFPbCMuHlNkLsIo HniZGR+lApVfkQcBy2ZKx3aGPhMFmMeETyMpo/0PCEhEuEcqIpnBg9Mku3unLCdBgc3jgc rNAXTKtmQBvy4QW40xGGvXZsJlD9DD8arogzfHEf249rBa82TfSlHebJeuS0Tw== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space To: 66718@debbugs.gnu.org Subject: [PATCH v2 0/6] gnu: Add mbedtls, version 3.5.1. Date: Sat, 18 Nov 2023 14:47:28 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Hilton Chain Content-Transfer-Encoding: 8bit X-Spam-Level: * X-Spamd-Bar: + X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66718 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) V1->V2: - 2.28.5 -> 2.28.6 - 3.5.0 -> 3.5.1 Mbed TLS 3.5.1 and 2.28.6 changed license to "Apache-2.0 OR GPL-2.0-or-later", so I removed the -apache suffix. Hilton Chain (6): gnu: mbedtls-for-hiawatha: Use inherited source. gnu: mbedtls-for-hiawatha: Update package style. gnu: mbedtls-apache: Update to 2.28.6. gnu: mbedtls-apache: Use gexp. gnu: mbedtls-apache: Rename to mbedtls-lts. gnu: Add mbedtls, version 3.5.1. 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 | 90 ++++++++++++++----------------- gnu/packages/video.scm | 2 +- 13 files changed, 56 insertions(+), 66 deletions(-) base-commit: fc6bdaad57bf91609849623c5f485403c030cb49 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 18 01:50:30 2023 Received: (at 66718) by debbugs.gnu.org; 18 Nov 2023 06:50:31 +0000 Received: from localhost ([127.0.0.1]:47639 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4F9y-0003mu-KH for submit@debbugs.gnu.org; Sat, 18 Nov 2023 01:50:30 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:40580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4F9v-0003mk-Sm for 66718@debbugs.gnu.org; Sat, 18 Nov 2023 01:50:29 -0500 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1700290021; 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=ZWPIN24UGpevlzNDJZPF3puhBEEbkwyVGZxllKctyKI=; b=xVphbK/CJilUmc27mfKVQD6P48fA8G0LceomMLzvqo1Sz3aY2PRkIERlrK0xg2jbcm/L3V dUAyKLGq9OQ2nWJbEkAc6TOhTymjjgGJ2Lsfd78DxnwcmihIOYv19WCvNEUnARJiCdy7kx 56nfO/qaD8JcRhs6tv2cSmQtLBlxZ18kVU1dhED/2930mDPpeWyOi9PgQRFrUVp2BEjRsz kfDeS5ZPuW7HZBgte0GiHPioT+vWjSl/Ke3Q9l7Mr+n33kcZFQ4GpT83PWwS1jQAtprl/A agGSYrEOtdhYgmIkBMwnQtWKvxaapY/q4IyycN+rELWm4yXggiV9/YyDOsBWpw== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space To: 66718@debbugs.gnu.org Subject: [PATCH v2 1/6] gnu: mbedtls-for-hiawatha: Use inherited source. Date: Sat, 18 Nov 2023 14:49:13 +0800 Message-ID: <25db53767b5c4d1af4e2f1e8a7b86a27678a0779.1700289538.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Hilton Chain Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spamd-Bar: --- X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66718 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 6a0aaf7f14..37650f632d 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -989,8 +989,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.0") (source (origin @@ -1027,26 +1025,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) @@ -1057,9 +1035,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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 18 01:50:33 2023 Received: (at 66718) by debbugs.gnu.org; 18 Nov 2023 06:50:33 +0000 Received: from localhost ([127.0.0.1]:47642 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4FA0-0003n9-VQ for submit@debbugs.gnu.org; Sat, 18 Nov 2023 01:50:33 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:41230) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4F9z-0003n1-Hc for 66718@debbugs.gnu.org; Sat, 18 Nov 2023 01:50:31 -0500 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1700290025; 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=SJ7vCAb6+udzvlRTIJBmH2aNZpMKC4zx/zQocvhyjFY=; b=T8VY1OF9OgE280MQaT5kONEkTprmdIKXiQo4iBHQRGw6ewVq5+rT6GFi8snw0ICJioeQgh q6lILI6cmGkuVGwgn3ttgz2hYAgZPmm+v0Q/Md2uMBdzkIkxpJauxGrzEAokR0uIEwlIxX ZogQm3mZKveAe3g8ufnC/HmIHNr716IIbv7cy8Xc5JaPasrkZrE/+g3R/opU6x3UelEW0/ db8aKjWvnHcOgPhSN/BVfrMvnlqGE5GRZjHZHh0LqBLqTg1yBPxgm5iwWOQOWgntDDV1HK IZdqEEqDY0LPb7aD/KoCidYQW5IxPnOsx5Q1QndWap+s/CrXz+RT5OZYGZF9UA== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space To: 66718@debbugs.gnu.org Subject: [PATCH v2 2/6] gnu: mbedtls-for-hiawatha: Update package style. Date: Sat, 18 Nov 2023 14:49:14 +0800 Message-ID: <1566c139264c6e80e0565679403b0d7240d600a7.1700289538.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Hilton Chain Content-Transfer-Encoding: 8bit X-Spamd-Bar: -- X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66718 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/tls.scm (mbedtls-for-hiawatha)[arguments]: Use gexp. 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 37650f632d..998860569a 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -1028,14 +1028,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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 18 01:50:40 2023 Received: (at 66718) by debbugs.gnu.org; 18 Nov 2023 06:50:40 +0000 Received: from localhost ([127.0.0.1]:47645 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4FA4-0003nR-Ao for submit@debbugs.gnu.org; Sat, 18 Nov 2023 01:50:39 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:41232) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4FA2-0003nH-VV for 66718@debbugs.gnu.org; Sat, 18 Nov 2023 01:50:35 -0500 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1700290029; 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=R3lk4+IFKRTAsRlnvSaoqmPoia/4mB5iKoCpZJHB+V0=; b=tDCuEGRwnQ38fzSgKFtAEpsNx9IoYRdz/BwQAU+QtgZHhJsrEkA2Ekg4CUQw8e9qWhF548 KdCJnmgZJNArCMwMHCeW0rdjuKqdEzkEOJLNAyueijuWWSKM3kiFrM2KABa5V8IrsPOdsz pRQRbdrool0Y7mI6LpfgZ2IlmGrnIFGLypf4jk7t2V/Hpl6BZ4QS2Fgdg+Tm/Pl65ZsiKN Zf2VFsf6xOq1YvNLzdGObocaEwwH3Il5/VFI9YrCAesJ4PPV85/xXWuumHQLjtbMkh5Sah d7tFgcvHoL6FEJFbkNYqtCKmcD429b/ypJxa1B0G5djTVgiteGUk8iy3fm7lrw== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space To: 66718@debbugs.gnu.org Subject: [PATCH v2 3/6] gnu: mbedtls-apache: Update to 2.28.6. Date: Sat, 18 Nov 2023 14:49:15 +0800 Message-ID: <9d34d533188e47e02db96e52c02f0c20995914f6.1700289538.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Hilton Chain Content-Transfer-Encoding: 8bit X-Spamd-Bar: -- X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66718 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/tls.scm (mbedtls-apache): Update to 2.28.6. [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 998860569a..7f4332244c 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -984,12 +984,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.0") + (version "2.28.6") (source (origin (method git-fetch) @@ -998,7 +996,7 @@ (define-public mbedtls-apache (commit (string-append "mbedtls-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0s37dsi29v7146fi9k4frvx5rz2snxdm6c3rwq2fvnca2r80hfjl")))) + (base32 "1zzcrnp5vs9iwpx03dg2v7zbhphqrim3dqfagzfb9frzxpf8136m")))) (build-system cmake-build-system) (arguments `(#:configure-flags @@ -1018,7 +1016,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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 18 01:50:41 2023 Received: (at 66718) by debbugs.gnu.org; 18 Nov 2023 06:50:41 +0000 Received: from localhost ([127.0.0.1]:47648 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4FA9-0003ni-0m for submit@debbugs.gnu.org; Sat, 18 Nov 2023 01:50:41 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:41244) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4FA6-0003nU-L5 for 66718@debbugs.gnu.org; Sat, 18 Nov 2023 01:50:38 -0500 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1700290033; 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=pCDAgSLkYurmfT9+pVVykGHzlXMSWmuV4TDodsaau0o=; b=Nat5CWq3u0h75CVTmLLSXy/XapEhYcKGUnJ5DyRsmeMlokRgr7DQyaTjqmAIK0GV4sgJrT GdLH44qVIr8jEg6TVHeRVh95E99pZjhKf/lHcTAcJ/tKkfa2r3LkKWm+uvbRzqFy+4ToUj hFvCDAXU85j5fSkhkRokvMlnM5N8dbGhnTn39qpdHhd6RFcAsDbUhC6av1KDLF1zjgdVwb VCMRuuvS454yimab2j5khSM8QZ4yKR2ZzHyziePEw04e/x+m/WKytfAF764Pu3D2QIwPYQ 2u6StfLppbd25XMM0GQw2077nijChKp35jWF+tBx7iE4uyB3C7Tck7yyq3qEaQ== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space To: 66718@debbugs.gnu.org Subject: [PATCH v2 4/6] gnu: mbedtls-apache: Use gexp. Date: Sat, 18 Nov 2023 14:49:16 +0800 Message-ID: <437592d0e983b4e6488c1a0b4ba342b9e19ed4ae.1700289538.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Hilton Chain Content-Transfer-Encoding: 8bit X-Spamd-Bar: -- X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66718 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/tls.scm (mbedtls-apache)[arguments]: Use gexp. 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 7f4332244c..9038a546f4 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -999,14 +999,14 @@ (define-public mbedtls-apache (base32 "1zzcrnp5vs9iwpx03dg2v7zbhphqrim3dqfagzfb9frzxpf8136m")))) (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") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 18 01:50:45 2023 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 From: Hilton Chain 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 To: 66718@debbugs.gnu.org Subject: [PATCH v2 5/6] gnu: mbedtls-apache: Rename to mbedtls-lts. Date: Sat, 18 Nov 2023 14:49:17 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Hilton Chain , Efraim Flashner , Leo Famulari , Liliana Marie Prikler , Maxim Cournoyer , Simon Tournier , Tobias Geerinckx-Rice , 宋文武 Content-Transfer-Encoding: 8bit X-Spamd-Bar: -- X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66718 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 18 01:50:48 2023 Received: (at 66718) by debbugs.gnu.org; 18 Nov 2023 06:50:48 +0000 Received: from localhost ([127.0.0.1]:47654 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4FAG-0003oF-1f for submit@debbugs.gnu.org; Sat, 18 Nov 2023 01:50:48 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:40148) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4FAE-0003o8-G6 for 66718@debbugs.gnu.org; Sat, 18 Nov 2023 01:50:46 -0500 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1700290040; 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=hM1FG9T/LkL1AYjDp4VngNFUrhE+1Cml6Q3RDOv+wh8=; b=LsQlU60l9nmBLAjC4sUL6QEkUrDSg9uPbFPT5X9spQgNjI0X58/2f7zSv+8HZpFl2jZDkD DlAz0LLhibjFYecJBjsK/BbEU00O6mRrhaYiW0l/ELSPz0rbaYHZ/lNxT3Ej/oqN9mgZpM U6gVJmkzhzEpijhufRa0NXidOrGcNY6FSm+EDHY06+yCELVKdXNmaGu4dsUQJURzEhjIGh qwWorX9CF2GePwfmWMtJQE5QIFx+czQ20nOkC8awFr6eFxq7HTgWyECIewfNV2CN00d8Om FYnS+ZzCPUYF0TjaMNSl8jyQ1aqGjCubSedaT0gbYdE441T/llZNEUZusGT2yg== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space To: 66718@debbugs.gnu.org Subject: [PATCH v2 6/6] gnu: Add mbedtls, version 3.5.1. Date: Sat, 18 Nov 2023 14:49:18 +0800 Message-ID: <629df4cf55c74e163a433ce93b8d9c2f5c7d52c4.1700289538.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Hilton Chain Content-Transfer-Encoding: 8bit X-Spamd-Bar: -- X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66718 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 d53893ec5a..5d1468df58 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -1018,6 +1018,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.1") + (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 + "1b1xq1fpsw1ywl6xm6577biwnhyyr4gk2wkfd1sil4yjcrq0f6qz")))))) + (define-public mbedtls-apache (deprecated-package "mbedtls-apache" mbedtls-lts)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 28 08:12:26 2024 Received: (at 66718) by debbugs.gnu.org; 28 Jan 2024 13:12:26 +0000 Received: from localhost ([127.0.0.1]:56813 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rU4xW-0004Ko-8B for submit@debbugs.gnu.org; Sun, 28 Jan 2024 08:12:26 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:49298) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rU4xU-0004Kf-3x for 66718@debbugs.gnu.org; Sun, 28 Jan 2024 08:12:24 -0500 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1706447492; 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=rTRgQkPmTMMrdi/QFBW6V6YLD1jFDFpKxgeNOVzPc0Y=; b=hJ7G1DnRFWC2qe8NQO2DS6be1B9feWAlYxESLIGMgMSq9A9UItuF1IC7cwzvvM5IHQ5vPX iYPuJmU120ifQRz5buBX4cMsb0srtYGR2ECSL460PVnUajRgfvDSnYl0WXXPlarF21DGWl EGtP3iwSSa8cJEuMXCbH+jegN5YgITct85XRL+ENcV1LlLK5ssF6SEW5t6J7r8fG1chrGj M4+b1ecCb3f9fzthucZharK/cC8w2Y33DCmv1FKjdbiU2Jw0mG1lYwEMb3Y70Od7l9mYY1 LYsxKoBNO2k7XoyBS9ZPSEdFVU2kKwDJpTCXALdljJvg5I93H+Zvw/cbVjY8ZA== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space To: 66718@debbugs.gnu.org Subject: [PATCH v3 0/6] gnu: Add mbedtls, version 3.5.2. Date: Sun, 28 Jan 2024 21:11:45 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spamd-Bar: / X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66718 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) V2->V3: - 2.28.6 -> 2.28.7 - 3.5.1 -> 3.5.2 - Adressed label issues for the name change V1->V2: - 2.28.5 -> 2.28.6 - 3.5.0 -> 3.5.1 Mbed TLS 3.5.1 and 2.28.6 changed license to "Apache-2.0 OR GPL-2.0-or-later", so I removed the -apache suffix. Hilton Chain (6): gnu: mbedtls-for-hiawatha: Use inherited source. gnu: mbedtls-for-hiawatha: Update package style. gnu: mbedtls-apache: Update to 2.28.7. gnu: mbedtls-apache: Use gexps. gnu: mbedtls-apache: Rename to mbedtls-lts. gnu: Add mbedtls, version 3.5.2. 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 | 90 ++++++++++++++----------------- gnu/packages/video.scm | 2 +- gnu/packages/web.scm | 2 +- 15 files changed, 65 insertions(+), 75 deletions(-) base-commit: 963a21bedcdb19c3a48af286b5b0cdcefa97fdb8 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 28 08:13:27 2024 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 From: Hilton Chain 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 To: 66718@debbugs.gnu.org Subject: [PATCH v3 1/6] gnu: mbedtls-for-hiawatha: Use inherited source. Date: Sun, 28 Jan 2024 21:12:52 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spamd-Bar: --- X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66718 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 28 08:13:32 2024 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 From: Hilton Chain 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 To: 66718@debbugs.gnu.org Subject: [PATCH v3 2/6] gnu: mbedtls-for-hiawatha: Update package style. Date: Sun, 28 Jan 2024 21:12:53 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: -- X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66718 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 28 08:13:32 2024 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 From: Hilton Chain 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 To: 66718@debbugs.gnu.org Subject: [PATCH v3 3/6] gnu: mbedtls-apache: Update to 2.28.7. 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 Content-Transfer-Encoding: 8bit X-Spamd-Bar: -- X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66718 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 28 08:13:41 2024 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 From: Hilton Chain 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 To: 66718@debbugs.gnu.org Subject: [PATCH v3 4/6] gnu: mbedtls-apache: Use gexps. 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 Content-Transfer-Encoding: 8bit X-Spamd-Bar: -- X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66718 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 28 08:13:46 2024 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 From: Hilton Chain 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 To: 66718@debbugs.gnu.org Subject: [PATCH v3 5/6] gnu: mbedtls-apache: Rename to mbedtls-lts. 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-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66718 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 28 08:13:47 2024 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 From: Hilton Chain 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 To: 66718@debbugs.gnu.org Subject: [PATCH v3 6/6] gnu: Add mbedtls, version 3.5.2. Date: Sun, 28 Jan 2024 21:12:57 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: -- X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66718 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 05 02:32:50 2024 Received: (at 66718-done) by debbugs.gnu.org; 5 Feb 2024 07:32:50 +0000 Received: from localhost ([127.0.0.1]:50474 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWtTF-0006Ch-Ts for submit@debbugs.gnu.org; Mon, 05 Feb 2024 02:32:50 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:44018) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWtT9-0006CT-7a for 66718-done@debbugs.gnu.org; Mon, 05 Feb 2024 02:32:48 -0500 Date: Mon, 05 Feb 2024 15:32:09 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1707118290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=vAAsNU2f4G6m2cVmZT2EHAS/3TzyS1B/iTomkFm/Jfg=; b=SdRYeW1Li8SS3NGqRjJd7O8w6mgWhakx79MJr7oWHyjb/v4GvY1FQCGDSKisUVGQ6y+xqe 2eDvqNvJ3wXusqL2CZOX6B4sZKoP7+ve97AXhLNT2vywGW9/UnhsQacADDGoHmjjWI1vjP NN94v8Cnq22KT7+i6voefe6Z3zfVLDJDHxeXc51/JPbpsUcyZ7xw4IqR1jigLUquQBTuje v8pDLep4bW0XvusNrM3XfKZJUMEgcpGWk4xv/MYXzp+i3bH+EbALYgsQNZ3r2kzHw0L73m hpWYpNgl4HH0HMF0CJxfJM02VXGdFr/3QWcTtxDdWq9xcM8sBE3KFDIGMIn9bA== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Message-ID: <878r3z8iyu.wl-hako@ultrarare.space> From: Hilton Chain To: 66718-done@debbugs.gnu.org Subject: Re: [bug#66718] [PATCH v3 0/6] gnu: Add mbedtls, version 3.5.2. In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spamd-Bar: / X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66718-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On Sun, 28 Jan 2024 21:11:45 +0800, Hilton Chain wrote: > > V2->V3: > - 2.28.6 -> 2.28.7 > - 3.5.1 -> 3.5.2 > - Adressed label issues for the name change > V1->V2: > - 2.28.5 -> 2.28.6 > - 3.5.0 -> 3.5.1 > > Mbed TLS 3.5.1 and 2.28.6 changed license to "Apache-2.0 OR GPL-2.0-or-later", > so I removed the -apache suffix. > > Hilton Chain (6): > gnu: mbedtls-for-hiawatha: Use inherited source. > gnu: mbedtls-for-hiawatha: Update package style. > gnu: mbedtls-apache: Update to 2.28.7. > gnu: mbedtls-apache: Use gexps. > gnu: mbedtls-apache: Rename to mbedtls-lts. > gnu: Add mbedtls, version 3.5.2. > > 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 | 90 ++++++++++++++----------------- > gnu/packages/video.scm | 2 +- > gnu/packages/web.scm | 2 +- > 15 files changed, 65 insertions(+), 75 deletions(-) > > > base-commit: 963a21bedcdb19c3a48af286b5b0cdcefa97fdb8 > -- > 2.41.0 Applied as 8dfaf461b4af...06331aec114c, closing. From unknown Tue Jun 24 15:41:49 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 04 Mar 2024 12:24:08 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator