Attachment #57336 for bug #86530

View | Details | Raw Unified | Return to bug 86530
Collapse All | Expand All




#

PORTNAME=	dovecot
DISTVERSION=	1.0.alpha3
CATEGORIES=	mail ipv6
MASTER_SITES=	http://www.dovecot.org/releases/

MAINTAINER=	robin@isometry.net
COMMENT=	Secure and compact IMAP and POP3 servers

CONFLICTS=	dovecot-1.*

USE_ICONV=	yes
USE_RC_SUBR=	yes

GNU_CONFIGURE=	yes
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS=	--without-shadow --with-pam \
		--localstatedir=/var --with-ssl=openssl
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
		LDFLAGS="-L${LOCALBASE}/lib"

PKGMESSAGE=	${WRKDIR}/pkg-message

DOCS=		USE-WIKI-INSTEAD \
		auth-protocol.txt auth.txt configuration.txt design.txt \
		index.txt mail-storages.txt mkcert.sh multiaccess.txt \
		nfs.txt securecoding.txt variables.txt \
		dovecot-ldap.conf dovecot-sql.conf dovecot-openssl.cnf
		dovecot-mysql.conf dovecot-openssl.cnf

OPTIONS=	SASL2		"SASL2 support"		off \
		SASL2		"SASL2 support"		off \
		VPOPMAIL	"VPopMail support"	off \
		LDAP		"OpenLDAP support"	off \
		PGSQL		"PostgreSQL support"	off \


.include <bsd.port.pre.mk>

## GNUTLS support
#
# Use the GNU Transport Layer Security
# rather than OpenSSL.
.if defined(WITH_GNUTLS)
IGNORE=			Currently incompatible with security/gnutls
LIB_DEPENDS+=		gnutls:${PORTSDIR}/security/gnutls
CONFIGURE_ARGS+=	--with-ssl=gnutls
.else
CONFIGURE_ARGS+=	--with-ssl=openssl
.endif

## SASL2 support
#
# SASL provides authentication support to


## VPopMail Support
#
# vpopmail provides easy authentication and
# multi-domain features. It was originally
# created for use with Qmail.
#
.if defined(WITH_VPOPMAIL)
VPOPMAIL=		${LOCALBASE}/vpopmail/bin/vchkpw
BUILD_DEPENDS+=		${VPOPMAIL}:${PORTSDIR}/mail/vpopmail


## OpenLDAP Support
#
# LDAP is the light-weight directory access
# protocol and can be used by Dovecot for its
# user database.
#
.if defined(WITH_LDAP)
USE_OPENLDAP=		yes
CONFIGURE_ARGS+=	--with-ldap


## PostgreSQL Support
#
# PostgreSQL is a powerful SQL database that
# can be used to store user tables.
#
.if defined(WITH_PGSQL)
USE_PGSQL=		yes
CONFIGURE_ARGS+=	--with-pgsql


## MySQL Support
#
# MySQL is another SQL database that can be
# used to store user tables.
#
.if defined(WITH_MYSQL)
USE_MYSQL=		yes
CONFIGURE_ARGS+=	--with-mysql
.endif

post-build:
	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
		${WRKSRC}/dovecot-example.conf >${WRKDIR}/dovecot.conf.sample
	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
		-e 's,%%RC_SUBR%%,${RC_SUBR},g' \

do-install:
	@${MKDIR} ${PREFIX}/libexec/dovecot
	${INSTALL_PROGRAM} \
		${WRKSRC}/src/auth/checkpassword-reply \
		${WRKSRC}/src/pop3/pop3 \
		${WRKSRC}/src/auth/dovecot-auth \
		${WRKSRC}/src/deliver/deliver \
		${WRKSRC}/src/imap/imap \
		${WRKSRC}/src/imap-login/imap-login \
		${WRKSRC}/src/pop3/pop3 \
		${WRKSRC}/src/pop3-login/pop3-login \
		${WRKSRC}/src/util/rawlog \
			${PREFIX}/libexec/dovecot/
	${INSTALL_PROGRAM} \
		${WRKSRC}/src/master/dovecot \
		${WRKSRC}/src/util/dovecotpw \
			${PREFIX}/sbin/
	${INSTALL_DATA} ${WRKDIR}/dovecot.conf.sample ${PREFIX}/etc/
	${INSTALL_SCRIPT} ${WRKDIR}/dovecot.sh ${PREFIX}/etc/rc.d/
.if !defined(NOPORTDOCS)

Lines 1-2 Link Here

(-)dovecot/distinfo (-2 / +2 lines)
1	MD5 (dovecot-0.99.14.tar.gz) = a12e26fd378a46c31ec3a81ab7b55b5b	1	MD5 (dovecot-1.0.alpha3.tar.gz) = 2006624ce4328dcdef6a71376c3be05d
2	SIZE (dovecot-0.99.14.tar.gz) = 871285	2	SIZE (dovecot-1.0.alpha3.tar.gz) = 1193017




