Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 Jan 2003 14:12:59 GMT
From:      Dominic Marks <dom@cus.org.uk>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/47048: Port Update: mail/dovecot
Message-ID:  <200301141412.h0EECxfv026752@moo.cus.org.uk>

next in thread | raw e-mail | index | archive | help

>Number:         47048
>Category:       ports
>Synopsis:       Port Update: mail/dovecot
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 14 06:10:02 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Dominic Marks
>Release:        FreeBSD 4.6-STABLE i386
>Organization:
UMIST
>Environment:
System: FreeBSD moo.cus.org.uk 4.6-STABLE FreeBSD 4.6-STABLE #0: Sat Jul 20 15:11:50 BST 2002 root@moo.cus.org.uk:/usr/obj/usr/src/sys/MOO i386

	
>Description:
	mail/dovecot 0.99.5 -> 0.99.7

	Dovecot Changes: (http://dovecot.procontrol.fi/)
	 Multiple optimisations
	 Multiple bug fixes

	Port Changes:
	 Add WITH_SASL2 option
	 Shuffle path replacement
	
>How-To-Repeat:
	NA.
	
>Fix:

Rather than provide a diff to a diff, I've just included a complete
version of patch-dovecot-example.conf in this PR.

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/dovecot/Makefile,v
retrieving revision 1.7
diff -u -3 -p -r1.7 Makefile
--- Makefile	2003/01/12 17:40:06	1.7
+++ Makefile	2003/01/14 14:07:20
@@ -6,22 +6,30 @@
 #
 
 PORTNAME=	dovecot
-PORTVERSION=	0.99.5
+PORTVERSION=	0.99.7
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://dovecot.procontrol.fi/
 
 MAINTAINER=	d.marks@student.umist.ac.uk
 
-USE_REINPLACE=	yes
+.if WITH_SASL2
+LIB_DEPENDS+=   sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+CONFIGURE_ARGS+=	--with-cyrus-sasl2
+.endif
+
+DOVECOT=	/var/dovecot
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
 CONFIGURE_ARGS+=	--disable-shadow --enable-ipv6 \
 		--localstatedir=/var/dovecot --with-ssl=openssl \
 		--with-vpopmail --with-pam --with-rawlog \
-		--with-ssldir=/var/dovecot/ssl 
-		
+		--with-ssldir=/var/dovecot/ssl
+
 pre-build:
-	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \
-		${WRKSRC}/dovecot-example.conf
+	@${REINPLACE_CMD} \
+		-e 's,%%PREFIX%%,${PREFIX},' \
+		-e 's,%%DOVECOT%%,${DOVECOT},' \
+			${WRKSRC}/dovecot-example.conf
 
 pre-install:
 	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" \
@@ -34,12 +42,14 @@ do-install:
 		${WRKSRC}/src/auth/imap-auth \
 		${WRKSRC}/src/login/imap-login \
 			${PREFIX}/lib/dovecot/
-	${INSTALL_DATA} ${WRKSRC}/dovecot-example.conf ${PREFIX}/etc/		
+	${INSTALL_DATA} ${WRKSRC}/dovecot-example.conf ${PREFIX}/etc/
 	${INSTALL_PROGRAM} ${WRKSRC}/src/master/imap-master ${PREFIX}/sbin/
 
 post-install:
 	@${MKDIR} /var/dovecot
 	@${MKDIR} /var/dovecot/ssl
+	@${MKDIR} /var/dovecot/ssl/certs
+	@${MKDIR} /var/dovecot/ssl/private
 	@${MKDIR} /var/dovecot/auth
 	@${MKDIR} /var/dovecot/login
 	@${CHOWN} -R imapd:imapd /var/dovecot
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/mail/dovecot/distinfo,v
retrieving revision 1.3
diff -u -3 -p -r1.3 distinfo
--- distinfo	2003/01/12 17:40:06	1.3
+++ distinfo	2003/01/14 14:07:20
@@ -1 +1 @@
-MD5 (dovecot-0.99.5.tar.gz) = b9e592f23213be9db3603f8bda8235cd
+MD5 (dovecot-0.99.7.tar.gz) = 169349448e4cd4f62cdb3162d6b92a90

--- dovecot-example.conf	Thu Jan  2 09:34:01 2003
+++ dovecot-example.conf	Tue Jan 14 13:45:02 2003
@@ -7,7 +7,7 @@
 # --with-ssldir=/etc/ssl
 
 # Base directory where to store runtime data.
-#base_dir = /var/run/dovecot/
+#base_dir = /%%DOVECOT%%/
 
 # Port to listen in for IMAP connections. This port is used for TLS
 # connections as well. Setting it to 0 disables it.
@@ -33,12 +33,12 @@
 # dropping root privileges, so keep the key file unreadable by anyone but
 # root. Included doc/mkcert.sh can be used to easily generate self-signed
 # certificate, just make sure to update the domains in dovecot-openssl.cnf
-#ssl_cert_file = /etc/ssl/certs/imapd.pem
-#ssl_key_file = /etc/ssl/private/imapd.pem
+#ssl_cert_file = /%%DOVECOT%%/ssl/certs/imapd.pem
+#ssl_key_file = /%%DOVECOT%%/ssl/private/imapd.pem
 
 # SSL parameter file. Master process generates this file for login processes.
 # It contains Diffie Hellman and RSA parameters.
-#ssl_parameters_file = /var/run/dovecot/ssl-parameters.dat
+#ssl_parameters_file = /%%DOVECOT%%/ssl/parameters.dat
 
 # How often to regenerate the SSL parameters file. Generation is quite CPU
 # intensive operation. The value is in hours, 0 disables regeneration
@@ -64,7 +64,7 @@
 ##
 
 # Executable location
-#login_executable = /usr/libexec/dovecot/imap-login
+#login_executable = /%%PREFIX%%/lib/dovecot/imap-login
 
 # User to use for imap-login process
 #login_user = imapd
@@ -76,7 +76,7 @@
 # Directory where imap-auth places authentication UNIX sockets which login
 # needs to be able to connect to. The sockets are created when running as
 # root, so you don't need to give imap-auth any access for it.
-#login_dir = /var/run/dovecot/login
+#login_dir = /%%DOVECOT%%/login/
 
 # chroot imap-login process to the login_dir. Only reason not to do this
 # is if you wish to run the whole imapd without roots.
@@ -111,7 +111,7 @@
 ##
 
 # Executable location
-#imap_executable = /usr/libexec/dovecot/imap
+#imap_executable = /%%PREFIX%%/lib/dovecot/imap
 
 # Set max. process size in megabytes. Most of the memory goes to mmap()ing
 # files, so it shouldn't harm much even if this limit is set pretty high.
@@ -140,7 +140,7 @@
 # WARNING: Never add directories here which local users can modify, that
 # may lead to root exploit. Usually this should be done only if you don't
 # allow shell access for users.
-#valid_chroot_dirs = 
+#valid_chroot_dirs = /%%DOVECOT%%/:/%%DOVECOT%%/auth/
 
 # Default MAIL environment to use when it's not set. By leaving this empty
 # dovecot tries to do some automatic detection as described in
@@ -289,10 +289,10 @@
 #   passwd-file /etc/passwd.imap: /etc/passwd-like file. Supports digest-md5
 #                                 style passwords
 #   vpopmail: vpopmail authentication
-auth_userinfo = pam
+auth_userinfo = passwd
 
 # Executable location
-#auth_executable = /usr/libexec/dovecot/imap-auth
+#auth_executable = /%%PREFIX%%/lib/dovecot/imap-auth
 
 # Set max. process size in megabytes.
 #auth_process_size = 256
@@ -317,9 +317,9 @@
 #auth = digest_md5
 #auth_methods = digest-md5
 #auth_realms = 
-#auth_userinfo = passwd-file /etc/passwd.imap
+#auth_userinfo = passwd-file /%%DOVECOT%%/auth/passwd.imap
 #auth_user = imapauth
-#auth_chroot = /var/run/dovecot/auth
+#auth_chroot = /%%DOVECOT%%/auth/
 
 # if you plan to use only passwd-file, you don't need the two auth processes,
 # simply set "auth_methods = plain digest-md5"




>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200301141412.h0EECxfv026752>