[pkgsrc/trunk]: pkgsrc/mail/postfix-current Update postfix-current pacakge to...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cb658e30d875
branches:  trunk
changeset: 476307:cb658e30d875
user:      taca <taca%pkgsrc.org@localhost>
date:      Sun Jun 06 13:50:41 2004 +0000

description:
Update postfix-current pacakge to postfix-20040504.

pkgsrc changes:

- install smtpd-policy script as example.
- adapot NetBSD 2.X and later.
- make local(8) handle EDQUOT as temporary error.
- enable RECEIVED_ENVELOPE_FROM.

Postfix changes:

20040324

        Portability: ekkoBSD support by Philip Reynolds.
        Files: makedefs, util/sys_defs.h.

20040325

        Cleanup: smtp_skip_4xx_greeting and smtp_skip_5xx_greeting
        functionality is moved from connection management to SMTP
        protocol processing, so that Postfix now logs the server
        response when a server refuses to provide service.  Files:
        smtp/smtp_connect.c, smtp/smtp_proto.c.

        Cleanup: smtp_skip_4xx_greeting is no longer configurable;
        it is now permanently turned on.

20040326

        Workaround: in the trivial-rewrite server, turn on the code
        to strip trailing "." while rewriting addresses, and change
        the address resolver to strip trailing "." in a compatible
        manner.  This does not eliminate the problem that the SMTP
        server may use a different address for recipient validation
        than what the cleanup server uses for virtual alias mapping.

20040329

        Bugfix: the SMTP server did not log client (and SASL)
        information with the real-time content filter was enabled.
        Files: smtpd/smtpd.c, smtpd/smtpd_sasl_proto.c.

        Compatibility: smtpd_reject_unlisted_sender is turned off
        by default, to avoid trouble with with in-house software
        that sends out mail software with an unreplyable address.

20040331

        Bugfix: postdrop should not abandon mail submission after
        receiving a SIGHUP signal when SIGHUP was ignored by the
        parent process.  Victor Duchovni, Morgan Stanley.  File:
        postdrop/postdrop.c.

        Bugfix: parsing bug in PgSQL dictionaries causing UNIX
        sockets to be ignored. Liviu Daia. Files: global/dict*sql.c.

        Performance: allow MySQL and PgSQL database connections to
        be closed when idle for more than 1 minute; Liviu Daia.
        Files: global/dict*sql.c.

20040401

        Sanity: the SMTP server no longer accepts sender or recipient
        addresses that end in the "@" null domain, as well as
        addresses that rewrite into such a form.  Specify
        "resolve_null_domain=yes" to get the old behavior back.
        File:  trivial-rewrite/resolve.c.

20040402

        Cleanup: added WARN action support for access maps, for
        consistency with the WARN action in header and body checks.
        File:  smtpd/smtpd_check.c.

20040407

        Bugfix: missing return statement at the end of the
        FREE_MEMORY_AND_RETURN error handling macro. Adi Prasaja.
        File: trivial-rewrite/resolve.c.

20040411

        Future proofing: client_rate_time_unit is renamed to
        anvil_rate_time_unit, so that it is no longer limited to
        clients only. File: src/global/mail_params.h.

        Cleanup: postalias and postmap now log problems to syslogd.
        Files: postalias/postalias.c, postmap/postmap.c.

20040413

        Feature: "postfix set-permissions" (re)sets ownership and
        access permissions of Postfix files and directories.

        Feature: "postfix upgrade-configuration" updates main.cf
        and master.cf. This is for people who people copy over
        their old files after installing a newer Postfix version.

        Feature: HTML files are now optionally installed under
        control of the html_directory configuration parameter.
        Files: postfix-install, conf/postfix-files, conf/post-install.

        Cleanup: README file installation is now optional.  Files:
        postfix-install, conf/postfix-files, conf/post-install.

