From 516652bbfdcc83191f3eb83a4a277d6e787e6b9d Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Fri, 26 Apr 2024 16:53:43 +0200
Subject: [PATCH 1/3] test: mountnfsd -> mountfsd

I keep accidentally writing mountnfsd instead of mountfsd, and a couple
of instances managed to get into the repo.
---
 .../{testsuite-50.mountnfsd.sh => testsuite-50.mountfsd.sh}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename test/units/{testsuite-50.mountnfsd.sh => testsuite-50.mountfsd.sh} (98%)

diff --git a/test/units/testsuite-50.mountnfsd.sh b/test/units/testsuite-50.mountfsd.sh
similarity index 98%
rename from test/units/testsuite-50.mountnfsd.sh
rename to test/units/testsuite-50.mountfsd.sh
index 7fd55980f9..604a9dbf38 100755
--- a/test/units/testsuite-50.mountnfsd.sh
+++ b/test/units/testsuite-50.mountfsd.sh
@@ -13,7 +13,7 @@ if [[ ! -f /usr/lib/systemd/system/systemd-mountfsd.socket ]] || \
    ! find /usr/lib* -name libbpf.so.1 2>/dev/null | grep . || \
    systemd-analyze compare-versions "$(uname -r)" lt 6.5 || \
    systemd-analyze compare-versions "$(pkcheck --version | awk '{print $3}')" lt 124; then
-    echo "Skipping mountnfsd/nsresourced tests"
+    echo "Skipping mountfsd/nsresourced tests"
     exit 0
 fi
 
@@ -56,7 +56,7 @@ if (SYSTEMD_LOG_TARGET=console varlinkctl call \
         io.systemd.NamespaceResource.AllocateUserRange \
         '{"name":"test-supported","size":65536,"userNamespaceFileDescriptor":0}' 2>&1 || true) |
             grep -q "io.systemd.NamespaceResource.UserNamespaceInterfaceNotSupported"; then
-    echo "User namespace interface not supported, skipping mountnfsd/nsresourced tests"
+    echo "User namespace interface not supported, skipping mountfsd/nsresourced tests"
     exit 0
 fi
 

From fea14ca15eb4b3873f85dbb5e24dc2929448b143 Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Fri, 26 Apr 2024 17:06:06 +0200
Subject: [PATCH 2/3] mountfsd: drop explicit dependencies for
 systemd-mountwork

As the executables are automagically linked against libshared.
---
 src/mountfsd/meson.build | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/mountfsd/meson.build b/src/mountfsd/meson.build
index 3689d2af27..53fc3d368c 100644
--- a/src/mountfsd/meson.build
+++ b/src/mountfsd/meson.build
@@ -19,8 +19,6 @@ executables += [
                 'name' : 'systemd-mountwork',
                 'conditions' : ['ENABLE_MOUNTFSD'],
                 'sources' : systemd_mountwork_sources,
-                'link_with' : common_libs,
-                'dependencies' : common_deps,
         },
 ]
 

From 6a68270c9795fd26b897a7cc33a8b39ae72d6d2c Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Fri, 26 Apr 2024 17:07:39 +0200
Subject: [PATCH 3/3] import: skip the whole subdir when building with
 -Dimportd=false

Resolves: #32501
---
 src/import/meson.build | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/import/meson.build b/src/import/meson.build
index ca23726603..184dd7bbf2 100644
--- a/src/import/meson.build
+++ b/src/import/meson.build
@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
+if conf.get('ENABLE_IMPORTD') != 1
+        subdir_done()
+endif
+
 systemd_importd_sources = files(
         'importd.c',
 )
@@ -117,15 +121,13 @@ executables += [
         },
 ]
 
-if conf.get('ENABLE_IMPORTD') == 1
-        install_data('org.freedesktop.import1.conf',
-                     install_dir : dbuspolicydir)
-        install_data('org.freedesktop.import1.service',
-                     install_dir : dbussystemservicedir)
-        install_data('org.freedesktop.import1.policy',
-                     install_dir : polkitpolicydir)
+install_data('org.freedesktop.import1.conf',
+             install_dir : dbuspolicydir)
+install_data('org.freedesktop.import1.service',
+             install_dir : dbussystemservicedir)
+install_data('org.freedesktop.import1.policy',
+             install_dir : polkitpolicydir)
 
-        install_data('import-pubring.gpg',
-                     install_dir : libexecdir)
-        # TODO: shouldn't this be in pkgdatadir?
-endif
+install_data('import-pubring.gpg',
+             install_dir : libexecdir)
+# TODO: shouldn't this be in pkgdatadir?