Update gnunet to rev 34155

2 files changed, 53 insertions, 53 deletions

diff --git a/gnunet-build/packages/gnunet/gnunet/Buildrules b/gnunet-build/packages/gnunet/gnunet/Buildrules
index fedd872..0b42e93 100644
--- a/gnunet-build/packages/gnunet/gnunet/Buildrules
+++ b/gnunet-build/packages/gnunet/gnunet/Buildrules
@@ -1,4 +1,4 @@
-REVISION="34051"
+REVISION="34155"
 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-34051-all.patch b/gnunet-build/packages/gnunet/gnunet/files/gnunet-svn-34155-all.patch
index c382cc9..7ee6e65 100644
--- a/gnunet-build/packages/gnunet/gnunet/files/gnunet-svn-34051-all.patch
+++ b/gnunet-build/packages/gnunet/gnunet/files/gnunet-svn-34155-all.patch
@@ -1,7 +1,7 @@
-Index: gnunet-svn-34051/configure.ac
+Index: gnunet-svn-34155/configure.ac
 ===================================================================
---- gnunet-svn-34051/configure.ac	(revision 34051)
-+++ gnunet-svn-34051/configure.ac	(working copy)
+--- gnunet-svn-34155/configure.ac	(revision 34155)
++++ gnunet-svn-34155/configure.ac	(working copy)
 @@ -582,7 +582,7 @@
      AC_CHECK_HEADERS(ltdl.h,
       AC_CHECK_LIB([ltdl], [lt_dlopenext],
@@ -11,10 +11,10 @@ Index: gnunet-svn-34051/configure.ac
  then
   AC_MSG_RESULT([libltdl found])
  else
-Index: gnunet-svn-34051/src/Makefile.am
+Index: gnunet-svn-34155/src/Makefile.am
 ===================================================================
---- gnunet-svn-34051/src/Makefile.am	(revision 34051)
-+++ gnunet-svn-34051/src/Makefile.am	(working copy)
+--- gnunet-svn-34155/src/Makefile.am	(revision 34155)
++++ gnunet-svn-34155/src/Makefile.am	(working copy)
 @@ -69,10 +69,8 @@
    peerinfo-tool \
    core \
@@ -39,10 +39,10 @@ Index: gnunet-svn-34051/src/Makefile.am
 -  pt \
 -  integration-tests \
    $(EXP_DIR)
-Index: gnunet-svn-34051/src/arm/gnunet-service-arm.c
+Index: gnunet-svn-34155/src/arm/gnunet-service-arm.c
 ===================================================================
---- gnunet-svn-34051/src/arm/gnunet-service-arm.c	(revision 34051)
-+++ gnunet-svn-34051/src/arm/gnunet-service-arm.c	(working copy)
+--- gnunet-svn-34155/src/arm/gnunet-service-arm.c	(revision 34155)
++++ gnunet-svn-34155/src/arm/gnunet-service-arm.c	(working copy)
 @@ -1561,19 +1561,5 @@
  }
  
@@ -63,10 +63,10 @@ Index: gnunet-svn-34051/src/arm/gnunet-service-arm.c
 -
 -
  /* end of gnunet-service-arm.c */
-Index: gnunet-svn-34051/src/dht/Makefile.am
+Index: gnunet-svn-34155/src/dht/Makefile.am
 ===================================================================
---- gnunet-svn-34051/src/dht/Makefile.am	(revision 34051)
-+++ gnunet-svn-34051/src/dht/Makefile.am	(working copy)
+--- gnunet-svn-34155/src/dht/Makefile.am	(revision 34155)
++++ gnunet-svn-34155/src/dht/Makefile.am	(working copy)
 @@ -52,12 +52,6 @@
   gnunet-service-dht \
   gnunet-service-dht-xvine
@@ -80,10 +80,10 @@ Index: gnunet-svn-34051/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-34051/src/dht/gnunet-service-dht_neighbours.c
+Index: gnunet-svn-34155/src/dht/gnunet-service-dht_neighbours.c
 ===================================================================
---- gnunet-svn-34051/src/dht/gnunet-service-dht_neighbours.c	(revision 34051)
-+++ gnunet-svn-34051/src/dht/gnunet-service-dht_neighbours.c	(working copy)
+--- gnunet-svn-34155/src/dht/gnunet-service-dht_neighbours.c	(revision 34155)
++++ gnunet-svn-34155/src/dht/gnunet-service-dht_neighbours.c	(working copy)
 @@ -46,7 +46,6 @@
  #include "gnunet-service-dht_neighbours.h"
  #include "gnunet-service-dht_nse.h"
@@ -92,10 +92,10 @@ Index: gnunet-svn-34051/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-34051/src/dns/Makefile.am
+Index: gnunet-svn-34155/src/dns/Makefile.am
 ===================================================================
---- gnunet-svn-34051/src/dns/Makefile.am	(revision 34051)
-+++ gnunet-svn-34051/src/dns/Makefile.am	(working copy)
+--- gnunet-svn-34155/src/dns/Makefile.am	(revision 34155)
++++ gnunet-svn-34155/src/dns/Makefile.am	(working copy)
 @@ -17,14 +17,6 @@
  pkgcfg_DATA = \
    dns.conf
@@ -111,10 +111,10 @@ Index: gnunet-svn-34051/src/dns/Makefile.am
  lib_LTLIBRARIES = \
    libgnunetdnsparser.la \
    libgnunetdnsstub.la \
-Index: gnunet-svn-34051/src/nat/Makefile.am
+Index: gnunet-svn-34155/src/nat/Makefile.am
 ===================================================================
---- gnunet-svn-34051/src/nat/Makefile.am	(revision 34051)
-+++ gnunet-svn-34051/src/nat/Makefile.am	(working copy)
+--- gnunet-svn-34155/src/nat/Makefile.am	(revision 34155)
++++ gnunet-svn-34155/src/nat/Makefile.am	(working copy)
 @@ -14,24 +14,6 @@
  dist_pkgcfg_DATA = \
    nat.conf
@@ -140,10 +140,10 @@ Index: gnunet-svn-34051/src/nat/Makefile.am
  bin_PROGRAMS = \
   gnunet-nat-server 
  
-Index: gnunet-svn-34051/src/nse/gnunet-service-nse.c
+Index: gnunet-svn-34155/src/nse/gnunet-service-nse.c
 ===================================================================
---- gnunet-svn-34051/src/nse/gnunet-service-nse.c	(revision 34051)
-+++ gnunet-svn-34051/src/nse/gnunet-service-nse.c	(working copy)
+--- gnunet-svn-34155/src/nse/gnunet-service-nse.c	(revision 34155)
++++ gnunet-svn-34155/src/nse/gnunet-service-nse.c	(working copy)
 @@ -1609,21 +1609,7 @@
  }
  
