From nobody@FreeBSD.org  Wed May 13 02:34:20 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 83A921065670
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 13 May 2009 02:34:20 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 719038FC17
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 13 May 2009 02:34:20 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n4D2YKBE058424
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 13 May 2009 02:34:20 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id n4D2YKmf058423;
	Wed, 13 May 2009 02:34:20 GMT
	(envelope-from nobody)
Message-Id: <200905130234.n4D2YKmf058423@www.freebsd.org>
Date: Wed, 13 May 2009 02:34:20 GMT
From: Sahil Tandon <sahil@tandon.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [UPDATE] upgrading mail/postfix from 2.5.6 to 2.6.0
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: vivek@khera.org

>Number:         134497
>Category:       ports
>Synopsis:       [UPDATE] upgrading mail/postfix from 2.5.6 to 2.6.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pav
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 13 02:40:04 UTC 2009
>Closed-Date:    Mon May 18 14:36:48 UTC 2009
>Last-Modified:  Mon May 18 14:40:00 UTC 2009
>Originator:     Sahil Tandon
>Release:        FreeBSD 7.1
>Organization:
>Environment:
FreeBSD spartan.hamla.org 7.1-RELEASE FreeBSD 7.1-RELEASE #0: Thu Jan  1 14:37:25 UTC 2009 root@logan.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Postfix 2.6.0 became the stable release as of today.  This is a patch against the CVS checkout of 2.5.6 (mail/postfix).  There are a few new tools (i.e. binaries) and documentation in 2.6.0, so I hope I captured them all.

Although the port builds cleanly, portlint(1) does complain about 3 fatal errors and 2 warnings.  However, these are the exact same complaints that are reported when running portlint(1) on the existing (already committed to the tree) mail/postfix, so I have not addressed them.

Please let me know of any mistakes -- happy to refine and re-submit the patch.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

? work
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/postfix/Makefile,v
retrieving revision 1.143
diff -u -r1.143 Makefile
--- Makefile	12 May 2009 11:41:17 -0000	1.143
+++ Makefile	13 May 2009 02:09:21 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION=	2.5.6
+PORTVERSION=	2.6.0
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -23,7 +23,7 @@
 MAINTAINER=	vivek@khera.org
 COMMENT=	A secure alternative to widely-used Sendmail
 
-CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-46-9].* postfix-current-2.* \
+CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-57-9].* postfix-current-2.* \
 		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 
 USE_SUBMAKE=	yes
@@ -58,13 +58,13 @@
 		TEST		"SMTP/LMTP test server and generator"			${STATUS_Test}
 
 MAN1=	postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
-	postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1 \
-	qshape.1
+	postlock.1 postlog.1 postmap.1 postmulti.1 postqueue.1 postsuper.1 \
+	sendmail.1 qshape.1
 
 MAN5=	access.5 aliases.5 bounce.5 canonical.5 cidr_table.5 generic.5 \
 	header_checks.5 ldap_table.5 master.5 mysql_table.5 nisplus_table.5 \
-	pcre_table.5 pgsql_table.5 postconf.5 regexp_table.5 relocated.5 \
-	tcp_table.5 transport.5 virtual.5
+	pcre_table.5 pgsql_table.5 postconf.5 postfix-wrapper.5 regexp_table.5 \
+	relocated.5 tcp_table.5 transport.5 virtual.5
 
 MAN8=	anvil.8 bounce.8 cleanup.8 discard.8 error.8 flush.8 local.8 master.8 \
 	oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 scache.8 showq.8 \
@@ -184,6 +184,7 @@
 .endif
 
 .if defined(WITH_VDA)
+IGNORE=			wait for a new VDA patch that works with 2.6.0
 PATCH_SITES+=		http://vda.sourceforge.net/VDA/
 PATCHFILES+=		postfix-2.5.6-vda-ng.patch.gz
 PATCH_DIST_STRIP=	-p1
@@ -298,8 +299,8 @@
 post-install:
 	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 # Fix compressed man pages
