gnunet: update source, add iptables dependency

Signed-off-by: Daniel Golle <redacted>

diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile
index 898b8d39463b5dd7d3a7cede18a25ee4b97dc740..0fdb4fa8cd8b7bb2d29ca3c444f1acb4fb8dd230 100644 (file)
--- a/net/gnunet/Makefile
+++ b/net/gnunet/Makefile
@@ -8,12 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gnunet
-PKG_SOURCE_VERSION:=36190
+PKG_SOURCE_VERSION:=36242
 PKG_VERSION:=0.10.1-svn$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 # ToDo:
-#  - UCI integration
 #  - break-out {peer,name,data}store for each backend
 #  - package testing stuff
 
@@ -237,7 +236,7 @@ LIBEXEC_transport-bluetooth:=helper-transport-bluetooth
 DEPENDS_utils:=+certtool +openssl-util
 BIN_utils:=gns-proxy-setup-ca transport-certificate-creation
 
-DEPENDS_vpn:=+kmod-tun
+DEPENDS_vpn:=+kmod-tun +iptables
 BIN_vpn:=vpn
 LIB_vpn:=tun vpn
 LIBEXEC_vpn:=daemon-exit daemon-pt helper-exit helper-vpn service-vpn

diff --git a/net/gnunet/files/gnunet.defaults b/net/gnunet/files/gnunet.defaults
index dbb505066b9875b444e88b3b1ad399b1967c520a..8b769191c2d80c6e6cd4d8f5bd71f8e13b76e903 100644 (file)
--- a/net/gnunet/files/gnunet.defaults
+++ b/net/gnunet/files/gnunet.defaults
@@ -28,13 +28,9 @@ uci set gnunet.pt.FORCESTART=YES
 uci set gnunet.exit=gnunet-config
 uci set gnunet.exit.AUTOSTART=YES
 uci set gnunet.exit.FORCESTART=YES
-uci set gnunet.exit.EXIT_IPV4=YES
-uci set gnunet.exit.EXIT_RANGE_IPV4_POLICY="169.254.86.1:7;169.254.86.1:5201;"
-
-# iperf (TCP) and echo (UDP) for battlemesh
-uci set gnunet.iperf=gnunet-exit-service
-uci set gnunet.iperf.TCP_REDIRECTS="5201:169.254.86.1:5201"
-uci set gnunet.echo=gnunet-exit-service
-uci set gnunet.echo.UDP_REDIRECTS="7:169.254.86.1:7"
+
+# increase WORKDELAY to something more sane on small CPUs
+uci set gnunet.nse=gnunet-config
+uci set gnunet.nse.WORKDELAY='500 ms'
 
 uci commit gnunet