Mon May 3 19:19:01 2010 UTC ()
load_rc_config prior to setting a default for dovecot_fdlimit in the
rc.d script, so it can be overridden from rc.conf.  From Edgar Fuß.
Bump PKGREVISION.


(ghen)
diff -r1.145 -r1.146 pkgsrc/mail/dovecot/Makefile
diff -r1.4 -r1.5 pkgsrc/mail/dovecot/files/dovecot.sh
cvs diff -r1.145 -r1.146 pkgsrc/mail/dovecot/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/dovecot/Attic/Makefile 2010/04/30 10:43:26 1.145
+++ pkgsrc/mail/dovecot/Attic/Makefile 2010/05/03 19:19:00 1.146
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.145 2010/04/30 10:43:26 ghen Exp $ 1# $NetBSD: Makefile,v 1.146 2010/05/03 19:19:00 ghen Exp $
2 2
3DOVECOT_VERSION= 1.2 3DOVECOT_VERSION= 1.2
4DOVECOT_SUBVERSION= .11 4DOVECOT_SUBVERSION= .11
5PKGREVISION= 1 5PKGREVISION= 2
6SIEVE_VERSION= 0.1.16 6SIEVE_VERSION= 0.1.16
7MANAGESIEVE_VERSION= 0.11.11 7MANAGESIEVE_VERSION= 0.11.11
8DISTNAME= dovecot-${DOVECOT_VERSION}${DOVECOT_SUBVERSION} 8DISTNAME= dovecot-${DOVECOT_VERSION}${DOVECOT_SUBVERSION}
9CATEGORIES= mail 9CATEGORIES= mail
10MASTER_SITES= http://www.dovecot.org/releases/${DOVECOT_VERSION}/ 10MASTER_SITES= http://www.dovecot.org/releases/${DOVECOT_VERSION}/
11DOVECOT_SIEVE_SITES= http://www.rename-it.nl/dovecot/${DOVECOT_VERSION}/ 11DOVECOT_SIEVE_SITES= http://www.rename-it.nl/dovecot/${DOVECOT_VERSION}/
12 12
13MANAGESIEVE_PATCH= dovecot-${DOVECOT_VERSION}${DOVECOT_SUBVERSION}-managesieve-${MANAGESIEVE_VERSION}.diff.gz 13MANAGESIEVE_PATCH= dovecot-${DOVECOT_VERSION}${DOVECOT_SUBVERSION}-managesieve-${MANAGESIEVE_VERSION}.diff.gz
14SITES.${MANAGESIEVE_PATCH}= ${DOVECOT_SIEVE_SITES} 14SITES.${MANAGESIEVE_PATCH}= ${DOVECOT_SIEVE_SITES}
15PATCH_DIST_STRIP.${MANAGESIEVE_PATCH}= -p1 15PATCH_DIST_STRIP.${MANAGESIEVE_PATCH}= -p1
16 16
17MAINTAINER= ghen@NetBSD.org 17MAINTAINER= ghen@NetBSD.org
18HOMEPAGE= http://www.dovecot.org/ 18HOMEPAGE= http://www.dovecot.org/
cvs diff -r1.4 -r1.5 pkgsrc/mail/dovecot/files/Attic/dovecot.sh (expand / switch to unified diff)

--- pkgsrc/mail/dovecot/files/Attic/dovecot.sh 2008/07/10 00:54:30 1.4
+++ pkgsrc/mail/dovecot/files/Attic/dovecot.sh 2010/05/03 19:19:01 1.5
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: dovecot.sh,v 1.4 2008/07/10 00:54:30 jnemeth Exp $ 3# $NetBSD: dovecot.sh,v 1.5 2010/05/03 19:19:01 ghen Exp $
4# 4#
5 5
6# PROVIDE: dovecot 6# PROVIDE: dovecot
7# REQUIRE: DAEMON LOGIN 7# REQUIRE: DAEMON LOGIN
8 8
9. /etc/rc.subr 9. /etc/rc.subr
10 10
11name="dovecot" 11name="dovecot"
12rcvar=$name 12rcvar=$name
13command="@PREFIX@/sbin/${name}" 13command="@PREFIX@/sbin/${name}"
14required_files="@PKG_SYSCONFDIR@/$name.conf" 14required_files="@PKG_SYSCONFDIR@/$name.conf"
15extra_commands="reload" 15extra_commands="reload"
16 16
 17load_rc_config $name
17dovecot_fdlimit=${dovecot_fdlimit-"768"} 18dovecot_fdlimit=${dovecot_fdlimit-"768"}
18 19
19# 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
20SOFT_FDLIMIT=`ulimit -S -n` 21SOFT_FDLIMIT=`ulimit -S -n`
21HARD_FDLIMIT=`ulimit -H -n` 22HARD_FDLIMIT=`ulimit -H -n`
22 23
23if [ ${dovecot_fdlimit} -gt ${SOFT_FDLIMIT} ]; then 24if [ ${dovecot_fdlimit} -gt ${SOFT_FDLIMIT} ]; then
24 if [ ${dovecot_fdlimit} -le ${HARD_FDLIMIT} ]; then 25 if [ ${dovecot_fdlimit} -le ${HARD_FDLIMIT} ]; then
25 ulimit -S -n ${dovecot_fdlimit} 26 ulimit -S -n ${dovecot_fdlimit}
26 else 27 else
27 ulimit -S -n ${HARD_FDLIMIT} 28 ulimit -S -n ${HARD_FDLIMIT}
28 fi 29 fi
29fi 30fi
30 31
31load_rc_config $name 
32run_rc_command "$1" 32run_rc_command "$1"