--- dovecot-example.conf.orig	Fri Jul 22 18:40:25 2005
+++ dovecot-example.conf	Fri Sep  9 00:02:06 2005
@@ -7,7 +7,7 @@
 # Default values are shown after each value, it's not required to uncomment
 # any of the lines. Exception to this are paths, they're just examples
 # with real defaults being based on configure options. The paths listed here
-# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+# are for configure --prefix=%%PREFIX%% --sysconfdir=%%PREFIX%%/etc --localstatedir=/var
 # --with-ssldir=/etc/ssl
 
 # Base directory where to store runtime data.
@@ -15,7 +15,7 @@
 
 # Protocols we want to be serving:
 #  imap imaps pop3 pop3s

 
 # IP or host address where to listen in for connections. It's not currently
 # possible to specify multiple addresses. "*" listens in all IPv4 interfaces.
@@ -95,7 +95,7 @@
 #pop3s_listen = 
 
 # Disable SSL/TLS support.
-#ssl_disable = no
+ssl_disable = yes
 
 # PEM encoded X.509 SSL/TLS certificate and private key. They're opened before
 # 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/dovecot.pem
-#ssl_key_file = /etc/ssl/private/dovecot.pem
+#ssl_cert_file = /etc/ssl/certs/imapd.pem
+#ssl_key_file = /etc/ssl/private/imapd.pem
 
 # SSL parameter file. Master process generates this file for login processes.
 # It contains Diffie Hellman and RSA parameters.
@@ -85,14 +85,14 @@
 login = imap
 
 # Executable location.
-#login_executable = /usr/libexec/dovecot/imap-login
+#login_executable = %%PREFIX%%/libexec/dovecot/imap-login
 
 # User to use for the login process. Create a completely new user for this,
 # and don't use it anywhere else. The user must also belong to a group where
 # only it has access, it's used to control access for authentication process.
 # Note that this user is NOT used to access mails.
 # http://wiki.dovecot.org/UserIds

 
 # Set max. process size in megabytes. If you don't use
 # login_process_per_connection you might need to grow this.
@@ -148,7 +148,7 @@
 login = pop3
 
 # Exception to above rule being the executable location.
-#login_executable = /usr/libexec/dovecot/pop3-login
+#login_executable = %%PREFIX%%/libexec/dovecot/pop3-login
 
 ##
 ## Mail processes
@@ -145,7 +145,7 @@
 # Show more verbose process titles (in ps). Currently shows user name and
 # IP address. Useful for seeing who are actually using the IMAP processes
 # (eg. shared mailboxes or if same uid is used for multiple accounts).
-#verbose_proctitle = no
+verbose_proctitle = no
 
 # Show protocol level SSL errors.
 #verbose_ssl = no
@@ -164,12 +164,12 @@
 # non-valid GID as primary group ID aren't allowed to log in. If user
 # belongs to supplementary groups with non-valid GIDs, those groups are
 # not set.

 #last_valid_gid = 0
 
 # Grant access to these extra groups for mail processes. Typical use would be
 # to give "mail" group write access to /var/mail to be able to create dotlocks.
-#mail_extra_groups =
+mail_extra_groups = mail
 
 # ':' separated list of directories under which chrooting is allowed for mail
 # processes (ie. /var/mail will allow chrooting to /var/mail/foo/bar too).
@@ -205,7 +205,7 @@
 # Default chroot directory for mail processes. This can be overridden by
 # giving /./ in user's home directory (eg. /home/./user chroots into /home).
@@ -197,7 +197,7 @@
 #   default_mail_env = mbox:~/mail/:INBOX=/var/mail/%u
 #   default_mail_env = mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n
 #
-#default_mail_env = 
+default_mail_env = mbox:/var/mail/%u
 
 # If you need to set multiple mailbox locations or want to change default
 # namespace settings, you can do it by defining namespace sections:
@@ -321,7 +321,7 @@
 #   outlook-pop3-no-nuls:
 #     Outlook and Outlook Express hang if mails contain NUL characters.
 #     This setting replaces them with 0x80 character.
-#client_workarounds = 
+client_workarounds = oe6-fetch-no-newmail outlook-idle outlook-pop3-no-nuls
 
 # Dovecot can notify client of new mail in selected mailbox soon after it's
 # received. This setting specifies the minimum interval in seconds between
@@ -289,7 +289,7 @@
 # know any MUA which would modify mail files directly. IMAP protocol also
 # requires that the mails don't change, so it would be problematic in any case.
 # If you care about performance, enable it.
-#maildir_copy_with_hardlinks = no
+maildir_copy_with_hardlinks = yes
 
 # Which locking methods to use for locking mbox. There's four available:
 #  dotlock: Create <mailbox>.lock file. This is the oldest and most NFS-safe
