ports/134497: [UPDATE] upgrading mail/postfix from 2.5.6 to 2.6.0
Sahil Tandon
sahil at tandon.net
Wed May 13 02:40:05 UTC 2009
>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: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed May 13 02:40:04 UTC 2009
>Closed-Date:
>Last-Modified:
>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 at 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 at 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:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list