Update gnunet to rev 34824

3 files changed, 65 insertions, 64 deletions

diff --git a/gnunet-build/packages/gnunet/gnunet/Buildrules b/gnunet-build/packages/gnunet/gnunet/Buildrules
index 90a3c55..5f48e93 100644
--- a/gnunet-build/packages/gnunet/gnunet/Buildrules
+++ b/gnunet-build/packages/gnunet/gnunet/Buildrules
@@ -1,4 +1,4 @@
-REVISION="34767"
+REVISION="34824"
 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-34767-all.patch b/gnunet-build/packages/gnunet/gnunet/files/gnunet-svn-34824-all.patch
index 145d5f2..d571d16 100644
--- a/gnunet-build/packages/gnunet/gnunet/files/gnunet-svn-34767-all.patch
+++ b/gnunet-build/packages/gnunet/gnunet/files/gnunet-svn-34824-all.patch
@@ -1,7 +1,7 @@
-Index: gnunet-svn-34767/configure.ac
+Index: gnunet-svn-34824/configure.ac
 ===================================================================
---- gnunet-svn-34767/configure.ac	(revision 34767)
-+++ gnunet-svn-34767/configure.ac	(working copy)
+--- gnunet-svn-34824/configure.ac	(revision 34824)
++++ gnunet-svn-34824/configure.ac	(working copy)
 @@ -605,7 +605,7 @@
      AC_CHECK_HEADERS(ltdl.h,
       AC_CHECK_LIB([ltdl], [lt_dlopenext],
@@ -11,10 +11,10 @@ Index: gnunet-svn-34767/configure.ac
  then
   AC_MSG_RESULT([libltdl found])
  else
-Index: gnunet-svn-34767/po/POTFILES.in
+Index: gnunet-svn-34824/po/POTFILES.in
 ===================================================================
---- gnunet-svn-34767/po/POTFILES.in	(revision 34767)
-+++ gnunet-svn-34767/po/POTFILES.in	(working copy)
+--- gnunet-svn-34824/po/POTFILES.in	(revision 34824)
++++ gnunet-svn-34824/po/POTFILES.in	(working copy)
 @@ -229,6 +229,7 @@
  src/peerstore/gnunet-service-peerstore.c
  src/peerstore/peerstore_api.c
@@ -31,10 +31,10 @@ Index: gnunet-svn-34767/po/POTFILES.in
  src/transport/plugin_transport_http_common.c
  src/transport/plugin_transport_http_server.c
  src/transport/plugin_transport_smtp.c
-Index: gnunet-svn-34767/src/Makefile.am
+Index: gnunet-svn-34824/src/Makefile.am
 ===================================================================
---- gnunet-svn-34767/src/Makefile.am	(revision 34767)
-+++ gnunet-svn-34767/src/Makefile.am	(working copy)
+--- gnunet-svn-34824/src/Makefile.am	(revision 34824)
++++ gnunet-svn-34824/src/Makefile.am	(working copy)
 @@ -66,10 +66,8 @@
    peerinfo-tool \
    core \
@@ -59,10 +59,10 @@ Index: gnunet-svn-34767/src/Makefile.am
 -  pt \
 -  integration-tests \
    $(EXP_DIR)
-Index: gnunet-svn-34767/src/arm/gnunet-service-arm.c
+Index: gnunet-svn-34824/src/arm/gnunet-service-arm.c
 ===================================================================
---- gnunet-svn-34767/src/arm/gnunet-service-arm.c	(revision 34767)
-+++ gnunet-svn-34767/src/arm/gnunet-service-arm.c	(working copy)
+--- gnunet-svn-34824/src/arm/gnunet-service-arm.c	(revision 34824)
++++ gnunet-svn-34824/src/arm/gnunet-service-arm.c	(working copy)
 @@ -1546,19 +1546,5 @@
  }
  
@@ -83,10 +83,10 @@ Index: gnunet-svn-34767/src/arm/gnunet-service-arm.c
 -
 -
  /* end of gnunet-service-arm.c */
-Index: gnunet-svn-34767/src/dht/Makefile.am
+Index: gnunet-svn-34824/src/dht/Makefile.am
 ===================================================================
---- gnunet-svn-34767/src/dht/Makefile.am	(revision 34767)
-+++ gnunet-svn-34767/src/dht/Makefile.am	(working copy)
+--- gnunet-svn-34824/src/dht/Makefile.am	(revision 34824)
++++ gnunet-svn-34824/src/dht/Makefile.am	(working copy)
 @@ -49,12 +49,6 @@
   gnunet-service-dht \
   gnunet-service-dht-xvine
@@ -100,10 +100,10 @@ Index: gnunet-svn-34767/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-34767/src/dht/gnunet-service-dht_neighbours.c
+Index: gnunet-svn-34824/src/dht/gnunet-service-dht_neighbours.c
 ===================================================================
---- gnunet-svn-34767/src/dht/gnunet-service-dht_neighbours.c	(revision 34767)
-+++ gnunet-svn-34767/src/dht/gnunet-service-dht_neighbours.c	(working copy)
+--- gnunet-svn-34824/src/dht/gnunet-service-dht_neighbours.c	(revision 34824)
++++ gnunet-svn-34824/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"
@@ -112,10 +112,10 @@ Index: gnunet-svn-34767/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-34767/src/dns/Makefile.am
+Index: gnunet-svn-34824/src/dns/Makefile.am
 ===================================================================
---- gnunet-svn-34767/src/dns/Makefile.am	(revision 34767)
-+++ gnunet-svn-34767/src/dns/Makefile.am	(working copy)
+--- gnunet-svn-34824/src/dns/Makefile.am	(revision 34824)
++++ gnunet-svn-34824/src/dns/Makefile.am	(working copy)
 @@ -17,14 +17,6 @@
  pkgcfg_DATA = \
    dns.conf
@@ -131,10 +131,10 @@ Index: gnunet-svn-34767/src/dns/Makefile.am
  lib_LTLIBRARIES = \
    libgnunetdnsparser.la \
    libgnunetdnsstub.la \
-Index: gnunet-svn-34767/src/nat/Makefile.am
+Index: gnunet-svn-34824/src/nat/Makefile.am
 ===================================================================
---- gnunet-svn-34767/src/nat/Makefile.am	(revision 34767)
-+++ gnunet-svn-34767/src/nat/Makefile.am	(working copy)
+--- gnunet-svn-34824/src/nat/Makefile.am	(revision 34824)
++++ gnunet-svn-34824/src/nat/Makefile.am	(working copy)
 @@ -14,24 +14,6 @@
  dist_pkgcfg_DATA = \
    nat.conf
@@ -160,10 +160,10 @@ Index: gnunet-svn-34767/src/nat/Makefile.am
  bin_PROGRAMS = \
   gnunet-nat-server 
  
-Index: gnunet-svn-34767/src/nse/gnunet-service-nse.c
+Index: gnunet-svn-34824/src/nse/gnunet-service-nse.c
 ===================================================================
---- gnunet-svn-34767/src/nse/gnunet-service-nse.c	(revision 34767)
-+++ gnunet-svn-34767/src/nse/gnunet-service-nse.c	(working copy)
+--- gnunet-svn-34824/src/nse/gnunet-service-nse.c	(revision 34824)
++++ gnunet-svn-34824/src/nse/gnunet-service-nse.c	(working copy)
 @@ -1629,21 +1629,7 @@
  }
  
