View | Details | Raw Unified | Return to bug 76830 | Differences between
and this patch

Collapse All | Expand All

(-)postfix-current/Makefile (-20 / +16 lines)
Lines 7-13 Link Here
7
7
8
# To pre-select options in batch mode, run make like this:
8
# To pre-select options in batch mode, run make like this:
9
#
9
#
10
#  make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS"
10
#  make -DBATCH POSTFIX_OPTIONS="DB3 TLS"
11
#
11
#
12
# the options are the same names as in the scripts/configure.postfix file.
12
# the options are the same names as in the scripts/configure.postfix file.
13
# POSTFIX_OPTIONS can be set in /etc/make.conf also.
13
# POSTFIX_OPTIONS can be set in /etc/make.conf also.
Lines 15-21 Link Here
15
# NOTE: PCRE is enabled by default unless you specifically disable it.
15
# NOTE: PCRE is enabled by default unless you specifically disable it.
16
16
17
PORTNAME=	postfix
17
PORTNAME=	postfix
18
PORTVERSIONRAW=	2.2-20041030
18
PORTVERSIONRAW=	2.2-20050119
19
PORTVERSION=	${PORTVERSIONRAW:S/-/./}
19
PORTVERSION=	${PORTVERSIONRAW:S/-/./}
20
PORTEPOCH=	2
20
PORTEPOCH=	2
21
CATEGORIES=	mail ipv6
21
CATEGORIES=	mail ipv6
Lines 50-60 Link Here
50
MAN8=	anvil.8 bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
50
MAN8=	anvil.8 bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
51
	master.8 oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \
51
	master.8 oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \
52
	smtp.8 smtpd.8 spawn.8 trace.8 trivial-rewrite.8 verify.8 virtual.8 \
52
	smtp.8 smtpd.8 spawn.8 trace.8 trivial-rewrite.8 verify.8 virtual.8 \
53
	scache.8 discard.8
53
	scache.8 discard.8 tlsmgr.8
54
55
# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to
56
# patch it.
57
MAN8base=$(MAN8:S/tlsmgr.8//)
58
54
59
CONF1=	main.cf master.cf access aliases canonical header_checks relocated \
55
CONF1=	main.cf master.cf access aliases canonical header_checks relocated \
60
	transport virtual
56
	transport virtual
Lines 70-76 Link Here
70
	SASL_README SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \
66
	SASL_README SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \
71
	SMTPD_PROXY_README STANDARD_CONFIGURATION_README TUNING_README \
67
	SMTPD_PROXY_README STANDARD_CONFIGURATION_README TUNING_README \
72
	ULTRIX_README UUCP_README VERP_README VIRTUAL_README \
68
	ULTRIX_README UUCP_README VERP_README VIRTUAL_README \
73
	XCLIENT_README XFORWARD_README
69
	XCLIENT_README XFORWARD_README IPV6_README TLS_README
74
70
75
.if !defined(DEBUG)
71
.if !defined(DEBUG)
76
MAKEFILEFLAGS+=	DEBUG=
72
MAKEFILEFLAGS+=	DEBUG=
Lines 138-155 Link Here
138
134
139
do-install:
135
do-install:
140
	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
136
	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
141
	 config_directory=${PREFIX}/etc/postfix \
137
	config_directory=${PREFIX}/etc/postfix \
142
	 daemon_directory=${PREFIX}/libexec/postfix \
138
	daemon_directory=${PREFIX}/libexec/postfix \
143
	 command_directory=${PREFIX}/sbin \
139
	command_directory=${PREFIX}/sbin \
144
	 queue_directory=/var/spool/postfix \
140
	queue_directory=/var/spool/postfix \
145
	 sendmail_path=${PREFIX}/sbin/sendmail \
141
	sendmail_path=${PREFIX}/sbin/sendmail \
146
	 newaliases_path=${PREFIX}/bin/newaliases \
142
	newaliases_path=${PREFIX}/bin/newaliases \
147
	 mailq_path=${PREFIX}/bin/mailq \
143
	mailq_path=${PREFIX}/bin/mailq \
148
	 mail_owner=postfix \
144
	mail_owner=postfix \
149
	 setgid_group=maildrop \
145
	setgid_group=maildrop \
150
	 manpage_directory=${PREFIX}/man \
146
	manpage_directory=${PREFIX}/man \
151
	 sample_directory=${PREFIX}/etc/postfix \
147
	sample_directory=${PREFIX}/etc/postfix \
152
	 readme_directory=${READMEDIR}
148
	readme_directory=${READMEDIR}
153
149
154
.for f in ${CONF1}
150
.for f in ${CONF1}
155
	${INSTALL_DATA} ${WRKSRC}/conf/${f} \
151
	${INSTALL_DATA} ${WRKSRC}/conf/${f} \
(-)postfix-current/distinfo (-4 / +2 lines)
Lines 1-4 Link Here
1
MD5 (postfix/postfix-2.2-20041030.tar.gz) = f179f5d50d387d2eb82351bdb03dac9e
1
MD5 (postfix/postfix-2.2-20050119.tar.gz) = 63861b2e09f17a7acfe84dbf6623c2d3
2
SIZE (postfix/postfix-2.2-20041030.tar.gz) = 2106328
2
SIZE (postfix/postfix-2.2-20050119.tar.gz) = 2354298
3
MD5 (postfix/pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz) = 2f5df0781abd0390611158b4a5fb63c4
4
SIZE (postfix/pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz) = 239159
(-)postfix-current/files/patch-freebsd6 (-23 lines)
Lines 9-34 Link Here
9
   OpenBSD.2*)	SYSTYPE=OPENBSD2
