Update gnunet to rev 35440

2 files changed, 60 insertions, 61 deletions

diff --git a/gnunet-build/packages/gnunet/gnunet/Buildrules b/gnunet-build/packages/gnunet/gnunet/Buildrules
index ca33176..9fc30ff 100644
--- a/gnunet-build/packages/gnunet/gnunet/Buildrules
+++ b/gnunet-build/packages/gnunet/gnunet/Buildrules
@@ -1,4 +1,4 @@
-REVISION="35318"
+REVISION="35440"
 VERSION="svn-${REVISION}"
 DESCRIPTION="GNUnet is a framework for secure peer-to-peer networking that does not use any centralized or otherwise trusted services."
 SOURCE_URI="svn://gnunet.org/svn/gnunet@${REVISION}?proto=https&archive=${NAME}-${VERSION}.${ARCHIVE_FORMAT}"
diff --git a/gnunet-build/packages/gnunet/gnunet/files/gnunet-svn-35318-all.patch b/gnunet-build/packages/gnunet/gnunet/files/gnunet-svn-35440-all.patch
index a7502d7..114c6ea 100644
--- a/gnunet-build/packages/gnunet/gnunet/files/gnunet-svn-35318-all.patch
+++ b/gnunet-build/packages/gnunet/gnunet/files/gnunet-svn-35440-all.patch
@@ -1,8 +1,8 @@
-Index: gnunet-svn-35318/configure.ac
+Index: gnunet-svn-35440/configure.ac
 ===================================================================
---- gnunet-svn-35318/configure.ac	(revision 35318)
-+++ gnunet-svn-35318/configure.ac	(working copy)
-@@ -605,7 +605,7 @@
+--- gnunet-svn-35440/configure.ac	(revision 35440)
++++ gnunet-svn-35440/configure.ac	(working copy)
+@@ -609,7 +609,7 @@
      AC_CHECK_HEADERS(ltdl.h,
       AC_CHECK_LIB([ltdl], [lt_dlopenext],
        ltdl=1))])
@@ -11,11 +11,11 @@ Index: gnunet-svn-35318/configure.ac
  then
   AC_MSG_RESULT([libltdl found])
  else
-Index: gnunet-svn-35318/src/Makefile.am
+Index: gnunet-svn-35440/src/Makefile.am
 ===================================================================
---- gnunet-svn-35318/src/Makefile.am	(revision 35318)
-+++ gnunet-svn-35318/src/Makefile.am	(working copy)
-@@ -69,7 +69,6 @@
+--- gnunet-svn-35440/src/Makefile.am	(revision 35440)
++++ gnunet-svn-35440/src/Makefile.am	(working copy)
+@@ -78,7 +78,6 @@
    $(TESTBED) \
    nse \
    dht \
@@ -23,7 +23,7 @@ Index: gnunet-svn-35318/src/Makefile.am
    topology \
    regex \
    cadet \
-@@ -81,14 +80,9 @@
+@@ -90,13 +89,8 @@
    gnsrecord \
    namecache \
    namestore \
@@ -35,13 +35,12 @@ Index: gnunet-svn-35318/src/Makefile.am
 -  exit \
 -  pt \
 -  integration-tests \
-   $(EXP_DIR)
- 
- #  ats-tests
-Index: gnunet-svn-35318/src/arm/gnunet-service-arm.c
+   $(EXP_DIR) \
+   $(WACHS_DIR)
+Index: gnunet-svn-35440/src/arm/gnunet-service-arm.c
 ===================================================================
---- gnunet-svn-35318/src/arm/gnunet-service-arm.c	(revision 35318)
-+++ gnunet-svn-35318/src/arm/gnunet-service-arm.c	(working copy)
+--- gnunet-svn-35440/src/arm/gnunet-service-arm.c	(revision 35440)
++++ gnunet-svn-35440/src/arm/gnunet-service-arm.c	(working copy)
 @@ -1563,19 +1563,5 @@
  }
  
@@ -62,10 +61,10 @@ Index: gnunet-svn-35318/src/arm/gnunet-service-arm.c
 -
 -
  /* end of gnunet-service-arm.c */