@@ -389,12 +389,12 @@
 
 protocol imap {
   # Login executable location.
-  #login_executable = /usr/libexec/dovecot/imap-login
+  #login_executable = %%PREFIX%%/libexec/dovecot/imap-login
 
   # IMAP executable location
-  #mail_executable = /usr/libexec/dovecot/imap
+  #mail_executable = %%PREFIX%%/libexec/dovecot/imap
   # This would write rawlogs into ~/dovecot.rawlog/ directory:
-  #mail_executable = /usr/libexec/dovecot/rawlog /usr/libexec/dovecot/imap
+  #mail_executable = %%PREFIX%%/libexec/dovecot/rawlog %%PREFIX%%/libexec/dovecot/imap
 
   # Maximum IMAP command line length in bytes. Some clients generate very long
   # command lines with huge mailboxes, so you may need to raise this if you get
@@ -403,7 +403,7 @@
 
   # Support for dynamically loadable modules.
   #mail_use_modules = no
-  #mail_modules = /usr/lib/dovecot/imap
+  #mail_modules = %%PREFIX%%/lib/dovecot/imap
 
   # Send IMAP capabilities in greeting message. This makes it unnecessary for
   # clients to request it with CAPABILITY command, so it saves one round-trip.
@@ -433,7 +433,7 @@
   #     With mbox storage a mailbox can contain either mails or submailboxes,
   #     but not both. Thunderbird separates these two by forcing server to
   #     accept '/' suffix in mailbox names in subscriptions list.
-  #imap_client_workarounds = outlook-idle
+  imap_client_workarounds = delay-newmail outlook-idle netscape-eoh tb-extra-mailbox-sep
 }
   
 ##
@@ -442,10 +442,10 @@
 
 protocol pop3 {
   # Login executable location.
-  #login_executable = /usr/libexec/dovecot/pop3-login
+  #login_executable = %%PREFIX%%/libexec/dovecot/pop3-login
 
   # POP3 executable location
-  #mail_executable = /usr/libexec/dovecot/pop3
+  #mail_executable = %%PREFIX%%/libexec/dovecot/pop3
 
   # Don't try to set mails non-recent or seen with POP3 sessions. This is
   # mostly intended to reduce disk I/O. With maildir it doesn't move files
@@ -475,7 +475,7 @@
   # Note that Outlook 2003 seems to have problems with %v.%u format which is
   # Dovecot's default, so if you're building a new server it would be a good
   # idea to change this. %08Xu%08Xv should be pretty fail-safe.
-  #pop3_uidl_format = %v.%u
+  pop3_uidl_format = %08Xu%08Xv
 
   # POP3 logout format string:
   #  %t - number of TOP commands
@@ -489,7 +489,7 @@
 
   # Support for dynamically loadable modules.
   #mail_use_modules = no
-  #mail_modules = /usr/lib/dovecot/pop3
+  #mail_modules = %%PREFIX%%/lib/dovecot/pop3
 
   # Workarounds for various client bugs:
   #   outlook-no-nuls:
@@ -498,7 +498,7 @@
   #   oe-ns-eoh:
   #     Outlook Express and Netscape Mail breaks if end of headers-line is
   #     missing. This option simply sends it if it's missing.
-  #pop3_client_workarounds = 
+  pop3_client_workarounds = outlook-no-nuls oe-ns-eoh
 }
 
 ##
@@ -506,7 +506,7 @@
 ##
 
 # Executable location
-#pop3_executable = /usr/libexec/dovecot/pop3
+#pop3_executable = %%PREFIX%%/libexec/dovecot/pop3
 
 # 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.
@@ -361,7 +361,7 @@
 
 # Support for dynamically loadable modules.
 #pop3_use_modules = no
-#pop3_modules = /usr/lib/dovecot/pop3
+#pop3_modules = %%PREFIX%%/lib/dovecot/pop3
 
 ##
 ## Authentication processes
@@ -438,9 +438,9 @@
 #   vpopmail: vpopmail authentication
 #   ldap <config path>: LDAP, see doc/dovecot-ldap.conf
 #   pgsql <config path>: a PostgreSQL database, see doc/dovecot-pgsql.conf
-auth_passdb = pam
+auth_passdb = passwd
 
-#auth_executable = /usr/libexec/dovecot/dovecot-auth
+#auth_executable = %%PREFIX%%/libexec/dovecot/dovecot-auth
 
 # Set max. process size in megabytes.
 #auth_process_size = 256
@@ -472,7 +472,7 @@
 
 # More verbose logging. Useful for figuring out why authentication isn't
 # working.
-#auth_verbose = no
+auth_verbose = yes
 
 # Even more verbose logging for debugging purposes. Shows for example SQL
 # queries.

Lines 1-13 Link Here

(-)dovecot/pkg-plist (-2 / +8 lines)
1	@comment $FreeBSD: ports/mail/dovecot/pkg-plist,v 1.11 2004/07/28 12:18:11 pav Exp $	1	@comment $FreeBSD: ports/mail/dovecot/pkg-plist,v 1.11 2004/07/28 12:18:11 pav Exp $
2	etc/dovecot.conf.sample	2	etc/dovecot.conf.sample
3	etc/rc.d/dovecot.sh	3	etc/rc.d/dovecot.sh
		4	libexec/dovecot/checkpassword-reply
		5	libexec/dovecot/deliver
