From 1cdd69f4c8769d0406c09d93444611238a26ada4 Mon Sep 17 00:00:00 2001
From: Joe Hillenbrand <joehillen@gmail.com>
Date: Wed, 18 Aug 2021 21:10:50 -0700
Subject: [PATCH] run as smbnetfs instead of nobody

---
 trunk/PKGBUILD          | 14 +++++++++++---
 trunk/smbnetfs.install  | 10 ----------
 trunk/smbnetfs.service  |  2 +-
 trunk/smbnetfs.sysusers |  1 +
 trunk/smbnetfs.tmpfiles |  3 +++
 5 files changed, 16 insertions(+), 14 deletions(-)
 create mode 100644 trunk/smbnetfs.sysusers
 create mode 100644 trunk/smbnetfs.tmpfiles

diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 13421dc67185..1539535556eb 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=smbnetfs
 pkgver=0.6.3
-pkgrel=1
+pkgrel=2
 pkgdesc="small C program that mounts Microsoft network neighborhood in single directory."
 arch=('x86_64')
 url="http://smbnetfs.sourceforge.net/"
@@ -17,10 +17,14 @@ install=smbnetfs.install
 options=(docs)
 source=(https://downloads.sourceforge.net/smbnetfs/$pkgname-$pkgver.tar.bz2
 	conf-smbnetfs
-	smbnetfs.service)
+	smbnetfs.service
+	smbnetfs.sysusers
+  smbnetfs.tmpfiles)
 sha256sums=('eac37b9769fbe9c3f4baf3eb64c61a6b59ad4f2aa05dfddcba5a1ac4adf4d560'
             'ca3b686c37fe77193e8df86efcaadb8fe809dfaa8cd62effde6b038af07ea226'
-            '9a06d4d1ffec3c2dd9bff09fa92fb3e9c0aa9569be90a61bb51f04f852b2d741')
+            '1dcbdb521509f9d9fd24a343ca7a0b19ea7b1f1b7053e0e07f36a09be3653ad1'
+            '950b719e11ac033cd19d1da890b913c78f97ca428d39a9614f90907dddc4e61d'
+            '79f2119a03a638e28451e01bd858a633d12b39dc3632822057feb0caa26db1f7')
 
 prepare() {
   cd "$srcdir"/$pkgname-$pkgver
@@ -43,6 +47,10 @@ package() {
   mv "$pkgdir"/usr/share/doc/smbnetfs* "$pkgdir"/usr/share/doc/smbnetfs
 
   mkdir -p "$pkgdir"/etc/smbnetfs/.smb
+  install -Dm644 "$srcdir/$pkgname.sysusers" \
+    "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
+  install -Dm644 "$srcdir/$pkgname.tmpfiles" \
+    "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
   install -m0644 "$srcdir"/$pkgname-$pkgver/conf/* "$pkgdir"/etc/smbnetfs/.smb/
   install -Dm0644 "$srcdir"/$pkgname-$pkgver/README "$pkgdir"/usr/share/doc/smbnetfs/README
   install -Dm0644 "$srcdir"/conf-smbnetfs "$pkgdir"/etc/conf.d/smbnetfs
diff --git a/trunk/smbnetfs.install b/trunk/smbnetfs.install
index d1c87406f0e4..1361eab8235c 100644
--- a/trunk/smbnetfs.install
+++ b/trunk/smbnetfs.install
@@ -1,11 +1,6 @@
 post_install() {
   echo "-- To use rc-script you should:"
   echo "--   * set user_allow_other option in /etc/fuse.conf"
-
-  chown -R nobody.nobody /etc/smbnetfs/.smb && \
-  mkdir -p /mnt/smbnet && \
-  chown nobody.nobody /mnt/smbnet && \
-  chmod 0777 /mnt/smbnet
 }
 
 pre_upgrade() {
@@ -16,9 +11,4 @@ pre_upgrade() {
 post_upgrade() {
   echo "-- You should set user_allow_other option in /etc/fuse.conf to use rc-script"
   echo "--   * set user_allow_other option in /etc/fuse.conf"
-
-  chown -R nobody.nobody /etc/smbnetfs/.smb && \
-  mkdir -p /mnt/smbnet && \
-  chown nobody.nobody /mnt/smbnet && \
-  chmod 0777 /mnt/smbnet
 }
diff --git a/trunk/smbnetfs.service b/trunk/smbnetfs.service
index 60d342b95a68..2684e7f43b1c 100644
--- a/trunk/smbnetfs.service
+++ b/trunk/smbnetfs.service
@@ -6,7 +6,7 @@ After=network-online.target
 [Service]
 Environment=HOME=/etc/smbnetfs SMBNETFS_MOUNT_POINT=/mnt/smbnet
 EnvironmentFile=/etc/conf.d/smbnetfs
-User=nobody
+User=smbnetfs
 ExecStart=/usr/bin/smbnetfs -f -o allow_other $SMBNETFS_MOUNT_POINT
 ExecStop=/bin/fusermount -u $SMBNETFS_MOUNT_POINT
 
diff --git a/trunk/smbnetfs.sysusers b/trunk/smbnetfs.sysusers
new file mode 100644
index 000000000000..8414408dff14
--- /dev/null
+++ b/trunk/smbnetfs.sysusers
@@ -0,0 +1 @@
+u smbnetfs 213 "smbnetfs" /etc/smbnetfs
diff --git a/trunk/smbnetfs.tmpfiles b/trunk/smbnetfs.tmpfiles
new file mode 100644
index 000000000000..fb02be686eea
--- /dev/null
+++ b/trunk/smbnetfs.tmpfiles
@@ -0,0 +1,3 @@
+d /etc/smbnetfs/.smb 0644 smbnetfs nobody
+d /etc/smbnetfs/.cache/samba 0644 smbnetfs nobody
+d /mnt/smbnet 0777 smbnetfs nobody
-- 
2.32.0