CVS commit: pkgsrc/mail

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Sun Apr 26 09:33:26 UTC 2020

Modified Files:
        pkgsrc/mail/postfix: Makefile Makefile.common distinfo
        pkgsrc/mail/postfix-ldap: Makefile
        pkgsrc/mail/postfix-sqlite: Makefile
        pkgsrc/mail/postfix/patches: patch-src_dns_dns__lookup.c

Log Message:
mail/postfix: update to 3.5.1

Update postfix to 3.5.1.

3.5.0 (2020-03-16)

Postfix stable release 3.5.0 is available. Support has ended for
legacy release Postfix 3.1.

The main changes are below. See the RELEASE_NOTES file for further details.

  * Support for the haproxy v2 protocol. The Postfix implementation
    supports TCP over IPv4 and IPv6, as well as non-proxied
    connections; the latter are typically used for heartbeat tests.

  * Support to force-expire email messages. This introduces new
    postsuper(1) command-line options to request expiration, and
    additional information in mailq(1) or postqueue(1) output.

  * The Postfix SMTP and LMTP client support a list of nexthop
    destinations separated by comma or whitespace. These destinations
    will be tried in the specified order. Examples:

    /etc/postfix/main.cf:
        relayhost = foo.example, bar.example
        default_transport = smtp:foo.example, bar.example

Incompatible changes:

  * Logging: Postfix daemon processes now log the from= and to=
    addresses in external (quoted) form in non-debug logging (info,
    warning, etc.). This means that when an address localpart
    contains spaces or other special characters, the localpart will
    be quoted, for example:

        from=<"name with spaces"@example.com>

    Specify "info_log_address_format = internal" for backwards compatibility.

  * Postfix now normalizes IP addresses received with XCLIENT,
    XFORWARD, or with the HaProxy protocol, for consistency with
    direct connections to Postfix. This may change the appearance
    of logging, and the way that check_client_access will match
    subnets of an IPv6 address.

3.5.1 (2020-04-20)

Postfix versions 3.5.1, 3.4.11, 3.3.9, 3.2.14:

  * Bitrot workaround for broken builds after an incompatible change
    in GCC 10.

  * Bitrot workaround for broken DANE/DNSSEC support after an
    incompatible change in GLIBC 2.31. This change avoids the need
    for new options in /etc/resolv.conf.


To generate a diff of this commit:
cvs rdiff -u -r1.318 -r1.319 pkgsrc/mail/postfix/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/mail/postfix/Makefile.common
cvs rdiff -u -r1.183 -r1.184 pkgsrc/mail/postfix/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/mail/postfix-ldap/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/mail/postfix-sqlite/Makefile
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/mail/postfix/patches/patch-src_dns_dns__lookup.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/postfix/Makefile
diff -u pkgsrc/mail/postfix/Makefile:1.318 pkgsrc/mail/postfix/Makefile:1.319
--- pkgsrc/mail/postfix/Makefile:1.318  Sun Apr 12 08:28:56 2020
+++ pkgsrc/mail/postfix/Makefile        Sun Apr 26 09:33:25 2020
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.318 2020/04/12 08:28:56 adam Exp $
+# $NetBSD: Makefile,v 1.319 2020/04/26 09:33:25 taca Exp $
 
-PKGREVISION= 1
 .include "../../mail/postfix/Makefile.common"
 
 COMMENT=       Fast, easy to administer, and secure mail transfer agent

Index: pkgsrc/mail/postfix/Makefile.common
diff -u pkgsrc/mail/postfix/Makefile.common:1.24 pkgsrc/mail/postfix/Makefile.common:1.25
--- pkgsrc/mail/postfix/Makefile.common:1.24    Tue Feb 11 20:40:27 2020
+++ pkgsrc/mail/postfix/Makefile.common Sun Apr 26 09:33:25 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.24 2020/02/11 20:40:27 triaxx Exp $
+# $NetBSD: Makefile.common,v 1.25 2020/04/26 09:33:25 taca Exp $
 # used by mail/postfix/Makefile
 # used by mail/postfix/Makefile.module
 
-DISTNAME=      postfix-3.4.9
+DISTNAME=      postfix-3.5.1
 CATEGORIES=    mail
 MASTER_SITES=  ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 MASTER_SITES+= http://mirrors.isc.org/pub/postfix/official/

