Package: guix-patches;
Reported by: Hilton Chain <hako <at> ultrarare.space>
Date: Tue, 24 Oct 2023 00:23:01 UTC
Severity: normal
Tags: patch
Done: Hilton Chain <hako <at> ultrarare.space>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 66718 in the body.
You can then email your comments to 66718 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#66718; Package guix-patches.
(Tue, 24 Oct 2023 00:23:02 GMT) Full text and rfc822 format available.Hilton Chain <hako <at> ultrarare.space>:guix-patches <at> gnu.org.
(Tue, 24 Oct 2023 00:23:02 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Hilton Chain <hako <at> ultrarare.space> To: guix-patches <at> gnu.org Cc: Hilton Chain <hako <at> ultrarare.space> Subject: [PATCH 0/6] gnu: mbedtls-apache: Update to 3.5.0. Date: Tue, 24 Oct 2023 08:20:48 +0800
*** 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
hako <at> ultrarare.space, efraim <at> flashner.co.il, leo <at> famulari.name, liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com, zimon.toutoune <at> gmail.com, me <at> tobias.gr, iyzsong <at> envs.net, guix-patches <at> gnu.org:bug#66718; Package guix-patches.
(Tue, 24 Oct 2023 00:31:01 GMT) Full text and rfc822 format available.Message #8 received at 66718 <at> debbugs.gnu.org (full text, mbox):
From: Hilton Chain <hako <at> ultrarare.space> To: 66718 <at> debbugs.gnu.org Cc: Hilton Chain <hako <at> ultrarare.space> Subject: [PATCH 1/6] gnu: mbedtls-apache: Rename to mbedtls-apache-lts. Date: Tue, 24 Oct 2023 08:28:00 +0800
* 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
hako <at> ultrarare.space, guix-patches <at> gnu.org:bug#66718; Package guix-patches.
(Tue, 24 Oct 2023 00:31:02 GMT) Full text and rfc822 format available.Message #11 received at 66718 <at> debbugs.gnu.org (full text, mbox):
From: Hilton Chain <hako <at> ultrarare.space> To: 66718 <at> debbugs.gnu.org Cc: Hilton Chain <hako <at> ultrarare.space> Subject: [PATCH 2/6] gnu: mbedtls-for-hiawatha: Use inherited source. Date: Tue, 24 Oct 2023 08:28:01 +0800
* 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
hako <at> ultrarare.space, guix-patches <at> gnu.org:bug#66718; Package guix-patches.
(Tue, 24 Oct 2023 00:31:02 GMT) Full text and rfc822 format available.Message #14 received at 66718 <at> debbugs.gnu.org (full text, mbox):
From: Hilton Chain <hako <at> ultrarare.space> To: 66718 <at> debbugs.gnu.org Cc: Hilton Chain <hako <at> ultrarare.space> Subject: [PATCH 3/6] gnu: mbedtls-for-hiawatha: Update package style. Date: Tue, 24 Oct 2023 08:28:02 +0800
* 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
hako <at> ultrarare.space, guix-patches <at> gnu.org:bug#66718; Package guix-patches.
(Tue, 24 Oct 2023 00:31:03 GMT) Full text and rfc822 format available.Message #17 received at 66718 <at> debbugs.gnu.org (full text, mbox):
From: Hilton Chain <hako <at> ultrarare.space> To: 66718 <at> debbugs.gnu.org Cc: Hilton Chain <hako <at> ultrarare.space> Subject: [PATCH 4/6] gnu: mbedtls-apache-lts: Update to 2.28.5. Date: Tue, 24 Oct 2023 08:28:03 +0800
* 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
hako <at> ultrarare.space, guix-patches <at> gnu.org:bug#66718; Package guix-patches.
(Tue, 24 Oct 2023 00:31:03 GMT) Full text and rfc822 format available.Message #20 received at 66718 <at> debbugs.gnu.org (full text, mbox):
From: Hilton Chain <hako <at> ultrarare.space> To: 66718 <at> debbugs.gnu.org Cc: Hilton Chain <hako <at> ultrarare.space> Subject: [PATCH 5/6] gnu: mbedtls-apache-lts: Use gexp. Date: Tue, 24 Oct 2023 08:28:04 +0800
* 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
hako <at> ultrarare.space, guix-patches <at> gnu.org:bug#66718; Package guix-patches.
(Tue, 24 Oct 2023 00:31:04 GMT) Full text and rfc822 format available.Message #23 received at 66718 <at> debbugs.gnu.org (full text, mbox):
From: Hilton Chain <hako <at> ultrarare.space> To: 66718 <at> debbugs.gnu.org Cc: Hilton Chain <hako <at> ultrarare.space> Subject: [PATCH 6/6] gnu: Add mbedtls-apache, version 3.5.0. Date: Tue, 24 Oct 2023 08:28:05 +0800
* 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
hako <at> ultrarare.space, guix-patches <at> gnu.org:bug#66718; Package guix-patches.
(Sat, 18 Nov 2023 06:49:02 GMT) Full text and rfc822 format available.Message #26 received at 66718 <at> debbugs.gnu.org (full text, mbox):
From: Hilton Chain <hako <at> ultrarare.space> To: 66718 <at> debbugs.gnu.org Cc: Hilton Chain <hako <at> ultrarare.space> Subject: [PATCH v2 0/6] gnu: Add mbedtls, version 3.5.1. Date: Sat, 18 Nov 2023 14:47:28 +0800
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
hako <at> ultrarare.space, guix-patches <at> gnu.org:bug#66718; Package guix-patches.
(Sat, 18 Nov 2023 06:51:02 GMT) Full text and rfc822 format available.Message #29 received at 66718 <at> debbugs.gnu.org (full text, mbox):
From: Hilton Chain <hako <at> ultrarare.space> To: 66718 <at> debbugs.gnu.org Cc: Hilton Chain <hako <at> ultrarare.space> Subject: [PATCH v2 1/6] gnu: mbedtls-for-hiawatha: Use inherited source. Date: Sat, 18 Nov 2023 14:49:13 +0800
* 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
hako <at> ultrarare.space, guix-patches <at> gnu.org:bug#66718; Package guix-patches.
(Sat, 18 Nov 2023 06:51:02 GMT) Full text and rfc822 format available.Message #32 received at 66718 <at> debbugs.gnu.org (full text, mbox):
From: Hilton Chain <hako <at> ultrarare.space> To: 66718 <at> debbugs.gnu.org Cc: Hilton Chain <hako <at> ultrarare.space> Subject: [PATCH v2 2/6] gnu: mbedtls-for-hiawatha: Update package style. Date: Sat, 18 Nov 2023 14:49:14 +0800
* 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
hako <at> ultrarare.space, guix-patches <at> gnu.org:bug#66718; Package guix-patches.
(Sat, 18 Nov 2023 06:51:02 GMT) Full text and rfc822 format available.Message #35 received at 66718 <at> debbugs.gnu.org (full text, mbox):
From: Hilton Chain <hako <at> ultrarare.space> To: 66718 <at> debbugs.gnu.org Cc: Hilton Chain <hako <at> ultrarare.space> Subject: [PATCH v2 3/6] gnu: mbedtls-apache: Update to 2.28.6. Date: Sat, 18 Nov 2023 14:49:15 +0800
* 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
hako <at> ultrarare.space, guix-patches <at> gnu.org:bug#66718; Package guix-patches.
(Sat, 18 Nov 2023 06:51:03 GMT) Full text and rfc822 format available.Message #38 received at 66718 <at> debbugs.gnu.org (full text, mbox):
From: Hilton Chain <hako <at> ultrarare.space> To: 66718 <at> debbugs.gnu.org Cc: Hilton Chain <hako <at> ultrarare.space> Subject: [PATCH v2 4/6] gnu: mbedtls-apache: Use gexp. Date: Sat, 18 Nov 2023 14:49:16 +0800
* 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
hako <at> ultrarare.space, efraim <at> flashner.co.il, leo <at> famulari.name, liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com, zimon.toutoune <at> gmail.com, me <at> tobias.gr, iyzsong <at> envs.net, guix-patches <at> gnu.org:bug#66718; Package guix-patches.
(Sat, 18 Nov 2023 06:51:03 GMT) Full text and rfc822 format available.Message #41 received at 66718 <at> debbugs.gnu.org (full text, mbox):
From: Hilton Chain <hako <at> ultrarare.space> To: 66718 <at> debbugs.gnu.org Cc: Hilton Chain <hako <at> ultrarare.space> Subject: [PATCH v2 5/6] gnu: mbedtls-apache: Rename to mbedtls-lts. Date: Sat, 18 Nov 2023 14:49:17 +0800
* 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
hako <at> ultrarare.space, guix-patches <at> gnu.org:bug#66718; Package guix-patches.
(Sat, 18 Nov 2023 06:51:03 GMT) Full text and rfc822 format available.Message #44 received at 66718 <at> debbugs.gnu.org (full text, mbox):
From: Hilton Chain <hako <at> ultrarare.space> To: 66718 <at> debbugs.gnu.org Cc: Hilton Chain <hako <at> ultrarare.space> Subject: [PATCH v2 6/6] gnu: Add mbedtls, version 3.5.1. Date: Sat, 18 Nov 2023 14:49:18 +0800
* 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
guix-patches <at> gnu.org:bug#66718; Package guix-patches.
(Sun, 28 Jan 2024 13:13:02 GMT) Full text and rfc822 format available.Message #47 received at 66718 <at> debbugs.gnu.org (full text, mbox):
From: Hilton Chain <hako <at> ultrarare.space> To: 66718 <at> debbugs.gnu.org Cc: Hilton Chain <hako <at> ultrarare.space> Subject: [PATCH v3 0/6] gnu: Add mbedtls, version 3.5.2. Date: Sun, 28 Jan 2024 21:11:45 +0800
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
guix-patches <at> gnu.org:bug#66718; Package guix-patches.
(Sun, 28 Jan 2024 13:14:02 GMT) Full text and rfc822 format available.Message #50 received at 66718 <at> debbugs.gnu.org (full text, mbox):
From: Hilton Chain <hako <at> ultrarare.space> To: 66718 <at> debbugs.gnu.org Cc: Hilton Chain <hako <at> ultrarare.space> Subject: [PATCH v3 1/6] gnu: mbedtls-for-hiawatha: Use inherited source. Date: Sun, 28 Jan 2024 21:12:52 +0800
* 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
guix-patches <at> gnu.org:bug#66718; Package guix-patches.
(Sun, 28 Jan 2024 13:14:02 GMT) Full text and rfc822 format available.Message #53 received at 66718 <at> debbugs.gnu.org (full text, mbox):
From: Hilton Chain <hako <at> ultrarare.space> To: 66718 <at> debbugs.gnu.org Cc: Hilton Chain <hako <at> ultrarare.space> Subject: [PATCH v3 2/6] gnu: mbedtls-for-hiawatha: Update package style. Date: Sun, 28 Jan 2024 21:12:53 +0800
* 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
guix-patches <at> gnu.org:bug#66718; Package guix-patches.
(Sun, 28 Jan 2024 13:14:03 GMT) Full text and rfc822 format available.Message #56 received at 66718 <at> debbugs.gnu.org (full text, mbox):
From: Hilton Chain <hako <at> ultrarare.space> To: 66718 <at> debbugs.gnu.org Cc: Hilton Chain <hako <at> ultrarare.space> Subject: [PATCH v3 3/6] gnu: mbedtls-apache: Update to 2.28.7. Date: Sun, 28 Jan 2024 21:12:54 +0800
* 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
guix-patches <at> gnu.org:bug#66718; Package guix-patches.
(Sun, 28 Jan 2024 13:14:03 GMT) Full text and rfc822 format available.Message #59 received at 66718 <at> debbugs.gnu.org (full text, mbox):
From: Hilton Chain <hako <at> ultrarare.space> To: 66718 <at> debbugs.gnu.org Cc: Hilton Chain <hako <at> ultrarare.space> Subject: [PATCH v3 4/6] gnu: mbedtls-apache: Use gexps. Date: Sun, 28 Jan 2024 21:12:55 +0800
* 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
guix-patches <at> gnu.org:bug#66718; Package guix-patches.
(Sun, 28 Jan 2024 13:14:04 GMT) Full text and rfc822 format available.Message #62 received at 66718 <at> debbugs.gnu.org (full text, mbox):
From: Hilton Chain <hako <at> ultrarare.space> To: 66718 <at> debbugs.gnu.org Cc: Hilton Chain <hako <at> ultrarare.space> Subject: [PATCH v3 5/6] gnu: mbedtls-apache: Rename to mbedtls-lts. Date: Sun, 28 Jan 2024 21:12:56 +0800
* 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
guix-patches <at> gnu.org:bug#66718; Package guix-patches.
(Sun, 28 Jan 2024 13:14:04 GMT) Full text and rfc822 format available.Message #65 received at 66718 <at> debbugs.gnu.org (full text, mbox):
From: Hilton Chain <hako <at> ultrarare.space> To: 66718 <at> debbugs.gnu.org Cc: Hilton Chain <hako <at> ultrarare.space> Subject: [PATCH v3 6/6] gnu: Add mbedtls, version 3.5.2. Date: Sun, 28 Jan 2024 21:12:57 +0800
* 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
Hilton Chain <hako <at> ultrarare.space>:Hilton Chain <hako <at> ultrarare.space>:Message #70 received at 66718-done <at> debbugs.gnu.org (full text, mbox):
From: Hilton Chain <hako <at> ultrarare.space> To: 66718-done <at> debbugs.gnu.org Subject: Re: [bug#66718] [PATCH v3 0/6] gnu: Add mbedtls, version 3.5.2. Date: Mon, 05 Feb 2024 15:32:09 +0800
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.
Debbugs Internal Request <help-debbugs <at> gnu.org>
to internal_control <at> debbugs.gnu.org.
(Mon, 04 Mar 2024 12:24:08 GMT) Full text and rfc822 format available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.