From patchwork Wed Mar 31 17:22:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 28228 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 D8D9227BC65; Wed, 31 Mar 2021 18:24:32 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4837A27BC66 for ; Wed, 31 Mar 2021 18:24:32 +0100 (BST) Received: from localhost ([::1]:46786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lReZz-0007tM-EI for patchwork@mira.cbaines.net; Wed, 31 Mar 2021 13:24:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lReZY-0007So-Pv for guix-patches@gnu.org; Wed, 31 Mar 2021 13:24:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43889) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lReZY-0006EM-C6 for guix-patches@gnu.org; Wed, 31 Mar 2021 13:24:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lReZY-0002xS-8a for guix-patches@gnu.org; Wed, 31 Mar 2021 13:24:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47513] [PATCH v2 05/12] gnu: opendht: Update to 2.2.0rc4. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 31 Mar 2021 17:24:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47513 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47513@debbugs.gnu.org Cc: Jack Hill , Maxime Devos , Maxim Cournoyer Received: via spool by 47513-submit@debbugs.gnu.org id=B47513.161721139211219 (code B ref 47513); Wed, 31 Mar 2021 17:24:04 +0000 Received: (at 47513) by debbugs.gnu.org; 31 Mar 2021 17:23:12 +0000 Received: from localhost ([127.0.0.1]:55414 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lReYh-0002um-H4 for submit@debbugs.gnu.org; Wed, 31 Mar 2021 13:23:12 -0400 Received: from mail-qk1-f173.google.com ([209.85.222.173]:47049) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lReYa-0002sc-Eg for 47513@debbugs.gnu.org; Wed, 31 Mar 2021 13:23:05 -0400 Received: by mail-qk1-f173.google.com with SMTP id z10so20079804qkz.13 for <47513@debbugs.gnu.org>; Wed, 31 Mar 2021 10:23:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7a0+wnZqGeglAKnDShMwpWerTHchl7xSybEyx4YnHas=; b=ZIZD2Kd0oZbUERNnIFonFV+bWNukWhT+z1JPV/3c8PgLHj3wnjLzVzSMGO9QkG8zyA YmafkTmCzKXT5ez2oBY3MbQE3QoAGjrgDOCjgxFQG37L5aPaDA07kqkzUBhFdMuQrqlf rgiPDqtDsSaEa2049RMaf4Hm7uiRrrrapRGZymEsSXKMGK5PE2J985XOt8w2rpPuDI5F ZlLIl3nsFHZdfVLTKsOr/OFEdCS9tt5FrvKYPQ5+ezymwm7lfT+6QY30/m2X7j2QTSxM ICfEs+3MHGh/7DRFTe0dmlUj3tdlDE082SVNQyZyyrbbkvxVZ7a8l2fRnEWTGQxFFPFM x9PQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7a0+wnZqGeglAKnDShMwpWerTHchl7xSybEyx4YnHas=; b=ji9nbNkS9iuAC66eJ1epJEaiTjs/X0aa9/Rq50AHlrAbAbItCo0Qif/PpZGsYTb+pH jUS3yd4ZCYnePqFzW4+/QWwcRmk635HiHNU/heoHIK8He5Bdcjg1AVrfK8Pwrs68E2Bf oPgKPEwQPdGJek54zI4keEqDxV7CXJlPomVREG4YLk3hGd1lck1MNKIuZQWattFxTcgY 43J7QIep0TwV0IvK1yVf+PVbqHfkTxdZRfq8bLuZNUjy/zTgcXZZh8Y99bGaSpWZxprf n3CPnYM4MGI0AxT8LdgypPleaSIuetdj+6yZHxetZfhGQGGxdD7dKFc8c/YkNNwTwh91 tlbw== X-Gm-Message-State: AOAM530mcG2nElqMnIiHodGMnpCmVqMc/xGhlHES2RTEqlXhI8M6tg1V JpKowPuAJ1wtqxk9Q2OYq0L5tSMF1+rQag== X-Google-Smtp-Source: ABdhPJx+SaiQ9WHdXnambvxCoMf/8qSMynI1PoiMFnHFgGr0egvRA0JSgDigjSLOZ49lvSRmzgpsPA== X-Received: by 2002:a05:620a:38f:: with SMTP id q15mr4205096qkm.379.1617211378800; Wed, 31 Mar 2021 10:22:58 -0700 (PDT) Received: from localhost.localdomain ([207.35.95.145]) by smtp.gmail.com with ESMTPSA id c5sm1891349qkg.105.2021.03.31.10.22.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Mar 2021 10:22:58 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 31 Mar 2021 13:22:25 -0400 Message-Id: <20210331172232.22483-5-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210331172232.22483-1-maxim.cournoyer@gmail.com> References: <20210331172232.22483-1-maxim.cournoyer@gmail.com> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/opendht-fix-jami.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Un-register it. * gnu/packages/networking.scm (opendht): Update to 2.2.0rc4. [patches]: Remove field. [inputs]: Use nettle-3.7. [native-inputs]: Move restinio to... [propagated-inputs]: ... here. --- gnu/local.mk | 1 - gnu/packages/networking.scm | 13 ++++---- gnu/packages/patches/opendht-fix-jami.patch | 33 --------------------- 3 files changed, 6 insertions(+), 41 deletions(-) delete mode 100644 gnu/packages/patches/opendht-fix-jami.patch diff --git a/gnu/local.mk b/gnu/local.mk index d8c548b0eb..bfb7cd80b7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1469,7 +1469,6 @@ dist_patch_DATA = \ %D%/packages/patches/opencascade-oce-glibc-2.26.patch \ %D%/packages/patches/opencv-fix-build-of-grfmt_jpeg2000.cpp.patch \ %D%/packages/patches/opencv-rgbd-aarch64-test-fix.patch \ - %D%/packages/patches/opendht-fix-jami.patch \ %D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openjdk-10-idlj-reproducibility.patch \ %D%/packages/patches/openmpi-mtl-priorities.patch \ diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index bd6201bcbf..f4f2532583 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3428,40 +3428,39 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (define-public opendht (package (name "opendht") - (version "2.1.4") + (version "2.2.0rc4") ;jami requires >= 2.2.0 (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/savoirfairelinux/opendht") (commit version))) (file-name (git-file-name name version)) - (patches (search-patches "opendht-fix-jami.patch")) (sha256 (base32 - "1ax26ri1ifb6s8ppd28jmanka9yf8mw3np65q2h4djhhik0phhal")))) + "1wc0f6cnvnlmhxnx64nxqgsx93k4g7ljdaqjl40ml74jg3nqrzcl")))) ;; Since 2.0, the gnu-build-system does not seem to work anymore, upstream bug? (build-system cmake-build-system) (inputs `(("argon2" ,argon2) - ("nettle" ,nettle) + ("nettle" ,nettle-3.7) ("readline" ,readline) ("jsoncpp" ,jsoncpp) ("openssl" ,openssl) ;required for the DHT proxy ("fmt" ,fmt))) (propagated-inputs `(("gnutls" ,gnutls) ;included in opendht/crypto.h - ("msgpack" ,msgpack))) ;included in several installed headers + ("msgpack" ,msgpack) ;included in several installed headers + ("restinio" ,restinio))) ;included in opendht/http.h (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) ("pkg-config" ,pkg-config) - ("restinio" ,restinio) ;headers only library ("libtool" ,libtool) ("cppunit" ,cppunit))) (arguments `(#:tests? #f ; Tests require network connection. #:configure-flags - '(;; "-DOPENDHT_TESTS=on" + '(;;"-DOPENDHT_TESTS=on" "-DOPENDHT_TOOLS=off" "-DOPENDHT_PYTHON=off" "-DOPENDHT_PROXY_SERVER=on" diff --git a/gnu/packages/patches/opendht-fix-jami.patch b/gnu/packages/patches/opendht-fix-jami.patch deleted file mode 100644 index 9718a84a41..0000000000 --- a/gnu/packages/patches/opendht-fix-jami.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e2b39dd3a0742853e00f9c3e8c46c911da20bed7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Adrien=20B=C3=A9raud?= -Date: Tue, 30 Jun 2020 10:42:49 -0400 -Subject: [PATCH 1/4] http/request: make terminate public - ---- - include/opendht/http.h | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/include/opendht/http.h b/include/opendht/http.h -index cc8d5f9..46b722c 100644 ---- a/include/opendht/http.h -+++ b/include/opendht/http.h -@@ -294,6 +294,7 @@ public: - * User action to cancel the Request and call the completion callbacks. - */ - void cancel(); -+ void terminate(const asio::error_code& ec); - - private: - using OnCompleteCb = std::function; -@@ -320,8 +321,6 @@ private: - - void connect(std::vector&& endpoints, HandlerCb cb = {}); - -- void terminate(const asio::error_code& ec); -- - void post(); - - void handle_request(const asio::error_code& ec); --- -2.27.0 -