mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 13:28:12 -05:00
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.
This commit is contained in:
Andreas Enge
parent
e5e069302e
commit
f944fbf185
4 changed files with 7 additions and 88 deletions
|
|
@ -407,8 +407,6 @@ dist_patch_DATA = \
|
|||
gnu/packages/patches/glibc-ldd-x86_64.patch \
|
||||
gnu/packages/patches/glibc-locales.patch \
|
||||
gnu/packages/patches/gmp-arm-asm-nothumb.patch \
|
||||
gnu/packages/patches/gnunet-fix-scheduler.patch \
|
||||
gnu/packages/patches/gnunet-fix-tests.patch \
|
||||
gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch \
|
||||
gnu/packages/patches/gobject-introspection-cc.patch \
|
||||
gnu/packages/patches/gobject-introspection-girepository.patch \
|
||||
|
|
|
|||
|
|
@ -194,25 +194,14 @@ (define-public gnurl
|
|||
(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)
|
||||
|
|
@ -233,13 +222,16 @@ (define-public gnunet
|
|||
`(("pkg-config" ,pkg-config)
|
||||
("python" ,python-2)))
|
||||
(arguments
|
||||
'(#:phases
|
||||
'(#:parallel-tests? #f
|
||||
;; test_gnunet_service_arm fails; reported upstream
|
||||
#:tests? #f
|
||||
#:phases
|
||||
;; swap check and install phases and set paths to installed binaries
|
||||
(alist-cons-before
|
||||
'check 'set-path-for-check
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(setenv "GNUNET_PREFIX" out)
|
||||
(setenv "GNUNET_PREFIX" (string-append out "/lib"))
|
||||
(setenv "PATH" (string-append (getenv "PATH") ":" out "/bin"))))
|
||||
(alist-cons-after
|
||||
'install 'check
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
@ -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 =
|
||||
Loading…
Reference in a new issue