10 files changed, 186 insertions, 18 deletions

diff --git a/meson.build b/meson.build
index 2d4d168df..f090549cd 100644
--- a/meson.build
+++ b/meson.build
@@ -47,6 +47,7 @@ endif
 # FIXME
 cdata.set('extractor', 0)
 
+cdata.set('PKGDATADIRECTORY', get_option('datadir')/'gnunet')
 
 # Various checks
 if cc.has_member ('struct sockaddr_in', 'sin_len', prefix : ['#include <sys/types.h>', '#include <sys/socket.h>', '#include <netinet/in.h>'])
@@ -324,7 +325,7 @@ result = cc.run(curl_ssl_check, name : 'cURL gnutls check',
                       dependencies: curl_dep)
 cdata.set('curl_gnutls', 0)
 if result.returncode() == 0
-  cdata.set('curl_gnutls', 1)
+cdata.set('curl_gnutls', 1)
 endif
 
 if cc.has_function('getloadavg') == false
diff --git a/src/core/meson.build b/src/core/meson.build
index d8d506b52..4c5bb4d61 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -31,6 +31,12 @@ libgnunetcore_dep = declare_dependency(link_with : libgnunetcore)
 pkg.generate(libgnunetcore, url: 'https://www.gnunet.org',
              description : 'Provides API for (encrypted) P2P communication')
 
