Update gnunet to commit 4ac7b3

2 files changed, 78 insertions, 61 deletions

diff --git a/gnunet-build/packages/gnunet/gnunet/Buildrules b/gnunet-build/packages/gnunet/gnunet/Buildrules
index b58b469..ddf8785 100644
--- a/gnunet-build/packages/gnunet/gnunet/Buildrules
+++ b/gnunet-build/packages/gnunet/gnunet/Buildrules
@@ -1,4 +1,4 @@
-COMMIT="3f9b17"
+COMMIT="4ac7b3"
 VERSION="git-${COMMIT}"
 RELEASE="0"
 DESCRIPTION="GNUnet is a framework for secure peer-to-peer networking that does not use any centralized or otherwise trusted services."
diff --git a/gnunet-build/packages/gnunet/gnunet/files/gnunet-git-3f9b17-all.patch b/gnunet-build/packages/gnunet/gnunet/files/gnunet-git-4ac7b3-all.patch
index 69721e1..69ec34b 100644
--- a/gnunet-build/packages/gnunet/gnunet/files/gnunet-git-3f9b17-all.patch
+++ b/gnunet-build/packages/gnunet/gnunet/files/gnunet-git-4ac7b3-all.patch
@@ -1,8 +1,8 @@
 diff --git a/configure.ac b/configure.ac
-index 145a6aaff..93b13d636 100644
+index 804a7dd56..44881b985 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -701,7 +701,7 @@ AC_ARG_WITH(ltdl,
+@@ -811,7 +811,7 @@ AC_ARG_WITH(ltdl,
      AC_CHECK_HEADERS(ltdl.h,
       AC_CHECK_LIB([ltdl], [lt_dlopenext],
        ltdl=1))])
@@ -12,10 +12,18 @@ index 145a6aaff..93b13d636 100644
   AC_MSG_RESULT([libltdl found])
  else
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 6d0284157..58a954b53 100644
+index 39cbaa893..05370e160 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -100,7 +100,6 @@ SUBDIRS = \
+@@ -80,7 +80,6 @@ else
+ SUBDIRS = \
+   include $(INTLEMU_SUBDIRS) \
+   util \
+-  gnsrecord \
+   hello \
+   block \
+   statistics \
+@@ -105,30 +104,20 @@ SUBDIRS = \
    $(ATS_TESTS) \
    nse \
    dht \
@@ -23,7 +31,12 @@ index 6d0284157..58a954b53 100644
    topology \
    regex \
    dns \
-@@ -114,20 +113,8 @@ SUBDIRS = \
+   identity \
+-  namecache \
+-  namestore \
+   peerstore \
+   cadet \
+   set \
    consensus \
    scalarproduct \
    revocation \
@@ -35,15 +48,13 @@ index 6d0284157..58a954b53 100644
 -  exit \
 -  pt \
 -  secretsharing \
--  integration-tests \
--  multicast \
--  psycutil \
--  psycstore \
--  psyc \
--  social \
-   $(AUCTION_DIR) \
-   $(EXP_DIR)
+ 	$(EXP_DIR) \
+   $(JSON_DIR) \
+-  $(REST_DIR) \
+-  integration-tests 
++  $(REST_DIR)
  
+ endif
 diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am
 index 240abbc67..db784cc44 100644
 --- a/src/datastore/Makefile.am
@@ -93,7 +104,7 @@ index c52ac93c7..d3983ef9e 100644
  gnunet_service_dht_SOURCES = \
   gnunet-service-dht.c gnunet-service-dht.h \
 diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am
-index 5af228121..523c760a8 100644
+index ca2685765..07eb794ca 100644
 --- a/src/dns/Makefile.am
 +++ b/src/dns/Makefile.am
 @@ -18,14 +18,6 @@ plugindir = $(libdir)/gnunet
@@ -109,13 +120,13 @@ index 5af228121..523c760a8 100644
 -endif
 -
  lib_LTLIBRARIES = \
-   libgnunetdnsparser.la \
-   libgnunetdnsstub.la \
+   libgnunetdns.la
+ 
 diff --git a/src/fs/fs_api.c b/src/fs/fs_api.c
-index a5b82ec27..5801aa87b 100644
+index 9b783ba93..f4aa012b1 100644
 --- a/src/fs/fs_api.c
 +++ b/src/fs/fs_api.c
