[pkgsrc/trunk]: pkgsrc/mail/postfix-current Updated postfix-current to 2.2-20...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/mail/postfix-current Updated postfix-current to 2.2-20...
From: martti <martti%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 00:16:58 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/f75a51aada3b
branches:  trunk
changeset: 477405:f75a51aada3b
user:      martti <martti%pkgsrc.org@localhost>
date:      Fri Jul 02 08:03:04 2004 +0000

description:
Updated postfix-current to 2.2-20040628

* Sync with pkgsrc/mail/postfix
* Get rid of canonical_classes patch
* No IPv6 patch

diffstat:

 mail/postfix-current/INSTALL          |   4 +-
 mail/postfix-current/Makefile         |  76 ++++++++++++++++------------------
 mail/postfix-current/PLIST            |  26 +++++------
 mail/postfix-current/PLIST.tls        |   4 +-
 mail/postfix-current/distinfo         |  24 +++-------
 mail/postfix-current/patches/patch-aa |  10 ++--
 mail/postfix-current/patches/patch-ab |   2 +-
 mail/postfix-current/patches/patch-ac |   2 +-
 mail/postfix-current/patches/patch-ae |  21 ++-------
 mail/postfix-current/patches/patch-af |  14 +++---
 mail/postfix-current/patches/patch-ag |  16 +++---
 mail/postfix-current/patches/patch-ah |   2 +-
 mail/postfix-current/patches/patch-ai |  10 ++--
 mail/postfix-current/patches/patch-bd |  12 -----
 mail/postfix-current/patches/patch-be |  30 -------------
 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 -------
 19 files changed, 92 insertions(+), 225 deletions(-)

diffs (truncated from 565 to 300 lines):

diff -r cfae5aa13e03 -r f75a51aada3b mail/postfix-current/INSTALL
--- a/mail/postfix-current/INSTALL      Fri Jul 02 07:59:58 2004 +0000
+++ b/mail/postfix-current/INSTALL      Fri Jul 02 08:03:04 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.1.1.1 2004/03/06 15:04:12 grant Exp $
+# $NetBSD: INSTALL,v 1.2 2004/07/02 08:03:04 martti Exp $
 #
 
 SHAREDIR=@SHAREDIR@
@@ -6,6 +6,6 @@
 case $STAGE in
 POST-INSTALL)
        echo "===> Running postfix's post-install script"
-       @SHAREDIR@/post-install command_directory="@PREFIX@/sbin" first-install
+       @SHAREDIR@/post-install command_directory=@PREFIX@/sbin first-install
        ;;
 esac
diff -r cfae5aa13e03 -r f75a51aada3b mail/postfix-current/Makefile
--- a/mail/postfix-current/Makefile     Fri Jul 02 07:59:58 2004 +0000
+++ b/mail/postfix-current/Makefile     Fri Jul 02 08:03:04 2004 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2004/06/06 13:50:41 taca Exp $
+# $NetBSD: Makefile,v 1.33 2004/07/02 08:03:04 martti Exp $
 
-DISTNAME=      postfix-2.2-20040504
-PKGNAME=       postfix-20040504
+DISTNAME=      postfix-2.2-20040628
 CATEGORIES=    mail
 MASTER_SITES=  ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
                http://public.planetmirror.com.au/pub/postfix/experimental/
@@ -40,10 +39,9 @@
 .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
+BUILD_DEFS+=   POSTFIX_USE_TLS
 BUILD_DEFS+=   POSTFIX_USE_PCRE
 BUILD_DEFS+=   POSTFIX_USE_MYSQL
 BUILD_DEFS+=   POSTFIX_USE_PGSQL
@@ -51,20 +49,20 @@
 BUILD_DEFS+=   USE_SASL
 BUILD_DEFS+=   USE_SASL2
 
-.if defined(POSTFIX_USE_INET6) && ${POSTFIX_USE_INET6} == "YES"
-.  include "../../security/openssl/buildlink3.mk"
-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
-AUXLIBS+=      -L${BUILDLINK_PREFIX.openssl}/lib                       \
-               -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib        \
-               -lssl -lcrypto
-
-PLIST_SRC+=    ${PKGDIR}/PLIST.tls
-MESSAGE_SRC+=  ${PKGDIR}/MESSAGE.tls
-.endif
+# .if defined(POSTFIX_USE_INET6) && ${POSTFIX_USE_INET6} == "YES"
+# .  include "../../security/openssl/buildlink3.mk"
+# PATCHFILES+=         tls+ipv6-1.25-pf-2.2-20040616.patch.gz
+# PATCH_SITES+=                ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.25/
+# PATCH_DIST_STRIP=    -p1
+# 
+# CCARGS+=     -DHAS_SSL
+# AUXLIBS+=    -L${BUILDLINK_PREFIX.openssl}/lib                       \
+#              -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib        \
+#              -lssl -lcrypto
+# 
+# PLIST_SRC+=  ${PKGDIR}/PLIST.tls
+# MESSAGE_SRC+=        ${PKGDIR}/MESSAGE.tls
+# .endif
 
 .if defined(POSTFIX_USE_PCRE) && ${POSTFIX_USE_PCRE} == "YES"
 .  include "../../devel/pcre/buildlink3.mk"