@@ -186,10 +186,10 @@ Index: gnunet-svn-34767/src/nse/gnunet-service-nse.c
  
 -
  /* end of gnunet-service-nse.c */
-Index: gnunet-svn-34767/src/peerstore/Makefile.am
+Index: gnunet-svn-34824/src/peerstore/Makefile.am
 ===================================================================
---- gnunet-svn-34767/src/peerstore/Makefile.am	(revision 34767)
-+++ gnunet-svn-34767/src/peerstore/Makefile.am	(working copy)
+--- gnunet-svn-34824/src/peerstore/Makefile.am	(revision 34824)
++++ gnunet-svn-34824/src/peerstore/Makefile.am	(working copy)
 @@ -50,7 +50,7 @@
    $(GN_LIB_LDFLAGS)
  
@@ -218,10 +218,10 @@ Index: gnunet-svn-34767/src/peerstore/Makefile.am
  check_PROGRAMS = \
   test_peerstore_api_store \
   test_peerstore_api_iterate \
-Index: gnunet-svn-34767/src/regex/gnunet-daemon-regexprofiler.c
+Index: gnunet-svn-34824/src/regex/gnunet-daemon-regexprofiler.c
 ===================================================================
---- gnunet-svn-34767/src/regex/gnunet-daemon-regexprofiler.c	(revision 34767)
-+++ gnunet-svn-34767/src/regex/gnunet-daemon-regexprofiler.c	(working copy)
+--- gnunet-svn-34824/src/regex/gnunet-daemon-regexprofiler.c	(revision 34824)
++++ gnunet-svn-34824/src/regex/gnunet-daemon-regexprofiler.c	(working copy)
 @@ -382,19 +382,6 @@
  }
  
