[pkgsrc/trunk]: pkgsrc/mail/postfix Updated postfix to 2.1.3

[martti <martti%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5fa81dbd74e7
branches:  trunk
changeset: 476859:5fa81dbd74e7
user:      martti <martti%pkgsrc.org@localhost>
date:      Mon Jun 21 16:13:23 2004 +0000

description:
Updated postfix to 2.1.3

This is the new 2.1.x series, please see www.postfix.org for
complete list of changes since 2.0.20.

diffstat:

 mail/postfix/Makefile         |  34 +++++++++++++----------
 mail/postfix/PLIST            |  62 ++++++++++++++++++++++--------------------
 mail/postfix/PLIST.tls        |   4 +--
 mail/postfix/distinfo         |  29 ++++++++-----------
 mail/postfix/patches/patch-aa |  15 ++++------
 mail/postfix/patches/patch-ad |  13 ---------
 mail/postfix/patches/patch-ae |  27 +++---------------
 mail/postfix/patches/patch-af |  17 +++++++----
 mail/postfix/patches/patch-ag |  16 +++++-----
 mail/postfix/patches/patch-ai |  19 +++---------
 mail/postfix/patches/patch-ba |  12 --------
 mail/postfix/patches/patch-bb |  12 --------
 mail/postfix/patches/patch-bc |  33 ----------------------
 mail/postfix/patches/patch-bd |  42 -----------------------------
 14 files changed, 99 insertions(+), 236 deletions(-)

diffs (truncated from 582 to 300 lines):

diff -r 84d129df428b -r 5fa81dbd74e7 mail/postfix/Makefile
--- a/mail/postfix/Makefile     Mon Jun 21 16:12:53 2004 +0000
+++ b/mail/postfix/Makefile     Mon Jun 21 16:13:23 2004 +0000
@@ -1,9 +1,13 @@
-# $NetBSD: Makefile,v 1.131 2004/05/21 08:10:41 martti Exp $
+# $NetBSD: Makefile,v 1.132 2004/06/21 16:13:23 martti Exp $
 
-DISTNAME=      postfix-2.0.20
+DISTNAME=      postfix-2.1.3
 CATEGORIES=    mail
 MASTER_SITES=  ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 
+PATCHFILES+=           postfix-2.1.1-canonical_classes.diff
+PATCH_SITES+=          ftp://ftp.gw.com/pub/people/kim/patches/
+PATCH_DIST_STRIP=      -p1
+
 MAINTAINER=    martti%NetBSD.org@localhost
 HOMEPAGE=      http://www.postfix.org/
 COMMENT=       Postfix SMTP server and tools
@@ -50,7 +54,7 @@
 
 .if defined(POSTFIX_USE_INET6) && ${POSTFIX_USE_INET6} == "YES"
 .  include "../../security/openssl/buildlink3.mk"
-PATCHFILES+=           tls+ipv6-1.24-pf-2.0.20.patch.gz
+PATCHFILES+=           tls+ipv6-1.24-pf-2.1.1.patch.gz
 PATCH_SITES+=          ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.24/
 PATCH_DIST_STRIP=      -p1
 
@@ -96,17 +100,17 @@
                -lmysqlclient -lz -lm
 .endif
 
-.if defined(POSTFIX_USE_PGSQL) && ${POSTFIX_USE_PGSQL} == "YES"
-.  include "../../databases/postgresql-lib/buildlink3.mk"
-.  include "../../security/openssl/buildlink3.mk"
-PATCHFILES+=           postfix-pg.postfix-2.0.0.2.patch
-PATCH_SITES+=          http://www.mat.cc/postfix/
-PATCH_DIST_STRIP=      -p1
-
-CCARGS+=       -DHAS_PGSQL -I${BUILDLINK_PREFIX.postgresql-lib}/include/pgsql
-AUXLIBS+=      -L${BUILDLINK_PREFIX.postgresql-lib}/lib -lpq \
-               -L${BUILDLINK_PREFIX.openssl}/lib -lcrypt
-.endif
+## .if defined(POSTFIX_USE_PGSQL) && ${POSTFIX_USE_PGSQL} == "YES"
+## .  include "../../databases/postgresql-lib/buildlink3.mk"
+## .  include "../../security/openssl/buildlink3.mk"
+## PATCHFILES+=                postfix-pg.postfix-2.0.0.2.patch
+## PATCH_SITES+=               http://www.mat.cc/postfix/
+## PATCH_DIST_STRIP=   -p1
+##
+## CCARGS+=    -DHAS_PGSQL -I${BUILDLINK_PREFIX.postgresql-lib}/include/pgsql
+## AUXLIBS+=   -L${BUILDLINK_PREFIX.postgresql-lib}/lib -lpq \
+##             -L${BUILDLINK_PREFIX.openssl}/lib -lcrypt
+## .endif
 
 .if defined(USE_SASL2) && ${USE_SASL2} == "YES"
 USING_SASL=    YES
@@ -140,7 +144,7 @@
 MAKE_ENV+=     AUXLIBS="${AUXLIBS}" CCARGS="${CCARGS}"
 
 POSTFIX_CONF_FILES=    conf/main.cf src/util/sys_defs.h postfix-install
-POSTFIX_CONF_FILES+=   conf/sample-misc.cf src/global/mail_params.h
+POSTFIX_CONF_FILES+=   src/global/mail_params.h
 
 FILES_SUBST+=  SHAREDIR=${SHAREDIR}
 MESSAGE_SUBST+=        SHAREDIR=${SHAREDIR}
diff -r 84d129df428b -r 5fa81dbd74e7 mail/postfix/PLIST
--- a/mail/postfix/PLIST        Mon Jun 21 16:12:53 2004 +0000
+++ b/mail/postfix/PLIST        Mon Jun 21 16:13:23 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2003/05/01 14:07:57 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.9 2004/06/21 16:13:23 martti Exp $
 bin/mailq
 bin/newaliases
 libexec/postfix/bounce
@@ -9,6 +9,7 @@
 libexec/postfix/local
 libexec/postfix/master
 libexec/postfix/nqmgr
+libexec/postfix/oqmgr
 libexec/postfix/pickup
 libexec/postfix/pipe
 libexec/postfix/proxymap
@@ -19,6 +20,7 @@
 libexec/postfix/smtpd
 libexec/postfix/spawn
 libexec/postfix/trivial-rewrite
+libexec/postfix/verify
 libexec/postfix/virtual
 man/man1/mailq.1
 man/man1/newaliases.1
@@ -36,8 +38,15 @@
 man/man1/sendmail.1
 man/man5/access.5
 man/man5/aliases.5
+man/man5/body_checks.5
 man/man5/canonical.5
+man/man5/cidr_table.5
+man/man5/header_checks.5
+man/man5/ldap_table.5
+man/man5/mysql_table.5
 man/man5/pcre_table.5
+man/man5/pgsql_table.5
+man/man5/postconf.5
 man/man5/regexp_table.5
 man/man5/relocated.5
 man/man5/transport.5
@@ -50,7 +59,7 @@
 man/man8/lmtp.8
 man/man8/local.8
 man/man8/master.8
-man/man8/nqmgr.8
+man/man8/oqmgr.8
 man/man8/pickup.8
 man/man8/pipe.8
 man/man8/proxymap.8
@@ -60,7 +69,9 @@
 man/man8/smtp.8
 man/man8/smtpd.8
 man/man8/spawn.8
+man/man8/trace.8
 man/man8/trivial-rewrite.8
+man/man8/verify.8
 man/man8/virtual.8
 sbin/postalias
 sbin/postcat
@@ -74,7 +85,15 @@
 sbin/postqueue
 sbin/postsuper
 sbin/sendmail
+share/doc/postfix/AAAREADME
 share/doc/postfix/ADDRESS_CLASS_README
+share/doc/postfix/ADDRESS_REWRITING_README
+share/doc/postfix/ADDRESS_VERIFICATION_README
+share/doc/postfix/BACKSCATTER_README
+share/doc/postfix/BASIC_CONFIGURATION_README
+share/doc/postfix/BUILTIN_FILTER_README
+share/doc/postfix/CONTENT_INSPECTION_README
+share/doc/postfix/DATABASE_README
 share/doc/postfix/DB_README
 share/doc/postfix/DEBUG_README
 share/doc/postfix/ETRN_README
@@ -84,53 +103,36 @@
 share/doc/postfix/LINUX_README
 share/doc/postfix/LMTP_README
 share/doc/postfix/LOCAL_RECIPIENT_README
-share/doc/postfix/MACOSX_README
 share/doc/postfix/MAILDROP_README
 share/doc/postfix/MYSQL_README
 share/doc/postfix/NFS_README
+share/doc/postfix/OVERVIEW
 share/doc/postfix/PACKAGE_README
 share/doc/postfix/PCRE_README
+share/doc/postfix/PGSQL_README
 share/doc/postfix/QMQP_README
+share/doc/postfix/QSHAPE_README
 share/doc/postfix/RELEASE_NOTES
 share/doc/postfix/RESTRICTION_CLASS_README
 share/doc/postfix/SASL_README
+share/doc/postfix/SCHEDULER_README
+share/doc/postfix/SMTPD_ACCESS_README
+share/doc/postfix/SMTPD_POLICY_README
+share/doc/postfix/SMTPD_PROXY_README
+share/doc/postfix/STANDARD_CONFIGURATION_README
+share/doc/postfix/TUNING_README
 share/doc/postfix/ULTRIX_README
 share/doc/postfix/UUCP_README
 share/doc/postfix/VERP_README
 share/doc/postfix/VIRTUAL_README
+share/doc/postfix/XCLIENT_README
+share/doc/postfix/XFORWARD_README
 share/examples/postfix/mailer.conf
 share/examples/postfix/main.cf
 share/examples/postfix/master.cf
 share/examples/postfix/post-install
 share/examples/postfix/postfix-files
 share/examples/postfix/postfix-script
-share/examples/postfix/sample-aliases.cf
-share/examples/postfix/sample-auth.cf
-share/examples/postfix/sample-canonical.cf
-share/examples/postfix/sample-compatibility.cf
-share/examples/postfix/sample-debug.cf
-share/examples/postfix/sample-filter.cf
-share/examples/postfix/sample-flush.cf
-share/examples/postfix/sample-ldap.cf
-share/examples/postfix/sample-lmtp.cf
-share/examples/postfix/sample-local.cf
-share/examples/postfix/sample-mime.cf
-share/examples/postfix/sample-misc.cf
-share/examples/postfix/sample-pcre-access.cf
-share/examples/postfix/sample-pcre-body.cf
-share/examples/postfix/sample-pcre-header.cf
-share/examples/postfix/sample-qmqpd.cf
-share/examples/postfix/sample-rate.cf
-share/examples/postfix/sample-regexp-access.cf
-share/examples/postfix/sample-regexp-body.cf
-share/examples/postfix/sample-regexp-header.cf
-share/examples/postfix/sample-relocated.cf
-share/examples/postfix/sample-resource.cf
-share/examples/postfix/sample-rewrite.cf
-share/examples/postfix/sample-smtp.cf
-share/examples/postfix/sample-smtpd.cf
-share/examples/postfix/sample-transport.cf
-share/examples/postfix/sample-virtual.cf
 @dirrm share/examples/postfix
 @dirrm share/doc/postfix
 @dirrm libexec/postfix
diff -r 84d129df428b -r 5fa81dbd74e7 mail/postfix/PLIST.tls
--- a/mail/postfix/PLIST.tls    Mon Jun 21 16:12:53 2004 +0000
+++ b/mail/postfix/PLIST.tls    Mon Jun 21 16:13:23 2004 +0000
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST.tls,v 1.3 2003/05/21 09:24:01 martti Exp $
+@comment $NetBSD: PLIST.tls,v 1.4 2004/06/21 16:13:23 martti Exp $
 libexec/postfix/tlsmgr
 man/man8/tlsmgr.8
 share/doc/postfix/IPV6_README
-share/examples/postfix/sample-ipv6.cf
-share/examples/postfix/sample-tls.cf
diff -r 84d129df428b -r 5fa81dbd74e7 mail/postfix/distinfo
--- a/mail/postfix/distinfo     Mon Jun 21 16:12:53 2004 +0000
+++ b/mail/postfix/distinfo     Mon Jun 21 16:13:23 2004 +0000
@@ -1,21 +1,16 @@
-$NetBSD: distinfo,v 1.65 2004/06/06 01:12:52 grant Exp $
+$NetBSD: distinfo,v 1.66 2004/06/21 16:13:23 martti Exp $
 
-SHA1 (postfix/postfix-2.0.20.tar.gz) = ffedae380952a5afc2c3f6b5e610b099e10e3c91
-Size (postfix/postfix-2.0.20.tar.gz) = 1354414 bytes
-SHA1 (postfix/tls+ipv6-1.24-pf-2.0.20.patch.gz) = ff6d08bb950eb8b038fe518b7132705518270486
-Size (postfix/tls+ipv6-1.24-pf-2.0.20.patch.gz) = 258462 bytes
-SHA1 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 70a58f5bd6f8d833dd7cf3d90613f64eeae45f4b
-Size (postfix/postfix-pg.postfix-2.0.0.2.patch) = 27423 bytes
-SHA1 (patch-aa) = 39a89a28cec3fd264dbda97633e34695eaad01e9
+SHA1 (postfix/postfix-2.1.3.tar.gz) = 1c08947afa33a1cf1477954d906aa8d95922ea6f
+Size (postfix/postfix-2.1.3.tar.gz) = 1971632 bytes
+SHA1 (postfix/postfix-2.1.1-canonical_classes.diff) = f97f8879a7a047db062ba8f53f71c71b7d811667
+Size (postfix/postfix-2.1.1-canonical_classes.diff) = 9645 bytes
+SHA1 (postfix/tls+ipv6-1.24-pf-2.1.1.patch.gz) = cfb133eb1b67554fc228d6afb4c4659efd3d2c73
+Size (postfix/tls+ipv6-1.24-pf-2.1.1.patch.gz) = 256320 bytes
+SHA1 (patch-aa) = ca3d2739c35c89056b2f0c19a2cbcb9e018013c6
 SHA1 (patch-ab) = ac4c75fb7a36491edf03b54915c7a47461748b4d
 SHA1 (patch-ac) = b0d26742fe8496b2fd4729a41fecadc275e71cf2
-SHA1 (patch-ad) = 60d98330d4b20508c03bb0bccebbe564ffea621f
-SHA1 (patch-ae) = 2a118fb905c469f8a2e947c3e91b5d4e82c5bb6e
-SHA1 (patch-af) = 9b0521751704fd1377d8215dc16a873c1d5ca032
-SHA1 (patch-ag) = 1753a7bfe9929fc3eabc02b07cdcb9fae4e351d2
+SHA1 (patch-ae) = 98ff7efe8338d4e6e05e311d070237d726161af2
+SHA1 (patch-af) = c5fc75f8f9499ed533bd30e162ec8784e446d288
+SHA1 (patch-ag) = 292b3b5d87f4688930fd654edfc5cb83ca8a2652
 SHA1 (patch-ah) = 6beedd15ee3a7cfd46cf3ed0b9ee579b9906300b
-SHA1 (patch-ai) = 475737812dd2025ae52ba9eab7569119d251eed6
-SHA1 (patch-ba) = e0ed2e41db1cfaf5d924578e536d809ff8623e2d
-SHA1 (patch-bb) = ba4cf4020ee26c3e43bd816f549ad6557a484110
-SHA1 (patch-bc) = 07ee685f6c607a5ee7ea723c4a36729a9c662ba1
-SHA1 (patch-bd) = 380f3947559667784584c05c0d38eb3ce61a13d5
+SHA1 (patch-ai) = e7284d9b3d7b83def7994269867e443fc0394d40
diff -r 84d129df428b -r 5fa81dbd74e7 mail/postfix/patches/patch-aa
--- a/mail/postfix/patches/patch-aa     Mon Jun 21 16:12:53 2004 +0000
+++ b/mail/postfix/patches/patch-aa     Mon Jun 21 16:13:23 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.13 2003/05/01 14:07:58 jmmv Exp $
+$NetBSD: patch-aa,v 1.14 2004/06/21 16:13:23 martti Exp $
 
---- postfix-install.orig       2003-03-21 20:04:53.000000000 +0100
-+++ postfix-install
-@@ -338,33 +338,13 @@ README files. Specify \"no\" if you do n
+--- postfix-install.orig       2004-04-14 11:45:23.000000000 -0400
++++ postfix-install    2004-05-23 22:32:31.000000000 -0400
+@@ -354,33 +354,13 @@
  : ${tempdir=`pwd`}
  : ${config_directory=`bin/postconf -h -d config_directory`}
  
@@ -37,7 +37,7 @@
  
  # If a parameter is not set via the command line or environment,
  # try to use settings from installed configuration files.
-@@ -652,13 +632,3 @@ bin/postconf -c $CONFIG_DIRECTORY -e \
+@@ -715,10 +695,3 @@
      "sample_directory = $sample_directory" \
      "readme_directory = $readme_directory" \
  || exit 1
@@ -46,8 +46,5 @@
 -# post-install processing now.
 -
 -test -n "$install_root" || {
--    export daemon_directory command_directory queue_directory sendmail_path \
--      newaliases_path mailq_path mail_owner setgid_group manpage_directory \
--      sample_directory readme_directory
--    ${SHELL} conf/post-install $post_install_options || exit 1
+-    bin/postfix post-install $post_install_options || exit 1
 -}
diff -r 84d129df428b -r 5fa81dbd74e7 mail/postfix/patches/patch-ad
--- a/mail/postfix/patches/patch-ad     Mon Jun 21 16:12:53 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.7 2004/01/21 06:56:48 martti Exp $
-
---- conf/sample-misc.cf.orig   2003-08-12 19:20:19.000000000 +0300
-+++ conf/sample-misc.cf        2004-01-21 08:40:15.000000000 +0200
-@@ -360,7 +360,7 @@
- # The daemon_directory parameter specifies the location of Postfix