Attachment #39239 for bug #61905

Lines 1-3 Link Here

(-)dovecot/Makefile (-30 / +40 lines)
		1	# ex:ts=8
1	# New ports collection makefile for: dovecot	2	# New ports collection makefile for: dovecot
2	# Date created: 12/08/2002	3	# Date created: 12/08/2002
3	# Whom: Dominic Marks <dominic.marks@btinternet.com>	4	# Whom: Dominic Marks <dominic.marks@btinternet.com>
Lines 7-13 Link Here
7		8
8	PORTNAME= dovecot	9	PORTNAME= dovecot
9	PORTVERSION= 0.99.10.4	10	PORTVERSION= 0.99.10.4
10	PORTREVISION= 1	11	PORTREVISION= 2
11	CATEGORIES= mail ipv6	12	CATEGORIES= mail ipv6
12	MASTER_SITES= http://www.dovecot.org/	13	MASTER_SITES= http://www.dovecot.org/
13		14
Lines 28-87 Link Here
28		29
29	PKGMESSAGE= ${WRKDIR}/pkg-message	30	PKGMESSAGE= ${WRKDIR}/pkg-message
30		31
31	DOCS= auth.txt configuration.txt design.txt \	32	.if !defined(NOPORTDOCS)
32	index.txt mail-storages.txt mkcert.sh multiaccess.txt \	33	PORTDOCS= auth.txt configuration.txt design.txt index.txt \
33	nfs.txt dovecot-ldap.conf dovecot-pgsql.conf \	34	mail-storages.txt mkcert.sh multiaccess.txt nfs.txt \
34	dovecot-openssl.cnf securecoding.txt	35	dovecot-ldap.conf dovecot-pgsql.conf dovecot-openssl.cnf \
		36	securecoding.txt
		37	.endif
35		38
36	#.include <bsd.port.pre.mk>	39	.include <bsd.port.pre.mk>
37		40
38	## SASL2 support -> WITH_SASL2=1	41	## SASL2 support
		42	OPTIONS+= SASL2 "SASL2 support" off
39	#	43	#
40	# SASL provides authentication support to	44	# SASL provides authentication support to
41	# session-based protocols. This is can be	45	# session-based protocols. This is can be
42	# used by dovecot for authentication sources.	46	# used by dovecot for authentication sources.
43	#	47	#
44	.if defined(WITH_SASL2)	48	.if defined(WITH_SASL2)
45	LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2	49	LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2
46	CONFIGURE_ARGS+= --with-cyrus-sasl2	50	CONFIGURE_ARGS+= --with-cyrus-sasl2
47	.endif	51	.endif
48		52
49	## VPopMail Support -> WITH_VPOPMAIL=1	53	## VPopMail Support
		54	OPTIONS+= VPOPMAIL "VPopMail support" off
50	#	55	#
51	# vpopmail provides easy authentication and	56	# vpopmail provides easy authentication and
52	# multi-domain features. It was originally	57	# multi-domain features. It was originally
53	# created for use with Qmail.	58	# created for use with Qmail.
54	#	59	#
55	.if defined(WITH_VPOPMAIL)	60	.if defined(WITH_VPOPMAIL)
56	VPOPMAIL= ${LOCALBASE}/vpopmail/bin/vchkpw	61	VPOPMAIL= ${LOCALBASE}/vpopmail/bin/vchkpw
57	BUILD_DEPENDS+= ${VPOPMAIL}:${PORTSDIR}/mail/vpopmail	62	BUILD_DEPENDS+= ${VPOPMAIL}:${PORTSDIR}/mail/vpopmail
58	CONFIGURE_ARGS+= --with-vpopmail	63	CONFIGURE_ARGS+= --with-vpopmail
59	.endif	64	.endif
60		65
61	## OpenLDAP Support -> WITH_LDAP=1	66	## OpenLDAP Support
		67	OPTIONS+= LDAP "OpenLDAP support" off