20040414

        Cleanup: references to sample-mumble.cf files removed,
        conf/mumble_table files removed, new commands added to
        conf/postfix-script.

        Cleanups: function declared in but used as void, missing
        include file, missing const qualifier, unused variable.
        Matthias Andree. Files:  bounce/bounce_notify_util.c,
        bounce/bounce_service.h, postlog/postlog.c, smtpd/smtpd_check.c,
        util/attr_scan64.c.

        Bugfix: more robust version of SIGHUP test of 20040331.
        Victor Duchovni, Morgan Stanley. File: postdrop/postdrop.c.

        Safety: added NOCLOBBER qualifiers to local variables that
        might be clobbered by longjmp(). Files: util/sys_defs.h,
        smtp/smtp_proto.c, lmtp/lmtp_proto.c, smtpd/smtpd_check.c,
        smtpstone/smtp-source.c.

        Bugfix: sub-level Makefiles no longer turned on the extra
        compiler warnings. Files: Makefile.in.*, makedefs.*.

20040415

        Bugfix: the LMTP client attempted to reuse a connection
        after timeout, causing protocol synchronization errors.
        Reported by Rob Mueller. File: lmtp/lmtp.c.

20040416

        Cleanup: non-delivery reports now include the original
        recipient information. File: bounce/bounce_notify_util.c.

20040415-18

        Typos: many documentation fixes by Rob Foehl.

20040418

        Cleanup: "int" versus "const int" prototype mismatch between
        the DICT sequence method prototype and possible implementations.
        Files: util/dict_db.c, util/dict_dbm.c.

20040419

        Bugfix: the code that rejects client/helo RESTRICTIONS with
        smtpd_delay_reject=no looked at the wrong evidence and
        rejected client/helo ACCESS MAP lookups instead. Michael
        Tokarev. Files:  smtpd/smtpd.c, smtpd/smtpd_check.c.

        Bugfix: missing # in master.cf in optional submission
        service.

20040420

        Bugfix: smtpd logged the client too often. Michael Tokarev.
        File: smtpd/smtpd.c.

        Cleanup: client_event_status_update_time renamed to
        anvil_status_update_time. Files: mantools/postlink,
        proto/postconf.proto, anvil/anvil.c.

20040421

        Workaround: allow pipelined SMTP clients to overshoot the
        SMTP server recipient limit without triggering the server
        hard error limit.  The SMTP server does not count "too many
        recipients" towards the hard error limit, as long as the
        number of excess recipients stays within a configurable
        overshoot limit (default: smtpd_recipient_overshoot_limit
        = 1000).  Solution in cooperation with Victor Duchovni.
        Files:  smtpd/smtpd.c, smtpd/smtpd_state.c, smtpd/smtpd.h.

20040502

        Missing test for a never used flag (the problematic and
        thus never completed INSPECT feature that doesn't re-inject
        mail into Postfix).  Victor Duchovni, Morgan Stanley. File:
        virtual/virtual.c.

20040503

        Bugfix: missing "sasl enabled" guard in the SMTPD policy
        client.  File: smtpd/smtpd_check.c.

diffstat:

 mail/postfix-current/Makefile         |  22 ++++++++++---
 mail/postfix-current/PLIST            |  55 ++++++++++++++++++----------------
 mail/postfix-current/distinfo         |  23 ++++++++------
 mail/postfix-current/patches/patch-aa |  13 +++-----
 mail/postfix-current/patches/patch-ad |  13 --------
 mail/postfix-current/patches/patch-af |  17 +++++++---
 mail/postfix-current/patches/patch-ag |   6 +-
 mail/postfix-current/patches/patch-ai |  17 ++--------
 mail/postfix-current/patches/patch-bg |  17 ++++++++++
 mail/postfix-current/patches/patch-bk |  13 ++++++++
 mail/postfix-current/patches/patch-bs |  17 ++++++++++
 mail/postfix-current/patches/patch-bt |  17 ++++++++++
 12 files changed, 145 insertions(+), 85 deletions(-)

diffs (truncated from 449 to 300 lines):

