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

(-)courier/Makefile (-53 / +86 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	courier
8
PORTNAME=	courier
9
PORTVERSION=	0.44.0
9
PORTVERSION=	0.44.2
10
CATEGORIES=	mail ipv6
10
CATEGORIES=	mail ipv6
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITE_SUBDIR=	courier
12
MASTER_SITE_SUBDIR=	courier
Lines 14-19 Link Here
14
MAINTAINER=	ports@FreeBSD.org
14
MAINTAINER=	ports@FreeBSD.org
15
COMMENT=	Courier SMTP IMAP POP3 HTTP mail server suite
15
COMMENT=	Courier SMTP IMAP POP3 HTTP mail server suite
16
16
17
CONFLICTS=	exim-4.* courier-imap-2.* maildrop-1.* \
18
		postfix-1.* postfix-2.* \
19
		qmail-1.* qmail-*-1.* \
20
		sendmail-8.* sendmail-*-8.* \
21
		smail-3.* sqwebmail-3.* zmailer-2.*
22
23
.if defined(WITH_GHOSTSCRIPT_AFPL) && ${WITH_GHOSTSCRIPT_AFPL} == yes
24
GSPORT?=        print/ghostscript-afpl
25
.else
26
GSPORT?=        print/ghostscript-gnu
27
.endif
28
29
LIB_DEPENDS=	fam.0:${PORTSDIR}/devel/fam
17
RUN_DEPENDS=	${LOCALBASE}/share/sysconftool/sysconftool:${PORTSDIR}/devel/sysconftool \
30
RUN_DEPENDS=	${LOCALBASE}/share/sysconftool/sysconftool:${PORTSDIR}/devel/sysconftool \
18
		${SITE_PERL}/Net/CIDR.pm:${PORTSDIR}/net/p5-Net-CIDR
31
		${SITE_PERL}/Net/CIDR.pm:${PORTSDIR}/net/p5-Net-CIDR
19
32
Lines 35-45 Link Here
35
CACHEOWN?=	pop
48
CACHEOWN?=	pop
36
MAILDROPDEFAULT?=./Maildir
49
MAILDROPDEFAULT?=./Maildir
37
# End of user-serviceable variables
50
# End of user-serviceable variables
38
CONFLICTS=	postfix-1.* postfix-2.* sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
51
MAILOWN=	courier
39
MAILOWN=	mailnull
52
MAILGRP=	courier
40
MAILGRP=	mailnull
53
MAILUID=	465
41
MAILUID=	26
54
MAILGID=	465
42
MAILGID=	26
43
ETCDIR=		${PREFIX}/etc
55
ETCDIR=		${PREFIX}/etc
44
SYSCONFDIR=	${ETCDIR}/courier
56
SYSCONFDIR=	${ETCDIR}/courier
45
USERDB=		${ETCDIR}/userdb
57
USERDB=		${ETCDIR}/userdb
Lines 54-63 Link Here
54
USE_PERL5=	yes
66
USE_PERL5=	yes
55
USE_GMAKE=	yes
67
USE_GMAKE=	yes
56
USE_OPENSSL=	yes
68
USE_OPENSSL=	yes
57
USE_AUTOMAKE_VER=15
69
USE_RC_SUBR=	yes
58
CONFIGURE_ENV=	REHASH=${SCRIPTDIR}/c_rehash
70
USE_REINPLACE=	yes
71
USE_LIBTOOL_VER=15
72
73
CPPFLAGS+=	-I${LOCALBASE}/include
74
LDFLAGS+=	-L${LOCALBASE}/lib
75
CONFIGURE_ENV=	REHASH=${SCRIPTDIR}/c_rehash \
76
		CPPFLAGS='${CPPFLAGS}' \
77
		LDFLAGS='${LDFLAGS}'
78
MAKE_ENV:=	${CONFIGURE_ENV}
59
CONFIGURE_ARGS=	--disable-root-check --with-db=db \
79
CONFIGURE_ARGS=	--disable-root-check --with-db=db \
60
		--enable-syslog=1 --enable-use-flock \
80
		--enable-syslog=1 --enable-use-flock \
81
		--program-transform-name=s,^,, \
61
		--with-mailuser=${MAILOWN} \
82
		--with-mailuser=${MAILOWN} \
62
		--with-mailgroup=${MAILGRP} \
83
		--with-mailgroup=${MAILGRP} \
63
		--with-mailuid=${MAILUID} \
84
		--with-mailuid=${MAILUID} \
Lines 76-90 Link Here
76
		--with-default-maildrop=${MAILDROPDEFAULT} \
97
		--with-default-maildrop=${MAILDROPDEFAULT} \
77
		--enable-workarounds-for-imap-client-bugs
98
		--enable-workarounds-for-imap-client-bugs
78
99
79
# Respect the make.conf(5) NOUUCP setting
80
WITH_TRANSPORT=	local esmtp dsn
81
.if defined(NOUUCP)
82
PLIST_SUB+=	SUB_UUCP="@comment "
83
.else
84
WITH_TRANSPORT+=uucp
85
PLIST_SUB+=	SUB_UUCP=""
86
.endif
87
88
PKGMESSAGE=	${WRKDIR}/.PKGMESSAGE
100
PKGMESSAGE=	${WRKDIR}/.PKGMESSAGE
89
101
90
INSTALL_TARGET=	install-strip install-perms
102
INSTALL_TARGET=	install-strip install-perms
Lines 99-114 Link Here
99
		WITH_GNUPG="${WITH_GNUPG:L}" \
111
		WITH_GNUPG="${WITH_GNUPG:L}" \
100
		WITH_ASPELL="${WITH_ASPELL:L}" \
112
		WITH_ASPELL="${WITH_ASPELL:L}" \
101
		WITH_ISPELL="${WITH_ISPELL:L}" \
113
		WITH_ISPELL="${WITH_ISPELL:L}" \
102
		WITH_LDAP1="${WITH_LDAP1:L}" \
114
		WITH_LDAP="${WITH_LDAP:L}" \
103
		WITH_LDAP2="${WITH_LDAP2:L}" \
104
		WITH_MYSQL="${WITH_MYSQL:L}" \
115
		WITH_MYSQL="${WITH_MYSQL:L}" \
105
		WITH_PGSQL="${WITH_PGSQL:L}" \
116
		WITH_PGSQL="${WITH_PGSQL:L}" \
106
		WITH_VPOPMAIL="${WITH_VPOPMAIL:L}" \
117
		WITH_VPOPMAIL="${WITH_VPOPMAIL:L}" \
107
		WITH_PROCMAIL="${WITH_PROCMAIL:L}" \
118
		WITH_PROCMAIL="${WITH_PROCMAIL:L}" \
108
		WITH_SENDFAX="${WITH_SENDFAX:L}" \
119
		WITH_SENDFAX="${WITH_SENDFAX:L}" \
120
		WITH_UUCP="${WITH_UUCP:L}" \
109
		WITH_IPV6="${WITH_IPV6:L}" \
121
		WITH_IPV6="${WITH_IPV6:L}" \
110
		WITH_TRANSPORT="${WITH_TRANSPORT}" \
111
		WITH_GHOSTSCRIPT_AFPL="${WITH_GHOSTSCRIPT_AFPL:L}" \
112
		TOUCH="${TOUCH}" \
122
		TOUCH="${TOUCH}" \
113
		MKDIR="${MKDIR}"
123
		MKDIR="${MKDIR}"
114
124
Lines 120-133 Link Here
120
.include "${.CURDIR}/Makefile.own"
130
.include "${.CURDIR}/Makefile.own"
121
131
122
pre-everything::
132
pre-everything::
123
	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.${PORTNAME}
124
125
.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
126
	@${ECHO_MSG} ""
133
	@${ECHO_MSG} ""
127
	@${ECHO_MSG} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
134
	@${ECHO_MSG} "You may use the following build options:"
128
	@${ECHO_MSG} "      AFPL Postscript interpreter instead of GNU one"
129
	@${ECHO_MSG} ""
135
	@${ECHO_MSG} ""
136
	@${ECHO_MSG} "	WITH_EXPECT=yes		Expect support for WebMail change passwd"
137
	@${ECHO_MSG} "	WITH_GNUPG=yes		GNU Privacy Guard support for WebMail"
138
	@${ECHO_MSG} "	WITH_ASPELL=yes		ASpell support for WebMail"
139
	@${ECHO_MSG} "	WITH_ISPELL=yes		ISpell support for WebMail"
140
	@${ECHO_MSG} "	WITH_LDAP=yes		OpenLDAP 2.x authentication support"
141
.if !defined(WANT_OPENLDAP_VER)
142
	@${ECHO_MSG} "	WANT_OPENLDAP_VER=??	See <bsd.port.mk> for legal values"
143
.endif
144
	@${ECHO_MSG} "	WITH_MYSQL=yes		MySQL authentication support"
145
	@${ECHO_MSG} "	WITH_PGSQL=yes		PostgreSQL authentication support"
146
	@${ECHO_MSG} "	WITH_VPOPMAIL=yes	VPopMail authentication support"
147
	@${ECHO_MSG} "	WITH_PROCMAIL=yes	Procmail local delivery support"
148
	@${ECHO_MSG} "	WITH_SENDFAX=yes	mgetty+sendfax support"
149
.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
150
	@${ECHO_MSG} "	WITH_GHOSTSCRIPT_AFPL=yes to use AFPL Postscript"
151
	@${ECHO_MSG} "				interpreter instead of GNU one"
152
	@${ECHO_MSG} "				for mgetty+sendfax support"
130
.endif
153
.endif
154
	@${ECHO_MSG} "	WITH_UUCP=yes		UUCP support"
155
	@${ECHO_MSG} "	WITH_IPV6=yes		Pv6 support"
156
	@${ECHO_MSG} ""
157
	@${ECHO_MSG} "	BATCH=yes		To skip INTERACTIVE selection"
158
	@${ECHO_MSG} "				of above tunables"
159
	@${ECHO_MSG} ""
160
	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.${PORTNAME}
131
161
132
post-patch:
162
post-patch:
133
	@${PERL} -pi -e 's:\@datadir\@:\@sysconfdir\@:g;' \
163
	@${PERL} -pi -e 's:\@datadir\@:\@sysconfdir\@:g;' \
Lines 141-186 Link Here
141
		${WRKSRC}/*/*/*.cnf.in
171
		${WRKSRC}/*/*/*.cnf.in
142
172
143
pre-configure:
173
pre-configure:
144
	@${SED} s:%%PREFIX%%:${PREFIX}: \
174
	@${SED}	-e s:%%RC_SUBR%%:${RC_SUBR}: \
145
		${.CURDIR}/pkg-message \
175
		-e s:%%PREFIX%%:${PREFIX}: ${FILESDIR}/courier.sh > ${WRKDIR}/courier.sh
146
		> ${WRKDIR}/.PKGMESSAGE
176
	@${SED}	-e s:%%PREFIX%%:${PREFIX}: ${.CURDIR}/pkg-message > ${WRKDIR}/.PKGMESSAGE
147
	@${SED} s:%%PREFIX%%:${PREFIX}: \
177
	@${SED}	-e s:%%PREFIX%%:${PREFIX}: ${FILESDIR}/crontab > ${WRKDIR}/crontab
148
		${FILESDIR}/crontab \
149
		> ${WRKDIR}/crontab
150
178
151
# patch around a bug in autoconf where the INSTALL macro does
152
# not get set properly in directories more than one level deep
153
post-build:
179
post-build:
154
	@${PERL} -pi -e 's:^(auth)\s+(required).*:$$1\t\t$$2\tpam_unix.so\ttry_first_pass:g; \
180
	@${PERL} -pi -e 's:^(auth)\s+(required).*:$$1\t\t$$2\tpam_unix.so\ttry_first_pass:g;' \
155
			s:^(account)\s+(required).*:$$1 \t$$2\tpam_unix.so:g; \
181
		     -e 's:^(account)\s+(required).*:$$1 \t$$2\tpam_unix.so:g;' \
156
			s:^(session)\s+(required).*:$$1 \t$$2\tpam_permit.so:g;' \
182
		     -e 's:^(session)\s+(required).*:$$1 \t$$2\tpam_permit.so:g;' \
157
		${WRKSRC}/*/*.authpam* \
183
		${WRKSRC}/*/*.authpam* \
158
		${WRKSRC}/*/*/*.authpam*
184
		${WRKSRC}/*/*/*.authpam*
159
	@${PERL} -pi -e 's:^transform = .*freebsd.*:transform = s,x,x:;' ${WRKSRC}/Makefile ${WRKSRC}/*/Makefile ${WRKSRC}/*/*/Makefile
185
	@${LN} -f ${WRKSRC}/gpglib/README.html		${WRKSRC}/gpglib/README.gpglib.html
160
	@${LN} ${WRKSRC}/gpglib/README.html	${WRKSRC}/gpglib/README.gpglib.html
186
	@${LN} -f ${WRKSRC}/imap/FAQ			${WRKSRC}/imap/FAQ.imap
161
	@${LN} ${WRKSRC}/imap/FAQ		${WRKSRC}/imap/FAQ.imap
187
	@${LN} -f ${WRKSRC}/imap/FAQ.html		${WRKSRC}/imap/FAQ.imap.html
162
	@${LN} ${WRKSRC}/imap/FAQ.html		${WRKSRC}/imap/FAQ.imap.html
188
	@${LN} -f ${WRKSRC}/imap/README			${WRKSRC}/imap/README.imap
163
	@${LN} ${WRKSRC}/imap/README		${WRKSRC}/imap/README.imap
189
	@${LN} -f ${WRKSRC}/imap/README.html		${WRKSRC}/imap/README.imap.html
164
	@${LN} ${WRKSRC}/imap/README.html	${WRKSRC}/imap/README.imap.html
190
	@${LN} -f ${WRKSRC}/maildrop/README.html	${WRKSRC}/maildrop/README.maildrop.html
165
	@${LN} ${WRKSRC}/maildrop/README.html	${WRKSRC}/maildrop/README.maildrop.html
191
	@${LN} -f ${WRKSRC}/pcp/README.html		${WRKSRC}/pcp/README.pcp.html
166
	@${LN} ${WRKSRC}/pcp/README.html	${WRKSRC}/pcp/README.pcp.html
192
	@${LN} -f ${WRKSRC}/webmail/BUGS		${WRKSRC}/webmail/BUGS.webmail
167
	@${LN} ${WRKSRC}/webmail/BUGS		${WRKSRC}/webmail/BUGS.webmail
193
	@${LN} -f ${WRKSRC}/webmail/BUGS.html		${WRKSRC}/webmail/BUGS.webmail.html
168
	@${LN} ${WRKSRC}/webmail/BUGS.html	${WRKSRC}/webmail/BUGS.webmail.html
194
	@${LN} -f ${WRKSRC}/webmail/SECURITY		${WRKSRC}/webmail/SECURITY.webmail
169
	@${LN} ${WRKSRC}/webmail/SECURITY	${WRKSRC}/webmail/SECURITY.webmail
195
	@${LN} -f ${WRKSRC}/webmail/SECURITY.html	${WRKSRC}/webmail/SECURITY.webmail.html
170
	@${LN} ${WRKSRC}/webmail/SECURITY.html	${WRKSRC}/webmail/SECURITY.webmail.html
171
196
172
pre-install:
197
pre-install:
173
	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
198
	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
174
199
175
post-install:
200
post-install:
176
	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
177
	@${STRIP_CMD} ${PREFIX}/libexec/courier/modules/*/*
178
	@${LN} -f ${SYSCONFDIR}/maildrop ${SYSCONFDIR}/maildropfilter
201
	@${LN} -f ${SYSCONFDIR}/maildrop ${SYSCONFDIR}/maildropfilter
179
	@${INSTALL_DATA} /dev/null ${SYSCONFDIR}/locallowercase
202
	@${INSTALL_DATA} /dev/null ${SYSCONFDIR}/locallowercase
180
	@${INSTALL_SCRIPT} ${FILESDIR}/courier.sh ${PREFIX}/etc/rc.d
181
	@${INSTALL_DATA} ${WRKDIR}/crontab ${PREFIX}/etc/courier/
203
	@${INSTALL_DATA} ${WRKDIR}/crontab ${PREFIX}/etc/courier/
204
	@${INSTALL_SCRIPT} ${WRKDIR}/courier.sh ${PREFIX}/etc/rc.d/
182
.for file in ${OWNER0}
205
.for file in ${OWNER0}
183
	@${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/${file}
206
	@-${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/${file}
184
.endfor
207
.endfor
185
	@${GREP} '^@exec ' ${TMPPLIST} \
208
	@${GREP} '^@exec ' ${TMPPLIST} \
186
		| ${SED} -e 's:^@exec ::' -e 's:%D:${PREFIX}:g' \
209
		| ${SED} -e 's:^@exec ::' -e 's:%D:${PREFIX}:g' \
Lines 204-209 Link Here
204
	@${ECHO_MSG} ""
227
	@${ECHO_MSG} ""
205
	@${CAT} ${PKGMESSAGE}
228
	@${CAT} ${PKGMESSAGE}
206
	@${ECHO_MSG} ""
229
	@${ECHO_MSG} ""
230
.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
231
	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
232
.else
233
	@${ECHO_MSG} "	To activate Courier in /etc/mail/mailer.conf or to"
234
	@${ECHO_MSG} "	replace {sendmail,mailq,newaliases} with Courier"
235
	@${ECHO_MSG} "	versions execute the following as root user:"
236
	@${ECHO_MSG} ""
237
	@${ECHO_MSG} "PKG_PREFIX=\"${PREFIX}\" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL"
238
	@${ECHO_MSG} ""
239
.endif
207
240
208
post-clean:
241
post-clean:
209
	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
242
	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
(-)courier/Makefile.man (-5 / +5 lines)
Lines 71-82 Link Here
71
	makeuserdb.8 pw2userdb.8 \
71
	makeuserdb.8 pw2userdb.8 \
72
	makeuserdb.8 vchkpw2userdb.8
72
	makeuserdb.8 vchkpw2userdb.8
73
73
74
.if !defined(NOUUCP)
75
MAN8+=	courieruucp.8
76
MLINKS+=courieruucp.8 makeuucpneighbors.8
77
.endif
78
79
.if defined(WITH_FAX) && ${WITH_FAX} == yes
74
.if defined(WITH_FAX) && ${WITH_FAX} == yes
80
MAN8+=	courierfax.8
75
MAN8+=	courierfax.8
81
.endif
76
.endif
82
	
77
	
78
.if defined(WITH_UUCP) && ${WITH_UUCP} == yes
79
MAN8+=	courieruucp.8
80
MLINKS+=courieruucp.8 makeuucpneighbors.8
81
.endif
82
(-)courier/distinfo (-1 / +1 lines)
Line 1 Link Here
1
MD5 (courier-0.44.0.tar.bz2) = acf6721a56f94791adf4fd7f56ba3e38
1
MD5 (courier-0.44.2.tar.bz2) = 8c607c70a692d8f8ccb769a3f96d2f28
(-)courier/files/courier.sh (-51 / +103 lines)
Lines 1-29 Link Here
1
#!/bin/sh
1
#!/bin/sh
2
# $FreeBSD: ports/mail/courier/files/courier.sh,v 1.2 2002/01/30 03:56:09 pat Exp $
3
#
2
#
4
# This is the ${PREFIX}/etc/rc.d file for Courier SMTP, IMAP and POP3 servers
3
# $FreeBSD: ports/mail/courier/files/courier.sh,v 1.2 2002/01/30 03:56:09 pat Exp $
5
#
4
#
6
# Adapted for FreeBSD from courier.sysvinit
5
# Adapted for FreeBSD from courier.sysvinit
7
#
6
#
8
# NOTE: The 'restart' here does a "hard" stop, and a start.  Be gentle, use
7
# NOTE: The 'restart' here does a "hard" stop, and a start.  Be gentle, use
9
# "courierd restart" for a kindler, gentler, restart.
8
# "courierd restart" for a kindler, gentler, restart.
10
#
9
#
10
# PROVIDE: mail
11
# REQUIRE: LOGIN
12
# BEFORE:  securelevel
13
# KEYWORD: FreeBSD shutdown
14
#
15
# NOTE for FreeBSD 5.0+:
16
# If you want this script to start with the base rc scripts
17
# move courier.sh to /etc/rc.d/courier
11
18
12
if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
19
prefix="%%PREFIX%%"
13
	echo "$0: Cannot determine the PREFIX" >&2
14
	exit 1
15
fi
16
17
prefix="${PREFIX}"
18
exec_prefix="${prefix}"
20
exec_prefix="${prefix}"
19
sysconfdir="${prefix}/etc/courier"
21
sysconfdir="${prefix}/etc/courier"
20
sbindir="${exec_prefix}/sbin"
22
sbindir="${exec_prefix}/sbin"
23
bindir="${exec_prefix}/bin"
21
libexecdir="${prefix}/libexec"
24
libexecdir="${prefix}/libexec"
22
datadir="${prefix}/share/courier"
25
datadir="${prefix}/share/courier"
23
26
24
arg=${1:-start}
27
# Define these courier_* variables in one of these files:
25
case $arg in
28
#	/etc/rc.conf
26
start)	# First time after install create aliases.dat and makesmtpaccess.dat
29
#	/etc/rc.conf.local
30
#	/etc/rc.conf.d/courier
31
#
32
# DO NOT CHANGE THESE DEFAULT VALUES HERE
33
#
34
courier_enable=${courier_enable:-"NO"}	# Run Courier-MTA (YES/NO).
35
36
. %%RC_SUBR%%
37
38
name="courier"
39
rcvar=`set_rcvar`
40
41
start_cmd="${name}_start"
42
stop_cmd="${name}_stop"
43
extra_commands="restart"
44
45
courier_start()
46
{	# First time after install create aliases.dat and makesmtpaccess.dat
47
	echo -n "Starting"
27
48
28
	if [ ! -f ${sysconfdir}/aliases.dat \
49
	if [ ! -f ${sysconfdir}/aliases.dat \
29
	  -a -x ${sbindir}/makealiases ]; then
50
	  -a -x ${sbindir}/makealiases ]; then
Lines 65-93 Link Here
65
	fi
86
	fi
66
87
67
	if [ -x ${sbindir}/courierfilter ]; then
88
	if [ -x ${sbindir}/courierfilter ]; then
68
		${sbindir}/courierfilter start && echo -n " courierfilter"
89
		echo -n " courierfilter"
90
		${sbindir}/courierfilter start
69
	fi
91
	fi
70
92
71
	if [ -x ${libexecdir}/authlib/authdaemond ]; then
93
	if [ -x ${libexecdir}/authlib/authdaemond ]; then
72
		${libexecdir}/authlib/authdaemond start && echo -n " authdaemond"
94
		echo -n " authdaemond"
95
		${libexecdir}/authlib/authdaemond start
73
	fi
96
	fi
74
97
75
	if [ -x ${sbindir}/courierldapaliasd ]; then
98
	if [ -x ${sbindir}/courierldapaliasd ]; then
76
		${sbindir}/courierldapaliasd start && echo -n " courierldapaliasd"
99
		echo -n " courierldapaliasd"
100
		${sbindir}/courierldapaliasd start
77
	fi
101
	fi
78
102
79
	case "`cat ${sysconfdir}/calendarmode 2>/dev/null`" in
103
	case "`cat ${sysconfdir}/calendarmode 2>/dev/null`" in
80
	net)
104
	net)
81
		if [ -x ${libexecdir}/courier/pcpd ]; then
105
		if [ -x ${libexecdir}/courier/pcpd ]; then
82
			${libexecdir}/courier/pcpd start && echo -n " pcpd"
106
			echo -n " pcpd"
107
			${libexecdir}/courier/pcpd start
83
		fi
108
		fi
84
		;;
109
		;;
85
	*)
110
	*)
86
		;;
111
		;;
87
	esac
112
	esac
88
113
114
	if [ -x ${libexecdir}/courier/sqwebmaild ]; then
115
		echo -n " webmail"
116
		${libexecdir}/courier/sqwebmaild start
117
	fi
118
89
	if [ -x ${sbindir}/courier ]; then
119
	if [ -x ${sbindir}/courier ]; then
90
		${sbindir}/courier start && echo -n " courierd"
120
		echo -n " courierd"
121
		${sbindir}/courier start
91
	fi
122
	fi
92
123
93
	if [ "$esmtpdcert" = 1 ]; then
124
	if [ "$esmtpdcert" = 1 ]; then
Lines 106-112 Link Here
106
		case $ESMTPDSTART in
137
		case $ESMTPDSTART in
107
		[Yy]*)
138
		[Yy]*)
108
			if [ -x ${sbindir}/esmtpd ]; then
139
			if [ -x ${sbindir}/esmtpd ]; then
109
				${sbindir}/esmtpd start && echo -n " esmtpd"
140
				echo -n " esmtpd"
141
				${sbindir}/esmtpd start
110
			fi
142
			fi
111
			;;
143
			;;
112
		esac
144
		esac
Lines 118-124 Link Here
118
		case $ESMTPDSTART in
150
		case $ESMTPDSTART in
119
		[Yy]*)
151
		[Yy]*)
120
			if [ -x ${sbindir}/esmtpd-msa ]; then
152
			if [ -x ${sbindir}/esmtpd-msa ]; then
121
				${sbindir}/esmtpd-msa start && echo -n " esmtpd-msa"
153
				echo -n " esmtpd-msa"
154
				${sbindir}/esmtpd-msa start
122
			fi
155
			fi
123
			;;
156
			;;
124
		esac
157
		esac
Lines 131-137 Link Here
131
		[Yy]*)
164
		[Yy]*)
132
			if [ -x $COURIERTLS \
165
			if [ -x $COURIERTLS \
133
			  -a -x ${sbindir}/esmtpd-ssl ]; then
166
			  -a -x ${sbindir}/esmtpd-ssl ]; then
134
				${sbindir}/esmtpd-ssl start && echo -n " esmtpd-ssl"
167
				echo -n " esmtpd-ssl"
168
				${sbindir}/esmtpd-ssl start
135
			fi
169
			fi
136
			;;
170
			;;
137
		esac
171
		esac
Lines 143-149 Link Here
143
		case $IMAPDSTART in
177
		case $IMAPDSTART in
144
		[Yy]*)
178
		[Yy]*)
145
			if [ -x ${sbindir}/imapd ]; then
179
			if [ -x ${sbindir}/imapd ]; then
146
				${sbindir}/imapd start && echo -n " imapd"
180
				echo -n " imapd"
181
				${sbindir}/imapd start
147
			fi
182
			fi
148
			;;
183
			;;
149
		esac
184
		esac
Lines 161-167 Link Here
161
					${sbindir}/mkimapdcert >/dev/null 2>&1
196
					${sbindir}/mkimapdcert >/dev/null 2>&1
162
				fi
197
				fi
163
				if [ -x ${sbindir}/imapd-ssl ]; then
198
				if [ -x ${sbindir}/imapd-ssl ]; then
164
					${sbindir}/imapd-ssl start && echo -n " imapd-ssl"
199
					echo -n " imapd-ssl"
200
					${sbindir}/imapd-ssl start
165
				fi
201
				fi
166
			fi
202
			fi
167
			;;
203
			;;
Lines 174-180 Link Here
174
		case $POP3DSTART in
210
		case $POP3DSTART in
175
		[Yy]*)
211
		[Yy]*)
176
			if [ -x ${sbindir}/pop3d ]; then
212
			if [ -x ${sbindir}/pop3d ]; then
177
				${sbindir}/pop3d start && echo -n " pop3d"
213
				echo -n " pop3d"
214
				${sbindir}/pop3d start
178
			fi
215
			fi
179
			;;
216
			;;
180
		esac
217
		esac
Lines 187-262 Link Here
187
		[Yy]*)	# If we do not have a certificate, make one up.
224
		[Yy]*)	# If we do not have a certificate, make one up.
188
			if [ -x $COURIERTLS ]; then
225
			if [ -x $COURIERTLS ]; then
189
				if [ ! -f ${sysconfdir}/pop3d.pem \
226
				if [ ! -f ${sysconfdir}/pop3d.pem \
190
				  -a -x ${sbindir}/mkpop3dcert ]; then
227
				  -a -x ${sbindir}/mkpop3dcert ]; then 
191
					echo -n " generating-POP3-SSL-certificate..."
228
					echo -n " generating-POP3-SSL-certificate..."
192
					${sbindir}/mkpop3dcert >/dev/null 2>&1
229
					${sbindir}/mkpop3dcert >/dev/null 2>&1
193
				fi
230
				fi
194
				if [ -x ${sbindir}/pop3d-ssl ]; then
231
				if [ -x ${sbindir}/pop3d-ssl ]; then
195
					${sbindir}/pop3d-ssl start && echo -n " pop3d-ssl"
232
					echo -n " pop3d-ssl"
233
					${sbindir}/pop3d-ssl start
196
				fi
234
				fi
197
			fi
235
			fi
198
			;;
236
			;;
199
		esac
237
		esac
200
	fi
238
	fi
201
	;;
239
	echo "."
202
stop)	# kill courier services in the reverse order of starting them
240
}
241
242
courier_stop()
243
{	# kill courier services in the reverse order of starting them
244
	echo -n "Stopping"
245
203
	if [ -x ${sbindir}/pop3d-ssl ]; then
246
	if [ -x ${sbindir}/pop3d-ssl ]; then
204
		${sbindir}/pop3d-ssl stop && echo -n " pop3d-ssl"
247
		echo -n " pop3d-ssl"
248
		${sbindir}/pop3d-ssl stop
205
	fi
249
	fi
206
250
207
	if [ -x ${sbindir}/pop3d ]; then
251
	if [ -x ${sbindir}/pop3d ]; then
208
		${sbindir}/pop3d stop && echo -n " pop3d"
252
		echo -n " pop3d"
253
		${sbindir}/pop3d stop
209
	fi
254
	fi
210
255
211
	if [ -x ${sbindir}/imapd-ssl ]; then
256
	if [ -x ${sbindir}/imapd-ssl ]; then
212
		${sbindir}/imapd-ssl stop && echo -n " imapd-ssl"
257
		echo -n " imapd-ssl"
258
		${sbindir}/imapd-ssl stop
213
	fi
259
	fi
214
260
215
	if [ -x ${sbindir}/imapd ]; then
261
	if [ -x ${sbindir}/imapd ]; then
216
		${sbindir}/imapd stop && echo -n " imapd"
262
		echo -n " imapd"
263
		${sbindir}/imapd stop
217
	fi
264
	fi
218
265
219
	if [ -x ${sbindir}/esmtpd-ssl ]; then
266
	if [ -x ${sbindir}/esmtpd-ssl ]; then
220
		${sbindir}/esmtpd-ssl stop && echo -n " esmtpd-ssl"
267
		echo -n " esmtpd-ssl"
268
		${sbindir}/esmtpd-ssl stop
221
	fi
269
	fi
222
270
223
	if [ -x ${sbindir}/esmtpd-msa ]; then
271
	if [ -x ${sbindir}/esmtpd-msa ]; then
224
		${sbindir}/esmtpd-msa stop && echo -n " esmtpd-msa"
272
		echo -n " esmtpd-msa"
273
		${sbindir}/esmtpd-msa stop
225
	fi
274
	fi
226
275
227
	if [ -x ${sbindir}/esmtpd ]; then
276
	if [ -x ${sbindir}/esmtpd ]; then
228
		${sbindir}/esmtpd stop && echo -n " esmtpd"
277
		echo -n " esmtpd"
278
		${sbindir}/esmtpd stop
229
	fi
279
	fi
230
280
231
	if [ -x ${sbindir}/courier ]; then
281
	if [ -x ${sbindir}/courier ]; then
232
		${sbindir}/courier stop && echo -n " courierd"
282
		echo -n " courierd"
283
		${sbindir}/courier stop
284
	fi
285
286
	if [ -x ${libexecdir}/courier/sqwebmaild ]; then
287
		echo -n " webmail"
288
		${libexecdir}/courier/sqwebmaild stop
233
	fi
289
	fi
234
290
235
	if [ -x ${libexecdir}/courier/pcpd ]; then
291
	if [ -x ${libexecdir}/courier/pcpd ]; then
236
		${libexecdir}/courier/pcpd stop && echo -n " pcpd"
292
		echo -n " pcpd"
293
		${libexecdir}/courier/pcpd stop
237
	fi
294
	fi
238
295
239
	if [ -x ${sbindir}/courierldapaliasd ]; then
296
	if [ -x ${sbindir}/courierldapaliasd ]; then
240
		${sbindir}/courierldapaliasd stop && echo -n " courierldapaliasd"
297
		echo -n " courierldapaliasd"
298
		${sbindir}/courierldapaliasd stop
241
	fi
299
	fi
242
300
243
	if [ -x ${libexecdir}/authlib/authdaemond ]; then
301
	if [ -x ${libexecdir}/authlib/authdaemond ]; then
244
		${libexecdir}/authlib/authdaemond stop && echo -n " authdaemond"
302
		echo -n " authdaemond"
303
		${libexecdir}/authlib/authdaemond stop
245
	fi
304
	fi
246
305
247
	if [ -x ${sbindir}/courierfilter ]; then
306
	if [ -x ${sbindir}/courierfilter ]; then
248
		${sbindir}/courierfilter stop && echo " courierfilter"
307
		echo -n " courierfilter"
308
		${sbindir}/courierfilter stop
249
	fi
309
	fi
250
	;;
310
	echo "."
251
restart)
311
}
252
	$0 stop
312
253
	$0 start
313
load_rc_config $name
254
	;;
314
run_rc_command "$1"
255
*)
256
	echo ""
257
	echo "Usage: `basename $0` { start | stop | restart }"
258
	echo ""
259
	exit 64
260
	;;
261
esac
262
exit 0
(-)courier/files/patch-configure (+12 lines)
Line 0 Link Here
1
--- configure.orig	Fri Nov 28 20:37:46 2003
2
+++ configure	Wed Jan  7 03:17:25 2004
3
@@ -18967,9 +18967,6 @@
4
 echo "$as_me: WARNING: === the INSTALL file you should have known this.  So" >&2;}
5
 	{ echo "$as_me:$LINENO: WARNING: === you better read INSTALL again" >&5
6
 echo "$as_me: WARNING: === you better read INSTALL again" >&2;}
7
-	{ { echo "$as_me:$LINENO: error: aborted." >&5
8
-echo "$as_me: error: aborted." >&2;}
9
-   { (exit 1); exit 1; }; }
10
 fi
11
 fi
12
 
(-)courier/files/patch-courier::configure (+15 lines)
Line 0 Link Here
1
--- courier/configure.orig	Sat Nov 15 15:13:43 2003
2
+++ courier/configure	Wed Jan  7 03:22:36 2004
3
@@ -21208,9 +21208,9 @@
4
 
5
 if test "$testmode" = "0"
6
 then
7
-	INSTALL_PROGRAM='${INSTALL} -m 700'
8
-	INSTALL_SCRIPT='${INSTALL} -m 700'
9
-	INSTALL_DATA='${INSTALL} -m 600'
10
+	INSTALL_PROGRAM='${BSD_INSTALL_PROGRAM}'
11
+	INSTALL_SCRIPT='${BSD_INSTALL_SCRIPT}'
12
+	INSTALL_DATA='${BSD_INSTALL_DATA}'
13
 fi
14
 
15
 ac_ext=cc
(-)courier/files/patch-courier::configure.in (-21 lines)
Lines 1-21 Link Here
1
--- courier/configure.in.orig	Sun Mar 16 17:35:34 2003
2
+++ courier/configure.in	Sat Aug  9 16:36:22 2003
3
@@ -465,12 +465,12 @@
4
 
5
 # Automake stupidity
6
 
7
-if test "$testmode" = "0"
8
-then
9
-	INSTALL_PROGRAM='${INSTALL} -m 700'
10
-	INSTALL_SCRIPT='${INSTALL} -m 700'
11
-	INSTALL_DATA='${INSTALL} -m 600'
12
-fi
13
+#if test "$testmode" = "0"
14
+#then
15
+#	INSTALL_PROGRAM='${INSTALL} -m 700'
16
+#	INSTALL_SCRIPT='${INSTALL} -m 700'
17
+#	INSTALL_DATA='${INSTALL} -m 600'
18
+#fi
19
 
20
 AC_LANG_CPLUSPLUS
21
 AC_CACHE_CHECK([if the C++ compiler needs -fhandle-exceptions],
(-)courier/pkg-descr (-1 / +1 lines)
Lines 13-19 Link Here
13
   client can optionally require that the remote server's X.509
13
   client can optionally require that the remote server's X.509
14
   certificate is signed by a trusted root CA (a default set of
14
   certificate is signed by a trusted root CA (a default set of
15
   root CAs is provided).
15
   root CAs is provided).
16
 * Mailboxes can be accessed via POP3, IMAP, and HTTP.
16
 * Mailboxes can be accessed via POP3, IMAP, SMAP, and HTTP.
17
 * A faxmail gateway that forwards E-mail messages via fax.
17
 * A faxmail gateway that forwards E-mail messages via fax.
18
 * Courier includes a mailing list manager.
18
 * Courier includes a mailing list manager.
19
 * PAM, LDAP, PostgreSQL, or MySQL authentication. 
19
 * PAM, LDAP, PostgreSQL, or MySQL authentication. 
(-)courier/pkg-install (-2 / +2 lines)
Lines 5-12 Link Here
5
5
6
PKG_PREFIX=${PKG_PREFIX:=/usr/local}
6
PKG_PREFIX=${PKG_PREFIX:=/usr/local}
7
7
8
USER=mailnull;	UID=26
8
USER=courier;	UID=465
9
GROUP=mailnull;	GID=26
9
GROUP=courier;	GID=465
10
10
11
ask() {
11
ask() {
12
    local question default answer
12
    local question default answer
(-)courier/pkg-message (-3 / +18 lines)
Lines 25-34 Link Here
25
	depending on which authentication services you chose to
25
	depending on which authentication services you chose to
26
	omit.
26
	omit.
27
27
28
	Do not forget to update /etc/pam.conf with the contents of
28
	Do not forget to update /etc/pam.d/ or /etc/pam.conf with
29
	%%PREFIX%%/etc/courier/*.authpam. See /etc/pam.conf(8) for
29
	the contents of %%PREFIX%%/etc/courier/*.authpam.
30
	further assistance.
30
31
	To enable Courier-MTA to start at boot time,
32
	set these variables in your /etc/rc.conf file:
33
34
		courier_enable="YES"                                
35
		sendmail_enable="NONE"                                
36
37
	Also, you will want to disable some Sendmail 
38
	specific daily maintenance routines in your
39
	/etc/periodic.conf file:
40
41
		daily_clean_hoststat_enable="NO"
42
		daily_status_mail_rejects_enable="NO"                                      
43
		daily_status_include_submit_mailq="NO"
44
		daily_submit_queuerun="NO"
31
45
32
	Documentation (if installed locally) is located in
46
	Documentation (if installed locally) is located in
33
	%%PREFIX%%/share/doc/courier/ otherwise see
47
	%%PREFIX%%/share/doc/courier/ otherwise see
34
	http://www.Courier-MTA.org/
48
	http://www.Courier-MTA.org/
49
(-)courier/pkg-plist (-38 / +52 lines)
Lines 137-143 Link Here
137
%%SUB_MYSQL%%libexec/authlib/authdaemond.mysql
137
%%SUB_MYSQL%%libexec/authlib/authdaemond.mysql
138
%%SUB_PGSQL%%libexec/authlib/authdaemond.pgsql
138
%%SUB_PGSQL%%libexec/authlib/authdaemond.pgsql
139
libexec/authlib/authdaemond.plain
139
libexec/authlib/authdaemond.plain
140
libexec/authlib/changepwd/authdaemon.passwd
140
%%SUB_EXPECT%%libexec/authlib/changepwd/authdaemon.passwd
141
libexec/authlib/changepwd/authsystem.passwd
141
libexec/authlib/changepwd/authsystem.passwd
142
libexec/courier/aliascombine
142
libexec/courier/aliascombine
143
libexec/courier/aliascreate
143
libexec/courier/aliascreate
Lines 159-164 Link Here
159
libexec/courier/modules/modules.ctl
159
libexec/courier/modules/modules.ctl
160
%%SUB_UUCP%%libexec/courier/modules/uucp/courieruucp
160
%%SUB_UUCP%%libexec/courier/modules/uucp/courieruucp
161
libexec/courier/pcpd
161
libexec/courier/pcpd
162
libexec/courier/sqwebmaild
162
libexec/courier/submit
163
libexec/courier/submit
163
libexec/courier/submitmkdir
164
libexec/courier/submitmkdir
164
libexec/courier/webmail/webadmin
165
libexec/courier/webmail/webadmin
Lines 248-255 Link Here
248
share/courier/courierwebadmin/admin-00machine.pl
249
share/courier/courierwebadmin/admin-00machine.pl
249
share/courier/courierwebadmin/admin-05local.html
250
share/courier/courierwebadmin/admin-05local.html
250
share/courier/courierwebadmin/admin-05local.pl
251
share/courier/courierwebadmin/admin-05local.pl
251
share/courier/courierwebadmin/admin-10password.pl
252
share/courier/courierwebadmin/admin-10password.html
252
share/courier/courierwebadmin/admin-10password.html
253
share/courier/courierwebadmin/admin-10password.pl
253
share/courier/courierwebadmin/admin-15ldap.html
254
share/courier/courierwebadmin/admin-15ldap.html
254
share/courier/courierwebadmin/admin-15ldap.pl
255
share/courier/courierwebadmin/admin-15ldap.pl
255
share/courier/courierwebadmin/admin-15ldapa.html
256
share/courier/courierwebadmin/admin-15ldapa.html
Lines 258-265 Link Here
258
share/courier/courierwebadmin/admin-15mysql.pl
259
share/courier/courierwebadmin/admin-15mysql.pl
259
share/courier/courierwebadmin/admin-15pgsql.html
260
share/courier/courierwebadmin/admin-15pgsql.html
260
share/courier/courierwebadmin/admin-15pgsql.pl
261
share/courier/courierwebadmin/admin-15pgsql.pl
261
share/courier/courierwebadmin/admin-20aliases.pl
262
share/courier/courierwebadmin/admin-20aliases.html
262
share/courier/courierwebadmin/admin-20aliases.html
263
share/courier/courierwebadmin/admin-20aliases.pl
263
share/courier/courierwebadmin/admin-30esmtp.html
264
share/courier/courierwebadmin/admin-30esmtp.html
264
share/courier/courierwebadmin/admin-30esmtp.pl
265
share/courier/courierwebadmin/admin-30esmtp.pl
265
share/courier/courierwebadmin/admin-31esmtp.html
266
share/courier/courierwebadmin/admin-31esmtp.html
Lines 272-279 Link Here
272
share/courier/courierwebadmin/admin-40imap.pl
273
share/courier/courierwebadmin/admin-40imap.pl
273
share/courier/courierwebadmin/admin-45pop3.html
274
share/courier/courierwebadmin/admin-45pop3.html
274
share/courier/courierwebadmin/admin-45pop3.pl
275
share/courier/courierwebadmin/admin-45pop3.pl
275
share/courier/courierwebadmin/admin-47webmail.pl
276
share/courier/courierwebadmin/admin-47webmail.html
276
share/courier/courierwebadmin/admin-47webmail.html
277
share/courier/courierwebadmin/admin-47webmail.pl
277
share/courier/courierwebadmin/admin-50bofh.html
278
share/courier/courierwebadmin/admin-50bofh.html
278
share/courier/courierwebadmin/admin-50bofh.pl
279
share/courier/courierwebadmin/admin-50bofh.pl
279
share/courier/courierwebadmin/admin-cancel.pl
280
share/courier/courierwebadmin/admin-cancel.pl
Lines 546-588 Link Here
546
share/courier/sqwebmail/html/en-us/quickadd.html
547
share/courier/sqwebmail/html/en-us/quickadd.html
547
share/courier/sqwebmail/html/en-us/readmsg.html
548
share/courier/sqwebmail/html/en-us/readmsg.html
548
share/courier/sqwebmail/html/en-us/redirect.html
549
share/courier/sqwebmail/html/en-us/redirect.html
550
share/courier/sqwebmail/html/en-us/smileys.txt
549
share/courier/sqwebmail/html/en-us/spellchk.html
551
share/courier/sqwebmail/html/en-us/spellchk.html
552
share/courier/sqwebmail/html/en
550
@dirrm share/courier/sqwebmail/html/en-us
553
@dirrm share/courier/sqwebmail/html/en-us
551
@exec [ -L %D/share/courier/sqwebmail/html/en ] || ln -sf en-us %D/share/courier/sqwebmail/html/en 2>/dev/null || true
552
@unexec rm -f %D/share/courier/sqwebmail/html/en 2>/dev/null || true
553
@dirrm share/courier/sqwebmail/html
554
@dirrm share/courier/sqwebmail/html
554
share/courier/sqwebmail/images/bg.gif
555
share/courier/sqwebmail/images/bg.png
555
share/courier/sqwebmail/images/bluebottomleft.gif
556
share/courier/sqwebmail/images/bluebottomleft.png
556
share/courier/sqwebmail/images/bluebottomright.gif
557
share/courier/sqwebmail/images/bluebottomright.png
557
share/courier/sqwebmail/images/bluetopleft.gif
558
share/courier/sqwebmail/images/bluetopleft.png
558
share/courier/sqwebmail/images/bluetopright.gif
559
share/courier/sqwebmail/images/bluetopright.png
559
share/courier/sqwebmail/images/calendar.gif
560
share/courier/sqwebmail/images/calendar.png
560
share/courier/sqwebmail/images/cancel.gif
561
share/courier/sqwebmail/images/cancel.png
561
share/courier/sqwebmail/images/folder.gif
562
share/courier/sqwebmail/images/eventadd.png
562
share/courier/sqwebmail/images/folder2.gif
563
share/courier/sqwebmail/images/eventedit.png
563
share/courier/sqwebmail/images/folders.gif
564
share/courier/sqwebmail/images/first.png
564
share/courier/sqwebmail/images/forward.gif
565
share/courier/sqwebmail/images/folder.png
565
share/courier/sqwebmail/images/forwardatt.gif
566
share/courier/sqwebmail/images/folder2.png
566
share/courier/sqwebmail/images/fullheaders.gif
567
share/courier/sqwebmail/images/folders.png
567
share/courier/sqwebmail/images/graybottomright.gif
568
share/courier/sqwebmail/images/forward.png
568
share/courier/sqwebmail/images/graybottomleft.gif
569
share/courier/sqwebmail/images/forwardatt.png
569
share/courier/sqwebmail/images/graytopleft.gif
570
share/courier/sqwebmail/images/fullheaders.png
570
share/courier/sqwebmail/images/graytopright.gif
571
share/courier/sqwebmail/images/graybottomleft.png
571
share/courier/sqwebmail/images/left.gif
572
share/courier/sqwebmail/images/graybottomright.png
572
share/courier/sqwebmail/images/left2.gif
573
share/courier/sqwebmail/images/graytopleft.png
573
share/courier/sqwebmail/images/logo.gif
574
share/courier/sqwebmail/images/graytopright.png
574
share/courier/sqwebmail/images/print.gif
575
share/courier/sqwebmail/images/last.png
575
share/courier/sqwebmail/images/reply.gif
576
share/courier/sqwebmail/images/left.png
576
share/courier/sqwebmail/images/replyall.gif
577
share/courier/sqwebmail/images/left2.png
577
share/courier/sqwebmail/images/replylist.gif
578
share/courier/sqwebmail/images/logo.png
578
share/courier/sqwebmail/images/right.gif
579
share/courier/sqwebmail/images/print.png
579
share/courier/sqwebmail/images/right2.gif
580
share/courier/sqwebmail/images/reply.png
580
share/courier/sqwebmail/images/save.gif
581
share/courier/sqwebmail/images/replyall.png
581
share/courier/sqwebmail/images/sep.gif
582
share/courier/sqwebmail/images/replylist.png
582
share/courier/sqwebmail/images/signin.gif
583
share/courier/sqwebmail/images/right.png
584
share/courier/sqwebmail/images/right2.png
585
share/courier/sqwebmail/images/save.png
586
share/courier/sqwebmail/images/sep.png
587
share/courier/sqwebmail/images/signin.png
588
share/courier/sqwebmail/images/sm-frowney.png
589
share/courier/sqwebmail/images/sm-frowney2.png
590
share/courier/sqwebmail/images/sm-notsmiley.png
591
share/courier/sqwebmail/images/sm-notsmiley2.png
592
share/courier/sqwebmail/images/sm-ohno.png
593
share/courier/sqwebmail/images/sm-smiley.png
594
share/courier/sqwebmail/images/sm-smiley2.png
595
share/courier/sqwebmail/images/sm-wink.png
596
share/courier/sqwebmail/images/sm-wink2.png
583
share/courier/sqwebmail/images/sqwebmail.css
597
share/courier/sqwebmail/images/sqwebmail.css
584
share/courier/sqwebmail/images/trash2.gif
598
share/courier/sqwebmail/images/trash2.png
585
share/courier/sqwebmail/images/uncancel.gif
599
share/courier/sqwebmail/images/uncancel.png
586
@dirrm share/courier/sqwebmail/images
600
@dirrm share/courier/sqwebmail/images
587
share/courier/sqwebmail/ldapsearch
601
share/courier/sqwebmail/ldapsearch
588
share/courier/sqwebmail/sendit.sh
602
share/courier/sqwebmail/sendit.sh
Lines 630-636 Link Here
630
%%PORTDOCS%%%%DOCSDIR%%/html/courierpop3d.html
644
%%PORTDOCS%%%%DOCSDIR%%/html/courierpop3d.html
631
%%PORTDOCS%%%%DOCSDIR%%/html/couriertcpd.html
645
%%PORTDOCS%%%%DOCSDIR%%/html/couriertcpd.html
632
%%PORTDOCS%%%%DOCSDIR%%/html/couriertls.html
646
%%PORTDOCS%%%%DOCSDIR%%/html/couriertls.html
633
%%PORTDOCS%%%%SUB_UUCP%%%%DOCSDIR%%/html/courieruucp.html
647
%%SUB_UUCP%%%%PORTDOCS%%%%DOCSDIR%%/html/courieruucp.html
634
%%PORTDOCS%%%%DOCSDIR%%/html/deliverquota.html
648
%%PORTDOCS%%%%DOCSDIR%%/html/deliverquota.html
635
%%PORTDOCS%%%%DOCSDIR%%/html/dot-courier.html
649
%%PORTDOCS%%%%DOCSDIR%%/html/dot-courier.html
636
%%PORTDOCS%%%%DOCSDIR%%/html/dot-forward.html
650
%%PORTDOCS%%%%DOCSDIR%%/html/dot-forward.html
(-)courier/scripts/configure.courier (-61 / +49 lines)
Lines 18-30 Link Here
18
	[ ":${WITH_GNUPG}"	= ':yes' ] && OPTIONS="${OPTIONS} \"GnuPG\""
18
	[ ":${WITH_GNUPG}"	= ':yes' ] && OPTIONS="${OPTIONS} \"GnuPG\""
19
	[ ":${WITH_ASPELL}"	= ':yes' ] && OPTIONS="${OPTIONS} \"ASpell\""
19
	[ ":${WITH_ASPELL}"	= ':yes' ] && OPTIONS="${OPTIONS} \"ASpell\""
20
	[ ":${WITH_ISPELL}"	= ':yes' ] && OPTIONS="${OPTIONS} \"ISpell\""
20
	[ ":${WITH_ISPELL}"	= ':yes' ] && OPTIONS="${OPTIONS} \"ISpell\""
21
	[ ":${WITH_LDAP1}"	= ':yes' ] && OPTIONS="${OPTIONS} \"OpenLDAP1\""
21
	[ ":${WITH_LDAP}"	= ':yes' ] && OPTIONS="${OPTIONS} \"OpenLDAP\""
22
	[ ":${WITH_LDAP2}"	= ':yes' ] && OPTIONS="${OPTIONS} \"OpenLDAP2\""
23
	[ ":${WITH_MYSQL}"	= ':yes' ] && OPTIONS="${OPTIONS} \"MySQL\""
22
	[ ":${WITH_MYSQL}"	= ':yes' ] && OPTIONS="${OPTIONS} \"MySQL\""
24
	[ ":${WITH_PGSQL}"	= ':yes' ] && OPTIONS="${OPTIONS} \"PostgreSQL\""
23
	[ ":${WITH_PGSQL}"	= ':yes' ] && OPTIONS="${OPTIONS} \"PostgreSQL\""
25
	[ ":${WITH_VPOPMAIL}"	= ':yes' ] && OPTIONS="${OPTIONS} \"VPopMail\""
24
	[ ":${WITH_VPOPMAIL}"	= ':yes' ] && OPTIONS="${OPTIONS} \"VPopMail\""
26
	[ ":${WITH_PROCMAIL}"	= ':yes' ] && OPTIONS="${OPTIONS} \"Procmail\""
25
	[ ":${WITH_PROCMAIL}"	= ':yes' ] && OPTIONS="${OPTIONS} \"Procmail\""
27
	[ ":${WITH_SENDFAX}"	= ':yes' ] && OPTIONS="${OPTIONS} \"SendFax\""
26
	[ ":${WITH_SENDFAX}"	= ':yes' ] && OPTIONS="${OPTIONS} \"SendFax\""
27
	[ ":${WITH_UUCP}"	= ':yes' ] && OPTIONS="${OPTIONS} \"UUCP\""
28
	[ ":${WITH_IPV6}"	= ':yes' ] && OPTIONS="${OPTIONS} \"IPv6\""
28
	[ ":${WITH_IPV6}"	= ':yes' ] && OPTIONS="${OPTIONS} \"IPv6\""
29
	[ -n "${OPTIONS}" ] && set ${OPTIONS}
29
	[ -n "${OPTIONS}" ] && set ${OPTIONS}
30
else
30
else
Lines 55-75 Link Here
55
	else
55
	else
56
		SET_ISPELL="OFF"
56
		SET_ISPELL="OFF"
57
	fi
57
	fi
58
	if [ ":${WITH_LDAP1}" = ':yes' \
58
	if [ ":${WITH_LDAP}" = ':yes' \
59
	  -o -f ${LOCALBASE}/lib/libldap.so.1 \
60
	  -a -f ${LOCALBASE}/lib/liblber.so.1 ]; then
61
		SET_LDAP1="ON"
62
		SET_LDAP2="OFF"
63
	else
64
		SET_LDAP1="OFF"
65
	fi
66
	if [ ":${WITH_LDAP2}" = ':yes' \
67
	  -o -f ${LOCALBASE}/lib/libldap.so.2 \
59
	  -o -f ${LOCALBASE}/lib/libldap.so.2 \
68
	  -a -f ${LOCALBASE}/lib/liblber.so.2 ]; then
60
	  -a -f ${LOCALBASE}/lib/liblber.so.2 ]; then
69
		SET_LDAP1="OFF"
61
		SET_LDAP="ON"
70
		SET_LDAP2="ON"
71
	else
62
	else
72
		SET_LDAP2="OFF"
63
		SET_LDAP="OFF"
73
	fi
64
	fi
74
	if [ ":${WITH_MYSQL}" = ':yes' \
65
	if [ ":${WITH_MYSQL}" = ':yes' \
75
	  -o -f ${LOCALBASE}/lib/mysql/libmysqlclient.so.12 ]; then
66
	  -o -f ${LOCALBASE}/lib/mysql/libmysqlclient.so.12 ]; then
Lines 97-103 Link Here
97
		SET_PROCMAIL="OFF"
88
		SET_PROCMAIL="OFF"
98
	fi
89
	fi
99
	if [ ":${WITH_SENDFAX}" = ':yes' \
90
	if [ ":${WITH_SENDFAX}" = ':yes' \
100
	  -o -x ${LOCALBASE}/bin/pnmscale \
91
	  -o -x ${LOCALBASE}/sbin/sendfax \
92
	  -a -x ${LOCALBASE}/bin/pnmscale \
101
	  -a -x ${LOCALBASE}/bin/giftopnm \
93
	  -a -x ${LOCALBASE}/bin/giftopnm \
102
	  -a -x ${LOCALBASE}/bin/jpegtopnm \
94
	  -a -x ${LOCALBASE}/bin/jpegtopnm \
103
	  -a -x ${LOCALBASE}/bin/ppmtopgm \
95
	  -a -x ${LOCALBASE}/bin/ppmtopgm \
Lines 111-116 Link Here
111
	else
103
	else
112
		SET_SENDFAX="OFF"
104
		SET_SENDFAX="OFF"
113
	fi
105
	fi
106
	if [ ":${WITH_UUCP}" = ':yes' \
107
	  -o -x ${LOCALBASE}/bin/uux \
108
	  -o -x /usr/bin/uux ]; then
109
		SET_UUCP="ON"
110
	else
111
		SET_UUCP="OFF"
112
	fi
114
	if [ ":${WITH_IPV6}" = ':yes' ]; then
113
	if [ ":${WITH_IPV6}" = ':yes' ]; then
115
		SET_IPV6="ON"
114
		SET_IPV6="ON"
116
	else
115
	else
Lines 124-137 Link Here
124
GnuPG		"GNU Privacy Guard support for WebMail" ${SET_GNUPG} \
123
GnuPG		"GNU Privacy Guard support for WebMail" ${SET_GNUPG} \
125
ASpell		"ASpell support for WebMail" ${SET_ASPELL} \
124
ASpell		"ASpell support for WebMail" ${SET_ASPELL} \
126
ISpell		"ISpell support for WebMail" ${SET_ISPELL} \
125
ISpell		"ISpell support for WebMail" ${SET_ISPELL} \
127
OpenLDAP1	"OpenLDAP 1.x authentication support" ${SET_LDAP1} \
126
OpenLDAP	"OpenLDAP 2.x authentication support" ${SET_LDAP} \
128
OpenLDAP2	"OpenLDAP 2.x authentication support" ${SET_LDAP2} \
129
MySQL		"MySQL authentication support" ${SET_MYSQL} \
127
MySQL		"MySQL authentication support" ${SET_MYSQL} \
130
PostgreSQL	"PostgreSQL authentication support" ${SET_PGSQL} \
128
PostgreSQL	"PostgreSQL authentication support" ${SET_PGSQL} \
131
VPopMail	"VPopMail authentication support" ${SET_VPOPMAIL} \
129
VPopMail	"VPopMail authentication support" ${SET_VPOPMAIL} \
132
Procmail	"Procmail local delivery support" ${SET_PROCMAIL} \
130
Procmail	"Procmail local delivery support" ${SET_PROCMAIL} \
133
SendFax		"mgetty+sendfax support" ${SET_SENDFAX} \
131
SendFax		"mgetty+sendfax support" ${SET_SENDFAX} \
134
IPv6		"IPv6 support (experimental)" ${SET_IPV6} \
132
UUCP		"UUCP support" ${SET_UUCP} \
133
IPv6		"IPv6 support" ${SET_IPV6} \
135
2> ${tempfile}
134
2> ${tempfile}
136
135
137
	retval=$?
136
	retval=$?
Lines 150-155 Link Here
150
149
151
echo "PREFIX=	${PREFIX}"
150
echo "PREFIX=	${PREFIX}"
152
151
152
WITH_TRANSPORT="local esmtp dsn"
153
WITH_EXPECT="--disable-changepass"
153
WITH_ISPELL="--without-ispell"
154
WITH_ISPELL="--without-ispell"
154
WITH_LDAP="--without-authldap"
155
WITH_LDAP="--without-authldap"
155
WITH_MYSQL="--without-authmysql"
156
WITH_MYSQL="--without-authmysql"
Lines 157-171 Link Here
157
WITH_VCHKPW="--without-authvchkpw"
158
WITH_VCHKPW="--without-authvchkpw"
158
WITH_IPV6="--without-ipv6"
159
WITH_IPV6="--without-ipv6"
159
160
161
SUB_EXPECT="@comment "
160
SUB_FAX="@comment "
162
SUB_FAX="@comment "
161
SUB_LDAP="@comment "
163
SUB_LDAP="@comment "
162
SUB_MYSQL="@comment "
164
SUB_MYSQL="@comment "
163
SUB_PGSQL="@comment "
165
SUB_PGSQL="@comment "
166
SUB_UUCP="@comment "
164
167
165
while [ "$1" ]; do
168
while [ "$1" ]; do
166
	case $1 in
169
	case $1 in
167
		\"Expect\")
170
		\"Expect\")
168
			echo "BUILD_DEPENDS+=	expect:\${PORTSDIR}/lang/expect"
171
			echo "BUILD_DEPENDS+=	expect:\${PORTSDIR}/lang/expect"
172
			WITH_EXPECT=""
173
			SUB_EXPECT=""
169
			;;
174
			;;
170
		\"GnuPG\")
175
		\"GnuPG\")
171
			echo "BUILD_DEPENDS+=	gpg:\${PORTSDIR}/security/gnupg"
176
			echo "BUILD_DEPENDS+=	gpg:\${PORTSDIR}/security/gnupg"
Lines 190-222 Link Here
190
			WITH_ISPELL="--with-ispell=\${LOCALBASE}/bin/ispell"
195
			WITH_ISPELL="--with-ispell=\${LOCALBASE}/bin/ispell"
191
			ISPELL=1
196
			ISPELL=1
192
			;;
197
			;;
193
		\"OpenLDAP1\")
198
		\"OpenLDAP\")
194
			if [ "$OPENLDAP2" ]; then
199
			echo "USE_OPENLDAP=	yes"
195
				echo "OpenLDAP1 and OpenLDAP2 are mutually exclusive." > /dev/stderr
196
				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
197
				exit 1
198
			fi
199
			echo "LIB_DEPENDS+=	ldap.1:\${PORTSDIR}/net/openldap12"
200
			CPPFLAGS="${CPPFLAGS} -I\${LOCALBASE}/include"
201
			LDFLAGS="${LDFLAGS} -L\${LOCALBASE}/lib"
202
			WITH_LDAP="--with-authldap"
203
			PKGNAMESUFFIX="${PKGNAMESUFFIX}-ldap"
204
			SUB_LDAP=""
205
			OPENLDAP1=1
206
			;;
207
		\"OpenLDAP2\")
208
			if [ "$OPENLDAP1" ]; then
209
				echo "OpenLDAP1 and OpenLDAP2 are mutually exclusive." > /dev/stderr
210
				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
211
				exit 1
212
			fi
213
			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap21-client"
214
			CPPFLAGS="${CPPFLAGS} -I\${LOCALBASE}/include"
215
			LDFLAGS="${LDFLAGS} -L\${LOCALBASE}/lib"
216
			WITH_LDAP="--with-authldap"
200
			WITH_LDAP="--with-authldap"
217
			PKGNAMESUFFIX="${PKGNAMESUFFIX}-ldap"
201
			PKGNAMESUFFIX="${PKGNAMESUFFIX}-ldap"
218
			SUB_LDAP=""
202
			SUB_LDAP=""
219
			OPENLDAP2=1
220
			;;
203
			;;
221
		\"MySQL\")
204
		\"MySQL\")
222
			if [ -f ${LOCALBASE}/vpopmail/lib/libvpopmail.a ]; then
205
			if [ -f ${LOCALBASE}/vpopmail/lib/libvpopmail.a ]; then
Lines 225-231 Link Here
225
				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
208
				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
226
				exit 1
209
				exit 1
227
			else
210
			else
228
				echo "USE_MYSQL=	YES"
211
				echo "USE_MYSQL=	yes"
229
				WITH_MYSQL="--with-authmysql"
212
				WITH_MYSQL="--with-authmysql"
230
				WITH_MYSQL="${WITH_MYSQL} --with-mysql-libs=\${LOCALBASE}/lib/mysql"
213
				WITH_MYSQL="${WITH_MYSQL} --with-mysql-libs=\${LOCALBASE}/lib/mysql"
231
				WITH_MYSQL="${WITH_MYSQL} --with-mysql-includes=\${LOCALBASE}/include/mysql"
214
				WITH_MYSQL="${WITH_MYSQL} --with-mysql-includes=\${LOCALBASE}/include/mysql"
Lines 251-262 Link Here
251
			echo "BUILD_DEPENDS+=	procmail:\${PORTSDIR}/mail/procmail"
234
			echo "BUILD_DEPENDS+=	procmail:\${PORTSDIR}/mail/procmail"
252
			;;
235
			;;
253
		\"SendFax\")
236
		\"SendFax\")
254
			if [ "x${WITH_GHOSTSCRIPT_AFPL}" = "xyes" ]
237
			echo "BUILD_DEPENDS+=	sendfax:\${PORTSDIR}/comms/mgetty+sendfax"
255
			then
256
				echo "BUILD_DEPENDS+=	gs:\${PORTSDIR}/print/ghostscript-afpl"
257
			else
258
				echo "BUILD_DEPENDS+=	gs:\${PORTSDIR}/print/ghostscript-gnu"
259
			fi
260
			echo "BUILD_DEPENDS+=	pnmscale:\${PORTSDIR}/graphics/netpbm"
238
			echo "BUILD_DEPENDS+=	pnmscale:\${PORTSDIR}/graphics/netpbm"
261
			echo "BUILD_DEPENDS+=	giftopnm:\${PORTSDIR}/graphics/netpbm"
239
			echo "BUILD_DEPENDS+=	giftopnm:\${PORTSDIR}/graphics/netpbm"
262
			echo "BUILD_DEPENDS+=	jpegtopnm:\${PORTSDIR}/graphics/netpbm"
240
			echo "BUILD_DEPENDS+=	jpegtopnm:\${PORTSDIR}/graphics/netpbm"
Lines 266-272 Link Here
266
			echo "BUILD_DEPENDS+=	g3topbm:\${PORTSDIR}/graphics/netpbm"
244
			echo "BUILD_DEPENDS+=	g3topbm:\${PORTSDIR}/graphics/netpbm"
267
			echo "BUILD_DEPENDS+=	pngtopnm:\${PORTSDIR}/graphics/netpbm"
245
			echo "BUILD_DEPENDS+=	pngtopnm:\${PORTSDIR}/graphics/netpbm"
268
			echo "BUILD_DEPENDS+=	pnmtopng:\${PORTSDIR}/graphics/netpbm"
246
			echo "BUILD_DEPENDS+=	pnmtopng:\${PORTSDIR}/graphics/netpbm"
269
			echo "RUN_DEPENDS+=	gs:\${PORTSDIR}/print/ghostscript-gnu"
247
			echo "BUILD_DEPENDS+=	gs:\${PORTSDIR}/\${GSPORT}"
248
			echo "RUN_DEPENDS+=	sendfax:\${PORTSDIR}/comms/mgetty+sendfax"
270
			echo "RUN_DEPENDS+=	pnmscale:\${PORTSDIR}/graphics/netpbm"
249
			echo "RUN_DEPENDS+=	pnmscale:\${PORTSDIR}/graphics/netpbm"
271
			echo "RUN_DEPENDS+=	giftopnm:\${PORTSDIR}/graphics/netpbm"
250
			echo "RUN_DEPENDS+=	giftopnm:\${PORTSDIR}/graphics/netpbm"
272
			echo "RUN_DEPENDS+=	jpegtopnm:\${PORTSDIR}/graphics/netpbm"
251
			echo "RUN_DEPENDS+=	jpegtopnm:\${PORTSDIR}/graphics/netpbm"
Lines 276-285 Link Here
276
			echo "RUN_DEPENDS+=	g3topbm:\${PORTSDIR}/graphics/netpbm"
255
			echo "RUN_DEPENDS+=	g3topbm:\${PORTSDIR}/graphics/netpbm"
277
			echo "RUN_DEPENDS+=	pngtopnm:\${PORTSDIR}/graphics/netpbm"
256
			echo "RUN_DEPENDS+=	pngtopnm:\${PORTSDIR}/graphics/netpbm"
278
			echo "RUN_DEPENDS+=	pnmtopng:\${PORTSDIR}/graphics/netpbm"
257
			echo "RUN_DEPENDS+=	pnmtopng:\${PORTSDIR}/graphics/netpbm"
279
			echo "WITH_FAX=		yes"
258
			echo "RUN_DEPENDS+=	gs:\${PORTSDIR}/\${GSPORT}"
259
			echo "WITH_FAX=	yes"
280
			WITH_TRANSPORT="${WITH_TRANSPORT} fax"
260
			WITH_TRANSPORT="${WITH_TRANSPORT} fax"
281
			SUB_FAX=""
261
			SUB_FAX=""
282
			;;
262
			;;
263
		\"UUCP\")
264
			if [ ! -x /usr/bin/uux ]; then
265
				echo "BUILD_DEPENDS+=	uux:\${PORTSDIR}/net/freebsd-uucp"
266
				echo "RUN_DEPENDS+=	uux:\${PORTSDIR}/net/freebsd-uucp"
267
			fi
268
			WITH_TRANSPORT="${WITH_TRANSPORT} uucp"
269
			SUB_UUCP=""
270
			;;
283
		\"IPv6\")
271
		\"IPv6\")
284
			WITH_IPV6=""
272
			WITH_IPV6=""
285
			;;
273
			;;
Lines 292-311 Link Here
292
	shift
280
	shift
293
done
281
done
294
282
295
[ -n "${CPPFLAGS}" ]	&& echo "CONFIGURE_ENV+=	CPPFLAGS='${CPPFLAGS}'"
283
echo "CONFIGURE_ARGS+=${WITH_EXPECT}"
296
[ -n "${LDFLAGS}" ]	&& echo "CONFIGURE_ENV+=	LDFLAGS='${LDFLAGS}'"
284
echo "CONFIGURE_ARGS+=${WITH_ISPELL}"
297
[ -n "${LIBS}" ]	&& echo "CONFIGURE_ENV+=	LIBS='${LIBS}'"
285
echo "CONFIGURE_ARGS+=${WITH_LDAP}"
298
echo "CONFIGURE_ARGS+= ${WITH_ISPELL}"
286
echo "CONFIGURE_ARGS+=${WITH_MYSQL}"
299
echo "CONFIGURE_ARGS+= ${WITH_LDAP}"
287
echo "CONFIGURE_ARGS+=${WITH_PGSQL}"
300
echo "CONFIGURE_ARGS+= ${WITH_MYSQL}"
288
echo "CONFIGURE_ARGS+=${WITH_VCHKPW}"
301
echo "CONFIGURE_ARGS+= ${WITH_PGSQL}"
289
echo "CONFIGURE_ARGS+=${WITH_IPV6}"
302
echo "CONFIGURE_ARGS+= ${WITH_VCHKPW}"
290
echo "CONFIGURE_ARGS+=--with-transport='${WITH_TRANSPORT}'"
303
echo "CONFIGURE_ARGS+= ${WITH_IPV6}"
291
echo "PLIST_SUB+=	SUB_EXPECT='${SUB_EXPECT}'"
304
echo "CONFIGURE_ARGS+= --with-transport='${WITH_TRANSPORT}'"
305
echo "PLIST_SUB+=	SUB_FAX='${SUB_FAX}'"
292
echo "PLIST_SUB+=	SUB_FAX='${SUB_FAX}'"
306
echo "PLIST_SUB+=	SUB_LDAP='${SUB_LDAP}'"
293
echo "PLIST_SUB+=	SUB_LDAP='${SUB_LDAP}'"
307
echo "PLIST_SUB+=	SUB_MYSQL='${SUB_MYSQL}'"
294
echo "PLIST_SUB+=	SUB_MYSQL='${SUB_MYSQL}'"
308
echo "PLIST_SUB+=	SUB_PGSQL='${SUB_PGSQL}'"
295
echo "PLIST_SUB+=	SUB_PGSQL='${SUB_PGSQL}'"
296
echo "PLIST_SUB+=	SUB_UUCP='${SUB_UUCP}'"
309
[ -n "${PKGNAMESUFFIX}" ] && echo "PKGNAMESUFFIX=	${PKGNAMESUFFIX}"
297
[ -n "${PKGNAMESUFFIX}" ] && echo "PKGNAMESUFFIX=	${PKGNAMESUFFIX}"
310
298
311
exit 0
299
exit 0

Return to bug 61112