svn commit: r363257 - in projects/release-git: . bin/ps cddl/contrib/opensolaris/cmd/zpool contrib/byacc/test contrib/ofed/infiniband-diags/src contrib/ofed/libibumad contrib/ofed/libibverbs contri...

Thu Jul 16 17:14:40 UTC 2020

Author: gjb
Date: Thu Jul 16 17:14:34 2020
New Revision: 363257
URL: https://svnweb.freebsd.org/changeset/base/363257

Log:
  MFH
  
  Sponsored by:	Rubicon Communications, LLC (netgate.com)

Added:
  projects/release-git/contrib/sendmail/cf/feature/blocklist_recipients.m4
     - copied unchanged from r363256, head/contrib/sendmail/cf/feature/blocklist_recipients.m4
  projects/release-git/contrib/sendmail/cf/feature/check_cert_altnames.m4
     - copied unchanged from r363256, head/contrib/sendmail/cf/feature/check_cert_altnames.m4
  projects/release-git/contrib/sendmail/cf/feature/tls_failures.m4
     - copied unchanged from r363256, head/contrib/sendmail/cf/feature/tls_failures.m4
  projects/release-git/contrib/sendmail/include/sm/notify.h
     - copied unchanged from r363256, head/contrib/sendmail/include/sm/notify.h
  projects/release-git/contrib/sendmail/libsm/notify.c
     - copied unchanged from r363256, head/contrib/sendmail/libsm/notify.c
  projects/release-git/contrib/sendmail/libsm/t-notify.c
     - copied unchanged from r363256, head/contrib/sendmail/libsm/t-notify.c
  projects/release-git/contrib/sendmail/libsmdb/smcdb.c
     - copied unchanged from r363256, head/contrib/sendmail/libsmdb/smcdb.c
  projects/release-git/contrib/sendmail/src/ratectrl.h
     - copied unchanged from r363256, head/contrib/sendmail/src/ratectrl.h
  projects/release-git/contrib/sendmail/src/tls.h
     - copied unchanged from r363256, head/contrib/sendmail/src/tls.h
  projects/release-git/contrib/sendmail/src/tlsh.c
     - copied unchanged from r363256, head/contrib/sendmail/src/tlsh.c
  projects/release-git/usr.bin/localedef/bootstrap/
     - copied from r363256, head/usr.bin/localedef/bootstrap/
Deleted:
  projects/release-git/contrib/byacc/test/calc.tab.c