-	@${REINPLACE_CMD} -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${PREFIX}/etc/postfix/postfix-files
-	@${RM} -f ${PREFIX}/etc/postfix/postfix-files.bak
+	@${REINPLACE_CMD} -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${PREFIX}/libexec/postfix/postfix-files
+	@${RM} -f ${PREFIX}/libexec/postfix/postfix-files.bak
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/mail/postfix/distinfo,v
retrieving revision 1.98
diff -u -r1.98 distinfo
--- distinfo	26 Jan 2009 19:52:05 -0000	1.98
+++ distinfo	13 May 2009 02:09:21 -0000
@@ -1,6 +1,3 @@
-MD5 (postfix/postfix-2.5.6.tar.gz) = ec2cb63b53f5f36c3ca91da8f3bc9407
-SHA256 (postfix/postfix-2.5.6.tar.gz) = 8e0178cc1540cb349ed341ae717f0f9ef663e85136db2889e6953bdcd5992abb
-SIZE (postfix/postfix-2.5.6.tar.gz) = 3157891
-MD5 (postfix/postfix-2.5.6-vda-ng.patch.gz) = 83e483795c616abb27fdee5d9886019c
-SHA256 (postfix/postfix-2.5.6-vda-ng.patch.gz) = c4e4ff3da5b6bfa2648dc41bbf7ee56c1ba2f62e2c77a7885bc8044a1131f531
-SIZE (postfix/postfix-2.5.6-vda-ng.patch.gz) = 12388
+MD5 (postfix/postfix-2.6.0.tar.gz) = 3674618dab2734f49182b8cba2f3186e
+SHA256 (postfix/postfix-2.6.0.tar.gz) = 8c323d200feba72121c302f15249d56c7521ade16cf5166fadf158e6818883bd
+SIZE (postfix/postfix-2.6.0.tar.gz) = 3324014
Index: pkg-install
===================================================================
RCS file: /home/ncvs/ports/mail/postfix/pkg-install,v
retrieving revision 1.26
diff -u -r1.26 pkg-install
--- pkg-install	1 Mar 2008 01:44:30 -0000	1.26
+++ pkg-install	13 May 2009 02:09:21 -0000
@@ -119,7 +119,7 @@
 		done
 	fi
 
-	/bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \
+	/bin/sh ${PKG_PREFIX}/libexec/postfix/post-install tempdir=/tmp \
 	config_directory=${PKG_PREFIX}/etc/postfix \
 	data_directory=/var/db/postfix \
 	daemon_directory=${PKG_PREFIX}/libexec/postfix \
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/mail/postfix/pkg-plist,v
retrieving revision 1.26
diff -u -r1.26 pkg-plist
--- pkg-plist	28 Feb 2008 20:06:30 -0000	1.26
+++ pkg-plist	13 May 2009 02:09:21 -0000
@@ -13,9 +13,6 @@
 etc/postfix/bounce.cf.default
 etc/postfix/main.cf.default
 etc/postfix/makedefs.out
-etc/postfix/post-install
-etc/postfix/postfix-files
-etc/postfix/postfix-script
 etc/postfix/dist/main.cf
 etc/postfix/dist/master.cf
 etc/postfix/dist/access
@@ -34,11 +31,18 @@
 libexec/postfix/flush
 libexec/postfix/lmtp
 libexec/postfix/local
+libexec/postfix/main.cf
 libexec/postfix/master
+libexec/postfix/master.cf
 libexec/postfix/nqmgr
 libexec/postfix/oqmgr
 libexec/postfix/pickup
 libexec/postfix/pipe
+libexec/postfix/post-install
+libexec/postfix/postfix-files
+libexec/postfix/postfix-script
+libexec/postfix/postfix-wrapper
+libexec/postfix/postmulti-script
 libexec/postfix/proxymap
 libexec/postfix/qmgr
 libexec/postfix/qmqpd
@@ -60,6 +64,7 @@
 sbin/postlock
 sbin/postlog
 sbin/postmap
