Skip site navigation (1)Skip section navigation (2)
Date:      Wed,  8 Dec 2004 15:45:13 -0200 (BRST)
From:      Marcus Grando <marcus@corp.grupos.com.br>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        edwin@FreeBSD.org
Subject:   ports/74858: Update mail/postfix to support TLS+SPF and solve pipe problem (getopt())
Message-ID:  <20041208174513.DDB7D20A8D@corp.grupos.com.br>
Resent-Message-ID: <200412081750.iB8HoPms079688@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         74858
>Category:       ports
>Synopsis:       Update mail/postfix to support TLS+SPF and solve pipe problem (getopt())
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 08 17:50:25 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Marcus Grando
>Release:        FreeBSD 4.11-PRERELEASE i386
>Organization:
Grupos Internet S/A
>Environment:
System: FreeBSD corp.grupos.com.br 4.11-PRERELEASE FreeBSD 4.11-PRERELEASE #32: Tue Dec 7 12:11:36 BRST 2004 root@corp.grupos.com.br:/usr/obj/usr/src/sys/CORP i386


	
>Description:
Update mail/postfix to support TLS+SPF and solve pipe problem (getopt())

* Close ports/74462
* Now this patch support TLS+SPF against
* SPF patch use libspf2 that use a broken getopt(), becouse this postfix have compile with
  -DPREPEND_PLUS_TO_OPTSTRING (pipe broken without this).
  See: http://archives.neohapsis.com/archives/postfix/2004-09/0870.html

	
>How-To-Repeat:
	
>Fix:

	

--- postfix.patch begins here ---
diff -ruN postfix.old/files/extra-libspf2_and_tls.patch postfix/files/extra-libspf2_and_tls.patch
--- postfix.old/files/extra-libspf2_and_tls.patch	Wed Dec 31 21:00:00 1969
+++ postfix/files/extra-libspf2_and_tls.patch	Wed Dec  8 15:11:23 2004
@@ -0,0 +1,18 @@
+--- postfix-2.1.5/src/smtpd/smtpd.c.orig	Sat Oct 16 21:44:03 2004
++++ postfix-2.1.5/src/smtpd/smtpd.c	Sat Oct 16 21:44:13 2004
+@@ -2749,12 +2749,12 @@
+ 	VAR_ALLOW_UNTRUST_ROUTE, DEF_ALLOW_UNTRUST_ROUTE, &var_allow_untrust_route,
+ 	VAR_SMTPD_SASL_ENABLE, DEF_SMTPD_SASL_ENABLE, &var_smtpd_sasl_enable,
+ 	VAR_BROKEN_AUTH_CLNTS, DEF_BROKEN_AUTH_CLNTS, &var_broken_auth_clients,
+-	VAR_SHOW_UNK_RCPT_TABLE, DEF_SHOW_UNK_RCPT_TABLE, &var_show_unk_rcpt_table,
+-	VAR_SMTPD_REJ_UNL_FROM, DEF_SMTPD_REJ_UNL_FROM, &var_smtpd_rej_unl_from,
+-	VAR_SMTPD_REJ_UNL_RCPT, DEF_SMTPD_REJ_UNL_RCPT, &var_smtpd_rej_unl_rcpt,
+ 	VAR_SPF_MARK_ONLY, DEF_SPF_MARK_ONLY, &var_spf_mark_only,
+ 	VAR_SPF_RCVD_HEADER, DEF_SPF_RCVD_HEADER, &var_spf_rcvd_header,
+ 	VAR_SPF_GLOBAL_WHITELIST, DEF_SPF_GLOBAL_WHITELIST, &var_spf_global_whitelist,
++	VAR_SHOW_UNK_RCPT_TABLE, DEF_SHOW_UNK_RCPT_TABLE, &var_show_unk_rcpt_table,
++	VAR_SMTPD_REJ_UNL_FROM, DEF_SMTPD_REJ_UNL_FROM, &var_smtpd_rej_unl_from,
++	VAR_SMTPD_REJ_UNL_RCPT, DEF_SMTPD_REJ_UNL_RCPT, &var_smtpd_rej_unl_rcpt,
+ 	0,
+     };
+     static CONFIG_STR_TABLE str_table[] = {
diff -ruN postfix.old/scripts/configure.postfix postfix/scripts/configure.postfix
--- postfix.old/scripts/configure.postfix	Sat Nov 27 00:15:57 2004
+++ postfix/scripts/configure.postfix	Wed Dec  8 15:11:55 2004
@@ -111,6 +111,9 @@
                         echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcom_err -lasn1 -lroken"
 			;;
 		TLS)
+			if [ "X$SUB_SPF" = "X" ]; then
+				echo "EXTRA_PATCHES+=   ${FILESDIR}/extra-libspf2_and_tls.patch"
+			fi
 			echo "MAN8+=		tlsmgr.8"
 			echo "USE_OPENSSL=	yes"
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
@@ -213,7 +216,7 @@
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
 			echo "PATCHFILES+=	postfix-libspf2-2.1.5-5.patch"
 			echo "PATCH_DIST_STRIP=	-p1"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include"
+			echo "POSTFIX_CCARGS+=	-DPREPEND_PLUS_TO_OPTSTRING -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lspf2"
 			echo "SPF_SUFFIX=	+spf"
 ##			echo "README+=	SPF_README"
--- postfix.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041208174513.DDB7D20A8D>