Attachment #58177 for bug #87732

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




#

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


COMMENT=	Secure and compact IMAP and POP3 servers

USE_ICONV=	yes
USE_RCORDER=	dovecot.sh

GNU_CONFIGURE=	yes
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}

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' \
		${FILESDIR}/dovecot.sh >${WRKDIR}/dovecot.sh

pre-install:
	@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL

		${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)
	@${MKDIR} ${DOCSDIR}
	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}

Lines 1-2 Link Here

(-)dovecot/distinfo (-2 / +2 lines)
1	MD5 (dovecot-1.0.alpha3.tar.gz) = 2006624ce4328dcdef6a71376c3be05d	1	MD5 (dovecot-1.0.alpha4.tar.gz) = 65f8e2cd097e80b536a75c31a974b5de
2	SIZE (dovecot-1.0.alpha3.tar.gz) = 1193017	2	SIZE (dovecot-1.0.alpha4.tar.gz) = 1203714




#!/bin/sh
#
# $FreeBSD: ports/mail/dovecot/files/dovecot.sh,v 1.2 2004/07/28 12:18:11 pav Exp $
#

# PROVIDE: dovecot
# REQUIRE: LOGIN
# KEYWORD: FreeBSD shutdown

#
# Add the following lines to /etc/rc.conf to enable dovecot:
#
#dovecot_enable="YES"
#
dovecot_enable=${dovecot_enable-"NO"}

. %%RC_SUBR%%

name=dovecot
rcvar=`set_rcvar`

command=%%PREFIX%%/sbin/${name}
required_files=%%PREFIX%%/etc/${name}.conf

load_rc_config ${name}
run_rc_command "$1"




#!/bin/sh
#
# $FreeBSD: ports/mail/dovecot/files/dovecot.sh,v 1.2 2004/07/28 12:18:11 pav Exp $
#

# PROVIDE: dovecot
# REQUIRE: LOGIN
# KEYWORD: FreeBSD shutdown

#
# Add the following lines to /etc/rc.conf to enable dovecot:
#
#dovecot_enable="YES"
#

. %%RC_SUBR%%

name=dovecot
rcvar=`set_rcvar`

: ${dovecot_enable:="NO"}
command=%%PREFIX%%/sbin/${name}
required_files=%%PREFIX%%/etc/${name}.conf

load_rc_config ${name}
run_rc_command "$1"




--- dovecot-example.conf.orig	Thu Oct 20 15:33:33 2005
+++ dovecot-example.conf	Thu Oct 20 15:38:40 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

 # 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 = yes
 
 # Show protocol level SSL errors.
 #verbose_ssl = no

 
 # If you need to set multiple mailbox locations or want to change default
 # namespace settings, you can do it by defining namespace sections:
@@ -391,12 +391,12 @@
 # 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.

 
   # 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
@@ -405,7 +405,7 @@
 
   # Support for dynamically loadable modules.
   #mail_use_modules = no

 
   # Send IMAP capabilities in greeting message. This makes it unnecessary for
   # clients to request it with CAPABILITY command, so it saves one round-trip.
@@ -435,7 +435,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.

 }
   
 ##
@@ -444,10 +444,10 @@
 
 protocol pop3 {
   # Login executable location.

 
   # 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
@@ -484,7 +484,7 @@
   # installations. %08Xu%08Xv will be the new default, so use it for new
   # installations.
   #
-  #pop3_uidl_format = 
+  pop3_uidl_format = %08Xu%08Xv
 
   # POP3 logout format string:
   #  %t - number of TOP commands
@@ -498,7 +498,7 @@
 
   # Support for dynamically loadable modules.
   #mail_use_modules = no

 
   # Workarounds for various client bugs:
   #   outlook-no-nuls:
@@ -507,7 +507,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.

 }
 
 ##
@@ -515,7 +515,7 @@
 ##
 
 # Executable location

Lines 1-6 Link Here

(-)dovecot/pkg-plist (-1 lines)
1	@comment $FreeBSD: ports/mail/dovecot/pkg-plist,v 1.12 2005/09/26 17:17:04 vsevolod Exp $	1	@comment $FreeBSD: ports/mail/dovecot/pkg-plist,v 1.12 2005/09/26 17:17:04 vsevolod Exp $
2	etc/dovecot.conf.sample	2	etc/dovecot.conf.sample
3	etc/rc.d/dovecot.sh
4	libexec/dovecot/checkpassword-reply	3	libexec/dovecot/checkpassword-reply
5	libexec/dovecot/deliver	4	libexec/dovecot/deliver
6	libexec/dovecot/dovecot-auth	5	libexec/dovecot/dovecot-auth

Return to bug 87732

Lines 7-13 Link Here

