From khera@kcilink.com  Thu Nov 18 21:48:33 2004
Return-Path: <khera@kcilink.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 83DC916A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 18 Nov 2004 21:48:33 +0000 (GMT)
Received: from yertle.kcilink.com (yertle.kcilink.com [65.205.34.180])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 38E5C43D2F
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 18 Nov 2004 21:48:33 +0000 (GMT)
	(envelope-from khera@kcilink.com)
Received: by yertle.kcilink.com (Postfix, from userid 100)
	id 9B2EF217B7; Thu, 18 Nov 2004 16:48:32 -0500 (EST)
Message-Id: <20041118214832.9B2EF217B7@yertle.kcilink.com>
Date: Thu, 18 Nov 2004 16:48:32 -0500 (EST)
From: Vivek Khera <vivek@khera.org>
Reply-To: Vivek Khera <vivek@khera.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject:
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         74095
>Category:       ports
>Synopsis:       [PATCH] mail/postfix: Update to libspf2-2.1.5-5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 18 21:50:27 GMT 2004
>Closed-Date:    Sat Nov 27 02:16:01 GMT 2004
>Last-Modified:  Sat Nov 27 02:16:01 GMT 2004
>Originator:     Vivek Khera
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
>Environment:
System: FreeBSD yertle.int.kciLink.com 4.10-STABLE FreeBSD 4.10-STABLE #12: Tue Jul 13 13:13:38 EDT 2004 khera@yertle.int.kciLink.com:/u/yertle2/usr.obj/u/sources/usr/src/sys/YERTLE i386


	
>Description:
	

update the SPF patch to latest release which fixes bug exposed by gcc in
FreeBSD 5.3.  it is otherwise identical to prior version, so no upgrade is
necessary if you have it compiled and workign in FreeBSD 4.10 already (thus no
version bump).

removed "extra libspf2" patch that tried to work around failure of IPv6+TLS
patch when used in conjunction with SPF patch.  It just doesn't work, and I
can't figure out exactly what it is supposed to do.  As it was, this would
cause failures when selecting just the SPF patch.

>How-To-Repeat:
	
>Fix:

	


diff -Pru postfix/distinfo postfix.new/distinfo
--- postfix/distinfo	Thu Oct 14 10:02:57 2004
+++ postfix.new/distinfo	Thu Nov 18 16:37:11 2004
@@ -1,7 +1,7 @@
 MD5 (postfix/postfix-2.1.5.tar.gz) = bcaa4aac80595d04c60c72844203a04d
 SIZE (postfix/postfix-2.1.5.tar.gz) = 1971931
-MD5 (postfix/postfix-libspf2-2.1.3-4.patch) = 0312a568fdf96861dbd6ac206b395630
-SIZE (postfix/postfix-libspf2-2.1.3-4.patch) = 25713
+MD5 (postfix/postfix-libspf2-2.1.5-5.patch) = c6ac24b91af6c575ec787110a2df8a24
+SIZE (postfix/postfix-libspf2-2.1.5-5.patch) = 25889
 MD5 (postfix/ipv6-1.25-pf-2.1.5.patch.gz) = c1c5a84b6c04bde0df7100cf05abb54c
 SIZE (postfix/ipv6-1.25-pf-2.1.5.patch.gz) = 48228
 MD5 (postfix/tls+ipv6-1.25-pf-2.1.5.patch.gz) = 5b02ebf2ec104c43f805d2bcb7bb16ef
diff -Pru postfix/scripts/configure.postfix postfix.new/scripts/configure.postfix
--- postfix/scripts/configure.postfix	Mon Nov 15 13:27:34 2004
+++ postfix.new/scripts/configure.postfix	Thu Nov 18 16:36:40 2004
@@ -210,8 +210,8 @@
 		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_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_AUXLIBS+=	-L\${LOCALBASE}/lib -lspf2"
@@ -219,9 +219,6 @@
 ##			echo "README+=	SPF_README"
 			echo ""
 			SUB_SPF=""
-			if [ X$SUB_TLS != "X" ]; then
-				echo "EXTRA_PATCHES+=	${FILESDIR}/extra-libspf2_and_tls.patch"
-			fi
 			;;
 		IPv6)
 			if [ X$SUB_TLS = "X" ]; then
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Sat Nov 27 02:15:58 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=74095 
>Unformatted:
