13 files changed, 28 insertions, 9 deletions

diff --git a/meson.build b/meson.build
index d88b5432f..f307791ab 100644
--- a/meson.build
+++ b/meson.build
@@ -28,13 +28,13 @@ gnunet_user = false
 getent_bin = find_program('getent', '/usr/bin/getent', required : false)
 if getent_bin.found()
   gnunet_user = true
-  if not run_command('getent', 'passwd', 'gnunet', check: false).returncode() == 0
+  if run_command('getent', 'passwd', 'gnunet', check: false).returncode() != 0
     gnunet_user = false
   endif
-  if not run_command('getent', 'group', 'gnunet', check: false).returncode() == 0
+  if run_command('getent', 'group', 'gnunet', check: false).returncode() != 0
     gnunet_user = false
   endif
-  if not run_command('getent', 'group', 'gnunetdns', check: false).returncode() == 0
+  if run_command('getent', 'group', 'gnunetdns', check: false).returncode() != 0
     gnunet_user = false
   endif
 endif
diff --git a/src/plugin/datastore/test_defaults.conf b/src/plugin/datastore/test_defaults.conf
new file mode 100644
index 000000000..1f971de8f
--- /dev/null
+++ b/src/plugin/datastore/test_defaults.conf
@@ -0,0 +1,10 @@
+@inline@ ../../contrib/conf/gnunet/no_autostart_above_core.conf
+@inline@ ../../contrib/conf/gnunet/no_forcestart.conf
+
+[datastore]
+PORT = 22654
+QUOTA = 1 MB
+START_ON_DEMAND = YES
+
+[nse]
+WORKBITS = 1
diff --git a/src/plugin/reclaim/meson.build b/src/plugin/reclaim/meson.build
index df0289ca2..cde9fc726 100644
--- a/src/plugin/reclaim/meson.build
+++ b/src/plugin/reclaim/meson.build
@@ -15,7 +15,9 @@ shared_module('gnunet_plugin_reclaim_attribute_basic',
               install: true,
               install_dir: get_option('libdir') / 'gnunet')
 shared_module('gnunet_plugin_reclaim_credential_jwt',
-              ['plugin_reclaim_credential_jwt.c'],
+              ['plugin_reclaim_credential_jwt.c',
+                '../../service/reclaim/reclaim_attribute.c',
+                '../../service/reclaim/reclaim_credential.c'],
               dependencies: [
                              libgnunetjson_dep,
                              libgnunetutil_dep,
diff --git a/src/plugin/revocation/meson.build b/src/plugin/revocation/meson.build
index c4405e9b8..0ac8df28d 100644
--- a/src/plugin/revocation/meson.build
+++ b/src/plugin/revocation/meson.build
@@ -1,6 +1,7 @@
 shared_module('gnunet_plugin_block_revocation',
               ['plugin_block_revocation.c'],
               dependencies: [libgnunetutil_dep,
+                             libgnunetgnsrecord_dep,
                              libgnunetblock_dep],
               include_directories: [incdir, configuration_inc],
               install: true,
diff --git a/src/service/core/meson.build b/src/service/core/meson.build
index 6de15cd6d..483aa0a11 100644
--- a/src/service/core/meson.build
+++ b/src/service/core/meson.build
@@ -50,6 +50,7 @@ libgnunetcoretesting_dep = declare_dependency(link_with : libgnunetcoretesting)
 shared_module('gnunet_test_core_plugin_cmd_just_run',
         ['test_core_plugin_cmd_just_run.c'],
         dependencies: [libgnunetutil_dep,
+                       libgnunettesting_dep,
                        libgnunetcoretesting_dep,
                        libgnunettransportcore_dep,
                        libgnunettransportapplication_dep,
diff --git a/src/service/meson.build b/src/service/meson.build
index b089c9794..57e885899 100644
--- a/src/service/meson.build
+++ b/src/service/meson.build
@@ -47,6 +47,7 @@ libgnunet = library('gnunet',
                                    libgnunetgnsrecord_dep,
                                    libgnunetgnsrecordjson_dep,
                                    jose_dep,
+                                   m_dep,
                                    libgnunetcurl_dep],
                     c_args: ['-DHAVE_GNUNET_MONOLITH=1'],
                     include_directories: [incdir, configuration_inc, exitdir])
diff --git a/src/service/nat/gnunet-service-nat.c b/src/service/nat/gnunet-service-nat.c
index dde269819..08c87d0be 100644
--- a/src/service/nat/gnunet-service-nat.c
+++ b/src/service/nat/gnunet-service-nat.c
@@ -2070,7 +2070,7 @@ GNUNET_SERVICE_MAIN
  * MINIMIZE heap size (way below 128k) since this process doesn't need much.
  */
 void __attribute__ ((constructor))
-GNUNET_ARM_memory_init ()
+GNUNET_NATM_memory_init ()
 {
   mallopt (M_TRIM_THRESHOLD, 4 * 1024);
   mallopt (M_TOP_PAD, 1 * 1024);
diff --git a/src/service/nse/gnunet-service-nse.c b/src/service/nse/gnunet-service-nse.c
index ee1cb025f..ddb720d26 100644
--- a/src/service/nse/gnunet-service-nse.c
+++ b/src/service/nse/gnunet-service-nse.c
@@ -1573,7 +1573,7 @@ GNUNET_SERVICE_MAIN ("nse",
  * MINIMIZE heap size (way below 128k) since this process doesn't need much.
  */
 void __attribute__ ((constructor))
-GNUNET_ARM_memory_init ()
+GNUNET_NSE_memory_init ()
 {
   mallopt (M_TRIM_THRESHOLD, 4 * 1024);
   mallopt (M_TOP_PAD, 1 * 1024);
diff --git a/src/service/regex/gnunet-daemon-regexprofiler.c b/src/service/regex/gnunet-daemon-regexprofiler.c
index 70301338f..8aa2a2a30 100644
--- a/src/service/regex/gnunet-daemon-regexprofiler.c
+++ b/src/service/regex/gnunet-daemon-regexprofiler.c
@@ -393,7 +393,7 @@ main (int argc, char *const *argv)
  * MINIMIZE heap size (way below 128k) since this process doesn't need much.
  */
 void __attribute__ ((constructor))
-GNUNET_ARM_memory_init ()
+GNUNET_REGEX_memory_init ()
 {
   mallopt (M_TRIM_THRESHOLD, 4 * 1024);
   mallopt (M_TOP_PAD, 1 * 1024);
diff --git a/src/service/testing/meson.build b/src/service/testing/meson.build
index 7e2069fb0..5605a2afb 100644
--- a/src/service/testing/meson.build
+++ b/src/service/testing/meson.build
@@ -1,4 +1,7 @@
 libgnunettesting_src = [
+                        'testing_api_cmd_stop_peer.c',
+                        'testing_api_cmd_start_peer.c',
+                        'testing_api_cmd_exec_bash_script.c',
                         'testing_api_cmd_barrier.c',
                         'testing_api_cmd_barrier_reached.c',
                         'testing_api_cmd_finish.c',
diff --git a/src/service/topology/gnunet-daemon-topology.c b/src/service/topology/gnunet-daemon-topology.c
index 71cc5bd19..f68b838d4 100644
--- a/src/service/topology/gnunet-daemon-topology.c
+++ b/src/service/topology/gnunet-daemon-topology.c
@@ -1010,7 +1010,7 @@ main (int argc, char *const *argv)
  * MINIMIZE heap size (way below 128k) since this process doesn't need much.
  */
 void __attribute__ ((constructor))
-GNUNET_ARM_memory_init ()
+GNUNET_TOPOLOGY_memory_init ()
 {
   mallopt (M_TRIM_THRESHOLD, 4 * 1024);
   mallopt (M_TOP_PAD, 1 * 1024);
diff --git a/src/service/transport/gnunet-communicator-unix.c b/src/service/transport/gnunet-communicator-unix.c
index 0ff16ab08..1cdc85b8a 100644
--- a/src/service/transport/gnunet-communicator-unix.c
+++ b/src/service/transport/gnunet-communicator-unix.c
@@ -1153,7 +1153,7 @@ main (int argc, char *const *argv)
  * MINIMIZE heap size (way below 128k) since this process doesn't need much.
  */
 void __attribute__ ((constructor))
-GNUNET_ARM_memory_init ()
+GNUNET_TRANSPORT_communicator_unix_memory_init ()
 {
   mallopt (M_TRIM_THRESHOLD, 4 * 1024);
   mallopt (M_TOP_PAD, 1 * 1024);
diff --git a/src/service/transport/meson.build b/src/service/transport/meson.build
index 4f8b592fd..3cacc53f6 100644
--- a/src/service/transport/meson.build
+++ b/src/service/transport/meson.build
@@ -111,6 +111,7 @@ executable ('gnunet-service-transport',
                            libgnunethello_dep,
                            libgnunetnat_dep,
                            gcrypt_dep,
+                           m_dep,
                            libgnunetutil_dep],
             include_directories: [incdir, configuration_inc],
             install: true,