diff -r f2853af89812 -r cb658e30d875 mail/postfix-current/Makefile
--- a/mail/postfix-current/Makefile     Sun Jun 06 13:04:24 2004 +0000
+++ b/mail/postfix-current/Makefile     Sun Jun 06 13:50:41 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2004/04/21 21:09:31 cube Exp $
+# $NetBSD: Makefile,v 1.32 2004/06/06 13:50:41 taca Exp $
 
-DISTNAME=      postfix-2.0.19-20040312
-PKGNAME=       postfix-20040312
+DISTNAME=      postfix-2.2-20040504
+PKGNAME=       postfix-20040504
 CATEGORIES=    mail
 MASTER_SITES=  ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
                http://public.planetmirror.com.au/pub/postfix/experimental/
@@ -40,6 +40,7 @@
 .endif
 
 FIX_RPATH+=    AUXLIBS
+REPLACE_PERL+= examples/smtpd-policy/greylist.pl examples/smtpd-policy/spf.pl
 
 BUILD_DEFS+=   POSTFIX_USE_INET6
 #BUILD_DEFS+=  POSTFIX_USE_TLS
@@ -52,8 +53,8 @@
 
 .if defined(POSTFIX_USE_INET6) && ${POSTFIX_USE_INET6} == "YES"
 .  include "../../security/openssl/buildlink3.mk"
-PATCHFILES+=           tls+ipv6-1.22-pf-2.0.19-20040312.patch.gz
-PATCH_SITES+=          ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.22/
+PATCHFILES+=           tls+ipv6-1.24-pf-2.2-20040504.patch.gz
+PATCH_SITES+=          ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.24/
 PATCH_DIST_STRIP=      -p1
 
 CCARGS+=       -DHAS_SSL
@@ -135,7 +136,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}
@@ -211,6 +212,15 @@
 do-install:
        cd ${WRKSRC} && ${SETENV} config_directory="${SHAREDIR}"        \
                ${SH} postfix-install -non-interactive
+.if defined(POSTFIX_USE_INET6) && ${POSTFIX_USE_INET6} == "YES"
+       ${INSTALL_DATA} ${WRKSRC}/conf/sample-ipv6.cf ${SHAREDIR}
+       ${INSTALL_DATA} ${WRKSRC}/conf/sample-tls.cf ${SHAREDIR}
+.endif
+       ${INSTALL_DATA_DIR} ${SHAREDIR}/smtpd-policy
+       ${INSTALL_SCRIPT} ${WRKSRC}/examples/smtpd-policy/greylist.pl \
+               ${SHAREDIR}/smtpd-policy
+       ${INSTALL_SCRIPT} ${WRKSRC}/examples/smtpd-policy/spf.pl \
+               ${SHAREDIR}/smtpd-policy
 
 .if ${OPSYS} == "Linux"
 .  include "../../databases/db/buildlink3.mk"
diff -r f2853af89812 -r cb658e30d875 mail/postfix-current/PLIST
--- a/mail/postfix-current/PLIST        Sun Jun 06 13:04:24 2004 +0000
+++ b/mail/postfix-current/PLIST        Sun Jun 06 13:50:41 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/03/06 15:04:12 grant Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/06/06 13:50:41 taca Exp $
 bin/mailq
 bin/newaliases
 libexec/postfix/anvil
@@ -39,12 +39,21 @@
 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/pgsql_table.5
+man/man5/postconf.5
 man/man5/pcre_table.5
 man/man5/regexp_table.5
 man/man5/relocated.5
+man/man5/tcp_table.5
 man/man5/transport.5
 man/man5/virtual.5
+man/man8/anvil.8
 man/man8/bounce.8
 man/man8/cleanup.8
 man/man8/defer.8
@@ -53,6 +62,7 @@
 man/man8/lmtp.8
 man/man8/local.8
 man/man8/master.8
+man/man8/oqmgr.8
 man/man8/pickup.8
 man/man8/pipe.8
 man/man8/proxymap.8
