me/guix
Archived
1
0
Fork 0
Code Activity

gnu: opendht: Update to 2.2.0rc4.

Browse source 
* 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.
This commit is contained in:
Maxim Cournoyer 2021-03-30 08:16:32 -04:00
parent cf86b9af53
commit 67a5e112b1
No known key found for this signature in database
GPG key ID: 1260E46482E63562
3 changed files with 6 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1470,7 +1470,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 \

13
gnu/packages/networking.scm
View file

@ -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"

33
gnu/packages/patches/opendht-fix-jami.patch
View file

@ -1,33 +0,0 @@
From e2b39dd3a0742853e00f9c3e8c46c911da20bed7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
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<void()>;
@@ -320,8 +321,6 @@ private:
void connect(std::vector<asio::ip::tcp::endpoint>&& endpoints, HandlerCb cb = {});
- void terminate(const asio::error_code& ec);
-
void post();
void handle_request(const asio::error_code& ec);
--
2.27.0