Attachment #45872 for bug #70595

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

Lines 6-8 Link Here

(-)postfix.new/distinfo (+2 lines)
6	SIZE (postfix/ipv6-1.25-pf-2.1.3.patch.gz) = 79473	6	SIZE (postfix/ipv6-1.25-pf-2.1.3.patch.gz) = 79473
7	MD5 (postfix/tls+ipv6-1.25-pf-2.1.3.patch.gz) = 71181d8dcf26c24e6fe373ad1ac7e741	7	MD5 (postfix/tls+ipv6-1.25-pf-2.1.3.patch.gz) = 71181d8dcf26c24e6fe373ad1ac7e741
8	SIZE (postfix/tls+ipv6-1.25-pf-2.1.3.patch.gz) = 256591	8	SIZE (postfix/tls+ipv6-1.25-pf-2.1.3.patch.gz) = 256591
		9	MD5 (postfix/postfix-libspf2-2.1.3-4.patch) = 0312a568fdf96861dbd6ac206b395630
		10	SIZE (postfix/postfix-libspf2-2.1.3-4.patch) = 25713

Lines 130-135 Link Here

(-)postfix.new/pkg-plist (+1 lines)
130	%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README.html	130	%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README.html
131	%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README	131	%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README
132	%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README.html	132	%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README.html
		133	%%PORTDOCS%%%%SUB_SPF%%%%DOCSDIR%%/SPF_README
133	%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README	134	%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README
134	%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README.html	135	%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README.html
135	%%PORTDOCS%%%%DOCSDIR%%/TUNING_README	136	%%PORTDOCS%%%%DOCSDIR%%/TUNING_README




SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
SASLKRB5	"If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \
SPF		"SPF support" "$status_SPF" \
TLS		"SSL and TLS" "$status_TLS" \
IPv6		"IPv6 support" "$status_IPv6" \
IPv6TLS		"IPv6 support with SSL and TLS" "$status_IPv6TLS" \

SUB_TLS="@comment "
SUB_TEST="@comment "
SUB_IPV6="@comment "
SUB_SPF="@comment "

while [ "$1" ]; do
	case $1 in

#			echo "MAN1+=		smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1"
			SUB_TEST=""
			;;
		SPF)
			# see http://www.ipnet6.org/postfix/spf/
			echo "LIB_DEPENDS+=	spf2.1:\${PORTSDIR}/mail/libspf2"
			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/spf/p4/"
			echo "PATCHFILES+=	postfix-libspf2-2.1.3-4.patch"
			echo "PATCH_DIST_STRIP=	-p1"
			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include"
			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lspf2"
			echo "SPF_SUFFIX=	+spf"
##			echo "README+=	SPF_README"
			echo ""
			SUB_SPF=""
			;;
		IPv6)
			if [ X$SUB_TLS = "X" ]; then
				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr

echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
echo "PLIST_SUB+=	SUB_IPV6=\"${SUB_IPV6}\""
echo "PLIST_SUB+=	SUB_SPF=\"${SUB_SPF}\""

# for some reason, if we alter the pkg name this way, the first build (where
# we ask the configure questions) doesn't pick up the extensions, but
# any subsequent build will.  so "make; make install" will build twice.
# don't do this for now.
#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}\${SPF_SUFFIX}"

Return to bug 70595

Lines 24-29 Link Here

(-)postfix.new/scripts/configure.postfix (-1 / +17 lines)
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	SASLKRB5 "If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \	26	SASLKRB5 "If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \
		27	SPF "SPF support" "$status_SPF" \
27	TLS "SSL and TLS" "$status_TLS" \	28	TLS "SSL and TLS" "$status_TLS" \
28	IPv6 "IPv6 support" "$status_IPv6" \	29	IPv6 "IPv6 support" "$status_IPv6" \
29	IPv6TLS "IPv6 support with SSL and TLS" "$status_IPv6TLS" \	30	IPv6TLS "IPv6 support with SSL and TLS" "$status_IPv6TLS" \
Lines 65-70 Link Here
65	SUB_TLS="@comment "	66	SUB_TLS="@comment "
66	SUB_TEST="@comment "	67	SUB_TEST="@comment "
67	SUB_IPV6="@comment "	68	SUB_IPV6="@comment "
		69	SUB_SPF="@comment "
68		70
69	while [ "$1" ]; do	71	while [ "$1" ]; do
70	case $1 in	72	case $1 in
Lines 204-209 Link Here
204	# echo "MAN1+= smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1"	206	# echo "MAN1+= smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1"
205	SUB_TEST=""	207	SUB_TEST=""
206	;;	208	;;
		209	SPF)
		210	# see http://www.ipnet6.org/postfix/spf/
		211	echo "LIB_DEPENDS+= spf2.1:\${PORTSDIR}/mail/libspf2"
		212	echo "PATCH_SITES+= ftp://ftp.stack.nl/pub/postfix/spf/p4/"
		213	echo "PATCHFILES+= postfix-libspf2-2.1.3-4.patch"
		214	echo "PATCH_DIST_STRIP= -p1"
		215	echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include"
		216	echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lspf2"
		217	echo "SPF_SUFFIX= +spf"
		218	## echo "README+= SPF_README"
		219	echo ""
		220	SUB_SPF=""
		221	;;
207	IPv6)	222	IPv6)
208	if [ X$SUB_TLS = "X" ]; then	223	if [ X$SUB_TLS = "X" ]; then
209	/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr	224	/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
Lines 247-255 Link Here
247	echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\""	262	echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\""
248	echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\""	263	echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\""
249	echo "PLIST_SUB+= SUB_IPV6=\"${SUB_IPV6}\""	264	echo "PLIST_SUB+= SUB_IPV6=\"${SUB_IPV6}\""
		265	echo "PLIST_SUB+= SUB_SPF=\"${SUB_SPF}\""
250		266
251	# for some reason, if we alter the pkg name this way, the first build (where	267	# for some reason, if we alter the pkg name this way, the first build (where
252	# we ask the configure questions) doesn't pick up the extensions, but	268	# we ask the configure questions) doesn't pick up the extensions, but
253	# any subsequent build will. so "make; make install" will build twice.	269	# any subsequent build will. so "make; make install" will build twice.
254	# don't do this for now.	270	# don't do this for now.
255	#echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}"	271	#echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}\${SPF_SUFFIX}"