From 155e6f5af0fa63461f917505f63dd75f592f9e7b Mon Sep 17 00:00:00 2001
From: Silke Hofstra <silke@slxh.eu>
Date: Sun, 8 Sep 2024 16:34:52 +0200
Subject: [PATCH] samba: Add discovery definitions for systemd resolved

**Summary**

Add mDNS discovery definitions for use with systemd resolved as mDNS resolver.
---
 packages/s/samba/files/smb-device-info.dnssd |  4 ++++
 packages/s/samba/files/smb.dnssd             |  4 ++++
 packages/s/samba/package.yml                 |  4 +++-
 packages/s/samba/pspec_x86_64.xml            | 16 +++++++++-------
 4 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 packages/s/samba/files/smb-device-info.dnssd
 create mode 100644 packages/s/samba/files/smb.dnssd

diff --git a/packages/s/samba/files/smb-device-info.dnssd b/packages/s/samba/files/smb-device-info.dnssd
new file mode 100644
index 000000000000..209e7f4645fb
--- /dev/null
+++ b/packages/s/samba/files/smb-device-info.dnssd
@@ -0,0 +1,4 @@
+[Service]
+Name=%H
+Type=_device-info._tcp
+TxtText=model=RackMac
diff --git a/packages/s/samba/files/smb.dnssd b/packages/s/samba/files/smb.dnssd
new file mode 100644
index 000000000000..11da84254d2e
--- /dev/null
+++ b/packages/s/samba/files/smb.dnssd
@@ -0,0 +1,4 @@
+[Service]
+Name=%H
+Type=_smb._tcp
+Port=445
diff --git a/packages/s/samba/package.yml b/packages/s/samba/package.yml
index 6c67a40dd0eb..49df77fef3df 100644
--- a/packages/s/samba/package.yml
+++ b/packages/s/samba/package.yml
@@ -1,6 +1,6 @@
 name       : samba
 version    : 4.19.6
-release    : 106
+release    : 107
 source     :
     - https://download.samba.org/pub/samba/stable/samba-4.19.6.tar.gz : 653b52095554dbc223c63b96af5cdf9e98c3e048549c5f56143d3b33dce1cef1
 homepage   : https://samba.org
@@ -93,6 +93,8 @@ install    : |
     install -D -m00644 $pkgfiles/avahi.smb.service $installdir/usr/share/defaults/samba/avahi.smb.service
     install -d -m00755 $installdir/etc/avahi/services
     ln -sv /usr/share/defaults/samba/avahi.smb.service $installdir/etc/avahi/services/smb.service
+    # systemd resolved autodiscovery configuration
+    install -Dm0644 -t $installdir/usr/lib/systemd/dnssd $pkgfiles/*.dnssd
     # cups
     install -d -m00755 $installdir/%libdir%/cups/backend
     ln -sv /usr/bin/smbspool $installdir/%libdir%/cups/backend/smb
diff --git a/packages/s/samba/pspec_x86_64.xml b/packages/s/samba/pspec_x86_64.xml
index b143ee8ba1cb..566fdd7be82a 100644
--- a/packages/s/samba/pspec_x86_64.xml
+++ b/packages/s/samba/pspec_x86_64.xml
@@ -3,8 +3,8 @@
         <Name>samba</Name>
         <Homepage>https://samba.org</Homepage>
         <Packager>
-            <Name>Joey Riches</Name>
-            <Email>josephriches@gmail.com</Email>
+            <Name>Silke Hofstra</Name>
+            <Email>silke@slxh.eu</Email>
         </Packager>
         <License>GPL-3.0-or-later</License>
         <PartOf>desktop.core</PartOf>
@@ -62,6 +62,8 @@ For more information, see the Solus Help Center [Samba file sharing guide](https
             <Path fileType="executable">/usr/bin/smbtree</Path>
             <Path fileType="executable">/usr/bin/testparm</Path>
             <Path fileType="executable">/usr/bin/wbinfo</Path>
+            <Path fileType="library">/usr/lib/systemd/dnssd/smb-device-info.dnssd</Path>
+            <Path fileType="library">/usr/lib/systemd/dnssd/smb.dnssd</Path>
             <Path fileType="library">/usr/lib/systemd/system/nmb.service</Path>
             <Path fileType="library">/usr/lib/systemd/system/smb.service</Path>
             <Path fileType="library">/usr/lib/systemd/system/winbind.service</Path>
@@ -395,7 +397,7 @@ For more information, see the Solus Help Center [Samba file sharing guide](https
 </Description>
         <PartOf>programming.devel</PartOf>
         <RuntimeDependencies>
-            <Dependency release="106">samba</Dependency>
+            <Dependency release="107">samba</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include/samba-4.0/charset.h</Path>
@@ -515,12 +517,12 @@ For more information, see the Solus Help Center [Samba file sharing guide](https
         </Files>
     </Package>
     <History>
-        <Update release="106">
-            <Date>2024-07-06</Date>
+        <Update release="107">
+            <Date>2024-09-08</Date>
             <Version>4.19.6</Version>
             <Comment>Packaging update</Comment>
-            <Name>Joey Riches</Name>
-            <Email>josephriches@gmail.com</Email>
+            <Name>Silke Hofstra</Name>
+            <Email>silke@slxh.eu</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file