diff --git a/dovecot/.footprint b/dovecot/.footprint index fe2867736..d72421fab 100644 --- a/dovecot/.footprint +++ b/dovecot/.footprint @@ -922,6 +922,3 @@ drwxr-xr-x root/root usr/share/man/man7/ drwxr-xr-x root/root var/ drwxr-xr-x root/root var/lib/ drwxr-x--- root/root var/lib/dovecot/ -drwxr-xr-x root/root var/run/ -drwxr-xr-x root/root var/run/dovecot/ -drwxr-x--- root/dovecot var/run/dovecot/login/ diff --git a/dovecot/.signature b/dovecot/.signature index 098ee2664..3888b1b9e 100644 --- a/dovecot/.signature +++ b/dovecot/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/a3p8RI2kIxop6JSDqvynI5hIjvztEcBQhQDqEwvfHDmFVRhKTk0jEvUVElSUX7Nc2HBH5rLV1q5Ld6L1mK9GgU= -SHA256 (Pkgfile) = 849f82c9a1ff73ff8da90dcd600e4de3ce8cebf6b032b900b97c57e265f71b26 -SHA256 (.footprint) = 3d42f1dcdc5538e0e1fc2ad22921683171c6f4407a2dbc09dcaf48df5dd5853f +RWSE3ohX2g5d/akDC7jJQkgovVpK2CigxS6CclH/1GSpPb+G8KP1sy2FdDy4TtCxP1NISac/unLqkYuwBSy0lN9vWfS5rEumogk= +SHA256 (Pkgfile) = 9de0534cb807035247a2b195416cc2bd41350167b0964106c3e10e5213cdd69a +SHA256 (.footprint) = 0be7eca76e1986948a6c09cc1e8780370254d03bd20edae965dee66ea856ff40 SHA256 (dovecot-2.3.18.tar.gz) = 06e73f668c6c093c45bdeeeb7c20398ab8dc49317234f4b5781ac5e2cc5d6c33 -SHA256 (dovecot.rc) = 188af70cdcbb012eedd44bc0bbe6ef11567e7a788ecc57ffb106b934a87de286 +SHA256 (dovecot.rc) = 5c42d68ba066ecb27571ab85da98e4aba6c9a91c3289066a461283c54d175db5 SHA256 (dovecot.pam) = 9aa8bd8871560e4e3c255ca3e8ed9c99d6b29620e375155ef6c4118b5b7da4af diff --git a/dovecot/Pkgfile b/dovecot/Pkgfile index b096ac5d6..65e71792e 100644 --- a/dovecot/Pkgfile +++ b/dovecot/Pkgfile @@ -5,7 +5,7 @@ name=dovecot version=2.3.18 -release=1 +release=2 source=(https://dovecot.org/releases/2.3/$name-$version.tar.gz dovecot.rc dovecot.pam) @@ -17,6 +17,7 @@ build() { --libexecdir=/usr/lib \ --sysconfdir=/etc \ --localstatedir=/var \ + --with-rundir=/run/dovecot \ --with-moduledir=/usr/lib/dovecot/modules \ --with-pam \ --with-ssl=openssl @@ -40,8 +41,6 @@ build() { # directories install -d -m 0750 $PKG/var/lib/dovecot - install -d -m 0755 $PKG/var/run/dovecot - install -d -m 0750 -o root -g dovecot $PKG/var/run/dovecot/login # cleanup rm -r $PKG/usr/share/doc diff --git a/dovecot/dovecot.rc b/dovecot/dovecot.rc index 6aea32ac8..d81d6cf73 100644 --- a/dovecot/dovecot.rc +++ b/dovecot/dovecot.rc @@ -5,7 +5,7 @@ SSD=/sbin/start-stop-daemon PROG=/usr/sbin/dovecot -PID=/var/run/dovecot/master.pid +PID=/run/dovecot/master.pid KEY=/etc/ssl/private/dovecot.pem CRT=/etc/ssl/certs/dovecot.pem @@ -14,7 +14,7 @@ start) if [ ! -s $KEY -o ! -s $CRT ]; then /usr/bin/mksslcert $KEY $CRT fi - + mkdir -p /run/dovecot $SSD --start --pidfile $PID --exec $PROG ;; stop)