9
   OpenBSD.2*)	SYSTYPE=OPENBSD2
10
 		;;
10
 		;;
11
   OpenBSD.3*)	SYSTYPE=OPENBSD3
11
   OpenBSD.3*)	SYSTYPE=OPENBSD3
12
--- makedefs.snapshot_orig	Wed Apr 14 14:18:06 2004
13
+++ makedefs.snapshot	Fri Aug 20 15:08:54 2004
14
@@ -93,6 +93,8 @@
15
 		;;
16
   FreeBSD.5*)	SYSTYPE=FREEBSD5
17
 		;;
18
+  FreeBSD.6*)	SYSTYPE=FREEBSD5
19
+		;;
20
   OpenBSD.2*)	SYSTYPE=OPENBSD2
21
 		;;
22
   OpenBSD.3*)	SYSTYPE=OPENBSD3
23
===cut-here===
24
--- makedefs.stable_orig	Wed Apr 14 13:59:43 2004
25
+++ makedefs.stable	Fri Aug 20 15:10:13 2004
26
@@ -93,6 +93,8 @@
27
 		;;
28
   FreeBSD.5*)	SYSTYPE=FREEBSD5
29
 		;;
30
+  FreeBSD.6*)	SYSTYPE=FREEBSD5
31
+		;;
32
   OpenBSD.2*)	SYSTYPE=OPENBSD2
33
 		;;
34
   OpenBSD.3*)	SYSTYPE=OPENBSD3
(-)postfix-current/pkg-plist (-2 / +8 lines)
Lines 8-13 Link Here
8
@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist-transport; then rm -f %D/etc/postfix/transport; fi
8
@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist-transport; then rm -f %D/etc/postfix/transport; fi
9
@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist-virtual; then rm -f %D/etc/postfix/virtual; fi
9
@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist-virtual; then rm -f %D/etc/postfix/virtual; fi
10
etc/postfix/LICENSE
10
etc/postfix/LICENSE
11
etc/postfix/TLS_LICENSE
11
etc/postfix/main.cf.default
12
etc/postfix/main.cf.default
12
etc/postfix/makedefs.out
13
etc/postfix/makedefs.out
13
etc/postfix/post-install
14
etc/postfix/post-install
Lines 46-52 Link Here
46
libexec/postfix/trivial-rewrite
47
libexec/postfix/trivial-rewrite
47
libexec/postfix/verify
48
libexec/postfix/verify
48
libexec/postfix/virtual
49
libexec/postfix/virtual
49
%%SUB_TLS%%libexec/postfix/tlsmgr
50
libexec/postfix/tlsmgr
50
sbin/postalias
51
sbin/postalias
51
sbin/postcat
52
sbin/postcat
52
sbin/postconf
53
sbin/postconf
Lines 93-99 Link Here
93
%%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html
94
%%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html
94
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
95
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
95
%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
96
%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
96
%%PORTDOCS%%%%SUB_IPV6%%%%DOCSDIR%%/IPV6_README
97
%%PORTDOCS%%%%DOCSDIR%%/IPV6_README
98
%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html
99
%%PORTDOCS%%%%DOCSDIR%%/CDB_README.html
100
%%PORTDOCS%%%%DOCSDIR%%/TLS_README
101
%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html
97
%%PORTDOCS%%%%DOCSDIR%%/LDAP_README
102
%%PORTDOCS%%%%DOCSDIR%%/LDAP_README
98
%%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
103
%%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
99
%%PORTDOCS%%%%DOCSDIR%%/LINUX_README
104
%%PORTDOCS%%%%DOCSDIR%%/LINUX_README
Lines 215-220 Link Here
215
%%PORTDOCS%%%%DOCSDIR%%/verify.8.html
220
%%PORTDOCS%%%%DOCSDIR%%/verify.8.html
216
%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
221
%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
217
%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
222
%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
223
%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html
218
%%PORTDOCS%%@dirrm %%DOCSDIR%%
224
%%PORTDOCS%%@dirrm %%DOCSDIR%%
219
@dirrm libexec/postfix
225
@dirrm libexec/postfix
220
@unexec rmdir %D/etc/postfix  2>/dev/null || true
226
@unexec rmdir %D/etc/postfix  2>/dev/null || true
(-)postfix-current/scripts/configure.postfix (-45 / +7 lines)
Lines 23-31 Link Here
23
SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
23
SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
24
SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
24
SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
25
SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
25
SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
26
TLS		"SSL and TLS (BROKEN)" "$status_TLS" \
26
SASLKRB5	"If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \
27
IPv6		"IPv6 support (BROKEN)" "$status_IPv6" \
27
TLS		"SSL and TLS" "$status_TLS" \
28
IPv6TLS		"IPv6 support with SSL and TLS (BROKEN)" "$status_IPv6TLS" \
29
DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
28
DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
30
DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
29
DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
31
DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
30
DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
Lines 62-70 Link Here
62
61
63
echo "PREFIX=	${PREFIX}"
62
echo "PREFIX=	${PREFIX}"
64
63
65
SUB_TLS="@comment "
66
SUB_TEST="@comment "
64
SUB_TEST="@comment "
67
SUB_IPV6="@comment "
68
65
69
while [ "$1" ]; do
66
while [ "$1" ]; do
70
	case $1 in
