commit 71bb9c4a71995ef817e614fd479169f251114d3b Author: Juergen Daubert <jue@jue.li> Date: Thu Feb 17 17:19:07 2022 +0100 stunnel: move pid-file to /run diff --git a/stunnel/.footprint b/stunnel/.footprint index 8021bf330..7c40ac422 100644 --- a/stunnel/.footprint +++ b/stunnel/.footprint @@ -14,6 +14,3 @@ drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man8/ -rw-r--r-- root/root usr/share/man/man8/stunnel.8.gz -drwxr-xr-x root/root var/ -drwxr-xr-x root/root var/run/ -drwxrwx--- stunnel/stunnel var/run/stunnel/ diff --git a/stunnel/.signature b/stunnel/.signature index 2b1d0c47f..cea10aa24 100644 --- a/stunnel/.signature +++ b/stunnel/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/QxJK79ALtr6x/XrKLjfkjU3L/4xA34JK5kWmzORr/T0c9efLXVL0W+k86Pgv3kyMf+b6QhoW9nOLAaLYxEgugI= -SHA256 (Pkgfile) = 4e16f466fcb304c67caf3268805db52b0ad056fe9a7828ed1d880aebdf6fbed3 -SHA256 (.footprint) = f83e6abdfdb94cb68ef512ba0ef5d19a1e180887f2cf7c92d2916af0ec7b1e51 +RWSE3ohX2g5d/d2WmjiMaApGxvSSuNs0bq7syNNK0aZ2iaK8YYjgz8j+VzH34Pq+rIyYCgseSyTk12g0OkxwjtTPSkDFstQRdwM= +SHA256 (Pkgfile) = ceda03d90594631b61f0fc6340903a6ec51acfd4bfe8d74e33f9bcc948c16be3 +SHA256 (.footprint) = fe22a3875f4d80b825fe529a35681487eec9e0d63efac00d19fe7b51399499f0 SHA256 (stunnel-5.62.tar.gz) = 9cf5bb949022aa66c736c1326554cca27d0641605a6370274edc4951eb5bd339 -SHA256 (stunnel.conf) = ef09041fd68530a6029826678eb22db30a80d8a77308ee361b12aa466f7daa28 -SHA256 (stunnel) = c6e5c2bcfd87b709bbc24b5c24a603b43bc9440e125eeaf283a11daadc78cbd7 +SHA256 (stunnel.conf) = f8b29dc508583669fe6e853bf004c9aec50bb07cb94672d99effdb592f17e4ab +SHA256 (stunnel) = e8867c4eeca0cd3cb48227851ba38c60972440b4171cc6f0a2173638b31626c7 diff --git a/stunnel/Pkgfile b/stunnel/Pkgfile index 1db10af63..5a350d273 100644 --- a/stunnel/Pkgfile +++ b/stunnel/Pkgfile @@ -26,9 +26,6 @@ build () { install -D -m 0755 $SRC/stunnel $PKG/etc/rc.d/stunnel install -D -m 0644 $SRC/stunnel.conf $PKG/etc/stunnel.conf - install -d $PKG/var/run - install -d -m 770 -o stunnel -g stunnel $PKG/var/run/stunnel - install -d $PKG/etc/ssl/{certs,keys} touch $PKG/etc/ssl/{certs/stunnel.crt,keys/stunnel.key} chmod 0600 $PKG/etc/ssl/keys/stunnel.key diff --git a/stunnel/stunnel b/stunnel/stunnel index f731c8f5b..ab6bc3739 100644 --- a/stunnel/stunnel +++ b/stunnel/stunnel @@ -6,7 +6,7 @@ SSD=/sbin/start-stop-daemon PROG=/usr/sbin/stunnel NAME=stunnel -PID=/var/run/stunnel/stunnel.pid +PID=/run/stunnel/stunnel.pid CFG=/etc/stunnel.conf CRT=/etc/ssl/certs/stunnel.crt @@ -17,6 +17,7 @@ start) if [ ! -s $KEY -o ! -s $CRT ]; then /usr/bin/mksslcert $KEY $CRT fi + install -o stunnel -g stunnel -m 0770 -d /run/stunnel $SSD --start --pidfile $PID --exec $PROG -- $CFG ;; stop) diff --git a/stunnel/stunnel.conf b/stunnel/stunnel.conf index 655f58311..52a3c327f 100644 --- a/stunnel/stunnel.conf +++ b/stunnel/stunnel.conf @@ -5,7 +5,7 @@ setuid = stunnel setgid = stunnel -chroot = /var/run/stunnel/ +chroot = /run/stunnel/ pid = /stunnel.pid syslog = yes