Modified:
  projects/release-git/ObsoleteFiles.inc
  projects/release-git/RELNOTES
  projects/release-git/bin/ps/print.c
  projects/release-git/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
  projects/release-git/contrib/ofed/infiniband-diags/src/ibdiag_common.c
  projects/release-git/contrib/ofed/infiniband-diags/src/ibdiag_sa.c
  projects/release-git/contrib/ofed/infiniband-diags/src/iblinkinfo.c
  projects/release-git/contrib/ofed/infiniband-diags/src/ibportstate.c
  projects/release-git/contrib/ofed/infiniband-diags/src/ibqueryerrors.c
  projects/release-git/contrib/ofed/infiniband-diags/src/ibroute.c
  projects/release-git/contrib/ofed/libibumad/umad_str.c
  projects/release-git/contrib/ofed/libibverbs/device.c
  projects/release-git/contrib/ofed/libibverbs/examples/rc_pingpong.c
  projects/release-git/contrib/ofed/libibverbs/examples/srq_pingpong.c
  projects/release-git/contrib/ofed/libibverbs/examples/uc_pingpong.c
  projects/release-git/contrib/ofed/libibverbs/examples/ud_pingpong.c
  projects/release-git/contrib/ofed/libibverbs/examples/xsrq_pingpong.c
  projects/release-git/contrib/ofed/libmlx5/bitmap.h
  projects/release-git/contrib/ofed/librdmacm/examples/mckey.c
  projects/release-git/contrib/ofed/opensm/opensm/osm_perfmgr.c
  projects/release-git/contrib/ofed/opensm/opensm/osm_port.c
  projects/release-git/contrib/ofed/opensm/opensm/osm_sa_mad_ctrl.c
  projects/release-git/contrib/sendmail/CACerts
  projects/release-git/contrib/sendmail/FREEBSD-upgrade
  projects/release-git/contrib/sendmail/KNOWNBUGS
  projects/release-git/contrib/sendmail/LICENSE
  projects/release-git/contrib/sendmail/PGPKEYS
  projects/release-git/contrib/sendmail/README
  projects/release-git/contrib/sendmail/RELEASE_NOTES
  projects/release-git/contrib/sendmail/cf/README
  projects/release-git/contrib/sendmail/cf/cf/Makefile
  projects/release-git/contrib/sendmail/cf/cf/knecht.mc
  projects/release-git/contrib/sendmail/cf/cf/submit.cf
  projects/release-git/contrib/sendmail/cf/feature/bcc.m4
  projects/release-git/contrib/sendmail/cf/feature/blacklist_recipients.m4
  projects/release-git/contrib/sendmail/cf/feature/dnsbl.m4
  projects/release-git/contrib/sendmail/cf/feature/enhdnsbl.m4
  projects/release-git/contrib/sendmail/cf/m4/cfhead.m4
  projects/release-git/contrib/sendmail/cf/m4/proto.m4
  projects/release-git/contrib/sendmail/cf/m4/version.m4
  projects/release-git/contrib/sendmail/cf/ostype/hpux10.m4
  projects/release-git/contrib/sendmail/cf/ostype/hpux9.m4
  projects/release-git/contrib/sendmail/contrib/cidrexpand
  projects/release-git/contrib/sendmail/contrib/dnsblaccess.m4
  projects/release-git/contrib/sendmail/contrib/expn.pl
  projects/release-git/contrib/sendmail/contrib/mmuegel
  projects/release-git/contrib/sendmail/doc/op/op.me
  projects/release-git/contrib/sendmail/editmap/Makefile
  projects/release-git/contrib/sendmail/editmap/editmap.c
  projects/release-git/contrib/sendmail/include/libmilter/mfapi.h
  projects/release-git/contrib/sendmail/include/libmilter/mfdef.h
  projects/release-git/contrib/sendmail/include/libsmdb/smdb.h
  projects/release-git/contrib/sendmail/include/sendmail/pathnames.h
  projects/release-git/contrib/sendmail/include/sendmail/sendmail.h
  projects/release-git/contrib/sendmail/include/sm/assert.h
  projects/release-git/contrib/sendmail/include/sm/bdb.h
  projects/release-git/contrib/sendmail/include/sm/cdefs.h
  projects/release-git/contrib/sendmail/include/sm/clock.h
  projects/release-git/contrib/sendmail/include/sm/conf.h
  projects/release-git/contrib/sendmail/include/sm/config.h
  projects/release-git/contrib/sendmail/include/sm/debug.h
  projects/release-git/contrib/sendmail/include/sm/errstring.h
  projects/release-git/contrib/sendmail/include/sm/gen.h
  projects/release-git/contrib/sendmail/include/sm/heap.h
  projects/release-git/contrib/sendmail/include/sm/io.h
  projects/release-git/contrib/sendmail/include/sm/ldap.h
  projects/release-git/contrib/sendmail/include/sm/limits.h
  projects/release-git/contrib/sendmail/include/sm/os/sm_os_freebsd.h
  projects/release-git/contrib/sendmail/include/sm/rpool.h
  projects/release-git/contrib/sendmail/include/sm/sem.h
  projects/release-git/contrib/sendmail/include/sm/shm.h
  projects/release-git/contrib/sendmail/include/sm/string.h
  projects/release-git/contrib/sendmail/include/sm/test.h
  projects/release-git/contrib/sendmail/include/sm/types.h
  projects/release-git/contrib/sendmail/include/sm/varargs.h
  projects/release-git/contrib/sendmail/include/sm/xtrap.h
  projects/release-git/contrib/sendmail/libmilter/Makefile
  projects/release-git/contrib/sendmail/libmilter/README
  projects/release-git/contrib/sendmail/libmilter/comm.c
  projects/release-git/contrib/sendmail/libmilter/docs/api.html
  projects/release-git/contrib/sendmail/libmilter/docs/design.html
  projects/release-git/contrib/sendmail/libmilter/docs/index.html
  projects/release-git/contrib/sendmail/libmilter/docs/installation.html
  projects/release-git/contrib/sendmail/libmilter/docs/overview.html
  projects/release-git/contrib/sendmail/libmilter/docs/sample.html
  projects/release-git/contrib/sendmail/libmilter/docs/smfi_addheader.html
  projects/release-git/contrib/sendmail/libmilter/docs/smfi_addrcpt.html
  projects/release-git/contrib/sendmail/libmilter/docs/smfi_addrcpt_par.html
  projects/release-git/contrib/sendmail/libmilter/docs/smfi_chgfrom.html
  projects/release-git/contrib/sendmail/libmilter/docs/smfi_chgheader.html
  projects/release-git/contrib/sendmail/libmilter/docs/smfi_delrcpt.html
  projects/release-git/contrib/sendmail/libmilter/docs/smfi_getpriv.html
  projects/release-git/contrib/sendmail/libmilter/docs/smfi_getsymval.html
  projects/release-git/contrib/sendmail/libmilter/docs/smfi_insheader.html
  projects/release-git/contrib/sendmail/libmilter/docs/smfi_main.html
  projects/release-git/contrib/sendmail/libmilter/docs/smfi_opensocket.html
  projects/release-git/contrib/sendmail/libmilter/docs/smfi_progress.html
  projects/release-git/contrib/sendmail/libmilter/docs/smfi_quarantine.html
  projects/release-git/contrib/sendmail/libmilter/docs/smfi_register.html
  projects/release-git/contrib/sendmail/libmilter/docs/smfi_replacebody.html
  projects/release-git/contrib/sendmail/libmilter/docs/smfi_setbacklog.html
  projects/release-git/contrib/sendmail/libmilter/docs/smfi_setconn.html
  projects/release-git/contrib/sendmail/libmilter/docs/smfi_setdbg.html
  projects/release-git/contrib/sendmail/libmilter/docs/smfi_setmlreply.html
  projects/release-git/contrib/sendmail/libmilter/docs/smfi_setpriv.html
  projects/release-git/contrib/sendmail/libmilter/docs/smfi_setreply.html
  projects/release-git/contrib/sendmail/libmilter/docs/smfi_setsymlist.html
  projects/release-git/contrib/sendmail/libmilter/docs/smfi_settimeout.html
  projects/release-git/contrib/sendmail/libmilter/docs/smfi_stop.html
  projects/release-git/contrib/sendmail/libmilter/docs/smfi_version.html
  projects/release-git/contrib/sendmail/libmilter/docs/xxfi_abort.html
  projects/release-git/contrib/sendmail/libmilter/docs/xxfi_body.html
  projects/release-git/contrib/sendmail/libmilter/docs/xxfi_close.html
  projects/release-git/contrib/sendmail/libmilter/docs/xxfi_connect.html
  projects/release-git/contrib/sendmail/libmilter/docs/xxfi_data.html
  projects/release-git/contrib/sendmail/libmilter/docs/xxfi_envfrom.html
  projects/release-git/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html
  projects/release-git/contrib/sendmail/libmilter/docs/xxfi_eoh.html
  projects/release-git/contrib/sendmail/libmilter/docs/xxfi_eom.html
  projects/release-git/contrib/sendmail/libmilter/docs/xxfi_header.html
  projects/release-git/contrib/sendmail/libmilter/docs/xxfi_helo.html
  projects/release-git/contrib/sendmail/libmilter/docs/xxfi_negotiate.html
  projects/release-git/contrib/sendmail/libmilter/docs/xxfi_unknown.html
  projects/release-git/contrib/sendmail/libmilter/engine.c
  projects/release-git/contrib/sendmail/libmilter/example.c
  projects/release-git/contrib/sendmail/libmilter/handler.c
  projects/release-git/contrib/sendmail/libmilter/libmilter.h
  projects/release-git/contrib/sendmail/libmilter/listener.c
  projects/release-git/contrib/sendmail/libmilter/main.c
  projects/release-git/contrib/sendmail/libmilter/monitor.c
  projects/release-git/contrib/sendmail/libmilter/sm_gethost.c
  projects/release-git/contrib/sendmail/libmilter/smfi.c
  projects/release-git/contrib/sendmail/libmilter/worker.c
  projects/release-git/contrib/sendmail/libsm/Makefile
  projects/release-git/contrib/sendmail/libsm/Makefile.m4
  projects/release-git/contrib/sendmail/libsm/assert.c
  projects/release-git/contrib/sendmail/libsm/clock.c
  projects/release-git/contrib/sendmail/libsm/config.c
  projects/release-git/contrib/sendmail/libsm/debug.c
  projects/release-git/contrib/sendmail/libsm/errstring.c
  projects/release-git/contrib/sendmail/libsm/exc.c
  projects/release-git/contrib/sendmail/libsm/findfp.c
  projects/release-git/contrib/sendmail/libsm/flags.c
  projects/release-git/contrib/sendmail/libsm/fopen.c
  projects/release-git/contrib/sendmail/libsm/fpos.c
  projects/release-git/contrib/sendmail/libsm/fscanf.c
  projects/release-git/contrib/sendmail/libsm/io.html
  projects/release-git/contrib/sendmail/libsm/ldap.c
  projects/release-git/contrib/sendmail/libsm/local.h
  projects/release-git/contrib/sendmail/libsm/makebuf.c
  projects/release-git/contrib/sendmail/libsm/mbdb.c
  projects/release-git/contrib/sendmail/libsm/memstat.c
  projects/release-git/contrib/sendmail/libsm/niprop.c
  projects/release-git/contrib/sendmail/libsm/refill.c
  projects/release-git/contrib/sendmail/libsm/rewind.c
  projects/release-git/contrib/sendmail/libsm/rpool.c
  projects/release-git/contrib/sendmail/libsm/sem.c
  projects/release-git/contrib/sendmail/libsm/signal.c
  projects/release-git/contrib/sendmail/libsm/stdio.c
  projects/release-git/contrib/sendmail/libsm/strdup.c
  projects/release-git/contrib/sendmail/libsm/strerror.c
  projects/release-git/contrib/sendmail/libsm/string.c
  projects/release-git/contrib/sendmail/libsm/strio.c
  projects/release-git/contrib/sendmail/libsm/strto.c
  projects/release-git/contrib/sendmail/libsm/syslogio.c
  projects/release-git/contrib/sendmail/libsm/t-event.c
  projects/release-git/contrib/sendmail/libsm/t-exc.c
  projects/release-git/contrib/sendmail/libsm/t-heap.c
  projects/release-git/contrib/sendmail/libsm/t-scanf.c
  projects/release-git/contrib/sendmail/libsm/t-sem.c
  projects/release-git/contrib/sendmail/libsm/vfprintf.c
  projects/release-git/contrib/sendmail/libsm/vfscanf.c
  projects/release-git/contrib/sendmail/libsmdb/Makefile
  projects/release-git/contrib/sendmail/libsmdb/Makefile.m4
  projects/release-git/contrib/sendmail/libsmdb/smdb.c
  projects/release-git/contrib/sendmail/libsmdb/smdb1.c
  projects/release-git/contrib/sendmail/libsmdb/smdb2.c
  projects/release-git/contrib/sendmail/libsmdb/smndbm.c
  projects/release-git/contrib/sendmail/libsmutil/Makefile
  projects/release-git/contrib/sendmail/libsmutil/cf.c
  projects/release-git/contrib/sendmail/libsmutil/safefile.c
  projects/release-git/contrib/sendmail/mail.local/Makefile
  projects/release-git/contrib/sendmail/mail.local/mail.local.c
  projects/release-git/contrib/sendmail/mailstats/Makefile
  projects/release-git/contrib/sendmail/mailstats/mailstats.c
  projects/release-git/contrib/sendmail/makemap/Makefile
  projects/release-git/contrib/sendmail/makemap/Makefile.m4
  projects/release-git/contrib/sendmail/makemap/makemap.8
  projects/release-git/contrib/sendmail/makemap/makemap.c
  projects/release-git/contrib/sendmail/praliases/Makefile
  projects/release-git/contrib/sendmail/praliases/praliases.c
  projects/release-git/contrib/sendmail/rmail/Makefile
  projects/release-git/contrib/sendmail/rmail/rmail.c
  projects/release-git/contrib/sendmail/smrsh/Makefile
  projects/release-git/contrib/sendmail/smrsh/smrsh.c
  projects/release-git/contrib/sendmail/src/Makefile
  projects/release-git/contrib/sendmail/src/Makefile.m4
  projects/release-git/contrib/sendmail/src/README
  projects/release-git/contrib/sendmail/src/TRACEFLAGS
  projects/release-git/contrib/sendmail/src/alias.c
  projects/release-git/contrib/sendmail/src/arpadate.c
  projects/release-git/contrib/sendmail/src/bf.c
  projects/release-git/contrib/sendmail/src/collect.c
  projects/release-git/contrib/sendmail/src/conf.c
  projects/release-git/contrib/sendmail/src/conf.h
  projects/release-git/contrib/sendmail/src/control.c
  projects/release-git/contrib/sendmail/src/daemon.c
  projects/release-git/contrib/sendmail/src/daemon.h
  projects/release-git/contrib/sendmail/src/deliver.c
  projects/release-git/contrib/sendmail/src/domain.c
  projects/release-git/contrib/sendmail/src/envelope.c
  projects/release-git/contrib/sendmail/src/err.c
  projects/release-git/contrib/sendmail/src/headers.c
  projects/release-git/contrib/sendmail/src/macro.c
  projects/release-git/contrib/sendmail/src/main.c
  projects/release-git/contrib/sendmail/src/map.c
  projects/release-git/contrib/sendmail/src/map.h
  projects/release-git/contrib/sendmail/src/mci.c
  projects/release-git/contrib/sendmail/src/milter.c
  projects/release-git/contrib/sendmail/src/mime.c
  projects/release-git/contrib/sendmail/src/parseaddr.c
  projects/release-git/contrib/sendmail/src/queue.c
  projects/release-git/contrib/sendmail/src/ratectrl.c
  projects/release-git/contrib/sendmail/src/readcf.c
  projects/release-git/contrib/sendmail/src/recipient.c
  projects/release-git/contrib/sendmail/src/sasl.c
  projects/release-git/contrib/sendmail/src/savemail.c
  projects/release-git/contrib/sendmail/src/sendmail.h
  projects/release-git/contrib/sendmail/src/sfsasl.c
  projects/release-git/contrib/sendmail/src/sfsasl.h
  projects/release-git/contrib/sendmail/src/sm_resolve.c
  projects/release-git/contrib/sendmail/src/sm_resolve.h
  projects/release-git/contrib/sendmail/src/srvrsmtp.c
  projects/release-git/contrib/sendmail/src/stab.c
  projects/release-git/contrib/sendmail/src/timers.c
  projects/release-git/contrib/sendmail/src/tls.c
  projects/release-git/contrib/sendmail/src/udb.c
  projects/release-git/contrib/sendmail/src/usersmtp.c
  projects/release-git/contrib/sendmail/src/util.c
  projects/release-git/contrib/sendmail/src/version.c
  projects/release-git/contrib/sendmail/test/Results
  projects/release-git/contrib/sendmail/vacation/Makefile
  projects/release-git/contrib/sendmail/vacation/vacation.c
  projects/release-git/crypto/openssh/sshd.c
  projects/release-git/crypto/openssh/version.h
  projects/release-git/etc/sendmail/freebsd.mc
  projects/release-git/etc/sendmail/freebsd.submit.mc
  projects/release-git/include/time.h
  projects/release-git/lib/libc/gen/tcsetattr.3
  projects/release-git/lib/libmd/Makefile
  projects/release-git/lib/libpmc/Makefile
  projects/release-git/lib/libpmc/libpmc_pmu_util.c
  projects/release-git/lib/libprocstat/libprocstat.c
  projects/release-git/lib/libsm/Makefile
  projects/release-git/lib/libsmdb/Makefile
  projects/release-git/release/tools/vmimage.subr
  projects/release-git/sbin/devd/devd.conf
  projects/release-git/share/man/man4/vxlan.4
  projects/release-git/share/man/man9/style.9
  projects/release-git/stand/defs.mk
  projects/release-git/sys/amd64/amd64/apic_vector.S
  projects/release-git/sys/amd64/amd64/db_interface.c
  projects/release-git/sys/amd64/amd64/machdep.c
  projects/release-git/sys/amd64/amd64/mp_machdep.c
  projects/release-git/sys/amd64/conf/GENERIC
  projects/release-git/sys/amd64/conf/MINIMAL
  projects/release-git/sys/amd64/include/cpufunc.h
  projects/release-git/sys/amd64/include/pcpu.h
  projects/release-git/sys/amd64/include/smp.h
  projects/release-git/sys/arm/conf/std.armv6
  projects/release-git/sys/arm/conf/std.armv7
  projects/release-git/sys/arm64/arm64/trap.c
  projects/release-git/sys/arm64/conf/GENERIC
  projects/release-git/sys/compat/linuxkpi/common/include/linux/string.h
  projects/release-git/sys/dev/coretemp/coretemp.c
  projects/release-git/sys/dev/hwpmc/hwpmc_amd.c
  projects/release-git/sys/dev/hwpmc/hwpmc_intel.c
  projects/release-git/sys/dev/safexcel/safexcel.c
  projects/release-git/sys/dev/virtio/block/virtio_blk.c
  projects/release-git/sys/dev/virtio/block/virtio_blk.h
  projects/release-git/sys/fs/nfsclient/nfs_clrpcops.c
  projects/release-git/sys/i386/conf/GENERIC
  projects/release-git/sys/i386/conf/MINIMAL
  projects/release-git/sys/i386/i386/mp_machdep.c
  projects/release-git/sys/i386/include/smp.h
  projects/release-git/sys/kern/init_main.c
  projects/release-git/sys/kern/kern_descrip.c
  projects/release-git/sys/kern/kern_exec.c
  projects/release-git/sys/kern/kern_fork.c
  projects/release-git/sys/kern/sys_generic.c
  projects/release-git/sys/kern/vfs_cache.c
  projects/release-git/sys/kern/vfs_vnops.c
  projects/release-git/sys/mips/atheros/ar71xx_wdog.c
  projects/release-git/sys/mips/conf/ERL
  projects/release-git/sys/mips/conf/OCTEON1
  projects/release-git/sys/modules/dtb/allwinner/Makefile
  projects/release-git/sys/net/if_ethersubr.c
  projects/release-git/sys/net/if_tuntap.c
  projects/release-git/sys/netinet/sctp_asconf.c
  projects/release-git/sys/netinet/sctp_input.c
  projects/release-git/sys/netinet/tcp_usrreq.c
  projects/release-git/sys/powerpc/aim/mmu_oea64.c
  projects/release-git/sys/powerpc/conf/GENERIC
  projects/release-git/sys/powerpc/conf/GENERIC64
  projects/release-git/sys/riscv/conf/GENERIC
  projects/release-git/sys/security/mac/mac_framework.c
  projects/release-git/sys/security/mac/mac_framework.h
  projects/release-git/sys/sys/filedesc.h
  projects/release-git/sys/sys/rtprio.h
  projects/release-git/sys/sys/time.h
  projects/release-git/sys/x86/include/apicvar.h
  projects/release-git/sys/x86/include/specialreg.h
  projects/release-git/sys/x86/include/x86_smp.h
  projects/release-git/sys/x86/x86/mp_x86.c
  projects/release-git/sys/x86/xen/xen_apic.c
  projects/release-git/tools/build/Makefile
  projects/release-git/usr.bin/localedef/Makefile
  projects/release-git/usr.bin/localedef/collate.c
  projects/release-git/usr.bin/localedef/ctype.c
  projects/release-git/usr.bin/top/machine.c
  projects/release-git/usr.bin/xinstall/install.1
  projects/release-git/usr.bin/xinstall/xinstall.c
  projects/release-git/usr.sbin/efibootmgr/efibootmgr.c
  projects/release-git/usr.sbin/sendmail/Makefile