4	libexec/dovecot/dovecot-auth	6	libexec/dovecot/dovecot-auth
5	libexec/dovecot/imap	7	libexec/dovecot/imap
6	libexec/dovecot/imap-login	8	libexec/dovecot/imap-login
7	libexec/dovecot/pop3	9	libexec/dovecot/pop3
8	libexec/dovecot/pop3-login	10	libexec/dovecot/pop3-login
		11	libexec/dovecot/rawlog
9	@dirrm libexec/dovecot	12	@dirrm libexec/dovecot
10	sbin/dovecot	13	sbin/dovecot
		14	sbin/dovecotpw
		15	%%PORTDOCS%%%%DOCSDIR%%/USE-WIKI-INSTEAD
		16	%%PORTDOCS%%%%DOCSDIR%%/auth-protocol.txt
11	%%PORTDOCS%%%%DOCSDIR%%/auth.txt	17	%%PORTDOCS%%%%DOCSDIR%%/auth.txt
12	%%PORTDOCS%%%%DOCSDIR%%/configuration.txt	18	%%PORTDOCS%%%%DOCSDIR%%/configuration.txt
13	%%PORTDOCS%%%%DOCSDIR%%/design.txt	19	%%PORTDOCS%%%%DOCSDIR%%/design.txt
Lines 17-24 Link Here
17	%%PORTDOCS%%%%DOCSDIR%%/multiaccess.txt	23	%%PORTDOCS%%%%DOCSDIR%%/multiaccess.txt
18	%%PORTDOCS%%%%DOCSDIR%%/nfs.txt	24	%%PORTDOCS%%%%DOCSDIR%%/nfs.txt
19	%%PORTDOCS%%%%DOCSDIR%%/securecoding.txt	25	%%PORTDOCS%%%%DOCSDIR%%/securecoding.txt
		26	%%PORTDOCS%%%%DOCSDIR%%/variables.txt
20	%%PORTDOCS%%%%DOCSDIR%%/dovecot-ldap.conf	27	%%PORTDOCS%%%%DOCSDIR%%/dovecot-ldap.conf
21	%%PORTDOCS%%%%DOCSDIR%%/dovecot-openssl.cnf	28	%%PORTDOCS%%%%DOCSDIR%%/dovecot-openssl.cnf
22	%%PORTDOCS%%%%DOCSDIR%%/dovecot-pgsql.conf	29	%%PORTDOCS%%%%DOCSDIR%%/dovecot-sql.conf
23	%%PORTDOCS%%%%DOCSDIR%%/dovecot-mysql.conf
24	%%PORTDOCS%%@dirrm %%DOCSDIR%%	30	%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 86530

Lines 7-40 Link Here

(-)dovecot/Makefile (-40 / +18 lines)
7	#	7	#
8		8
9	PORTNAME= dovecot	9	PORTNAME= dovecot
10	DISTVERSION= 0.99.14	10	DISTVERSION= 1.0.alpha3
11	CATEGORIES= mail ipv6	11	CATEGORIES= mail ipv6
12	MASTER_SITES= http://www.dovecot.org/releases/	12	MASTER_SITES= http://www.dovecot.org/releases/
13		13
14	MAINTAINER= robin@isometry.net	14	MAINTAINER= robin@isometry.net
15	COMMENT= Secure and compact IMAP and POP3 servers	15	COMMENT= Secure and compact IMAP and POP3 servers
16		16
17	CONFLICTS= dovecot-1.*
18
19	USE_ICONV= yes	17	USE_ICONV= yes
20	USE_RC_SUBR= yes	18	USE_RC_SUBR= yes
21		19
22	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
23	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	21	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
24	CONFIGURE_ARGS= --without-shadow --with-pam --localstatedir=/var	22	CONFIGURE_ARGS= --without-shadow --with-pam \
		23	--localstatedir=/var --with-ssl=openssl
25	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	24	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
26	LDFLAGS="-L${LOCALBASE}/lib"	25	LDFLAGS="-L${LOCALBASE}/lib"
27		26
28	PKGMESSAGE= ${WRKDIR}/pkg-message	27	PKGMESSAGE= ${WRKDIR}/pkg-message
29		28
30	DOCS= auth.txt configuration.txt design.txt \	29	DOCS= USE-WIKI-INSTEAD \
		30	auth-protocol.txt auth.txt configuration.txt design.txt \
31	index.txt mail-storages.txt mkcert.sh multiaccess.txt \	31	index.txt mail-storages.txt mkcert.sh multiaccess.txt \
32	nfs.txt securecoding.txt \	32	nfs.txt securecoding.txt variables.txt \
33	dovecot-ldap.conf dovecot-pgsql.conf \	33	dovecot-ldap.conf dovecot-sql.conf dovecot-openssl.cnf
34	dovecot-mysql.conf dovecot-openssl.cnf
35		34
36	OPTIONS= GNUTLS "GNUTLS support" off \	35	OPTIONS= SASL2 "SASL2 support" off \
37	SASL2 "SASL2 support" off \
38	VPOPMAIL "VPopMail support" off \	36	VPOPMAIL "VPopMail support" off \
39	LDAP "OpenLDAP support" off \	37	LDAP "OpenLDAP support" off \
40	PGSQL "PostgreSQL support" off \	38	PGSQL "PostgreSQL support" off \
Lines 42-59 Link Here
42		40
43	.include <bsd.port.pre.mk>	41	.include <bsd.port.pre.mk>
44		42
45	## GNUTLS support
46	#
47	# Use the GNU Transport Layer Security
48	# rather than OpenSSL.
49	.if defined(WITH_GNUTLS)
50	IGNORE= Currently incompatible with security/gnutls
51	LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls
52	CONFIGURE_ARGS+= --with-ssl=gnutls
53	.else
54	CONFIGURE_ARGS+= --with-ssl=openssl
55	.endif
56
57	## SASL2 support	43	## SASL2 support
58	#	44	#
59	# SASL provides authentication support to	45	# SASL provides authentication support to
Lines 67-76 Link Here
67		53
68	## VPopMail Support	54	## VPopMail Support
69	#	55	#
70	# vpopmail provides easy authentication and
71	# multi-domain features. It was originally
72	# created for use with Qmail.
73	#
74	.if defined(WITH_VPOPMAIL)	56	.if defined(WITH_VPOPMAIL)
75	VPOPMAIL= ${LOCALBASE}/vpopmail/bin/vchkpw	57	VPOPMAIL= ${LOCALBASE}/vpopmail/bin/vchkpw
76	BUILD_DEPENDS+= ${VPOPMAIL}:${PORTSDIR}/mail/vpopmail	58	BUILD_DEPENDS+= ${VPOPMAIL}:${PORTSDIR}/mail/vpopmail
Lines 81-90 Link Here
81		63
82	## OpenLDAP Support	64	## OpenLDAP Support
83	#	65	#
84	# LDAP is the light-weight directory access
85	# protocol and can be used by Dovecot for its
86	# user database.
87	#
88	.if defined(WITH_LDAP)	66	.if defined(WITH_LDAP)
89	USE_OPENLDAP= yes	67	USE_OPENLDAP= yes
90	CONFIGURE_ARGS+= --with-ldap	68	CONFIGURE_ARGS+= --with-ldap
Lines 92-100 Link Here
92		70
93	## PostgreSQL Support	71	## PostgreSQL Support
94	#	72	#
95	# PostgreSQL is a powerful SQL database that
96	# can be used to store user tables.
97	#
98	.if defined(WITH_PGSQL)	73	.if defined(WITH_PGSQL)
99	USE_PGSQL= yes	74	USE_PGSQL= yes
100	CONFIGURE_ARGS+= --with-pgsql	75	CONFIGURE_ARGS+= --with-pgsql
Lines 102-117 Link Here
102		77
103	## MySQL Support	78	## MySQL Support
104	#	79	#
105	# MySQL is another SQL database that can be
106	# used to store user tables.
107	#
108	.if defined(WITH_MYSQL)	80	.if defined(WITH_MYSQL)
109	USE_MYSQL= yes	81	USE_MYSQL= yes
110	CONFIGURE_ARGS+= --with-mysql	82	CONFIGURE_ARGS+= --with-mysql
111	.endif	83	.endif
112		84
113	post-build:	85	post-build:
114	@${SED} -e 's,%%PREFIX%%,${PREFIX},' \	86	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
115	${WRKSRC}/dovecot-example.conf >${WRKDIR}/dovecot.conf.sample	87	${WRKSRC}/dovecot-example.conf >${WRKDIR}/dovecot.conf.sample
116	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \	88	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
117	-e 's,%%RC_SUBR%%,${RC_SUBR},g' \	89	-e 's,%%RC_SUBR%%,${RC_SUBR},g' \
Lines 123-135 Link Here
123	do-install:	95	do-install:
124	@${MKDIR} ${PREFIX}/libexec/dovecot	96	@${MKDIR} ${PREFIX}/libexec/dovecot
125	${INSTALL_PROGRAM} \	97	${INSTALL_PROGRAM} \
126	${WRKSRC}/src/imap/imap \	98	${WRKSRC}/src/auth/checkpassword-reply \
127	${WRKSRC}/src/pop3/pop3 \
128	${WRKSRC}/src/auth/dovecot-auth \	99	${WRKSRC}/src/auth/dovecot-auth \
		100	${WRKSRC}/src/deliver/deliver \
		101	${WRKSRC}/src/imap/imap \
129	${WRKSRC}/src/imap-login/imap-login \	102	${WRKSRC}/src/imap-login/imap-login \
		103	${WRKSRC}/src/pop3/pop3 \
130	${WRKSRC}/src/pop3-login/pop3-login \	104	${WRKSRC}/src/pop3-login/pop3-login \
		105	${WRKSRC}/src/util/rawlog \
131	${PREFIX}/libexec/dovecot/	106	${PREFIX}/libexec/dovecot/
132	${INSTALL_PROGRAM} ${WRKSRC}/src/master/dovecot ${PREFIX}/sbin/	107	${INSTALL_PROGRAM} \
		108	${WRKSRC}/src/master/dovecot \
		109	${WRKSRC}/src/util/dovecotpw \
		110	${PREFIX}/sbin/