@@ -242,10 +242,10 @@ Index: gnunet-svn-34767/src/regex/gnunet-daemon-regexprofiler.c
  
 -
  /* end of gnunet-daemon-regexprofiler.c */
-Index: gnunet-svn-34767/src/revocation/gnunet-service-revocation.c
+Index: gnunet-svn-34824/src/revocation/gnunet-service-revocation.c
 ===================================================================
---- gnunet-svn-34767/src/revocation/gnunet-service-revocation.c	(revision 34767)
-+++ gnunet-svn-34767/src/revocation/gnunet-service-revocation.c	(working copy)
+--- gnunet-svn-34824/src/revocation/gnunet-service-revocation.c	(revision 34824)
++++ gnunet-svn-34824/src/revocation/gnunet-service-revocation.c	(working copy)
 @@ -902,21 +902,7 @@
  }
  
@@ -268,10 +268,10 @@ Index: gnunet-svn-34767/src/revocation/gnunet-service-revocation.c
  
 -
  /* end of gnunet-service-revocation.c */
-Index: gnunet-svn-34767/src/set/Makefile.am
+Index: gnunet-svn-34824/src/set/Makefile.am
 ===================================================================
---- gnunet-svn-34767/src/set/Makefile.am	(revision 34767)
-+++ gnunet-svn-34767/src/set/Makefile.am	(working copy)
+--- gnunet-svn-34824/src/set/Makefile.am	(revision 34824)
++++ gnunet-svn-34824/src/set/Makefile.am	(working copy)
 @@ -15,9 +15,6 @@
    AM_CFLAGS = -fprofile-arcs -ftest-coverage
  endif
@@ -282,12 +282,12 @@ Index: gnunet-svn-34767/src/set/Makefile.am
  libexec_PROGRAMS = \
   gnunet-service-set
  
-Index: gnunet-svn-34767/src/statistics/gnunet-service-statistics.c
+Index: gnunet-svn-34824/src/statistics/gnunet-service-statistics.c
 ===================================================================
---- gnunet-svn-34767/src/statistics/gnunet-service-statistics.c	(revision 34767)
-+++ gnunet-svn-34767/src/statistics/gnunet-service-statistics.c	(working copy)
-@@ -861,19 +861,6 @@
-                               GNUNET_SERVICE_OPTION_SOFT_SHUTDOWN, &run, NULL)) ? 0 : 1;
+--- gnunet-svn-34824/src/statistics/gnunet-service-statistics.c	(revision 34824)
++++ gnunet-svn-34824/src/statistics/gnunet-service-statistics.c	(working copy)
+@@ -1077,20 +1077,5 @@
+                               &run, NULL)) ? 0 : 1;
  }
  
 -#ifdef LINUX
@@ -296,20 +296,21 @@ Index: gnunet-svn-34767/src/statistics/gnunet-service-statistics.c
 -/**
 - * MINIMIZE heap size (way below 128k) since this process doesn't need much.
 - */
--void __attribute__ ((constructor)) GNUNET_ARM_memory_init ()
+-void __attribute__ ((constructor))
+-GNUNET_STATISTICS_memory_init ()
 -{
 -  mallopt (M_TRIM_THRESHOLD, 4 * 1024);
 -  mallopt (M_TOP_PAD, 1 * 1024);
 -  malloc_trim (0);
 -}
 -#endif
- 
+-
 -
  /* end of gnunet-service-statistics.c */
-Index: gnunet-svn-34767/src/topology/gnunet-daemon-topology.c
+Index: gnunet-svn-34824/src/topology/gnunet-daemon-topology.c
 ===================================================================
