14 files changed, 87 insertions, 5 deletions

diff --git a/src/datacache/meson.build b/src/datacache/meson.build
index b06a284f1..e753ca6eb 100644
--- a/src/datacache/meson.build
+++ b/src/datacache/meson.build
@@ -18,7 +18,7 @@ endif
 libgnunetdatacache = library('gnunetdatacache',
         libgnunetdatacache_src,
         soversion: '0',
-        version: '0.1.0',
+        version: '0.0.1',
         dependencies: [libgnunetutil_dep, libgnunetstatistics_dep],
         include_directories: [incdir, configuration_inc],
         install: true,
diff --git a/src/dns/meson.build b/src/dns/meson.build
index ee9ba0005..20002a9fc 100644
--- a/src/dns/meson.build
+++ b/src/dns/meson.build
@@ -56,4 +56,10 @@ executable ('gnunet-dns-redirector',
             include_directories: [incdir, configuration_inc],
             install: true,
             install_dir: get_option('libdir')/'gnunet'/'libexec')
+executable ('gnunet-helper-dns',
+            ['gnunet-helper-dns.c'],
+            dependencies: [libgnunetdns_dep, libgnunetutil_dep, libgnunetdns_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('libdir')/'gnunet'/'libexec')
 
diff --git a/src/fs/meson.build b/src/fs/meson.build
index fa7924959..ca0b7ef95 100644
--- a/src/fs/meson.build
+++ b/src/fs/meson.build
@@ -123,4 +123,12 @@ executable ('gnunet-service-fs',
             include_directories: [incdir, configuration_inc],
             install: true,
             install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+executable ('gnunet-helper-fs-publish',
+            ['gnunet-helper-fs-publish.c'],
+            dependencies: [libgnunetfs_dep,
+                           libgnunetutil_dep,
+                           libgnunetblock_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('libdir') / 'gnunet' / 'libexec')
 
diff --git a/src/gns/meson.build b/src/gns/meson.build
index 3441acab2..bb9fac065 100644
--- a/src/gns/meson.build
+++ b/src/gns/meson.build
@@ -135,3 +135,8 @@ executable ('gnunet-dns2gns',
             include_directories: [incdir, configuration_inc],
             install: true,
             install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+
+
+#if nss_dep.found()
+#  subdir('nss')
+#endif
diff --git a/src/hostlist/meson.build b/src/hostlist/meson.build
index 99cc089df..811e3e669 100644
--- a/src/hostlist/meson.build
+++ b/src/hostlist/meson.build
@@ -22,4 +22,6 @@ executable ('gnunet-daemon-hostlist',
                            libgnunettransport_dep,
                            mhd_dep,
                            curl_dep],
-            include_directories: [incdir, configuration_inc])
+            include_directories: [incdir, configuration_inc],
+            install:true,
+            install_dir: get_option('libdir')/'gnunet'/'libexec')
diff --git a/src/nat-auto/meson.build b/src/nat-auto/meson.build
index 6370cb5e4..9c6f5a0d0 100644
--- a/src/nat-auto/meson.build
+++ b/src/nat-auto/meson.build
@@ -18,6 +18,8 @@ endif
 
 libgnunetnatauto = library('gnunetnatauto',
         libgnunetnatauto_src,
+        soversion: '0',
+        version: '0.0.0',
         dependencies: [libgnunetutil_dep, libgnunetnat_dep],
         include_directories: [incdir, configuration_inc])
 libgnunetnatauto_dep = declare_dependency(link_with : libgnunetnatauto)
diff --git a/src/nat/meson.build b/src/nat/meson.build
index 6950e8bae..415d6cbb3 100644
--- a/src/nat/meson.build
+++ b/src/nat/meson.build
@@ -48,4 +48,18 @@ executable ('gnunet-service-nat',
             include_directories: [incdir, configuration_inc],
             install: true,
             install_dir: get_option('libdir')/'gnunet'/'libexec')
+executable ('gnunet-helper-nat-server',
+            ['gnunet-helper-nat-server.c'],
+            dependencies: [libgnunetnat_dep, libgnunetutil_dep,
+                           libgnunetstatistics_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('libdir')/'gnunet'/'libexec')
+executable ('gnunet-helper-nat-client',
+            ['gnunet-helper-nat-client.c'],
+            dependencies: [libgnunetnat_dep, libgnunetutil_dep,
+                           libgnunetstatistics_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('libdir')/'gnunet'/'libexec')
 
diff --git a/src/regex/meson.build b/src/regex/meson.build
index ae644dcc7..f1bbfa1b8 100644
--- a/src/regex/meson.build
+++ b/src/regex/meson.build
@@ -51,4 +51,19 @@ executable ('gnunet-service-regex',
             include_directories: [incdir, configuration_inc],
             install: true,
             install_dir: get_option('libdir')/'gnunet'/'libexec')
+executable ('gnunet-daemon-regexprofiler',
+            ['gnunet-daemon-regexprofiler.c',
+              'regex_internal.c',
+              'regex_internal_dht.c',
+              'regex_test_lib.c',
+              'regex_test_graph.c',
+              'regex_test_random.c'],
+            dependencies: [libgnunetregex_dep, libgnunetutil_dep,
+                           libgnunetdht_dep,
+                           libgnunetstatistics_dep,
+                           libgnunetregex_dep,
+                           libgnunetregexblock_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('libdir')/'gnunet'/'libexec')
 
diff --git a/src/set/meson.build b/src/set/meson.build
index bfaf4260f..51782f446 100644
--- a/src/set/meson.build
+++ b/src/set/meson.build
@@ -31,6 +31,12 @@ libgnunetset = library('gnunetset',
 pkg.generate(libgnunetset, url: 'https://www.gnunet.org',
              description : 'Provides API for accessing the set service')
 libgnunetset_dep = declare_dependency(link_with : libgnunetset)
+shared_module('gnunet_plugin_block_set_test',
+              ['plugin_block_set_test.c'],
+              dependencies: libgnunetutil_dep,
+              include_directories: [incdir, configuration_inc],
+              install:true,
+              install_dir: get_option('libdir')/'gnunet')
 executable ('gnunet-service-set',
             gnunetserviceset_src,
             dependencies: [libgnunetset_dep,
diff --git a/src/seti/meson.build b/src/seti/meson.build
index 0741cac18..e5d3812ce 100644
--- a/src/seti/meson.build
+++ b/src/seti/meson.build
@@ -27,6 +27,12 @@ libgnunetseti = library('gnunetseti',
 pkg.generate(libgnunetseti, url: 'https://www.gnunet.org',
              description : 'Provides API for accessing the set intersection service')
 libgnunetseti_dep = declare_dependency(link_with : libgnunetseti)
+shared_module('gnunet_plugin_block_seti_test',
+              ['plugin_block_seti_test.c'],
+              dependencies: libgnunetutil_dep,
+              include_directories: [incdir, configuration_inc],
+              install:true,
+              install_dir: get_option('libdir')/'gnunet')
 executable ('gnunet-service-seti',
             gnunetserviceseti_src,
             dependencies: [libgnunetseti_dep,
diff --git a/src/setu/meson.build b/src/setu/meson.build
index 6f0b0c663..fe5611fd2 100644
--- a/src/setu/meson.build
+++ b/src/setu/meson.build
@@ -29,6 +29,12 @@ libgnunetsetu = library('gnunetsetu',
 pkg.generate(libgnunetsetu, url: 'https://www.gnunet.org',
              description : 'Provides API for accessing the set union service')
 libgnunetsetu_dep = declare_dependency(link_with : libgnunetsetu)
+shared_module('gnunet_plugin_block_setu_test',
+              ['plugin_block_setu_test.c'],
+              dependencies: libgnunetutil_dep,
+              include_directories: [incdir, configuration_inc],
+              install:true,
+              install_dir: get_option('libdir')/'gnunet')
 executable ('gnunet-service-setu',
             gnunetservicesetu_src,
             dependencies: [libgnunetsetu_dep,
diff --git a/src/template/Makefile.am b/src/template/Makefile.am
index 4d2e58083..c8ab26ebd 100644
--- a/src/template/Makefile.am
+++ b/src/template/Makefile.am
@@ -5,7 +5,7 @@ pkgcfgdir= $(pkgdatadir)/config.d/
 
 libexecdir= $(pkglibdir)/libexec/
 
-dist_pkgcfg_DATA = \
+noinst_dist_pkgcfg_DATA = \
   template.conf
 
 if USE_COVERAGE
diff --git a/src/util/meson.build b/src/util/meson.build
index 3b7711b13..a9d1178b1 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -76,10 +76,15 @@ configure_file(input : 'util.conf',
                configuration : cdata,
                install: true,
                install_dir: pkgcfgdir)
+configure_file(input : 'resolver.conf',
+               output : 'resolver.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
 
 
 if get_option('monolith')
-  foreach p : libgnunetutil_src
+  foreach p : [libgnunetutil_src, gnunetserviceresolver_src]
     gnunet_src += 'util/' + p
   endforeach
   subdir_done()
@@ -147,7 +152,7 @@ executable ('gnunet-config-diff',
             include_directories: [incdir, configuration_inc],
             install: false)
 
-executable ('gnunet-resolver-arm',
+executable ('gnunet-service-resolver-arm',
             gnunetserviceresolver_src,
             dependencies: [libgnunetutil_dep],
             include_directories: [incdir, configuration_inc],
diff --git a/src/vpn/meson.build b/src/vpn/meson.build
index 54f8ffae9..ed53e200e 100644
--- a/src/vpn/meson.build
+++ b/src/vpn/meson.build
@@ -55,4 +55,11 @@ executable ('gnunet-service-vpn',
             include_directories: [incdir, configuration_inc, exitdir],
             install: true,
             install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+executable ('gnunet-helper-vpn',
+            ['gnunet-helper-vpn.c'],
+            dependencies: [libgnunetvpn_dep,
+                           libgnunetutil_dep],
+            include_directories: [incdir, configuration_inc, exitdir],
+            install: true,
+            install_dir: get_option('libdir') / 'gnunet' / 'libexec')