-Index: gnunet-svn-35318/src/dht/Makefile.am
+Index: gnunet-svn-35440/src/dht/Makefile.am
 ===================================================================
---- gnunet-svn-35318/src/dht/Makefile.am	(revision 35318)
-+++ gnunet-svn-35318/src/dht/Makefile.am	(working copy)
+--- gnunet-svn-35440/src/dht/Makefile.am	(revision 35440)
++++ gnunet-svn-35440/src/dht/Makefile.am	(working copy)
 @@ -50,12 +50,6 @@
   gnunet-service-dht \
   gnunet-service-dht-xvine
@@ -79,10 +78,10 @@ Index: gnunet-svn-35318/src/dht/Makefile.am
  gnunet_service_dht_SOURCES = \
   gnunet-service-dht.c gnunet-service-dht.h \
   gnunet-service-dht_clients.c gnunet-service-dht_clients.h \
-Index: gnunet-svn-35318/src/dht/gnunet-service-dht_neighbours.c
+Index: gnunet-svn-35440/src/dht/gnunet-service-dht_neighbours.c
 ===================================================================
---- gnunet-svn-35318/src/dht/gnunet-service-dht_neighbours.c	(revision 35318)
-+++ gnunet-svn-35318/src/dht/gnunet-service-dht_neighbours.c	(working copy)
+--- gnunet-svn-35440/src/dht/gnunet-service-dht_neighbours.c	(revision 35440)
++++ gnunet-svn-35440/src/dht/gnunet-service-dht_neighbours.c	(working copy)
 @@ -45,7 +45,6 @@
  #include "gnunet-service-dht_neighbours.h"
  #include "gnunet-service-dht_nse.h"
@@ -91,10 +90,10 @@ Index: gnunet-svn-35318/src/dht/gnunet-service-dht_neighbours.c
  #include "dht.h"
  
  #define LOG_TRAFFIC(kind,...) GNUNET_log_from (kind, "dht-traffic",__VA_ARGS__)
-Index: gnunet-svn-35318/src/dns/Makefile.am
+Index: gnunet-svn-35440/src/dns/Makefile.am
 ===================================================================
---- gnunet-svn-35318/src/dns/Makefile.am	(revision 35318)
-+++ gnunet-svn-35318/src/dns/Makefile.am	(working copy)
+--- gnunet-svn-35440/src/dns/Makefile.am	(revision 35440)
++++ gnunet-svn-35440/src/dns/Makefile.am	(working copy)
 @@ -18,14 +18,6 @@
  pkgcfg_DATA = \
    dns.conf
@@ -110,10 +109,10 @@ Index: gnunet-svn-35318/src/dns/Makefile.am
  lib_LTLIBRARIES = \
    libgnunetdnsparser.la \
    libgnunetdnsstub.la \
-Index: gnunet-svn-35318/src/nat/Makefile.am
+Index: gnunet-svn-35440/src/nat/Makefile.am
 ===================================================================
---- gnunet-svn-35318/src/nat/Makefile.am	(revision 35318)
-+++ gnunet-svn-35318/src/nat/Makefile.am	(working copy)
+--- gnunet-svn-35440/src/nat/Makefile.am	(revision 35440)
++++ gnunet-svn-35440/src/nat/Makefile.am	(working copy)
 @@ -15,24 +15,6 @@
  dist_pkgcfg_DATA = \
    nat.conf
@@ -139,10 +138,10 @@ Index: gnunet-svn-35318/src/nat/Makefile.am
  bin_PROGRAMS = \
   gnunet-nat-server 
  
-Index: gnunet-svn-35318/src/nse/gnunet-service-nse.c
+Index: gnunet-svn-35440/src/nse/gnunet-service-nse.c
 ===================================================================
---- gnunet-svn-35318/src/nse/gnunet-service-nse.c	(revision 35318)
-+++ gnunet-svn-35318/src/nse/gnunet-service-nse.c	(working copy)
+--- gnunet-svn-35440/src/nse/gnunet-service-nse.c	(revision 35440)
++++ gnunet-svn-35440/src/nse/gnunet-service-nse.c	(working copy)
 @@ -1629,21 +1629,7 @@
  }
  
