Mon Aug 30 09:33:48 2021 UTC ()
dovecot2: let the RC script work unprivileged

This takes advantage of the introduction of the SYSCONFBASE variable.
Tested on NetBSD/amd64.

ok adam@

Bumps PKGREVISION.


(khorben)
diff -r1.106 -r1.107 pkgsrc/mail/dovecot2/Makefile
diff -r1.3 -r1.4 pkgsrc/mail/dovecot2/files/dovecot.sh
cvs diff -r1.106 -r1.107 pkgsrc/mail/dovecot2/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/dovecot2/Makefile 2021/01/04 14:57:18 1.106
+++ pkgsrc/mail/dovecot2/Makefile 2021/08/30 09:33:48 1.107
@@ -1,17 +1,19 @@ @@ -1,17 +1,19 @@
1# $NetBSD: Makefile,v 1.106 2021/01/04 14:57:18 taca Exp $ 1# $NetBSD: Makefile,v 1.107 2021/08/30 09:33:48 khorben Exp $
2 2
3.include "../../mail/dovecot2/Makefile.common" 3.include "../../mail/dovecot2/Makefile.common"
4 4
 5PKGREVISION= 1
 6
5RCD_SCRIPTS= dovecot 7RCD_SCRIPTS= dovecot
6SMF_NAME= dovecot 8SMF_NAME= dovecot
7 9
8DOVECOT_USER?= dovecot 10DOVECOT_USER?= dovecot
9DOVECOT_GROUP?= dovecot 11DOVECOT_GROUP?= dovecot
10DOVENULL_USER?= dovenull 12DOVENULL_USER?= dovenull
11DOVENULL_GROUP?= dovenull 13DOVENULL_GROUP?= dovenull
12PKG_GROUPS= ${DOVECOT_GROUP} ${DOVENULL_GROUP} 14PKG_GROUPS= ${DOVECOT_GROUP} ${DOVENULL_GROUP}
13PKG_USERS= ${DOVECOT_USER}:${DOVECOT_GROUP} \ 15PKG_USERS= ${DOVECOT_USER}:${DOVECOT_GROUP} \
14 ${DOVENULL_USER}:${DOVENULL_GROUP} 16 ${DOVENULL_USER}:${DOVENULL_GROUP}
15PKG_GROUPS_VARS= DOVECOT_GROUP DOVENULL_GROUP 17PKG_GROUPS_VARS= DOVECOT_GROUP DOVENULL_GROUP
16PKG_USERS_VARS= DOVECOT_USER DOVENULL_USER 18PKG_USERS_VARS= DOVECOT_USER DOVENULL_USER
17 19
cvs diff -r1.3 -r1.4 pkgsrc/mail/dovecot2/files/dovecot.sh (expand / switch to unified diff)

--- pkgsrc/mail/dovecot2/files/dovecot.sh 2010/12/07 11:43:44 1.3
+++ pkgsrc/mail/dovecot2/files/dovecot.sh 2021/08/30 09:33:48 1.4
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: dovecot.sh,v 1.3 2010/12/07 11:43:44 adam Exp $ 3# $NetBSD: dovecot.sh,v 1.4 2021/08/30 09:33:48 khorben Exp $
4# 4#
5 5
6# PROVIDE: dovecot 6# PROVIDE: dovecot
7# REQUIRE: DAEMON LOGIN ntpdate 7# REQUIRE: DAEMON LOGIN ntpdate
8 8
9. /etc/rc.subr 9. @SYSCONFBASE@/rc.subr
10 10
11name="dovecot" 11name="dovecot"
12rcvar=$name 12rcvar=$name
13command="@PREFIX@/sbin/${name}" 13command="@PREFIX@/sbin/${name}"
14required_files="@PKG_SYSCONFDIR@/dovecot/$name.conf" 14required_files="@PKG_SYSCONFDIR@/dovecot/$name.conf"
15extra_commands="reload" 15extra_commands="reload"
16 16
17load_rc_config $name 17load_rc_config $name
18dovecot_fdlimit=${dovecot_fdlimit-"768"} 18dovecot_fdlimit=${dovecot_fdlimit-"768"}
19 19
20# A default limit of 64 (at least on NetBSD) may be too low for many people 20# A default limit of 64 (at least on NetBSD) may be too low for many people
21SOFT_FDLIMIT=`ulimit -S -n` 21SOFT_FDLIMIT=`ulimit -S -n`
22HARD_FDLIMIT=`ulimit -H -n` 22HARD_FDLIMIT=`ulimit -H -n`