diff options
Diffstat (limited to 'mail/postfix22')
| -rw-r--r-- | mail/postfix22/Makefile | 7 | ||||
| -rw-r--r-- | mail/postfix22/distinfo | 6 | ||||
| -rw-r--r-- | mail/postfix22/files/patch-bd | 11 | ||||
| -rw-r--r-- | mail/postfix22/files/patch-ck | 11 | ||||
| -rw-r--r-- | mail/postfix22/files/patch-ea | 13 | ||||
| -rw-r--r-- | mail/postfix22/files/patch-eb | 11 | ||||
| -rw-r--r-- | mail/postfix22/files/patch-ee | 13 | ||||
| -rw-r--r-- | mail/postfix22/files/patch-ef | 11 | ||||
| -rw-r--r-- | mail/postfix22/files/patch-eg | 20 | ||||
| -rw-r--r-- | mail/postfix22/files/patch-eh | 11 | ||||
| -rw-r--r-- | mail/postfix22/files/patch-ei | 21 | ||||
| -rw-r--r-- | mail/postfix22/files/patch-ej | 21 | ||||
| -rw-r--r-- | mail/postfix22/files/patch-lmtp.h | 13 | ||||
| -rw-r--r-- | mail/postfix22/files/patch-main.cf | 58 | ||||
| -rw-r--r-- | mail/postfix22/pkg-message | 15 | ||||
| -rw-r--r-- | mail/postfix22/pkg-plist | 5 | ||||
| -rw-r--r-- | mail/postfix22/scripts/configure.postfix | 76 | 
17 files changed, 208 insertions, 115 deletions
| diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile index 6adf63b1ee81..f75e2d5770bf 100644 --- a/mail/postfix22/Makefile +++ b/mail/postfix22/Makefile @@ -9,10 +9,11 @@  #  #  make -DBATCH POSTFIX_OPTIONS="DB3 PCRE"  # -# the options are the same names as in the scripts/configure.postfix file +# the options are the same names as in the scripts/configure.postfix file. +# POSTFIX_OPTIONS can be set in /etc/make.conf also.  PORTNAME=	postfix -PORTVERSION=	1.1.12 +PORTVERSION=	2.0.0.2  PORTEPOCH=	1  CATEGORIES=	mail ipv6  MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -45,6 +46,8 @@ MAN8=	bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \  # patch it.  MAN8base=$(MAN8:S/tlsmgr.8//) +NO_LATEST_LINK=	yes +  CONF1=	main.cf master.cf access aliases canonical pcre_table regexp_table \  	relocated transport virtual diff --git a/mail/postfix22/distinfo b/mail/postfix22/distinfo index 832388cccb96..9ed106bfeb1a 100644 --- a/mail/postfix22/distinfo +++ b/mail/postfix22/distinfo @@ -1,4 +1,4 @@ -MD5 (postfix/postfix-1.1.12.tar.gz) = d1d0f9792ec6ea063ccca59184e54212 -MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = 11d82e9a3482f64af9d228f7a4319566 -MD5 (postfix/postfix-1.1.12+ipv6.patch.gz) = add4396ce50ca61b5d9b67454fb51258 +MD5 (postfix/postfix-2.0.0.2.tar.gz) = 1e51a2290d33ee498f9abe91dbb27dc2 +MD5 (postfix/pfixtls-0.8.12-2.0.0.1-0.9.6h.tar.gz) = 1111b97c77e71b2f7edd9ab6d36fb550  MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba +MD5 (postfix/tls+ipv6-1.10-pf-2.0.0.1.patch.gz) = ed18c6933fa81961bcbd1e3a28493487 diff --git a/mail/postfix22/files/patch-bd b/mail/postfix22/files/patch-bd deleted file mode 100644 index ce79695f1341..000000000000 --- a/mail/postfix22/files/patch-bd +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/local.8.html.orig	Thu Feb  3 21:15:02 2000 ---- ./html/local.8.html	Thu Jun  1 22:22:30 2000 -*************** -*** 99,101 **** -         The default per-user mailbox is a file in  the  UNIX  mail -!        spool  directory (<b>/var/mail/</b><i>user</i> or <b>/var/spool/mail/</b><i>user</i>); -         the location can be specified with  the  <b>mail</b><i>_</i><b>spool</b><i>_</i><b>direc-</b> ---- 99,101 ---- -         The default per-user mailbox is a file in  the  UNIX  mail -!        spool  directory (<b>/var/mail/</b><i>user</i>); -         the location can be specified with  the  <b>mail</b><i>_</i><b>spool</b><i>_</i><b>direc-</b> diff --git a/mail/postfix22/files/patch-ck b/mail/postfix22/files/patch-ck deleted file mode 100644 index 6e1ddce3c8f9..000000000000 --- a/mail/postfix22/files/patch-ck +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man8/local.8.orig	Thu Feb  3 21:14:53 2000 ---- ./man/man8/local.8	Thu Jun  1 22:42:43 2000 -*************** -*** 96,98 **** -  The default per-user mailbox is a file in the UNIX mail spool -! directory (\fB/var/mail/\fIuser\fR or \fB/var/spool/mail/\fIuser\fR); -  the location can be specified with the \fBmail_spool_directory\fR ---- 96,98 ---- -  The default per-user mailbox is a file in the UNIX mail spool -! directory (\fB/var/mail/\fIuser\fR); -  the location can be specified with the \fBmail_spool_directory\fR diff --git a/mail/postfix22/files/patch-ea b/mail/postfix22/files/patch-ea new file mode 100644 index 000000000000..6c3f98d2af4f --- /dev/null +++ b/mail/postfix22/files/patch-ea @@ -0,0 +1,13 @@ +*** ./src/cleanup/cleanup.c.orig	Sun May 28 18:33:41 2000 +--- ./src/cleanup/cleanup.c	Thu Jun  1 21:52:22 2000 +*************** +*** 118,121 **** +  /* FILES +! /*	/etc/postfix/canonical*, canonical mapping table +! /*	/etc/postfix/virtual*, virtual mapping table +  /* LICENSE +--- 118,121 ---- +  /* FILES +! /*	!!PREFIX!!/etc/postfix/canonical*, canonical mapping table +! /*	!!PREFIX!!/etc/postfix/virtual*, virtual mapping table +  /* LICENSE diff --git a/mail/postfix22/files/patch-eb b/mail/postfix22/files/patch-eb new file mode 100644 index 000000000000..e67680963d2d --- /dev/null +++ b/mail/postfix22/files/patch-eb @@ -0,0 +1,11 @@ +*** ./src/global/mail_conf.c.orig	Sun May  7 18:51:16 2000 +--- ./src/global/mail_conf.c	Thu Jun  1 22:16:29 2000 +*************** +*** 53,55 **** +  /* FILES +! /*	/etc/postfix: default Postfix configuration directory. +  /* ENVIRONMENT +--- 53,55 ---- +  /* FILES +! /*	!!PREFIX!!/etc/postfix: default Postfix configuration directory. +  /* ENVIRONMENT diff --git a/mail/postfix22/files/patch-ee b/mail/postfix22/files/patch-ee new file mode 100644 index 000000000000..ef44eac24b73 --- /dev/null +++ b/mail/postfix22/files/patch-ee @@ -0,0 +1,13 @@ +*** ./src/master/master.c.orig	Tue Mar  7 10:25:07 2000 +--- ./src/master/master.c	Thu Jun  1 22:43:50 2000 +*************** +*** 104,107 **** +  /* FILES +! /*	/etc/postfix/main.cf: global configuration file. +! /*	/etc/postfix/master.cf: master process configuration file. +  /*	/var/spool/postfix/pid/master.pid: master lock file. +--- 104,107 ---- +  /* FILES +! /*	!!PREFIX!!/etc/postfix/main.cf: global configuration file. +! /*	!!PREFIX!!/etc/postfix/master.cf: master process configuration file. +  /*	/var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix22/files/patch-ef b/mail/postfix22/files/patch-ef new file mode 100644 index 000000000000..586b304a103d --- /dev/null +++ b/mail/postfix22/files/patch-ef @@ -0,0 +1,11 @@ +*** ./src/postdrop/postdrop.c.orig	Sun Apr 25 18:05:43 1999 +--- ./src/postdrop/postdrop.c	Thu Jun  1 22:44:22 2000 +*************** +*** 39,41 **** +  /*	/var/spool/postfix, mail queue +! /*	/etc/postfix, configuration files +  /* CONFIGURATION PARAMETERS +--- 39,41 ---- +  /*	/var/spool/postfix, mail queue +! /*	!!PREFIX!!/etc/postfix, configuration files +  /* CONFIGURATION PARAMETERS diff --git a/mail/postfix22/files/patch-eg b/mail/postfix22/files/patch-eg new file mode 100644 index 000000000000..2983bbfd86ea --- /dev/null +++ b/mail/postfix22/files/patch-eg @@ -0,0 +1,20 @@ +*** ./src/sendmail/sendmail.c.orig	Tue Mar 14 10:42:06 2000 +--- ./src/sendmail/sendmail.c	Thu Jun  1 22:47:24 2000 +*************** +*** 57,59 **** +  /*	The path name of the \fBsendmail.cf\fR file. Postfix configuration +! /*	files are kept in \fB/etc/postfix\fR. +  /* .IP "\fB-F \fIfull_name\fR +--- 57,59 ---- +  /*	The path name of the \fBsendmail.cf\fR file. Postfix configuration +! /*	files are kept in \fB!!PREFIX!!/etc/postfix\fR. +  /* .IP "\fB-F \fIfull_name\fR +*************** +*** 159,161 **** +  /*	/var/spool/postfix, mail queue +! /*	/etc/postfix, configuration files +  /* CONFIGURATION PARAMETERS +--- 159,161 ---- +  /*	/var/spool/postfix, mail queue +! /*	!!PREFIX!!/etc/postfix, configuration files +  /* CONFIGURATION PARAMETERS diff --git a/mail/postfix22/files/patch-eh b/mail/postfix22/files/patch-eh new file mode 100644 index 000000000000..c104c3680d21 --- /dev/null +++ b/mail/postfix22/files/patch-eh @@ -0,0 +1,11 @@ +*** ./src/trivial-rewrite/transport.c.orig	Tue Nov 16 19:15:41 1999 +--- ./src/trivial-rewrite/transport.c	Thu Jun  1 22:47:49 2000 +*************** +*** 32,34 **** +  /* FILES +! /*	/etc/postfix/transport* +  /* CONFIGURATION PARAMETERS +--- 32,34 ---- +  /* FILES +! /*	!!PREFIX!!/etc/postfix/transport* +  /* CONFIGURATION PARAMETERS diff --git a/mail/postfix22/files/patch-ei b/mail/postfix22/files/patch-ei deleted file mode 100644 index 8f03b69ccc52..000000000000 --- a/mail/postfix22/files/patch-ei +++ /dev/null @@ -1,21 +0,0 @@ -*** ./src/smtpd/smtpd.h.orig	Thu Sep 14 10:17:23 2000 ---- ./src/smtpd/smtpd.h	Thu Sep 14 10:17:38 2000 -*************** -*** 12,19 **** -    * SASL library. -    */ -  #ifdef USE_SASL_AUTH -! #include <sasl.h> -! #include <saslutil.h> -  #endif -   -   /* ---- 12,19 ---- -    * SASL library. -    */ -  #ifdef USE_SASL_AUTH -! #include <sasl1/sasl.h> -! #include <sasl1/saslutil.h> -  #endif -   -   /* diff --git a/mail/postfix22/files/patch-ej b/mail/postfix22/files/patch-ej deleted file mode 100644 index 329d7bb1cf96..000000000000 --- a/mail/postfix22/files/patch-ej +++ /dev/null @@ -1,21 +0,0 @@ -*** ./src/smtp/smtp.h.orig	Thu Sep 14 13:04:43 2000 ---- ./src/smtp/smtp.h	Thu Sep 14 13:04:53 2000 -*************** -*** 12,19 **** -    * SASL library. -    */ -  #ifdef USE_SASL_AUTH -! #include <sasl.h> -! #include <saslutil.h> -  #endif -   -   /* ---- 12,19 ---- -    * SASL library. -    */ -  #ifdef USE_SASL_AUTH -! #include <sasl1/sasl.h> -! #include <sasl1/saslutil.h> -  #endif -   -   /* diff --git a/mail/postfix22/files/patch-lmtp.h b/mail/postfix22/files/patch-lmtp.h deleted file mode 100644 index 86d5975b2b4d..000000000000 --- a/mail/postfix22/files/patch-lmtp.h +++ /dev/null @@ -1,13 +0,0 @@ ---- ./src/lmtp/lmtp.h.orig	Fri Jan 19 15:43:06 2001 -+++ ./src/lmtp/lmtp.h	Sat Feb  3 14:01:09 2001 -@@ -12,8 +12,8 @@ -   * SASL library. -   */ - #ifdef USE_SASL_AUTH --#include <sasl.h> --#include <saslutil.h> -+#include <sasl1/sasl.h> -+#include <sasl1/saslutil.h> - #endif -  -  /* diff --git a/mail/postfix22/files/patch-main.cf b/mail/postfix22/files/patch-main.cf new file mode 100644 index 000000000000..95fb2feaca0a --- /dev/null +++ b/mail/postfix22/files/patch-main.cf @@ -0,0 +1,58 @@ +--- ./conf/main.cf	Wed Jan  8 22:11:52 2003 ++++ ./conf/main.cf	Wed Jan  8 22:11:53 2003 +@@ -31,13 +31,13 @@ + # The command_directory parameter specifies the location of all + # postXXX commands. + # +-command_directory = /usr/sbin ++command_directory = /usr/local/sbin +  + # The daemon_directory parameter specifies the location of all Postfix + # daemon programs (i.e. programs listed in the master.cf file). This + # directory must be owned by root. + # +-daemon_directory = /usr/libexec/postfix ++daemon_directory = /usr/local/libexec/postfix +  + # QUEUE AND PROCESS OWNERSHIP + # +@@ -590,32 +590,32 @@ + # sendmail_path: The full pathname of the Postfix sendmail command. + # This is the Sendmail-compatible mail posting interface. + #  +-sendmail_path = ++sendmail_path = /usr/local/sbin/sendmail +  + # newaliases_path: The full pathname of the Postfix newaliases command. + # This is the Sendmail-compatible command to build alias databases. + # +-newaliases_path = ++newaliases_path = /usr/local/bin/newaliases +  + # mailq_path: The full pathname of the Postfix mailq command.  This + # is the Sendmail-compatible mail queue listing command. + #  +-mailq_path = ++mailq_path = /usr/local/bin/mailq +  + # setgid_group: The group for mail submission and queue management + # commands.  This must be a group name with a numerical group ID that + # is not shared with other accounts, not even with the Postfix account. + # +-setgid_group = ++setgid_group = maildrop +  + # manpage_directory: The location of the Postfix on-line manual pages. + # +-manpage_directory = ++manpage_directory = /usr/local/man +  + # sample_directory: The location of the Postfix sample configuration files. + # +-sample_directory = ++sample_directory = /usr/local/etc/postfix +  + # readme_directory: The location of the Postfix README files. + # +-readme_directory = ++readme_directory = no diff --git a/mail/postfix22/pkg-message b/mail/postfix22/pkg-message index 7fb3a804599c..a7ae2b17e2a6 100644 --- a/mail/postfix22/pkg-message +++ b/mail/postfix22/pkg-message @@ -8,21 +8,10 @@ sendmail_outbound_enable="NO"  sendmail_submit_enable="NO"  sendmail_msp_queue_enable="NO" -  **OR** +This will disable Sendmail completely. -sendmail_enable="NONE" -then type this command as root: - -ln -s /usr/local/sbin/postfix /usr/local/etc/rc.d/postfix.sh - -Either of these will disable Sendmail completely.  The latter form is useful -if you need to wait until other local package initialization (such as ldconfig -for Postgres or MySQL) is done.  The former method will start postfix very -early on in the boot process. - - -Also, you will want to disable some Sendmail-specific daily maintenance +Also, you may wish to disable some Sendmail-specific daily maintenance  routines in your /etc/periodic.conf file:  daily_status_mail_rejects_enable="NO"                                       diff --git a/mail/postfix22/pkg-plist b/mail/postfix22/pkg-plist index 5b6c3c55d5b6..6d882a8666a7 100644 --- a/mail/postfix22/pkg-plist +++ b/mail/postfix22/pkg-plist @@ -32,6 +32,7 @@ etc/postfix/sample-lmtp.cf  etc/postfix/sample-local.cf  etc/postfix/sample-main.cf  etc/postfix/sample-master.cf +etc/postfix/sample-mime.cf  etc/postfix/sample-misc.cf  etc/postfix/sample-pcre-access.cf  etc/postfix/sample-pcre-body.cf @@ -86,6 +87,7 @@ bin/newaliases  bin/mailq  %%SUB_TEST%%sbin/smtp-sink  %%SUB_TEST%%sbin/smtp-source +%%PORTDOCS%%share/doc/postfix/ADDRESS_CLASS_README  %%PORTDOCS%%share/doc/postfix/DB_README  %%PORTDOCS%%share/doc/postfix/DEBUG_README  %%PORTDOCS%%share/doc/postfix/ETRN_README @@ -93,13 +95,16 @@ bin/mailq  %%PORTDOCS%%share/doc/postfix/INSTALL  %%PORTDOCS%%share/doc/postfix/LDAP_README  %%PORTDOCS%%share/doc/postfix/LINUX_README +%%PORTDOCS%%share/doc/postfix/LOCAL_RECIPIENT_README  %%PORTDOCS%%share/doc/postfix/LMTP_README  %%PORTDOCS%%share/doc/postfix/MACOSX_README +%%PORTDOCS%%share/doc/postfix/MAILDROP_README  %%PORTDOCS%%share/doc/postfix/MYSQL_README  %%PORTDOCS%%share/doc/postfix/NFS_README  %%PORTDOCS%%share/doc/postfix/PACKAGE_README  %%PORTDOCS%%share/doc/postfix/PCRE_README  %%PORTDOCS%%share/doc/postfix/QMQP_README +%%PORTDOCS%%share/doc/postfix/RELEASE_NOTES  %%PORTDOCS%%share/doc/postfix/RESTRICTION_CLASS_README  %%PORTDOCS%%share/doc/postfix/SASL_README  %%PORTDOCS%%share/doc/postfix/ULTRIX_README diff --git a/mail/postfix22/scripts/configure.postfix b/mail/postfix22/scripts/configure.postfix index 79715fb882bf..c761c5e8de00 100644 --- a/mail/postfix22/scripts/configure.postfix +++ b/mail/postfix22/scripts/configure.postfix @@ -1,5 +1,5 @@  #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.25 2003-01-04 16:17:26 seanc Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.26 2003-01-09 05:10:39 petef Exp $  if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then  	exit @@ -22,14 +22,16 @@ if [ -z "${BATCH}" ]; then  		--checklist "\n\  Please select desired options:" -1 -1 16 \  PCRE		"Perl Compatible Regular Expressions" "$status_PCRE" \ -SASL		"Cyrus SASL (Simple Authentication and Security Layer)" "$status_SASL" \ +SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \ +SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \  DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \  MySQL		"MySQL map lookups" "$status_MySQL" \  PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \  OpenLDAP	"OpenLDAP map lookups" "$status_OpenLDAP" \  Test		"SMTP/LMTP test server and generator" "$status_Test" \ -TLS		"Secure Sockets Layer and Transport Layer Security" "$status_TLS" \ -IPv6		"IPv6 support (not KAME official)" "$status_IPv6" \ +TLS		"SSL and TLS" "$status_TLS" \ +IPv6		"IPv6 support (currently broken)" "$status_IPv6" \ +IPv6TLS		"IPv6 support with SSL and TLS" "$status_IPv6TLS" \  2> $tempfile  	retval=$? @@ -58,8 +60,8 @@ echo "PREFIX=	${PREFIX}"  SUB_TLS="@comment "  SUB_TEST="@comment " -for i; do -	case $i in +while [ "$1" ]; do +	case $1 in  		PCRE)  			echo "LIB_DEPENDS+=	pcre.0:\${PORTSDIR}/devel/pcre"  			echo "POSTFIX_CCARGS+=	-DHAS_PCRE -I\${LOCALBASE}/include" @@ -67,13 +69,32 @@ for i; do  			echo "PCRE_SUFFIX=	+pcre"  			SUB_PCRE=""  			;; -		SASL) -			echo "LIB_DEPENDS+=	sasl.8:\${PORTSDIR}/security/cyrus-sasl" -			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include" -			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl -lpam -lcrypt" -			echo "SASL_SUFFIX=	+sasl" -			if [ -f ${PREFIX}/lib/libsasl.a ]; then  -				if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then +                SASL) +                        echo "LIB_DEPENDS+=     sasl.8:\${PORTSDIR}/security/cyrus-sasl" +                        echo "POSTFIX_CCARGS+=  -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1" +                        echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt" +                        echo "SASL_SUFFIX=      +sasl" +                        if [ -f ${PREFIX}/lib/libsasl.a ]; then +                                if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then +                                        echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" +                                        echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" +                                fi +                        else +                                echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" +                                echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" +                        fi +                        echo ".if exists(/usr/lib/libkrb.a)" +                        echo "POSTFIX_AUXLIBS+= -lkrb -ldes -lcom_err" +                        echo ".endif" +                        SUB_SASL="" +                        ;; +		SASL2) +			echo "LIB_DEPENDS+=	sasl2.2:\${PORTSDIR}/security/cyrus-sasl2" +			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl" +			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt" +			echo "SASL_SUFFIX=	+sasl2" +			if [ -f ${PREFIX}/lib/libsasl2.a ]; then +				if nm ${PREFIX}/lib/libsasl2.a | grep -wq "mysql_verify_password"; then  					echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"  					echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"  				fi @@ -90,8 +111,8 @@ for i; do  			echo "MAN8+=		tlsmgr.8"  			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I/usr/include/openssl"  			echo "POSTFIX_AUXLIBS+=	-lssl -lcrypto" -			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz" -			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.11a-1.1.11-0.9.6g/pfixtls.diff" +			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.12-2.0.0.1-0.9.6h.tar.gz" +			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.12-2.0.0.1-0.9.6h/pfixtls.diff"  			echo "PATCH_STRIP=	-p1"  			echo "TLS_SUFFIX=	+tls"  			SUB_TLS="" @@ -132,10 +153,10 @@ for i; do  			if [ `uname -m` != "i386" ]; then  				/usr/bin/dialog --msgbox "IPv6 patch currently only supported on i386!" 5 60 > /dev/stderr  				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc -				exit 1 +			exit 1  			fi -			if [ -z $SUB_TLS ]; then -				/usr/bin/dialog --msgbox "IPv6 and TLS patch cannot be used simultaneously!" 5 60 > /dev/stderr +			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 @@ -144,15 +165,30 @@ for i; do  			echo "PATCH_DIST_STRIP= -p1"  			echo "IPv6_SUFFIX=	+ipv6"  			echo "" +			IPv6SELECTED=YES  			;; -	        "") +		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 "POSTFIX_CCARGS+=	-DHAS_SSL -I/usr/include/openssl" +			echo "POSTFIX_AUXLIBS+=	-lssl -lcrypto" +			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.10/" +			echo "PATCHFILES+=	tls+ipv6-1.10-pf-2.0.0.1.patch.gz" +			echo "PATCH_DIST_STRIP=	-p1" +			echo "TLS_SUFFIX=	+ipv6+tls" +			SUB_TLS=""  			;;  		*) -			echo "Invalid option(s): $*" > /dev/stderr +			echo "Unknown option(s): $*" > /dev/stderr  			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc  			exit 1  			;;  	esac +	shift  done  echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\"" | 