+executable ('gnunet-core',
+            ['gnunet-core.c'],
+            dependencies: [libgnunetcore_dep, libgnunetutil_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('libdir') / 'gnunet' / 'libexec')
 executable ('gnunet-service-core',
             gnunetservicecore_src,
             dependencies: [libgnunetcore_dep, libgnunetutil_dep,
diff --git a/src/dht/meson.build b/src/dht/meson.build
index e36f4544c..83ce8ad9e 100644
--- a/src/dht/meson.build
+++ b/src/dht/meson.build
@@ -49,7 +49,30 @@ executable ('gnunet-dht',
             include_directories: [incdir, configuration_inc],
             install: true,
             install_dir: get_option('bindir'))
-
+executable ('gnunet-dht-put',
+            ['gnunet-dht-put.c'],
+            dependencies: [libgnunetdht_dep, libgnunetutil_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('bindir'))
+executable ('gnunet-dht-get',
+            ['gnunet-dht-get.c'],
+            dependencies: [libgnunetdht_dep, libgnunetutil_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('bindir'))
+executable ('gnunet-dht-monitor',
+            ['gnunet-dht-monitor.c'],
+            dependencies: [libgnunetdht_dep, libgnunetutil_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('bindir'))
+executable ('gnunet-dht-hello',
+            ['gnunet-dht-hello.c'],
+            dependencies: [libgnunetdht_dep, libgnunetutil_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('bindir'))
 executable ('gnunet-service-dht',
             gnunetservicedht_src,
             dependencies: [libgnunetdht_dep, libgnunetutil_dep,
diff --git a/src/fs/meson.build b/src/fs/meson.build
index 65fe6320f..fa7924959 100644
--- a/src/fs/meson.build
+++ b/src/fs/meson.build
@@ -42,8 +42,8 @@ endif
 
 libgnunetfs = library('gnunetfs',
         libgnunetfs_src,
-        soversion: '3',
-        version: '3.1.1',
+        soversion: '2',
+        version: '2.1.1',
         dependencies: [libgnunetutil_dep,
                        libgnunetdatastore_dep,
                        libgnunetstatistics_dep,
@@ -70,6 +70,42 @@ executable ('gnunet-unindex',
             include_directories: [incdir, configuration_inc],
             install: true,
             install_dir: get_option('bindir'))
+executable ('gnunet-auto-share',
+            'gnunet-auto-share.c',
+            dependencies: [libgnunetfs_dep,
+                           libgnunetutil_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('bindir'))
+executable ('gnunet-directory',
+            'gnunet-directory.c',
+            dependencies: [libgnunetfs_dep,
+                           libgnunetutil_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('bindir'))
+executable ('gnunet-download',
+            'gnunet-download.c',
+            dependencies: [libgnunetfs_dep,
+                           libgnunetutil_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('bindir'))
+executable ('gnunet-fs',
+            'gnunet-fs.c',
+            dependencies: [libgnunetfs_dep,
+                           libgnunetutil_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('bindir'))
+executable ('gnunet-publish',
+            'gnunet-publish.c',
+            dependencies: [libgnunetfs_dep,
+                           libgnunetidentity_dep,
+                           libgnunetutil_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('bindir'))
 executable ('gnunet-service-fs',
             gnunetservicefs_src,
             dependencies: [libgnunetfs_dep,
diff --git a/src/gns/meson.build b/src/gns/meson.build
index a25850d85..3441acab2 100644
--- a/src/gns/meson.build
+++ b/src/gns/meson.build
@@ -11,7 +11,20 @@ configure_file(input : 'gns.conf.in',
                configuration : cdata,
                install: true,
                install_dir: pkgcfgdir)
+configure_file(input : 'tlds.conf',
+               output : 'tlds.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
+configure_file(input : 'gnunet-gns-proxy-setup-ca.in',
+               output : 'gnunet-gns-proxy-setup-ca',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
 
+install_data('gnunet-gns-proxy-ca.template',
+             install_dir: get_option('datadir')/'gnunet')
 
 if get_option('monolith')
   foreach p : libgnunetgns_src + gnunetservicegns_src
diff --git a/src/namestore/meson.build b/src/namestore/meson.build
index 1a84e7d0f..e57bf46e7 100644
--- a/src/namestore/meson.build
+++ b/src/namestore/meson.build
@@ -59,14 +59,42 @@ if pq_dep.found()
 endif
 
 executable ('gnunet-namestore',
-            gnunetnamestore_src,
+          gnunetnamestore_src,
+          dependencies: [libgnunetnamestore_dep,
+                         libgnunetutil_dep,
+                         libgnunetgnsrecord_dep,
+                         libgnunetidentity_dep],
+          include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('bindir'))
+executable ('gnunet-namestore-dbtool',
+            ['gnunet-namestore-dbtool.c'],
             dependencies: [libgnunetnamestore_dep,
                            libgnunetutil_dep,
                            libgnunetgnsrecord_dep,
                            libgnunetidentity_dep],
             include_directories: [incdir, configuration_inc],
-          install: true,
-          install_dir: get_option('bindir'))
+            install: true,
+            install_dir: get_option('bindir'))
+executable ('gnunet-namestore-zonefile',
+            ['gnunet-namestore-zonefile.c'],
+            dependencies: [libgnunetnamestore_dep,
+                           libgnunetutil_dep,
+                           libgnunetgnsrecord_dep,
+                           libgnunetidentity_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('bindir'))
+executable ('gnunet-zoneimport',
+            ['gnunet-zoneimport.c'],
+            dependencies: [libgnunetnamestore_dep,
+                           libgnunetutil_dep,
+                           libgnunetstatistics_dep,
+                           libgnunetgnsrecord_dep,
+                           libgnunetidentity_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('bindir'))
 executable ('gnunet-service-namestore',
             gnunetservicenamestore_src,
             dependencies: [libgnunetnamestore_dep,
diff --git a/src/nat-auto/meson.build b/src/nat-auto/meson.build
index e5643cc58..6370cb5e4 100644
--- a/src/nat-auto/meson.build
+++ b/src/nat-auto/meson.build
@@ -3,19 +3,36 @@ libgnunetnatauto_src = ['nat_auto_api.c',
 
 gnunetservicenatauto_src = ['gnunet-nat-server.c']
 
+configure_file(input : 'nat-auto.conf.in',
+               output : 'nat-auto.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
 
-if get_option('monolith') == false
-  libgnunetnatauto = library('gnunetnatauto',
-          libgnunetnatauto_src,
-          dependencies: [libgnunetutil_dep, libgnunetnat_dep],
-          include_directories: [incdir, configuration_inc])
-  libgnunetnatauto_dep = declare_dependency(link_with : libgnunetnatauto)
-  executable ('gnunet-nat-server',
-              gnunetservicenatauto_src,
-              dependencies: [libgnunetnatauto_dep, libgnunetutil_dep, libgnunetnat_dep],
-              include_directories: [incdir, configuration_inc])
-else
+if get_option('monolith')
   foreach p : libgnunetnatauto_src + gnunetservicenatauto_src
     gnunet_src += 'nat-auto/' + p
   endforeach
+  subdir_done()
 endif
+
+libgnunetnatauto = library('gnunetnatauto',
+        libgnunetnatauto_src,
+        dependencies: [libgnunetutil_dep, libgnunetnat_dep],
+        include_directories: [incdir, configuration_inc])
+libgnunetnatauto_dep = declare_dependency(link_with : libgnunetnatauto)
+
+executable ('gnunet-nat-auto',
+            ['gnunet-nat-auto.c'],
+            dependencies: [libgnunetnatauto_dep, libgnunetutil_dep,
+                           libgnunetnat_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('bindir'))
+executable ('gnunet-nat-server',
+            gnunetservicenatauto_src,
+            dependencies: [libgnunetnatauto_dep, libgnunetutil_dep, libgnunetnat_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('libdir')/'gnunet'/'libexec')
+
diff --git a/src/nat/meson.build b/src/nat/meson.build
index 430f56e13..6950e8bae 100644
--- a/src/nat/meson.build
+++ b/src/nat/meson.build
@@ -34,6 +34,13 @@ libgnunetnat_dep = declare_dependency(link_with : libgnunetnat)
 pkg.generate(libgnunetnat, url: 'https://www.gnunet.org',
              description : 'Provides API for accessing the NAT service')
 
+executable ('gnunet-nat',
+            ['gnunet-nat.c'],
+            dependencies: [libgnunetnat_dep, libgnunetutil_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('bindir'))
+
 executable ('gnunet-service-nat',
             gnunetservicenat_src,
             dependencies: [libgnunetnat_dep, libgnunetutil_dep,
diff --git a/src/nse/meson.build b/src/nse/meson.build
index 57047b463..7490214a3 100644
--- a/src/nse/meson.build
+++ b/src/nse/meson.build
@@ -28,6 +28,13 @@ libgnunetnse_dep = declare_dependency(link_with : libgnunetnse)
 pkg.generate(libgnunetnse, url: 'https://www.gnunet.org',
              description : 'Provides API for accessing the NSE service')
 
+executable ('gnunet-nse',
+            ['gnunet-nse.c'],
+            dependencies: [libgnunetnse_dep, m_dep, libgnunetutil_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('bindir'))
+
 executable ('gnunet-service-nse',
             gnunetservicense_src,
             dependencies: [libgnunetnse_dep, libgnunetutil_dep,
diff --git a/src/reclaim/meson.build b/src/reclaim/meson.build
index 0c23ef92b..4ccda79c2 100644
--- a/src/reclaim/meson.build
+++ b/src/reclaim/meson.build
@@ -1,6 +1,8 @@
 libgnunetreclaim_src = ['reclaim_api.c',
                         'reclaim_attribute.c',
                         'reclaim_credential.c']
+libgnunetdid_src = ['did_helper.c',
+                    'did_core.c']
 
 gnunetservicereclaim_src = ['gnunet-service-reclaim.c',
                         'gnunet-service-reclaim_tickets.c']
@@ -32,6 +34,23 @@ libgnunetreclaim_dep = declare_dependency(link_with : libgnunetreclaim)
 pkg.generate(libgnunetreclaim, url: 'https://www.gnunet.org',
              description : 'Provides API to access reclaimID')
 
+libgnunetdid = library('gnunetdid',
+        libgnunetdid_src,
+        soversion: '0',
+        version: '0.0.0',
+        dependencies: [libgnunetutil_dep,
+                       libgnunetnamestore_dep,
+                       libgnunetgnsrecord_dep,
+                       libgnunetgns_dep,
+                       json_dep,
+                       libgnunetidentity_dep],
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir'))
+libgnunetdid_dep = declare_dependency(link_with : libgnunetdid)
+pkg.generate(libgnunetdid, url: 'https://www.gnunet.org',
+             description : 'Provides API to manipulate DID')
+
 executable ('gnunet-reclaim',
             'gnunet-reclaim.c',
             dependencies: [libgnunetreclaim_dep,
@@ -40,6 +59,17 @@ executable ('gnunet-reclaim',
             include_directories: [incdir, configuration_inc],
             install: true,
             install_dir: get_option('bindir'))
+executable ('gnunet-did',
+            'gnunet-did.c',
+            dependencies: [libgnunetreclaim_dep,
+                           libgnunetdid_dep,
+                           libgnunetgns_dep,
+                           libgnunetnamestore_dep,
+                           libgnunetidentity_dep,
+                           libgnunetutil_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('bindir'))
 executable ('gnunet-service-reclaim',
             gnunetservicereclaim_src,
             dependencies: [libgnunetreclaim_dep,