View difference between Paste ID: 97Cyber8 and q3VHF5EL

 --- gnu/packages/gnunet.scm	2014-05-17 16:30:31.455126665 +0200
 +++ gnu/packages/gnunet.scm	2014-05-18 14:51:30.076634215 +0200
 @@ -25,6 +25,7 @@
    #:use-module (gnu packages geeqie)
    #:use-module (gnu packages gettext)
    #:use-module (gnu packages glib)
 +  #:use-module (gnu packages gnome)
    #:use-module (gnu packages gnupg)
    #:use-module (gnu packages gnutls)
    #:use-module (gnu packages groff)
 @@ -69,7 +70,6 @@
     ;; * libgif (giflib)
     ;; * libgtk+ >= 3.0.0 (may probably drop glib then as a propagated input of
     ;;                     gtk)
 -   ;; * libgsf
     ;; * libmagic (file)
     ;; * libmpeg2
     ;; * libmp4v2
 @@ -84,6 +84,7 @@
        ("glib" ,glib)
        ("gstreamer" ,gstreamer)
        ("gst-plugins-base" ,gst-plugins-base)
 +      ("libgsf" ,libgsf)
        ("libjpeg" ,libjpeg)
        ("libogg" ,libogg)
        ("libtiff" ,libtiff)
 @@ -105,14 +106,14 @@
  (define-public libmicrohttpd
    (package
     (name "libmicrohttpd")
 -   (version "0.9.34")
 +   (version "0.9.35")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/libmicrohttpd/libmicrohttpd-"
                                  version ".tar.gz"))
              (sha256
               (base32
 -              "122snbhhn10s8az46f0lrkirhj0k38lq7hmqav3n1prdzpabz8i9"))))
 +              "1z0h6llx7pra78358ryi3bdh8p0ns0bn97n6bl0fj6cib9cz2pdw"))))
     (build-system gnu-build-system)
     (inputs
      `(("curl" ,curl)
 @@ -187,23 +188,18 @@
  (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"))
 +               "04wxzm3wkgqbn42b8ksr4cx6m5cckyig5cls1adh0nwdczwvnp7n"))
        (patches
         (list
 -        ;; Patch to fix serious bug in scheduler; upstream commit: #31747
 -        (search-patch "gnunet-fix-scheduler.patch")
 -        ;; Patch to fix bugs in testcases:
 +        ;; Patch to fix bug 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"))))
     (build-system gnu-build-system)
 
 --- gnu/packages/patches/gnunet-fix-tests.patch	2014-05-17 16:30:31.475126666 +0200
 +++ gnu/packages/patches/gnunet-fix-tests.patch	2014-05-18 13:59:34.237802681 +0200
 @@ -1,58 +1,13 @@
  diff -ru a/src/peerinfo-tool/Makefile.in b/src/peerinfo-tool/Makefile.in
  --- src/peerinfo-tool/Makefile.in	2013-12-24 13:55:04.000000000 +0100
  +++ src/peerinfo-tool/Makefile.in	2014-01-30 13:07:52.275965484 +0100
 -@@ -335,9 +335,6 @@
 +@@ -596,9 +596,6 @@
     $(top_builddir)/src/statistics/libgnunetstatistics.la \
 -   $(top_builddir)/src/util/libgnunetutil.la
 +   $(top_builddir)/src/util/libgnunetutil.la
 
  -@HAVE_PYTHON_TRUE@check_SCRIPTS = \
 --@HAVE_PYTHON_TRUE@ test_gnunet_peerinfo.py
 +-@HAVE_PYTHON_TRUE@ test_gnunet_peerinfo.py
  -
 + @ENABLE_TEST_RUN_TRUE@AM_TESTS_ENVIRONMENT = export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
   @ENABLE_TEST_RUN_TRUE@TESTS = $(check_SCRIPTS)
   do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
 - EXTRA_DIST = \
 -diff -ru a/src/revocation/test_revocation.conf b/src/revocation/test_revocation.conf
 ---- src/revocation/test_revocation.conf	2013-12-21 18:57:06.000000000 +0100
 -+++ src/revocation/test_revocation.conf	2014-01-30 15:00:02.841340556 +0100
 -@@ -20,6 +20,9 @@
 - [transport-udp]
 - BROADCAST = NO
 -
 -+[nat]
 -+RETURN_LOCAL_ADDRESSES = YES
 -+
 - [peerinfo]
 - USE_INCLUDED_HELLOS = NO
 -
 -Index: src/gns/test_gns_cname_lookup.sh
 -===================================================================
 ---- src/gns/test_gns_cname_lookup.sh	(revision 32117)
 -+++ src/gns/test_gns_cname_lookup.sh	(revision 32118)
 -@@ -13,6 +13,15 @@
 - 	exit 77
 - fi
 -
 -+# permissive DNS resolver we will use for the test
 -+DNS_RESOLVER="8.8.8.8"
 -+if ! nslookup gnunet.org $DNS_RESOLVER &> /dev/null
 -+then
 -+  echo "Cannot reach DNS, skipping test"
 -+  exit 77
 -+fi
 -+
 -+
 - rm -rf /tmp/test-gnunet-gns-peer-1/
 -
 - TEST_DOMAIN_PLUS="www.gnu"
 -Index: src/integration-tests/confs/test_defaults.conf
 -===================================================================
 ---- src/integration-tests/confs/test_defaults.conf	(revision 32320)
 -+++ src/integration-tests/confs/test_defaults.conf	(working copy)
 -@@ -17,6 +17,7 @@
 - EXTERNAL_ADDRESS = 127.0.0.1
 - INTERNAL_ADDRESS = 127.0.0.1
 - BINDTO = 127.0.0.1
 -+RETURN_LOCAL_ADDRESSES = YES
 -
 - [hostlist]
 - SERVERS =
 
 --- gnu-system.am.orig	2014-05-18 15:00:00.340652315 +0200
 +++ gnu-system.am	2014-05-18 15:00:10.516652676 +0200
 @@ -290,7 +290,6 @@
    gnu/packages/patches/glib-tests-prlimit.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		\