CVS commit: src/external/ibm-public/postfix

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Sat Dec 23 20:30:46 UTC 2023

Modified Files:
        src/external/ibm-public/postfix/dist: makedefs
        src/external/ibm-public/postfix/dist/README_FILES: INSTALL TLS_README
        src/external/ibm-public/postfix/dist/conf: main.cf master.cf
            postfix-files postfix-script postfix-tls-script
        src/external/ibm-public/postfix/dist/html:
            ADDRESS_VERIFICATION_README.html INSTALL.html TLS_README.html
            postconf.5.html
        src/external/ibm-public/postfix/dist/man/man1: postfix-tls.1 postfix.1
            postlog.1 postqueue.1 posttls-finger.1
        src/external/ibm-public/postfix/dist/man/man5: aliases.5 cidr_table.5
            ldap_table.5 mysql_table.5 pcre_table.5 pgsql_table.5 postconf.5
            regexp_table.5 virtual.5
        src/external/ibm-public/postfix/dist/man/man8: postscreen.8 smtp.8
            smtpd.8 tlsproxy.8
        src/external/ibm-public/postfix/dist/proto:
            ADDRESS_VERIFICATION_README.html INSTALL.html TLS_README.html
            postconf.proto
        src/external/ibm-public/postfix/dist/src/cleanup: cleanup_map1n.c
            cleanup_milter.c
        src/external/ibm-public/postfix/dist/src/dns: dns.h dns_lookup.c
            dns_rr.c dns_rr_eq_sa.c dns_sa_to_rr.c dns_str_resflags.c
            dns_strrecord.c dns_strtype.c
        src/external/ibm-public/postfix/dist/src/global: compat_level.c
            compat_level.h dict_ldap.c dict_memcache.c dict_mysql.c
            dict_pgsql.c dict_proxy.h dict_sqlite.c dynamicmaps.c
            header_body_checks.h mail_dict.c mail_params.h mail_proto.h
            mail_version.h map_search.c maps.c mkmap_proxy.c smtp_stream.c
            smtp_stream.h
        src/external/ibm-public/postfix/dist/src/local: local_expand.c
        src/external/ibm-public/postfix/dist/src/milter: milter8.c
        src/external/ibm-public/postfix/dist/src/postalias: postalias.c
        src/external/ibm-public/postfix/dist/src/postconf: postconf.h
            postconf_dbms.c postconf_edit.c postconf_main.c postconf_master.c
            postconf_misc.c
        src/external/ibm-public/postfix/dist/src/postfix: postfix.c
        src/external/ibm-public/postfix/dist/src/postlog: postlog.c
        src/external/ibm-public/postfix/dist/src/postmap: postmap.c
        src/external/ibm-public/postfix/dist/src/postqueue: postqueue.c
        src/external/ibm-public/postfix/dist/src/postscreen: postscreen.c
            postscreen_smtpd.c
        src/external/ibm-public/postfix/dist/src/posttls-finger:
            posttls-finger.c
        src/external/ibm-public/postfix/dist/src/showq: showq.c
        src/external/ibm-public/postfix/dist/src/smtp: lmtp_params.c smtp.c
            smtp.h smtp_addr.c smtp_addr.h smtp_connect.c smtp_params.c
            smtp_proto.c smtp_reuse.c smtp_session.c
        src/external/ibm-public/postfix/dist/src/smtpd: smtpd.c smtpd.h
            smtpd_check.c smtpd_peer.c smtpd_proxy.c smtpd_sasl_glue.c
        src/external/ibm-public/postfix/dist/src/tls: tls.h tls_client.c
            tls_dane.c tls_dh.c tls_fprint.c tls_misc.c tls_proxy.h
            tls_proxy_client_misc.c tls_proxy_client_print.c
            tls_proxy_client_scan.c tls_server.c
        src/external/ibm-public/postfix/dist/src/tlsproxy: tlsproxy.c
        src/external/ibm-public/postfix/dist/src/util: argv.c argv.h attr.h
            clean_env.c dict.c dict.h dict_cache.c dict_cdb.h dict_cidr.c
            dict_db.h dict_dbm.h dict_fail.h dict_lmdb.h dict_open.c
            dict_pcre.c dict_regexp.c dict_sdbm.h hash_fnv.c hash_fnv.h
            htable.c inet_addr_sizes.c inet_addr_sizes.h inet_connect.c
            inet_prefix_top.c inet_prefix_top.h make_dirs.c match_list.c
            mkmap.h mkmap_cdb.c mkmap_db.c mkmap_dbm.c mkmap_fail.c
            mkmap_lmdb.c mkmap_open.c mkmap_sdbm.c mystrtok.c sock_addr.c
            sock_addr.h split_nameval.c stringops.h sys_defs.h unix_send_fd.c
            valid_hostname.c valid_hostname.h
        src/external/ibm-public/postfix/dist/src/xsasl: xsasl_cyrus_server.c
        src/external/ibm-public/postfix/lib/global: Makefile
        src/external/ibm-public/postfix/lib/util: Makefile