62	#	68	#
63	# LDAP is the light-weight directory access	69	# LDAP is the light-weight directory access
64	# protocol and can be used by Dovecot for its	70	# protocol and can be used by Dovecot for its
65	# user database.	71	# user database.
66	#	72	#
67	.if defined(WITH_LDAP)	73	.if defined(WITH_LDAP)
68	USE_OPENLDAP= yes	74	USE_OPENLDAP= yes
69	CONFIGURE_ARGS+= --with-ldap	75	CONFIGURE_ARGS+= --with-ldap
70	.endif	76	.endif
71		77
72	## PostgreSQL Support -> WITH_PGSQL=1	78	## PostgreSQL Support
		79	OPTIONS+= PGSQL "PostgreSQL support" off
73	#	80	#
74	# PostgreSQL is a powerful SQL database that	81	# PostgreSQL is a powerful SQL database that
75	# can be used to store user tables.	82	# can be used to store user tables.
76	#	83	#
77	.if defined(WITH_PGSQL)	84	.if defined(WITH_PGSQL)
78	LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7	85	LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7
79	CONFIGURE_ARGS+= --with-pgsql	86	CONFIGURE_ARGS+= --with-pgsql
80	.endif	87	.endif
81		88
82	pre-configure:	89	.if ${OSVERSION} >= 500038
83	@${ECHO_MSG} "=> ${PORTNAME} options: see ${MAKEFILE} for descriptions"	90	RC_SUBR?= /etc/rc.subr
84	@${SED} -ne 's,^##,=> ,p' ${MAKEFILE}	91	.else
		92	USE_RC_SUBR= yes
		93	.endif
85		94
86	pre-build:	95	pre-build:
87	@${REINPLACE_CMD} -e 's,%%SSLDIR%%,/var/dovecot/ssl,' \	96	@${REINPLACE_CMD} -e 's,%%SSLDIR%%,/var/dovecot/ssl,' \
Lines 90-98 Link Here
90	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \	99	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \
91	${WRKSRC}/dovecot-example.conf	100	${WRKSRC}/dovecot-example.conf
92		101
		102	post-build:
		103	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
		104	-e 's,%%RC_SUBR%%,${RC_SUBR},g' \
		105	${FILESDIR}/dovecot.sh >${WRKDIR}/dovecot.sh
		106