-@@ -456,19 +456,22 @@ struct FileInfo
+@@ -454,19 +454,22 @@ struct FileInfo
   *            to provide less data unless there is an error;
   *            a value of "0" will be used at the end to allow
   *            the reader to clean up its internal state
@@ -144,7 +155,7 @@ index a5b82ec27..5801aa87b 100644
  
    if (UINT64_MAX == offset)
    {
-@@ -477,7 +480,7 @@ GNUNET_FS_data_reader_file_ (void *cls,
+@@ -475,7 +478,7 @@ GNUNET_FS_data_reader_file_ (void *cls,
        GNUNET_DISK_file_close (fi->fd);
        fi->fd = NULL;
      }
@@ -153,7 +164,7 @@ index a5b82ec27..5801aa87b 100644
    }
    if (0 == max)
    {
-@@ -485,7 +488,7 @@ GNUNET_FS_data_reader_file_ (void *cls,
+@@ -483,7 +486,7 @@ GNUNET_FS_data_reader_file_ (void *cls,
        GNUNET_DISK_file_close (fi->fd);
      GNUNET_free (fi->filename);
      GNUNET_free (fi);
@@ -162,7 +173,7 @@ index a5b82ec27..5801aa87b 100644
    }
    if (NULL == fi->fd)
    {
-@@ -499,7 +502,9 @@ GNUNET_FS_data_reader_file_ (void *cls,
+@@ -497,7 +500,9 @@ GNUNET_FS_data_reader_file_ (void *cls,
                         _("Could not open file `%s': %s"),
                         fi->filename,
                         STRERROR (errno));
@@ -173,7 +184,7 @@ index a5b82ec27..5801aa87b 100644
      }
    }
    if ( (GNUNET_SYSERR ==
-@@ -510,16 +515,22 @@ GNUNET_FS_data_reader_file_ (void *cls,
+@@ -508,16 +513,22 @@ GNUNET_FS_data_reader_file_ (void *cls,
                       _("Could not read file `%s': %s"),
                       fi->filename,
                       STRERROR (errno));
@@ -199,7 +210,7 @@ index a5b82ec27..5801aa87b 100644
  }
  
  
-@@ -561,28 +572,30 @@ GNUNET_FS_make_file_reader_context_ (const char *filename)
+@@ -559,28 +570,30 @@ GNUNET_FS_make_file_reader_context_ (const char *filename)
   *            to provide less data unless there is an error;
   *            a value of "0" will be used at the end to allow
   *            the reader to clean up its internal state
@@ -240,7 +251,7 @@ index a5b82ec27..5801aa87b 100644
  }
  
  
-@@ -1250,43 +1263,6 @@ make_serialization_file_name_in_dir (struct GNUNET_FS_Handle *h,
+@@ -1248,43 +1261,6 @@ make_serialization_file_name_in_dir (struct GNUNET_FS_Handle *h,
  
  
  /**
@@ -284,7 +295,7 @@ index a5b82ec27..5801aa87b 100644
   * Create a temporary file on disk to store the current
   * state of @a fi in.
   *
-@@ -1370,7 +1346,6 @@ GNUNET_FS_file_information_sync_ (struct GNUNET_FS_FileInformation *fi)
+@@ -1368,7 +1344,6 @@ GNUNET_FS_file_information_sync_ (struct GNUNET_FS_FileInformation *fi)
        goto cleanup;
      }
      if ((GNUNET_NO == fi->is_published) && (NULL == fi->filename))
@@ -293,10 +304,10 @@ index a5b82ec27..5801aa87b 100644
          GNUNET_break (0);
          goto cleanup;
 diff --git a/src/fs/fs_api.h b/src/fs/fs_api.h
-index be22ea73e..2ae9f71f5 100644
+index 35a3c6837..ac1332f57 100644
 --- a/src/fs/fs_api.h
 +++ b/src/fs/fs_api.h
-@@ -670,16 +670,17 @@ GNUNET_FS_dequeue_ (struct GNUNET_FS_QueueEntry *qe);
+@@ -668,16 +668,17 @@ GNUNET_FS_dequeue_ (struct GNUNET_FS_QueueEntry *qe);
   *            to provide less data unless there is an error;
   *            a value of "0" will be used at the end to allow
   *            the reader to clean up its internal state
@@ -320,7 +331,7 @@ index be22ea73e..2ae9f71f5 100644
  
  
  /**
-@@ -705,16 +706,17 @@ GNUNET_FS_make_file_reader_context_ (const char *filename);
+@@ -703,16 +704,17 @@ GNUNET_FS_make_file_reader_context_ (const char *filename);
   *            to provide less data unless there is an error;
   *            a value of "0" will be used at the end to allow
   *            the reader to clean up its internal state
@@ -345,10 +356,10 @@ index be22ea73e..2ae9f71f5 100644
  
  /**
 diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c
-index c2a3d4c5d..f386ce1f3 100644
+index b32e9ddde..631b01986 100644
 --- a/src/fs/fs_download.c
 +++ b/src/fs/fs_download.c
-@@ -1762,33 +1762,36 @@ reconstruct_cb (void *cls,
+@@ -1760,33 +1760,36 @@ reconstruct_cb (void *cls,
   * @param offset identifies which block to get
   * @param max (maximum) number of bytes to get; returning
   *        fewer will also cause errors
@@ -400,10 +411,10 @@ index c2a3d4c5d..f386ce1f3 100644
  
  
 diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c
-index 759467ba4..bd7bc606e 100644
+index 2bb7c5750..82039b15c 100644
 --- a/src/fs/fs_publish.c
 +++ b/src/fs/fs_publish.c
-@@ -363,24 +363,24 @@ publish_kblocks_cont (void *cls,
+@@ -361,24 +361,24 @@ publish_kblocks_cont (void *cls,
   * @param emsg location to store an error message (on error)
   * @return number of bytes copied to buf, 0 on error
   */
@@ -434,7 +445,7 @@ index 759467ba4..bd7bc606e 100644
    }
    else
    {
-@@ -391,18 +391,11 @@ block_reader (void *cls,
+@@ -389,18 +389,11 @@ block_reader (void *cls,
  	/* force closing the file to avoid keeping too many files open */
  	p->data.file.reader (p->data.file.reader_cls, offset, 0, NULL, NULL);
        }
@@ -457,7 +468,7 @@ index 759467ba4..bd7bc606e 100644
  }
  
  
-@@ -610,7 +603,6 @@ static void
+@@ -608,7 +601,6 @@ static void
  publish_content (struct GNUNET_FS_PublishContext *pc)
  {
    struct GNUNET_FS_FileInformation *p;
@@ -465,7 +476,7 @@ index 759467ba4..bd7bc606e 100644
    struct GNUNET_FS_DirectoryBuilder *db;
    struct GNUNET_FS_FileInformation *dirpos;
    void *raw_data;
-@@ -635,22 +627,6 @@ publish_content (struct GNUNET_FS_PublishContext *pc)
+@@ -633,22 +625,6 @@ publish_content (struct GNUNET_FS_PublishContext *pc)
          else
          {
            raw_data = NULL;
@@ -489,10 +500,10 @@ index 759467ba4..bd7bc606e 100644
          GNUNET_FS_directory_builder_add (db, dirpos->chk_uri, dirpos->meta,
                                           raw_data);
 diff --git a/src/fs/fs_test_lib.c b/src/fs/fs_test_lib.c
-index d03888021..7c05639ac 100644
+index f8ed3a22f..2b7678503 100644
 --- a/src/fs/fs_test_lib.c
 +++ b/src/fs/fs_test_lib.c
-@@ -273,26 +273,23 @@ publish_progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
+@@ -271,26 +271,23 @@ publish_progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
   * @param cls pointer to uint32_t with publishing seed
   * @param offset offset to generate data for
   * @param max maximum number of bytes to generate
@@ -527,7 +538,7 @@ index d03888021..7c05639ac 100644
    for (pos = 0; pos < 8; pos++)
      cbuf[pos] = (uint8_t) (offset >> pos * 8);
    for (pos = 8; pos < max; pos++)
-@@ -302,7 +299,9 @@ file_generator (void *cls,
+@@ -300,7 +297,9 @@ file_generator (void *cls,
        mod = 1;
      cbuf[pos] = (uint8_t) ((offset * (*publish_seed)) % mod);
    }
@@ -538,7 +549,7 @@ index d03888021..7c05639ac 100644
  }
  
  
-@@ -346,6 +345,24 @@ fs_disconnect_adapter (void *cls,
+@@ -344,6 +343,24 @@ fs_disconnect_adapter (void *cls,
  
  
  /**
@@ -563,7 +574,7 @@ index d03888021..7c05639ac 100644
   * Callback to be called when testbed has connected to the fs service
   *
   * @param cls the 'struct TestPublishOperation'
-@@ -363,9 +380,7 @@ publish_fs_connect_complete_cb (void *cls,
+@@ -361,9 +378,7 @@ publish_fs_connect_complete_cb (void *cls,
    struct TestPublishOperation *po = cls;
    struct GNUNET_FS_FileInformation *fi;
    struct GNUNET_DISK_FileHandle *fh;
@@ -573,7 +584,7 @@ index d03888021..7c05639ac 100644
    size_t bsize;
    struct GNUNET_FS_BlockOptions bo;
  
-@@ -397,11 +412,8 @@ publish_fs_connect_complete_cb (void *cls,
+@@ -395,11 +410,8 @@ publish_fs_connect_complete_cb (void *cls,
      off = 0;
      while (off < po->size)
      {
@@ -588,10 +599,10 @@ index d03888021..7c05639ac 100644
      }
      GNUNET_assert (GNUNET_OK == GNUNET_DISK_file_close (fh));
 diff --git a/src/fs/fs_tree.c b/src/fs/fs_tree.c
-index e57e4e494..c5b7dbdd2 100644
+index 1f391da71..c90c6dc93 100644
 --- a/src/fs/fs_tree.c
 +++ b/src/fs/fs_tree.c
-@@ -322,59 +322,27 @@ compute_chk_offset (unsigned int depth, uint64_t end_offset)
+@@ -320,59 +320,27 @@ compute_chk_offset (unsigned int depth, uint64_t end_offset)
  
  
  /**
@@ -660,7 +671,7 @@ index e57e4e494..c5b7dbdd2 100644
    off = compute_chk_offset (te->current_depth, te->publish_offset);
    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                "TE is at offset %llu and depth %u with block size %u and target-CHK-offset %u\n",
-@@ -416,6 +384,58 @@ GNUNET_FS_tree_encoder_next (struct GNUNET_FS_TreeEncoder *te)
+@@ -414,6 +382,58 @@ GNUNET_FS_tree_encoder_next (struct GNUNET_FS_TreeEncoder *te)
  
  
  /**
@@ -719,7 +730,7 @@ index e57e4e494..c5b7dbdd2 100644
   * Get the resulting URI from the encoding.
   *
   * @param te the tree encoder to clean up
-@@ -446,7 +466,7 @@ GNUNET_FS_tree_encoder_finish (struct GNUNET_FS_TreeEncoder *te,
+@@ -444,7 +464,7 @@ GNUNET_FS_tree_encoder_finish (struct GNUNET_FS_TreeEncoder *te,
  {
    if (NULL != te->reader)
    {
@@ -729,10 +740,10 @@ index e57e4e494..c5b7dbdd2 100644
    }
    GNUNET_assert (GNUNET_NO == te->in_next);
 diff --git a/src/fs/fs_unindex.c b/src/fs/fs_unindex.c
-index 95a48f8cc..7e55936cf 100644
+index 776c868e6..a62668b9a 100644
 --- a/src/fs/fs_unindex.c
 +++ b/src/fs/fs_unindex.c
-@@ -43,32 +43,37 @@
+@@ -41,32 +41,37 @@
   * @param offset identifies which block to get
   * @param max (maximum) number of bytes to get; returning
   *        fewer will also cause errors
@@ -785,10 +796,10 @@ index 95a48f8cc..7e55936cf 100644
  
  
 diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h
-index cbad374b5..9cbc66c2e 100644
+index 2030c942c..162222c26 100644
 --- a/src/include/gnunet_fs_service.h
 +++ b/src/include/gnunet_fs_service.h
-@@ -1860,6 +1860,20 @@ GNUNET_FS_file_information_create_from_data (struct GNUNET_FS_Handle *h,
+@@ -1858,6 +1858,20 @@ GNUNET_FS_file_information_create_from_data (struct GNUNET_FS_Handle *h,
  
  
  /**
@@ -809,7 +820,7 @@ index cbad374b5..9cbc66c2e 100644
   * Function that provides data.
   *
   * @param cls closure
-@@ -1871,20 +1885,21 @@ GNUNET_FS_file_information_create_from_data (struct GNUNET_FS_Handle *h,
+@@ -1869,20 +1883,21 @@ GNUNET_FS_file_information_create_from_data (struct GNUNET_FS_Handle *h,
   *             clean up the reader's state); in this case,
   *            a value of '0' for max should be ignored
   * @param max maximum number of bytes that should be
@@ -892,7 +903,7 @@ index 3aef05769..beaf6a204 100644
  	$(FLAT_PLUGIN)
  
 diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
-index e8c1f5d4a..0863ed399 100644
+index d0db6b141..6ac35c1b7 100644
 --- a/src/transport/Makefile.am
 +++ b/src/transport/Makefile.am
 @@ -80,20 +80,6 @@ endif
@@ -916,7 +927,7 @@ index e8c1f5d4a..0863ed399 100644
  install-exec-hook:
  	$(top_srcdir)/src/transport/install-wlan-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true
  if HAVE_LIBBLUETOOTH
-@@ -278,21 +264,7 @@ gnunet_service_transport_CFLAGS = \
+@@ -278,27 +264,7 @@ gnunet_service_transport_CFLAGS = \
    $(CFLAGS)
  # -DANALYZE
  
@@ -931,6 +942,12 @@ index e8c1f5d4a..0863ed399 100644
 -  $(WLAN_PLUGIN_LA) \
 -  $(BT_PLUGIN_LA)
 -
+-if HAVE_EXPERIMENTAL
+-plugin_LTLIBRARIES += \
+-  libgnunet_plugin_transport_xt.la \
+-  libgnunet_plugin_transport_xu.la
+-endif
+-
 -# Note: real plugins of course need to be added
 -# to the plugin_LTLIBRARIES above
 -noinst_LTLIBRARIES = \
@@ -938,8 +955,8 @@ index e8c1f5d4a..0863ed399 100644
 +plugin_LTLIBRARIES = libgnunet_plugin_transport_http_client.la
  
  libgnunet_plugin_transport_tcp_la_SOURCES = \
-   plugin_transport_tcp.c 
-@@ -367,7 +339,7 @@ libgnunet_plugin_transport_unix_la_LDFLAGS = \
+   plugin_transport_tcp.c
+@@ -398,7 +364,7 @@ libgnunet_plugin_transport_unix_la_LDFLAGS = \
  
  
  libgnunet_plugin_transport_http_client_la_SOURCES = \
@@ -949,10 +966,10 @@ index e8c1f5d4a..0863ed399 100644
    $(top_builddir)/src/hello/libgnunethello.la \
    $(top_builddir)/src/statistics/libgnunetstatistics.la \
 diff --git a/src/transport/tcp_connection_legacy.c b/src/transport/tcp_connection_legacy.c
-index 17157436d..a6e9f0f17 100644
+index 66902c6a0..02c1cf37e 100644
 --- a/src/transport/tcp_connection_legacy.c
 +++ b/src/transport/tcp_connection_legacy.c
-@@ -408,7 +408,7 @@ GNUNET_CONNECTION_create_from_accept (GNUNET_CONNECTION_AccessCheck access_cb,
+@@ -406,7 +406,7 @@ GNUNET_CONNECTION_create_from_accept (GNUNET_CONNECTION_AccessCheck access_cb,
  			 &gc.gid))
        gcp = &gc;
  #else
@@ -962,10 +979,10 @@ index 17157436d..a6e9f0f17 100644
      olen = sizeof (uc);
      if ( (0 ==
 diff --git a/src/util/Makefile.am b/src/util/Makefile.am
-index eb655157d..fdaca5721 100644
+index b0f45b1da..4742eab03 100644
 --- a/src/util/Makefile.am
 +++ b/src/util/Makefile.am
-@@ -65,8 +65,6 @@ libgnunetutil_la_SOURCES = \
+@@ -71,8 +71,6 @@ libgnunetutil_la_SOURCES = \
    common_allocation.c \
    common_endian.c \
    common_logging.c \
@@ -974,7 +991,7 @@ index eb655157d..fdaca5721 100644
    container_bloomfilter.c \
    container_heap.c \
    container_meta_data.c \
-@@ -96,13 +94,11 @@ libgnunetutil_la_SOURCES = \
+@@ -104,13 +102,11 @@ libgnunetutil_la_SOURCES = \
    mst.c \
    mq.c \
    nc.c \
@@ -986,5 +1003,5 @@ index eb655157d..fdaca5721 100644
    peer.c \
 -  plugin.c \
    program.c \
+   regex.c \
    resolver_api.c resolver.h \
-   scheduler.c \