67
	case $1 in
Lines 104-119 Link Here
104
		SASLKRB)
101
		SASLKRB)
105
                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
102
                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
106
			;;
103
			;;
104
		SASLKRB5)
105
			echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken"
106
			;;
107
		TLS)
107
		TLS)
108
			echo "MAN8+=		tlsmgr.8"
109
			echo "USE_OPENSSL=	yes"
108
			echo "USE_OPENSSL=	yes"
110
			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
109
			echo "POSTFIX_CCARGS+=	-DUSE_TLS -I\${OPENSSLINC}"
111
			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
110
			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
112
			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz"
113
			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.19-2.2-20040919-0.9.7d/pfixtls.diff"
114
			echo "PATCH_STRIP=	-p1"
115
			echo "TLS_SUFFIX=	+tls"
111
			echo "TLS_SUFFIX=	+tls"
116
			SUB_TLS=""
117
			;;
112
			;;
118
		DB3)
113
		DB3)
119
			if [ "X$BDB_SELECTED" != "X" ]; then
114
			if [ "X$BDB_SELECTED" != "X" ]; then
Lines 205-241 Link Here
205
#			echo "MAN1+=		smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1"
200
#			echo "MAN1+=		smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1"
206
			SUB_TEST=""
201
			SUB_TEST=""
207
			;;
202
			;;
208
		IPv6)
209
			if [ X$SUB_TLS = "X" ]; then
210
				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
211
				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
212
				exit 1
213
			fi
214
			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
215
			echo "PATCHFILES+=	ipv6-1.25-pf-2.2-20040616.patch.gz"
216
			echo "PATCH_DIST_STRIP=	-p1"
217
			echo "IPv6_SUFFIX=	+ipv6"
218
			echo ""
219
			IPv6SELECTED=YES
220
			SUB_IPV6=""
221
			;;
222
		IPv6TLS)
223
			if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then
224
				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
225
				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
226
				exit 1
227
			fi
228
			echo "MAN8+=		tlsmgr.8"
229
			echo "USE_OPENSSL=	yes"
230
			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
231
			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
232
			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
233
			echo "PATCHFILES+=	tls+ipv6-1.25-pf-2.2-20040616.patch.gz"
234
			echo "PATCH_DIST_STRIP=	-p1"
235
			echo "TLS_SUFFIX=	+tls+ipv6"
236
			SUB_TLS=""
237
			SUB_IPV6=""
238
			;;
239
		*)
203
		*)
240
			echo "Unknown option(s): $*" > /dev/stderr
204
			echo "Unknown option(s): $*" > /dev/stderr
241
			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
205
			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
Lines 245-256 Link Here
245
	shift
209
	shift
246
done
210
done
247
211
248
echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
249
echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
212
echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
250
echo "PLIST_SUB+=	SUB_IPV6=\"${SUB_IPV6}\""
251
213
252
# for some reason, if we alter the pkg name this way, the first build (where
214
# for some reason, if we alter the pkg name this way, the first build (where
253
# we ask the configure questions) doesn't pick up the extensions, but
215
# we ask the configure questions) doesn't pick up the extensions, but
254
# any subsequent build will.  so "make; make install" will build twice.
216
# any subsequent build will.  so "make; make install" will build twice.
255
# don't do this for now.
217
# don't do this for now.
256
#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}\${NIS_SUFFIX}"
218
#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}"

Return to bug 76830