Index: pkgsrc/mail/postfix/distinfo
diff -u pkgsrc/mail/postfix/distinfo:1.183 pkgsrc/mail/postfix/distinfo:1.184
--- pkgsrc/mail/postfix/distinfo:1.183  Tue Feb 11 20:40:27 2020
+++ pkgsrc/mail/postfix/distinfo        Sun Apr 26 09:33:25 2020
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.183 2020/02/11 20:40:27 triaxx Exp $
+$NetBSD: distinfo,v 1.184 2020/04/26 09:33:25 taca Exp $
 
-SHA1 (postfix-3.4.9.tar.gz) = e2ce620f172052bb3a51e99eefe0294199163a54
-RMD160 (postfix-3.4.9.tar.gz) = 45c52a186bbadfa9ab289694b8d696565a7f39b3
-SHA512 (postfix-3.4.9.tar.gz) = 9038850d79bf19460d55dede2dd97e6f4bd8255363b4004704e5f0493bf9b1c0729f5bb11663ba6f6ed34177205609f72401b0f55d1d9dbce5398b4603a0a991
-Size (postfix-3.4.9.tar.gz) = 4573241 bytes
+SHA1 (postfix-3.5.1.tar.gz) = 2a18e312772ae322aa84cf2a16cd206ee85b0480
+RMD160 (postfix-3.5.1.tar.gz) = 43cd8af5a581054135fda54d4299ad3e6e4f611b
+SHA512 (postfix-3.5.1.tar.gz) = 9c091cda6c2d54fefc7093736f69dc60dc4d9d2d858260bde1430427bc49caa59f81aea7a992b9764998a4edaaa015ddd50392b8f0a1bccd15f52b563887a698
+Size (postfix-3.5.1.tar.gz) = 4609587 bytes
 SHA1 (patch-aa) = c8216f133e202a7bb37682b0dbc1448f021e7c1c
 SHA1 (patch-ag) = c126c572e36bf2bcbd3f6e5d8332a3d26e704109
 SHA1 (patch-ai) = 51748ccf92da543f7ff640f36906a29b5db3f6e3
-SHA1 (patch-src_dns_dns__lookup.c) = 448fe38a38cb201cd09fbae35d6c5f6cdf7df8b9
+SHA1 (patch-src_dns_dns__lookup.c) = 036872a0e6e438d0253469ea447c0c9c1de0188d

Index: pkgsrc/mail/postfix-ldap/Makefile
diff -u pkgsrc/mail/postfix-ldap/Makefile:1.6 pkgsrc/mail/postfix-ldap/Makefile:1.7
--- pkgsrc/mail/postfix-ldap/Makefile:1.6       Sat Jan 18 21:49:53 2020
+++ pkgsrc/mail/postfix-ldap/Makefile   Sun Apr 26 09:33:26 2020
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2020/01/18 21:49:53 jperkin Exp $
+# $NetBSD: Makefile,v 1.7 2020/04/26 09:33:26 taca Exp $
 #
 
 COMMENT=               Postfix SMTP server LDAP backend module
-PKGREVISION=           1
 
 POSTFIX_LIB=           ldap
 POSTFIX_LIBDIR=                src/global

Index: pkgsrc/mail/postfix-sqlite/Makefile
diff -u pkgsrc/mail/postfix-sqlite/Makefile:1.22 pkgsrc/mail/postfix-sqlite/Makefile:1.23
--- pkgsrc/mail/postfix-sqlite/Makefile:1.22    Sun Apr 12 08:28:56 2020
+++ pkgsrc/mail/postfix-sqlite/Makefile Sun Apr 26 09:33:26 2020
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2020/04/12 08:28:56 adam Exp $
+# $NetBSD: Makefile,v 1.23 2020/04/26 09:33:26 taca Exp $
 #
 
 COMMENT=               Postfix SMTP server SQLite backend module
-PKGREVISION=           1
 
 POSTFIX_LIB=           sqlite
 POSTFIX_LIBDIR=                src/global

Index: pkgsrc/mail/postfix/patches/patch-src_dns_dns__lookup.c
diff -u pkgsrc/mail/postfix/patches/patch-src_dns_dns__lookup.c:1.6 pkgsrc/mail/postfix/patches/patch-src_dns_dns__lookup.c:1.7
--- pkgsrc/mail/postfix/patches/patch-src_dns_dns__lookup.c:1.6 Tue Feb 11 20:40:27 2020
+++ pkgsrc/mail/postfix/patches/patch-src_dns_dns__lookup.c     Sun Apr 26 09:33:26 2020
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_dns_dns__lookup.c,v 1.6 2020/02/11 20:40:27 triaxx Exp $
+$NetBSD: patch-src_dns_dns__lookup.c,v 1.7 2020/04/26 09:33:26 taca Exp $
 
 Fix runtime problem when mysql PKG_OPTIONS is enabled.
 