@@ -165,11 +164,11 @@ Index: gnunet-svn-35318/src/nse/gnunet-service-nse.c
  
 -
  /* end of gnunet-service-nse.c */
-Index: gnunet-svn-35318/src/peerstore/Makefile.am
+Index: gnunet-svn-35440/src/peerstore/Makefile.am
 ===================================================================
---- gnunet-svn-35318/src/peerstore/Makefile.am	(revision 35318)
-+++ gnunet-svn-35318/src/peerstore/Makefile.am	(working copy)
-@@ -51,7 +51,7 @@
+--- gnunet-svn-35440/src/peerstore/Makefile.am	(revision 35440)
++++ gnunet-svn-35440/src/peerstore/Makefile.am	(working copy)
+@@ -52,7 +52,7 @@
    $(GN_LIB_LDFLAGS)
  
  plugin_LTLIBRARIES = \
@@ -178,7 +177,7 @@ Index: gnunet-svn-35318/src/peerstore/Makefile.am
  
  libgnunet_plugin_peerstore_sqlite_la_SOURCES = \
    plugin_peerstore_sqlite.c
-@@ -62,6 +62,18 @@
+@@ -63,6 +63,18 @@
  libgnunet_plugin_peerstore_sqlite_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS)
  
@@ -197,10 +196,10 @@ Index: gnunet-svn-35318/src/peerstore/Makefile.am
  check_PROGRAMS = \
   test_peerstore_api_store \
   test_peerstore_api_iterate \
-Index: gnunet-svn-35318/src/regex/gnunet-daemon-regexprofiler.c
+Index: gnunet-svn-35440/src/regex/gnunet-daemon-regexprofiler.c
 ===================================================================
---- gnunet-svn-35318/src/regex/gnunet-daemon-regexprofiler.c	(revision 35318)
-+++ gnunet-svn-35318/src/regex/gnunet-daemon-regexprofiler.c	(working copy)
+--- gnunet-svn-35440/src/regex/gnunet-daemon-regexprofiler.c	(revision 35440)
++++ gnunet-svn-35440/src/regex/gnunet-daemon-regexprofiler.c	(working copy)
 @@ -382,19 +382,6 @@
  }
  
@@ -221,11 +220,11 @@ Index: gnunet-svn-35318/src/regex/gnunet-daemon-regexprofiler.c
  
 -
  /* end of gnunet-daemon-regexprofiler.c */
-Index: gnunet-svn-35318/src/revocation/gnunet-service-revocation.c
+Index: gnunet-svn-35440/src/revocation/gnunet-service-revocation.c
 ===================================================================
---- gnunet-svn-35318/src/revocation/gnunet-service-revocation.c	(revision 35318)
-+++ gnunet-svn-35318/src/revocation/gnunet-service-revocation.c	(working copy)
-@@ -902,21 +902,7 @@
+--- gnunet-svn-35440/src/revocation/gnunet-service-revocation.c	(revision 35440)
++++ gnunet-svn-35440/src/revocation/gnunet-service-revocation.c	(working copy)
+@@ -933,21 +933,7 @@
  }
  
  
@@ -247,10 +246,10 @@ Index: gnunet-svn-35318/src/revocation/gnunet-service-revocation.c
  
 -
  /* end of gnunet-service-revocation.c */
-Index: gnunet-svn-35318/src/set/Makefile.am
+Index: gnunet-svn-35440/src/set/Makefile.am
 ===================================================================
---- gnunet-svn-35318/src/set/Makefile.am	(revision 35318)
-+++ gnunet-svn-35318/src/set/Makefile.am	(working copy)
+--- gnunet-svn-35440/src/set/Makefile.am	(revision 35440)
++++ gnunet-svn-35440/src/set/Makefile.am	(working copy)
 @@ -16,9 +16,6 @@
    AM_CFLAGS = -fprofile-arcs -ftest-coverage
  endif