Directory Properties:
  projects/release-git/   (props changed)
  projects/release-git/cddl/   (props changed)
  projects/release-git/cddl/contrib/opensolaris/   (props changed)
  projects/release-git/contrib/byacc/   (props changed)
  projects/release-git/contrib/sendmail/   (props changed)
  projects/release-git/crypto/openssh/   (props changed)

Modified: projects/release-git/ObsoleteFiles.inc
==============================================================================

--- projects/release-git/ObsoleteFiles.inc	Thu Jul 16 16:46:24 2020	(r363256)
+++ projects/release-git/ObsoleteFiles.inc	Thu Jul 16 17:14:34 2020	(r363257)
@@ -36,6 +36,21 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20200714: update byacc to 20200330
+OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_calc1.y
+OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_demo.y
+OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_destroy1.y
+OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_destroy2.y
+OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_destroy3.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit1.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit2.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit3.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit4.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit5.y
+OLD_FILES+=usr/tests/usr.bin/yacc/inherit0.y
+OLD_FILES+=usr/tests/usr.bin/yacc/inherit1.y
+OLD_FILES+=usr/tests/usr.bin/yacc/inherit2.y
+
 # 20200706: update of sglist(9), r360574
 OLD_FILES+=usr/share/man/man9/sglist_append_ext_pgs.9.gz
 OLD_FILES+=usr/share/man/man9/sglist_append_mb_ext_pgs.9.gz

Modified: projects/release-git/RELNOTES
==============================================================================
--- projects/release-git/RELNOTES	Thu Jul 16 16:46:24 2020	(r363256)
+++ projects/release-git/RELNOTES	Thu Jul 16 17:14:34 2020	(r363257)
@@ -10,6 +10,13 @@ newline.  Entries should be separated by a newline.
 
 Changes to this file should not be MFCed.
 
+r363253:
+	SCTP support has been removed from GENERIC kernel configurations.
+	The SCTP stack is now built as sctp.ko and can be dynamically loaded.
+
+r363233:
+	Merge sendmail 8.16.1: See contrib/sendmail/RELEASE_NOTES for details.
+
 r363180:
 	The safexcel(4) crypto offload driver has been added.
 

Modified: projects/release-git/bin/ps/print.c
==============================================================================
--- projects/release-git/bin/ps/print.c	Thu Jul 16 16:46:24 2020	(r363256)
+++ projects/release-git/bin/ps/print.c	Thu Jul 16 17:14:34 2020	(r363257)
@@ -723,11 +723,18 @@ priorityr(KINFO *k, VARENT *ve __unused)
 		break;
 	case RTP_PRIO_NORMAL:
 	/* alias for PRI_TIMESHARE */
-		asprintf(&str, "normal:%u", level - PRI_MIN_TIMESHARE);
+		if (level >= PRI_MIN_TIMESHARE)
+			asprintf(&str, "normal:%u", level - PRI_MIN_TIMESHARE);
+		else
+			asprintf(&str, "kernel:%u", level - PRI_MIN_KERN);
 		break;
 	case RTP_PRIO_IDLE:
 	/* alias for PRI_IDLE */
 		asprintf(&str, "idle:%u", level - PRI_MIN_IDLE);
+		break;
+	case RTP_PRIO_ITHD:
+	/* alias for PRI_ITHD */
+		asprintf(&str, "intr:%u", level - PRI_MIN_ITHD);
 		break;
 	default:
 		asprintf(&str, "%u:%u", class, level);

Modified: projects/release-git/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
==============================================================================
--- projects/release-git/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7	Thu Jul 16 16:46:24 2020	(r363256)
+++ projects/release-git/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7	Thu Jul 16 17:14:34 2020	(r363257)
@@ -521,10 +521,9 @@ property has been set larger than 128KB, and will retu
 once all filesystems that have ever had their recordsize larger than 128KB
 are destroyed.
 .Pp
-Please note that booting from datasets that have recordsize greater than
-128KB is
-.Em NOT
-supported by the
+Booting from datasets that use the
+.Sy large_block
+feature is supported by the
 .Fx
 boot loader.
 .It Sy large_dnode

Modified: projects/release-git/contrib/ofed/infiniband-diags/src/ibdiag_common.c
==============================================================================
--- projects/release-git/contrib/ofed/infiniband-diags/src/ibdiag_common.c	Thu Jul 16 16:46:24 2020	(r363256)
+++ projects/release-git/contrib/ofed/infiniband-diags/src/ibdiag_common.c	Thu Jul 16 17:14:34 2020	(r363257)
@@ -120,6 +120,7 @@ static inline int val_str_true(const char *val_str)
 void read_ibdiag_config(const char *file)
 {
 	char buf[1024];
+	char orig_buf[1024];
 	FILE *config_fd = NULL;
 	char *p_prefix, *p_last;
 	char *name;
@@ -142,8 +143,14 @@ void read_ibdiag_config(const char *file)
 		if (*p_prefix == '#')
 			continue; /* ignore comment lines */
 
+		strlcpy(orig_buf, buf, sizeof(orig_buf));
 		name = strtok_r(p_prefix, "=", &p_last);
 		val_str = strtok_r(NULL, "\n", &p_last);
+		if (!name || !val_str) {
+			fprintf(stderr, "%s: malformed line in \"%s\":\n%s\n",
+			    prog_name, file, orig_buf);
+			continue;
+		}
 
 		if (strncmp(name, "CA", strlen("CA")) == 0) {
 			free(ibd_ca);
@@ -165,6 +172,7 @@ void read_ibdiag_config(const char *file)
 			ibd_sakey = strtoull(val_str, 0, 0);
 		} else if (strncmp(name, "nd_format",
 				   strlen("nd_format")) == 0) {
+			free(ibd_nd_format);
 			ibd_nd_format = strdup(val_str);
 		}
 	}