+sbin/postmulti
 sbin/postqueue
 sbin/postsuper
 sbin/sendmail
@@ -118,6 +123,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MILTER_README
 %%PORTDOCS%%%%DOCSDIR%%/MILTER_README.html
+%%PORTDOCS%%%%DOCSDIR%%/MULTI_INSTANCE_README
+%%PORTDOCS%%%%DOCSDIR%%/MULTI_INSTANCE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MYSQL_README
 %%PORTDOCS%%%%DOCSDIR%%/MYSQL_README.html
 %%PORTDOCS%%%%DOCSDIR%%/NFS_README
@@ -202,11 +209,13 @@
 %%PORTDOCS%%%%DOCSDIR%%/postfix-logo.jpg
 %%PORTDOCS%%%%DOCSDIR%%/postfix-manuals.html
 %%PORTDOCS%%%%DOCSDIR%%/postfix-power.png
+%%PORTDOCS%%%%DOCSDIR%%/postfix-wrapper.5.html
 %%PORTDOCS%%%%DOCSDIR%%/postfix.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postmulti.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html
 %%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html
Index: files/patch-conf__postfix-files
===================================================================
RCS file: files/patch-conf__postfix-files
diff -N files/patch-conf__postfix-files
--- files/patch-conf__postfix-files	1 Mar 2008 01:44:30 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- conf/postfix-files.orig	2008-01-24 00:13:49.000000000 +0000
-+++ conf/postfix-files	2008-02-29 20:53:24.000000000 +0000
-@@ -42,7 +42,7 @@
- # permissions, so that running "make install" fixes any glitches.
- #
- $config_directory:d:root:-:755:u
--$data_directory:d:$mail_owner:-:700:u
-+$data_directory:d:$mail_owner:-:700:uc
- $daemon_directory:d:root:-:755:u
- $queue_directory:d:root:-:755:uc
- $sample_directory:d:root:-:755:o


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->beech 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed May 13 02:40:17 UTC 2009 
Responsible-Changed-Why:  
beech@ wants his PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=134497 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Wed May 13 02:40:23 UTC 2009 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=134497 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: vivek@khera.org
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/134497: [UPDATE] upgrading mail/postfix from 2.5.6 to 2.6.0
Date: Wed, 13 May 2009 02:40:19 UT

 Maintainer of mail/postfix,
 
 Please note that PR ports/134497 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/134497
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Vick Khera <vivek@khera.org>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/134497: [UPDATE] upgrading mail/postfix from 2.5.6 to 2.6.0
Date: Thu, 14 May 2009 16:30:56 -0400

 Something seems wrong here.. There's no reason for the config files
 master.cf and main.cf to move from etc/ to libexec/.  What's causing
 that?

From: Sahil Tandon <sahil@tandon.net>
To: bug-followup@FreeBSD.org, sahil@tandon.net
Cc:  
Subject: Re: ports/134497: [UPDATE] upgrading mail/postfix from 2.5.6 to
	2.6.0