(-)dovecot/Makefile (-6 / +2 lines)
7	#	7	#
8		8
9	PORTNAME= dovecot	9	PORTNAME= dovecot
10	DISTVERSION= 1.0.alpha3	10	DISTVERSION= 1.0.alpha4
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
Lines 15-21 Link Here
15	COMMENT= Secure and compact IMAP and POP3 servers	15	COMMENT= Secure and compact IMAP and POP3 servers
16		16
17	USE_ICONV= yes	17	USE_ICONV= yes
18	USE_RC_SUBR= yes	18	USE_RCORDER= dovecot.sh
19		19
20	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
21	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	21	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
Lines 85-93 Link Here
85	post-build:	85	post-build:
86	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \	86	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
87	${WRKSRC}/dovecot-example.conf >${WRKDIR}/dovecot.conf.sample	87	${WRKSRC}/dovecot-example.conf >${WRKDIR}/dovecot.conf.sample
88	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
89	-e 's,%%RC_SUBR%%,${RC_SUBR},g' \
90	${FILESDIR}/dovecot.sh >${WRKDIR}/dovecot.sh
91		88
92	pre-install:	89	pre-install:
93	@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL	90	@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
Lines 109-115 Link Here
109	${WRKSRC}/src/util/dovecotpw \	106	${WRKSRC}/src/util/dovecotpw \
110	${PREFIX}/sbin/	107	${PREFIX}/sbin/
111	${INSTALL_DATA} ${WRKDIR}/dovecot.conf.sample ${PREFIX}/etc/	108	${INSTALL_DATA} ${WRKDIR}/dovecot.conf.sample ${PREFIX}/etc/
112	${INSTALL_SCRIPT} ${WRKDIR}/dovecot.sh ${PREFIX}/etc/rc.d/
113	.if !defined(NOPORTDOCS)	109	.if !defined(NOPORTDOCS)
114	@${MKDIR} ${DOCSDIR}	110	@${MKDIR} ${DOCSDIR}
115	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}	111	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}

Lines 1-26 Link Here

(-)dovecot/files/dovecot.sh (-26 lines)
1	#!/bin/sh
2	#
3	# $FreeBSD: ports/mail/dovecot/files/dovecot.sh,v 1.2 2004/07/28 12:18:11 pav Exp $
4	#
5
6	# PROVIDE: dovecot
7	# REQUIRE: LOGIN
8	# KEYWORD: FreeBSD shutdown
9
10	#
11	# Add the following lines to /etc/rc.conf to enable dovecot:
12	#
13	#dovecot_enable="YES"
14	#
15	dovecot_enable=${dovecot_enable-"NO"}
16
17	. %%RC_SUBR%%
18
19	name=dovecot
20	rcvar=`set_rcvar`
21
22	command=%%PREFIX%%/sbin/${name}
23	required_files=%%PREFIX%%/etc/${name}.conf
24
25	load_rc_config ${name}
26	run_rc_command "$1"

Line 0 Link Here

(-)dovecot/files/dovecot.sh.in (+26 lines)
	1	#!/bin/sh
	2	#
	3	# $FreeBSD: ports/mail/dovecot/files/dovecot.sh,v 1.2 2004/07/28 12:18:11 pav Exp $
	4	#
	5
	6	# PROVIDE: dovecot
	7	# REQUIRE: LOGIN
	8	# KEYWORD: FreeBSD shutdown
	9
	10	#
	11	# Add the following lines to /etc/rc.conf to enable dovecot:
	12	#
	13	#dovecot_enable="YES"
	14	#
	15
	16	. %%RC_SUBR%%
	17
	18	name=dovecot
	19	rcvar=`set_rcvar`
	20
	21	: ${dovecot_enable:="NO"}
	22	command=%%PREFIX%%/sbin/${name}
	23	required_files=%%PREFIX%%/etc/${name}.conf
	24
	25	load_rc_config ${name}
	26	run_rc_command "$1"

Lines 1-5 Link Here