@@ -261,10 +260,10 @@ Index: gnunet-svn-35318/src/set/Makefile.am
  libexec_PROGRAMS = \
   gnunet-service-set
  
-Index: gnunet-svn-35318/src/statistics/gnunet-service-statistics.c
+Index: gnunet-svn-35440/src/statistics/gnunet-service-statistics.c
 ===================================================================
---- gnunet-svn-35318/src/statistics/gnunet-service-statistics.c	(revision 35318)
-+++ gnunet-svn-35318/src/statistics/gnunet-service-statistics.c	(working copy)
+--- gnunet-svn-35440/src/statistics/gnunet-service-statistics.c	(revision 35440)
++++ gnunet-svn-35440/src/statistics/gnunet-service-statistics.c	(working copy)
 @@ -1077,20 +1077,5 @@
                                &run, NULL)) ? 0 : 1;
  }
@@ -286,10 +285,10 @@ Index: gnunet-svn-35318/src/statistics/gnunet-service-statistics.c
 -
 -
  /* end of gnunet-service-statistics.c */
-Index: gnunet-svn-35318/src/topology/gnunet-daemon-topology.c
+Index: gnunet-svn-35440/src/topology/gnunet-daemon-topology.c
 ===================================================================
---- gnunet-svn-35318/src/topology/gnunet-daemon-topology.c	(revision 35318)
-+++ gnunet-svn-35318/src/topology/gnunet-daemon-topology.c	(working copy)
+--- gnunet-svn-35440/src/topology/gnunet-daemon-topology.c	(revision 35440)
++++ gnunet-svn-35440/src/topology/gnunet-daemon-topology.c	(working copy)
 @@ -1327,18 +1327,5 @@
  }
  
@@ -309,10 +308,10 @@ Index: gnunet-svn-35318/src/topology/gnunet-daemon-topology.c
 -#endif
 -
  /* end of gnunet-daemon-topology.c */
-Index: gnunet-svn-35318/src/transport/Makefile.am
+Index: gnunet-svn-35440/src/transport/Makefile.am
 ===================================================================
---- gnunet-svn-35318/src/transport/Makefile.am	(revision 35318)
-+++ gnunet-svn-35318/src/transport/Makefile.am	(working copy)
+--- gnunet-svn-35440/src/transport/Makefile.am	(revision 35440)
++++ gnunet-svn-35440/src/transport/Makefile.am	(working copy)
 @@ -80,20 +80,6 @@
  endif
  
@@ -362,10 +361,10 @@ Index: gnunet-svn-35318/src/transport/Makefile.am
  libgnunet_plugin_transport_http_client_la_LIBADD = \
    $(top_builddir)/src/hello/libgnunethello.la \
    $(top_builddir)/src/statistics/libgnunetstatistics.la \
-Index: gnunet-svn-35318/src/util/Makefile.am
+Index: gnunet-svn-35440/src/util/Makefile.am
 ===================================================================
---- gnunet-svn-35318/src/util/Makefile.am	(revision 35318)
-+++ gnunet-svn-35318/src/util/Makefile.am	(working copy)
+--- gnunet-svn-35440/src/util/Makefile.am	(revision 35440)
++++ gnunet-svn-35440/src/util/Makefile.am	(working copy)
 @@ -67,13 +67,10 @@
  libgnunetutil_la_SOURCES = \
    bandwidth.c \
@@ -396,10 +395,10 @@ Index: gnunet-svn-35318/src/util/Makefile.am
    signal.c \
    strings.c \
    time.c \
-Index: gnunet-svn-35318/src/util/gnunet-service-resolver.c
+Index: gnunet-svn-35440/src/util/gnunet-service-resolver.c
 ===================================================================
---- gnunet-svn-35318/src/util/gnunet-service-resolver.c	(revision 35318)
-+++ gnunet-svn-35318/src/util/gnunet-service-resolver.c	(working copy)
+--- gnunet-svn-35440/src/util/gnunet-service-resolver.c	(revision 35440)
++++ gnunet-svn-35440/src/util/gnunet-service-resolver.c	(working copy)
 @@ -603,20 +603,6 @@
    return ret;
  }