@@ -62,7 +72,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
@@ -76,32 +88,42 @@
 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
 share/doc/postfix/FILTER_README
-share/doc/postfix/HOSTING_README
 share/doc/postfix/INSTALL
 share/doc/postfix/LDAP_README
 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/QSHAPE_README
 share/doc/postfix/QMQP_README
+share/doc/postfix/RELEASE_NOTES
 share/doc/postfix/SCHEDULER_README
-share/doc/postfix/RELEASE_NOTES
 share/doc/postfix/RESTRICTION_CLASS_README
 share/doc/postfix/SASL_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
@@ -114,28 +136,9 @@
 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-compatibility.cf
-share/examples/postfix/sample-debug.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-pgsql-aliases.cf
-share/examples/postfix/sample-qmqpd.cf
-share/examples/postfix/sample-rate.cf
-share/examples/postfix/sample-relocated.cf
-share/examples/postfix/sample-resource.cf
-share/examples/postfix/sample-rewrite.cf
-share/examples/postfix/sample-scheduler.cf
-share/examples/postfix/sample-smtp.cf
-share/examples/postfix/sample-smtpd.cf
-share/examples/postfix/sample-transport.cf
-share/examples/postfix/sample-verify.cf
-share/examples/postfix/sample-virtual.cf
+share/examples/postfix/smtpd-policy/greylist.pl
+share/examples/postfix/smtpd-policy/spf.pl
+@dirrm share/examples/postfix/smtpd-policy
 @dirrm share/examples/postfix
 @dirrm share/doc/postfix
 @dirrm libexec/postfix
diff -r f2853af89812 -r cb658e30d875 mail/postfix-current/distinfo
--- a/mail/postfix-current/distinfo     Sun Jun 06 13:04:24 2004 +0000
+++ b/mail/postfix-current/distinfo     Sun Jun 06 13:50:41 2004 +0000
@@ -1,17 +1,20 @@
-$NetBSD: distinfo,v 1.5 2004/05/04 19:59:06 minskim Exp $
+$NetBSD: distinfo,v 1.6 2004/06/06 13:50:41 taca Exp $
 
-SHA1 (postfix/postfix-2.0.19-20040312.tar.gz) = 68ade8c704c3c54ad6465d695ff9b8f0230e8758
-Size (postfix/postfix-2.0.19-20040312.tar.gz) = 1531471 bytes
-SHA1 (postfix/tls+ipv6-1.22-pf-2.0.19-20040312.patch.gz) = adde688f01f56906b57968e35d66de715e5df9df
-Size (postfix/tls+ipv6-1.22-pf-2.0.19-20040312.patch.gz) = 256057 bytes
-SHA1 (patch-aa) = 39a89a28cec3fd264dbda97633e34695eaad01e9
+SHA1 (postfix/postfix-2.2-20040504.tar.gz) = c0b2493c8f407396117e453b011633ea72f21e93
+Size (postfix/postfix-2.2-20040504.tar.gz) = 1989111 bytes
+SHA1 (postfix/tls+ipv6-1.24-pf-2.2-20040504.patch.gz) = 6bfe5abbe051fc412280fae1f7d13a7c2b8e5d13
+Size (postfix/tls+ipv6-1.24-pf-2.2-20040504.patch.gz) = 256490 bytes
+SHA1 (patch-aa) = 2c29fa353a07d651b2c32a6ee2e5e80f31e1c08f
 SHA1 (patch-ab) = ac4c75fb7a36491edf03b54915c7a47461748b4d
 SHA1 (patch-ac) = b0d26742fe8496b2fd4729a41fecadc275e71cf2
-SHA1 (patch-ad) = 60d98330d4b20508c03bb0bccebbe564ffea621f
 SHA1 (patch-ae) = 9ea314db37541a1a9c7765e000687c0fdef90d8e