@@ -166,12 +166,12 @@ Index: gnunet-svn-34051/src/nse/gnunet-service-nse.c
  
 -
  /* end of gnunet-service-nse.c */
-Index: gnunet-svn-34051/src/peerstore/Makefile.am
+Index: gnunet-svn-34155/src/peerstore/Makefile.am
 ===================================================================
---- gnunet-svn-34051/src/peerstore/Makefile.am	(revision 34051)
-+++ gnunet-svn-34051/src/peerstore/Makefile.am	(working copy)
+--- gnunet-svn-34155/src/peerstore/Makefile.am	(revision 34155)
++++ gnunet-svn-34155/src/peerstore/Makefile.am	(working copy)
 @@ -50,7 +50,7 @@
-   $(GNUNET_LDFLAGS)
+   $(GN_LIB_LDFLAGS)
  
  plugin_LTLIBRARIES = \
 -  libgnunet_plugin_peerstore_sqlite.la
@@ -198,10 +198,10 @@ Index: gnunet-svn-34051/src/peerstore/Makefile.am
  check_PROGRAMS = \
   test_peerstore_api_store \
   test_peerstore_api_iterate \
-Index: gnunet-svn-34051/src/regex/gnunet-daemon-regexprofiler.c
+Index: gnunet-svn-34155/src/regex/gnunet-daemon-regexprofiler.c
 ===================================================================
---- gnunet-svn-34051/src/regex/gnunet-daemon-regexprofiler.c	(revision 34051)
-+++ gnunet-svn-34051/src/regex/gnunet-daemon-regexprofiler.c	(working copy)
+--- gnunet-svn-34155/src/regex/gnunet-daemon-regexprofiler.c	(revision 34155)
++++ gnunet-svn-34155/src/regex/gnunet-daemon-regexprofiler.c	(working copy)
 @@ -382,19 +382,6 @@
  }
  
@@ -222,10 +222,10 @@ Index: gnunet-svn-34051/src/regex/gnunet-daemon-regexprofiler.c
  
 -
  /* end of gnunet-daemon-regexprofiler.c */
-Index: gnunet-svn-34051/src/revocation/gnunet-service-revocation.c
+Index: gnunet-svn-34155/src/revocation/gnunet-service-revocation.c
 ===================================================================
---- gnunet-svn-34051/src/revocation/gnunet-service-revocation.c	(revision 34051)
-+++ gnunet-svn-34051/src/revocation/gnunet-service-revocation.c	(working copy)
+--- gnunet-svn-34155/src/revocation/gnunet-service-revocation.c	(revision 34155)
++++ gnunet-svn-34155/src/revocation/gnunet-service-revocation.c	(working copy)
 @@ -901,21 +901,7 @@
  }
  
