From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andreas Enge <andreas@enge.fr>
Subject: Gnunet update
Date: Tue, 12 Aug 2014 16:06:42 +0200
Message-ID: <20140812140642.GA7541@debian>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="FCuugMFkClbJLl1L"
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:48670)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <andreas@enge.fr>) id 1XHCj0-0002rh-6d
	for guix-devel@gnu.org; Tue, 12 Aug 2014 10:07:00 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <andreas@enge.fr>) id 1XHCit-00024H-HD
	for guix-devel@gnu.org; Tue, 12 Aug 2014 10:06:54 -0400
Received: from mout.kundenserver.de ([212.227.17.10]:62672)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <andreas@enge.fr>) id 1XHCis-000246-TI
	for guix-devel@gnu.org; Tue, 12 Aug 2014 10:06:47 -0400
Content-Disposition: inline
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
To: guix-devel@gnu.org


--FCuugMFkClbJLl1L
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hello,

the attached patch attempts to update gnunet to its current release 0.10.1.
It fails one of its tests; Sree, could you maybe look into it? It would be
nice to be up-to-date before coming to the GHM in gnunet's birth place!

Thanks,

Andreas


--FCuugMFkClbJLl1L
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="gnunet.scm.patch"

diff --git a/gnu-system.am b/gnu-system.am
index a1dea39..2a2867f 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -313,8 +313,6 @@ dist_patch_DATA =						\
   gnu/packages/patches/glib-tests-timer.patch			\
   gnu/packages/patches/glibc-bootstrap-system.patch		\
   gnu/packages/patches/glibc-ldd-x86_64.patch			\
-  gnu/packages/patches/gnunet-fix-scheduler.patch		\
-  gnu/packages/patches/gnunet-fix-tests.patch    		\
   gnu/packages/patches/gobject-introspection-cc.patch		\
   gnu/packages/patches/grub-gets-undeclared.patch		\
   gnu/packages/patches/gstreamer-0.10-bison3.patch		\
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index e4ef3d4..ff8c765 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -186,25 +186,14 @@ supports HTTPS, HTTPS and GnuTLS.")
 (define-public gnunet
   (package
    (name "gnunet")
-   (version "0.10.0")
+   (version "0.10.1")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://gnu/gnunet/gnunet-" version
                           ".tar.gz"))
       (sha256 (base32
-               "0zqpc47kywhjrpphl0palz849khv00ra2gjrfkysp6p0gfsbvd0i"))
-      (patches
-       (list
-        ;; Patch to fix serious bug in scheduler; upstream commit: #31747
-        (search-patch "gnunet-fix-scheduler.patch")
-        ;; Patch to fix bugs in testcases:
-        ;; * Disable peerinfo-tool tests as they depend on reverse DNS lookups
-        ;; * Allow revocation and integration-tests testcases to run on
-        ;;   loopback; upstream: #32130, #32326
-        ;; * Skip GNS testcases requiring DNS lookups; upstream: #32118
-        (search-patch "gnunet-fix-tests.patch")))
-      (patch-flags '("-p0"))))
+               "04wxzm3wkgqbn42b8ksr4cx6m5cckyig5cls1adh0nwdczwvnp7n"))))
    (build-system gnu-build-system)
    (inputs
     `(("glpk" ,glpk)

--FCuugMFkClbJLl1L--