From patchwork Mon Jan 8 19:38:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 58686 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 19DA427BBE2; Mon, 8 Jan 2024 19:39:46 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 924E027BBE2 for ; Mon, 8 Jan 2024 19:39:45 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMvSd-00061d-2l; Mon, 08 Jan 2024 14:38:59 -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 1rMvSb-00060w-0P for guix-patches@gnu.org; Mon, 08 Jan 2024 14:38:57 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rMvSa-0006SV-HM for guix-patches@gnu.org; Mon, 08 Jan 2024 14:38:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMvSg-0003J0-LX for guix-patches@gnu.org; Mon, 08 Jan 2024 14:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68332] [PATCH 1/6] gnu: web: Delete trailing whitespace. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 19:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68332 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68332@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68332-submit@debbugs.gnu.org id=B68332.170474272112622 (code B ref 68332); Mon, 08 Jan 2024 19:39:02 +0000 Received: (at 68332) by debbugs.gnu.org; 8 Jan 2024 19:38:41 +0000 Received: from localhost ([127.0.0.1]:37636 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMvSL-0003HL-5U for submit@debbugs.gnu.org; Mon, 08 Jan 2024 14:38:41 -0500 Received: from wolfsden.cz ([37.205.8.62]:48250) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rMvSH-0003Gv-Fy for 68332@debbugs.gnu.org; Mon, 08 Jan 2024 14:38:39 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 2536224CE90; Mon, 8 Jan 2024 19:38:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1704742709; bh=Vgm2H1TU/ZOKOljC30TpsArLHmY+P4gB+nDlRxq6MME=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=zBFdIOFcOBHAeZEDTiBEqawkXzJYZdmf26y/aAC/hPg6qOtiiXCdLoSVNhTsUiHKj fn+drxDEgbMO55KbovASha/LdkmFoP/w0F+Mq2WjNtAwAO9AxxctLZwDFvrT2LILQy OnMzwO04HY6o4h58Weqk1+zfuLHu8SM21udwO5KlChF/oqy8FWbmuA1pEgXNPgDtIr HyTERqlDLASddtiNgXmDN1ySSH0DWcEvWfdABaEb3itzLYPdVgcoophT8mwqOviSDJ sYiTpkCiSSwbeThHte8ZVdAbfY2hIC/rRJPvPatmR/Sz+2vk70B/P/a39d6rSsH8ot MMonPxjswjO8Gh6P6zSu/MciZQ+3wyyLqfB/luDSD8l8GL/xmy+n77Y/zF65kKY+5L W6n7qXvxZLTmIs0jKwPbIHBGK5fZP9ThQLGGGZMkgtsinQ3Wk7JH2Z/DD8pw0qWGob T1NDMkztb7k59p8swqMEJeNMZUuCZTBD2e2c2BbTYdp3yj+7kC/mNHzY69ZDyiCs+a yuCtLmYEptFn1PJo2Iv7uyKzoBqJlT1ecjm0fGMtlohw/kNcp+Wb7yuEZsCwAcCq6d TDjNpc6HXpbYMnGLJdkPQd5L6D53Iej8U4mkw2hC2fQm7cBCZ49jj/3gZSNo0QvbDr 5Q6V02jRThf3lNzeLsmkAH0w= Received: from localhost (unknown [146.70.134.143]) by wolfsden.cz (Postfix) with ESMTPSA id 6733A24D00C; Mon, 8 Jan 2024 19:38:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1704742708; bh=Vgm2H1TU/ZOKOljC30TpsArLHmY+P4gB+nDlRxq6MME=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=vy8ms5uFQTE6c6WibpGNILWPj8hsianVAG51auJJfC8flBCdAJidbmiki2gnBDRt6 exzCAgkr8yZjA91X40JhOLBHkshiJU6tW8ISJYVW6xpTNrXoOvloF7XX0KfsA9QG37 4RzTndv2j9wQna0uOIw+9gr7wx/OD2uP/LzgFp/YM2glPIykUXob/8mpGt83/FcqOs BmBDV/axoI53oxaLTi+6mgN5NmcSAT3uA7w66czLHTvsAUdpCzeG8RI9AqN/w6lWOi neMfDq2n6tSkQ5tnlNV76W0DDAXZ8LarTAXRmOjEuvnoGR1DN2n2HspAy8mIozm53u tdVuGjBnQJPq14HPMDoh1UffgWWBxUnXenjis4wVy42pI1pONxvo1eBlnex+V1EubC g+iNYg1GaErpiRpNsUmdGEAAwSBYSX4U5vNVcR7zA+yqaf1Qc9ycqPgJDe1ApdcGST z4XzktXbdn9fjyhdnRQUMwDBQEDIalG40Ezy5sS8+/sok+DTcyWK7vfbt84gABX9eS 5YUHzxLjKLAFdkMpsHh5tTaohKFfY1ZNO8y4w4R1JvmtiTXMmAS+ad1+1668824nQk 7CNHvGgSnuSQ8kXfxpINuIbhC6KVONkH0wvau+9GgxklC8NmqmG8QAjvr1og5iITLO iB8GqHc+erQTF4UrKgMo51XM= From: Tomas Volf <~@wolfsden.cz> Date: Mon, 8 Jan 2024 20:38:13 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/web.scm (krona-tools): Delete trailing whitespace. Change-Id: Ide601b011d3e2c3c736bf041571f9ab00b5b5b1d --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 13ae53aa8c..e0f8bf4547 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1481,7 +1481,7 @@ (define-public krona-tools "ImportTaxonomy" "ImportText" "ImportXML")) - (for-each + (for-each (lambda (directory) (copy-recursively directory (string-append perl "/../" directory))) From patchwork Mon Jan 8 19:38:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 58684 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E6E6D27BBE2; Mon, 8 Jan 2024 19:39:29 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 34BC727BBE9 for ; Mon, 8 Jan 2024 19:39:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMvSd-000627-RI; Mon, 08 Jan 2024 14:38:59 -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 1rMvSc-00061I-1m for guix-patches@gnu.org; Mon, 08 Jan 2024 14:38:58 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rMvSb-0006Te-Po for guix-patches@gnu.org; Mon, 08 Jan 2024 14:38:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMvSi-0003JN-2d for guix-patches@gnu.org; Mon, 08 Jan 2024 14:39:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68332] [PATCH 2/6] gnu: Add nghttp3. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 19:39:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68332 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68332@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68332-submit@debbugs.gnu.org id=B68332.170474272612663 (code B ref 68332); Mon, 08 Jan 2024 19:39:04 +0000 Received: (at 68332) by debbugs.gnu.org; 8 Jan 2024 19:38:46 +0000 Received: from localhost ([127.0.0.1]:37642 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMvSP-0003I4-JM for submit@debbugs.gnu.org; Mon, 08 Jan 2024 14:38:46 -0500 Received: from wolfsden.cz ([37.205.8.62]:48262) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rMvSH-0003Gw-Fy for 68332@debbugs.gnu.org; Mon, 08 Jan 2024 14:38:41 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id C827B24BA54; Mon, 8 Jan 2024 19:38:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1704742709; bh=VSOmCyG1gbHUr1HwNkAFoeoQ3UO7tJxMZd7Z4K9GYmE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=QyzwslfbTPqHHZ1S9XFPqgvkRuGLtTeIYryN9/MZb0GxwwllLucEurpEf1W4/pvN1 pruY3l5AzQP37H2SUacazUNS8Btz84KJnYjsEKjFIVC0HdwJ0zCFwohjJ05QrjACGz XctNG+VlBlTNI0mpwyebf/+uWP9MG18OyAC7BcdctAI9zSQkLLTCKkfh+slxj0vvPk XSIcipx6XibOI5TQ8XK3QiiLnvEarxiBlGqSRZ3pdA2NCPnaMTi0N/DPnoYjbLWVbS RXLGY/xrEzERkm/erP7FV947KBnFeg5Pv5RcnMONYqJLHRNkJuU/XyBTCjnipSJzEI tiIgs4r9S7U9hVurTQemoOugsolVbJJLL185dhemuq28WqGCAUetbbiCZ3f5UpZDzH hjIQ6GDFK4zS1PE61EkqvkwgSha+X0VtkpCOs1DljA39Yd/f0agTR8hY3v+ibPJCH0 5Tq+wYIqccXmHgci4I+eFGu2LsaN4139i5XMWd+oqw35TPX9gMBmaOTbNkBPBFXNyq NX1AESnNyEj7uVnkBuYLyP3x5UXUl9gK7w1g3OHZ6xgxrl/Gi+7qDb9dE/GBuTUui9 DBxZFb8rg7i0uQOC5OHS1z97iD5kH3CKRUzuMTTnq0Hx+AErHStVyjJZNmKTO7BkWo luvE2lG2na6/rmUDqjHfy38E= Received: from localhost (unknown [146.70.134.143]) by wolfsden.cz (Postfix) with ESMTPSA id 4394F24C61B; Mon, 8 Jan 2024 19:38:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1704742709; bh=VSOmCyG1gbHUr1HwNkAFoeoQ3UO7tJxMZd7Z4K9GYmE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=QyzwslfbTPqHHZ1S9XFPqgvkRuGLtTeIYryN9/MZb0GxwwllLucEurpEf1W4/pvN1 pruY3l5AzQP37H2SUacazUNS8Btz84KJnYjsEKjFIVC0HdwJ0zCFwohjJ05QrjACGz XctNG+VlBlTNI0mpwyebf/+uWP9MG18OyAC7BcdctAI9zSQkLLTCKkfh+slxj0vvPk XSIcipx6XibOI5TQ8XK3QiiLnvEarxiBlGqSRZ3pdA2NCPnaMTi0N/DPnoYjbLWVbS RXLGY/xrEzERkm/erP7FV947KBnFeg5Pv5RcnMONYqJLHRNkJuU/XyBTCjnipSJzEI tiIgs4r9S7U9hVurTQemoOugsolVbJJLL185dhemuq28WqGCAUetbbiCZ3f5UpZDzH hjIQ6GDFK4zS1PE61EkqvkwgSha+X0VtkpCOs1DljA39Yd/f0agTR8hY3v+ibPJCH0 5Tq+wYIqccXmHgci4I+eFGu2LsaN4139i5XMWd+oqw35TPX9gMBmaOTbNkBPBFXNyq NX1AESnNyEj7uVnkBuYLyP3x5UXUl9gK7w1g3OHZ6xgxrl/Gi+7qDb9dE/GBuTUui9 DBxZFb8rg7i0uQOC5OHS1z97iD5kH3CKRUzuMTTnq0Hx+AErHStVyjJZNmKTO7BkWo luvE2lG2na6/rmUDqjHfy38E= From: Tomas Volf <~@wolfsden.cz> Date: Mon, 8 Jan 2024 20:38:14 +0100 Message-ID: <9dda8133cace802ec620c95dd0ae741fc0bebe30.1704741394.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/web.scm (nghttp3): New variable. Change-Id: I4ed318506f6d3bdd0c47a367b1dcc1b4454c09b2 --- gnu/packages/web.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index e0f8bf4547..3c7ff49fb9 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -65,6 +65,7 @@ ;;; Copyright © 2023 Christopher Howard ;;; Copyright © 2023 Felix Lechner ;;; Copyright © 2023 Evgeny Pisemsky +;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz> ;;; ;;; This file is part of GNU Guix. ;;; @@ -8137,6 +8138,41 @@ (define-public nghttp2-for-node (("print \\(ver >= '3\\.8'\\)") "print (tuple(map(int, ver.split('.'))) >= (3,8))"))))))))))) +(define-public nghttp3 + (package + (name "nghttp3") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/ngtcp2/nghttp3/" + "releases/download/v" version "/" + "nghttp3-" version ".tar.gz")) + (sha256 + (base32 + "1fzvadnwb03jlm180313gg5m4fg09qdcc67fwcfrv9zs22anaa55")))) + (build-system gnu-build-system) + (native-inputs + (list pkg-config + ;; Required by tests. + cunit)) + (arguments + (list + #:configure-flags + #~(list "--enable-lib-only"))) + (home-page "https://nghttp2.org/nghttp3/") + (synopsis "HTTP/3 protocol library") + (description + "nghttp3 is an implementation of RFC 9114 HTTP/3 mapping over QUIC and +RFC 9204 QPACK in C. It does not depend on any particular QUIC transport +implementation. + +It implements extensions specified in RFC 9218 and RFC 9220. It supports +SETTINGS_H3_DATAGRAM from RFC 9297. + +It does not support server push.") + (license license:expat))) + (define-public hpcguix-web (package (name "hpcguix-web") From patchwork Mon Jan 8 19:38:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 58682 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0739827BBE9; Mon, 8 Jan 2024 19:39:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EABD727BBE2 for ; Mon, 8 Jan 2024 19:39:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMvSb-00061C-Oa; Mon, 08 Jan 2024 14:38:57 -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 1rMvSa-00060n-DP for guix-patches@gnu.org; Mon, 08 Jan 2024 14:38:56 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rMvSa-0006SH-5H for guix-patches@gnu.org; Mon, 08 Jan 2024 14:38:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMvSg-0003Ir-7Z for guix-patches@gnu.org; Mon, 08 Jan 2024 14:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68332] [PATCH 3/6] gnu: ngtcp2: Update to 1.1.0. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 19:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68332 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68332@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68332-submit@debbugs.gnu.org id=B68332.170474272112610 (code B ref 68332); Mon, 08 Jan 2024 19:39:02 +0000 Received: (at 68332) by debbugs.gnu.org; 8 Jan 2024 19:38:41 +0000 Received: from localhost ([127.0.0.1]:37634 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMvSK-0003HJ-MP for submit@debbugs.gnu.org; Mon, 08 Jan 2024 14:38:41 -0500 Received: from wolfsden.cz ([37.205.8.62]:48268) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rMvSH-0003Gy-G3 for 68332@debbugs.gnu.org; Mon, 08 Jan 2024 14:38:39 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 799B524B4F1; Mon, 8 Jan 2024 19:38:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1704742710; bh=2gxTvkoMTxdfNz3OgkRnrKOGus9+h4w7JK8V/1FMy1A=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=VKstKpRDmZT4wl0ZlGN/ikdzCIW1fHkQGE3vrfHTzUA9l6jmoHxoZYqNmJ66oE9/q XTiNe4wK4GKlyMNT0QiVhCWGISOM5zVCUN8hTgUAPuMNKYy7HsIsJsXYxWvLf3jPNc m4aefz1BxTusCHM2+nBQFORX3iI+MEzUFUyrQGud+hD4Ok2YkjsPEXnCvbmIzsltZ5 C25GvK6vG2SdysLkVZ938IDP5RStp9FlOAp9EXaNBrhbwzCHPMcSjhLf3no24aglFl OkpwqZHr7OemDpX43O9iL5af2Mrb/qplahbzlW4V0hIMYKO5s91pn5Z8dP0HExNc81 OgtMNQ149d4su56tOAq+HjtkrDqWd0qyFhULrKx5AsbrMJjyEyfp5ukhuJCfXA+x+O GatZqfhhm3PjOLDOeiYVOwR/D/XczZA6oSOkgUC2vt5rS4XnPcosLR/mUIHajgLgzC J7LA8nMjnYZKdwG6IFqGSFNhaAhyBjGn4XPjJQSvbO5XIqI/i9Rik5OtKkmcK5+z4g W28/QmxvY5JL1R9v6haTB/Ddz2JEbjo3EmOZtnqZPnEYAlqC5D3uu7Us1Dn1mcNSpQ nCFIydyzaLLpohTRGFY1NA6Q0Gdh3OdquOpUVnWk0Ldvppp2TSJDdtm4UG7PXoBTL3 Ij+1Ebdd3gsgj3bPSvhGniDg= Received: from localhost (unknown [146.70.134.143]) by wolfsden.cz (Postfix) with ESMTPSA id 21AA524B954; Mon, 8 Jan 2024 19:38:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1704742710; bh=2gxTvkoMTxdfNz3OgkRnrKOGus9+h4w7JK8V/1FMy1A=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=VKstKpRDmZT4wl0ZlGN/ikdzCIW1fHkQGE3vrfHTzUA9l6jmoHxoZYqNmJ66oE9/q XTiNe4wK4GKlyMNT0QiVhCWGISOM5zVCUN8hTgUAPuMNKYy7HsIsJsXYxWvLf3jPNc m4aefz1BxTusCHM2+nBQFORX3iI+MEzUFUyrQGud+hD4Ok2YkjsPEXnCvbmIzsltZ5 C25GvK6vG2SdysLkVZ938IDP5RStp9FlOAp9EXaNBrhbwzCHPMcSjhLf3no24aglFl OkpwqZHr7OemDpX43O9iL5af2Mrb/qplahbzlW4V0hIMYKO5s91pn5Z8dP0HExNc81 OgtMNQ149d4su56tOAq+HjtkrDqWd0qyFhULrKx5AsbrMJjyEyfp5ukhuJCfXA+x+O GatZqfhhm3PjOLDOeiYVOwR/D/XczZA6oSOkgUC2vt5rS4XnPcosLR/mUIHajgLgzC J7LA8nMjnYZKdwG6IFqGSFNhaAhyBjGn4XPjJQSvbO5XIqI/i9Rik5OtKkmcK5+z4g W28/QmxvY5JL1R9v6haTB/Ddz2JEbjo3EmOZtnqZPnEYAlqC5D3uu7Us1Dn1mcNSpQ nCFIydyzaLLpohTRGFY1NA6Q0Gdh3OdquOpUVnWk0Ldvppp2TSJDdtm4UG7PXoBTL3 Ij+1Ebdd3gsgj3bPSvhGniDg= From: Tomas Volf <~@wolfsden.cz> Date: Mon, 8 Jan 2024 20:38:15 +0100 Message-ID: <506698982472307161dddbb3c3c587bbc3cad57d.1704741394.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/networking.scm (ngtcp2): Update to 1.1.0. Change-Id: I7f6b08952ba508207c8dedbd68c7c48dd17dd0ff --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 9844430656..c738716792 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4385,7 +4385,7 @@ (define-public nbd (define-public ngtcp2 (package (name "ngtcp2") - (version "1.0.1") + (version "1.1.0") (source (origin (method url-fetch) @@ -4393,7 +4393,7 @@ (define-public ngtcp2 "releases/download/v" version "/" "ngtcp2-" version ".tar.xz")) (sha256 - (base32 "0l84hnj9n4bfxjizgmqsqbz71jx7m00a7l1z43fg5ls3apx9ij11")))) + (base32 "1pppl6s25hz91w6321g1q7dqvfy4vccz9mmc5r8sfdvdc95fngl0")))) (build-system gnu-build-system) (native-inputs (list cunit)) (home-page "https://nghttp2.org/ngtcp2/") From patchwork Mon Jan 8 19:38:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 58683 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8267327BBEA; Mon, 8 Jan 2024 19:39:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 28C8327BBE2 for ; Mon, 8 Jan 2024 19:39:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMvSg-00063F-2p; Mon, 08 Jan 2024 14:39:02 -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 1rMvSc-00061V-Id for guix-patches@gnu.org; Mon, 08 Jan 2024 14:38:58 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rMvSc-0006U1-AA for guix-patches@gnu.org; Mon, 08 Jan 2024 14:38:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMvSi-0003JX-JU for guix-patches@gnu.org; Mon, 08 Jan 2024 14:39:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68332] [PATCH 4/6] gnu: ngtcp2: Build libngtcp2_crypto_gnutls. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 19:39:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68332 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68332@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68332-submit@debbugs.gnu.org id=B68332.170474272612669 (code B ref 68332); Mon, 08 Jan 2024 19:39:04 +0000 Received: (at 68332) by debbugs.gnu.org; 8 Jan 2024 19:38:46 +0000 Received: from localhost ([127.0.0.1]:37644 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMvSQ-0003ID-3D for submit@debbugs.gnu.org; Mon, 08 Jan 2024 14:38:46 -0500 Received: from wolfsden.cz ([37.205.8.62]:50566) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rMvSI-0003H0-8W for 68332@debbugs.gnu.org; Mon, 08 Jan 2024 14:38:42 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 3A10E24CC38; Mon, 8 Jan 2024 19:38:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1704742711; bh=+yz9r40NnElC2AAwfiMCKPQSCPzQyxYLwn6vYXQQG4A=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OgmWglagBO57URwW0UWgR63JtBP3myY8XhxxHMvcRgNmTH5GVpS/aDHEH4kiuzmMu dhgrEHhJWk03NB2iuOpedlFg0DIpGn0sMervG533MIP5Lxf82AiMJP9bA/YRUYQLrV FHAvcaeCcDj0dwpm+2BV5OI68S5d3nS5bbYHDfBoM+Uo2u2NBx6QLb7q/qssT7ifB3 wXUV2RWvVQky0QmWgpn7KTf/VQDyx0Nt/HspKGfpcFh0w7Or/fpECB467fyY4RfgxT kJOd/KUw9bYmpONHC5gFJEV5j8re6z9ooElQloMkHk1mYuZxtsvW5o/PjYdts1RFEf RpGTFLdjYbf9n1E0A1IYgBkVQaF+VNZJ8EfoRkSh5pgWoOLykRuVCI+mIyE83F6tII iJy0v0NaCs5ERY0/Jd9ZzZ15QgwVcm43M16e6XvF31I12VXVka9YwUlUy2ZBi/irF/ 0ZMWBDxyF4LAlrhn9hsgKT9JqF6ysG0fhCNvSrQIVNMA39i5VOLfmZz9F70NSVoIid 6ckY/vw36Gk+J49SbiIAJmQ+4EUs2/vvkpXdqT3dMlRCvNL42A7bSoiwiUrrTv1gvT 3vD4SRrkUa0pyoaJjKc2plRkuPYVez5q543nTthFkNy5q8O1YR6Oj/CNuAonK3a/6j skAwzEGBlH7b+3E1VOTHUoc8= Received: from localhost (unknown [146.70.134.143]) by wolfsden.cz (Postfix) with ESMTPSA id DCEB024B4F2; Mon, 8 Jan 2024 19:38:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1704742711; bh=+yz9r40NnElC2AAwfiMCKPQSCPzQyxYLwn6vYXQQG4A=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OgmWglagBO57URwW0UWgR63JtBP3myY8XhxxHMvcRgNmTH5GVpS/aDHEH4kiuzmMu dhgrEHhJWk03NB2iuOpedlFg0DIpGn0sMervG533MIP5Lxf82AiMJP9bA/YRUYQLrV FHAvcaeCcDj0dwpm+2BV5OI68S5d3nS5bbYHDfBoM+Uo2u2NBx6QLb7q/qssT7ifB3 wXUV2RWvVQky0QmWgpn7KTf/VQDyx0Nt/HspKGfpcFh0w7Or/fpECB467fyY4RfgxT kJOd/KUw9bYmpONHC5gFJEV5j8re6z9ooElQloMkHk1mYuZxtsvW5o/PjYdts1RFEf RpGTFLdjYbf9n1E0A1IYgBkVQaF+VNZJ8EfoRkSh5pgWoOLykRuVCI+mIyE83F6tII iJy0v0NaCs5ERY0/Jd9ZzZ15QgwVcm43M16e6XvF31I12VXVka9YwUlUy2ZBi/irF/ 0ZMWBDxyF4LAlrhn9hsgKT9JqF6ysG0fhCNvSrQIVNMA39i5VOLfmZz9F70NSVoIid 6ckY/vw36Gk+J49SbiIAJmQ+4EUs2/vvkpXdqT3dMlRCvNL42A7bSoiwiUrrTv1gvT 3vD4SRrkUa0pyoaJjKc2plRkuPYVez5q543nTthFkNy5q8O1YR6Oj/CNuAonK3a/6j skAwzEGBlH7b+3E1VOTHUoc8= From: Tomas Volf <~@wolfsden.cz> Date: Mon, 8 Jan 2024 20:38:16 +0100 Message-ID: <84ab70db28e7aa5c9a90f14f489971a19601eaac.1704741394.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/networking.scm (ngtcp2)[arguments]<#:configure-flags>: Add --with-gnutls. [native-inputs]: Add pkg-config. [inputs]: Add gnutls. Change-Id: Id3a9210992d203a57a9b791f3c3752f2ebd3e634 --- gnu/packages/networking.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index c738716792..40155480c9 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -61,6 +61,7 @@ ;;; Copyright © 2023 Yovan Naumovski ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Artyom V. Poptsov +;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz> ;;; ;;; This file is part of GNU Guix. ;;; @@ -4395,7 +4396,13 @@ (define-public ngtcp2 (sha256 (base32 "1pppl6s25hz91w6321g1q7dqvfy4vccz9mmc5r8sfdvdc95fngl0")))) (build-system gnu-build-system) - (native-inputs (list cunit)) + (arguments + (list + #:configure-flags + ;; openssl package does not support QUIC interface, so just gnutls + #~(list "--with-gnutls"))) + (native-inputs (list cunit pkg-config)) + (inputs (list gnutls)) (home-page "https://nghttp2.org/ngtcp2/") (synopsis "QUIC protocol implementation") (description From patchwork Mon Jan 8 19:38:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 58687 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5ABD727BBEA; Mon, 8 Jan 2024 19:39:51 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2DA0427BBE2 for ; Mon, 8 Jan 2024 19:39:50 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMvSd-00061j-7H; Mon, 08 Jan 2024 14:38:59 -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 1rMvSb-00061D-Rt for guix-patches@gnu.org; Mon, 08 Jan 2024 14:38:57 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rMvSb-0006TJ-Fx for guix-patches@gnu.org; Mon, 08 Jan 2024 14:38:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMvSh-0003JG-Iz for guix-patches@gnu.org; Mon, 08 Jan 2024 14:39:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68332] [PATCH 5/6] gnu: Add curl-full. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 19:39:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68332 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68332@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68332-submit@debbugs.gnu.org id=B68332.170474272512655 (code B ref 68332); Mon, 08 Jan 2024 19:39:03 +0000 Received: (at 68332) by debbugs.gnu.org; 8 Jan 2024 19:38:45 +0000 Received: from localhost ([127.0.0.1]:37640 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMvSO-0003Hx-Ru for submit@debbugs.gnu.org; Mon, 08 Jan 2024 14:38:45 -0500 Received: from wolfsden.cz ([37.205.8.62]:50580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rMvSJ-0003H2-CU for 68332@debbugs.gnu.org; Mon, 08 Jan 2024 14:38:41 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 6039B24C524; Mon, 8 Jan 2024 19:38:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1704742712; bh=4V3eU1JfhR0guQh9KnJaPspoTy9H1jTFvfymhxtq3og=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=mbociWeRi3cUTz/VJySsZ3RFIWpF9kgTKfBCUauPFGBxhraVhHXAutZkbIN/zYKSo BTVXx3V6dU6nUj3mmjPZYxmxj4DDHvIsMr1DbM7E49Jz82vMxh7SDOVhlcE3Ow2rpv tEb0BLlCrBgPPN0xTAULxX9q5Sp5iLbybKeaW+a1NNB4VvPwgnZmpTsJM9bqtzeIvH 5VZGVL3nNO0/KIHzq1b57HfIeMw3A66E1cCBI54pY5/QNPnhZj+ZtocXKIXNcd9854 fTSlsbrsnVarH/P3cUadLkq7MepA/HfAlwbYbxoAD3L7v9zTuByZ7kQ3bsCPOWsnsG lqmue4nYeR+pJuLq8QJjcs3O5c7qpT8iQfkkYLYQyQFyZmBBKy+94iQcO7Tvpiqa8h l1qR5ld82GTzzpxJ8WmDPWBZ8i27FBWRoc4TnGvjrTJqPQMvbuWby8ClueIBRca3jx husVlmiMnSIhFPcC/6J13xZs+SmuF5Na2teczShpMfQn+tDgjaXaDJ+EmcL6sKqraF LmJmfLKX/L/jh1eWi/7m/heySZJgrEMWLjfrorQcVtJPj4LKsoBxAwNkwZ8lhKq2sI 8yvlV9waA2WuqcxFj2VLcVE52VfDQqN8NsWPHsr8t+aNoSEqN+iqSvmwHF/MNutZoP Xy4QaCBxBNHgYHiea5yxw/ps= Received: from localhost (unknown [146.70.134.143]) by wolfsden.cz (Postfix) with ESMTPSA id B6CEE24CE9A; Mon, 8 Jan 2024 19:38:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1704742711; bh=4V3eU1JfhR0guQh9KnJaPspoTy9H1jTFvfymhxtq3og=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fHLRK2oB6owEJZILPlZKbmMQv9E3RqlVljowiFtd/RGKQ9H2IDVs5jPyP8q92f+5X JA/Whwdb0BjpTPkz+17fJPDF3rM2gEx9NS95iDcTlYeDFdVdPw9IIbU22Qr5FjBgrB SrlK4NnUN+yxUgOC4Xxgtxb7fqdH+lYxPgmYDF4dJKYbmDZXQ6syNI7se0hb97LOX8 f39+RnHWwR3qd4/IhqzQkTP1ocVY0/Br3pqU2286FWLzCDqbsuxx/gy0JuKV17PYZq /tyUr2PFrN64/5IPSRMvcWFqD/bD1IRqRwOHqUprJbEZfOQIunw6ptb6Y0+uCgl/M7 f7yxHCvc8WY7W3Rc/TBQUSRRZdhenhAh2QIeVS7hfSJLS0d2NxnmMVykVpETozb8zd 0oIrLctu5CA19XvaVM3jvDSOQaq3HjBVUorNAzj/pthpcnxe/TywNl0rBJCcQe1w+h wfeuTnkqVAtXnc5tIHTKGiUfGz6hR3KMxx0E8eEXMevvMDPcLLtPHH4JUwrxwcMNpf wTiQJGZsPBdQaU4YewM0E6o+ulGo/r9JP06olu0Fg/U+udUMwVaTiC97mYfeXikxnt kmiArBgfc+X4LqHM4lsLFHc9puFstUK8Si2/27j3+zKVCxNyIDNer98xZ3zHNBkUh+ K/dsV1/yeo8O3QdlCe3ejjDQ= From: Tomas Volf <~@wolfsden.cz> Date: Mon, 8 Jan 2024 20:38:17 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches New variable providing curl compiled with all available features is added. * gnu/packages/curl.scm (curl-full): New variable. * gnu/packages/patches/curl-8.5-use-ssl-cert-env.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Change-Id: Ic3c9b2b9bd0a81d6840dcdccd21d52a9d0b311e2 --- gnu/local.mk | 1 + gnu/packages/curl.scm | 69 ++++++++++++++++ .../patches/curl-8.5-use-ssl-cert-env.patch | 79 +++++++++++++++++++ 3 files changed, 149 insertions(+) create mode 100644 gnu/packages/patches/curl-8.5-use-ssl-cert-env.patch diff --git a/gnu/local.mk b/gnu/local.mk index f804f4ef5b..73eab7cf93 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1060,6 +1060,7 @@ dist_patch_DATA = \ %D%/packages/patches/clucene-contribs-lib.patch \ %D%/packages/patches/cube-nocheck.patch \ %D%/packages/patches/curl-use-ssl-cert-env.patch \ + %D%/packages/patches/curl-8.5-use-ssl-cert-env.patch \ %D%/packages/patches/curlftpfs-fix-error-closing-file.patch \ %D%/packages/patches/curlftpfs-fix-file-names.patch \ %D%/packages/patches/curlftpfs-fix-memory-leak.patch \ diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index b33f4d36d4..0f0336cb6a 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2021 Felix Gruber ;;; Copyright © 2023 Sharlatan Hellseher ;;; Copyright © 2023 John Kehayias +;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz> ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,14 +47,19 @@ (define-module (gnu packages curl) #:use-module (guix build-system meson) #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE)) #:use-module (gnu packages) + #:use-module (gnu packages certs) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages golang) + #:use-module (gnu packages gsasl) + #:use-module (gnu packages groff) #:use-module (gnu packages guile) #:use-module (gnu packages kerberos) #:use-module (gnu packages logging) #:use-module (gnu packages libevent) #:use-module (gnu packages libidn) + #:use-module (gnu packages openldap) + #:use-module (gnu packages networking) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -169,6 +175,69 @@ (define-public curl "See COPYING in the distribution.")) (home-page "https://curl.haxx.se/"))) +(define-public curl-full + (package/inherit curl + (name "curl-full") + (version "8.5.0") + (source (origin + (method url-fetch) + (uri (string-append "https://curl.se/download/curl-" + version ".tar.gz")) + (sha256 + (base32 + "1pas8z1vijp08za5xgh2vvsajwi1p2208vlhl0vs94xp4pzigz05")) + (patches (search-patches "curl-8.5-use-ssl-cert-env.patch")))) + (arguments + (substitute-keyword-arguments (package-arguments curl) + ((#:configure-flags flags) + #~(cons* "--enable-manual" + ;; Not yet available: https://github.com/curl/curl/pull/11922 + ;; "--enable-ech" + "--enable-websockets" + "--with-brotli" + "--with-ldap" + "--with-ldaps" + "--with-librtmp" + "--with-libssh2" + "--with-nghttp3" + "--with-ngtcp2" + "--with-zstd" + #$flags)) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'unpack 'skip-tests + (lambda _ + (let ((port (open-file "tests/data/DISABLED" "a"))) + ;; I do not understand why curl package ignores this test + ;; just on some architectures. I had it fail even on amd64, + ;; it is just too flaky. + (display "1474\n" port) + ;; Required files are missing, should be fixed in >8.5.0: + ;; https://github.com/curl/curl/issues/12462 + (display "1477\n" port) + (close port)))))))) + (propagated-inputs + (list nss-certs)) + (native-inputs + (modify-inputs (package-native-inputs curl) + (prepend groff))) + (inputs + (modify-inputs (package-inputs curl) + (prepend brotli + gsasl + libpsl + libssh2 + nghttp3 + ngtcp2 + openldap + rtmpdump + `(,zstd "lib")))) + (description (string-append (package-description curl) + "\n\n" + "Compared to the regular curl package, this +one enables everything that can be enabled, bringing in additional features +and security.")))) + (define-public curl-ssh (package/inherit curl (arguments diff --git a/gnu/packages/patches/curl-8.5-use-ssl-cert-env.patch b/gnu/packages/patches/curl-8.5-use-ssl-cert-env.patch new file mode 100644 index 0000000000..70f703a999 --- /dev/null +++ b/gnu/packages/patches/curl-8.5-use-ssl-cert-env.patch @@ -0,0 +1,79 @@ +From 0a942e9f2f5255793e99408ca3da0940d52dfdad Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jakub=20K=C4=85dzio=C5=82ka?= +Date: Mon, 8 Jan 2024 15:07:38 +0100 +Subject: [PATCH] libcurl: Respect SSL_CERT_DIR and SSL_CERT_FILE. + +Make libcurl respect the SSL_CERT_{DIR,FILE} variables by default. The variables +are fetched during initialization to preserve thread-safety (curl_global_init(3) +must be called when no other threads exist). + +This fixes network functionality in rust:cargo, and probably removes the need +for other future workarounds. +--- + lib/easy.c | 9 +++++++++ + lib/url.c | 15 +++++++++++++++ + 2 files changed, 24 insertions(+) + +diff --git a/lib/easy.c b/lib/easy.c +index 322d1a41b..2a235a19c 100644 +--- a/lib/easy.c ++++ b/lib/easy.c +@@ -137,6 +137,9 @@ curl_wcsdup_callback Curl_cwcsdup = Curl_wcsdup; + static char *leakpointer; + #endif + ++char * Curl_ssl_cert_dir = NULL; ++char * Curl_ssl_cert_file = NULL; ++ + /** + * curl_global_init() globally initializes curl given a bitwise set of the + * different features of what to initialize. +@@ -163,6 +166,9 @@ static CURLcode global_init(long flags, bool memoryfuncs) + goto fail; + } + ++ Curl_ssl_cert_dir = curl_getenv("SSL_CERT_DIR"); ++ Curl_ssl_cert_file = curl_getenv("SSL_CERT_FILE"); ++ + if(!Curl_ssl_init()) { + DEBUGF(fprintf(stderr, "Error: Curl_ssl_init failed\n")); + goto fail; +@@ -287,6 +293,9 @@ void curl_global_cleanup(void) + Curl_ssl_cleanup(); + Curl_resolver_global_cleanup(); + ++ free(Curl_ssl_cert_dir); ++ free(Curl_ssl_cert_file); ++ + #ifdef _WIN32 + Curl_win32_cleanup(easy_init_flags); + #endif +diff --git a/lib/url.c b/lib/url.c +index b81785fe2..d607e74bb 100644 +--- a/lib/url.c ++++ b/lib/url.c +@@ -454,6 +454,21 @@ CURLcode Curl_init_userdefined(struct Curl_easy *data) + if(result) + return result; + #endif ++ extern char * Curl_ssl_cert_dir; ++ extern char * Curl_ssl_cert_file; ++ if(Curl_ssl_cert_dir) { ++ if(result = Curl_setstropt(&set->str[STRING_SSL_CAPATH], Curl_ssl_cert_dir)) ++ return result; ++ if(result = Curl_setstropt(&set->str[STRING_SSL_CAPATH_PROXY], Curl_ssl_cert_dir)) ++ return result; ++ } ++ ++ if(Curl_ssl_cert_file) { ++ if(result = Curl_setstropt(&set->str[STRING_SSL_CAFILE], Curl_ssl_cert_file)) ++ return result; ++ if(result = Curl_setstropt(&set->str[STRING_SSL_CAFILE_PROXY], Curl_ssl_cert_file)) ++ return result; ++ } + } + + #ifndef CURL_DISABLE_FTP +-- +2.41.0 + From patchwork Mon Jan 8 19:38:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 58685 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C1D8C27BBE2; Mon, 8 Jan 2024 19:39:38 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3445027BBE9 for ; Mon, 8 Jan 2024 19:39:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMvSd-00061l-Cf; Mon, 08 Jan 2024 14:38:59 -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 1rMvSb-00060y-5u for guix-patches@gnu.org; Mon, 08 Jan 2024 14:38:57 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rMvSa-0006Sq-T0 for guix-patches@gnu.org; Mon, 08 Jan 2024 14:38:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMvSh-0003J8-34 for guix-patches@gnu.org; Mon, 08 Jan 2024 14:39:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68332] [PATCH 6/6] gnu: curl-full: Update homepage. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 19:39:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68332 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68332@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68332-submit@debbugs.gnu.org id=B68332.170474272512648 (code B ref 68332); Mon, 08 Jan 2024 19:39:03 +0000 Received: (at 68332) by debbugs.gnu.org; 8 Jan 2024 19:38:45 +0000 Received: from localhost ([127.0.0.1]:37638 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMvSO-0003Hu-FL for submit@debbugs.gnu.org; Mon, 08 Jan 2024 14:38:44 -0500 Received: from wolfsden.cz ([37.205.8.62]:50590) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rMvSK-0003HG-2P for 68332@debbugs.gnu.org; Mon, 08 Jan 2024 14:38:41 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id CC56E24CE9C; Mon, 8 Jan 2024 19:38:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1704742712; bh=TJy5uuE45JYdilvsGX7QQBuhb+OyQZ3xNaLvre+2Irw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=qsiVvXZBdteOLjZZQ2GSkAT6vaeDnMDdKP2y21EwkWXmNLC6BM7WOR4ghUhCPrxRb yTcZV8Zwatczqz9juXQCHEkW4iEBPdgD5rGER6L2Rz51a+7Bf0LyXvEgEkenKPAKlN axBeE2FwuRlYJClRrsznsMgy0PPTjmK10rYveK5WfpW8c4rejEC7AfB9yiMaJ/WDkP BklnTMAnE9C1RTU3Lz8FVm9ZiBV43hECD1rgsAxzuj7hpz9/0ORDaSVg9pxIDdfqiv LYNJnwVUT+oDeOaWITMMM8lekP1k4R57K20s0ioOIiqSI8d9aNW74DbMnTaoVEglEX t9vnoPGNjuSAusCLvrwsPdNbQhGS80b77hoKG59GbjySvPBPpTLcLtGz+CanM6RkHL IwoiFWqG0lBbX0An0cX5IZFgwWQD/wDCkxir++PxO9yx24SNmUks7JlwVAvohfqjtf yLuwt9wmY5ijZM/LyzatYtuekHwdkKljO/ocphndMVquHd9OR/myntYaXJ4Hvu83a7 OR0Wvxf7Meto9Q3K88rDpFVMwMRNqc65xoKhIhM0dt4Wx8iQWRZ0fP13sOHmZO1vJQ QnyF1nI8TKFBQH8i+W8GZWE6gnycSXPCqNKuNRm6ApVTdOuMI1YAYY+Ievx2e16MrW 15eE/b2QtfpALoe44QhA9jW0= Received: from localhost (unknown [146.70.134.143]) by wolfsden.cz (Postfix) with ESMTPSA id 7E78D24B9DC; Mon, 8 Jan 2024 19:38:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1704742712; bh=TJy5uuE45JYdilvsGX7QQBuhb+OyQZ3xNaLvre+2Irw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=qsiVvXZBdteOLjZZQ2GSkAT6vaeDnMDdKP2y21EwkWXmNLC6BM7WOR4ghUhCPrxRb yTcZV8Zwatczqz9juXQCHEkW4iEBPdgD5rGER6L2Rz51a+7Bf0LyXvEgEkenKPAKlN axBeE2FwuRlYJClRrsznsMgy0PPTjmK10rYveK5WfpW8c4rejEC7AfB9yiMaJ/WDkP BklnTMAnE9C1RTU3Lz8FVm9ZiBV43hECD1rgsAxzuj7hpz9/0ORDaSVg9pxIDdfqiv LYNJnwVUT+oDeOaWITMMM8lekP1k4R57K20s0ioOIiqSI8d9aNW74DbMnTaoVEglEX t9vnoPGNjuSAusCLvrwsPdNbQhGS80b77hoKG59GbjySvPBPpTLcLtGz+CanM6RkHL IwoiFWqG0lBbX0An0cX5IZFgwWQD/wDCkxir++PxO9yx24SNmUks7JlwVAvohfqjtf yLuwt9wmY5ijZM/LyzatYtuekHwdkKljO/ocphndMVquHd9OR/myntYaXJ4Hvu83a7 OR0Wvxf7Meto9Q3K88rDpFVMwMRNqc65xoKhIhM0dt4Wx8iQWRZ0fP13sOHmZO1vJQ QnyF1nI8TKFBQH8i+W8GZWE6gnycSXPCqNKuNRm6ApVTdOuMI1YAYY+Ievx2e16MrW 15eE/b2QtfpALoe44QhA9jW0= From: Tomas Volf <~@wolfsden.cz> Date: Mon, 8 Jan 2024 20:38:18 +0100 Message-ID: <462759b14e3365bcb388d8792ab854776fe3bf16.1704741394.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Resolves following lint warning: permanent redirect from https://curl.haxx.se/ to https://curl.se/ * gnu/packages/curl.scm (curl-full)[homepage]: Update. Change-Id: I88c899c0a79b80e1ce86add8227c43c12d8b00ce --- gnu/packages/curl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 0f0336cb6a..f233eeca7a 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -173,7 +173,7 @@ (define-public curl tunneling, and so on.") (license (license:non-copyleft "file://COPYING" "See COPYING in the distribution.")) - (home-page "https://curl.haxx.se/"))) + (home-page "https://curl.se/"))) (define-public curl-full (package/inherit curl