Removed Files:
        src/external/ibm-public/postfix/dist/src/global: mkmap.h mkmap_cdb.c
            mkmap_db.c mkmap_dbm.c mkmap_fail.c mkmap_lmdb.c mkmap_open.c
            mkmap_sdbm.c

Log Message:
merge conflicts between 3.7.3 and 3.8.4


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/ibm-public/postfix/dist/makedefs
cvs rdiff -u -r1.9 -r1.10 \
    src/external/ibm-public/postfix/dist/README_FILES/INSTALL
cvs rdiff -u -r1.13 -r1.14 \
    src/external/ibm-public/postfix/dist/README_FILES/TLS_README
cvs rdiff -u -r1.9 -r1.10 src/external/ibm-public/postfix/dist/conf/main.cf
cvs rdiff -u -r1.10 -r1.11 \
    src/external/ibm-public/postfix/dist/conf/master.cf
cvs rdiff -u -r1.8 -r1.9 \
    src/external/ibm-public/postfix/dist/conf/postfix-files
cvs rdiff -u -r1.3 -r1.4 \
    src/external/ibm-public/postfix/dist/conf/postfix-script
cvs rdiff -u -r1.4 -r1.5 \
    src/external/ibm-public/postfix/dist/conf/postfix-tls-script
cvs rdiff -u -r1.10 -r1.11 \
    src/external/ibm-public/postfix/dist/html/ADDRESS_VERIFICATION_README.html
cvs rdiff -u -r1.9 -r1.10 \
    src/external/ibm-public/postfix/dist/html/INSTALL.html
cvs rdiff -u -r1.14 -r1.15 \
    src/external/ibm-public/postfix/dist/html/TLS_README.html
cvs rdiff -u -r1.18 -r1.19 \
    src/external/ibm-public/postfix/dist/html/postconf.5.html
cvs rdiff -u -r1.2 -r1.3 \
    src/external/ibm-public/postfix/dist/man/man1/postfix-tls.1
cvs rdiff -u -r1.5 -r1.6 \
    src/external/ibm-public/postfix/dist/man/man1/postfix.1
cvs rdiff -u -r1.4 -r1.5 \
    src/external/ibm-public/postfix/dist/man/man1/postlog.1 \
    src/external/ibm-public/postfix/dist/man/man1/postqueue.1 \
    src/external/ibm-public/postfix/dist/man/man1/posttls-finger.1
cvs rdiff -u -r1.4 -r1.5 \
    src/external/ibm-public/postfix/dist/man/man5/aliases.5 \
    src/external/ibm-public/postfix/dist/man/man5/cidr_table.5 \
    src/external/ibm-public/postfix/dist/man/man5/ldap_table.5 \
    src/external/ibm-public/postfix/dist/man/man5/mysql_table.5 \
    src/external/ibm-public/postfix/dist/man/man5/pgsql_table.5 \
    src/external/ibm-public/postfix/dist/man/man5/virtual.5
cvs rdiff -u -r1.3 -r1.4 \
    src/external/ibm-public/postfix/dist/man/man5/pcre_table.5 \
    src/external/ibm-public/postfix/dist/man/man5/regexp_table.5
cvs rdiff -u -r1.18 -r1.19 \
    src/external/ibm-public/postfix/dist/man/man5/postconf.5
cvs rdiff -u -r1.4 -r1.5 \
    src/external/ibm-public/postfix/dist/man/man8/postscreen.8 \
    src/external/ibm-public/postfix/dist/man/man8/smtp.8 \
    src/external/ibm-public/postfix/dist/man/man8/smtpd.8 \
    src/external/ibm-public/postfix/dist/man/man8/tlsproxy.8
cvs rdiff -u -r1.10 -r1.11 \
    src/external/ibm-public/postfix/dist/proto/ADDRESS_VERIFICATION_README.html
cvs rdiff -u -r1.9 -r1.10 \
    src/external/ibm-public/postfix/dist/proto/INSTALL.html
