Attachment 50425 Details for Bug 76830 – postfix-current.patch

[patch] postfix-current.patch

postfix-current.patch (text/plain), 11.91 KB, created by Marcus Grando on 2005-02-12 23:00:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus Grando

Created: 2005-02-12 23:00:01 UTC

Size: 11.91 KB

patch

obsolete

>diff -ruN postfix-current.old/Makefile postfix-current/Makefile
>--- postfix-current.old/Makefile	Sat Nov 27 00:24:12 2004
>+++ postfix-current/Makefile	Sat Feb 12 20:52:51 2005
>@@ -7,7 +7,7 @@
> 
> # To pre-select options in batch mode, run make like this:
> #
>-#  make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS"
>+#  make -DBATCH POSTFIX_OPTIONS="DB3 TLS"
> #
> # the options are the same names as in the scripts/configure.postfix file.
> # POSTFIX_OPTIONS can be set in /etc/make.conf also.
>@@ -15,7 +15,7 @@
> # NOTE: PCRE is enabled by default unless you specifically disable it.
> 
> PORTNAME=	postfix
>-PORTVERSIONRAW=	2.2-20041030
>+PORTVERSIONRAW=	2.2-20050211
> PORTVERSION=	${PORTVERSIONRAW:S/-/./}
> PORTEPOCH=	2
> CATEGORIES=	mail ipv6
>@@ -45,19 +45,16 @@
> MAN5=	access.5 aliases.5 canonical.5 cidr_table.5 ldap_table.5 \
> 	mysql_table.5 pgsql_table.5 postconf.5 pcre_table.5 \
> 	regexp_table.5 relocated.5 tcp_table.5 transport.5 virtual.5 \
>-	header_checks.5 body_checks.5 master.5 nisplus_table.5
>+	header_checks.5 body_checks.5 master.5 nisplus_table.5 \
>+	generic.5
> 
> MAN8=	anvil.8 bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
> 	master.8 oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \
> 	smtp.8 smtpd.8 spawn.8 trace.8 trivial-rewrite.8 verify.8 virtual.8 \
>-	scache.8 discard.8
>-
>-# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to
>-# patch it.
>-MAN8base=$(MAN8:S/tlsmgr.8//)
>+	scache.8 discard.8 tlsmgr.8
> 
> CONF1=	main.cf master.cf access aliases canonical header_checks relocated \
>-	transport virtual
>+	transport virtual generic
> 
> README=	ADDRESS_CLASS_README ADDRESS_REWRITING_README \
> 	ADDRESS_VERIFICATION_README BACKSCATTER_README \
>@@ -70,7 +67,7 @@
> 	SASL_README SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \
> 	SMTPD_PROXY_README STANDARD_CONFIGURATION_README TUNING_README \
> 	ULTRIX_README UUCP_README VERP_README VIRTUAL_README \
>-	XCLIENT_README XFORWARD_README
>+	XCLIENT_README XFORWARD_README IPV6_README TLS_README
> 
> .if !defined(DEBUG)
> MAKEFILEFLAGS+=	DEBUG=
>@@ -138,18 +135,18 @@
> 
> do-install:
> 	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
>-	 config_directory=${PREFIX}/etc/postfix \
>-	 daemon_directory=${PREFIX}/libexec/postfix \
>-	 command_directory=${PREFIX}/sbin \
>-	 queue_directory=/var/spool/postfix \
>-	 sendmail_path=${PREFIX}/sbin/sendmail \
>-	 newaliases_path=${PREFIX}/bin/newaliases \
>-	 mailq_path=${PREFIX}/bin/mailq \
>-	 mail_owner=postfix \
>-	 setgid_group=maildrop \
>-	 manpage_directory=${PREFIX}/man \
>-	 sample_directory=${PREFIX}/etc/postfix \
>-	 readme_directory=${READMEDIR}
>+	config_directory=${PREFIX}/etc/postfix \
>+	daemon_directory=${PREFIX}/libexec/postfix \
>+	command_directory=${PREFIX}/sbin \
>+	queue_directory=/var/spool/postfix \
>+	sendmail_path=${PREFIX}/sbin/sendmail \
>+	newaliases_path=${PREFIX}/bin/newaliases \
>+	mailq_path=${PREFIX}/bin/mailq \
>+	mail_owner=postfix \
>+	setgid_group=maildrop \
>+	manpage_directory=${PREFIX}/man \
>+	sample_directory=${PREFIX}/etc/postfix \
>+	readme_directory=${READMEDIR}
> 
> .for f in ${CONF1}
> 	${INSTALL_DATA} ${WRKSRC}/conf/${f} \
>diff -ruN postfix-current.old/distinfo postfix-current/distinfo
>--- postfix-current.old/distinfo	Sat Nov 27 00:24:12 2004
>+++ postfix-current/distinfo	Sat Feb 12 20:50:48 2005
>@@ -1,4 +1,2 @@
>-MD5 (postfix/postfix-2.2-20041030.tar.gz) = f179f5d50d387d2eb82351bdb03dac9e
>-SIZE (postfix/postfix-2.2-20041030.tar.gz) = 2106328
>-MD5 (postfix/pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz) = 2f5df0781abd0390611158b4a5fb63c4
>-SIZE (postfix/pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz) = 239159
>+MD5 (postfix/postfix-2.2-20050211.tar.gz) = 33c6c0215fc3a136e24fc42f6cfded95
>+SIZE (postfix/postfix-2.2-20050211.tar.gz) = 2396343
>diff -ruN postfix-current.old/files/patch-freebsd6 postfix-current/files/patch-freebsd6
>--- postfix-current.old/files/patch-freebsd6	Tue Aug 24 14:51:22 2004
>+++ postfix-current/files/patch-freebsd6	Sat Feb 12 20:49:00 2005
>@@ -9,26 +9,3 @@
>    OpenBSD.2*)	SYSTYPE=OPENBSD2
>  		;;
>    OpenBSD.3*)	SYSTYPE=OPENBSD3
>---- makedefs.snapshot_orig	Wed Apr 14 14:18:06 2004
>-+++ makedefs.snapshot	Fri Aug 20 15:08:54 2004
>-@@ -93,6 +93,8 @@
>- 		;;
>-   FreeBSD.5*)	SYSTYPE=FREEBSD5
>- 		;;
>-+  FreeBSD.6*)	SYSTYPE=FREEBSD5
>-+		;;
>-   OpenBSD.2*)	SYSTYPE=OPENBSD2
>- 		;;
>-   OpenBSD.3*)	SYSTYPE=OPENBSD3
>-===cut-here===
>---- makedefs.stable_orig	Wed Apr 14 13:59:43 2004
>-+++ makedefs.stable	Fri Aug 20 15:10:13 2004
>-@@ -93,6 +93,8 @@
>- 		;;
>-   FreeBSD.5*)	SYSTYPE=FREEBSD5
>- 		;;
>-+  FreeBSD.6*)	SYSTYPE=FREEBSD5
>-+		;;
>-   OpenBSD.2*)	SYSTYPE=OPENBSD2
>- 		;;
>-   OpenBSD.3*)	SYSTYPE=OPENBSD3
>diff -ruN postfix-current.old/pkg-plist postfix-current/pkg-plist
>--- postfix-current.old/pkg-plist	Sat Nov 27 00:24:12 2004
>+++ postfix-current/pkg-plist	Sat Feb 12 20:53:07 2005
>@@ -7,7 +7,9 @@
> @unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist-relocated; then rm -f %D/etc/postfix/relocated; fi
> @unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist-transport; then rm -f %D/etc/postfix/transport; fi
> @unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist-virtual; then rm -f %D/etc/postfix/virtual; fi
>+@unexec if cmp -s %D/etc/postfix/generic %D/etc/postfix/dist-generic; then rm -f %D/etc/postfix/generic; fi
> etc/postfix/LICENSE
>+etc/postfix/TLS_LICENSE
> etc/postfix/main.cf.default
> etc/postfix/makedefs.out
> etc/postfix/post-install
>@@ -46,7 +48,7 @@
> libexec/postfix/trivial-rewrite
> libexec/postfix/verify
> libexec/postfix/virtual
>-%%SUB_TLS%%libexec/postfix/tlsmgr
>+libexec/postfix/tlsmgr
> sbin/postalias
> sbin/postcat
> sbin/postconf
>@@ -93,7 +95,11 @@
> %%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html
> %%PORTDOCS%%%%DOCSDIR%%/INSTALL
> %%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
>-%%PORTDOCS%%%%SUB_IPV6%%%%DOCSDIR%%/IPV6_README
>+%%PORTDOCS%%%%DOCSDIR%%/IPV6_README
>+%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html
>+%%PORTDOCS%%%%DOCSDIR%%/CDB_README.html
>+%%PORTDOCS%%%%DOCSDIR%%/TLS_README
>+%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html
> %%PORTDOCS%%%%DOCSDIR%%/LDAP_README
> %%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
> %%PORTDOCS%%%%DOCSDIR%%/LINUX_README
>@@ -215,6 +221,8 @@
> %%PORTDOCS%%%%DOCSDIR%%/verify.8.html
> %%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
> %%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
>+%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html
>+%%PORTDOCS%%%%DOCSDIR%%/generic.5.html
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
> @dirrm libexec/postfix
> @unexec rmdir %D/etc/postfix  2>/dev/null || true
>diff -ruN postfix-current.old/scripts/configure.postfix postfix-current/scripts/configure.postfix
>--- postfix-current.old/scripts/configure.postfix	Sat Nov 27 00:24:12 2004
>+++ postfix-current/scripts/configure.postfix	Sat Feb 12 20:49:00 2005
>@@ -23,9 +23,8 @@
> SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
> SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
> SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
>-TLS		"SSL and TLS (BROKEN)" "$status_TLS" \
>-IPv6		"IPv6 support (BROKEN)" "$status_IPv6" \
>-IPv6TLS		"IPv6 support with SSL and TLS (BROKEN)" "$status_IPv6TLS" \
>+SASLKRB5	"If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \
>+TLS		"SSL and TLS" "$status_TLS" \
> DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
> DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
> DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
>@@ -33,7 +32,6 @@
> MySQL		"MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \
> PgSQL		"PostgreSQL v7.4 map lookups" "$status_PgSQL" \
> PgSQL73		"PostgreSQL v7.3 map lookups" "$status_PgSQL73" \
>-PgSQL72		"PostgreSQL v7.2 map lookups" "$status_PgSQL72" \
> OpenLDAP	"OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \
> NIS		"NIS map lookups" "$status_NIS" \
> Test		"SMTP/LMTP test server and generator" "$status_Test" \
>@@ -62,9 +60,7 @@
> 
> echo "PREFIX=	${PREFIX}"
> 
>-SUB_TLS="@comment "
> SUB_TEST="@comment "
>-SUB_IPV6="@comment "
> 
> while [ "$1" ]; do
> 	case $1 in
>@@ -104,16 +100,14 @@
> 		SASLKRB)
>                         echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
> 			;;
>+		SASLKRB5)
>+			echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken"
>+			;;
> 		TLS)
>-			echo "MAN8+=		tlsmgr.8"
> 			echo "USE_OPENSSL=	yes"
>-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
>+			echo "POSTFIX_CCARGS+=	-DUSE_TLS -I\${OPENSSLINC}"
> 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
>-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz"
>-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.19-2.2-20040919-0.9.7d/pfixtls.diff"
>-			echo "PATCH_STRIP=	-p1"
> 			echo "TLS_SUFFIX=	+tls"
>-			SUB_TLS=""
> 			;;
> 		DB3)
> 			if [ "X$BDB_SELECTED" != "X" ]; then
>@@ -170,26 +164,19 @@
> 			echo "MYSQL_SUFFIX=	+mysql"
> 			;;
> 		PgSQL)
>-			echo "POSTGRESQL_PORT?=	databases/postgresql7"
>+			echo "POSTGRESQL_PORT?=	databases/postgresql74-client"
> 			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
> 			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
> 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
> 			echo "PGSQL_SUFFIX=	+pgsql"
> 			;;
> 		PgSQL73)
>-			echo "POSTGRESQL_PORT?=	databases/postgresql73"
>+			echo "POSTGRESQL_PORT?=	databases/postgresql73-client"
> 			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
> 			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
> 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
> 			echo "PGSQL_SUFFIX=	+pgsql"
> 			;;
>-		PgSQL72)
>-			echo "POSTGRESQL_PORT?=	databases/postgresql72"
>-			echo "LIB_DEPENDS+=	pq.2:\${PORTSDIR}/\${POSTGRESQL_PORT}"
>-			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
>-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
>-			echo "PGSQL_SUFFIX=	+pgsql"
>-			;;
> 		OpenLDAP)
> 			echo "USE_OPENLDAP=YES"
> 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
>@@ -205,37 +192,6 @@
> #			echo "MAN1+=		smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1"
> 			SUB_TEST=""
> 			;;
>-		IPv6)
>-			if [ X$SUB_TLS = "X" ]; then
>-				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
>-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
>-				exit 1
>-			fi
>-			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
>-			echo "PATCHFILES+=	ipv6-1.25-pf-2.2-20040616.patch.gz"
>-			echo "PATCH_DIST_STRIP=	-p1"
>-			echo "IPv6_SUFFIX=	+ipv6"
>-			echo ""
>-			IPv6SELECTED=YES
>-			SUB_IPV6=""
>-			;;
>-		IPv6TLS)
>-			if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then
>-				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
>-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
>-				exit 1
>-			fi
>-			echo "MAN8+=		tlsmgr.8"
>-			echo "USE_OPENSSL=	yes"
>-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
>-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
>-			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
>-			echo "PATCHFILES+=	tls+ipv6-1.25-pf-2.2-20040616.patch.gz"
>-			echo "PATCH_DIST_STRIP=	-p1"
>-			echo "TLS_SUFFIX=	+tls+ipv6"
>-			SUB_TLS=""
>-			SUB_IPV6=""
>-			;;
> 		*)
> 			echo "Unknown option(s): $*" > /dev/stderr
> 			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
>@@ -245,12 +201,10 @@
> 	shift
> done
> 
>-echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
> echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
>-echo "PLIST_SUB+=	SUB_IPV6=\"${SUB_IPV6}\""
> 
> # 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}\${NIS_SUFFIX}"
>+#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}"

Actions: View | Diff

Attachments on bug 76830: 50419 | 50420 | 50421 | 50422 | 50423 | 50424 | 50425 | 50426