@@ -82,6 +80,13 @@
 AUXLIBS+=      -L${BUILDLINK_PREFIX.openldap}/lib                      \
                -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openldap}/lib       \
                -lldap -llber
+.  if ${OPSYS} != "Linux"
+.    include "../../databases/db4/buildlink3.mk"
+CCARGS+=       -I${BUILDLINK_PREFIX.db4}/include/db4
+AUXLIBS+=      -L${BUILDLINK_PREFIX.db4}/lib                    \
+               -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.db4}/lib     \
+               -ldb4
+.  endif
 .endif
 
 .if defined(POSTFIX_USE_MYSQL) && ${POSTFIX_USE_MYSQL} == "YES"
@@ -92,17 +97,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
@@ -112,7 +117,7 @@
                -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib     \
                -lsasl2
 .elif defined(USE_SASL) && ${USE_SASL} == "YES"
-USING_SASL=    YES
+USING_SASL=YES
 .  include "../../security/cyrus-sasl/buildlink3.mk"
 CCARGS+=       -DUSE_SASL_AUTH
 AUXLIBS+=      -L${BUILDLINK_PREFIX.cyrus-sasl}/lib                    \
@@ -212,15 +217,6 @@
 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 cfae5aa13e03 -r f75a51aada3b mail/postfix-current/PLIST
--- a/mail/postfix-current/PLIST        Fri Jul 02 07:59:58 2004 +0000
+++ b/mail/postfix-current/PLIST        Fri Jul 02 08:03:04 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/06/06 13:50:41 taca Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/07/02 08:03:04 martti Exp $
 bin/mailq
 bin/newaliases
 libexec/postfix/anvil
@@ -45,9 +45,9 @@
 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/pcre_table.5
 man/man5/regexp_table.5
 man/man5/relocated.5
 man/man5/tcp_table.5
@@ -113,12 +113,12 @@
 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/QMQP_README
 share/doc/postfix/RELEASE_NOTES
-share/doc/postfix/SCHEDULER_README
 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
@@ -130,15 +130,13 @@
 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/smtpd-policy/greylist.pl
-share/examples/postfix/smtpd-policy/spf.pl
-@dirrm share/examples/postfix/smtpd-policy
-@dirrm share/examples/postfix
+share/examples/postfix-2.2/mailer.conf
+share/examples/postfix-2.2/main.cf
+share/examples/postfix-2.2/master.cf
+share/examples/postfix-2.2/post-install
+share/examples/postfix-2.2/postfix-files
+share/examples/postfix-2.2/postfix-script
+@dirrm share/examples/postfix-2.2
 @dirrm share/doc/postfix
+@dirrm libexec/postfix-2.2
 @dirrm libexec/postfix
diff -r cfae5aa13e03 -r f75a51aada3b mail/postfix-current/PLIST.tls
--- a/mail/postfix-current/PLIST.tls    Fri Jul 02 07:59:58 2004 +0000
+++ b/mail/postfix-current/PLIST.tls    Fri Jul 02 08:03:04 2004 +0000
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST.tls,v 1.1.1.1 2004/03/06 15:04:12 grant Exp $
+@comment $NetBSD: PLIST.tls,v 1.2 2004/07/02 08:03:04 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 cfae5aa13e03 -r f75a51aada3b mail/postfix-current/distinfo
--- a/mail/postfix-current/distinfo     Fri Jul 02 07:59:58 2004 +0000
+++ b/mail/postfix-current/distinfo     Fri Jul 02 08:03:04 2004 +0000
@@ -1,20 +1,12 @@
-$NetBSD: distinfo,v 1.6 2004/06/06 13:50:41 taca Exp $
+$NetBSD: distinfo,v 1.7 2004/07/02 08:03:04 martti Exp $
 
