From patchwork Wed Jun 18 11:54:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Homo X-Patchwork-Id: 43107 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 841A827BC4B; Wed, 18 Jun 2025 12:56:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 034D727BC4A for ; Wed, 18 Jun 2025 12:56:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRrOk-0006CC-Q8; Wed, 18 Jun 2025 07:56:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uRrOf-00069I-7J for guix-patches@gnu.org; Wed, 18 Jun 2025 07:56:06 -0400 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 1uRrOe-0003kE-M1 for guix-patches@gnu.org; Wed, 18 Jun 2025 07:56:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=RbwCA8/3xM89iLmKkyvwDWO1cktry9DIdIn/WRKC1vU=; b=drM48Ojwv0Rs/3fR2gaTqBR00P8ERMlVrILeew7M1YUkAv+/diHRacbGwV1R2vPTwfk1Z/VeUTbVnM8Aci28WR+8+s9j98eVPbF1FI8ZHmD50r3B/fM5AWxVT6zGzmACRr0XsOAXgjg+G2bI9lVWgx5MFnZC3wxyNsDMpg6U6D5MZbJ7n9xhzoeBmdEw8MsjHIOkLZG5I92HQftf1YN/fLAjioP94OxqBB+46hjUQGlNMA26P0ZTXjUIVsmnxLeqc6HXS0ApB92DU/YTjI7QIvnNoYtHHmbj6L4T2QVTyGGED1KqixnArkmdg+2CjXemCZlm7XL7+LYF/JahSZQydw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uRrOe-0006YN-Er for guix-patches@gnu.org; Wed, 18 Jun 2025 07:56:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH v3 4/8] gnu: opendht: Update to 3.4.0. Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Jun 2025 11:56:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78790 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78790@debbugs.gnu.org Cc: Homo Received: via spool by 78790-submit@debbugs.gnu.org id=B78790.175024774325059 (code B ref 78790); Wed, 18 Jun 2025 11:56:04 +0000 Received: (at 78790) by debbugs.gnu.org; 18 Jun 2025 11:55:43 +0000 Received: from localhost ([127.0.0.1]:48123 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uRrOH-0006Vs-Vl for submit@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:42 -0400 Received: from layka.disroot.org ([178.21.23.139]:46502) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uRrO5-0006TK-CB for 78790@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:31 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 7830F25F0C; Wed, 18 Jun 2025 13:55:28 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id nMi7vO3gaWQj; Wed, 18 Jun 2025 13:55:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750247727; bh=KoQe9XZnpMp2KmyCmSQead5AvcHxfgLxKdXbT8vUaNo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NK0Qc7uQVWWXPJi6485KuQbAnGVeCBxLpK8Aw4/MLqPgLtUVobDqTlpdpLkFWJ8lI HXK1RvfkzP5sm+hQrkhURKqN1AdH2e3WWZrsIq7OjYSJ1mImWLuKl8oHxhqSY4VmDE NnQLcCRItA4mn63eIvGQTcoYMRgE1f9zpN+1bfdE2lnW0vY3NcptLqKwp5wspwJwTS PrEPdRHHuTy6uReIgYidUFuNG7Y5AMK0VDgSOU6QedtaP+M3EnobhT3Gwf1dg4zZgS PJehdXEGW/zxZhKGYzdhSXU84/aAh7HZBEoL29OQbv3ZimoVgnf2EJjJ5F9dS5MQ43 ts2mSenAQ7oWA== Date: Wed, 18 Jun 2025 14:54:36 +0300 Message-ID: <20250618115507.4993-4-gay@disroot.org> In-Reply-To: <20250618115507.4993-1-gay@disroot.org> References: <20250618115507.4993-1-gay@disroot.org> 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: , Reply-to: Homo X-ACL-Warn: , Homo via Guix-patches X-Patchwork-Original-From: Homo via Guix-patches via From: Homo 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 (opendht): Update to 3.4.0. [version]: Do not use git-version. [inputs]: Replace restinio-0.6 by restinio. Add llhttp. [arguments] <#:phases> {pkgconfig-disable-iouring}: New phase. Change-Id: I6fed7fe1c8ba0d75d0dca8406010f7c8dd89609e --- gnu/packages/networking.scm | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 6ef265e0eb..594991efea 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3935,22 +3935,18 @@ (define-public restinio-0.6 (replace "llhttp" http-parser))))) (define-public opendht - ;; Temporarily use the latest commit, as the latest release lacks a 'detach' - ;; procedure used by a recent DhtNet, required by Jami. - (let ((commit "318d02c55a7061a771a632ff2224b0d195a80d42") - (revision "0")) (package (name "opendht") - (version (git-version "3.1.11" revision commit)) + (version "3.4.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/savoirfairelinux/opendht") - (commit commit))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0d4m9bxvwa1pz8r0sfrjjyml4yp5v7n4vy8ad7k4hcryyvd5npb0")))) + "069y4mgygjsfp5szfbqr7l30g7fbcqqj62h11byyq9k24rl7ilsq")))) (outputs '("out" "python" "tools" "debug")) (build-system gnu-build-system) (arguments @@ -4001,6 +3997,13 @@ (define-public opendht (("extra_link_args=\\[(.*)\\]" _ args) (string-append "extra_link_args=[" args ", '-Wl,-rpath=" #$output "/lib']"))))) + ;; TODO: build with liburing, requires cmake or meson. + (add-after 'unpack 'pkgconfig-disable-iouring + (lambda _ + ;; This one causes configure error in dhtnet. + (substitute* "opendht.pc.in" + (("@iouring_lib@") + "")))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? @@ -4030,12 +4033,13 @@ (define-public opendht readline)) (propagated-inputs (list msgpack-cxx ;included in several installed headers - restinio-0.6 ;included in opendht/http.h + restinio ;included in opendht/http.h ;; The following are listed in the 'Requires.private' field of ;; opendht.pc: argon2 gnutls jsoncpp + llhttp nettle openssl ;required for the DHT proxy python)) @@ -4072,7 +4076,7 @@ (define-public opendht @item dhtchat A very simple IM client working over the DHT. @end table") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public dhtnet ;; There is no tag nor release; use the latest available commit.