133	${INSTALL_DATA} ${WRKDIR}/dovecot.conf.sample ${PREFIX}/etc/	111	${INSTALL_DATA} ${WRKDIR}/dovecot.conf.sample ${PREFIX}/etc/
134	${INSTALL_SCRIPT} ${WRKDIR}/dovecot.sh ${PREFIX}/etc/rc.d/	112	${INSTALL_SCRIPT} ${WRKDIR}/dovecot.sh ${PREFIX}/etc/rc.d/
135	.if !defined(NOPORTDOCS)	113	.if !defined(NOPORTDOCS)

Lines 1-15 Link Here

(-)dovecot/files/patch-dovecot-example.conf (-112 / +92 lines)
1	--- dovecot-example.conf.orig Tue Jan 11 00:49:06 2005	1	--- dovecot-example.conf.orig Fri Jul 22 18:40:25 2005
2	+++ dovecot-example.conf Tue Jan 11 00:53:50 2005	2	+++ dovecot-example.conf Fri Sep 9 00:02:06 2005
3	@@ -3,7 +3,7 @@	3	@@ -7,7 +7,7 @@
4	# Default values are shown after each value, it's not required to uncomment	4	# Default values are shown after each value, it's not required to uncomment
5	# any of the lines. Exception to this are paths, they're just examples	5	# any of the lines. Exception to this are paths, they're just examples
6	# with real defaults being based on configure options. The paths listed here	6	# with real defaults being based on configure options. The paths listed here
7	-# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var	7	-# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
8	+# are for configure --prefix=%%PREFIX%% --sysconfdir=/etc --localstatedir=/var	8	+# are for configure --prefix=%%PREFIX%% --sysconfdir=%%PREFIX%%/etc --localstatedir=/var
9	# --with-ssldir=/etc/ssl	9	# --with-ssldir=/etc/ssl
10		10
11	# Base directory where to store runtime data.	11	# Base directory where to store runtime data.
12	@@ -11,7 +11,7 @@	12	@@ -15,7 +15,7 @@
13		13
14	# Protocols we want to be serving:	14	# Protocols we want to be serving:
15	# imap imaps pop3 pop3s	15	# imap imaps pop3 pop3s
Lines 18-50 Link Here
18		18
19	# IP or host address where to listen in for connections. It's not currently	19	# IP or host address where to listen in for connections. It's not currently
20	# possible to specify multiple addresses. "*" listens in all IPv4 interfaces.	20	# possible to specify multiple addresses. "*" listens in all IPv4 interfaces.
21	@@ -27,14 +27,14 @@	21	@@ -95,7 +95,7 @@
22	#pop3s_listen =
23
24	# Disable SSL/TLS support.
25	-#ssl_disable = no
26	+ssl_disable = yes
27
28	# PEM encoded X.509 SSL/TLS certificate and private key. They're opened before
29	# dropping root privileges, so keep the key file unreadable by anyone but
30	# root. Included doc/mkcert.sh can be used to easily generate self-signed
31	# certificate, just make sure to update the domains in dovecot-openssl.cnf
32	-#ssl_cert_file = /etc/ssl/certs/dovecot.pem
33	-#ssl_key_file = /etc/ssl/private/dovecot.pem
34	+#ssl_cert_file = /etc/ssl/certs/imapd.pem
35	+#ssl_key_file = /etc/ssl/private/imapd.pem
36
37	# SSL parameter file. Master process generates this file for login processes.
38	# It contains Diffie Hellman and RSA parameters.
39	@@ -85,14 +85,14 @@
40	login = imap
41
42	# Executable location.
43	-#login_executable = /usr/libexec/dovecot/imap-login
44	+#login_executable = %%PREFIX%%/libexec/dovecot/imap-login
45
46	# User to use for the login process. Create a completely new user for this,
47	# and don't use it anywhere else. The user must also belong to a group where
48	# only it has access, it's used to control access for authentication process.	22	# only it has access, it's used to control access for authentication process.
49	# Note that this user is NOT used to access mails.	23	# Note that this user is NOT used to access mails.
50	# http://wiki.dovecot.org/UserIds	24	# http://wiki.dovecot.org/UserIds
Lines 53-77 Link Here
53		27
54	# Set max. process size in megabytes. If you don't use	28	# Set max. process size in megabytes. If you don't use
55	# login_process_per_connection you might need to grow this.	29	# login_process_per_connection you might need to grow this.
56	@@ -132,7 +132,7 @@	30	@@ -148,7 +148,7 @@
57	login = pop3
58
59	# Exception to above rule being the executable location.
60	-#login_executable = /usr/libexec/dovecot/pop3-login
61	+#login_executable = %%PREFIX%%/libexec/dovecot/pop3-login
62
63	##
64	## Mail processes
65	@@ -145,7 +145,7 @@
66	# Show more verbose process titles (in ps). Currently shows user name and	31	# Show more verbose process titles (in ps). Currently shows user name and
67	# IP address. Useful for seeing who are actually using the IMAP processes	32	# IP address. Useful for seeing who are actually using the IMAP processes
68	# (eg. shared mailboxes or if same uid is used for multiple accounts).	33	# (eg. shared mailboxes or if same uid is used for multiple accounts).
69	-#verbose_proctitle = no	34	-#verbose_proctitle = no
70	+verbose_proctitle = yes	35	+verbose_proctitle = no
71		36
72	# Show protocol level SSL errors.	37	# Show protocol level SSL errors.
73	#verbose_ssl = no	38	#verbose_ssl = no
74	@@ -161,7 +161,7 @@	39	@@ -164,12 +164,12 @@
75	# non-valid GID as primary group ID aren't allowed to log in. If user	40	# non-valid GID as primary group ID aren't allowed to log in. If user
76	# belongs to supplementary groups with non-valid GIDs, those groups are	41	# belongs to supplementary groups with non-valid GIDs, those groups are
77	# not set.	42	# not set.
Lines 80-174 Link Here
80	#last_valid_gid = 0	45	#last_valid_gid = 0
81		46
82	# Grant access to these extra groups for mail processes. Typical use would be	47	# Grant access to these extra groups for mail processes. Typical use would be
83	@@ -174,7 +174,7 @@	48	# to give "mail" group write access to /var/mail to be able to create dotlocks.
84	# WARNING: Never add directories here which local users can modify, that	49	-#mail_extra_groups =
85	# may lead to root exploit. Usually this should be done only if you don't	50	+mail_extra_groups = mail
86	# allow shell access for users. See doc/configuration.txt for more information.	51
87	-#valid_chroot_dirs =	52	# ':' separated list of directories under which chrooting is allowed for mail
88	+valid_chroot_dirs = /var/mail	53	# processes (ie. /var/mail will allow chrooting to /var/mail/foo/bar too).
89		54	@@ -205,7 +205,7 @@
90	# Default chroot directory for mail processes. This can be overridden by
91	# giving /./ in user's home directory (eg. /home/./user chroots into /home).
92	@@ -197,7 +197,7 @@
93	# default_mail_env = mbox:~/mail/:INBOX=/var/mail/%u	55	# default_mail_env = mbox:~/mail/:INBOX=/var/mail/%u
94	# default_mail_env = mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n	56	# default_mail_env = mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n
95	#	57	#
96	-#default_mail_env =	58	-#default_mail_env =
97	+default_mail_env = mbox:/var/mail/%u	59	+default_mail_env = mbox:/var/mail/%u
98		60
99	# Space-separated list of fields to cache for all mails. Currently these	61	# If you need to set multiple mailbox locations or want to change default
100	# fields are allowed followed by a list of commands they speed up:	62	# namespace settings, you can do it by defining namespace sections:
101	@@ -245,7 +245,7 @@	63	@@ -321,7 +321,7 @@
102	# outlook-pop3-no-nuls:
103	# Outlook and Outlook Express hang if mails contain NUL characters.
104	# This setting replaces them with 0x80 character.
105	-#client_workarounds =
106	+client_workarounds = oe6-fetch-no-newmail outlook-idle outlook-pop3-no-nuls
107
108	# Dovecot can notify client of new mail in selected mailbox soon after it's
109	# received. This setting specifies the minimum interval in seconds between
110	@@ -289,7 +289,7 @@
111	# know any MUA which would modify mail files directly. IMAP protocol also	64	# know any MUA which would modify mail files directly. IMAP protocol also
112	# requires that the mails don't change, so it would be problematic in any case.	65	# requires that the mails don't change, so it would be problematic in any case.
113	# If you care about performance, enable it.	66	# If you care about performance, enable it.
114	-#maildir_copy_with_hardlinks = no	67	-#maildir_copy_with_hardlinks = no
115	+maildir_copy_with_hardlinks = yes	68	+maildir_copy_with_hardlinks = yes
116		69
117	# Check if mails' content has been changed by external programs. This slows	70	# Which locking methods to use for locking mbox. There's four available:
118	# down things as extra stat() needs to be called for each file. If changes are	71	# dotlock: Create <mailbox>.lock file. This is the oldest and most NFS-safe
119	@@ -338,7 +338,7 @@	72	@@ -389,12 +389,12 @@
		73
		74	protocol imap {
		75	# Login executable location.
		76	- #login_executable = /usr/libexec/dovecot/imap-login
		77	+ #login_executable = %%PREFIX%%/libexec/dovecot/imap-login
		78
		79	# IMAP executable location
		80	- #mail_executable = /usr/libexec/dovecot/imap
		81	+ #mail_executable = %%PREFIX%%/libexec/dovecot/imap
		82	# This would write rawlogs into ~/dovecot.rawlog/ directory:
		83	- #mail_executable = /usr/libexec/dovecot/rawlog /usr/libexec/dovecot/imap
		84	+ #mail_executable = %%PREFIX%%/libexec/dovecot/rawlog %%PREFIX%%/libexec/dovecot/imap
		85
		86	# Maximum IMAP command line length in bytes. Some clients generate very long
		87	# command lines with huge mailboxes, so you may need to raise this if you get
		88	@@ -403,7 +403,7 @@
		89
		90	# Support for dynamically loadable modules.
		91	#mail_use_modules = no
		92	- #mail_modules = /usr/lib/dovecot/imap
		93	+ #mail_modules = %%PREFIX%%/lib/dovecot/imap
		94
		95	# Send IMAP capabilities in greeting message. This makes it unnecessary for
		96	# clients to request it with CAPABILITY command, so it saves one round-trip.
		97	@@ -433,7 +433,7 @@
		98	# With mbox storage a mailbox can contain either mails or submailboxes,
		99	# but not both. Thunderbird separates these two by forcing server to
		100	# accept '/' suffix in mailbox names in subscriptions list.
		101	- #imap_client_workarounds = outlook-idle
		102	+ imap_client_workarounds = delay-newmail outlook-idle netscape-eoh tb-extra-mailbox-sep
		103	}
		104