Modified: projects/release-git/contrib/ofed/infiniband-diags/src/ibdiag_sa.c
==============================================================================
--- projects/release-git/contrib/ofed/infiniband-diags/src/ibdiag_sa.c	Thu Jul 16 16:46:24 2020	(r363256)
+++ projects/release-git/contrib/ofed/infiniband-diags/src/ibdiag_sa.c	Thu Jul 16 17:14:34 2020	(r363257)
@@ -222,7 +222,7 @@ static const char *ib_mad_inv_field_str[] = {
 	"MAD Reserved",
 	"MAD Reserved",
 	"MAD Reserved",
-	"MAD Invalid value in Attribute field(s) or Attribute Modifier"
+	"MAD Invalid value in Attribute field(s) or Attribute Modifier",
 	"MAD UNKNOWN ERROR"
 };
 #define MAD_ERR_UNKNOWN (ARR_SIZE(ib_mad_inv_field_str) - 1)

Modified: projects/release-git/contrib/ofed/infiniband-diags/src/iblinkinfo.c
==============================================================================
--- projects/release-git/contrib/ofed/infiniband-diags/src/iblinkinfo.c	Thu Jul 16 16:46:24 2020	(r363256)
+++ projects/release-git/contrib/ofed/infiniband-diags/src/iblinkinfo.c	Thu Jul 16 17:14:34 2020	(r363257)
@@ -293,7 +293,8 @@ void print_node_header(ibnd_node_t *node, int *out_hea
 			printf("%s%s: %s:\n",
 				out_prefix ? out_prefix : "",
 				nodetype_str(node), remap);
-		(*out_header_flag)++;
+		if (out_header_flag)
+			(*out_header_flag)++;
 		free(remap);
 	}
 }
@@ -397,7 +398,7 @@ void diff_node_ports(ibnd_node_t * fabric1_node, ibnd_
 		}
 
 		if (output_diff && fabric2_port) {
-			print_node_header(fabric1_node,
+			print_node_header(fabric2_node,
 					    head_print,
 					    NULL);
 			print_port(fabric2_node,

Modified: projects/release-git/contrib/ofed/infiniband-diags/src/ibportstate.c
==============================================================================
--- projects/release-git/contrib/ofed/infiniband-diags/src/ibportstate.c	Thu Jul 16 16:46:24 2020	(r363256)
+++ projects/release-git/contrib/ofed/infiniband-diags/src/ibportstate.c	Thu Jul 16 17:14:34 2020	(r363257)
@@ -564,6 +564,7 @@ int main(int argc, char **argv)
 				printf("Port is already in enable state\n");
 				goto close_port;
 			}
+			/* FALLTHROUGH */
 		case ENABLE:
 		case RESET:
 			/* Polling */

Modified: projects/release-git/contrib/ofed/infiniband-diags/src/ibqueryerrors.c
==============================================================================
--- projects/release-git/contrib/ofed/infiniband-diags/src/ibqueryerrors.c	Thu Jul 16 16:46:24 2020	(r363256)
+++ projects/release-git/contrib/ofed/infiniband-diags/src/ibqueryerrors.c	Thu Jul 16 17:14:34 2020	(r363257)
@@ -130,6 +130,7 @@ static void set_thres(char *name, uint32_t val)
 static void set_thresholds(char *threshold_file)
 {
 	char buf[1024];
+	char orig_buf[1024];
 	int val = 0;
 	FILE *thresf = fopen(threshold_file, "r");
 	char *p_prefix, *p_last;
@@ -156,8 +157,14 @@ static void set_thresholds(char *threshold_file)
 		if (*p_prefix == '#')
 			continue; /* ignore comment lines */
 
+		strlcpy(orig_buf, buf, sizeof(orig_buf));
 		name = strtok_r(p_prefix, "=", &p_last);
 		val_str = strtok_r(NULL, "\n", &p_last);
+		if (!name || !val_str) {
+			fprintf(stderr, "malformed line in \"%s\":\n%s\n",
+			    threshold_file, orig_buf);
+			continue;
+		}
 
 		val = strtoul(val_str, NULL, 0);
 		set_thres(name, val);

Modified: projects/release-git/contrib/ofed/infiniband-diags/src/ibroute.c
==============================================================================
--- projects/release-git/contrib/ofed/infiniband-diags/src/ibroute.c	Thu Jul 16 16:46:24 2020	(r363256)
+++ projects/release-git/contrib/ofed/infiniband-diags/src/ibroute.c	Thu Jul 16 17:14:34 2020	(r363257)
@@ -354,6 +354,8 @@ char *dump_unicast_tables(ib_portid_t * portid, int st
 	       " (%s):\n", startlid, endlid, portid2str(portid), nodeguid,
 	       mapnd);
 
+	free(mapnd);
+
 	DEBUG("Switch top is 0x%x\n", top);
 
 	printf("  Lid  Out   Destination\n");
@@ -390,7 +392,6 @@ char *dump_unicast_tables(ib_portid_t * portid, int st
 	}
 
 	printf("%d %slids dumped \n", n, dump_all ? "" : "valid ");
-	free(mapnd);
 	return 0;
 }
 

Modified: projects/release-git/contrib/ofed/libibumad/umad_str.c
==============================================================================
--- projects/release-git/contrib/ofed/libibumad/umad_str.c	Thu Jul 16 16:46:24 2020	(r363256)
+++ projects/release-git/contrib/ofed/libibumad/umad_str.c	Thu Jul 16 17:14:34 2020	(r363257)
@@ -246,7 +246,6 @@ static const char * umad_sm_attr_str(__be16 attr_id)
 		default:
 			return (umad_common_attr_str(attr_id));
 	}
-	return ("<unknown>");
 }
 
 static const char * umad_sa_attr_str(__be16 attr_id)
@@ -301,7 +300,6 @@ static const char * umad_sa_attr_str(__be16 attr_id)
 		default:
 			return (umad_common_attr_str(attr_id));
 	}
-	return ("<unknown>");
 }
 
 static const char * umad_cm_attr_str(__be16 attr_id)
@@ -336,7 +334,6 @@ static const char * umad_cm_attr_str(__be16 attr_id)
 		default:
 			return (umad_common_attr_str(attr_id));
 	}
-	return ("<unknown>");
 }
 
 const char * umad_attribute_str(uint8_t mgmt_class, __be16 attr_id)

Modified: projects/release-git/contrib/ofed/libibverbs/device.c
==============================================================================
--- projects/release-git/contrib/ofed/libibverbs/device.c	Thu Jul 16 16:46:24 2020	(r363256)
+++ projects/release-git/contrib/ofed/libibverbs/device.c	Thu Jul 16 17:14:34 2020	(r363257)
@@ -264,7 +264,6 @@ int __ibv_close_device(struct ibv_context *context)
 {
 	int async_fd = context->async_fd;
 	int cmd_fd   = context->cmd_fd;
-	int cq_fd    = -1;
 	struct verbs_context *context_ex;
 	struct verbs_device *verbs_device = verbs_get_device(context->device);
 
@@ -279,8 +278,6 @@ int __ibv_close_device(struct ibv_context *context)
 
 	close(async_fd);
 	close(cmd_fd);
-	if (abi_ver <= 2)
-		close(cq_fd);
 
 	return 0;
 }

Modified: projects/release-git/contrib/ofed/libibverbs/examples/rc_pingpong.c
==============================================================================
--- projects/release-git/contrib/ofed/libibverbs/examples/rc_pingpong.c	Thu Jul 16 16:46:24 2020	(r363256)
+++ projects/release-git/contrib/ofed/libibverbs/examples/rc_pingpong.c	Thu Jul 16 17:14:34 2020	(r363257)
@@ -273,7 +273,11 @@ static struct pingpong_dest *pp_server_exch_dest(struc
 		return NULL;
 	}
 