93	do-install:	107	do-install:
94	@${SETENV} ${SCRIPTS_ENV} \	108	@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
95	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
96	@${MKDIR} ${PREFIX}/libexec/dovecot	109	@${MKDIR} ${PREFIX}/libexec/dovecot
97	${INSTALL_PROGRAM} \	110	${INSTALL_PROGRAM} \
98	${WRKSRC}/src/imap/imap \	111	${WRKSRC}/src/imap/imap \
Lines 103-123 Link Here
103	${PREFIX}/libexec/dovecot/	116	${PREFIX}/libexec/dovecot/
104	${INSTALL_DATA} ${WRKSRC}/dovecot-example.conf ${PREFIX}/etc/	117	${INSTALL_DATA} ${WRKSRC}/dovecot-example.conf ${PREFIX}/etc/
105	${INSTALL_PROGRAM} ${WRKSRC}/src/master/dovecot ${PREFIX}/sbin/	118	${INSTALL_PROGRAM} ${WRKSRC}/src/master/dovecot ${PREFIX}/sbin/
106	@${SETENV} ${SCRIPTS_ENV} \	119	@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
107	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL	120	${INSTALL_SCRIPT} ${WRKDIR}/dovecot.sh ${PREFIX}/etc/rc.d/
108	${INSTALL_SCRIPT} -m 751 ${FILESDIR}/dovecot.sh.sample \
109	${PREFIX}/etc/rc.d/dovecot.sh.sample
110	.if !defined(NOPORTDOCS)	121	.if !defined(NOPORTDOCS)
111	@${MKDIR} ${DOCSDIR}	122	@${MKDIR} ${DOCSDIR}
112	.for document in ${DOCS}	123	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${DOCSDIR}
113	@${INSTALL_DATA} ${WRKSRC}/doc/${document} ${DOCSDIR}
114	.endfor
115	@${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${DOCSDIR}	124	@${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${DOCSDIR}
116	.endif	125	.endif
		126
		127	post-install:
117	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \	128	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
118	-e 's,%%DOCSDIR%%,${DOCSDIR},g' \	129	-e 's,%%DOCSDIR%%,${DOCSDIR},g' \
119	${.CURDIR}/pkg-message >${PKGMESSAGE}	130	${.CURDIR}/pkg-message >${PKGMESSAGE}
120	@${CAT} ${PKGMESSAGE}	131	@${CAT} ${PKGMESSAGE}
121		132
122	#.include <bsd.port.post.mk>	133	.include <bsd.port.post.mk>
123	.include <bsd.port.mk>




#!/bin/sh
#
# $FreeBSD$
#

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

#
# Add the following lines to /etc/rc.conf to enable dovecot:
#
#dovecot_enable="YES"
#
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"

Line 0 Link Here

(-)dovecot/files/patch-network.c (+11 lines)
	1	--- src/lib/network.c Sun Jun 22 23:09:48 2003
	2	+++ network.c Sun Jan 25 20:22:17 2004
	3	@@ -591,7 +591,7 @@
	4	int net_hosterror_notfound(int error)
	5	{
	6	#ifdef HAVE_IPV6
	7	- return error != 1 && (error == EAI_NONAME \|\| error == EAI_NODATA);
	8	+ return error != 1 && (error == EAI_NONAME);
	9	#else
	10	return error == HOST_NOT_FOUND \|\| error == NO_ADDRESS;
	11	#endif




---------------------------------------------------------------------
 
 You can get default configured IMAP and POP3 services running by
 copying the sample configuration file to the given location and then
 enabling dovecot in /etc/rc.conf.
 In this simple configuration Dovecot will authenticate users against
 the systems passwd file and use the default /var/mail/$USER mbox
 files.

  cd %%PREFIX%%/etc; cp dovecot-example.conf dovecot.conf
   -> %%PREFIX%%/etc/dovecot.conf
  
  echo dovecot_enable="YES" >> /etc/rc.conf
   -> %%PREFIX%%/etc/rc.d/dovecot.sh
 
 Further information on configuration can be found in:





etc/dovecot-example.conf
etc/rc.d/dovecot.sh
libexec/dovecot/dovecot-auth
libexec/dovecot/imap
libexec/dovecot/imap-login

libexec/dovecot/pop3-login
@dirrm libexec/dovecot
sbin/dovecot
%%PORTDOCS%%%%DOCSDIR%%/auth.txt
%%PORTDOCS%%%%DOCSDIR%%/configuration.txt
%%PORTDOCS%%%%DOCSDIR%%/design.txt
%%PORTDOCS%%%%DOCSDIR%%/index.txt
%%PORTDOCS%%%%DOCSDIR%%/mail-storages.txt
%%PORTDOCS%%%%DOCSDIR%%/mkcert.sh
%%PORTDOCS%%%%DOCSDIR%%/multiaccess.txt
%%PORTDOCS%%%%DOCSDIR%%/nfs.txt
%%PORTDOCS%%%%DOCSDIR%%/dovecot-ldap.conf
%%PORTDOCS%%%%DOCSDIR%%/dovecot-pgsql.conf
%%PORTDOCS%%%%DOCSDIR%%/dovecot-openssl.cnf
%%PORTDOCS%%%%DOCSDIR%%/securecoding.txt
%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@unexec rmdir /var/dovecot/auth 2>/dev/null || true
@unexec rmdir /var/dovecot/login 2>/dev/null || true
@unexec rmdir /var/dovecot/ssl/certs 2>/dev/null || true

Return to bug 61905

Line 0 Link Here

(-)dovecot/files/dovecot.sh (+26 lines)
	1	#!/bin/sh
	2	#
	3	# $FreeBSD$
	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="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"

Lines 1-15 Link Here

(-)dovecot/pkg-message (-7 / +7 lines)
1	---------------------------------------------------------------------	1	---------------------------------------------------------------------
2		2
3	You can get default configured IMAP and POP3 services running by	3	You can get default configured IMAP and POP3 services running by
4	copying the following sample files to the given locations. In this	4	copying the sample configuration file to the given location and then
5	simple configuration Dovecot will authenticate users against the	5	enabling dovecot in /etc/rc.conf.
6	systems passwd file and use the default /var/mail/$USER mbox files.	6	In this simple configuration Dovecot will authenticate users against
		7	the systems passwd file and use the default /var/mail/$USER mbox
		8	files.
7		9
8	%%PREFIX%%/etc/dovecot-example.conf	10	cd %%PREFIX%%/etc; cp dovecot-example.conf dovecot.conf
9	-> %%PREFIX%%/etc/dovecot.conf
10		11
11	%%PREFIX%%/etc/rc.d/dovecot.sh.sample	12	echo dovecot_enable="YES" >> /etc/rc.conf
12	-> %%PREFIX%%/etc/rc.d/dovecot.sh
13		13
14	Further information on configuration can be found in:	14	Further information on configuration can be found in:
15		15

Lines 1-5 Link Here

(-)dovecot/pkg-plist (-15 / +1 lines)
1	etc/dovecot-example.conf	1	etc/dovecot-example.conf
2	etc/rc.d/dovecot.sh.sample	2	etc/rc.d/dovecot.sh
3	libexec/dovecot/dovecot-auth	3	libexec/dovecot/dovecot-auth
4	libexec/dovecot/imap	4	libexec/dovecot/imap
5	libexec/dovecot/imap-login	5	libexec/dovecot/imap-login
Lines 7-26 Link Here
7	libexec/dovecot/pop3-login	7	libexec/dovecot/pop3-login
8	@dirrm libexec/dovecot	8	@dirrm libexec/dovecot
9	sbin/dovecot	9	sbin/dovecot
10	%%PORTDOCS%%%%DOCSDIR%%/auth.txt
11	%%PORTDOCS%%%%DOCSDIR%%/configuration.txt
12	%%PORTDOCS%%%%DOCSDIR%%/design.txt
13	%%PORTDOCS%%%%DOCSDIR%%/index.txt
14	%%PORTDOCS%%%%DOCSDIR%%/mail-storages.txt
15	%%PORTDOCS%%%%DOCSDIR%%/mkcert.sh
16	%%PORTDOCS%%%%DOCSDIR%%/multiaccess.txt
17	%%PORTDOCS%%%%DOCSDIR%%/nfs.txt
18	%%PORTDOCS%%%%DOCSDIR%%/dovecot-ldap.conf
19	%%PORTDOCS%%%%DOCSDIR%%/dovecot-pgsql.conf
20	%%PORTDOCS%%%%DOCSDIR%%/dovecot-openssl.cnf
21	%%PORTDOCS%%%%DOCSDIR%%/securecoding.txt
22	%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
23	%%PORTDOCS%%@dirrm %%DOCSDIR%%
24	@unexec rmdir /var/dovecot/auth 2>/dev/null \|\| true	10	@unexec rmdir /var/dovecot/auth 2>/dev/null \|\| true
25	@unexec rmdir /var/dovecot/login 2>/dev/null \|\| true	11	@unexec rmdir /var/dovecot/login 2>/dev/null \|\| true
26	@unexec rmdir /var/dovecot/ssl/certs 2>/dev/null \|\| true	12	@unexec rmdir /var/dovecot/ssl/certs 2>/dev/null \|\| true