diff options
| author | Andreas Enge <andreas@enge.fr> | 2015-03-07 00:16:04 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2015-03-07 00:16:04 +0100 |
| commit | f944fbf185a869845fe3eb78977a118b1ef593cc (patch) | |
| tree | 4690ff555e22b54b297533bade51979dcaaa6977 /gnu/packages/patches | |
| parent | e5e069302eeeb01df4191a0383201595d1e109c6 (diff) | |
| download | guix-f944fbf185a869845fe3eb78977a118b1ef593cc.tar.gz guix-f944fbf185a869845fe3eb78977a118b1ef593cc.zip | |
gnu: gnunet: Update to 0.10.1.
* gnu/packages/gnunet.scm (gnunet): Update to 0.10.1.
Adapt environment variable GNUNET_PREFIX to new use.
Disable parallel tests.
Disable tests until a failure is fixed.
* gnu/packages/patches/gnunet-fix-scheduler.patch,
gnu/packages/patches/gnunet-fix-tests.patch: Delete patch files.
* gnu-system.am (dist_patch_DATA): Unregister patches.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/gnunet-fix-scheduler.patch | 13 | ||||
| -rw-r--r-- | gnu/packages/patches/gnunet-fix-tests.patch | 58 |
2 files changed, 0 insertions, 71 deletions
diff --git a/gnu/packages/patches/gnunet-fix-scheduler.patch b/gnu/packages/patches/gnunet-fix-scheduler.patch deleted file mode 100644 index 1e0aef2a1a..0000000000 --- a/gnu/packages/patches/gnunet-fix-scheduler.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: src/util/scheduler.c -=================================================================== ---- src/util/scheduler.c (revision 31745) -+++ src/util/scheduler.c (working copy) -@@ -1599,7 +1599,7 @@ - int real_fd; - - GNUNET_DISK_internal_file_handle_ (fd, &real_fd, sizeof (int)); -- GNUNET_assert (real_fd > 0); -+ GNUNET_assert (real_fd >= 0); - return add_without_sets ( - delay, priority, - on_read ? real_fd : -1, diff --git a/gnu/packages/patches/gnunet-fix-tests.patch b/gnu/packages/patches/gnunet-fix-tests.patch deleted file mode 100644 index 4276db5a7c..0000000000 --- a/gnu/packages/patches/gnunet-fix-tests.patch +++ /dev/null @@ -1,58 +0,0 @@ -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 @@ - $(top_builddir)/src/statistics/libgnunetstatistics.la \ - $(top_builddir)/src/util/libgnunetutil.la - --@HAVE_PYTHON_TRUE@check_SCRIPTS = \ --@HAVE_PYTHON_TRUE@ test_gnunet_peerinfo.py -- - @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 = |