pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mail/postfix postfix: update to 3.4.6



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2e5d7a437c7c
branches:  trunk
changeset: 398368:2e5d7a437c7c
user:      triaxx <triaxx%pkgsrc.org@localhost>
date:      Wed Jul 17 13:33:00 2019 +0000

description:
postfix: update to 3.4.6

pkgsrc changes:
---------------
  * change COMMENT to make pkglint happy (inspired by http://www.postfix.org/)
  * update PLIST using make print-PLIST (missing @pkgdir)

upstream changes:
-----------------
20181125

        Cleanup: dict_file_to_xxx() takes a list of file names
        separated by CHARS_COMMA_SP. Shoe-horned into the existing
        API, make it nicer when there is time. File: util/dict_file.c.

20181127

        Cleanup: encapsulated clumsy 'read into VSTRING' code with
        easier-to-use vstream_fread_buf() and vstream_fread_app()
        primitives. Files: global/memcache_proto.c, global/record.c,
        global/smtp_stream.c, global/smtp_stream.h, global/uxtext.c,
        global/xtext.c, milter/milter8.c, util/dict_file.c,
        util/hex_quote.c, util/netstring.c, util/vstream.c,
        util/vstream.h. Verified with "make tests".

        Cleanup: simplified the smtp_fread() API (introduced for
        BDAT support), and changed the name to smtp_fread_buf().
        Files: global/smtp_stream.c, smtpd/smtpd.c. Verified with
        ~megabyte BDAT commands.

        Cleanup: simplified a tlsproxy-internal API. File:
        tlsproxy/tlsproxy.c.

20181128

        Initial support for key/certificate chain files that will
        replace the proliferation of separate parameters for
        RSA/DSA/ECC/etc. key and certificate files. Viktor
        Dukhovni.

20181201

        Cleanup: replaced the remaining unsafe VSTRING_AT_OFFSET()
        calls with safe vstring_set_payload_size() calls, in code
        that directly writes into VSTRING. Files: tls/tls_session.c,
        tlsmgr/tlsmgr.c, util/casefold.c, util/vstring.c, util/vstring.h,
        xsasl/xsasl_cyrus_client.c.

        Cleanup: postscreen_command_time_limit did not need to be
        a 'raw' parameter. This makes "postconf -x" behavior more
        consistent. Files: global/mail_params.h, postscreen/postscreen.c.

        Documentation: added text that the following parameter
        values are not subject to Postfix parameter $name expansion:
        default_rbl_reply, command_execution_directory, luser_relay,
        smtpd_reject_footer. These have their own documented $name
        substitution mechanism. File: proto/postconf.proto.

20181202

        Bugfix: posttls-finger reported an error for UNIX-domain
        connections, even if they did not fail. Found by Coverity.
        File: posttls-finger/posttls-finger.c.

20181208

        Documentation: add even more redundancy to the rate-delay
        description. File: proto/postconf.proto.

20181210

        Cleanup: code deduplication. File: util/dict_file.c.

20181226

        Cleanup: code deduplication and better encapsulation with
        PSC_DEL_CLIENT_STATE() and PSC_DEL_SERVER_STATE() macros.
        Files: postscreen/postscreen.h, postscreen/postscreen_state.c.

        Documentation: POSTSCREEN_README did not describe the
        postscreen_post_queue_limit, and attributed the wrong reject
        message to the postscreen_pre_queue_limit. Problem reported
        by Michael Orlitzky. File: proto/POSTSCREEN_README.html.

        (20181226-nonprod) Compatibility: removed support for OpenSSL
        1.0.1 (not supported since December 31, 2016) and earlier
        releases. This eliminated a large number of #ifdefs with
        bitrot workarounds.  Viktor Dukhovni. Files: global/mail_params.h,
        posttls-finger/posttls-finger.c, tls/tls.h, tls/tls_certkey.c,
        tls/tls_client.c, tls/tls_dane.c, tls/tls_dh.c, tls/tls_misc.c,
        tls/tls_proxy_client_scan.c, tls/tls_rsa.c, tls/tls_server.c,
        tls/tls_session.c.

        (20181226-nonprod) Use the OpenSSL 1.0.2 and later API for
        setting ECDHE curves. Viktor Dukhovni. Files: tls/tls.h,
        tls/tls_client.c, tls/tls_dh.c.

        (20181226-nonprod) Documentation update for TLS support.
        Viktor Dukhovni. Files: mantools/postlink, proto/TLS_README.html,
        proto/postconf.proto, src/sendmail/sendmail.c, src/smtpd/smtpd.c.

20181229

        Explicit maps_file_find() and dict_file_lookup() methods
        that decode base64 content. Decoding content is not built
        into the dict->lookup() method, because that would complicate
        the implementation of map nesting (inline, thash), map
        composition (pipemap, unionmap), and map proxying.  For
        consistency, decoding base64 file content is also not built
        into the maps_find() method. Files: util/dict.h.
        util/dict_file.c, global/maps.[hc], postmap/postmap.c.

20190106

        Documentation: documented the SRC_RHS_IS_FILE flag in
        dict_open.c, and updated the -F description in the postmap
        manpage. Files: util/dict_open.c, postmap/postmap.c.

        (20190106-nonprod) Feature: support for files that combine
        multiple (key, certificate, trust chain) instances in one
        file, to avoid separate files for RSA, DSA, Elliptic Curve,
        and so on. Viktor Dukhovni. Files: .indent.pro,
        global/mail_params.h, posttls-finger/posttls-finger.c,
        smtp/lmtp_params.c, smtp/smtp.c, smtp/smtp_params.c,
        smtp/smtp_proto.c, smtpd/smtpd.c, tls/tls.h, tls/tls_certkey.c,
        tls/tls_client.c, tls/tls_proxy.h, tls/tls_proxy_client_print.c,
        tls/tls_proxy_client_scan.c, tls/tls_proxy_server_print.c,
        tls/tls_proxy_server_scan.c, tls/tls_server.c, tlsproxy/tlsproxy.c.

        (20190106-nonprod) Create a second, no-key no-cert, SSL_CTX
        for use with SNI. Viktor Dukhovni. Files: src/tls/tls.h,
        src/tls/tls_client.c, src/tls/tls_misc.c, src/tls/tls_server.c.

        (20190106-nonprod) Server-side SNI support. Viktor Dukhovni.
        Files: src/global/mail_params.h, src/smtp/smtp.c,
        src/smtpd/smtpd.c, src/tls/tls.h, src/tls/tls_certkey.c,
        src/tls/tls_misc.c, src/tlsproxy/tlsproxy.c,

        (20190106-nonprod) Configurable client-side SNI signal.
        Viktor Dukhovni. Files: global/mail_params.h,
        posttls-finger/posttls-finger.c, smtp/lmtp_params.c,
        smtp/smtp.c, smtp/smtp.h, smtp/smtp_params.c, smtp/smtp_proto.c,
        smtp/smtp_tls_policy.c, tls/tls.h, tls/tls_client.c,
        tls/tls_proxy.h, tls/tls_proxy_client_print.c,
        tls/tls_proxy_client_scan.c.

20190121

        Logging: support for internal logging file, without using
        syslog (it uses the new postlogd daemon instead). This
        solves a usability problem for MacOS, may help getting
        around systemd, and solves 99% of the problem for logging
        to stdout in a container (hopefully we have 100% soon).
        Enable by setting, for example, "maillog_file =
        /var/log/postfix.log").  This works fine for daemons, and
        with some limitations for non-daemon programs.  See
        RELEASE_NOTES for more details.  Files: conf/master.cf,
        conf/post-install, conf/postfix-files, conf/postfix-script,
        mantools/postlink, proto/master, proto/postconf.proto,
        global/mail_params.c, global/mail_params.h, global/mail_proto.h,
        global/maillog_client.c, global/maillog_client.h,
        master/dgram_server.c, master/event_server.c, master/mail_server.h,
        master/master.c, master/master.h, master/master_ent.c,
        master/master_listen.c, master/master_proto.h,
        master/master_wakeup.c, master/multi_server.c,
        master/single_server.c, master/trigger_server.c,
        postalias/postalias.c, postconf/postconf_master.c,
        postdrop/postdrop.c, postfix/postfix.c, postkick/postkick.c,
        postlog/postlog.c, postlogd/postlogd.c, postmap/postmap.c,
        postmulti/postmulti.c, postqueue/postqueue.c,
        postsuper/postsuper.c, sendmail/sendmail.c, util/connect.h,
        util/listen.h, util/logwriter.c, util/logwriter.h,
        util/msg_logger.c, util/msg_logger.h, util/msg_output.c,
        util/msg_output.h, util/unix_dgram_connect.c,
        util/unix_dgram_listen.c.

        Cleanup: cert/key/chain loading, plus unit tests to exercise
        non-error and error cases. Viktor Dukhovni. Files: tls/*.pem,
        tls*.pem.ref, tls/tls_certkey.c.

20190126

        Safety: Postfix programs will log to either syslog or postlog
        but not both; and postlogd forwards postlog logging to
        syslog, when a configuration change removes the maillog_file
        pathname, but some programs still use the old configuration.
        Files: util/msg_syslog.[hc], util/msg_logger.c,
        global/maillog_client.c, postlogd/postlogd.c,

        Bugfix (introduced: Postfix 20110109, Postfix 2.10): watchdog
        pipe file descriptor leak. This pipe provides one source
        of liveness, data from this pipe is discarded, and therefore
        this does not enable privilege escalation or DOS. File:
        util/watchdog.c.

        Feature: stdout logging support; requires "postfix start-fg"
        and "maillog_file = /dev/stdout". Files: master/master.c,
        conf/postfix-script.

20190127

        Safety: when maillog_file is specified, 'postfix check' now
        requires that the postlog service is enabled in master.cf.
        Otherwise 'postfix start' etc. will log a fatal error. File:
        conf/postfix-script.

        Documentation: added policy_context example. File:
        proto/SMTPD_POLICY_README.html.

20190128

        Testing: run libtls tests under Valgrind. File tls/Makefile.in.

20190129

        Safety: require that $maillog_file matches one of the
        pathname prefixes specified in $maillog_file_prefixes. The
        maillog file is created by root, and the prefixes limit the
        damage from a single configuration error. Files:
        global/mail_params.[hc], global/maillog_client.c.

20191201

        Feature: "postfix logrotate" command with configurable
        compression program and datestamp filename suffix. File:
        conf/postfix-script.

20190202

        Cleanup: log a warning when the client sends a malformed
        SNI; log an info message when the client sends a valid SNI
        that does not match the SNI lookup tables; update the
        FORWARD_SECRECY_README logging examples. Viktor Dukhovni.
        Files: proto/FORWARD_SECRECY_README.html, tls/tls.h,
        tls/tls_client.c, tls/tls_misc.c.

20190208

        Debugging: the master(8) daemon now logs a warning if a
        master.cf entry is defined multiple times. File:
        src/master/master_conf.c.

20190209

        Debugging: tlsproxy(8) now logs more details about unexpected
        configuration differences between the Postfix SMTP client
        and the tlsproxy(8) daemon.

20190210

        Documentation: Postfix 3.4.0 RELEASE NOTES.

        Documentation: added BDAT_README.

        Documentation: global TLS settings. Files: mantools/postlink,
        smtp/smtp.c, tlsproxy/tlsproxy.c.

20190211

        Cleanup: removed obsolete parameters: tls_dane_digest_agility,
        tls_dane_trust_anchor_digest_enable; removed openssl_path
        parameter from configuration difference checks in tlsproxy.
        Files: global/mail_params.h, tls/tls_misc.c,
        tls/tls_proxy_client_misc.c, tls/tls_proxy_client_print.c,
        tls/tls_proxy_client_scan.c, tls/tls_proxy.h.

20190212

        Cleanup: missing #ifdef USE_TLS. Files: smtp/smtp_session.c,
        posttls-finger/posttls-finger.c.

20190217

        Cleanup: when the master daemon runs with PID=1 (init mode),
        reap orhpan processes from non-Postfix code running in the
        same container, instead of terminating with a panic. File:
        master/master_spawn.c.

20190218

        Bugfix: tlsproxy did not enable DANE-style PKI because
        libtls seems to have to accreted multiple init functions
        instead of reusing the tls_client_init() and tls_client_start()
        API. And some functions that do initialization don't even
        have init in their name! Problem report by Andreas Schulze.
        Viktor Dukhovni. Files: tls/tls_misc.c, tlsproxy/tlsproxy.c.

        Workaround: Postfix libtls makes DANE-specific changes to
        the shared SSL_CTX. To avoid false sharing, tlsproxy needs
        to label the SSL_CTX cache with DANE bits until we can
        remove the code that modifies SSL_CTX. File: tlsproxy/tlsproxy.c.

        Cleanup: Postfix libtls changed the shared SSL_CTX to
        override ciphers. instead of changing the SSL handle. To
        avoid false sharing in tlsproxy, the changes are now made
        to the SSL handle. Viktor Dukhovni. Files: tls/tls.h,
        tls/tls_client.c, tls/tls_misc.c, tls/tls_server.c.

20190219

        Bugfix: in the Postfix SMTP client, TLS wrappermode was not
        tested in tlsproxy mode. It needed some setup for buffering
        and timeouts. Problem report by Andreas Schulze. File:
        smtp/smtp_proto.c.

20190304

        Bugfix: a reversed test broke TLS configurations that specify
        the same filename for a private key and certificate. Reported
        by Mike Kazantsev. Fix by Viktor Dukhovni. Wietse fixed the
        test. Files: tls/tls_certkey.c, tls/Makefile.in.

20190310

        Bitrot: LINUX5s support, after some sanity checks with a
        rawhide prerelease version. Files: makedefs, util/sys_defs.h.

        Bugfix (introduced: 20181226): broken DANE trust anchor
        file support, caused by left-over debris from the 20181226
        TLS library overhaul. By intrigeri. File: tls/tls_dane.c.

        Bugfix (introduced: Postfix-1.0.1): null pointer read, while
        logging a warning after a corrupted bounce log file. File:
        global/bounce_log.c.

        Bugfix (introduced: Postfix-2.9.0): null pointer read, while
        logging a warning after a postscreen_command_filter read
        error. File: postscreen/postscreen_smtpd.c. global/bounce_log.c

20190312

        Bugfix (introduced: Postfix 2.2): reject_multi_recipient_bounce
        has been producing false rejects starting with the Postfix
        2.2 smtpd_end_of_data_restrictons, and for the same reasons,
        does the same with the Postfix 3.4 BDAT command. The latter
        was reported by Andreas Schulze. File: smtpd/smtpd_check.c.

20190319

        With message_size_limit=0 (which is NOT DOCUMENTED), BDAT
        chunks were always rejected as too large. File: smtpd/smtpd.c

20190328

        Bugfix (introduced: Postfix 3.0): LMTP connections over
        UNIX-domain sockets were cached but not reused, due to a
        cache lookup key mismatch. Therefore, idle cached connections
        could exhaust LMTP server resources, resulting in two-second
        pauses between email deliveries. This problem was investigated
        by Juliana Rodrigueiro. File: smtp/smtp_connect.c.

20190331

        Documentation: tlsext_padding is not a tls_ssl_options
        feature. File: proto/postconf.proto.

20190401

        Portability: added "#undef sun" to util/unix_dgram_connect.c.

20190403

        Bugfix (introduced: Postfix 2.3): a censoring filter broke
        multiline Milter responses for header/body events. Problem
        report by Andreas Thienemann. Files: util/printable.c,
        util/stringops.h, smtpd/smtpd.c

        Bugfix (introduced: Postfix 3.3): "smtp_mx_address_limit =
        0" no longer meant 'unlimited'. Problem report by Luc Pardon.
        File: smtp/smtp_addr.c.

20190615

        Documentation: updated the BUGS section in the smtp(8) manpage
        about TLS connection reuse. File: smtp/smtp.c.

        Workaround for implementations that hang Postfix while
        shutting down a TLS session, until Postfix times out. With
        "tls_fast_shutdown_enable = yes" (the default), Postfix no
        longer waits for the TLS peer to respond to a TLS 'close'
        request. This is recommended with TLSv1.0 and later. Files:
        global/mail_params.h, tls/tls_session.c, and documentation.

20190621

        Bugfix (introduced: Postfix 3.0): the code to reset Postfix
        SMTP server command counts was not called after a HaProxy
        handshake failure, causing stale numbers to be reported.
        The command counts are now reset in the function that reports
        the counts. File: smtpd/smtpd.c.

diffstat:

 mail/postfix/Makefile         |   5 +-
 mail/postfix/Makefile.common  |   4 +-
 mail/postfix/PLIST            |  21 +++++++++++++-
 mail/postfix/distinfo         |  14 ++++----
 mail/postfix/patches/patch-ag |  11 +++---
 mail/postfix/patches/patch-ai |  66 ++++++------------------------------------
 6 files changed, 47 insertions(+), 74 deletions(-)

diffs (267 lines):

diff -r f33b08e1a052 -r 2e5d7a437c7c mail/postfix/Makefile
--- a/mail/postfix/Makefile     Wed Jul 17 12:42:36 2019 +0000
+++ b/mail/postfix/Makefile     Wed Jul 17 13:33:00 2019 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.311 2019/07/16 15:18:28 triaxx Exp $
+# $NetBSD: Makefile,v 1.312 2019/07/17 13:33:00 triaxx Exp $
 
 .include "../../mail/postfix/Makefile.common"
 
-PKGREVISION=   1
-COMMENT=       Postfix SMTP server and tools
+COMMENT=       Fast, easy to administer, and secure mail transfer agent
 
 CONFLICTS+=    courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
 CONFLICTS+=    esmtp>=1.2 nullmailer-[0-9]*
diff -r f33b08e1a052 -r 2e5d7a437c7c mail/postfix/Makefile.common
--- a/mail/postfix/Makefile.common      Wed Jul 17 12:42:36 2019 +0000
+++ b/mail/postfix/Makefile.common      Wed Jul 17 13:33:00 2019 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.18 2019/04/30 03:41:51 taca Exp $
+# $NetBSD: Makefile.common,v 1.19 2019/07/17 13:33:00 triaxx Exp $
 # used by mail/postfix/Makefile
 # used by mail/postfix/Makefile.module
 
-DISTNAME=      postfix-3.3.3
+DISTNAME=      postfix-3.4.6
 CATEGORIES=    mail
 MASTER_SITES=  ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 MASTER_SITES+= http://mirrors.isc.org/pub/postfix/official/
diff -r f33b08e1a052 -r 2e5d7a437c7c mail/postfix/PLIST
--- a/mail/postfix/PLIST        Wed Jul 17 12:42:36 2019 +0000
+++ b/mail/postfix/PLIST        Wed Jul 17 13:33:00 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2016/09/18 17:10:28 taca Exp $
+@comment $NetBSD: PLIST,v 1.31 2019/07/17 13:33:00 triaxx Exp $
 bin/mailq
 bin/newaliases
 lib/postfix/libpostfix-dns.so
@@ -29,6 +29,7 @@
 libexec/postfix/postfix-script
 libexec/postfix/postfix-tls-script
 libexec/postfix/postfix-wrapper
+libexec/postfix/postlogd
 libexec/postfix/postmulti-script
 libexec/postfix/postscreen
 libexec/postfix/proxymap
@@ -100,6 +101,7 @@
 man/man8/oqmgr.8
 man/man8/pickup.8
 man/man8/pipe.8
+man/man8/postlogd.8
 man/man8/postscreen.8
 man/man8/proxymap.8
 man/man8/qmgr.8
@@ -201,3 +203,20 @@
 ${PLIST.csasl}share/examples/postfix/smtpd.conf
 share/examples/postfix/transport
 share/examples/postfix/virtual
+@pkgdir var/spool/postfix/trace
+@pkgdir var/spool/postfix/saved
+@pkgdir var/spool/postfix/public
+@pkgdir var/spool/postfix/private
+@pkgdir var/spool/postfix/pid
+@pkgdir var/spool/postfix/maildrop
+@pkgdir var/spool/postfix/incoming
+@pkgdir var/spool/postfix/hold
+@pkgdir var/spool/postfix/flush
+@pkgdir var/spool/postfix/deferred
+@pkgdir var/spool/postfix/defer
+@pkgdir var/spool/postfix/corrupt
+@pkgdir var/spool/postfix/bounce
+@pkgdir var/spool/postfix/active
+@pkgdir var/db/postfix
+@pkgdir libexec/postfix/postfix-files.d
+@pkgdir libexec/postfix/dynamicmaps.cf.d
diff -r f33b08e1a052 -r 2e5d7a437c7c mail/postfix/distinfo
--- a/mail/postfix/distinfo     Wed Jul 17 12:42:36 2019 +0000
+++ b/mail/postfix/distinfo     Wed Jul 17 13:33:00 2019 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.179 2019/04/30 03:41:51 taca Exp $
+$NetBSD: distinfo,v 1.180 2019/07/17 13:33:00 triaxx Exp $
 
-SHA1 (postfix-3.3.3.tar.gz) = 8095c7c1f263d62df71abe65a53f0d4d9399c91d
-RMD160 (postfix-3.3.3.tar.gz) = 0c7afeb0f805c821436baa48acac660d433b4b19
-SHA512 (postfix-3.3.3.tar.gz) = 9d04d48b5393c49c00ca62f0a24e21c9642f2b645431b66b532a559ad1b4d35c7581fec8bd1bb1a2d7b31b812b1cea3b29e0a0cbd6576bd377b2c810d27b7ec3
-Size (postfix-3.3.3.tar.gz) = 4429713 bytes
+SHA1 (postfix-3.4.6.tar.gz) = 044a2949f50f4fe3d6d569673bcf691a9105ad60
+RMD160 (postfix-3.4.6.tar.gz) = 10e9293cfc88ad56a7438d2dba03b488c90c45d1
+SHA512 (postfix-3.4.6.tar.gz) = 96430d60cf58b9876e52a742dbfe3ca1da4ec82eeea5cd35c6ee4e69714ddd5601561a6663aac51a34b2d64db4f7678d7c5d720ec9ead807b5d7e87e37434961
+Size (postfix-3.4.6.tar.gz) = 4571771 bytes
 SHA1 (patch-aa) = c8216f133e202a7bb37682b0dbc1448f021e7c1c
-SHA1 (patch-ag) = 10e7c6ec4ca9e05ba8a37eeb4910b784fb9a5e34
-SHA1 (patch-ai) = 464da0a53bc9cac1f4e932e9735b75f4a33c7aa7
+SHA1 (patch-ag) = c126c572e36bf2bcbd3f6e5d8332a3d26e704109
+SHA1 (patch-ai) = 51748ccf92da543f7ff640f36906a29b5db3f6e3
 SHA1 (patch-src_dns_dns__lookup.c) = 88cdda55765799d40f05fa7aad43cdbc58c4a307
diff -r f33b08e1a052 -r 2e5d7a437c7c mail/postfix/patches/patch-ag
--- a/mail/postfix/patches/patch-ag     Wed Jul 17 12:42:36 2019 +0000
+++ b/mail/postfix/patches/patch-ag     Wed Jul 17 13:33:00 2019 +0000
@@ -1,15 +1,16 @@
-$NetBSD: patch-ag,v 1.39 2017/06/23 19:18:07 maya Exp $
+$NetBSD: patch-ag,v 1.40 2019/07/17 13:33:00 triaxx Exp $
 
 * Add support for NetBSD 8.
 * Only define HAS_DB if it hasn't been defined.
 * Add support for FreeBSD 11 and 12.
 
---- src/util/sys_defs.h.orig   2017-02-02 01:31:15.000000000 +0000
+--- src/util/sys_defs.h.orig   2019-03-10 16:58:04.000000000 +0000
 +++ src/util/sys_defs.h
-@@ -30,13 +30,11 @@
+@@ -30,14 +30,11 @@
  #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
      || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \
      || defined(FREEBSD8) || defined(FREEBSD9) || defined(FREEBSD10) \
+-    || defined(FREEBSD11) \
 +    || defined(FREEBSD11) || defined(FREEBSD12) \
      || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
      || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
@@ -22,7 +23,7 @@
  #define SUPPORTED
  #include <sys/param.h>
  #define UINT32_TYPE   unsigned int
-@@ -48,7 +46,9 @@
+@@ -49,7 +46,9 @@
  #define DEF_MAILBOX_LOCK "flock, dotlock"
  #define HAS_SUN_LEN
  #define HAS_FSYNC
@@ -32,7 +33,7 @@
  #define HAS_SA_LEN
  #define NATIVE_DB_TYPE        "hash"
  #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104250000)
-@@ -1250,6 +1250,8 @@ extern int h_errno;
+@@ -1252,6 +1251,8 @@ extern int h_errno;
  #define DEF_SMTP_CACHE_DEMAND 0
  #endif
  
diff -r f33b08e1a052 -r 2e5d7a437c7c mail/postfix/patches/patch-ai
--- a/mail/postfix/patches/patch-ai     Wed Jul 17 12:42:36 2019 +0000
+++ b/mail/postfix/patches/patch-ai     Wed Jul 17 13:33:00 2019 +0000
@@ -1,27 +1,18 @@
-$NetBSD: patch-ai,v 1.40 2017/06/23 19:18:07 maya Exp $
+$NetBSD: patch-ai,v 1.41 2019/07/17 13:33:00 triaxx Exp $
 
 1) Add shlib definitions for NetBSD 5; the build system must be
 hard-coded per OS per version.  Not yet reported upstream.
 
 2) Make this pkgsrc friendly.
 
-3) Add support for FreeBSD 11 & 12.
+3) Add support for FreeBSD 12.
 
---- makedefs.orig      2017-02-12 15:32:10.000000000 +0000
+--- makedefs.orig      2019-03-10 23:42:59.000000000 +0000
 +++ makedefs
-@@ -284,6 +284,24 @@ case "$SYSTEM.$RELEASE" in
+@@ -298,6 +298,15 @@ case "$SYSTEM.$RELEASE" in
                : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
                : ${PLUGIN_LD="${CC} -shared"}
                ;;
-+  FreeBSD.11*)        SYSTYPE=FREEBSD11
-+              : ${CC=cc}
-+              : ${SHLIB_SUFFIX=.so}
-+              : ${SHLIB_CFLAGS=-fPIC}
-+              : ${SHLIB_LD="${CC} -shared"' -Wl,-soname,${LIB}'}
-+              : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'}
-+              : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
-+              : ${PLUGIN_LD="${CC} -shared"}
-+              ;;
 +  FreeBSD.12*)        SYSTYPE=FREEBSD12
 +              : ${CC=cc}
 +              : ${SHLIB_SUFFIX=.so}
@@ -34,7 +25,7 @@
   DragonFly.*) SYSTYPE=DRAGONFLY
                ;;
    OpenBSD.2*) SYSTYPE=OPENBSD2
-@@ -312,25 +330,7 @@ case "$SYSTEM.$RELEASE" in
+@@ -326,25 +335,7 @@ case "$SYSTEM.$RELEASE" in
                ;;
    ekkoBSD.1*) SYSTYPE=EKKOBSD1
                ;;
@@ -61,7 +52,7 @@
                : ${SHLIB_SUFFIX=.so}
                : ${SHLIB_CFLAGS=-fPIC}
                : ${SHLIB_LD="${CC-gcc} -shared"' -Wl,-soname,${LIB}'}
-@@ -409,13 +409,6 @@ case "$SYSTEM.$RELEASE" in
+@@ -423,13 +414,6 @@ case "$SYSTEM.$RELEASE" in
                esac
                ;;
     ULTRIX.4*) SYSTYPE=ULTRIX4
@@ -75,7 +66,7 @@
                for l in syslog resolv; do
                    if [ -f /usr/local/lib/lib$l.a ]; then
                        SYSLIBS="$SYSLIBS -l$l"
-@@ -457,33 +450,8 @@ case "$SYSTEM.$RELEASE" in
+@@ -471,33 +455,8 @@ case "$SYSTEM.$RELEASE" in
                esac;;
                # Tested with RedHat 3.03 on 20020729.
      Linux.1*) SYSTYPE=LINUX1
@@ -109,33 +100,7 @@
                for name in nsl resolv $GDBM_LIBS
                do
                    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -544,25 +512,6 @@ EOF
-               : ${PLUGIN_LD="${CC-gcc} -shared"}
-               ;;
-   Linux.[34].*)       SYSTYPE=LINUX$RELEASE_MAJOR
--              case "$CCARGS" in
--               *-DNO_DB*) ;;
--               *-DHAS_DB*) ;;
--               *) if [ -f /usr/include/db.h ]
--                  then
--                      : we are all set
--                  elif [ -f /usr/include/db/db.h ]
--                  then
--                      CCARGS="$CCARGS -I/usr/include/db"
--                  else
--                      # On a properly installed system, Postfix builds
--                      # by including <db.h> and by linking with -ldb
--                      echo "No <db.h> include file found." 1>&2
--                      echo "Install the appropriate db*-devel package first." 1>&2
--                      exit 1
--                  fi
--                  SYSLIBS="-ldb"
--                  ;;
--              esac
-               for name in nsl resolv
-               do
-                   for lib in /usr/lib64 /lib64 /usr/lib /usr/lib/* /lib /lib/*
-@@ -583,24 +532,6 @@ EOF
+@@ -597,24 +556,6 @@ EOF
                ;;
       GNU.0*|GNU/kFreeBSD.[567]*)
                SYSTYPE=GNU0
@@ -160,7 +125,7 @@
                for name in nsl resolv
                do
                    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -631,26 +562,14 @@ EOF
+@@ -645,26 +586,14 @@ EOF
  HP-UX.A.09.*) SYSTYPE=HPUX9
                SYSLIBS=-ldbm
                CCARGS="$CCARGS -DMISSING_USLEEP -DNO_SNPRINTF"
@@ -187,7 +152,7 @@
                ;;
  ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix543
                RANLIB=echo
-@@ -692,12 +611,12 @@ ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix5
+@@ -706,12 +635,12 @@ ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix5
                esac
                : ${SHLIB_CFLAGS=-fPIC}
                : ${SHLIB_SUFFIX=.dylib}
@@ -202,14 +167,3 @@
                ;;
      dcosx.1*) SYSTYPE=DCOSX1
                RANLIB=echo
-@@ -778,8 +697,8 @@ esac
- #
- case "$CCARGS" in
- *-DNO_EAI*) CCARGS="$CCARGS "'-DDEF_SMTPUTF8_ENABLE=\"no\"';;
--       *) icu_cppflags=`(icu-config --cppflags) 2>/dev/null` && {
--              icu_ldflags=`(icu-config --ldflags) 2>/dev/null` && {
-+       *) icu_cppflags=`(pkg-config --cflags icu-i18n) 2>/dev/null` && {
-+              icu_ldflags=`(pkg-config --libs icu-i18n) 2>/dev/null` && {
-                   trap 'rm -f makedefs.test makedefs.test.[co]' 1 2 3 15
-                   cat >makedefs.test.c <<'EOF'
- #include <unicode/uidna.h>



Home | Main Index | Thread Index | Old Index