120	##	105	##
		106	@@ -442,10 +442,10 @@
121		107
122	# Executable location	108	protocol pop3 {
123	-#imap_executable = /usr/libexec/dovecot/imap	109	# Login executable location.
124	+#imap_executable = %%PREFIX%%/libexec/dovecot/imap	110	- #login_executable = /usr/libexec/dovecot/pop3-login
125		111	+ #login_executable = %%PREFIX%%/libexec/dovecot/pop3-login
126	# Set max. process size in megabytes. Most of the memory goes to mmap()ing	112
127	# files, so it shouldn't harm much even if this limit is set pretty high.	113	# POP3 executable location
128	@@ -346,14 +346,14 @@	114	- #mail_executable = /usr/libexec/dovecot/pop3
129		115	+ #mail_executable = %%PREFIX%%/libexec/dovecot/pop3
130	# Support for dynamically loadable modules.	116
131	#imap_use_modules = no	117	# Don't try to set mails non-recent or seen with POP3 sessions. This is
132	-#imap_modules = /usr/lib/dovecot/imap	118	# mostly intended to reduce disk I/O. With maildir it doesn't move files
133	+#imap_modules = %%PREFIX%%/lib/dovecot/imap	119	@@ -475,7 +475,7 @@
		120	# Note that Outlook 2003 seems to have problems with %v.%u format which is
		121	# Dovecot's default, so if you're building a new server it would be a good
		122	# idea to change this. %08Xu%08Xv should be pretty fail-safe.
		123	- #pop3_uidl_format = %v.%u
		124	+ pop3_uidl_format = %08Xu%08Xv
		125
		126	# POP3 logout format string:
		127	# %t - number of TOP commands
		128	@@ -489,7 +489,7 @@
		129
		130	# Support for dynamically loadable modules.
		131	#mail_use_modules = no
		132	- #mail_modules = /usr/lib/dovecot/pop3
		133	+ #mail_modules = %%PREFIX%%/lib/dovecot/pop3
		134
		135	# Workarounds for various client bugs:
		136	# outlook-no-nuls:
		137	@@ -498,7 +498,7 @@
		138	# oe-ns-eoh:
		139	# Outlook Express and Netscape Mail breaks if end of headers-line is
		140	# missing. This option simply sends it if it's missing.
		141	- #pop3_client_workarounds =
		142	+ pop3_client_workarounds = outlook-no-nuls oe-ns-eoh
		143	}
