[gnome-build-meta/alatiera/38-backports: 5/7] vm: add nss-mdns

[Jordan Petridis <jpetridis src gnome org>]

commit b59e8696680328f4362a22e2bea6ae37bef00222
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Thu Sep 3 17:05:35 2020 +0100

    vm: add nss-mdns
    
    This allows resolving mdns .local addresses directly

 elements/flatpak/platform-image.bst |  7 ++++---
 elements/flatpak/sdk-image.bst      | 11 ++++++-----
 elements/sdk-platform.bst           |  1 -
 elements/vm/common-deps.bst         |  2 ++
 elements/vm/nss-mdns.bst            | 12 ++++++++++++
 elements/vm/nsswitch-config.bst     | 13 +++++++++++++
 files/vm/nsswitch.conf              | 18 ++++++++++++++++++
 7 files changed, 55 insertions(+), 9 deletions(-)
---
diff --git a/elements/flatpak/platform-image.bst b/elements/flatpak/platform-image.bst
index bc1f9470..3dec2031 100644
--- a/elements/flatpak/platform-image.bst
+++ b/elements/flatpak/platform-image.bst
@@ -3,11 +3,12 @@ build-depends:
 - platform-manifest.bst
 - sdk-platform.bst
 - sdk/os-release.bst
-- freedesktop-sdk.bst:components/python3-usercustomize.bst
+- freedesktop-sdk.bst:components/nsswitch-config.bst
 - freedesktop-sdk.bst:components/python3-sitecustomize.bst
-- freedesktop-sdk.bst:multiarch/multiarch-platform.bst
-- freedesktop-sdk.bst:integration/split-locales.bst
+- freedesktop-sdk.bst:components/python3-usercustomize.bst
 - freedesktop-sdk.bst:integration/split-docs.bst
+- freedesktop-sdk.bst:integration/split-locales.bst
+- freedesktop-sdk.bst:multiarch/multiarch-platform.bst
 config:
   exclude:
   - devel
diff --git a/elements/flatpak/sdk-image.bst b/elements/flatpak/sdk-image.bst
index f87a0821..c3b2426d 100644
--- a/elements/flatpak/sdk-image.bst
+++ b/elements/flatpak/sdk-image.bst
@@ -3,13 +3,14 @@ build-depends:
 - sdk.bst
 - sdk/os-release.bst
 - sdk-manifest.bst
-- freedesktop-sdk.bst:components/python3-usercustomize.bst
+- freedesktop-sdk.bst:components/nsswitch-config.bst
 - freedesktop-sdk.bst:components/python3-sitecustomize.bst
-- freedesktop-sdk.bst:multiarch/multiarch-sdk.bst
-- freedesktop-sdk.bst:integration/split-locales.bst
-- freedesktop-sdk.bst:integration/split-docs.bst
-- freedesktop-sdk.bst:integration/flatpak-builder-configuration.bst
+- freedesktop-sdk.bst:components/python3-usercustomize.bst
 - freedesktop-sdk.bst:integration/debug-app-link.bst
+- freedesktop-sdk.bst:integration/flatpak-builder-configuration.bst
+- freedesktop-sdk.bst:integration/split-docs.bst
+- freedesktop-sdk.bst:integration/split-locales.bst
+- freedesktop-sdk.bst:multiarch/multiarch-sdk.bst
 config:
   exclude:
   - extra
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index d6d47001..029677b2 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -123,7 +123,6 @@ depends:
 - freedesktop-sdk.bst:components/npth.bst
 - freedesktop-sdk.bst:components/nspr.bst
 - freedesktop-sdk.bst:components/nss.bst
-- freedesktop-sdk.bst:components/nsswitch-config.bst
 - freedesktop-sdk.bst:components/opus.bst
 - freedesktop-sdk.bst:components/osmesa.bst
 - freedesktop-sdk.bst:components/p11-kit.bst
diff --git a/elements/vm/common-deps.bst b/elements/vm/common-deps.bst
index ec4cb27f..6bbe1072 100644
--- a/elements/vm/common-deps.bst
+++ b/elements/vm/common-deps.bst
@@ -15,7 +15,9 @@ runtime-depends:
 - vm/resize-root.bst
 - vm/spice-vdagent.bst
 - vm/wpa-supplicant-config.bst
+- vm/nsswitch-config.bst
 
+- vm/nss-mdns.bst
 - vm/uresourced.bst
 
 - freedesktop-sdk.bst:vm/config/pulseaudio.bst
diff --git a/elements/vm/nss-mdns.bst b/elements/vm/nss-mdns.bst
new file mode 100644
index 00000000..9e7bfc47
--- /dev/null
+++ b/elements/vm/nss-mdns.bst
@@ -0,0 +1,12 @@
+kind: autotools
+
+sources:
+- kind: tar
+  url: github_com:lathiat/nss-mdns/releases/download/v0.14.1/nss-mdns-0.14.1.tar.gz
+
+  ref: a2094101b735cade45048764ea594bdae2bfa9399837f3c852a5b264416e9c8c
+runtime-depends:
+- freedesktop-sdk.bst:components/avahi.bst
+
+depends:
+- freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/vm/nsswitch-config.bst b/elements/vm/nsswitch-config.bst
new file mode 100644
index 00000000..1cccf3a5
--- /dev/null
+++ b/elements/vm/nsswitch-config.bst
@@ -0,0 +1,13 @@
+kind: manual
+
+sources:
+- kind: local
+  path: files/vm/nsswitch.conf
+
+depends:
+- freedesktop-sdk.bst:bootstrap-import.bst
+
+config:
+  install-commands:
+  - mkdir -p "%{install-root}%{sysconfdir}"
+  - install nsswitch.conf "%{install-root}%{sysconfdir}"
diff --git a/files/vm/nsswitch.conf b/files/vm/nsswitch.conf
new file mode 100644
index 00000000..9df78767
--- /dev/null
+++ b/files/vm/nsswitch.conf
@@ -0,0 +1,18 @@
+# Name Service Switch configuration file.
+# See nsswitch.conf(5) for details.
+
+passwd: files
+group: files
+shadow: files
+
+publickey: files
+
+hosts: files mdns4_minimal [NOTFOUND=return] dns
+networks: files
+
+protocols: files
+services: files
+ethers: files
+rpc: files
+
+netgroup: files