@@ -248,10 +248,10 @@ Index: gnunet-svn-34051/src/revocation/gnunet-service-revocation.c
  
 -
  /* end of gnunet-service-revocation.c */
-Index: gnunet-svn-34051/src/set/Makefile.am
+Index: gnunet-svn-34155/src/set/Makefile.am
 ===================================================================
---- gnunet-svn-34051/src/set/Makefile.am	(revision 34051)
-+++ gnunet-svn-34051/src/set/Makefile.am	(working copy)
+--- gnunet-svn-34155/src/set/Makefile.am	(revision 34155)
++++ gnunet-svn-34155/src/set/Makefile.am	(working copy)
 @@ -24,24 +24,6 @@
  lib_LTLIBRARIES = \
    libgnunetset.la
@@ -277,10 +277,10 @@ Index: gnunet-svn-34051/src/set/Makefile.am
  gnunet_service_set_SOURCES = \
   gnunet-service-set.c gnunet-service-set.h \
   gnunet-service-set_union.c \
-Index: gnunet-svn-34051/src/statistics/gnunet-service-statistics.c
+Index: gnunet-svn-34155/src/statistics/gnunet-service-statistics.c
 ===================================================================
---- gnunet-svn-34051/src/statistics/gnunet-service-statistics.c	(revision 34051)
-+++ gnunet-svn-34051/src/statistics/gnunet-service-statistics.c	(working copy)
+--- gnunet-svn-34155/src/statistics/gnunet-service-statistics.c	(revision 34155)
++++ gnunet-svn-34155/src/statistics/gnunet-service-statistics.c	(working copy)
 @@ -861,19 +861,6 @@
                                GNUNET_SERVICE_OPTION_SOFT_SHUTDOWN, &run, NULL)) ? 0 : 1;
  }
@@ -301,10 +301,10 @@ Index: gnunet-svn-34051/src/statistics/gnunet-service-statistics.c
  
 -
  /* end of gnunet-service-statistics.c */
-Index: gnunet-svn-34051/src/topology/gnunet-daemon-topology.c
+Index: gnunet-svn-34155/src/topology/gnunet-daemon-topology.c
 ===================================================================
---- gnunet-svn-34051/src/topology/gnunet-daemon-topology.c	(revision 34051)
-+++ gnunet-svn-34051/src/topology/gnunet-daemon-topology.c	(working copy)
+--- gnunet-svn-34155/src/topology/gnunet-daemon-topology.c	(revision 34155)
++++ gnunet-svn-34155/src/topology/gnunet-daemon-topology.c	(working copy)
 @@ -1327,18 +1327,5 @@
  }
  
@@ -324,10 +324,10 @@ Index: gnunet-svn-34051/src/topology/gnunet-daemon-topology.c
 -#endif
 -
  /* end of gnunet-daemon-topology.c */
-Index: gnunet-svn-34051/src/transport/Makefile.am
+Index: gnunet-svn-34155/src/transport/Makefile.am
 ===================================================================
---- gnunet-svn-34051/src/transport/Makefile.am	(revision 34051)
-+++ gnunet-svn-34051/src/transport/Makefile.am	(working copy)
+--- gnunet-svn-34155/src/transport/Makefile.am	(revision 34155)
++++ gnunet-svn-34155/src/transport/Makefile.am	(working copy)
 @@ -50,20 +50,6 @@
  endif
  
@@ -377,10 +377,10 @@ Index: gnunet-svn-34051/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-34051/src/util/Makefile.am
+Index: gnunet-svn-34155/src/util/Makefile.am
 ===================================================================
---- gnunet-svn-34051/src/util/Makefile.am	(revision 34051)
-+++ gnunet-svn-34051/src/util/Makefile.am	(working copy)
+--- gnunet-svn-34155/src/util/Makefile.am	(revision 34155)
++++ gnunet-svn-34155/src/util/Makefile.am	(working copy)
 @@ -72,13 +72,10 @@
  libgnunetutil_la_SOURCES = \
    bandwidth.c \
@@ -411,10 +411,10 @@ Index: gnunet-svn-34051/src/util/Makefile.am
    signal.c \
    strings.c \
    time.c \
-Index: gnunet-svn-34051/src/util/gnunet-service-resolver.c
+Index: gnunet-svn-34155/src/util/gnunet-service-resolver.c
 ===================================================================
---- gnunet-svn-34051/src/util/gnunet-service-resolver.c	(revision 34051)
-+++ gnunet-svn-34051/src/util/gnunet-service-resolver.c	(working copy)
+--- gnunet-svn-34155/src/util/gnunet-service-resolver.c	(revision 34155)
++++ gnunet-svn-34155/src/util/gnunet-service-resolver.c	(working copy)
 @@ -603,20 +603,6 @@
    return ret;
  }