-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 (postfix/postfix-2.2-20040628.tar.gz) = f5fb9278cbcb86fd2d90ceea62e806894561a333
+Size (postfix/postfix-2.2-20040628.tar.gz) = 2014579 bytes
+SHA1 (patch-aa) = ca3d2739c35c89056b2f0c19a2cbcb9e018013c6
 SHA1 (patch-ab) = ac4c75fb7a36491edf03b54915c7a47461748b4d
 SHA1 (patch-ac) = b0d26742fe8496b2fd4729a41fecadc275e71cf2
-SHA1 (patch-ae) = 9ea314db37541a1a9c7765e000687c0fdef90d8e
-SHA1 (patch-af) = db5b23950e18d6914718d785396873bcdabed941
-SHA1 (patch-ag) = e3b1bb58d193f487e0eb3844a72969dc8d9d4f61
+SHA1 (patch-ae) = 98ff7efe8338d4e6e05e311d070237d726161af2
+SHA1 (patch-af) = c5fc75f8f9499ed533bd30e162ec8784e446d288
+SHA1 (patch-ag) = 292b3b5d87f4688930fd654edfc5cb83ca8a2652
 SHA1 (patch-ah) = 6beedd15ee3a7cfd46cf3ed0b9ee579b9906300b
-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
+SHA1 (patch-ai) = e7284d9b3d7b83def7994269867e443fc0394d40
diff -r cfae5aa13e03 -r f75a51aada3b mail/postfix-current/patches/patch-aa
--- a/mail/postfix-current/patches/patch-aa     Fri Jul 02 07:59:58 2004 +0000
+++ b/mail/postfix-current/patches/patch-aa     Fri Jul 02 08:03:04 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2004/06/06 13:50:41 taca Exp $
+$NetBSD: patch-aa,v 1.13 2004/07/02 08:03:04 martti Exp $
 
---- postfix-install.orig       2004-04-15 00:45:23.000000000 +0900
-+++ postfix-install
-@@ -354,33 +354,13 @@ HTML files. Specify \"no\" if you do not
+--- 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.
-@@ -715,10 +695,3 @@ bin/postconf -c $CONFIG_DIRECTORY -e \
+@@ -715,10 +695,3 @@
      "sample_directory = $sample_directory" \
      "readme_directory = $readme_directory" \
  || exit 1
diff -r cfae5aa13e03 -r f75a51aada3b mail/postfix-current/patches/patch-ab
--- a/mail/postfix-current/patches/patch-ab     Fri Jul 02 07:59:58 2004 +0000
+++ b/mail/postfix-current/patches/patch-ab     Fri Jul 02 08:03:04 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2004/03/06 15:08:32 grant Exp $
+$NetBSD: patch-ab,v 1.6 2004/07/02 08:03:04 martti Exp $
 
 --- src/lmtp/lmtp.h.orig       2003-09-10 02:48:03.000000000 +0200
 +++ src/lmtp/lmtp.h    2004-01-20 20:30:12.000000000 +0100
diff -r cfae5aa13e03 -r f75a51aada3b mail/postfix-current/patches/patch-ac
--- a/mail/postfix-current/patches/patch-ac     Fri Jul 02 07:59:58 2004 +0000
+++ b/mail/postfix-current/patches/patch-ac     Fri Jul 02 08:03:04 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2004/03/06 15:08:32 grant Exp $
+$NetBSD: patch-ac,v 1.4 2004/07/02 08:03:04 martti Exp $
 
 --- src/smtp/smtp.h.orig       2002-05-23 21:18:02.000000000 +0200
 +++ src/smtp/smtp.h    2004-01-20 20:29:21.000000000 +0100
diff -r cfae5aa13e03 -r f75a51aada3b mail/postfix-current/patches/patch-ae
--- a/mail/postfix-current/patches/patch-ae     Fri Jul 02 07:59:58 2004 +0000
+++ b/mail/postfix-current/patches/patch-ae     Fri Jul 02 08:03:04 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2004/03/06 15:08:32 grant Exp $
+$NetBSD: patch-ae,v 1.4 2004/07/02 08:03:04 martti Exp $
 
---- src/global/mail_params.h.orig      2004-01-18 02:04:00.000000000 +1100
-+++ src/global/mail_params.h
-@@ -64,7 +64,7 @@ extern uid_t var_owner_uid;
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc + TeXmacs-1.0.3.10, centericq-4.10.0, clamav-0.74,...
Next by Date: [pkgsrc/trunk]: pkgsrc/security/libgcrypt When exec'ing child processes (nets...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc + TeXmacs-1.0.3.10, centericq-4.10.0, clamav-0.74,...
Next by Thread: [pkgsrc/trunk]: pkgsrc/security/libgcrypt When exec'ing child processes (nets...
Indexes:
Home | Main Index | Thread Index | Old Index