---- gnunet-svn-34767/src/topology/gnunet-daemon-topology.c	(revision 34767)
-+++ gnunet-svn-34767/src/topology/gnunet-daemon-topology.c	(working copy)
+--- gnunet-svn-34824/src/topology/gnunet-daemon-topology.c	(revision 34824)
++++ gnunet-svn-34824/src/topology/gnunet-daemon-topology.c	(working copy)
 @@ -1327,18 +1327,5 @@
  }
  
@@ -329,10 +330,10 @@ Index: gnunet-svn-34767/src/topology/gnunet-daemon-topology.c
 -#endif
 -
  /* end of gnunet-daemon-topology.c */
-Index: gnunet-svn-34767/src/transport/Makefile.am
+Index: gnunet-svn-34824/src/transport/Makefile.am
 ===================================================================
---- gnunet-svn-34767/src/transport/Makefile.am	(revision 34767)
-+++ gnunet-svn-34767/src/transport/Makefile.am	(working copy)
+--- gnunet-svn-34824/src/transport/Makefile.am	(revision 34824)
++++ gnunet-svn-34824/src/transport/Makefile.am	(working copy)
 @@ -79,20 +79,6 @@
  endif
  
@@ -382,10 +383,10 @@ Index: gnunet-svn-34767/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-34767/src/util/Makefile.am
+Index: gnunet-svn-34824/src/util/Makefile.am
 ===================================================================
---- gnunet-svn-34767/src/util/Makefile.am	(revision 34767)
-+++ gnunet-svn-34767/src/util/Makefile.am	(working copy)
+--- gnunet-svn-34824/src/util/Makefile.am	(revision 34824)
++++ gnunet-svn-34824/src/util/Makefile.am	(working copy)
 @@ -66,13 +66,10 @@
  libgnunetutil_la_SOURCES = \
    bandwidth.c \
@@ -416,10 +417,10 @@ Index: gnunet-svn-34767/src/util/Makefile.am
    signal.c \
    strings.c \
    time.c \
-Index: gnunet-svn-34767/src/util/gnunet-service-resolver.c
+Index: gnunet-svn-34824/src/util/gnunet-service-resolver.c
 ===================================================================
---- gnunet-svn-34767/src/util/gnunet-service-resolver.c	(revision 34767)
-+++ gnunet-svn-34767/src/util/gnunet-service-resolver.c	(working copy)
+--- gnunet-svn-34824/src/util/gnunet-service-resolver.c	(revision 34824)
++++ gnunet-svn-34824/src/util/gnunet-service-resolver.c	(working copy)
 @@ -603,20 +603,6 @@
    return ret;
  }
diff --git a/gnunet-build/packages/gnunet/gnunet/files/plugin_transport_http_client_emscripten.c b/gnunet-build/packages/gnunet/gnunet/files/plugin_transport_http_client_emscripten.c
index dfabc1f..c491d03 100644
--- a/gnunet-build/packages/gnunet/gnunet/files/plugin_transport_http_client_emscripten.c
+++ b/gnunet-build/packages/gnunet/gnunet/files/plugin_transport_http_client_emscripten.c
@@ -142,7 +142,7 @@ struct Session
   /**
    * Session timeout task
    */
-  GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+  struct GNUNET_SCHEDULER_Task *timeout_task;
 
   /**
    * Absolute time when to receive data again
@@ -299,10 +299,10 @@ client_delete_session (struct Session *s)
 {
   struct HTTP_Client_Plugin *plugin = s->plugin;
 
-  if (GNUNET_SCHEDULER_NO_TASK != s->timeout_task)
+  if (NULL != s->timeout_task)
   {
     GNUNET_SCHEDULER_cancel (s->timeout_task);
-    s->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+    s->timeout_task = NULL;
     s->timeout = GNUNET_TIME_UNIT_ZERO_ABS;
   }
   GNUNET_assert (GNUNET_OK ==
@@ -349,7 +349,7 @@ client_delete_session (struct Session *s)
 static void
 client_reschedule_session_timeout (struct Session *s)
 {
-  GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != s->timeout_task);
+  GNUNET_assert (NULL != s->timeout_task);
   s->timeout = GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
 }
 
@@ -832,7 +832,7 @@ client_session_timeout (void *cls,
   struct Session *s = cls;
   struct GNUNET_TIME_Relative left;
 
-  s->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+  s->timeout_task = NULL;
   left = GNUNET_TIME_absolute_get_remaining (s->timeout);
   if (0 != left.rel_value_us)
   {