From 2bfe0e3389e8ac21514a8f1fe7a7096bdad6ff08 Mon Sep 17 00:00:00 2001 From: "Schanzenbach, Martin" Date: Fri, 15 Feb 2019 20:30:00 +0100 Subject: fix macos build of dist tarball --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 17476e485..40890ad1a 100644 --- a/configure.ac +++ b/configure.ac @@ -71,6 +71,7 @@ case "$host_os" in CPPFLAGS="-D_APPLE_C_SOURCE $CPPFLAGS" CFLAGS="-fno-common $CFLAGS" AC_MSG_WARN([WARNING: The VPN application cannot be compiled on your OS]) + AC_CHECK_LIB(intl, gettext) build_target="darwin" DEFAULT_INTERFACE="\"en0\"" LIBPREFIX= -- cgit v1.2.3 From f48595ede523757350ea8e4557dca37f72694d58 Mon Sep 17 00:00:00 2001 From: "Schanzenbach, Martin" Date: Fri, 15 Feb 2019 20:55:59 +0100 Subject: fix dist build --- src/ats-tests/Makefile.am | 1 + src/include/Makefile.am | 1 + src/rest-plugins/Makefile.am | 2 ++ 3 files changed, 4 insertions(+) diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am index c85645b9d..83f9e1b6a 100644 --- a/src/ats-tests/Makefile.am +++ b/src/ats-tests/Makefile.am @@ -60,6 +60,7 @@ libgnunetatstesting_la_SOURCES = \ libgnunetatstesting_la_LIBADD = \ $(top_builddir)/src/testbed/libgnunettestbed.la \ $(top_builddir)/src/core/libgnunetcore.la \ + $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) diff --git a/src/include/Makefile.am b/src/include/Makefile.am index 6b930178f..4e84e023c 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -106,6 +106,7 @@ gnunetinclude_HEADERS = \ gnunet_regex_service.h \ gnunet_rest_lib.h \ gnunet_rest_plugin.h \ + gnunet_rps_service.h \ gnunet_revocation_service.h \ gnunet_scalarproduct_service.h \ gnunet_scheduler_lib.h \ diff --git a/src/rest-plugins/Makefile.am b/src/rest-plugins/Makefile.am index f36154ebd..a49ab0ef0 100644 --- a/src/rest-plugins/Makefile.am +++ b/src/rest-plugins/Makefile.am @@ -67,6 +67,7 @@ libgnunet_plugin_rest_copying_la_LDFLAGS = \ libgnunet_plugin_rest_peerinfo_la_SOURCES = \ plugin_rest_peerinfo.c libgnunet_plugin_rest_peerinfo_la_LIBADD = \ + $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ $(top_builddir)/src/rest/libgnunetrest.la \ $(top_builddir)/src/json/libgnunetjson.la \ @@ -104,6 +105,7 @@ libgnunet_plugin_rest_namestore_la_LDFLAGS = \ libgnunet_plugin_rest_gns_la_SOURCES = \ plugin_rest_gns.c libgnunet_plugin_rest_gns_la_LIBADD = \ + $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ $(top_builddir)/src/gns/libgnunetgns.la \ $(top_builddir)/src/rest/libgnunetrest.la \ $(top_builddir)/src/identity/libgnunetidentity.la \ -- cgit v1.2.3 From 2a461dcb1fd5875139654650cc4d6c525f2289b7 Mon Sep 17 00:00:00 2001 From: "Schanzenbach, Martin" Date: Fri, 15 Feb 2019 21:16:37 +0100 Subject: fix some compiler warnings --- src/gns/gnunet-gns-proxy.c | 5 +++-- src/namecache/plugin_namecache_flat.c | 2 +- src/peerstore/plugin_peerstore_flat.c | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index 21451651d..9db388e77 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c @@ -2045,11 +2045,12 @@ create_response (void *cls, const char *us; long upload_size; + upload_size = 0; us = MHD_lookup_connection_value (con, MHD_HEADER_KIND, MHD_HTTP_HEADER_CONTENT_LENGTH); if ( (NULL != us) && - (1 == sscanf (us, + (1 == sscanf (us, "%ld", &upload_size)) && (upload_size >= 0) ) @@ -2149,7 +2150,7 @@ create_response (void *cls, curl_easy_setopt (s5r->curl, CURLOPT_USE_SSL, CURLUSESSL_ALL); - if (NULL != s5r->dane_data) + if (0 < s5r->num_danes) curl_easy_setopt (s5r->curl, CURLOPT_SSL_VERIFYPEER, 0L); diff --git a/src/namecache/plugin_namecache_flat.c b/src/namecache/plugin_namecache_flat.c index 4323780d5..c093cb2a9 100644 --- a/src/namecache/plugin_namecache_flat.c +++ b/src/namecache/plugin_namecache_flat.c @@ -173,7 +173,7 @@ database_setup (struct Plugin *plugin) &entry->query)); GNUNET_STRINGS_base64_decode (block, strlen (block), - &block_buffer); + (void**)&block_buffer); entry->block = (struct GNUNET_GNSRECORD_Block *) block_buffer; if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put (plugin->hm, diff --git a/src/peerstore/plugin_peerstore_flat.c b/src/peerstore/plugin_peerstore_flat.c index cd1837e1a..0cd2522ec 100644 --- a/src/peerstore/plugin_peerstore_flat.c +++ b/src/peerstore/plugin_peerstore_flat.c @@ -440,7 +440,7 @@ database_setup (struct Plugin *plugin) o = NULL; s = GNUNET_STRINGS_base64_decode (peer, strlen (peer), - &o); + (void**)&o); if (sizeof (struct GNUNET_PeerIdentity) == s) GNUNET_memcpy (&entry->peer, o, @@ -451,7 +451,7 @@ database_setup (struct Plugin *plugin) } entry->value_size = GNUNET_STRINGS_base64_decode (value, strlen (value), - (char**)&entry->value); + (void**)&entry->value); if (GNUNET_SYSERR == GNUNET_STRINGS_fancy_time_to_absolute (expiry, &entry->expiry)) -- cgit v1.2.3