From d051cd918f92039122bbe89414801c5e669ed149 Mon Sep 17 00:00:00 2001
From: ng0 <address@hidden>
Date: Thu, 14 Mar 2019 11:19:47 +0000
Subject: [PATCH 5/5] gnu: gnunet: Update to 0.11.0.

* gnu/packages/gnunet.scm (gnunet): Update to 0.11.0.
[inputs]: Replace libidn with libidn2, remove perl,
remove python-2, remove glpk (only used when compiled
--with-experimental), add which.
[native-inputs]: remove pkg-config (pc files provided
but pkg-config is not used), add python.
[arguments]: Remove configure flags, --with-nssdir no
longer exists.
[license]: switch to agpl3+.

(gnunet-gtk)[source]: Update checksum.
---
 gnu/packages/gnunet.scm | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 029e174a79..94c8016175 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -29,6 +29,7 @@
   #:use-module (gnu packages file)
   #:use-module (gnu packages aidc)
   #:use-module (gnu packages autotools)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages gettext)
@@ -53,6 +54,7 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages video)
@@ -231,7 +233,7 @@ supports HTTP, HTTPS and GnuTLS.")
 (define-public gnunet
   (package
    (name "gnunet")
-   (version "0.10.1")
+   (version "0.11.0")
    (source
     (origin
       (method url-fetch)
@@ -239,39 +241,40 @@ supports HTTP, HTTPS and GnuTLS.")
                           ".tar.gz"))
       (sha256
        (base32
-        "04wxzm3wkgqbn42b8ksr4cx6m5cckyig5cls1adh0nwdczwvnp7n"))))
+        "16kydkrjlf2vxflgls46bwaf9kjczf621p456q0qlphd7cy7lixp"))))
    (build-system gnu-build-system)
+   ;; python2.7 is optionally detected at runtime in $PATH of user,
+   ;; no longer required in 0.11.1 released (gnunet-qr C rewrite).
    (inputs
-    `(("glpk" ,glpk)
-      ("gnurl" ,gnurl)
+    `(("gnurl" ,gnurl)
       ("gstreamer" ,gstreamer)
       ("gst-plugins-base" ,gst-plugins-base)
       ("gnutls" ,gnutls/dane)
       ("libextractor" ,libextractor)
       ("libgcrypt" ,libgcrypt)
-      ("libidn" ,libidn)
+      ("libidn2" ,libidn2)
       ("libmicrohttpd" ,libmicrohttpd) ; hostlist, pt, contrib, and more
       ("libltdl" ,libltdl)
       ("libunistring" ,libunistring) ; fs and more
       ("openssl" ,openssl) ; transport, certificate creation, contribs
-      ("opus" ,opus) ; gnunet-conversation
-      ("pulseaudio" ,pulseaudio) ; conversation
+      ("opus" ,opus) ;conversation
+      ("pulseaudio" ,pulseaudio) ;conversation
       ("sqlite" ,sqlite) ; sqlite bindings, *store
       ("zlib" ,zlib)
-      ("perl" ,perl) ; doxygen and more
       ("jansson" ,jansson) ; identity, taler (external), gnunet-json, gns
       ("nss" ,nss) ; gns
       ("gmp" ,gmp) ; util
       ("bluez" ,bluez) ; gnunet-transport
       ("glib" ,glib)
-      ("libogg" ,libogg) ; gnunet-conversation
-      ("python-2" ,python-2))) ; tests, gnunet-qr
+      ("libogg" ,libogg)
+      ;; https://bugs.gnunet.org/view.php?id=5614
+      ("which" ,which)))
    (native-inputs
-    `(("pkg-config" ,pkg-config)))
+    `(("python" ,python)
+      ;; Will be removed in 0.11.1:
+      ("python-future" ,python-future)))
    (arguments
-    '(#:configure-flags
-      (list (string-append "--with-nssdir=" %output "/lib"))
-      #:parallel-tests? #f
+    '(#:parallel-tests? #f
       ;; test_gnunet_service_arm fails; reported upstream
       #:tests? #f
       #:phases
@@ -294,7 +297,7 @@ global, distributed network that provides security and privacy.  GNUnet in
 that sense aims to replace the current internet protocol stack.  Along with
 an application for secure publication of files, it has grown to include all
 kinds of basic applications for the foundation of a GNU internet.")
-   (license license:gpl3+)
+   (license license:agpl3+)
    (home-page "https://gnunet.org/")))
 
 (define-public guile-gnunet                       ;GSoC 2015!
@@ -339,7 +342,7 @@ services.")
                                   version ".tar.gz"))
               (sha256
                (base32
-                "1p38k1s6a2fmcfc9a7cf1zrdycm9h06kqdyand4s3k500nj6mb4g"))))
+                "1vr9iyji25r87ym1jw033l9xyqfj4971anamfvz810rl65jjhb6z"))))
     (arguments
      `(#:configure-flags
        (list "--with-libunique"
-- 
2.21.0