---- src/dns/dns_lookup.c.orig  2019-12-15 16:13:04.000000000 +0000
+--- src/dns/dns_lookup.c.orig  2019-12-15 16:19:34.000000000 +0000
 +++ src/dns/dns_lookup.c
-@@ -245,6 +245,8 @@
+@@ -247,6 +247,8 @@
  
  /* Local stuff. */
  
@@ -13,7 +13,7 @@ Fix runtime problem when mysql PKG_OPTIO
   /*
    * Structure to keep track of things while decoding a name server reply.
    */
-@@ -308,7 +310,7 @@ typedef struct DNS_REPLY {
+@@ -311,7 +313,7 @@ typedef struct DNS_REPLY {
  
  /* dns_res_query - a res_query() clone that can return negative replies */
  
@@ -22,7 +22,7 @@ Fix runtime problem when mysql PKG_OPTIO
                                 unsigned char *answer, int anslen)
  {
      unsigned char msg_buf[MAX_DNS_QUERY_SIZE];
-@@ -337,14 +339,14 @@ static int dns_res_query(const char *nam
+@@ -340,14 +342,14 @@ static int dns_res_query(const char *nam
  #define NO_MKQUERY_DATA_LEN     ((int) 0)
  #define NO_MKQUERY_NEWRR        ((unsigned char *) 0)
  
@@ -39,7 +39,7 @@ Fix runtime problem when mysql PKG_OPTIO
        SET_H_ERRNO(TRY_AGAIN);
        if (msg_verbose)
            msg_info("res_send() failed");
-@@ -373,7 +375,7 @@ static int dns_res_query(const char *nam
+@@ -378,7 +380,7 @@ static int dns_res_query(const char *nam
  
  /* dns_res_search - res_search() that can return negative replies */
  
@@ -48,7 +48,7 @@ Fix runtime problem when mysql PKG_OPTIO
                       unsigned char *answer, int anslen, int keep_notfound)
  {
      int     len;
-@@ -396,7 +398,7 @@ static int dns_res_search(const char *na
+@@ -401,7 +403,7 @@ static int dns_res_search(const char *na
      if (keep_notfound)
        /* Prepare for returning a null-padded server reply. */
        memset(answer, 0, anslen);
@@ -57,7 +57,7 @@ Fix runtime problem when mysql PKG_OPTIO
      /* Begin API creep workaround. */
      if (len < 0 && h_errno == 0) {
        SET_H_ERRNO(TRY_AGAIN);
-@@ -435,7 +437,7 @@ static int dns_query(const char *name, i
+@@ -440,7 +442,7 @@ static int dns_query(const char *name, i
      /*
       * Initialize the name service.
       */
@@ -66,7 +66,7 @@ Fix runtime problem when mysql PKG_OPTIO
        if (why)
            vstring_strcpy(why, "Name service initialization failure");
        return (DNS_FAIL);
-@@ -464,24 +466,24 @@ static int dns_query(const char *name, i
+@@ -479,32 +481,32 @@ static int dns_query(const char *name, i
       */
  #define SAVE_FLAGS (USER_FLAGS | XTRA_FLAGS)
  
@@ -83,9 +83,18 @@ Fix runtime problem when mysql PKG_OPTIO
 +      rstate.options &= ~saved_options;
 +      rstate.options |= flags;
        if (keep_notfound && var_dns_ncache_ttl_fix) {
+ #ifdef HAVE_RES_SEND
 -          len = dns_res_query((char *) name, C_IN, type, reply->buf,
 +              len = dns_res_query(&rstate, (char *) name, C_IN, type, reply->buf,
                                reply->buf_len);
+ #else
+           var_dns_ncache_ttl_fix = 0;
+           msg_warn("system library does not support %s=yes"
+                    " -- ignoring this setting", VAR_DNS_NCACHE_TTL_FIX);
+-          len = dns_res_search((char *) name, C_IN, type, reply->buf,
++          len = dns_res_search(&rstate, (char *) name, C_IN, type, reply->buf,
+                                reply->buf_len, keep_notfound);
+ #endif
        } else {
 -          len = dns_res_search((char *) name, C_IN, type, reply->buf,
 +              len = dns_res_search(&rstate, (char *) name, C_IN, type, reply->buf,