cvs rdiff -u -r1.13 -r1.14 \
    src/external/ibm-public/postfix/dist/proto/TLS_README.html
cvs rdiff -u -r1.18 -r1.19 \
    src/external/ibm-public/postfix/dist/proto/postconf.proto
cvs rdiff -u -r1.3 -r1.4 \
    src/external/ibm-public/postfix/dist/src/cleanup/cleanup_map1n.c
cvs rdiff -u -r1.4 -r1.5 \
    src/external/ibm-public/postfix/dist/src/cleanup/cleanup_milter.c
cvs rdiff -u -r1.5 -r1.6 src/external/ibm-public/postfix/dist/src/dns/dns.h
cvs rdiff -u -r1.7 -r1.8 \
    src/external/ibm-public/postfix/dist/src/dns/dns_lookup.c
cvs rdiff -u -r1.2 -r1.3 \
    src/external/ibm-public/postfix/dist/src/dns/dns_rr.c \
    src/external/ibm-public/postfix/dist/src/dns/dns_rr_eq_sa.c \
    src/external/ibm-public/postfix/dist/src/dns/dns_sa_to_rr.c \
    src/external/ibm-public/postfix/dist/src/dns/dns_str_resflags.c \
    src/external/ibm-public/postfix/dist/src/dns/dns_strrecord.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
    src/external/ibm-public/postfix/dist/src/dns/dns_strtype.c
cvs rdiff -u -r1.2 -r1.3 \
    src/external/ibm-public/postfix/dist/src/global/compat_level.c \
    src/external/ibm-public/postfix/dist/src/global/compat_level.h \
    src/external/ibm-public/postfix/dist/src/global/dict_memcache.c \
    src/external/ibm-public/postfix/dist/src/global/dict_proxy.h \
    src/external/ibm-public/postfix/dist/src/global/header_body_checks.h \
    src/external/ibm-public/postfix/dist/src/global/mail_dict.c
cvs rdiff -u -r1.4 -r1.5 \
    src/external/ibm-public/postfix/dist/src/global/dict_ldap.c \
    src/external/ibm-public/postfix/dist/src/global/mail_proto.h \
    src/external/ibm-public/postfix/dist/src/global/smtp_stream.c
cvs rdiff -u -r1.3 -r1.4 \
    src/external/ibm-public/postfix/dist/src/global/dict_mysql.c \
    src/external/ibm-public/postfix/dist/src/global/dict_pgsql.c \
    src/external/ibm-public/postfix/dist/src/global/dict_sqlite.c \
    src/external/ibm-public/postfix/dist/src/global/dynamicmaps.c \
    src/external/ibm-public/postfix/dist/src/global/map_search.c \
    src/external/ibm-public/postfix/dist/src/global/maps.c \
    src/external/ibm-public/postfix/dist/src/global/smtp_stream.h
cvs rdiff -u -r1.18 -r1.19 \
    src/external/ibm-public/postfix/dist/src/global/mail_params.h
cvs rdiff -u -r1.5 -r1.6 \
    src/external/ibm-public/postfix/dist/src/global/mail_version.h
cvs rdiff -u -r1.2 -r0 \
    src/external/ibm-public/postfix/dist/src/global/mkmap.h \
    src/external/ibm-public/postfix/dist/src/global/mkmap_db.c \
    src/external/ibm-public/postfix/dist/src/global/mkmap_open.c
cvs rdiff -u -r1.1.1.1 -r0 \
    src/external/ibm-public/postfix/dist/src/global/mkmap_cdb.c \
    src/external/ibm-public/postfix/dist/src/global/mkmap_dbm.c \
    src/external/ibm-public/postfix/dist/src/global/mkmap_fail.c \
    src/external/ibm-public/postfix/dist/src/global/mkmap_lmdb.c \
    src/external/ibm-public/postfix/dist/src/global/mkmap_sdbm.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
    src/external/ibm-public/postfix/dist/src/global/mkmap_proxy.c
cvs rdiff -u -r1.2 -r1.3 \
    src/external/ibm-public/postfix/dist/src/local/local_expand.c
cvs rdiff -u -r1.4 -r1.5 \
    src/external/ibm-public/postfix/dist/src/milter/milter8.c
cvs rdiff -u -r1.4 -r1.5 \
    src/external/ibm-public/postfix/dist/src/postalias/postalias.c
