Mon Feb 18 17:45:34 2008 UTC ()
Update Postfix to version 2.5.1 (ok martti).  Major changes over 2.4.x are:

- TLS (SSL) support was streamlined further, and provides a new security level
  based on certificate fingerprints instead of CA signatures. See TLS_README
  for details.

- Milter support was updated from the Sendmail 8.13 feature set and now
  includes most of the features that were introduced with Sendmail 8.14. See
  MILTER_README for details.

- Stress-adaptive configuration was introduced. This allows the Postfix SMTP
  server to temporarily adjust its rules under conditions of overload, such as
  a malware attack or backscatter flood. See STRESS_README for details.
  [pkgsrc: this obsoletes the "postfix-stress" option which provided the same
  functionality via a distribution patch]

- The queue manager scheduler was refined. It now provides per-transport
  scheduling controls and allows for adjustment of the sensitivity to mail
  delivery (non-)errors. See SCHEDULER_README.

- Security was improved by introducing a Postfix-owned data_directory for
  storage of randomness, caches and other non-queue data. This change avoids
  future security loopholes due to untrusted data sitting in root-owned files
  or in root-owned directories. Writes to legacy files in root-owned
  directories are automatically redirected to files in the new data_directory.

No functionality has been removed, but it is a good idea to review the
RELEASE_NOTES file for the usual minor incompatibilities or limitations.


(ghen)
diff -r1.214 -r1.215 pkgsrc/mail/postfix/Makefile
diff -r1.18 -r1.19 pkgsrc/mail/postfix/PLIST
diff -r1.115 -r1.116 pkgsrc/mail/postfix/distinfo
diff -r1.29 -r1.30 pkgsrc/mail/postfix/options.mk
diff -r1.19 -r1.20 pkgsrc/mail/postfix/patches/patch-aa
diff -r1.20 -r1.21 pkgsrc/mail/postfix/patches/patch-ai
cvs diff -r1.214 -r1.215 pkgsrc/mail/postfix/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/postfix/Makefile 2008/01/25 09:44:24 1.214
+++ pkgsrc/mail/postfix/Makefile 2008/02/18 17:45:34 1.215
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.214 2008/01/25 09:44:24 ghen Exp $ 1# $NetBSD: Makefile,v 1.215 2008/02/18 17:45:34 ghen Exp $
2 2
3DISTNAME= postfix-2.4.6 3DISTNAME= postfix-2.5.1
4PKGREVISION= 2 
5CATEGORIES= mail 4CATEGORIES= mail
6MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ 5MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/
7DIST_SUBDIR= postfix 6DIST_SUBDIR= postfix
8 7
9MAINTAINER= martti@NetBSD.org 8MAINTAINER= martti@NetBSD.org
10HOMEPAGE= http://www.postfix.org/ 9HOMEPAGE= http://www.postfix.org/
11COMMENT= Postfix SMTP server and tools 10COMMENT= Postfix SMTP server and tools
12#LICENSE= postfix-license 11#LICENSE= postfix-license
13 12
14CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]* 13CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
15 14
16PKG_INSTALLATION_TYPES= overwrite pkgviews 15PKG_INSTALLATION_TYPES= overwrite pkgviews
17 16
cvs diff -r1.18 -r1.19 pkgsrc/mail/postfix/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/postfix/PLIST 2007/04/25 13:09:35 1.18
+++ pkgsrc/mail/postfix/PLIST 2008/02/18 17:45:34 1.19
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.18 2007/04/25 13:09:35 ghen Exp $ 1@comment $NetBSD: PLIST,v 1.19 2008/02/18 17:45:34 ghen Exp $
2bin/mailq 2bin/mailq
3bin/newaliases 3bin/newaliases
4libexec/postfix/anvil 4libexec/postfix/anvil
5libexec/postfix/bounce 5libexec/postfix/bounce
6libexec/postfix/cleanup 6libexec/postfix/cleanup
7libexec/postfix/discard 7libexec/postfix/discard
8libexec/postfix/error 8libexec/postfix/error
9libexec/postfix/flush 9libexec/postfix/flush
10libexec/postfix/lmtp 10libexec/postfix/lmtp
11libexec/postfix/local 11libexec/postfix/local
12libexec/postfix/master 12libexec/postfix/master
13libexec/postfix/nqmgr 13libexec/postfix/nqmgr
14libexec/postfix/oqmgr 14libexec/postfix/oqmgr
@@ -128,26 +128,27 @@ share/doc/postfix/NFS_README @@ -128,26 +128,27 @@ share/doc/postfix/NFS_README
128share/doc/postfix/OVERVIEW 128share/doc/postfix/OVERVIEW
129share/doc/postfix/PACKAGE_README 129share/doc/postfix/PACKAGE_README
130share/doc/postfix/PCRE_README 130share/doc/postfix/PCRE_README
131share/doc/postfix/PGSQL_README 131share/doc/postfix/PGSQL_README
132share/doc/postfix/QSHAPE_README 132share/doc/postfix/QSHAPE_README
133share/doc/postfix/RELEASE_NOTES 133share/doc/postfix/RELEASE_NOTES
134share/doc/postfix/RESTRICTION_CLASS_README 134share/doc/postfix/RESTRICTION_CLASS_README
135share/doc/postfix/SASL_README 135share/doc/postfix/SASL_README
136share/doc/postfix/SCHEDULER_README 136share/doc/postfix/SCHEDULER_README
137share/doc/postfix/SMTPD_ACCESS_README 137share/doc/postfix/SMTPD_ACCESS_README
138share/doc/postfix/SMTPD_POLICY_README 138share/doc/postfix/SMTPD_POLICY_README
139share/doc/postfix/SMTPD_PROXY_README 139share/doc/postfix/SMTPD_PROXY_README
140share/doc/postfix/STANDARD_CONFIGURATION_README 140share/doc/postfix/STANDARD_CONFIGURATION_README
 141share/doc/postfix/STRESS_README