(-)dovecot/files/patch-dovecot-example.conf (-24 / +15 lines)
1	--- dovecot-example.conf.orig Fri Jul 22 18:40:25 2005	1	--- dovecot-example.conf.orig Thu Oct 20 15:33:33 2005
2	+++ dovecot-example.conf Fri Sep 9 00:02:06 2005	2	+++ dovecot-example.conf Thu Oct 20 15:38:40 2005
3	@@ -7,7 +7,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
Lines 32-38 Link Here
32	# 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
33	# (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).
34	-#verbose_proctitle = no	34	-#verbose_proctitle = no
35	+verbose_proctitle = no	35	+verbose_proctitle = yes
36		36
37	# Show protocol level SSL errors.	37	# Show protocol level SSL errors.
38	#verbose_ssl = no	38	#verbose_ssl = no
Lines 60-75 Link Here
60		60
61	# If you need to set multiple mailbox locations or want to change default	61	# If you need to set multiple mailbox locations or want to change default
62	# namespace settings, you can do it by defining namespace sections:	62	# namespace settings, you can do it by defining namespace sections:
63	@@ -321,7 +321,7 @@	63	@@ -391,12 +391,12 @@
64	# know any MUA which would modify mail files directly. IMAP protocol also
65	# requires that the mails don't change, so it would be problematic in any case.
66	# If you care about performance, enable it.
67	-#maildir_copy_with_hardlinks = no
68	+maildir_copy_with_hardlinks = yes
69
70	# Which locking methods to use for locking mbox. There's four available:
71	# dotlock: Create <mailbox>.lock file. This is the oldest and most NFS-safe
72	@@ -389,12 +389,12 @@
73		64
74	protocol imap {	65	protocol imap {
75	# Login executable location.	66	# Login executable location.
Lines 85-91 Link Here
85		76
86	# Maximum IMAP command line length in bytes. Some clients generate very long	77	# 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	78	# command lines with huge mailboxes, so you may need to raise this if you get
88	@@ -403,7 +403,7 @@	79	@@ -405,7 +405,7 @@
89		80
90	# Support for dynamically loadable modules.	81	# Support for dynamically loadable modules.
91	#mail_use_modules = no	82	#mail_use_modules = no
Lines 94-100 Link Here
94		85
95	# Send IMAP capabilities in greeting message. This makes it unnecessary for	86	# 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.	87	# clients to request it with CAPABILITY command, so it saves one round-trip.
97	@@ -433,7 +433,7 @@	88	@@ -435,7 +435,7 @@
98	# With mbox storage a mailbox can contain either mails or submailboxes,	89	# With mbox storage a mailbox can contain either mails or submailboxes,
99	# but not both. Thunderbird separates these two by forcing server to	90	# but not both. Thunderbird separates these two by forcing server to
100	# accept '/' suffix in mailbox names in subscriptions list.	91	# accept '/' suffix in mailbox names in subscriptions list.
Lines 103-109 Link Here
103	}	94	}
104		95
105	##	96	##
106	@@ -442,10 +442,10 @@	97	@@ -444,10 +444,10 @@
107		98
108	protocol pop3 {	99	protocol pop3 {
109	# Login executable location.	100	# Login executable location.
Lines 116-131 Link Here
116		107
117	# Don't try to set mails non-recent or seen with POP3 sessions. This is	108	# Don't try to set mails non-recent or seen with POP3 sessions. This is
118	# mostly intended to reduce disk I/O. With maildir it doesn't move files	109	# mostly intended to reduce disk I/O. With maildir it doesn't move files
119	@@ -475,7 +475,7 @@	110	@@ -484,7 +484,7 @@
120	# Note that Outlook 2003 seems to have problems with %v.%u format which is	111	# installations. %08Xu%08Xv will be the new default, so use it for new
121	# Dovecot's default, so if you're building a new server it would be a good	112	# installations.
122	# idea to change this. %08Xu%08Xv should be pretty fail-safe.	113	#
123	- #pop3_uidl_format = %v.%u	114	- #pop3_uidl_format =
124	+ pop3_uidl_format = %08Xu%08Xv	115	+ pop3_uidl_format = %08Xu%08Xv
125		116
126	# POP3 logout format string:	117	# POP3 logout format string:
127	# %t - number of TOP commands	118	# %t - number of TOP commands
128	@@ -489,7 +489,7 @@	119	@@ -498,7 +498,7 @@
129		120
130	# Support for dynamically loadable modules.	121	# Support for dynamically loadable modules.
131	#mail_use_modules = no	122	#mail_use_modules = no
Lines 134-140 Link Here
134		125
135	# Workarounds for various client bugs:	126	# Workarounds for various client bugs:
136	# outlook-no-nuls:	127	# outlook-no-nuls:
137	@@ -498,7 +498,7 @@	128	@@ -507,7 +507,7 @@
138	# oe-ns-eoh:	129	# oe-ns-eoh:
139	# Outlook Express and Netscape Mail breaks if end of headers-line is	130	# Outlook Express and Netscape Mail breaks if end of headers-line is
140	# missing. This option simply sends it if it's missing.	131	# missing. This option simply sends it if it's missing.
Lines 143-149 Link Here
143	}	134	}
144		135
145	##	136	##
146	@@ -506,7 +506,7 @@	137	@@ -515,7 +515,7 @@
147	##	138	##
148		139
149	# Executable location	140	# Executable location