cvs rdiff -u -r1.3 -r1.4 \
    src/external/ibm-public/postfix/dist/src/postconf/postconf.h \
    src/external/ibm-public/postfix/dist/src/postconf/postconf_main.c
cvs rdiff -u -r1.4 -r1.5 \
    src/external/ibm-public/postfix/dist/src/postconf/postconf_dbms.c
cvs rdiff -u -r1.2 -r1.3 \
    src/external/ibm-public/postfix/dist/src/postconf/postconf_edit.c \
    src/external/ibm-public/postfix/dist/src/postconf/postconf_misc.c
cvs rdiff -u -r1.7 -r1.8 \
    src/external/ibm-public/postfix/dist/src/postconf/postconf_master.c
cvs rdiff -u -r1.5 -r1.6 \
    src/external/ibm-public/postfix/dist/src/postfix/postfix.c
cvs rdiff -u -r1.4 -r1.5 \
    src/external/ibm-public/postfix/dist/src/postlog/postlog.c
cvs rdiff -u -r1.4 -r1.5 \
    src/external/ibm-public/postfix/dist/src/postmap/postmap.c
cvs rdiff -u -r1.4 -r1.5 \
    src/external/ibm-public/postfix/dist/src/postqueue/postqueue.c
cvs rdiff -u -r1.4 -r1.5 \
    src/external/ibm-public/postfix/dist/src/postscreen/postscreen.c \
    src/external/ibm-public/postfix/dist/src/postscreen/postscreen_smtpd.c
cvs rdiff -u -r1.4 -r1.5 \
    src/external/ibm-public/postfix/dist/src/posttls-finger/posttls-finger.c
cvs rdiff -u -r1.4 -r1.5 \
    src/external/ibm-public/postfix/dist/src/showq/showq.c
cvs rdiff -u -r1.4 -r1.5 \
    src/external/ibm-public/postfix/dist/src/smtp/lmtp_params.c \
    src/external/ibm-public/postfix/dist/src/smtp/smtp.h \
    src/external/ibm-public/postfix/dist/src/smtp/smtp_addr.c \
    src/external/ibm-public/postfix/dist/src/smtp/smtp_connect.c \
    src/external/ibm-public/postfix/dist/src/smtp/smtp_params.c \
    src/external/ibm-public/postfix/dist/src/smtp/smtp_proto.c \
    src/external/ibm-public/postfix/dist/src/smtp/smtp_session.c
cvs rdiff -u -r1.12 -r1.13 \
    src/external/ibm-public/postfix/dist/src/smtp/smtp.c
cvs rdiff -u -r1.2 -r1.3 \
    src/external/ibm-public/postfix/dist/src/smtp/smtp_addr.h
cvs rdiff -u -r1.3 -r1.4 \
    src/external/ibm-public/postfix/dist/src/smtp/smtp_reuse.c
cvs rdiff -u -r1.19 -r1.20 \
    src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c
cvs rdiff -u -r1.4 -r1.5 \
    src/external/ibm-public/postfix/dist/src/smtpd/smtpd.h \
    src/external/ibm-public/postfix/dist/src/smtpd/smtpd_peer.c \
    src/external/ibm-public/postfix/dist/src/smtpd/smtpd_sasl_glue.c
cvs rdiff -u -r1.5 -r1.6 \
    src/external/ibm-public/postfix/dist/src/smtpd/smtpd_check.c
cvs rdiff -u -r1.2 -r1.3 \
    src/external/ibm-public/postfix/dist/src/smtpd/smtpd_proxy.c
cvs rdiff -u -r1.4 -r1.5 src/external/ibm-public/postfix/dist/src/tls/tls.h \
    src/external/ibm-public/postfix/dist/src/tls/tls_dane.c \
    src/external/ibm-public/postfix/dist/src/tls/tls_dh.c \
    src/external/ibm-public/postfix/dist/src/tls/tls_misc.c
cvs rdiff -u -r1.12 -r1.13 \
    src/external/ibm-public/postfix/dist/src/tls/tls_client.c
cvs rdiff -u -r1.3 -r1.4 \
    src/external/ibm-public/postfix/dist/src/tls/tls_fprint.c \
    src/external/ibm-public/postfix/dist/src/tls/tls_proxy.h \
    src/external/ibm-public/postfix/dist/src/tls/tls_proxy_client_misc.c \
    src/external/ibm-public/postfix/dist/src/tls/tls_proxy_client_print.c \
    src/external/ibm-public/postfix/dist/src/tls/tls_proxy_client_scan.c
