commit:     18e0da7d0aa16d3e64ddc9782a8d4c29330b5b5b
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 27 20:14:50 2023 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Jan 27 20:16:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18e0da7d

net-fs/samba: move more keepdirs to tmpfiles

Closes: https://bugs.gentoo.org/602352
Closes: https://bugs.gentoo.org/520612
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 net-fs/samba/files/samba.conf        | 11 ++++++++---
 net-fs/samba/samba-4.15.12-r3.ebuild |  5 -----
 net-fs/samba/samba-4.16.7-r3.ebuild  |  5 -----
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/net-fs/samba/files/samba.conf b/net-fs/samba/files/samba.conf
index a7f4946fb07c..8e6e9dd8a158 100644
--- a/net-fs/samba/files/samba.conf
+++ b/net-fs/samba/files/samba.conf
@@ -1,3 +1,8 @@
-D /run/samba 0755 root root
-D /run/ctdb 0755 root root
-D /run/lock/samba 0755 root root
+d /run/samba
+d /run/ctdb
+d /run/lock/samba
+d /var/cache/samba
+d /var/lib/ctdb
+d /var/lib/samba/bind-dns
+d /var/lib/samba/private
+d /var/log/samba

diff --git a/net-fs/samba/samba-4.15.12-r3.ebuild 
b/net-fs/samba/samba-4.15.12-r3.ebuild
index 647db70b0f64..7cd4ba9cba8b 100644
--- a/net-fs/samba/samba-4.15.12-r3.ebuild
+++ b/net-fs/samba/samba-4.15.12-r3.ebuild
@@ -318,11 +318,6 @@ multilib_src_install() {
                insinto /etc/security
                doins examples/pam_winbind/pam_winbind.conf
        fi
-
-       keepdir /var/cache/samba
-       keepdir /var/lib/ctdb
-       keepdir /var/lib/samba/{bind-dns,private}
-       keepdir /var/log/samba
 }
 
 multilib_src_test() {

diff --git a/net-fs/samba/samba-4.16.7-r3.ebuild 
b/net-fs/samba/samba-4.16.7-r3.ebuild
index 2029be6f6ff9..3f91c4f83dab 100644
--- a/net-fs/samba/samba-4.16.7-r3.ebuild
+++ b/net-fs/samba/samba-4.16.7-r3.ebuild
@@ -358,11 +358,6 @@ multilib_src_install() {
                insinto /etc/security
                doins examples/pam_winbind/pam_winbind.conf
        fi
-
-       keepdir /var/cache/samba
-       keepdir /var/lib/ctdb
-       keepdir /var/lib/samba/{bind-dns,private}
-       keepdir /var/log/samba
 }
 
 pkg_postinst() {

Reply via email to