Guest User

Untitled

a guest
May 18th, 2014
30
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. --- gnu/packages/gnunet.scm 2014-05-17 16:30:31.455126665 +0200
  2. +++ gnu/packages/gnunet.scm 2014-05-18 14:51:30.076634215 +0200
  3. @@ -25,6 +25,7 @@
  4.    #:use-module (gnu packages geeqie)
  5.    #:use-module (gnu packages gettext)
  6.    #:use-module (gnu packages glib)
  7. +  #:use-module (gnu packages gnome)
  8.    #:use-module (gnu packages gnupg)
  9.    #:use-module (gnu packages gnutls)
  10.    #:use-module (gnu packages groff)
  11. @@ -69,7 +70,6 @@
  12.     ;; * libgif (giflib)
  13.     ;; * libgtk+ >= 3.0.0 (may probably drop glib then as a propagated input of
  14.     ;;                     gtk)
  15. -   ;; * libgsf
  16.     ;; * libmagic (file)
  17.     ;; * libmpeg2
  18.     ;; * libmp4v2
  19. @@ -84,6 +84,7 @@
  20.        ("glib" ,glib)
  21.        ("gstreamer" ,gstreamer)
  22.        ("gst-plugins-base" ,gst-plugins-base)
  23. +      ("libgsf" ,libgsf)
  24.        ("libjpeg" ,libjpeg)
  25.        ("libogg" ,libogg)
  26.        ("libtiff" ,libtiff)
  27. @@ -105,14 +106,14 @@
  28.  (define-public libmicrohttpd
  29.    (package
  30.     (name "libmicrohttpd")
  31. -   (version "0.9.34")
  32. +   (version "0.9.35")
  33.     (source (origin
  34.              (method url-fetch)
  35.              (uri (string-append "mirror://gnu/libmicrohttpd/libmicrohttpd-"
  36.                                  version ".tar.gz"))
  37.              (sha256
  38.               (base32
  39. -              "122snbhhn10s8az46f0lrkirhj0k38lq7hmqav3n1prdzpabz8i9"))))
  40. +              "1z0h6llx7pra78358ryi3bdh8p0ns0bn97n6bl0fj6cib9cz2pdw"))))
  41.     (build-system gnu-build-system)
  42.     (inputs
  43.      `(("curl" ,curl)
  44. @@ -187,23 +188,18 @@
  45.  (define-public gnunet
  46.    (package
  47.     (name "gnunet")
  48. -   (version "0.10.0")
  49. +   (version "0.10.1")
  50.     (source
  51.      (origin
  52.        (method url-fetch)
  53.        (uri (string-append "mirror://gnu/gnunet/gnunet-" version
  54.                            ".tar.gz"))
  55.        (sha256 (base32
  56. -               "0zqpc47kywhjrpphl0palz849khv00ra2gjrfkysp6p0gfsbvd0i"))
  57. +               "04wxzm3wkgqbn42b8ksr4cx6m5cckyig5cls1adh0nwdczwvnp7n"))
  58.        (patches
  59.         (list
  60. -        ;; Patch to fix serious bug in scheduler; upstream commit: #31747
  61. -        (search-patch "gnunet-fix-scheduler.patch")
  62. -        ;; Patch to fix bugs in testcases:
  63. +        ;; Patch to fix bug in testcases:
  64.          ;; * Disable peerinfo-tool tests as they depend on reverse DNS lookups
  65. -        ;; * Allow revocation and integration-tests testcases to run on
  66. -        ;;   loopback; upstream: #32130, #32326
  67. -        ;; * Skip GNS testcases requiring DNS lookups; upstream: #32118
  68.          (search-patch "gnunet-fix-tests.patch")))
  69.        (patch-flags '("-p0"))))
  70.     (build-system gnu-build-system)
  71.  
  72. --- gnu/packages/patches/gnunet-fix-tests.patch 2014-05-17 16:30:31.475126666 +0200
  73. +++ gnu/packages/patches/gnunet-fix-tests.patch 2014-05-18 13:59:34.237802681 +0200
  74. @@ -1,58 +1,13 @@
  75.  diff -ru a/src/peerinfo-tool/Makefile.in b/src/peerinfo-tool/Makefile.in
  76.  --- src/peerinfo-tool/Makefile.in  2013-12-24 13:55:04.000000000 +0100
  77.  +++ src/peerinfo-tool/Makefile.in  2014-01-30 13:07:52.275965484 +0100
  78. -@@ -335,9 +335,6 @@
  79. +@@ -596,9 +596,6 @@
  80.     $(top_builddir)/src/statistics/libgnunetstatistics.la \
  81. -   $(top_builddir)/src/util/libgnunetutil.la
  82. +   $(top_builddir)/src/util/libgnunetutil.la
  83.  
  84.  -@HAVE_PYTHON_TRUE@check_SCRIPTS = \
  85. --@HAVE_PYTHON_TRUE@ test_gnunet_peerinfo.py
  86. +-@HAVE_PYTHON_TRUE@ test_gnunet_peerinfo.py
  87.  -
  88. + @ENABLE_TEST_RUN_TRUE@AM_TESTS_ENVIRONMENT = export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
  89.   @ENABLE_TEST_RUN_TRUE@TESTS = $(check_SCRIPTS)
  90.   do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
  91. - EXTRA_DIST = \
  92. -diff -ru a/src/revocation/test_revocation.conf b/src/revocation/test_revocation.conf
  93. ---- src/revocation/test_revocation.conf    2013-12-21 18:57:06.000000000 +0100
  94. -+++ src/revocation/test_revocation.conf    2014-01-30 15:00:02.841340556 +0100
  95. -@@ -20,6 +20,9 @@
  96. - [transport-udp]
  97. - BROADCAST = NO
  98. -
  99. -+[nat]
  100. -+RETURN_LOCAL_ADDRESSES = YES
  101. -+
  102. - [peerinfo]
  103. - USE_INCLUDED_HELLOS = NO
  104. -
  105. -Index: src/gns/test_gns_cname_lookup.sh
  106. -===================================================================
  107. ---- src/gns/test_gns_cname_lookup.sh   (revision 32117)
  108. -+++ src/gns/test_gns_cname_lookup.sh   (revision 32118)
  109. -@@ -13,6 +13,15 @@
  110. -   exit 77
  111. - fi
  112. -
  113. -+# permissive DNS resolver we will use for the test
  114. -+DNS_RESOLVER="8.8.8.8"
  115. -+if ! nslookup gnunet.org $DNS_RESOLVER &> /dev/null
  116. -+then
  117. -+  echo "Cannot reach DNS, skipping test"
  118. -+  exit 77
  119. -+fi
  120. -+
  121. -+
  122. - rm -rf /tmp/test-gnunet-gns-peer-1/
  123. -
  124. - TEST_DOMAIN_PLUS="www.gnu"
  125. -Index: src/integration-tests/confs/test_defaults.conf
  126. -===================================================================
  127. ---- src/integration-tests/confs/test_defaults.conf (revision 32320)
  128. -+++ src/integration-tests/confs/test_defaults.conf (working copy)
  129. -@@ -17,6 +17,7 @@
  130. - EXTERNAL_ADDRESS = 127.0.0.1
  131. - INTERNAL_ADDRESS = 127.0.0.1
  132. - BINDTO = 127.0.0.1
  133. -+RETURN_LOCAL_ADDRESSES = YES
  134. -
  135. - [hostlist]
  136. - SERVERS =
  137.  
  138. --- gnu-system.am.orig  2014-05-18 15:00:00.340652315 +0200
  139. +++ gnu-system.am   2014-05-18 15:00:10.516652676 +0200
  140. @@ -290,7 +290,6 @@
  141.    gnu/packages/patches/glib-tests-prlimit.patch            \
  142.    gnu/packages/patches/glibc-bootstrap-system.patch        \
  143.    gnu/packages/patches/glibc-ldd-x86_64.patch          \
  144. -  gnu/packages/patches/gnunet-fix-scheduler.patch      \
  145.    gnu/packages/patches/gnunet-fix-tests.patch          \
  146.    gnu/packages/patches/gobject-introspection-cc.patch      \
  147.    gnu/packages/patches/grub-gets-undeclared.patch      \
RAW Paste Data