commit 58563edc1c6473217446c8d0131a3abedcfee67e Author: Juergen Daubert <jue@jue.li> Date: Sat Feb 12 18:51:57 2022 +0100 samba: use /run/samba instead of /var/run/samba for pid files diff --git a/samba/.footprint b/samba/.footprint index 945425cb6..cbff67683 100644 --- a/samba/.footprint +++ b/samba/.footprint @@ -927,5 +927,3 @@ drwxrwxrwt root/root var/lock/ drwxr-xr-x root/root var/lock/samba/ drwxr-xr-x root/root var/log/ drwxr-xr-x root/root var/log/samba/ -drwxr-xr-x root/root var/run/ -drwxr-xr-x root/root var/run/samba/ diff --git a/samba/.signature b/samba/.signature index a18585974..ded7f9e06 100644 --- a/samba/.signature +++ b/samba/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/R5G5RZ2b8q7VVKsxchYruW91q16Gme8yh+Tu4z5CT5bbYZER6ZuEIkXmCCnZvrTCb/mWWHpf1XxC7O07RxxtAs= -SHA256 (Pkgfile) = 31d16bb0e6a51a052f1ec3dc9f1347728078b32689c37d144fb07da33f788617 -SHA256 (.footprint) = 88ed6018c9e14f01de0aabb6e4f693d4c498d393682b047c7a1b752ba7397fde +RWSE3ohX2g5d/dJu63CGRJ2xzwKtnl+n02IvEWllmDyjMsld5kqMVHabVS9aqfwdWuqKFPM1A9p2QuWxIDPesfWh8Sy3TsYuJws= +SHA256 (Pkgfile) = ab3159d33a6b24268cde8e4db6d1d4cbe1b40e44cf0dcf986ffceade6c68af71 +SHA256 (.footprint) = a196b8317d0d0c056983ef716f9a830ed4e481a3f92a1a8abf08617ba0769cdb SHA256 (samba-4.15.5.tar.gz) = 69115e33831937ba5151be0247943147765aece658ba743f44741672ad68d17f -SHA256 (samba) = 75bccea892422b5aebe8d2f9ce9b9c42ddc3cbdeccfd16f3161c07c1eb3feff0 +SHA256 (samba) = 0ab5a29dd85d5107cea902c21dd8426d20c3bcb2ce28a5add10d572bb88adc63 diff --git a/samba/Pkgfile b/samba/Pkgfile index e5ef5ed10..7d02c229b 100644 --- a/samba/Pkgfile +++ b/samba/Pkgfile @@ -5,7 +5,7 @@ name=samba version=4.15.5 -release=1 +release=2 source=(https://www.samba.org/samba/ftp/stable/$name-$version.tar.gz \ samba) @@ -18,6 +18,7 @@ build () { --libexecdir=/usr/lib \ --localstatedir=/var \ --sysconfdir=/etc \ + --with-piddir=/run/samba \ --with-privatedir=/etc/samba/private \ --with-pammodulesdir=/lib/security \ --bundled-libraries=!tdb,!talloc,!tevent,!popt,!ldb,!cmocka \ @@ -35,6 +36,7 @@ build () { # cleanup chmod 1777 $PKG/var/lock + rm -r $PKG/var/run $PKG/run # config-file and start-script install -d $PKG/etc/{samba,rc.d} diff --git a/samba/samba b/samba/samba index 692e1add0..611d9e5bf 100644 --- a/samba/samba +++ b/samba/samba @@ -6,8 +6,8 @@ SSD=/sbin/start-stop-daemon SMB=/usr/sbin/smbd NMB=/usr/sbin/nmbd -SMB_PID=/var/run/samba/smbd.pid -NMB_PID=/var/run/samba/nmbd.pid +SMB_PID=/run/samba/smbd.pid +NMB_PID=/run/samba/nmbd.pid print_status() { @@ -22,6 +22,7 @@ print_status() { case $1 in start) + mkdir -p /run/samba $SSD --start --pidfile $NMB_PID --exec $NMB -- -D $SSD --start --pidfile $SMB_PID --exec $SMB -- -D ;;