From 6a6e5d84dacb4b127120ec150c52549a2bc111d6 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 9 Jan 2019 21:12:44 +0100 Subject: gnu: opendht: Update to 1.8.1. * gnu/packages/crypto.scm (opendht): Update to 1.8.1. [source]: Remove snippet that deletes argon2, which is no longer bundled. [arguments]: Add "--with-argon2" to use system argon2. [license]: Update to GPLv3+ following the README and source headers. --- gnu/packages/crypto.scm | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 84b00e0d8c..56f909ed2f 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -11,6 +11,8 @@ ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018 Nicolas Goaziou ;;; Copyright © 2018 Nicolò Balzarotti +;;; Copyright © 2018 Tim Gesthuizen +;;; Copyright © 2019 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; @@ -167,28 +169,16 @@ OpenBSD tool of the same name.") (define-public opendht (package (name "opendht") - (version "0.6.1") + (version "1.8.1") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/savoirfairelinux/opendht.git") (commit version))) (file-name (git-file-name name version)) - (modules '((guix build utils))) - (snippet - '(begin - (delete-file-recursively "src/argon2") - (substitute* "src/Makefile.am" - (("./argon2/libargon2.la") "") - (("SUBDIRS = argon2") "")) - (substitute* "src/crypto.cpp" - (("argon2/argon2.h") "argon2.h")) - (substitute* "configure.ac" - (("src/argon2/Makefile") "")) - #t)) (sha256 (base32 - "1akk613f18rc8kqs0cxdm34iq7wwc9kffhgp5rng09arwlw8gw3w")))) + "0vninb5mak27wigajslyvr05vq7wbrwqhbr4wzl2nmqcb20wmlq2")))) (build-system gnu-build-system) (inputs `(("gnutls" ,gnutls) @@ -203,13 +193,15 @@ OpenBSD tool of the same name.") ("automake" ,automake) ("libtool" ,libtool))) (arguments - `(#:configure-flags '("--disable-tools" "--disable-python"))) + `(#:configure-flags '("--disable-tools" + "--disable-python" + "--with-argon2"))) (home-page "https://github.com/savoirfairelinux/opendht/") (synopsis "Distributed Hash Table (DHT) library") (description "OpenDHT is a Distributed Hash Table (DHT) library. It may be used to manage peer-to-peer network connections as needed for real time communication.") - (license license:gpl3))) + (license license:gpl3+))) (define-public encfs (package -- cgit v1.2.3