-SHA1 (patch-af) = 9b0521751704fd1377d8215dc16a873c1d5ca032
-SHA1 (patch-ag) = 23f24d535d1f3922f396ce05953dc197dd390bee
+SHA1 (patch-af) = db5b23950e18d6914718d785396873bcdabed941
+SHA1 (patch-ag) = e3b1bb58d193f487e0eb3844a72969dc8d9d4f61
 SHA1 (patch-ah) = 6beedd15ee3a7cfd46cf3ed0b9ee579b9906300b
-SHA1 (patch-ai) = eb9406c02f91d20201ebdcdc8bfadab506a1174f
+SHA1 (patch-ai) = 1e9954ff10db17870f27671e8b72ea8f816802bc
 SHA1 (patch-bd) = 652b96357164208e39d322e84ee9a2ad2bd4ccc4
 SHA1 (patch-be) = dd00235af79a8d5e46a7d393e18840241bb685a8
+SHA1 (patch-bg) = d09d7fce17e27b1e91c0914b4e7b1b3f418f5356
+SHA1 (patch-bk) = aa3516374629a525c75caca4ed89c2225c47506f
+SHA1 (patch-bs) = 2dfa789f4fb2ef6fbf4ba85387c8c29bafe224c0
+SHA1 (patch-bt) = 912cc7811743ce1ff8b556085dbc2ffc73808333
diff -r f2853af89812 -r cb658e30d875 mail/postfix-current/patches/patch-aa
--- a/mail/postfix-current/patches/patch-aa     Sun Jun 06 13:04:24 2004 +0000
+++ b/mail/postfix-current/patches/patch-aa     Sun Jun 06 13:50:41 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.11 2004/03/06 15:08:32 grant Exp $
+$NetBSD: patch-aa,v 1.12 2004/06/06 13:50:41 taca Exp $
 
---- postfix-install.orig       2003-03-21 20:04:53.000000000 +0100
+--- postfix-install.orig       2004-04-15 00:45:23.000000000 +0900
 +++ postfix-install
-@@ -338,33 +338,13 @@ README files. Specify \"no\" if you do n
+@@ -354,33 +354,13 @@ HTML files. Specify \"no\" if you do not
  : ${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 @@ bin/postconf -c $CONFIG_DIRECTORY -e \
      "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 f2853af89812 -r cb658e30d875 mail/postfix-current/patches/patch-ad
--- a/mail/postfix-current/patches/patch-ad     Sun Jun 06 13:04:24 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2004/03/06 15:08:32 grant 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
- # support programs and daemons. This directory must be owned by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = __PREFIX/libexec/postfix
- 
- # The queue_directory specifies the location of the Postfix queue.
- # This is also the root directory of Postfix daemons that run chrooted.
diff -r f2853af89812 -r cb658e30d875 mail/postfix-current/patches/patch-af
--- a/mail/postfix-current/patches/patch-af     Sun Jun 06 13:04:24 2004 +0000
+++ b/mail/postfix-current/patches/patch-af     Sun Jun 06 13:50:41 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.8 2004/03/06 15:08:32 grant Exp $
+$NetBSD: patch-af,v 1.9 2004/06/06 13:50:41 taca Exp $
 
---- conf/main.cf.orig  2003-09-06 03:30:35.000000000 +0300
-+++ conf/main.cf       2004-01-21 08:40:42.000000000 +0200
-@@ -31,13 +31,18 @@
+--- conf/main.cf.orig  2004-04-15 22:27:21.000000000 +0900
++++ conf/main.cf
+@@ -32,13 +32,18 @@ queue_directory = /var/spool/postfix
  # The command_directory parameter specifies the location of all
  # postXXX commands.
  #
@@ -23,7 +23,7 @@
  
  # QUEUE AND PROCESS OWNERSHIP
  #
-@@ -55,7 +60,7 @@
+@@ -56,7 +61,7 @@ mail_owner = postfix
  # These rights are used in the absence of a recipient user context.
  # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
  #
@@ -32,19 +32,24 @@
  
  # INTERNET HOST AND DOMAIN NAMES
  # 
-@@ -621,16 +626,16 @@