cvs rdiff -u -r1.11 -r1.12 \
    src/external/ibm-public/postfix/dist/src/tls/tls_server.c
cvs rdiff -u -r1.5 -r1.6 \
    src/external/ibm-public/postfix/dist/src/tlsproxy/tlsproxy.c
cvs rdiff -u -r1.3 -r1.4 src/external/ibm-public/postfix/dist/src/util/argv.c \
    src/external/ibm-public/postfix/dist/src/util/argv.h \
    src/external/ibm-public/postfix/dist/src/util/dict.c \
    src/external/ibm-public/postfix/dist/src/util/dict_cache.c \
    src/external/ibm-public/postfix/dist/src/util/dict_db.h \
    src/external/ibm-public/postfix/dist/src/util/dict_open.c \
    src/external/ibm-public/postfix/dist/src/util/htable.c \
    src/external/ibm-public/postfix/dist/src/util/mystrtok.c
cvs rdiff -u -r1.4 -r1.5 src/external/ibm-public/postfix/dist/src/util/attr.h \
    src/external/ibm-public/postfix/dist/src/util/dict.h \
    src/external/ibm-public/postfix/dist/src/util/dict_cidr.c \
    src/external/ibm-public/postfix/dist/src/util/dict_pcre.c \
    src/external/ibm-public/postfix/dist/src/util/dict_regexp.c \
    src/external/ibm-public/postfix/dist/src/util/stringops.h
cvs rdiff -u -r1.2 -r1.3 \
    src/external/ibm-public/postfix/dist/src/util/clean_env.c \
    src/external/ibm-public/postfix/dist/src/util/dict_lmdb.h \
    src/external/ibm-public/postfix/dist/src/util/hash_fnv.c \
    src/external/ibm-public/postfix/dist/src/util/hash_fnv.h \
    src/external/ibm-public/postfix/dist/src/util/inet_connect.c \
    src/external/ibm-public/postfix/dist/src/util/match_list.c \
    src/external/ibm-public/postfix/dist/src/util/sock_addr.c \
    src/external/ibm-public/postfix/dist/src/util/valid_hostname.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
    src/external/ibm-public/postfix/dist/src/util/dict_cdb.h \
    src/external/ibm-public/postfix/dist/src/util/dict_fail.h \
    src/external/ibm-public/postfix/dist/src/util/dict_sdbm.h \
    src/external/ibm-public/postfix/dist/src/util/sock_addr.h
cvs rdiff -u -r1.1.1.3 -r1.2 \
    src/external/ibm-public/postfix/dist/src/util/dict_dbm.h \
    src/external/ibm-public/postfix/dist/src/util/split_nameval.c \
    src/external/ibm-public/postfix/dist/src/util/valid_hostname.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/external/ibm-public/postfix/dist/src/util/inet_addr_sizes.c \
    src/external/ibm-public/postfix/dist/src/util/inet_addr_sizes.h \
    src/external/ibm-public/postfix/dist/src/util/inet_prefix_top.c \
    src/external/ibm-public/postfix/dist/src/util/inet_prefix_top.h \
    src/external/ibm-public/postfix/dist/src/util/mkmap.h \
    src/external/ibm-public/postfix/dist/src/util/mkmap_cdb.c \
    src/external/ibm-public/postfix/dist/src/util/mkmap_db.c \
    src/external/ibm-public/postfix/dist/src/util/mkmap_dbm.c \
    src/external/ibm-public/postfix/dist/src/util/mkmap_fail.c \
    src/external/ibm-public/postfix/dist/src/util/mkmap_lmdb.c \
    src/external/ibm-public/postfix/dist/src/util/mkmap_open.c \
    src/external/ibm-public/postfix/dist/src/util/mkmap_sdbm.c
cvs rdiff -u -r1.1.1.4 -r1.2 \
    src/external/ibm-public/postfix/dist/src/util/make_dirs.c
cvs rdiff -u -r1.13 -r1.14 \
    src/external/ibm-public/postfix/dist/src/util/sys_defs.h
cvs rdiff -u -r1.7 -r1.8 \
    src/external/ibm-public/postfix/dist/src/util/unix_send_fd.c
cvs rdiff -u -r1.3 -r1.4 \
    src/external/ibm-public/postfix/dist/src/xsasl/xsasl_cyrus_server.c
cvs rdiff -u -r1.9 -r1.10 src/external/ibm-public/postfix/lib/global/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/ibm-public/postfix/lib/util/Makefile

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