Date: Thu, 14 May 2009 18:47:36 -0400

 Hi Vivek,
 
 The config files (master.cf and main.cf) do not move from etc/ to libexec/;
 they remain in the former but are added to the latter.  I agree this seems
 odd, but it reflects changes in the underlying source.  The stock
 configuration files in $daemon_directory are used by the new multi-instance
 support introduced in 2.6.0.
 
 Postfix 2.5.7:
 
 % grep main.cf postfix-2.5.7/conf/postfix-files 
 $config_directory/main.cf.default:f:root:-:644
 $config_directory/main.cf:f:root:-:644:p
 
 % grep master.cf postfix-2.5.7/conf/postfix-files
 $config_directory/master.cf:f:root:-:644:p
 
 Postfix 2.6.0 (notice addition of the $daemon_directory):
 
 % grep main.cf postfix-2.6.0/conf/postfix-files
 $daemon_directory/main.cf:f:root:-:644
 $config_directory/main.cf.default:f:root:-:644:1
 $config_directory/main.cf:f:root:-:644:p
 
 % grep master.cf postfix-2.6.0/conf/postfix-files
 $daemon_directory/master.cf:f:root:-:644
 $config_directory/master.cf:f:root:-:644:p
 
  % grep \$daemon postfix-2.6.0/src/postmulti/postmulti.c
 /*	$daemon_directory/main.cf, stock configuration file
 /*	$daemon_directory/master.cf, stock configuration file
 /*	$daemon_directory/postmulti-script, life-cycle helper program
 
 -- 
 Sahil Tandon <sahil@tandon.net>

From: Vick Khera <khera@kcilink.com>
To: bug-followup@FreeBSD.org,
 sahil@tandon.net
Cc:  
Subject: Re: ports/134497: [UPDATE] upgrading mail/postfix from 2.5.6 to 2.6.0
Date: Fri, 15 May 2009 11:21:56 -0400

 ok. that makes sense.
 
 are the main.cf and master.cf files in libexec expected to be edited?   
 if so, they should be installed like the others as ".default" so they  
 don't get removed when the package is deleted.  it is bad to delete  
 config files that are expected to be edited.
 
 also, are you interested in taking over this port maintainership?  i'm  
 really short on time and I have about a dozen other ports I maintain.
 

From: Sahil Tandon <sahil@tandon.net>
To: Vick Khera <khera@kcilink.com>
Cc: "bug-followup@FreeBSD.org" <bug-followup@FreeBSD.org>
Subject: Re: ports/134497: [UPDATE] upgrading mail/postfix from 2.5.6 to 2.6.0
Date: Fri, 15 May 2009 13:14:42 -0400

  From my (very cursory) reading of the code, the stock main and  
 master.cf files in libexec/ are used only during the creation of a new  
 instance, and are not for user editing like the configuration files in  
 $config_directory.
 
 I would be glad to take over maintainership if that suits you.  Let me  
 know!

From: Vick Khera <vivek@khera.org>
To: bug-followup@FreeBSD.org,
 sahil@tandon.net
Cc:  
Subject: Re: ports/134497: [UPDATE] upgrading mail/postfix from 2.5.6 to 2.6.0
Date: Fri, 15 May 2009 14:00:51 -0400

 I approve this patch.  I also approve Sahil taking over as the  
 maintainer, which we have discussed privately.
 
State-Changed-From-To: feedback->open 
State-Changed-By: pav 
State-Changed-When: Mon May 18 14:28:22 UTC 2009 
State-Changed-Why:  
Maintainer approved 

http://www.freebsd.org/cgi/query-pr.cgi?pr=134497 
Responsible-Changed-From-To: beech->pav 
Responsible-Changed-By: pav 
Responsible-Changed-When: Mon May 18 14:29:34 UTC 2009 
Responsible-Changed-Why:  
Steal 

http://www.freebsd.org/cgi/query-pr.cgi?pr=134497 
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Mon May 18 14:31:27 UTC 2009 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=134497 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/134497: commit references a PR
Date: Mon, 18 May 2009 14:36:43 +0000 (UTC)

 pav         2009-05-18 14:36:34 UTC
 
   FreeBSD ports repository
 
   Modified files:
     mail/postfix         Makefile distinfo pkg-install pkg-plist 
   Removed files:
     mail/postfix/files   patch-conf__postfix-files 
   Log:
   - Update to 2.6.0
   - Transfer maintainership to the submitter
   
   PR:             ports/134497
   Submitted by:   Sahil Tandon <sahil@tandon.net>
   Approved by:    Vick Khera <vivek@khera.org> (old maintainer)
   
   Revision  Changes    Path
   1.144     +10 -10    ports/mail/postfix/Makefile
   1.99      +3 -6      ports/mail/postfix/distinfo
   1.2       +0 -11     ports/mail/postfix/files/patch-conf__postfix-files (dead)
   1.27      +2 -2      ports/mail/postfix/pkg-install
   1.27      +12 -3     ports/mail/postfix/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
