From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id eFt3Mg7Yj2MtTQAAbAwnHQ (envelope-from ) for ; Wed, 07 Dec 2022 01:02:22 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id CMF9MQ7Yj2NCOQEAG6o9tA (envelope-from ) for ; Wed, 07 Dec 2022 01:02:22 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 599FD18E6B for ; Wed, 7 Dec 2022 01:02:22 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p2hsz-0005sD-O4; Tue, 06 Dec 2022 19:02:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p2hsw-0005rr-S7 for guix-patches@gnu.org; Tue, 06 Dec 2022 19:02:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p2hsw-0006sW-Hv for guix-patches@gnu.org; Tue, 06 Dec 2022 19:02:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p2hsw-0005mJ-2T for guix-patches@gnu.org; Tue, 06 Dec 2022 19:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59867] Update mbedtls-apache to 3.2.1 Resent-From: Gabriel Wicki Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 07 Dec 2022 00:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59867 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 59867@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167037130822203 (code B ref -1); Wed, 07 Dec 2022 00:02:01 +0000 Received: (at submit) by debbugs.gnu.org; 7 Dec 2022 00:01:48 +0000 Received: from localhost ([127.0.0.1]:45933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p2hsi-0005m3-2o for submit@debbugs.gnu.org; Tue, 06 Dec 2022 19:01:48 -0500 Received: from lists.gnu.org ([209.51.188.17]:58046) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p2hse-0005lx-OT for submit@debbugs.gnu.org; Tue, 06 Dec 2022 19:01:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p2hse-0005pu-77 for guix-patches@gnu.org; Tue, 06 Dec 2022 19:01:44 -0500 Received: from chimborazo.ee.ethz.ch ([129.132.2.15]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p2hsb-0006p3-Jr for guix-patches@gnu.org; Tue, 06 Dec 2022 19:01:43 -0500 Received: from silvi (unknown [85.195.207.206]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: gabriel) by chimborazo.ee.ethz.ch (Postfix) with ESMTPSA id 2465B401E0 for ; Wed, 7 Dec 2022 01:01:31 +0100 (CET) From: Gabriel Wicki Date: Wed, 07 Dec 2022 01:01:28 +0100 Message-ID: <87tu28axpj.fsf@erlikon.ch> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=129.132.2.15; envelope-from=gabriel@erlikon.ch; helo=chimborazo.ee.ethz.ch X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1670371342; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=iy1kROfuYErk5+MzTH1gamTpCjfa9YmDu6GZJq8uSvk=; b=e8GlUJH5CXh2tl7PPeeSBJPHlEUoE9pQW+ofUHtz2UV2I9UAxyrroMJFTHKBO7dOgWxMl0 dRTsUTQgxu7r3MjirYP9QM8M18lDQWJEiZba2RtaJ84HG0jopTD5XqDNg8D5J/Qn2dRDyg GxDSNl/pOSwjO9ivqY9JpCORBTihZvY89dtNdIdVz2EcappbgfLICLSFeE4ZqvJgTE99m+ RDlCTBBUgwf3Ji+ljL4IY8wPciAc0Dz0/arelmr+FNi62bYSefzZfJO9+2Kx5N7oOUxKlR SHoOEQN01E59BCXsCQI8oJQtW/zCX5uOt+x0Bz7CZpOja74Zjlg3rip/UInzrQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1670371342; a=rsa-sha256; cv=none; b=j8dgpHmYgKV0vGMERJnCA3kFT2tip7iW7NZ0PrqLBEE9xdWsZSihs110LV/77Jo9k//lFy CPRMDOTDqlAoeiOHVXolKazjKi+6k327JZMqhGXneuYhVab6MkIbSi7UaRMhkuqTPmVNtb B3G7Q6X20HwYj7OqeZg6Q/m6Jo/UEmJysdLh1dwGrB8T2d9ishgXT3hAIvjDFeDYWepmPC tVU31po+NqkZuJWJx0HW0s8jXzSgbIqQZBKH4XtZdrAZicqnT41MWv9PHf75XUxDentCEM RxhSbqPW4dVlNABtAAdWDH0rcFsf38Pl2qLQDH8TZZgciFoQ6mJTFCDKAHa7ow== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -4.47 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 599FD18E6B X-Spam-Score: -4.47 X-Migadu-Scanner: scn0.migadu.com X-TUID: Kw22KHG0zQ0F 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 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(-) 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 =E2=80=98-Wformat-signedness=E2=80=99 still break= s 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 posi= tives. - ;; https://github.com/ARMmbed/mbedtls/commit/2065a8d8af27c6cb1e= 40c9462b5933336dca7434 - (substitute* "CMakeLists.txt" - (("Wformat-truncation=3D2") "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 cop= ies. - (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 --=20 2.38.0