Message ID | 87tu28axpj.fsf@erlikon.ch |
---|---|
State | New |
Headers | show |
Series | [bug#59867] Update mbedtls-apache to 3.2.1 | expand |
Hi, Thanks for the contribution. On mer., 07 déc. 2022 at 01:01, Gabriel Wicki <gabriel@erlikon.ch> wrote: > Working with it i realized today that mbedtls is somewhat outdated in > Guix, so i took the liberty of creating an update patch. Following the > comments in the package definition i realized that updating mbedtls > would break hiawatha, since that project upgraded to mbedtls 3 with > version 11. So i updatet that package as well. > I removed the snippets in both source blocks since they aren't needed > anymore. I get this: --8<---------------cut here---------------start------------->8--- $ guix refresh -l mbedtls-apache Building the following 52 packages would ensure 312 dependent packages are rebuilt: dolphin-emu@5.0-13178.a34823d superstarfighter@0.6.5 openrgb@0.8 hashlink@1.12 inspircd@3.12.0 julia-juno@0.8.4 julia-measures@0.3.1 julia-cenum@0.4.1 julia-genericschur@0.5.3 julia-sundials-jll@5.2.1+0 julia-ffmpeg@0.4.1 julia-bfloat16s@0.4.0 julia-fuzzycompletions@0.4.1 julia-millboard@0.2.5 julia-showoff@1.0.2 julia-msgpack@1.1.0 julia-softglobalscope@1.1.0 julia-scratch@1.1.0 julia-tableiointerface@0.1.6 julia-mocking@0.7.3 julia-static@0.8.3 julia-pyplot@2.10.0 julia-infinity@0.2.4 julia-mutablearithmetics@0.2.20 julia-gpuarrays@8.1.3 julia-gr@0.58.1 julia-configurations@0.16.4 julia-bioalignments@2.0.0 julia-suppressor@0.2.0 julia-quadmath@0.5.5 julia-referencetests@0.9.7 julia-imagemagick@1.2.1 julia-optim@1.6.0 julia-lazyarrays@0.22.16 julia-testimages@1.5.0 julia-plotthemes@2.0.1 julia-recipespipeline@0.3.4 julia-csv@0.10.4 julia-bson@0.3.6 julia-geometrybasics@0.4.2 bluez-alsa@3.0.0 kopete@22.04.3 mswebrtc@1.1.1-0.946ca70 msopenh264@1.2.1-0.88697cc mssilk@1.1.1-0.dd0f31e msamr@1.1.3-0.5ab5c09 linphone-desktop@4.2.5 dislocker@0.7.3 nng@1.3.2 obs-spectralizer@1.3.3 obs-websocket@4.9.1 obs-wlrobs@1.0 --8<---------------cut here---------------end--------------->8--- which means it is tangent for master. :-) Have you rebuilt all these? Does the update only break hiawatha? Then, it is not a clean patch; it is not straightforward apply. :-) Please, could you use “git-send-email” as recommended by the manual [1]. Please mention the base commit against which the patch applies, it helps as in this case when the file gnu/packages/tls.scm has changed in the mean time. Could you send v2? 1: <https://guix.gnu.org/manual/devel/en/guix.html#Submitting-Patches> Thanks, simon
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index f1e844b608..ee81359a66 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -1002,7 +1002,7 @@ (define-public mbedtls-apache (name "mbedtls-apache") ;; XXX Check whether ‘-Wformat-signedness’ still breaks mbedtls-for-hiawatha ;; when updating. - (version "2.26.0") + (version "3.2.1") (source (origin (method git-fetch) @@ -1010,17 +1010,8 @@ (define-public mbedtls-apache (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)))) + (base32 "1dvj1m2i5lkaf8bcmslap8d82z2pi7ypgr8n7lv0rqjyy4vgmkgq")) + (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a313b0c7a4..f046ddd025 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6095,20 +6095,14 @@ (define-public tidy-html (define-public hiawatha (package (name "hiawatha") - (version "10.11") + (version "11.2") (source (origin (method url-fetch) (uri (string-append "https://www.hiawatha-webserver.org/files/" "hiawatha-" version ".tar.gz")) - (modules '((guix build utils))) - (snippet '(begin - ;; We use packaged libraries, so delete the bundled copies. - (for-each delete-file-recursively - (list "extra/nghttp2.tgz" "mbedtls")) - #t)) (sha256 - (base32 "09wpgilbv13zal71v9lbsqr8c3fignygadykpd1p1pb8blb5vn3r")))) + (base32 "1i8vrxbvpcj6yxmshbg19gm9g8vrxds6pdra0sgld4vzj9v4zilr")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no tests included
Hi Working with it i realized today that mbedtls is somewhat outdated in Guix, so i took the liberty of creating an update patch. Following the comments in the package definition i realized that updating mbedtls would break hiawatha, since that project upgraded to mbedtls 3 with version 11. So i updatet that package as well. I removed the snippets in both source blocks since they aren't needed anymore. Thanks for review and merge! Kind regards gabriel From 94ade2b4e1cf65b4859418ea2e7f7e12e35289bc Mon Sep 17 00:00:00 2001 From: Gabriel Wicki <wicg@zhaw.ch> Date: Tue, 6 Dec 2022 16:36:11 +0100 Subject: [PATCH] gnu: mbedtls-apache: Update to version 3.2.1. * gnu/packages/tls.scm (mbedtls-apache): Update to 3.2.1. [source]: Remove snippet. * gnu/packages/web.scm (hiawatha): Update to version 11.2 [source] Remove snippet. --- gnu/packages/tls.scm | 15 +++------------ gnu/packages/web.scm | 10 ++-------- 2 files changed, 5 insertions(+), 20 deletions(-)