141share/doc/postfix/TLS_LEGACY_README 142share/doc/postfix/TLS_LEGACY_README
142share/doc/postfix/TLS_README 143share/doc/postfix/TLS_README
143share/doc/postfix/TUNING_README 144share/doc/postfix/TUNING_README
144share/doc/postfix/ULTRIX_README 145share/doc/postfix/ULTRIX_README
145share/doc/postfix/UUCP_README 146share/doc/postfix/UUCP_README
146share/doc/postfix/VERP_README 147share/doc/postfix/VERP_README
147share/doc/postfix/VIRTUAL_README 148share/doc/postfix/VIRTUAL_README
148share/doc/postfix/XCLIENT_README 149share/doc/postfix/XCLIENT_README
149share/doc/postfix/XFORWARD_README 150share/doc/postfix/XFORWARD_README
150share/examples/postfix/LICENSE 151share/examples/postfix/LICENSE
151share/examples/postfix/TLS_LICENSE 152share/examples/postfix/TLS_LICENSE
152share/examples/postfix/access 153share/examples/postfix/access
153share/examples/postfix/aliases 154share/examples/postfix/aliases
cvs diff -r1.115 -r1.116 pkgsrc/mail/postfix/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/postfix/distinfo 2008/01/14 13:29:24 1.115
+++ pkgsrc/mail/postfix/distinfo 2008/02/18 17:45:34 1.116
@@ -1,11 +1,8 @@ @@ -1,11 +1,8 @@
1$NetBSD: distinfo,v 1.115 2008/01/14 13:29:24 ghen Exp $ 1$NetBSD: distinfo,v 1.116 2008/02/18 17:45:34 ghen Exp $
2 2
3SHA1 (postfix/postfix-2.4-stress-patch.gz) = fa0f7f01358c8dde1757f1c98806bb1585e487c3 3SHA1 (postfix/postfix-2.5.1.tar.gz) = 4ceb805b78aff4c872b7e55554d2364e06f695b3
4RMD160 (postfix/postfix-2.4-stress-patch.gz) = 0f96dda904a40a60cd1e26d20ad3cee0af4a4e7d 4RMD160 (postfix/postfix-2.5.1.tar.gz) = cf414306742d642ccab78212ee33af955d7a9023
5Size (postfix/postfix-2.4-stress-patch.gz) = 2947 bytes 5Size (postfix/postfix-2.5.1.tar.gz) = 3153629 bytes
6SHA1 (postfix/postfix-2.4.6.tar.gz) = 226222707fd8d963d3173070cac96370c453ffa7 6SHA1 (patch-aa) = 757b6f1be1a51696f1c7d41ad520cba3b8420dcf
7RMD160 (postfix/postfix-2.4.6.tar.gz) = 115b3a4eb982701e29db2e52e294ec8ee69bdae5 
8Size (postfix/postfix-2.4.6.tar.gz) = 2935249 bytes 
9SHA1 (patch-aa) = b8f4e67ac18dcd1e5e3c56ad587b4552c539caa0 
10SHA1 (patch-ag) = 4d66026fe81dde97470bd01d529af191f1547228 7SHA1 (patch-ag) = 4d66026fe81dde97470bd01d529af191f1547228
11SHA1 (patch-ai) = 68201eac6b479ad733ba851741cc1cc2e56f7c9f 8SHA1 (patch-ai) = 7b19361e77d25139134511331a82abcd26b5336d
cvs diff -r1.29 -r1.30 pkgsrc/mail/postfix/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/postfix/options.mk 2008/01/25 09:44:24 1.29
+++ pkgsrc/mail/postfix/options.mk 2008/02/18 17:45:34 1.30
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: options.mk,v 1.29 2008/01/25 09:44:24 ghen Exp $ 1# $NetBSD: options.mk,v 1.30 2008/02/18 17:45:34 ghen Exp $
2 2
3# Global and legacy options 3# Global and legacy options
4 4
5PKG_OPTIONS_VAR= PKG_OPTIONS.postfix 5PKG_OPTIONS_VAR= PKG_OPTIONS.postfix
6PKG_SUPPORTED_OPTIONS= bdb ldap mysql mysql4 pcre pgsql sasl tls postfix-stress 6PKG_SUPPORTED_OPTIONS= bdb ldap mysql mysql4 pcre pgsql sasl tls
7PKG_SUGGESTED_OPTIONS= tls 7PKG_SUGGESTED_OPTIONS= tls
8 8
9.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
10 10
11### 11###
12### Support "hash" (Berkeley DB) map type. 12### Support "hash" (Berkeley DB) map type.
13### 13###
14.if empty(PKG_OPTIONS:Mbdb) 14.if empty(PKG_OPTIONS:Mbdb)
15PKG_OPTIONS+= bdb # "hash" map type is mandatory 15PKG_OPTIONS+= bdb # "hash" map type is mandatory
16.endif 16.endif
17.if !empty(PKG_OPTIONS:Mbdb) 17.if !empty(PKG_OPTIONS:Mbdb)
18. include "../../mk/bdb.buildlink3.mk" 18. include "../../mk/bdb.buildlink3.mk"
19CCARGS+= -DHAS_DB 19CCARGS+= -DHAS_DB
@@ -95,22 +95,13 @@ CCARGS+= -DUSE_CYRUS_SASL @@ -95,22 +95,13 @@ CCARGS+= -DUSE_CYRUS_SASL
95AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \ 95AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \
96 ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \ 96 ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \
97 -lsasl2 97 -lsasl2
98PLIST_SUBST+= SASL= 98PLIST_SUBST+= SASL=
99MESSAGE_SRC+= ${PKGDIR}/MESSAGE.sasl 99MESSAGE_SRC+= ${PKGDIR}/MESSAGE.sasl
100MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} 100MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
101MESSAGE_SUBST+= SASLLIBDIR=${SASLLIBDIR} 101MESSAGE_SUBST+= SASLLIBDIR=${SASLLIBDIR}
102MAKE_DIRS+= ${SASLLIBDIR} 102MAKE_DIRS+= ${SASLLIBDIR}
103CONF_FILES+= ${EXAMPLEDIR}/smtpd.conf ${SASLLIBDIR}/smtpd.conf 103CONF_FILES+= ${EXAMPLEDIR}/smtpd.conf ${SASLLIBDIR}/smtpd.conf
104.else 104.else
105PLIST_SUBST+= SASL="@comment " 105PLIST_SUBST+= SASL="@comment "
106CCARGS+= -DDEF_SERVER_SASL_TYPE=\"dovecot\" 106CCARGS+= -DDEF_SERVER_SASL_TYPE=\"dovecot\"
107.endif 107.endif
108 
109### 
110### Postfix stress-adaptive behaviour, back-ported from Postfix 2.5 
111### See http://www.postfix.org/STRESS_README.html#adapt 
112### 
113.if !empty(PKG_OPTIONS:Mpostfix-stress) 
114PATCHFILES= postfix-2.4-stress-patch.gz 
115PATCH_SITES= ${MASTER_SITES} 
116.endif 
cvs diff -r1.19 -r1.20 pkgsrc/mail/postfix/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/mail/postfix/patches/patch-aa 2007/06/01 03:34:07 1.19
+++ pkgsrc/mail/postfix/patches/patch-aa 2008/02/18 17:45:34 1.20
@@ -1,42 +1,42 @@ @@ -1,42 +1,42 @@
1$NetBSD: patch-aa,v 1.19 2007/06/01 03:34:07 martti Exp $ 1$NetBSD: patch-aa,v 1.20 2008/02/18 17:45:34 ghen Exp $
2 2
3--- postfix-install.orig 2007-04-02 20:14:37.000000000 +0300 3--- postfix-install.orig 2007-12-05 02:16:40.000000000 +0200
4+++ postfix-install 2007-06-01 06:26:07.000000000 +0300 4+++ postfix-install 2008-01-17 15:59:23.000000000 +0200
5@@ -359,26 +359,6 @@ 5@@ -365,26 +365,6 @@
6 : ${tempdir=`pwd`} 6 : ${tempdir=`pwd`}
7 : ${config_directory=`bin/postconf -h -d config_directory`} 7 : ${config_directory=`bin/postconf -h -d config_directory`}
8  8
9-# Find out the location of installed configuration files. 9-# Find out the location of installed configuration files.
10- 10-
11-test -z "$non_interactive" && for name in install_root tempdir config_directory 11-test -z "$non_interactive" && for name in install_root tempdir config_directory
12-do 12-do
13- while : 13- while :
14- do 14- do
15- echo 15- echo
16- eval echo Please specify \$${name}_prompt | ${FMT} 16- eval echo Please specify \$${name}_prompt | ${FMT}
17- eval echo \$n "$name: [\$$name]\ \$c" 17- eval echo \$n "$name: [\$$name]\ \$c"
18- read ans 18- read ans
19- case $ans in 19- case $ans in
20- "") break;; 20- "") break;;
21- *) case $ans in 21- *) case $ans in
22- /*) eval $name=$ans; break;; 22- /*) eval $name=$ans; break;;
23- *) echo; echo $0: Error: $name should be an absolute path name. 1>&2;; 23- *) echo; echo $0: Error: $name should be an absolute path name. 1>&2;;
24- esac;; 24- esac;;
25- esac 25- esac
26- done 26- done
27-done 27-done
28- 28-
29 # In case some systems special-case pathnames beginning with //. 29 # In case some systems special-case pathnames beginning with //.
30  30
31 case $install_root in 31 case $install_root in
32@@ -735,10 +715,3 @@ 32@@ -739,10 +719,3 @@
33 "sample_directory = $sample_directory" \ 33 "sample_directory = $sample_directory" \
34 "readme_directory = $readme_directory" \ 34 "readme_directory = $readme_directory" \
35 || exit 1 35 || exit 1
36- 36-
37-# If Postfix is being installed locally from source code, do the 37-# If Postfix is being installed locally from source code, do the
38-# post-install processing now. 38-# post-install processing now.
39- 39-
40-test -n "$install_root" || { 40-test -n "$install_root" || {
41- bin/postfix post-install $post_install_options || exit 1 41- bin/postfix post-install $post_install_options || exit 1
42-} 42-}
cvs diff -r1.20 -r1.21 pkgsrc/mail/postfix/patches/patch-ai (expand / switch to unified diff)

--- pkgsrc/mail/postfix/patches/patch-ai 2007/04/03 07:27:51 1.20
+++ pkgsrc/mail/postfix/patches/patch-ai 2008/02/18 17:45:34 1.21
@@ -1,75 +1,75 @@ @@ -1,75 +1,75 @@
1$NetBSD: patch-ai,v 1.20 2007/04/03 07:27:51 martti Exp $ 1$NetBSD: patch-ai,v 1.21 2008/02/18 17:45:34 ghen Exp $
2 2
3--- makedefs.orig 2007-03-24 15:30:18.000000000 +0200 3--- makedefs.orig 2007-08-19 14:28:11.000000000 +0000
4+++ makedefs 2007-04-03 08:51:47.000000000 +0300 4+++ makedefs 2007-10-22 05:50:31.000000000 +0000
5@@ -130,6 +130,8 @@ 5@@ -132,6 +132,8 @@
6 ;; 6 ;;
7 FreeBSD.6*) SYSTYPE=FREEBSD6 7 FreeBSD.7*) SYSTYPE=FREEBSD7
8 ;; 8 ;;
9+ DragonFly.1*) SYSTYPE=FREEBSD4 9+ DragonFly.1*) SYSTYPE=FREEBSD4
10+ ;; 10+ ;;
11 OpenBSD.2*) SYSTYPE=OPENBSD2 11 OpenBSD.2*) SYSTYPE=OPENBSD2
12 ;; 12 ;;
13 OpenBSD.3*) SYSTYPE=OPENBSD3 13 OpenBSD.3*) SYSTYPE=OPENBSD3
14@@ -196,13 +198,6 @@ 14@@ -198,13 +200,6 @@
15 esac 15 esac
16 ;; 16 ;;
17 ULTRIX.4*) SYSTYPE=ULTRIX4 17 ULTRIX.4*) SYSTYPE=ULTRIX4
18- if [ -f /usr/local/lib/libdb.a ]; then 18- if [ -f /usr/local/lib/libdb.a ]; then
19- SYSLIBS="$SYSLIBS -ldb" 19- SYSLIBS="$SYSLIBS -ldb"
20- CCARGS="$CCARGS -DHAS_DB" 20- CCARGS="$CCARGS -DHAS_DB"
21- if [ -d /usr/local/include/db ]; then 21- if [ -d /usr/local/include/db ]; then
22- CCARGS="$CCARGS -I/usr/local/include/db" 22- CCARGS="$CCARGS -I/usr/local/include/db"
23- fi 23- fi
24- fi 24- fi
25 for l in syslog resolv; do 25 for l in syslog resolv; do
26 if [ -f /usr/local/lib/lib$l.a ]; then 26 if [ -f /usr/local/lib/lib$l.a ]; then
27 SYSLIBS="$SYSLIBS -l$l" 27 SYSLIBS="$SYSLIBS -l$l"
28@@ -234,25 +229,8 @@ 28@@ -236,25 +231,8 @@
29 esac;; 29 esac;;
30 # Tested with RedHat 3.03 on 20020729. 30 # Tested with RedHat 3.03 on 20020729.
31 Linux.1*) SYSTYPE=LINUX1 31 Linux.1*) SYSTYPE=LINUX1
32- SYSLIBS="-ldb" 32- SYSLIBS="-ldb"
33 ;; 33 ;;
34 Linux.2*) SYSTYPE=LINUX2 34 Linux.2*) SYSTYPE=LINUX2
35- # Postfix no longer needs DB 1.85 compatibility 35- # Postfix no longer needs DB 1.85 compatibility
36- if [ -f /usr/include/db.h ] 36- if [ -f /usr/include/db.h ]
37- then 37- then
38- : we are all set 38- : we are all set
39- elif [ -f /usr/include/db/db.h ] 39- elif [ -f /usr/include/db/db.h ]
40- then 40- then
41- CCARGS="$CCARGS -I/usr/include/db" 41- CCARGS="$CCARGS -I/usr/include/db"
42- else 42- else
43- # No, we're not going to try db1 db2 db3 etc. 43- # No, we're not going to try db1 db2 db3 etc.
44- # On a properly installed system, Postfix builds 44- # On a properly installed system, Postfix builds
45- # by including <db.h> and by linking with -ldb 45- # by including <db.h> and by linking with -ldb
46- echo "No <db.h> include file found." 1>&2 46- echo "No <db.h> include file found." 1>&2
47- echo "Install the appropriate db*-devel package first." 1>&2 47- echo "Install the appropriate db*-devel package first." 1>&2
48- echo "See the RELEASE_NOTES file for more information." 1>&2 48- echo "See the RELEASE_NOTES file for more information." 1>&2
49- exit 1 49- exit 1
50- fi 50- fi
51 # GDBM locks the DBM .pag file after open. This breaks postmap. 51 # GDBM locks the DBM .pag file after open. This breaks postmap.
52 # if [ -f /usr/include/gdbm-ndbm.h ] 52 # if [ -f /usr/include/gdbm-ndbm.h ]
53 # then 53 # then
54@@ -263,7 +241,6 @@ 54@@ -265,7 +243,6 @@
55 # CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'" 55 # CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
56 # GDBM_LIBS=gdbm 56 # GDBM_LIBS=gdbm
57 # fi 57 # fi
58- SYSLIBS="-ldb" 58- SYSLIBS="-ldb"
59 for name in nsl resolv $GDBM_LIBS 59 for name in nsl resolv $GDBM_LIBS
60 do 60 do
61 for lib in /usr/lib64 /lib64 /usr/lib /lib 61 for lib in /usr/lib64 /lib64 /usr/lib /lib
62@@ -332,25 +309,13 @@ 62@@ -360,25 +337,13 @@
63 HP-UX.A.09.*) SYSTYPE=HPUX9 63 HP-UX.A.09.*) SYSTYPE=HPUX9
64 SYSLIBS=-ldbm 64 SYSLIBS=-ldbm
65 CCARGS="$CCARGS -DMISSING_USLEEP" 65 CCARGS="$CCARGS -DMISSING_USLEEP"
66- if [ -f /usr/lib/libdb.a ]; then 66- if [ -f /usr/lib/libdb.a ]; then
67- CCARGS="$CCARGS -DHAS_DB" 67- CCARGS="$CCARGS -DHAS_DB"
68- SYSLIBS="$SYSLIBS -ldb" 68- SYSLIBS="$SYSLIBS -ldb"
69- fi 69- fi
70 ;; 70 ;;
71 HP-UX.B.10.*) SYSTYPE=HPUX10 71 HP-UX.B.10.*) SYSTYPE=HPUX10
72 CCARGS="$CCARGS `nm /usr/lib/libc.a 2>/dev/null | 72 CCARGS="$CCARGS `nm /usr/lib/libc.a 2>/dev/null |
73 (grep usleep >/dev/null || echo '-DMISSING_USLEEP')`" 73 (grep usleep >/dev/null || echo '-DMISSING_USLEEP')`"
74- if [ -f /usr/lib/libdb.a ]; then 74- if [ -f /usr/lib/libdb.a ]; then
75- CCARGS="$CCARGS -DHAS_DB" 75- CCARGS="$CCARGS -DHAS_DB"