-	listen(sockfd, 1);
+	if (listen(sockfd, 1) < 0) {
+		perror("listen() failed");
+		close(sockfd);
+		return NULL;
+	}
 	connfd = accept(sockfd, NULL, NULL);
 	close(sockfd);
 	if (connfd < 0) {

Modified: projects/release-git/contrib/ofed/libibverbs/examples/srq_pingpong.c
==============================================================================
--- projects/release-git/contrib/ofed/libibverbs/examples/srq_pingpong.c	Thu Jul 16 16:46:24 2020	(r363256)
+++ projects/release-git/contrib/ofed/libibverbs/examples/srq_pingpong.c	Thu Jul 16 17:14:34 2020	(r363257)
@@ -283,7 +283,11 @@ static struct pingpong_dest *pp_server_exch_dest(struc
 		return NULL;
 	}
 
-	listen(sockfd, 1);
+	if (listen(sockfd, 1) < 0) {
+		perror("listen() failed");
+		close(sockfd);
+		return NULL;
+	}
 	connfd = accept(sockfd, NULL, NULL);
 	close(sockfd);
 	if (connfd < 0) {

Modified: projects/release-git/contrib/ofed/libibverbs/examples/uc_pingpong.c
==============================================================================
--- projects/release-git/contrib/ofed/libibverbs/examples/uc_pingpong.c	Thu Jul 16 16:46:24 2020	(r363256)
+++ projects/release-git/contrib/ofed/libibverbs/examples/uc_pingpong.c	Thu Jul 16 17:14:34 2020	(r363257)
@@ -247,7 +247,11 @@ static struct pingpong_dest *pp_server_exch_dest(struc
 		return NULL;
 	}
 
-	listen(sockfd, 1);
+	if (listen(sockfd, 1) < 0) {
+		perror("listen() failed");
+		close(sockfd);
+		return NULL;
+	}
 	connfd = accept(sockfd, NULL, NULL);
 	close(sockfd);
 	if (connfd < 0) {

Modified: projects/release-git/contrib/ofed/libibverbs/examples/ud_pingpong.c
==============================================================================
--- projects/release-git/contrib/ofed/libibverbs/examples/ud_pingpong.c	Thu Jul 16 16:46:24 2020	(r363256)
+++ projects/release-git/contrib/ofed/libibverbs/examples/ud_pingpong.c	Thu Jul 16 17:14:34 2020	(r363257)
@@ -245,7 +245,11 @@ static struct pingpong_dest *pp_server_exch_dest(struc
 		return NULL;
 	}
 
-	listen(sockfd, 1);
+	if (listen(sockfd, 1) < 0) {
+		perror("listen() failed");
+		close(sockfd);
+		return NULL;
+	}
 	connfd = accept(sockfd, NULL, NULL);
 	close(sockfd);
 	if (connfd < 0) {

Modified: projects/release-git/contrib/ofed/libibverbs/examples/xsrq_pingpong.c
==============================================================================
--- projects/release-git/contrib/ofed/libibverbs/examples/xsrq_pingpong.c	Thu Jul 16 16:46:24 2020	(r363256)
+++ projects/release-git/contrib/ofed/libibverbs/examples/xsrq_pingpong.c	Thu Jul 16 17:14:34 2020	(r363257)
@@ -630,7 +630,11 @@ static int pp_server_connect(int port)
 		return 1;
 	}
 
-	listen(sockfd, ctx.num_clients);
+	if (listen(sockfd, ctx.num_clients) < 0) {
+		perror("listen() failed");
+		close(sockfd);
+		return 1;
+	}
 
 	for (i = 0; i < ctx.num_clients; i++) {
 		connfd = accept(sockfd, NULL, NULL);

Modified: projects/release-git/contrib/ofed/libmlx5/bitmap.h
==============================================================================
--- projects/release-git/contrib/ofed/libmlx5/bitmap.h	Thu Jul 16 16:46:24 2020	(r363256)
+++ projects/release-git/contrib/ofed/libmlx5/bitmap.h	Thu Jul 16 17:14:34 2020	(r363257)
@@ -95,17 +95,17 @@ found:
 
 static inline void mlx5_set_bit(unsigned int nr, unsigned long *addr)
 {
-	addr[(nr / BITS_PER_LONG)] |= (1 << (nr % BITS_PER_LONG));
+	addr[(nr / BITS_PER_LONG)] |= (1UL << (nr % BITS_PER_LONG));
 }
 
-static inline void mlx5_clear_bit(unsigned int nr,  unsigned long *addr)
+static inline void mlx5_clear_bit(unsigned int nr, unsigned long *addr)
 {
-	addr[(nr / BITS_PER_LONG)] &= ~(1 << (nr % BITS_PER_LONG));
+	addr[(nr / BITS_PER_LONG)] &= ~(1UL << (nr % BITS_PER_LONG));
 }
 
 static inline int mlx5_test_bit(unsigned int nr, const unsigned long *addr)
 {
-	return !!(addr[(nr / BITS_PER_LONG)] & (1 <<  (nr % BITS_PER_LONG)));
+	return !!(addr[(nr / BITS_PER_LONG)] & (1UL << (nr % BITS_PER_LONG)));
 }
 
 #endif

Modified: projects/release-git/contrib/ofed/librdmacm/examples/mckey.c
==============================================================================
--- projects/release-git/contrib/ofed/librdmacm/examples/mckey.c	Thu Jul 16 16:46:24 2020	(r363256)
+++ projects/release-git/contrib/ofed/librdmacm/examples/mckey.c	Thu Jul 16 17:14:34 2020	(r363257)
@@ -469,8 +469,7 @@ static int get_dst_addr(char *dst, struct sockaddr *ad
 	sib = (struct sockaddr_ib *) addr;
 	memset(sib, 0, sizeof *sib);
 	sib->sib_family = AF_IB;
-	inet_pton(AF_INET6, dst, &sib->sib_addr);
-	return 0;
+	return inet_pton(AF_INET6, dst, &sib->sib_addr) != 1;
 }
 
 static int run(void)

Modified: projects/release-git/contrib/ofed/opensm/opensm/osm_perfmgr.c
==============================================================================
--- projects/release-git/contrib/ofed/opensm/opensm/osm_perfmgr.c	Thu Jul 16 16:46:24 2020	(r363256)
+++ projects/release-git/contrib/ofed/opensm/opensm/osm_perfmgr.c	Thu Jul 16 17:14:34 2020	(r363257)
@@ -1935,7 +1935,9 @@ ib_api_status_t osm_perfmgr_init(osm_perfmgr_t * pm, o
 	pm->state =
 	    p_opt->perfmgr ? PERFMGR_STATE_ENABLED : PERFMGR_STATE_DISABLE;
 	pm->sweep_state = PERFMGR_SWEEP_SLEEP;
-	cl_spinlock_init(&pm->lock);
+	status = cl_spinlock_init(&pm->lock);
+	if (status != IB_SUCCESS)
+		goto Exit;
 	pm->sweep_time_s = p_opt->perfmgr_sweep_time_s;
 	pm->max_outstanding_queries = p_opt->perfmgr_max_outstanding_queries;
 	pm->ignore_cas = p_opt->perfmgr_ignore_cas;

Modified: projects/release-git/contrib/ofed/opensm/opensm/osm_port.c
==============================================================================
--- projects/release-git/contrib/ofed/opensm/opensm/osm_port.c	Thu Jul 16 16:46:24 2020	(r363256)
+++ projects/release-git/contrib/ofed/opensm/opensm/osm_port.c	Thu Jul 16 17:14:34 2020	(r363257)
@@ -161,8 +161,10 @@ osm_port_t *osm_port_new(IN const ib_node_info_t * p_n
 	   only the singular part that has this GUID is owned.
 	 */
 	p_physp = osm_node_get_physp_ptr(p_parent_node, port_num);
-	if (!p_physp)
+	if (!p_physp) {
+		osm_port_delete(&p_port);
 		return NULL;
+	}
 
 	CL_ASSERT(port_guid == osm_physp_get_port_guid(p_physp));
 	p_port->p_physp = p_physp;

Modified: projects/release-git/contrib/ofed/opensm/opensm/osm_sa_mad_ctrl.c
==============================================================================
--- projects/release-git/contrib/ofed/opensm/opensm/osm_sa_mad_ctrl.c	Thu Jul 16 16:46:24 2020	(r363256)
+++ projects/release-git/contrib/ofed/opensm/opensm/osm_sa_mad_ctrl.c	Thu Jul 16 17:14:34 2020	(r363257)
@@ -373,6 +373,7 @@ static void sa_mad_ctrl_rcv_callback(IN osm_madw_t * p
 	case IB_MAD_METHOD_GETMULTI:
 #endif
 		is_get_request = TRUE;
+		/* FALLTHROUGH */
 	case IB_MAD_METHOD_SET:
 	case IB_MAD_METHOD_DELETE:
 		/* if we are closing down simply do nothing */

Modified: projects/release-git/contrib/sendmail/CACerts
==============================================================================
--- projects/release-git/contrib/sendmail/CACerts	Thu Jul 16 16:46:24 2020	(r363256)
+++ projects/release-git/contrib/sendmail/CACerts	Thu Jul 16 17:14:34 2020	(r363257)
@@ -1,4 +1,3 @@
-# $Id: CACerts,v 8.6 2013-01-18 15:14:17 ca Exp $
 # This file contains some CA certificates that are used to sign the
 # certificates of mail servers of members of the sendmail consortium
 # who may reply to questions etc sent to sendmail.org.
@@ -10,189 +9,92 @@ Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number:
-            92:91:67:de:e0:ef:2c:e4
+            81:9d:41:0f:40:55:ac:4a
     Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=Claus Assmann CA RSA 2015/emailAddress=ca+ca-rsa2015 at esmtp.org
+        Issuer: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=CA/emailAddress=ca+ca-rsa2018 at esmtp.org
         Validity
-            Not Before: Mar  2 19:15:29 2015 GMT
-            Not After : Mar  1 19:15:29 2018 GMT
-        Subject: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=Claus Assmann CA RSA 2015/emailAddress=ca+ca-rsa2015 at esmtp.org
+            Not Before: Feb 27 02:30:55 2018 GMT
+            Not After : Feb 26 02:30:55 2021 GMT
+        Subject: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=CA/emailAddress=ca+ca-rsa2018 at esmtp.org
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
                 Public-Key: (2048 bit)
                 Modulus:
-                    00:b9:1a:a1:56:ce:cb:16:af:4f:96:ba:2a:70:31:
-                    70:d3:86:6c:7a:46:26:47:42:3f:de:49:57:3e:08:
-                    1e:10:25:bf:06:8f:ca:fd:f4:5e:6a:01:7d:31:4d:
-                    50:88:18:43:71:66:65:42:9c:90:97:0d:95:f2:14:
-                    ef:d7:5e:77:ef:7d:b5:49:3f:02:bb:83:20:f7:e6:
-                    fc:9a:cd:13:df:60:41:28:8e:39:07:a6:a4:40:98:
-                    15:1e:46:b6:04:2e:f9:ab:32:d1:8b:fe:52:81:f1:
-                    d2:e1:c3:cf:bf:ab:40:a7:f0:e4:e5:a2:82:37:30:
-                    8c:10:7d:aa:a8:7c:7e:76:cc:5f:1a:24:d0:8c:94:
-                    f6:f2:7f:4a:be:2f:38:67:c0:06:e6:9e:51:ad:55:
-                    d0:cb:26:71:cf:f4:af:7d:5a:41:81:16:fb:26:ec:
-                    f0:35:01:6e:db:f9:e9:00:d7:d0:89:7b:cf:88:16:
-                    8b:1c:8f:77:1f:5d:ef:70:04:28:76:c5:1b:c6:23:
-                    8d:49:6b:f0:b8:21:56:d6:7d:68:6c:be:21:e3:e6:
-                    e3:1d:6f:a5:ea:dc:83:e4:27:b3:6f:5f:1b:3d:33:
-                    a1:d5:d3:f0:73:1a:12:eb:d9:95:00:71:59:16:b4:
-                    e4:60:38:b2:2e:7f:b7:d4:c5:e9:3f:74:e4:48:38:
-                    29:89
+                    00:b8:a3:8d:79:28:c1:1f:9c:11:74:43:26:e1:3b:
+                    cc:14:87:5b:6b:64:4c:ed:79:1b:7f:2a:03:d0:7b:
+                    ef:9e:88:b0:64:36:ee:58:ef:fd:d9:c7:20:b3:71:
+                    e9:6d:1e:a7:bc:c1:7c:3b:fe:2a:e4:16:2f:bc:d6:
+                    2c:f5:98:f9:c4:21:1c:ca:c3:7e:57:89:c8:a9:2f:
+                    da:6b:9b:52:d6:c9:9d:98:97:6d:08:7c:a6:37:4e:
+                    d4:26:bb:db:73:b0:38:ef:7d:1e:dd:8e:dd:8e:17:
+                    2f:a0:3d:a9:0e:4d:f0:2b:b8:14:23:33:ad:c8:a0:
+                    e5:9d:0f:27:ad:83:a2:78:90:05:ec:29:06:91:07:
+                    45:6c:5f:ba:8e:1d:f1:d7:1b:2d:f9:99:ba:2e:27:
+                    e1:03:7d:e9:d2:54:35:cc:39:79:07:83:d8:93:9b:
+                    d6:ef:72:ab:d4:63:8e:6b:f7:00:66:5f:77:e8:b6:
+                    bc:de:5f:8c:d0:ce:1a:c4:db:03:9d:e4:ee:0a:ec:
+                    77:c5:f2:30:69:7e:70:12:e5:c2:4a:28:3f:e7:19:
+                    eb:af:41:fb:e6:a6:1d:b5:fd:2b:99:03:f5:20:90:
+                    38:73:bd:43:70:da:cf:1f:34:5d:ab:17:4b:73:cf:
+                    f9:3d:e1:a2:79:14:de:d8:40:85:82:c4:5a:84:82:
+                    32:f1
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Subject Key Identifier: 
-                B1:69:DB:5E:9B:CE:1A:B4:1D:B2:6A:FC:5A:22:97:B6:24:14:6F:32
+                42:37:75:E7:8F:12:CF:D9:EB:21:22:7D:8A:E8:49:21:FD:E2:3A:3A
             X509v3 Authority Key Identifier: 
-                keyid:B1:69:DB:5E:9B:CE:1A:B4:1D:B2:6A:FC:5A:22:97:B6:24:14:6F:32
-                DirName:/C=US/ST=California/L=Berkeley/O=Endmail Org/OU=MTA/CN=Claus Assmann CA RSA 2015/emailAddress=ca+ca-rsa2015 at esmtp.org
-                serial:92:91:67:DE:E0:EF:2C:E4
-
+                keyid:42:37:75:E7:8F:12:CF:D9:EB:21:22:7D:8A:E8:49:21:FD:E2:3A:3A
+                DirName:/C=US/ST=California/L=Berkeley/O=Endmail Org/OU=MTA/CN=CA/emailAddress=ca+ca-rsa2018 at esmtp.org
+                serial:81:9D:41:0F:40:55:AC:4A
             X509v3 Basic Constraints: 
                 CA:TRUE
             X509v3 Subject Alternative Name: 
-                email:ca+ca-rsa2015 at esmtp.org
+                email:ca+ca-rsa2018 at esmtp.org
             X509v3 Issuer Alternative Name: 
-                email:ca+ca-rsa2015 at esmtp.org
+                email:ca+ca-rsa2018 at esmtp.org
     Signature Algorithm: sha1WithRSAEncryption
-         0a:ce:07:39:77:08:c5:3a:00:04:e8:a0:3b:f7:d2:4c:79:02:
-         23:0b:da:c0:55:39:82:71:0a:0c:83:e2:de:f2:3b:fe:23:bc:
-         9b:13:34:d1:29:0a:16:3f:01:7d:9f:fb:4b:aa:12:dc:3b:7e:
-         b9:27:7b:ec:0c:3f:c0:d9:f5:d8:a8:a1:9c:1c:3a:2f:40:df:
-         27:1a:1a:a0:74:00:19:b7:82:0e:f9:45:86:bf:32:da:0e:72:
-         0a:4c:2c:39:21:63:c3:1f:61:6e:e2:4d:ba:7a:26:1a:15:ce:
-         b1:f6:1a:59:04:70:ed:e8:72:05:4c:fc:84:c6:a5:f4:e2:4a:
-         40:e4:42:70:87:9a:a7:02:26:3a:47:34:09:e0:7b:88:ca:fb:
-         99:d9:9b:bb:0c:52:8a:93:d5:59:30:0b:55:42:b4:bb:d2:b1:
-         49:55:81:a4:70:a0:49:19:f2:4f:61:94:af:e9:d7:62:68:65:
-         97:67:00:26:b8:9b:b2:2c:d0:2c:83:7d:3e:b3:31:73:b9:55:
-         49:53:fa:a3:ad:1b:02:67:08:9e:ce:9e:eb:9f:47:0d:6c:95:
-         e9:6c:30:92:c1:94:67:ad:d9:e3:b9:61:ea:a9:72:98:81:3a:
-         62:80:70:20:9a:3e:c4:1f:6f:bd:b4:00:ec:b1:fe:71:da:91:
-         15:89:f7:8f
------BEGIN CERTIFICATE-----
-MIIFJzCCBA+gAwIBAgIJAJKRZ97g7yzkMA0GCSqGSIb3DQEBBQUAMIGlMQswCQYD
-VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTERMA8GA1UEBwwIQmVya2VsZXkx
-FDASBgNVBAoMC0VuZG1haWwgT3JnMQwwCgYDVQQLDANNVEExIjAgBgNVBAMMGUNs
-YXVzIEFzc21hbm4gQ0EgUlNBIDIwMTUxJjAkBgkqhkiG9w0BCQEWF2NhK2NhLXJz
-YTIwMTVAZXNtdHAub3JnMB4XDTE1MDMwMjE5MTUyOVoXDTE4MDMwMTE5MTUyOVow
-gaUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQHDAhC
-ZXJrZWxleTEUMBIGA1UECgwLRW5kbWFpbCBPcmcxDDAKBgNVBAsMA01UQTEiMCAG
-A1UEAwwZQ2xhdXMgQXNzbWFubiBDQSBSU0EgMjAxNTEmMCQGCSqGSIb3DQEJARYX
-Y2ErY2EtcnNhMjAxNUBlc210cC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQC5GqFWzssWr0+WuipwMXDThmx6RiZHQj/eSVc+CB4QJb8Gj8r99F5q
-AX0xTVCIGENxZmVCnJCXDZXyFO/XXnfvfbVJPwK7gyD35vyazRPfYEEojjkHpqRA
-mBUeRrYELvmrMtGL/lKB8dLhw8+/q0Cn8OTlooI3MIwQfaqofH52zF8aJNCMlPby
-f0q+LzhnwAbmnlGtVdDLJnHP9K99WkGBFvsm7PA1AW7b+ekA19CJe8+IFoscj3cf
-Xe9wBCh2xRvGI41Ja/C4IVbWfWhsviHj5uMdb6Xq3IPkJ7NvXxs9M6HV0/BzGhLr
-2ZUAcVkWtORgOLIuf7fUxek/dORIOCmJAgMBAAGjggFWMIIBUjAdBgNVHQ4EFgQU
-sWnbXpvOGrQdsmr8WiKXtiQUbzIwgdoGA1UdIwSB0jCBz4AUsWnbXpvOGrQdsmr8
-WiKXtiQUbzKhgaukgagwgaUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9y
-bmlhMREwDwYDVQQHDAhCZXJrZWxleTEUMBIGA1UECgwLRW5kbWFpbCBPcmcxDDAK
-BgNVBAsMA01UQTEiMCAGA1UEAwwZQ2xhdXMgQXNzbWFubiBDQSBSU0EgMjAxNTEm
-MCQGCSqGSIb3DQEJARYXY2ErY2EtcnNhMjAxNUBlc210cC5vcmeCCQCSkWfe4O8s
-5DAMBgNVHRMEBTADAQH/MCIGA1UdEQQbMBmBF2NhK2NhLXJzYTIwMTVAZXNtdHAu
-b3JnMCIGA1UdEgQbMBmBF2NhK2NhLXJzYTIwMTVAZXNtdHAub3JnMA0GCSqGSIb3
-DQEBBQUAA4IBAQAKzgc5dwjFOgAE6KA799JMeQIjC9rAVTmCcQoMg+Le8jv+I7yb
-EzTRKQoWPwF9n/tLqhLcO365J3vsDD/A2fXYqKGcHDovQN8nGhqgdAAZt4IO+UWG
-vzLaDnIKTCw5IWPDH2Fu4k26eiYaFc6x9hpZBHDt6HIFTPyExqX04kpA5EJwh5qn
-AiY6RzQJ4HuIyvuZ2Zu7DFKKk9VZMAtVQrS70rFJVYGkcKBJGfJPYZSv6ddiaGWX
-ZwAmuJuyLNAsg30+szFzuVVJU/qjrRsCZwiezp7rn0cNbJXpbDCSwZRnrdnjuWHq
-qXKYgTpigHAgmj7EH2+9tADssf5x2pEVifeP
------END CERTIFICATE-----
+         0b:4c:e5:c2:ed:0a:e5:7b:95:29:22:d4:8f:5f:cb:1b:b1:e3:
+         4c:fc:90:e7:2e:97:87:87:a2:63:0d:6d:4d:f0:1f:0d:84:11:
+         dc:df:b7:fa:c3:c6:2e:07:e9:a0:e9:a6:9f:54:17:ad:1a:d0:
+         36:be:31:cc:a5:85:a0:45:4a:87:45:80:7e:de:ea:97:68:e0:
+         2b:09:5d:9a:31:6f:f5:78:22:c5:66:2a:99:70:9e:6d:c4:ab:
+         f6:90:01:70:53:07:66:6c:a6:b5:ce:4b:36:05:83:87:0c:a7:
+         e0:1e:34:d0:5e:76:a4:20:71:cd:9d:c1:ae:82:27:e0:6f:16:
+         57:74:e7:63:9f:d0:3d:72:91:6d:97:a4:82:23:84:dd:6e:0d:
+         da:43:00:a7:ce:2f:f8:79:04:67:6a:e5:b0:ab:30:d8:f1:90:
+         10:43:3b:09:77:27:34:a4:d4:c0:25:4e:21:32:a3:ab:60:1c:
+         9d:6e:e2:65:39:51:7f:cd:9f:88:3a:7e:f4:38:af:7b:5b:a7:
+         bb:7b:70:97:21:59:fc:5c:55:a1:db:74:0a:37:1e:33:97:5f:
+         70:32:98:b3:d9:99:4e:08:3c:de:01:82:17:9b:49:d7:fa:c9:
+         45:8d:93:cc:42:d6:36:f2:39:3a:47:28:3f:6f:6a:e5:23:f3:
+         5c:d4:a3:1b
 
-
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            f1:41:b3:3d:ba:bd:33:49
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=Claus Assmann CA RSA 2012/emailAddress=ca+ca-rsa2012 at esmtp.org
-        Validity
-            Not Before: Mar 10 02:47:46 2012 GMT
-            Not After : Mar 10 02:47:46 2015 GMT
-        Subject: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=Claus Assmann CA RSA 2012/emailAddress=ca+ca-rsa2012 at esmtp.org
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:a2:80:fc:c6:ce:7f:60:38:65:f4:38:f9:7a:d9:
-                    87:fd:47:eb:3f:2c:4a:c9:38:77:6a:77:94:92:7f:
-                    83:3d:99:57:2c:5f:37:bb:ba:12:10:17:56:fa:eb:
-                    43:a6:4b:4c:1e:30:32:07:94:2f:5a:d8:65:49:29:
-                    fa:24:d1:f0:0b:45:2d:e5:d5:cb:7d:60:dc:a6:ce:
-                    a4:47:35:30:ee:5e:8d:c2:30:e7:a7:63:32:b0:59:
-                    80:cc:8c:99:64:77:8f:50:8e:88:51:47:36:ea:9a:
-                    f3:b4:c0:8c:a6:ab:c6:42:57:88:b9:5f:9f:61:15:
-                    bb:79:65:93:ca:a9:fd:17:eb:87:26:8b:eb:b7:2b:
-                    7e:33:05:2b:ba:c0:46:f7:08:fd:da:c1:50:9b:3d:
-                    26:83:5c:53:97:89:2c:cc:5f:f2:7b:a8:b7:3d:fb:
-                    f2:b4:89:0d:43:ef:18:5c:21:75:71:cc:f0:c2:a3:
-                    84:69:c0:a7:f3:9b:de:c1:c7:5a:5c:7e:68:da:49:
-                    71:af:58:a8:51:9f:bd:f9:3d:bb:a5:92:fa:7b:1d:
-                    52:f5:fe:90:59:95:27:65:a4:af:97:9a:4f:01:39:
-                    59:7d:08:6f:a1:8f:42:47:49:bf:12:52:53:39:74:
-                    8d:62:3b:bd:4c:4f:05:0f:c4:b9:3e:da:a8:0e:96:
-                    05:2d
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                08:38:E3:88:92:53:6E:F1:56:69:27:44:B5:4C:A0:18:CA:06:97:EB
-            X509v3 Authority Key Identifier: 
-                keyid:08:38:E3:88:92:53:6E:F1:56:69:27:44:B5:4C:A0:18:CA:06:97:EB
-                DirName:/C=US/ST=California/L=Berkeley/O=Endmail Org/OU=MTA/CN=Claus Assmann CA RSA 2012/emailAddress=ca+ca-rsa2012 at esmtp.org
-                serial:F1:41:B3:3D:BA:BD:33:49
-
-            X509v3 Basic Constraints: 
-                CA:TRUE
-            X509v3 Subject Alternative Name: 
-                email:ca+ca-rsa2012 at esmtp.org
-            X509v3 Issuer Alternative Name: 
-                email:ca+ca-rsa2012 at esmtp.org
-    Signature Algorithm: sha1WithRSAEncryption
-        9a:8f:4d:23:5b:30:80:e1:94:e4:66:9c:3a:17:8b:79:49:5b:
-        ec:5d:e5:a1:22:2d:71:37:a1:51:e7:1d:b1:0d:a9:9b:aa:a9:
-        0d:c7:cd:d6:24:f9:e0:f0:57:be:4f:74:0c:4b:7a:42:4c:70:
-        19:2e:8e:eb:cb:1b:00:26:27:eb:1c:42:33:d5:ec:32:b4:6c:
-        7d:a3:04:a1:5c:00:49:c9:0d:4c:4d:28:37:06:22:77:ec:40:
-        15:25:3a:23:84:ae:1f:da:90:dd:c9:dc:27:ee:7c:ec:e5:df:
-        b8:ba:1e:3f:ee:c2:91:a2:3f:22:92:1e:f3:06:7e:aa:e9:c3:
-        11:2d:3d:2f:85:f7:fc:d7:e2:f8:6d:70:a6:40:62:69:e7:52:
-        ed:1b:19:38:72:86:08:a1:3d:47:c8:68:82:41:db:db:2a:52:
-        25:d7:49:aa:9e:c5:83:22:7d:2f:0b:df:8c:90:2d:b5:aa:33:
-        c7:9b:e8:39:8f:bb:79:5b:13:2d:4e:a9:69:59:c7:09:26:e2:
-        b5:53:80:86:72:bb:7c:be:e9:46:5b:d8:b2:78:42:d6:5d:c3:
-        bb:3a:3b:5f:0f:e8:c3:60:fb:88:9f:3a:2b:9f:d3:7d:9f:c7:
-        32:aa:4d:34:a7:66:a1:25:16:95:a6:69:e7:86:a3:5c:b9:b9:
-        df:58:05:e3
 -----BEGIN CERTIFICATE-----
-MIIFJzCCBA+gAwIBAgIJAPFBsz26vTNJMA0GCSqGSIb3DQEBBQUAMIGlMQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTERMA8GA1UEBxMIQmVya2VsZXkx
-FDASBgNVBAoTC0VuZG1haWwgT3JnMQwwCgYDVQQLEwNNVEExIjAgBgNVBAMTGUNs
-YXVzIEFzc21hbm4gQ0EgUlNBIDIwMTIxJjAkBgkqhkiG9w0BCQEWF2NhK2NhLXJz
-YTIwMTJAZXNtdHAub3JnMB4XDTEyMDMxMDAyNDc0NloXDTE1MDMxMDAyNDc0Nlow
-gaUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQHEwhC
-ZXJrZWxleTEUMBIGA1UEChMLRW5kbWFpbCBPcmcxDDAKBgNVBAsTA01UQTEiMCAG
-A1UEAxMZQ2xhdXMgQXNzbWFubiBDQSBSU0EgMjAxMjEmMCQGCSqGSIb3DQEJARYX
-Y2ErY2EtcnNhMjAxMkBlc210cC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCigPzGzn9gOGX0OPl62Yf9R+s/LErJOHdqd5SSf4M9mVcsXze7uhIQ
-F1b660OmS0weMDIHlC9a2GVJKfok0fALRS3l1ct9YNymzqRHNTDuXo3CMOenYzKw
-WYDMjJlkd49QjohRRzbqmvO0wIymq8ZCV4i5X59hFbt5ZZPKqf0X64cmi+u3K34z
-BSu6wEb3CP3awVCbPSaDXFOXiSzMX/J7qLc9+/K0iQ1D7xhcIXVxzPDCo4RpwKfz
-m97Bx1pcfmjaSXGvWKhRn735Pbulkvp7HVL1/pBZlSdlpK+Xmk8BOVl9CG+hj0JH
-Sb8SUlM5dI1iO71MTwUPxLk+2qgOlgUtAgMBAAGjggFWMIIBUjAdBgNVHQ4EFgQU
-CDjjiJJTbvFWaSdEtUygGMoGl+swgdoGA1UdIwSB0jCBz4AUCDjjiJJTbvFWaSdE
-tUygGMoGl+uhgaukgagwgaUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9y
-bmlhMREwDwYDVQQHEwhCZXJrZWxleTEUMBIGA1UEChMLRW5kbWFpbCBPcmcxDDAK
-BgNVBAsTA01UQTEiMCAGA1UEAxMZQ2xhdXMgQXNzbWFubiBDQSBSU0EgMjAxMjEm
-MCQGCSqGSIb3DQEJARYXY2ErY2EtcnNhMjAxMkBlc210cC5vcmeCCQDxQbM9ur0z
-STAMBgNVHRMEBTADAQH/MCIGA1UdEQQbMBmBF2NhK2NhLXJzYTIwMTJAZXNtdHAu
-b3JnMCIGA1UdEgQbMBmBF2NhK2NhLXJzYTIwMTJAZXNtdHAub3JnMA0GCSqGSIb3
-DQEBBQUAA4IBAQCaj00jWzCA4ZTkZpw6F4t5SVvsXeWhIi1xN6FR5x2xDambqqkN
-x83WJPng8Fe+T3QMS3pCTHAZLo7ryxsAJifrHEIz1ewytGx9owShXABJyQ1MTSg3
-BiJ37EAVJTojhK4f2pDdydwn7nzs5d+4uh4/7sKRoj8ikh7zBn6q6cMRLT0vhff8
-1+L4bXCmQGJp51LtGxk4coYIoT1HyGiCQdvbKlIl10mqnsWDIn0vC9+MkC21qjPH
-m+g5j7t5WxMtTqlpWccJJuK1U4CGcrt8vulGW9iyeELWXcO7OjtfD+jDYPuInzor
-n9N9n8cyqk00p2ahJRaVpmnnhqNcubnfWAXj
+MIIE4jCCA8qgAwIBAgIJAIGdQQ9AVaxKMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
+VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTERMA8GA1UEBwwIQmVya2VsZXkx
+FDASBgNVBAoMC0VuZG1haWwgT3JnMQwwCgYDVQQLDANNVEExCzAJBgNVBAMMAkNB
+MSYwJAYJKoZIhvcNAQkBFhdjYStjYS1yc2EyMDE4QGVzbXRwLm9yZzAeFw0xODAy
+MjcwMjMwNTVaFw0yMTAyMjYwMjMwNTVaMIGOMQswCQYDVQQGEwJVUzETMBEGA1UE
+CAwKQ2FsaWZvcm5pYTERMA8GA1UEBwwIQmVya2VsZXkxFDASBgNVBAoMC0VuZG1h
+aWwgT3JnMQwwCgYDVQQLDANNVEExCzAJBgNVBAMMAkNBMSYwJAYJKoZIhvcNAQkB
+FhdjYStjYS1yc2EyMDE4QGVzbXRwLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBALijjXkowR+cEXRDJuE7zBSHW2tkTO15G38qA9B7756IsGQ27ljv
+/dnHILNx6W0ep7zBfDv+KuQWL7zWLPWY+cQhHMrDfleJyKkv2mubUtbJnZiXbQh8
+pjdO1Ca723OwOO99Ht2O3Y4XL6A9qQ5N8Cu4FCMzrcig5Z0PJ62DoniQBewpBpEH
+RWxfuo4d8dcbLfmZui4n4QN96dJUNcw5eQeD2JOb1u9yq9Rjjmv3AGZfd+i2vN5f
+jNDOGsTbA53k7grsd8XyMGl+cBLlwkooP+cZ669B++amHbX9K5kD9SCQOHO9Q3Da
+zx80XasXS3PP+T3honkU3thAhYLEWoSCMvECAwEAAaOCAT8wggE7MB0GA1UdDgQW
+BBRCN3XnjxLP2eshIn2K6Ekh/eI6OjCBwwYDVR0jBIG7MIG4gBRCN3XnjxLP2esh
+In2K6Ekh/eI6OqGBlKSBkTCBjjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlm
+b3JuaWExETAPBgNVBAcMCEJlcmtlbGV5MRQwEgYDVQQKDAtFbmRtYWlsIE9yZzEM
+MAoGA1UECwwDTVRBMQswCQYDVQQDDAJDQTEmMCQGCSqGSIb3DQEJARYXY2ErY2Et
+cnNhMjAxOEBlc210cC5vcmeCCQCBnUEPQFWsSjAMBgNVHRMEBTADAQH/MCIGA1Ud
+EQQbMBmBF2NhK2NhLXJzYTIwMThAZXNtdHAub3JnMCIGA1UdEgQbMBmBF2NhK2Nh
+LXJzYTIwMThAZXNtdHAub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQALTOXC7Qrle5Up
+ItSPX8sbseNM/JDnLpeHh6JjDW1N8B8NhBHc37f6w8YuB+mg6aafVBetGtA2vjHM
+pYWgRUqHRYB+3uqXaOArCV2aMW/1eCLFZiqZcJ5txKv2kAFwUwdmbKa1zks2BYOH
+DKfgHjTQXnakIHHNncGugifgbxZXdOdjn9A9cpFtl6SCI4Tdbg3aQwCnzi/4eQRn
+auWwqzDY8ZAQQzsJdyc0pNTAJU4hMqOrYBydbuJlOVF/zZ+IOn70OK97W6e7e3CX
+IVn8XFWh23QKNx4zl19wMpiz2ZlOCDzeAYIXm0nX+slFjZPMQtY28jk6Ryg/b2rl
+I/Nc1KMb
 -----END CERTIFICATE-----

Modified: projects/release-git/contrib/sendmail/FREEBSD-upgrade
==============================================================================
--- projects/release-git/contrib/sendmail/FREEBSD-upgrade	Thu Jul 16 16:46:24 2020	(r363256)
+++ projects/release-git/contrib/sendmail/FREEBSD-upgrade	Thu Jul 16 17:14:34 2020	(r363257)
@@ -1,6 +1,6 @@
 $FreeBSD$
 
-sendmail 8.15.2
+sendmail 8.16.1
 	originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/
 
 For the import of sendmail, the following directories were renamed:
@@ -13,12 +13,16 @@ http://www.freebsd.org/doc/en_US.ISO8859-1/articles/co
 
 Then merged using:
 
-% set FSVN=svn+ssh://svn.freebsd.org/base
+% set FSVN=svn+ssh://repo.freebsd.org/base
 % svn checkout $FSVN/head/contrib/sendmail head
 % cd head
-% svn merge --accept=postpone $FSVN/vendor/sendmail/dist .
-% svn rm --force */Build [e-v]*/*.0 cf/cf/generic-*.cf cf/cf/Build
-% svn rm --force Build devtools doc/op/op.ps src/makesendmail src/sysexits.h
+### Replace XXXXXX with import revision number in next command:
+% svn merge -c rXXXXXX --accept=postpone '^/vendor/sendmail/dist' .
+% svn resolve --accept working cf/cf/Build \
+    cf/cf/generic-{bsd4.4,hpux{9,10},linux,mpeix,nextstep3.3,osf1,solaris,sunos4.1,ultrix4}.cf \
+    devtools doc/op/op.ps editmap/editmap.0 mail.local/mail.local.0 mailstats/mailstats.0 \
+    makemap/makemap.0 praliases/praliases.0 rmail/rmail.0 smrsh/smrsh.0 \
+    src/{aliases,mailq,newaliases,sendmail}.0 vacation/vacation.0
 % svn propset -R svn:keywords FreeBSD=%H .
 % svn propdel svn:keywords libmilter/docs/*.jpg
 % svn diff --no-diff-deleted --old=$FSVN/vendor/sendmail/dist --new=.
@@ -98,4 +102,4 @@ infrastructure in FreeBSD:
 	usr.sbin/mailwrapper/Makefile
 
 gshapiro at FreeBSD.org
-06-July-2015
+15-July-2020

Modified: projects/release-git/contrib/sendmail/KNOWNBUGS
==============================================================================
--- projects/release-git/contrib/sendmail/KNOWNBUGS	Thu Jul 16 16:46:24 2020	(r363256)
+++ projects/release-git/contrib/sendmail/KNOWNBUGS	Thu Jul 16 17:14:34 2020	(r363257)
@@ -271,4 +271,3 @@ Kresolve sequence dnsmx canon
   be used if set instead of LOCAL_RELAY ($R).  This will be fixed in a
   future version.
 
-$Revision: 8.61 $, Last updated $Date: 2011-04-07 17:48:23 $

Modified: projects/release-git/contrib/sendmail/LICENSE
==============================================================================
--- projects/release-git/contrib/sendmail/LICENSE	Thu Jul 16 16:46:24 2020	(r363256)
+++ projects/release-git/contrib/sendmail/LICENSE	Thu Jul 16 17:14:34 2020	(r363257)
@@ -37,7 +37,7 @@ each of the following conditions is met:
    the "Copyright Notice" refers to the following language:
    "Copyright (c) 1998-2014 Proofpoint, Inc.  All rights reserved."
 
-3. Neither the name of Proofpoint, Inc. nor the University of California nor
+4. Neither the name of Proofpoint, Inc. nor the University of California nor
    names of their contributors may be used to endorse or promote
    products derived from this software without specific prior written
    permission.  The name "sendmail" is a trademark of Proofpoint, Inc.

Modified: projects/release-git/contrib/sendmail/PGPKEYS
==============================================================================
--- projects/release-git/contrib/sendmail/PGPKEYS	Thu Jul 16 16:46:24 2020	(r363256)
+++ projects/release-git/contrib/sendmail/PGPKEYS	Thu Jul 16 17:14:34 2020	(r363257)
@@ -8,140 +8,1092 @@ GPG:       gpg --import PGPKEYS
 Other versions of PGP may require you to separate each key into a
 separate file and add them one at a time.
 
-Type Bits KeyID      Created    Expires    Algorithm       Use
-pub  1024 0x16F4CCE9 1999-06-23 ---------- RSA             Sign & Encrypt
-f16    Fingerprint16 = 18 A4 51 78 CA 72 D4 A7  ED 80 BA 8A C4 98 71 1D
-uid  Sendmail Security <sendmail-security at sendmail.org>
+Note that PGP 2.X and 5.X are deprecated and may not properly
+function with newer keys.
 
+pub   4096R/CA28E5A4 2016-03-04
+fingerprint: 8E6A 5575 0635 A7EA F56C  FE80 3D67 CBA7 CA28 E5A4
+uid Sendmail Security <sendmail-security at sendmail.org>
+
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.4 (Darwin)
+Version: GnuPG v1
 
-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
+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
-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
-gpExpdV7qPrw9k01j5rod5PjZlG8zV0=
-=SR28
+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

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