134		144
135	##	145	##
136	## POP3 process	146	@@ -506,7 +506,7 @@
137	##	147	##
138		148
139	# Executable location	149	# Executable location
140	-#pop3_executable = /usr/libexec/dovecot/pop3
141	+#pop3_executable = %%PREFIX%%/libexec/dovecot/pop3
142
143	# Set max. process size in megabytes. Most of the memory goes to mmap()ing
144	# files, so it shouldn't harm much even if this limit is set pretty high.
145	@@ -361,7 +361,7 @@
146
147	# Support for dynamically loadable modules.
148	#pop3_use_modules = no
149	-#pop3_modules = /usr/lib/dovecot/pop3
150	+#pop3_modules = %%PREFIX%%/lib/dovecot/pop3
151
152	##
153	## Authentication processes
154	@@ -438,9 +438,9 @@
155	# vpopmail: vpopmail authentication
156	# ldap <config path>: LDAP, see doc/dovecot-ldap.conf
157	# pgsql <config path>: a PostgreSQL database, see doc/dovecot-pgsql.conf
158	-auth_passdb = pam
159	+auth_passdb = passwd
160
161	-#auth_executable = /usr/libexec/dovecot/dovecot-auth	150	-#auth_executable = /usr/libexec/dovecot/dovecot-auth
162	+#auth_executable = %%PREFIX%%/libexec/dovecot/dovecot-auth	151	+#auth_executable = %%PREFIX%%/libexec/dovecot/dovecot-auth
163		152
164	# Set max. process size in megabytes.	153	# Set max. process size in megabytes.
165	#auth_process_size = 256	154	#auth_process_size = 256
166	@@ -472,7 +472,7 @@
167
168	# More verbose logging. Useful for figuring out why authentication isn't
169	# working.
170	-#auth_verbose = no
171	+auth_verbose = yes
172
173	# Even more verbose logging for debugging purposes. Shows for example SQL
174	# queries.