svn commit: r358678 - in projects/clang1000-import: . contrib/dtc contrib/elftoolchain/readelf contrib/libarchive/cpio contrib/libarchive/cpio/test contrib/libarchive/libarchive contrib/libarchive/...

Dimitry Andric dim at FreeBSD.org
Thu Mar 5 17:58:05 UTC 2020 

Author: dim
Date: Thu Mar  5 17:55:36 2020
New Revision: 358678
URL: https://svnweb.freebsd.org/changeset/base/358678

Log:
  Merge ^/head r358466 through r358677.

Added:
  projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_format_zip_lzma_stream_end.zipx.uu
     - copied unchanged from r358676, head/contrib/libarchive/libarchive/test/test_read_format_zip_lzma_stream_end.zipx.uu
  projects/clang1000-import/contrib/ntp/include/ntp_calgps.h
     - copied unchanged from r358676, head/contrib/ntp/include/ntp_calgps.h
  projects/clang1000-import/contrib/ntp/include/ntp_psl.h
     - copied unchanged from r358676, head/contrib/ntp/include/ntp_psl.h
  projects/clang1000-import/contrib/ntp/include/timexsup.h
     - copied unchanged from r358676, head/contrib/ntp/include/timexsup.h
  projects/clang1000-import/contrib/ntp/libntp/ntp_calgps.c
     - copied unchanged from r358676, head/contrib/ntp/libntp/ntp_calgps.c
  projects/clang1000-import/contrib/ntp/libntp/timespecops.c
     - copied unchanged from r358676, head/contrib/ntp/libntp/timespecops.c
  projects/clang1000-import/contrib/ntp/libntp/timexsup.c
     - copied unchanged from r358676, head/contrib/ntp/libntp/timexsup.c
  projects/clang1000-import/contrib/ntp/ntpd/psl0.conf
     - copied unchanged from r358676, head/contrib/ntp/ntpd/psl0.conf
  projects/clang1000-import/contrib/ntp/ntpd/psl1.conf
     - copied unchanged from r358676, head/contrib/ntp/ntpd/psl1.conf
  projects/clang1000-import/contrib/ntp/ntpd/psl2.conf
     - copied unchanged from r358676, head/contrib/ntp/ntpd/psl2.conf
  projects/clang1000-import/usr.bin/elfctl/
     - copied from r358676, head/usr.bin/elfctl/
  projects/clang1000-import/usr.bin/hexdump/tests/d_hexdump_dflag_a_eb.out
     - copied unchanged from r358676, head/usr.bin/hexdump/tests/d_hexdump_dflag_a_eb.out
  projects/clang1000-import/usr.bin/hexdump/tests/d_hexdump_dflag_a_el.out
     - copied unchanged from r358676, head/usr.bin/hexdump/tests/d_hexdump_dflag_a_el.out
  projects/clang1000-import/usr.bin/hexdump/tests/d_hexdump_dflag_b_eb.out
     - copied unchanged from r358676, head/usr.bin/hexdump/tests/d_hexdump_dflag_b_eb.out
  projects/clang1000-import/usr.bin/hexdump/tests/d_hexdump_dflag_b_el.out
     - copied unchanged from r358676, head/usr.bin/hexdump/tests/d_hexdump_dflag_b_el.out
  projects/clang1000-import/usr.bin/hexdump/tests/d_hexdump_dflag_c_eb.out
     - copied unchanged from r358676, head/usr.bin/hexdump/tests/d_hexdump_dflag_c_eb.out
  projects/clang1000-import/usr.bin/hexdump/tests/d_hexdump_dflag_c_el.out
     - copied unchanged from r358676, head/usr.bin/hexdump/tests/d_hexdump_dflag_c_el.out
  projects/clang1000-import/usr.bin/hexdump/tests/d_hexdump_oflag_a_eb.out
     - copied unchanged from r358676, head/usr.bin/hexdump/tests/d_hexdump_oflag_a_eb.out
  projects/clang1000-import/usr.bin/hexdump/tests/d_hexdump_oflag_a_el.out
     - copied unchanged from r358676, head/usr.bin/hexdump/tests/d_hexdump_oflag_a_el.out
  projects/clang1000-import/usr.bin/hexdump/tests/d_hexdump_oflag_b_eb.out
     - copied unchanged from r358676, head/usr.bin/hexdump/tests/d_hexdump_oflag_b_eb.out
  projects/clang1000-import/usr.bin/hexdump/tests/d_hexdump_oflag_b_el.out
     - copied unchanged from r358676, head/usr.bin/hexdump/tests/d_hexdump_oflag_b_el.out
  projects/clang1000-import/usr.bin/hexdump/tests/d_hexdump_oflag_c_eb.out
     - copied unchanged from r358676, head/usr.bin/hexdump/tests/d_hexdump_oflag_c_eb.out
  projects/clang1000-import/usr.bin/hexdump/tests/d_hexdump_oflag_c_el.out
     - copied unchanged from r358676, head/usr.bin/hexdump/tests/d_hexdump_oflag_c_el.out
  projects/clang1000-import/usr.bin/hexdump/tests/d_hexdump_xflag_a_eb.out
     - copied unchanged from r358676, head/usr.bin/hexdump/tests/d_hexdump_xflag_a_eb.out
  projects/clang1000-import/usr.bin/hexdump/tests/d_hexdump_xflag_a_el.out
     - copied unchanged from r358676, head/usr.bin/hexdump/tests/d_hexdump_xflag_a_el.out
  projects/clang1000-import/usr.bin/hexdump/tests/d_hexdump_xflag_b_eb.out
     - copied unchanged from r358676, head/usr.bin/hexdump/tests/d_hexdump_xflag_b_eb.out
  projects/clang1000-import/usr.bin/hexdump/tests/d_hexdump_xflag_b_el.out
     - copied unchanged from r358676, head/usr.bin/hexdump/tests/d_hexdump_xflag_b_el.out
  projects/clang1000-import/usr.bin/hexdump/tests/d_hexdump_xflag_c_eb.out
     - copied unchanged from r358676, head/usr.bin/hexdump/tests/d_hexdump_xflag_c_eb.out
  projects/clang1000-import/usr.bin/hexdump/tests/d_hexdump_xflag_c_el.out
     - copied unchanged from r358676, head/usr.bin/hexdump/tests/d_hexdump_xflag_c_el.out
Deleted:
  projects/clang1000-import/contrib/dtc/
  projects/clang1000-import/contrib/libstdc++/
  projects/clang1000-import/gnu/usr.bin/dtc/
  projects/clang1000-import/share/man/man4/bktr.4
  projects/clang1000-import/sys/dev/bktr/CHANGELOG.TXT
  projects/clang1000-import/sys/dev/bktr/bktr_audio.c
  projects/clang1000-import/sys/dev/bktr/bktr_audio.h
  projects/clang1000-import/sys/dev/bktr/bktr_card.c
  projects/clang1000-import/sys/dev/bktr/bktr_card.h
  projects/clang1000-import/sys/dev/bktr/bktr_core.c
  projects/clang1000-import/sys/dev/bktr/bktr_core.h
  projects/clang1000-import/sys/dev/bktr/bktr_i2c.c
  projects/clang1000-import/sys/dev/bktr/bktr_i2c.h
  projects/clang1000-import/sys/dev/bktr/bktr_mem.c
  projects/clang1000-import/sys/dev/bktr/bktr_mem.h
  projects/clang1000-import/sys/dev/bktr/bktr_os.c
  projects/clang1000-import/sys/dev/bktr/bktr_os.h
  projects/clang1000-import/sys/dev/bktr/bktr_reg.h
  projects/clang1000-import/sys/dev/bktr/bktr_tuner.c
  projects/clang1000-import/sys/dev/bktr/bktr_tuner.h
  projects/clang1000-import/sys/dev/bktr/ioctl_bt848.h
  projects/clang1000-import/sys/dev/bktr/ioctl_meteor.h
  projects/clang1000-import/sys/dev/bktr/msp34xx.c
  projects/clang1000-import/sys/i386/include/ioctl_bt848.h
  projects/clang1000-import/sys/i386/include/ioctl_meteor.h
  projects/clang1000-import/sys/modules/bktr/Makefile
  projects/clang1000-import/sys/modules/bktr/Makefile.inc
  projects/clang1000-import/sys/modules/bktr/bktr/Makefile
  projects/clang1000-import/sys/modules/bktr/bktr_mem/Makefile
  projects/clang1000-import/tools/build/options/WITHOUT_GPL_DTC
  projects/clang1000-import/tools/build/options/WITH_GPL_DTC
  projects/clang1000-import/tools/tools/controlelf/
  projects/clang1000-import/usr.bin/hexdump/tests/d_hexdump_dflag_a.out
  projects/clang1000-import/usr.bin/hexdump/tests/d_hexdump_dflag_b.out
  projects/clang1000-import/usr.bin/hexdump/tests/d_hexdump_dflag_c.out
  projects/clang1000-import/usr.bin/hexdump/tests/d_hexdump_oflag_a.out
  projects/clang1000-import/usr.bin/hexdump/tests/d_hexdump_oflag_b.out
  projects/clang1000-import/usr.bin/hexdump/tests/d_hexdump_oflag_c.out
  projects/clang1000-import/usr.bin/hexdump/tests/d_hexdump_xflag_a.out
  projects/clang1000-import/usr.bin/hexdump/tests/d_hexdump_xflag_b.out
  projects/clang1000-import/usr.bin/hexdump/tests/d_hexdump_xflag_c.out
Modified:
  projects/clang1000-import/Makefile.inc1
  projects/clang1000-import/ObsoleteFiles.inc
  projects/clang1000-import/UPDATING
  projects/clang1000-import/contrib/elftoolchain/readelf/readelf.c
  projects/clang1000-import/contrib/libarchive/cpio/cpio.c
  projects/clang1000-import/contrib/libarchive/cpio/cpio.h
  projects/clang1000-import/contrib/libarchive/cpio/test/test_format_newc.c
  projects/clang1000-import/contrib/libarchive/libarchive/archive_read.c
  projects/clang1000-import/contrib/libarchive/libarchive/archive_read_open_filename.c
  projects/clang1000-import/contrib/libarchive/libarchive/archive_read_support_format_xar.c
  projects/clang1000-import/contrib/libarchive/libarchive/archive_util.c
  projects/clang1000-import/contrib/libarchive/libarchive/archive_write_disk_posix.c
  projects/clang1000-import/contrib/libarchive/libarchive/archive_write_set_format_xar.c
  projects/clang1000-import/contrib/libarchive/libarchive/cpio.5
  projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_format_zip.c
  projects/clang1000-import/contrib/ntp/COPYRIGHT
  projects/clang1000-import/contrib/ntp/ChangeLog
  projects/clang1000-import/contrib/ntp/CommitLog
  projects/clang1000-import/contrib/ntp/NEWS
  projects/clang1000-import/contrib/ntp/config.h.in
  projects/clang1000-import/contrib/ntp/configure
  projects/clang1000-import/contrib/ntp/configure.ac
  projects/clang1000-import/contrib/ntp/html/accopt.html
  projects/clang1000-import/contrib/ntp/html/clockopt.html
  projects/clang1000-import/contrib/ntp/html/confopt.html
  projects/clang1000-import/contrib/ntp/html/copyright.html
  projects/clang1000-import/contrib/ntp/html/discipline.html
  projects/clang1000-import/contrib/ntp/html/drivers/driver20.html
  projects/clang1000-import/contrib/ntp/html/drivers/driver29.html
  projects/clang1000-import/contrib/ntp/html/miscopt.html
  projects/clang1000-import/contrib/ntp/include/Makefile.am
  projects/clang1000-import/contrib/ntp/include/Makefile.in
  projects/clang1000-import/contrib/ntp/include/ntp.h
  projects/clang1000-import/contrib/ntp/include/ntp_calendar.h
  projects/clang1000-import/contrib/ntp/include/ntp_config.h
  projects/clang1000-import/contrib/ntp/include/ntp_control.h
  projects/clang1000-import/contrib/ntp/include/ntp_fp.h
  projects/clang1000-import/contrib/ntp/include/ntp_io.h
  projects/clang1000-import/contrib/ntp/include/ntp_refclock.h
  projects/clang1000-import/contrib/ntp/include/ntp_request.h
  projects/clang1000-import/contrib/ntp/include/ntp_stdlib.h
  projects/clang1000-import/contrib/ntp/include/ntp_syslog.h
  projects/clang1000-import/contrib/ntp/include/ntpd.h
  projects/clang1000-import/contrib/ntp/include/timespecops.h
  projects/clang1000-import/contrib/ntp/libntp/Makefile.am
  projects/clang1000-import/contrib/ntp/libntp/Makefile.in
  projects/clang1000-import/contrib/ntp/libntp/decodenetnum.c
  projects/clang1000-import/contrib/ntp/libntp/dofptoa.c
  projects/clang1000-import/contrib/ntp/libntp/dolfptoa.c
  projects/clang1000-import/contrib/ntp/libntp/mstolfp.c
  projects/clang1000-import/contrib/ntp/libntp/msyslog.c
  projects/clang1000-import/contrib/ntp/libntp/ntp_calendar.c
  projects/clang1000-import/contrib/ntp/libntp/recvbuff.c
  projects/clang1000-import/contrib/ntp/libntp/statestr.c
  projects/clang1000-import/contrib/ntp/libntp/systime.c
  projects/clang1000-import/contrib/ntp/libparse/Makefile.am
  projects/clang1000-import/contrib/ntp/libparse/Makefile.in
  projects/clang1000-import/contrib/ntp/libparse/clk_rawdcf.c
  projects/clang1000-import/contrib/ntp/ntpd/Makefile.am
  projects/clang1000-import/contrib/ntp/ntpd/Makefile.in
  projects/clang1000-import/contrib/ntp/ntpd/cmd_args.c
  projects/clang1000-import/contrib/ntp/ntpd/complete.conf.in
  projects/clang1000-import/contrib/ntp/ntpd/invoke-ntp.conf.texi
  projects/clang1000-import/contrib/ntp/ntpd/invoke-ntp.keys.texi
  projects/clang1000-import/contrib/ntp/ntpd/invoke-ntpd.texi
  projects/clang1000-import/contrib/ntp/ntpd/keyword-gen-utd
  projects/clang1000-import/contrib/ntp/ntpd/keyword-gen.c
  projects/clang1000-import/contrib/ntp/ntpd/ntp.conf.5man
  projects/clang1000-import/contrib/ntp/ntpd/ntp.conf.5mdoc
  projects/clang1000-import/contrib/ntp/ntpd/ntp.conf.def
  projects/clang1000-import/contrib/ntp/ntpd/ntp.conf.html
  projects/clang1000-import/contrib/ntp/ntpd/ntp.conf.man.in
  projects/clang1000-import/contrib/ntp/ntpd/ntp.conf.mdoc.in
  projects/clang1000-import/contrib/ntp/ntpd/ntp.keys.5man
  projects/clang1000-import/contrib/ntp/ntpd/ntp.keys.5mdoc
  projects/clang1000-import/contrib/ntp/ntpd/ntp.keys.html
  projects/clang1000-import/contrib/ntp/ntpd/ntp.keys.man.in
  projects/clang1000-import/contrib/ntp/ntpd/ntp.keys.mdoc.in
  projects/clang1000-import/contrib/ntp/ntpd/ntp_config.c
  projects/clang1000-import/contrib/ntp/ntpd/ntp_control.c
  projects/clang1000-import/contrib/ntp/ntpd/ntp_io.c
  projects/clang1000-import/contrib/ntp/ntpd/ntp_keyword.h
  projects/clang1000-import/contrib/ntp/ntpd/ntp_leapsec.c
  projects/clang1000-import/contrib/ntp/ntpd/ntp_leapsec.h
  projects/clang1000-import/contrib/ntp/ntpd/ntp_loopfilter.c
  projects/clang1000-import/contrib/ntp/ntpd/ntp_parser.c
  projects/clang1000-import/contrib/ntp/ntpd/ntp_parser.h
  projects/clang1000-import/contrib/ntp/ntpd/ntp_peer.c
  projects/clang1000-import/contrib/ntp/ntpd/ntp_proto.c
  projects/clang1000-import/contrib/ntp/ntpd/ntp_refclock.c
  projects/clang1000-import/contrib/ntp/ntpd/ntp_request.c
  projects/clang1000-import/contrib/ntp/ntpd/ntp_restrict.c
  projects/clang1000-import/contrib/ntp/ntpd/ntp_scanner.c
  projects/clang1000-import/contrib/ntp/ntpd/ntp_util.c
  projects/clang1000-import/contrib/ntp/ntpd/ntpd-opts.c
  projects/clang1000-import/contrib/ntp/ntpd/ntpd-opts.h
  projects/clang1000-import/contrib/ntp/ntpd/ntpd.1ntpdman
  projects/clang1000-import/contrib/ntp/ntpd/ntpd.1ntpdmdoc
  projects/clang1000-import/contrib/ntp/ntpd/ntpd.c
  projects/clang1000-import/contrib/ntp/ntpd/ntpd.html
  projects/clang1000-import/contrib/ntp/ntpd/ntpd.man.in
  projects/clang1000-import/contrib/ntp/ntpd/ntpd.mdoc.in
  projects/clang1000-import/contrib/ntp/ntpd/refclock_gpsdjson.c
  projects/clang1000-import/contrib/ntp/ntpd/refclock_jupiter.c
  projects/clang1000-import/contrib/ntp/ntpd/refclock_nmea.c
  projects/clang1000-import/contrib/ntp/ntpd/refclock_oncore.c
  projects/clang1000-import/contrib/ntp/ntpd/refclock_palisade.c
  projects/clang1000-import/contrib/ntp/ntpd/refclock_palisade.h
  projects/clang1000-import/contrib/ntp/ntpd/refclock_parse.c
  projects/clang1000-import/contrib/ntp/ntpd/refclock_zyfer.c
  projects/clang1000-import/contrib/ntp/ntpdate/ntpdate.c
  projects/clang1000-import/contrib/ntp/ntpdc/invoke-ntpdc.texi
  projects/clang1000-import/contrib/ntp/ntpdc/layout.std
  projects/clang1000-import/contrib/ntp/ntpdc/ntpdc-opts.c
  projects/clang1000-import/contrib/ntp/ntpdc/ntpdc-opts.h
  projects/clang1000-import/contrib/ntp/ntpdc/ntpdc.1ntpdcman
  projects/clang1000-import/contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc
  projects/clang1000-import/contrib/ntp/ntpdc/ntpdc.c
  projects/clang1000-import/contrib/ntp/ntpdc/ntpdc.html
  projects/clang1000-import/contrib/ntp/ntpdc/ntpdc.man.in
  projects/clang1000-import/contrib/ntp/ntpdc/ntpdc.mdoc.in
  projects/clang1000-import/contrib/ntp/ntpdc/ntpdc_ops.c
  projects/clang1000-import/contrib/ntp/ntpq/Makefile.am
  projects/clang1000-import/contrib/ntp/ntpq/Makefile.in
  projects/clang1000-import/contrib/ntp/ntpq/invoke-ntpq.texi
  projects/clang1000-import/contrib/ntp/ntpq/ntpq-opts.c
  projects/clang1000-import/contrib/ntp/ntpq/ntpq-opts.h
  projects/clang1000-import/contrib/ntp/ntpq/ntpq-subs.c
  projects/clang1000-import/contrib/ntp/ntpq/ntpq.1ntpqman
  projects/clang1000-import/contrib/ntp/ntpq/ntpq.1ntpqmdoc
  projects/clang1000-import/contrib/ntp/ntpq/ntpq.c
  projects/clang1000-import/contrib/ntp/ntpq/ntpq.h
  projects/clang1000-import/contrib/ntp/ntpq/ntpq.html
  projects/clang1000-import/contrib/ntp/ntpq/ntpq.man.in
  projects/clang1000-import/contrib/ntp/ntpq/ntpq.mdoc.in
  projects/clang1000-import/contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi
  projects/clang1000-import/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c
  projects/clang1000-import/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h
  projects/clang1000-import/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
  projects/clang1000-import/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
  projects/clang1000-import/contrib/ntp/ntpsnmpd/ntpsnmpd.html
  projects/clang1000-import/contrib/ntp/ntpsnmpd/ntpsnmpd.man.in
  projects/clang1000-import/contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in
  projects/clang1000-import/contrib/ntp/packageinfo.sh
  projects/clang1000-import/contrib/ntp/parseutil/dcfd.c
  projects/clang1000-import/contrib/ntp/scripts/build/mkver.in
  projects/clang1000-import/contrib/ntp/scripts/calc_tickadj/calc_tickadj-opts
  projects/clang1000-import/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman
  projects/clang1000-import/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
  projects/clang1000-import/contrib/ntp/scripts/calc_tickadj/calc_tickadj.html
  projects/clang1000-import/contrib/ntp/scripts/calc_tickadj/calc_tickadj.man.in
  projects/clang1000-import/contrib/ntp/scripts/calc_tickadj/calc_tickadj.mdoc.in
  projects/clang1000-import/contrib/ntp/scripts/calc_tickadj/invoke-calc_tickadj.texi
  projects/clang1000-import/contrib/ntp/scripts/invoke-plot_summary.texi
  projects/clang1000-import/contrib/ntp/scripts/invoke-summary.texi
  projects/clang1000-import/contrib/ntp/scripts/ntp-wait/invoke-ntp-wait.texi
  projects/clang1000-import/contrib/ntp/scripts/ntp-wait/ntp-wait-opts
  projects/clang1000-import/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitman
  projects/clang1000-import/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
  projects/clang1000-import/contrib/ntp/scripts/ntp-wait/ntp-wait.html
  projects/clang1000-import/contrib/ntp/scripts/ntp-wait/ntp-wait.man.in
  projects/clang1000-import/contrib/ntp/scripts/ntp-wait/ntp-wait.mdoc.in
  projects/clang1000-import/contrib/ntp/scripts/ntpsweep/invoke-ntpsweep.texi
  projects/clang1000-import/contrib/ntp/scripts/ntpsweep/ntpsweep-opts
  projects/clang1000-import/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepman
  projects/clang1000-import/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc
  projects/clang1000-import/contrib/ntp/scripts/ntpsweep/ntpsweep.html
  projects/clang1000-import/contrib/ntp/scripts/ntpsweep/ntpsweep.man.in
  projects/clang1000-import/contrib/ntp/scripts/ntpsweep/ntpsweep.mdoc.in
  projects/clang1000-import/contrib/ntp/scripts/ntptrace/invoke-ntptrace.texi
  projects/clang1000-import/contrib/ntp/scripts/ntptrace/ntptrace-opts
  projects/clang1000-import/contrib/ntp/scripts/ntptrace/ntptrace.1ntptraceman
  projects/clang1000-import/contrib/ntp/scripts/ntptrace/ntptrace.1ntptracemdoc
  projects/clang1000-import/contrib/ntp/scripts/ntptrace/ntptrace.html
  projects/clang1000-import/contrib/ntp/scripts/ntptrace/ntptrace.man.in
  projects/clang1000-import/contrib/ntp/scripts/ntptrace/ntptrace.mdoc.in
  projects/clang1000-import/contrib/ntp/scripts/plot_summary-opts
  projects/clang1000-import/contrib/ntp/scripts/plot_summary.1plot_summaryman
  projects/clang1000-import/contrib/ntp/scripts/plot_summary.1plot_summarymdoc
  projects/clang1000-import/contrib/ntp/scripts/plot_summary.html
  projects/clang1000-import/contrib/ntp/scripts/plot_summary.man.in
  projects/clang1000-import/contrib/ntp/scripts/plot_summary.mdoc.in
  projects/clang1000-import/contrib/ntp/scripts/summary-opts
  projects/clang1000-import/contrib/ntp/scripts/summary.1summaryman
  projects/clang1000-import/contrib/ntp/scripts/summary.1summarymdoc
  projects/clang1000-import/contrib/ntp/scripts/summary.html
  projects/clang1000-import/contrib/ntp/scripts/summary.man.in
  projects/clang1000-import/contrib/ntp/scripts/summary.mdoc.in
  projects/clang1000-import/contrib/ntp/scripts/update-leap/invoke-update-leap.texi
  projects/clang1000-import/contrib/ntp/scripts/update-leap/update-leap-opts
  projects/clang1000-import/contrib/ntp/scripts/update-leap/update-leap.1update-leapman
  projects/clang1000-import/contrib/ntp/scripts/update-leap/update-leap.1update-leapmdoc
  projects/clang1000-import/contrib/ntp/scripts/update-leap/update-leap.html
  projects/clang1000-import/contrib/ntp/scripts/update-leap/update-leap.man.in
  projects/clang1000-import/contrib/ntp/scripts/update-leap/update-leap.mdoc.in
  projects/clang1000-import/contrib/ntp/sntp/COPYRIGHT
  projects/clang1000-import/contrib/ntp/sntp/configure
  projects/clang1000-import/contrib/ntp/sntp/configure.ac
  projects/clang1000-import/contrib/ntp/sntp/crypto.c
  projects/clang1000-import/contrib/ntp/sntp/include/copyright.def
  projects/clang1000-import/contrib/ntp/sntp/include/version.def
  projects/clang1000-import/contrib/ntp/sntp/include/version.texi
  projects/clang1000-import/contrib/ntp/sntp/invoke-sntp.texi
  projects/clang1000-import/contrib/ntp/sntp/libevent/build-aux/ar-lib
  projects/clang1000-import/contrib/ntp/sntp/libevent/build-aux/compile
  projects/clang1000-import/contrib/ntp/sntp/libevent/build-aux/config.guess
  projects/clang1000-import/contrib/ntp/sntp/libevent/build-aux/config.sub
  projects/clang1000-import/contrib/ntp/sntp/libevent/build-aux/depcomp
  projects/clang1000-import/contrib/ntp/sntp/libevent/build-aux/install-sh
  projects/clang1000-import/contrib/ntp/sntp/libevent/build-aux/missing
  projects/clang1000-import/contrib/ntp/sntp/libevent/build-aux/test-driver
  projects/clang1000-import/contrib/ntp/sntp/libevent/build-aux/ylwrap
  projects/clang1000-import/contrib/ntp/sntp/libevent/test/regress.gen.c
  projects/clang1000-import/contrib/ntp/sntp/libevent/test/regress.gen.h
  projects/clang1000-import/contrib/ntp/sntp/libopts/m4/libopts.m4
  projects/clang1000-import/contrib/ntp/sntp/m4/ntp_problemtests.m4
  projects/clang1000-import/contrib/ntp/sntp/m4/version.m4
  projects/clang1000-import/contrib/ntp/sntp/main.c
  projects/clang1000-import/contrib/ntp/sntp/networking.c
  projects/clang1000-import/contrib/ntp/sntp/scm-rev
  projects/clang1000-import/contrib/ntp/sntp/sntp-opts.c
  projects/clang1000-import/contrib/ntp/sntp/sntp-opts.h
  projects/clang1000-import/contrib/ntp/sntp/sntp.1sntpman
  projects/clang1000-import/contrib/ntp/sntp/sntp.1sntpmdoc
  projects/clang1000-import/contrib/ntp/sntp/sntp.html
  projects/clang1000-import/contrib/ntp/sntp/sntp.man.in
  projects/clang1000-import/contrib/ntp/sntp/sntp.mdoc.in
  projects/clang1000-import/contrib/ntp/sntp/tests/run-crypto.c
  projects/clang1000-import/contrib/ntp/sntp/tests/run-keyFile.c
  projects/clang1000-import/contrib/ntp/sntp/tests/run-kodDatabase.c
  projects/clang1000-import/contrib/ntp/sntp/tests/run-kodFile.c
  projects/clang1000-import/contrib/ntp/sntp/tests/run-networking.c
  projects/clang1000-import/contrib/ntp/sntp/tests/run-packetHandling.c
  projects/clang1000-import/contrib/ntp/sntp/tests/run-packetProcessing.c
  projects/clang1000-import/contrib/ntp/sntp/tests/run-t-log.c
  projects/clang1000-import/contrib/ntp/sntp/tests/run-utilities.c
  projects/clang1000-import/contrib/ntp/sntp/tests/testconf.yml
  projects/clang1000-import/contrib/ntp/sntp/version.c
  projects/clang1000-import/contrib/ntp/util/invoke-ntp-keygen.texi
  projects/clang1000-import/contrib/ntp/util/ntp-keygen-opts.c
  projects/clang1000-import/contrib/ntp/util/ntp-keygen-opts.h
  projects/clang1000-import/contrib/ntp/util/ntp-keygen.1ntp-keygenman
  projects/clang1000-import/contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc
  projects/clang1000-import/contrib/ntp/util/ntp-keygen.html
  projects/clang1000-import/contrib/ntp/util/ntp-keygen.man.in
  projects/clang1000-import/contrib/ntp/util/ntp-keygen.mdoc.in
  projects/clang1000-import/contrib/ntp/util/ntptime.c
  projects/clang1000-import/etc/mtree/BSD.include.dist
  projects/clang1000-import/gnu/usr.bin/Makefile
  projects/clang1000-import/include/Makefile
  projects/clang1000-import/lib/libarchive/tests/Makefile
  projects/clang1000-import/lib/libc/gen/ftw.3
  projects/clang1000-import/lib/libc/powerpc64/string/bcopy_resolver.c
  projects/clang1000-import/lib/libc/sys/_umtx_op.2
  projects/clang1000-import/lib/libc/sys/thr_self.2
  projects/clang1000-import/lib/libprocstat/libprocstat.c
  projects/clang1000-import/libexec/tftpd/tests/functional.c
  projects/clang1000-import/libexec/tftpd/tftp-file.c
  projects/clang1000-import/libexec/tftpd/tftp-file.h
  projects/clang1000-import/libexec/tftpd/tftp-options.c
  projects/clang1000-import/libexec/tftpd/tftp-options.h
  projects/clang1000-import/libexec/tftpd/tftp-transfer.c
  projects/clang1000-import/libexec/tftpd/tftp-utils.c
  projects/clang1000-import/libexec/tftpd/tftp-utils.h
  projects/clang1000-import/libexec/tftpd/tftpd.8
  projects/clang1000-import/release/packages/generate-ucl.sh
  projects/clang1000-import/sbin/dumpon/dumpon.c
  projects/clang1000-import/sbin/mount_nfs/mount_nfs.c
  projects/clang1000-import/share/man/man4/Makefile
  projects/clang1000-import/share/man/man4/ismt.4
  projects/clang1000-import/share/man/man4/man4.i386/ctau.4
  projects/clang1000-import/share/man/man4/man4.i386/cx.4
  projects/clang1000-import/share/man/man4/ng_car.4
  projects/clang1000-import/share/man/man5/src.conf.5
  projects/clang1000-import/share/mk/src.opts.mk
  projects/clang1000-import/stand/i386/Makefile.inc
  projects/clang1000-import/stand/i386/boot.ldscript
  projects/clang1000-import/stand/i386/boot2/Makefile
  projects/clang1000-import/stand/i386/gptboot/Makefile
  projects/clang1000-import/stand/i386/gptzfsboot/Makefile
  projects/clang1000-import/stand/i386/isoboot/Makefile
  projects/clang1000-import/stand/i386/loader/Makefile
  projects/clang1000-import/stand/i386/zfsboot/Makefile
  projects/clang1000-import/sys/arm64/arm64/genassym.c
  projects/clang1000-import/sys/arm64/arm64/identcpu.c
  projects/clang1000-import/sys/arm64/arm64/locore.S
  projects/clang1000-import/sys/arm64/arm64/machdep.c
  projects/clang1000-import/sys/arm64/include/armreg.h
  projects/clang1000-import/sys/arm64/include/cpu.h
  projects/clang1000-import/sys/arm64/include/cpufunc.h
  projects/clang1000-import/sys/arm64/include/machdep.h
  projects/clang1000-import/sys/cam/cam_xpt.c
  projects/clang1000-import/sys/cam/ctl/ctl_ha.c
  projects/clang1000-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  projects/clang1000-import/sys/compat/linprocfs/linprocfs.c
  projects/clang1000-import/sys/compat/linux/linux_mib.c
  projects/clang1000-import/sys/compat/linux/linux_mib.h
  projects/clang1000-import/sys/compat/linux/linux_misc.c
  projects/clang1000-import/sys/compat/linux/linux_misc.h
  projects/clang1000-import/sys/compat/linux/linux_mmap.c
  projects/clang1000-import/sys/compat/linuxkpi/common/src/linux_compat.c
  projects/clang1000-import/sys/conf/NOTES
  projects/clang1000-import/sys/conf/files
  projects/clang1000-import/sys/conf/options
  projects/clang1000-import/sys/contrib/ipfilter/netinet/ip_compat.h
  projects/clang1000-import/sys/contrib/ipfilter/netinet/ip_fil.h
  projects/clang1000-import/sys/contrib/ipfilter/netinet/ip_nat.c
  projects/clang1000-import/sys/contrib/ipfilter/netinet/ip_proxy.c
  projects/clang1000-import/sys/contrib/ipfilter/netinet/ip_state.c
  projects/clang1000-import/sys/contrib/ipfilter/netinet/ip_sync.c
  projects/clang1000-import/sys/dev/aacraid/aacraid.c
  projects/clang1000-import/sys/dev/aacraid/aacraid_cam.c
  projects/clang1000-import/sys/dev/acpica/acpi_button.c
  projects/clang1000-import/sys/dev/acpica/acpi_lid.c
  projects/clang1000-import/sys/dev/al_eth/al_eth.c
  projects/clang1000-import/sys/dev/ale/if_ale.c
  projects/clang1000-import/sys/dev/arcmsr/arcmsr.c
  projects/clang1000-import/sys/dev/arcmsr/arcmsr.h
  projects/clang1000-import/sys/dev/bce/if_bce.c
  projects/clang1000-import/sys/dev/bce/if_bcereg.h
  projects/clang1000-import/sys/dev/bnxt/if_bnxt.c
  projects/clang1000-import/sys/dev/bxe/bxe.c
  projects/clang1000-import/sys/dev/bxe/bxe.h
  projects/clang1000-import/sys/dev/cpufreq/cpufreq_dt.c
  projects/clang1000-import/sys/dev/ctau/if_ct.c
  projects/clang1000-import/sys/dev/cx/if_cx.c
  projects/clang1000-import/sys/dev/cxgb/cxgb_osdep.h
  projects/clang1000-import/sys/dev/cxgb/cxgb_sge.c
  projects/clang1000-import/sys/dev/isci/isci.h
  projects/clang1000-import/sys/dev/isci/isci_controller.c
  projects/clang1000-import/sys/dev/isci/isci_io_request.c
  projects/clang1000-import/sys/dev/iscsi_initiator/isc_cam.c
  projects/clang1000-import/sys/dev/iscsi_initiator/isc_sm.c
  projects/clang1000-import/sys/dev/iscsi_initiator/isc_soc.c
  projects/clang1000-import/sys/dev/iscsi_initiator/isc_subr.c
  projects/clang1000-import/sys/dev/iscsi_initiator/iscsi_subr.c
  projects/clang1000-import/sys/dev/iscsi_initiator/iscsivar.h
  projects/clang1000-import/sys/dev/ismt/ismt.c
  projects/clang1000-import/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
  projects/clang1000-import/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c
  projects/clang1000-import/sys/dev/mlx5/port.h
  projects/clang1000-import/sys/dev/mmc/host/dwmmc.c
  projects/clang1000-import/sys/dev/mmc/host/dwmmc_hisi.c
  projects/clang1000-import/sys/dev/mmc/host/dwmmc_var.h
  projects/clang1000-import/sys/dev/mxge/if_mxge.c
  projects/clang1000-import/sys/dev/sound/pcm/dsp.c
  projects/clang1000-import/sys/dev/sound/pcm/mixer.c
  projects/clang1000-import/sys/dev/sound/pcm/sound.c
  projects/clang1000-import/sys/dev/sound/pcm/sound.h
  projects/clang1000-import/sys/dev/usb/input/ukbd.c
  projects/clang1000-import/sys/dev/virtio/virtio.c
  projects/clang1000-import/sys/dev/wtap/if_wtap.c
  projects/clang1000-import/sys/dev/wtap/if_wtapvar.h
  projects/clang1000-import/sys/dev/xen/netback/netback.c
  projects/clang1000-import/sys/fs/nullfs/null_vfsops.c
  projects/clang1000-import/sys/kern/kern_descrip.c
  projects/clang1000-import/sys/kern/kern_exec.c
  projects/clang1000-import/sys/kern/kern_linker.c
  projects/clang1000-import/sys/kern/kern_sendfile.c
  projects/clang1000-import/sys/kern/kern_shutdown.c
  projects/clang1000-import/sys/kern/kern_synch.c
  projects/clang1000-import/sys/kern/kern_thread.c
  projects/clang1000-import/sys/kern/kern_umtx.c
  projects/clang1000-import/sys/kern/sched_4bsd.c
  projects/clang1000-import/sys/kern/sched_ule.c
  projects/clang1000-import/sys/kern/subr_kobj.c
  projects/clang1000-import/sys/kern/uipc_ktls.c
  projects/clang1000-import/sys/kern/uipc_shm.c
  projects/clang1000-import/sys/kern/vfs_bio.c
  projects/clang1000-import/sys/kern/vfs_cache.c
  projects/clang1000-import/sys/kern/vfs_lookup.c
  projects/clang1000-import/sys/kern/vfs_mountroot.c
  projects/clang1000-import/sys/modules/Makefile
  projects/clang1000-import/sys/net/if.c
  projects/clang1000-import/sys/net/if_edsc.c
  projects/clang1000-import/sys/net/if_llatbl.c
  projects/clang1000-import/sys/net/if_llatbl.h
  projects/clang1000-import/sys/net/if_var.h
  projects/clang1000-import/sys/net/route.c
  projects/clang1000-import/sys/netgraph/ng_car.c
  projects/clang1000-import/sys/netgraph/ng_car.h
  projects/clang1000-import/sys/netinet/icmp6.h
  projects/clang1000-import/sys/netinet/ip6.h
  projects/clang1000-import/sys/netinet/tcp_hpts.c
  projects/clang1000-import/sys/netinet/tcp_syncache.c
  projects/clang1000-import/sys/netinet6/in6_fib.c
  projects/clang1000-import/sys/netinet6/in6_fib.h
  projects/clang1000-import/sys/netinet6/in6_src.c
  projects/clang1000-import/sys/netinet6/ip6_fastfwd.c
  projects/clang1000-import/sys/netinet6/ip6_output.c
  projects/clang1000-import/sys/netinet6/ip6_var.h
  projects/clang1000-import/sys/nlm/nlm_prot_impl.c
  projects/clang1000-import/sys/powerpc/conf/NOTES
  projects/clang1000-import/sys/powerpc/powernv/platform_powernv.c
  projects/clang1000-import/sys/powerpc/powerpc/uma_machdep.c
  projects/clang1000-import/sys/rpc/rpc_generic.c
  projects/clang1000-import/sys/security/audit/audit_bsm.c
  projects/clang1000-import/sys/security/audit/audit_bsm_klib.c
  projects/clang1000-import/sys/sys/elf_common.h
  projects/clang1000-import/sys/sys/filedesc.h
  projects/clang1000-import/sys/sys/param.h
  projects/clang1000-import/sys/sys/refcount.h
  projects/clang1000-import/sys/sys/signalvar.h
  projects/clang1000-import/sys/sys/syscallsubr.h
  projects/clang1000-import/sys/ufs/ffs/ffs_alloc.c
  projects/clang1000-import/sys/vm/uma_core.c
  projects/clang1000-import/sys/vm/vm_mmap.c
  projects/clang1000-import/sys/vm/vm_page.c
  projects/clang1000-import/targets/pseudo/userland/Makefile.depend
  projects/clang1000-import/targets/pseudo/userland/gnu/Makefile.depend
  projects/clang1000-import/tests/sys/net/Makefile
  projects/clang1000-import/tests/sys/net/if_epair.c
  projects/clang1000-import/tests/sys/netinet/redirect.sh
  projects/clang1000-import/tests/sys/netinet6/redirect.sh
  projects/clang1000-import/tools/boot/ci-qemu-test.sh
  projects/clang1000-import/usr.bin/Makefile
  projects/clang1000-import/usr.bin/calendar/calendars/calendar.history
  projects/clang1000-import/usr.bin/hexdump/tests/Makefile
  projects/clang1000-import/usr.bin/hexdump/tests/hexdump_test.sh
  projects/clang1000-import/usr.bin/netstat/inet6.c
  projects/clang1000-import/usr.bin/tftp/main.c
  projects/clang1000-import/usr.bin/tftp/tftp.1
  projects/clang1000-import/usr.sbin/ntp/config.h
  projects/clang1000-import/usr.sbin/ntp/libntp/Makefile
  projects/clang1000-import/usr.sbin/powerd/powerd.8
  projects/clang1000-import/usr.sbin/powerd/powerd.c
Directory Properties:
  projects/clang1000-import/   (props changed)
  projects/clang1000-import/contrib/elftoolchain/   (props changed)
  projects/clang1000-import/contrib/libarchive/   (props changed)
  projects/clang1000-import/contrib/ntp/   (props changed)
  projects/clang1000-import/sys/cddl/contrib/opensolaris/   (props changed)
  projects/clang1000-import/sys/contrib/ipfilter/   (props changed)

Modified: projects/clang1000-import/Makefile.inc1
==============================================================================
--- projects/clang1000-import/Makefile.inc1	Thu Mar  5 17:53:38 2020	(r358677)
+++ projects/clang1000-import/Makefile.inc1	Thu Mar  5 17:55:36 2020	(r358678)
@@ -2233,12 +2233,6 @@ ${_bt}-usr.bin/clang/llvm-tblgen: ${_bt}-lib/clang/lib
 ${_bt}-usr.bin/clang/lldb-tblgen: ${_bt}-lib/clang/libllvmminimal
 .endif
 
-# Build BSDL or GPL DTC depending on GPL_DTC option.
-_dtc= usr.bin/dtc
-.if ${MK_GPL_DTC} != "no"
-_dtc= gnu/usr.bin/dtc
-.endif
-
 .if ${MK_LOCALES} != "no"
 _localedef=	usr.bin/localedef
 .endif
@@ -2360,7 +2354,7 @@ bootstrap-tools: ${_bt}-links .PHONY
     ${_clang_tblgen} \
     ${_kerberos5_bootstrap_tools} \
     ${_strfile} \
-    ${_dtc} \
+    usr.bin/dtc \
     ${_cat} \
     ${_kbdcontrol} \
     ${_elftoolchain_libs} \

Modified: projects/clang1000-import/ObsoleteFiles.inc
==============================================================================
--- projects/clang1000-import/ObsoleteFiles.inc	Thu Mar  5 17:53:38 2020	(r358677)
+++ projects/clang1000-import/ObsoleteFiles.inc	Thu Mar  5 17:55:36 2020	(r358678)
@@ -273,6 +273,16 @@ OLD_DIRS+=usr/lib/clang/9.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/9.0.1/lib
 OLD_DIRS+=usr/lib/clang/9.0.1
 
+# 20200301: bktr removed
+OLD_DIRS+=usr/include/dev/bktr
+OLD_FILES+=usr/include/dev/bktr/ioctl_bktr.h
+OLD_FILES+=usr/include/dev/bktr/ioctl_bt848.h
+OLD_FILES+=usr/include/dev/bktr/ioctl_meteor.h
+.if ${TARGET_ARCH} == "i386"
+OLD_FILES+=usr/include/machine/ioctl_bktr.h
+OLD_FILES+=usr/include/machine/ioctl_meteor.h
+.endif
+OLD_FILES+=usr/share/man/man4/bktr.4.gz
 # 20200229: GCC 4.2.1 removed
 .if !defined(WITH_PORT_BASE_GCC)
 OLD_FILES+=usr/bin/g++
@@ -875,7 +885,6 @@ OLD_FILES+=usr/lib32/libsupc++.so
 OLD_LIBS+=usr/lib32/libsupc++.so.1
 OLD_FILES+=usr/lib32/libsupc++_p.a
 .endif
-OLD_FILES+=usr/libexec/cc1plus
 OLD_LIBS+=usr/lib/libgomp.so.1
 OLD_FILES+=usr/lib/libgomp_p.a
 OLD_FILES+=usr/lib32/libgcov.a

Modified: projects/clang1000-import/UPDATING
==============================================================================
--- projects/clang1000-import/UPDATING	Thu Mar  5 17:53:38 2020	(r358677)
+++ projects/clang1000-import/UPDATING	Thu Mar  5 17:55:36 2020	(r358678)
@@ -32,6 +32,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW:
 	information about prerequisites and upgrading, if you are not already
 	using clang 3.5.0 or higher.
 
+20200301:
+	Removed brooktree driver (bktr.4) from the tree.
+
+20200229:
+	The WITH_GPL_DTC option has been removed.  The BSD-licenced device tree
+	compiler in usr.bin/dtc is used on all architectures which use dtc, and
+	the GPL dtc is available (if needed) from the sysutils/dtc port.
+
 20200229:
 	The WITHOUT_LLVM_LIBUNWIND option has been removed.  LLVM's libunwind
 	is used by all supported CPU architectures.

Modified: projects/clang1000-import/contrib/elftoolchain/readelf/readelf.c
==============================================================================
--- projects/clang1000-import/contrib/elftoolchain/readelf/readelf.c	Thu Mar  5 17:53:38 2020	(r358677)
+++ projects/clang1000-import/contrib/elftoolchain/readelf/readelf.c	Thu Mar  5 17:55:36 2020	(r358678)
@@ -3669,6 +3669,9 @@ dump_notes(struct readelf *re)
 
 static struct flag_desc note_feature_ctl_flags[] = {
 	{ NT_FREEBSD_FCTL_ASLR_DISABLE,		"ASLR_DISABLE" },
+	{ NT_FREEBSD_FCTL_PROTMAX_DISABLE,	"PROTMAX_DISABLE" },
+	{ NT_FREEBSD_FCTL_STKGAP_DISABLE,	"STKGAP_DISABLE" },
+	{ NT_FREEBSD_FCTL_WXNEEDED,		"WXNEEDED" },
 	{ 0, NULL }
 };
 
@@ -3725,6 +3728,7 @@ dump_notes_content(struct readelf *re, const char *buf
 {
 	Elf_Note *note;
 	const char *end, *name;
+	uint32_t namesz, descsz;
 
 	printf("\nNotes at offset %#010jx with length %#010jx:\n",
 	    (uintmax_t) off, (uintmax_t) sz);
@@ -3736,9 +3740,16 @@ dump_notes_content(struct readelf *re, const char *buf
 			return;
 		}
 		note = (Elf_Note *)(uintptr_t) buf;
+		namesz = roundup2(note->n_namesz, 4);
+		descsz = roundup2(note->n_descsz, 4);
+		if (namesz < note->n_namesz || descsz < note->n_descsz ||
+		    buf + namesz + descsz > end) {
+			warnx("invalid note header");
+			return;
+		}
 		buf += sizeof(Elf_Note);
 		name = buf;
-		buf += roundup2(note->n_namesz, 4);
+		buf += namesz;
 		/*
 		 * The name field is required to be nul-terminated, and
 		 * n_namesz includes the terminating nul in observed
@@ -3757,7 +3768,7 @@ dump_notes_content(struct readelf *re, const char *buf
 		printf("      %s\n", note_type(name, re->ehdr.e_type,
 		    note->n_type));
 		dump_notes_data(re, name, note->n_type, buf, note->n_descsz);
-		buf += roundup2(note->n_descsz, 4);
+		buf += descsz;
 	}
 }
 

Modified: projects/clang1000-import/contrib/libarchive/cpio/cpio.c
==============================================================================
--- projects/clang1000-import/contrib/libarchive/cpio/cpio.c	Thu Mar  5 17:53:38 2020	(r358677)
+++ projects/clang1000-import/contrib/libarchive/cpio/cpio.c	Thu Mar  5 17:55:36 2020	(r358678)
@@ -737,7 +737,7 @@ file_to_archive(struct cpio *cpio, const char *srcpath
 	 */
 	destpath = srcpath;
 	if (cpio->destdir) {
-		len = strlen(cpio->destdir) + strlen(srcpath) + 8;
+		len = cpio->destdir_len + strlen(srcpath) + 8;
 		if (len >= cpio->pass_destpath_alloc) {
 			while (len >= cpio->pass_destpath_alloc) {
 				cpio->pass_destpath_alloc += 512;
@@ -1228,15 +1228,14 @@ mode_pass(struct cpio *cpio, const char *destdir)
 	struct lafe_line_reader *lr;
 	const char *p;
 	int r;
-	size_t destdir_len;
 
 	/* Ensure target dir has a trailing '/' to simplify path surgery. */
-	destdir_len = strlen(destdir);
-	cpio->destdir = malloc(destdir_len + 8);
-	memcpy(cpio->destdir, destdir, destdir_len);
-	if (destdir_len == 0 || destdir[destdir_len - 1] != '/')
-		cpio->destdir[destdir_len++] = '/';
-	cpio->destdir[destdir_len++] = '\0';
+	cpio->destdir_len = strlen(destdir);
+	cpio->destdir = malloc(cpio->destdir_len + 8);
+	memcpy(cpio->destdir, destdir, cpio->destdir_len);
+	if (cpio->destdir_len == 0 || destdir[cpio->destdir_len - 1] != '/')
+		cpio->destdir[cpio->destdir_len++] = '/';
+	cpio->destdir[cpio->destdir_len] = '\0';
 
 	cpio->archive = archive_write_disk_new();
 	if (cpio->archive == NULL)

Modified: projects/clang1000-import/contrib/libarchive/cpio/cpio.h
==============================================================================
--- projects/clang1000-import/contrib/libarchive/cpio/cpio.h	Thu Mar  5 17:53:38 2020	(r358677)
+++ projects/clang1000-import/contrib/libarchive/cpio/cpio.h	Thu Mar  5 17:55:36 2020	(r358678)
@@ -64,6 +64,7 @@ struct cpio {
 	int		  option_numeric_uid_gid; /* -n */
 	int		  option_rename; /* -r */
 	char		 *destdir;
+	size_t		  destdir_len;
 	size_t		  pass_destpath_alloc;
 	char		 *pass_destpath;
 	int		  uid_override;

Modified: projects/clang1000-import/contrib/libarchive/cpio/test/test_format_newc.c
==============================================================================
--- projects/clang1000-import/contrib/libarchive/cpio/test/test_format_newc.c	Thu Mar  5 17:53:38 2020	(r358677)
+++ projects/clang1000-import/contrib/libarchive/cpio/test/test_format_newc.c	Thu Mar  5 17:55:36 2020	(r358678)
@@ -49,10 +49,11 @@ is_hex(const char *p, size_t l)
 	return (1);
 }
 
-static int
+/* Convert up to 8 hex characters to unsigned 32-bit decimal integer */
+static uint32_t
 from_hex(const char *p, size_t l)
 {
-	int r = 0;
+	uint32_t r = 0;
 
 	while (l > 0) {
 		r *= 16;
@@ -82,11 +83,11 @@ DEFINE_TEST(test_format_newc)
 {
 	FILE *list;
 	int r;
-	int devmajor, devminor, ino, gid;
-	int uid = -1;
+	uint32_t devmajor, devminor, ino, gid, uid;
 	time_t t, t2, now;
 	char *p, *e;
-	size_t s, fs, ns;
+	size_t s;
+	uint64_t fs, ns;
 	char result[1024];
 
 	assertUmask(0);
@@ -199,9 +200,11 @@ DEFINE_TEST(test_format_newc)
 #else
 	assertEqualInt(0x81a4, from_hex(e + 14, 8)); /* Mode */
 #endif	
-	if (uid < 0)
-		uid = from_hex(e + 22, 8);
+#if defined(_WIN32)
+	uid = from_hex(e + 22, 8);
+#else
 	assertEqualInt(from_hex(e + 22, 8), uid); /* uid */
+#endif
 	gid = from_hex(e + 30, 8); /* gid */
 	assertEqualMem(e + 38, "00000003", 8); /* nlink */
 	t = from_hex(e + 46, 8); /* mtime */
@@ -215,14 +218,14 @@ DEFINE_TEST(test_format_newc)
 	    "       first appearance should be empty, so this file size\n"
 	    "       field should be zero");
 	assertEqualInt(0, from_hex(e + 54, 8)); /* File size */
-	fs = from_hex(e + 54, 8);
+	fs = (uint64_t)from_hex(e + 54, 8);
 	fs += PAD(fs, 4);
 	devmajor = from_hex(e + 62, 8); /* devmajor */
 	devminor = from_hex(e + 70, 8); /* devminor */
 	assert(is_hex(e + 78, 8)); /* rdevmajor */
 	assert(is_hex(e + 86, 8)); /* rdevminor */
 	assertEqualMem(e + 94, "00000006", 8); /* Name size */
-	ns = from_hex(e + 94, 8);
+	ns = (uint64_t)from_hex(e + 94, 8);
 	ns += PAD(ns + 2, 4);
 	assertEqualInt(0, from_hex(e + 102, 8)); /* check field */
 	assertEqualMem(e + 110, "file1\0", 6); /* Name contents */
@@ -249,14 +252,14 @@ DEFINE_TEST(test_format_newc)
 		    " at t2=%#08jx", (intmax_t)t, (intmax_t)t2);
 		assert(t2 == t || t2 == t + 1); /* Almost same as first entry. */
 		assertEqualMem(e + 54, "00000005", 8); /* File size */
-		fs = from_hex(e + 54, 8);
+		fs = (uint64_t)from_hex(e + 54, 8);
 		fs += PAD(fs, 4);
 		assertEqualInt(devmajor, from_hex(e + 62, 8)); /* devmajor */
 		assertEqualInt(devminor, from_hex(e + 70, 8)); /* devminor */
 		assert(is_hex(e + 78, 8)); /* rdevmajor */
 		assert(is_hex(e + 86, 8)); /* rdevminor */
 		assertEqualMem(e + 94, "00000008", 8); /* Name size */
-		ns = from_hex(e + 94, 8);
+		ns = (uint64_t)from_hex(e + 94, 8);
 		ns += PAD(ns + 2, 4);
 		assertEqualInt(0, from_hex(e + 102, 8)); /* check field */
 		assertEqualMem(e + 110, "symlink\0\0\0", 10); /* Name contents */
@@ -285,14 +288,14 @@ DEFINE_TEST(test_format_newc)
 	    "t2=%#08jx", (intmax_t)t, (intmax_t)t2);
 	assert(t2 == t || t2 == t + 1); /* Almost same as first entry. */
 	assertEqualMem(e + 54, "00000000", 8); /* File size */
-	fs = from_hex(e + 54, 8);
+	fs = (uint64_t)from_hex(e + 54, 8);
 	fs += PAD(fs, 4);
 	assertEqualInt(devmajor, from_hex(e + 62, 8)); /* devmajor */
 	assertEqualInt(devminor, from_hex(e + 70, 8)); /* devminor */
 	assert(is_hex(e + 78, 8)); /* rdevmajor */
 	assert(is_hex(e + 86, 8)); /* rdevminor */
 	assertEqualMem(e + 94, "00000004", 8); /* Name size */
-	ns = from_hex(e + 94, 8);
+	ns = (uint64_t)from_hex(e + 94, 8);
 	ns += PAD(ns + 2, 4);
 	assertEqualInt(0, from_hex(e + 102, 8)); /* check field */
 	assertEqualMem(e + 110, "dir\0\0\0", 6); /* Name contents */
@@ -319,14 +322,14 @@ DEFINE_TEST(test_format_newc)
 	    "t2=%#08jx", (intmax_t)t, (intmax_t)t2);
 	assert(t2 == t || t2 == t + 1); /* Almost same as first entry. */
 	assertEqualInt(10, from_hex(e + 54, 8)); /* File size */
-	fs = from_hex(e + 54, 8);
+	fs = (uint64_t)from_hex(e + 54, 8);
 	fs += PAD(fs, 4);
 	assertEqualInt(devmajor, from_hex(e + 62, 8)); /* devmajor */
 	assertEqualInt(devminor, from_hex(e + 70, 8)); /* devminor */
 	assert(is_hex(e + 78, 8)); /* rdevmajor */
 	assert(is_hex(e + 86, 8)); /* rdevminor */
 	assertEqualMem(e + 94, "00000009", 8); /* Name size */
-	ns = from_hex(e + 94, 8);
+	ns = (uint64_t)from_hex(e + 94, 8);
 	ns += PAD(ns + 2, 4);
 	assertEqualInt(0, from_hex(e + 102, 8)); /* check field */
 	assertEqualMem(e + 110, "hardlink\0\0", 10); /* Name contents */

Modified: projects/clang1000-import/contrib/libarchive/libarchive/archive_read.c
==============================================================================
--- projects/clang1000-import/contrib/libarchive/libarchive/archive_read.c	Thu Mar  5 17:53:38 2020	(r358677)
+++ projects/clang1000-import/contrib/libarchive/libarchive/archive_read.c	Thu Mar  5 17:55:36 2020	(r358678)
@@ -892,15 +892,16 @@ archive_read_data(struct archive *_a, void *buff, size
 			len = a->read_data_remaining;
 			if (len > s)
 				len = s;
-			if (len)
+			if (len) {
 				memcpy(dest, a->read_data_block, len);
-			s -= len;
-			a->read_data_block += len;
-			a->read_data_remaining -= len;
-			a->read_data_output_offset += len;
-			a->read_data_offset += len;
-			dest += len;
-			bytes_read += len;
+				s -= len;
+				a->read_data_block += len;
+				a->read_data_remaining -= len;
+				a->read_data_output_offset += len;
+				a->read_data_offset += len;
+				dest += len;
+				bytes_read += len;
+			}
 		}
 	}
 	a->read_data_is_posix_read = 0;

Modified: projects/clang1000-import/contrib/libarchive/libarchive/archive_read_open_filename.c
==============================================================================
--- projects/clang1000-import/contrib/libarchive/libarchive/archive_read_open_filename.c	Thu Mar  5 17:53:38 2020	(r358677)
+++ projects/clang1000-import/contrib/libarchive/libarchive/archive_read_open_filename.c	Thu Mar  5 17:55:36 2020	(r358678)
@@ -221,7 +221,9 @@ file_open(struct archive *a, void *client_data)
 	struct read_file_data *mine = (struct read_file_data *)client_data;
 	void *buffer;
 	const char *filename = NULL;
+#if defined(_WIN32) && !defined(__CYGWIN__)
 	const wchar_t *wfilename = NULL;
+#endif
 	int fd = -1;
 	int is_disk_like = 0;
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
@@ -281,10 +283,12 @@ file_open(struct archive *a, void *client_data)
 #endif
 	}
 	if (fstat(fd, &st) != 0) {
+#if defined(_WIN32) && !defined(__CYGWIN__)
 		if (mine->filename_type == FNT_WCS)
 			archive_set_error(a, errno, "Can't stat '%S'",
 			    wfilename);
 		else
+#endif
 			archive_set_error(a, errno, "Can't stat '%s'",
 			    filename);
 		goto fail;

Modified: projects/clang1000-import/contrib/libarchive/libarchive/archive_read_support_format_xar.c
==============================================================================
--- projects/clang1000-import/contrib/libarchive/libarchive/archive_read_support_format_xar.c	Thu Mar  5 17:53:38 2020	(r358677)
+++ projects/clang1000-import/contrib/libarchive/libarchive/archive_read_support_format_xar.c	Thu Mar  5 17:55:36 2020	(r358678)
@@ -458,6 +458,11 @@ archive_read_support_format_xar(struct archive *_a)
 		return (ARCHIVE_FATAL);
 	}
 
+	/* initialize xar->file_queue */
+	xar->file_queue.allocated = 0;
+	xar->file_queue.used = 0;
+	xar->file_queue.files = NULL;
+
 	r = __archive_read_register_format(a,
 	    xar,
 	    "xar",
@@ -1221,10 +1226,12 @@ heap_add_entry(struct archive_read *a,
 	/* Expand our pending files list as necessary. */
 	if (heap->used >= heap->allocated) {
 		struct xar_file **new_pending_files;
-		int new_size = heap->allocated * 2;
+		int new_size;
 
 		if (heap->allocated < 1024)
 			new_size = 1024;
+		else
+			new_size = heap->allocated * 2;
 		/* Overflow might keep us from growing the list. */
 		if (new_size <= heap->allocated) {
 			archive_set_error(&a->archive,
@@ -1238,9 +1245,11 @@ heap_add_entry(struct archive_read *a,
 			    ENOMEM, "Out of memory");
 			return (ARCHIVE_FATAL);
 		}
-		memcpy(new_pending_files, heap->files,
-		    heap->allocated * sizeof(new_pending_files[0]));
-		free(heap->files);
+		if (heap->allocated) {
+			memcpy(new_pending_files, heap->files,
+			    heap->allocated * sizeof(new_pending_files[0]));
+			free(heap->files);
+		}
 		heap->files = new_pending_files;
 		heap->allocated = new_size;
 	}

Modified: projects/clang1000-import/contrib/libarchive/libarchive/archive_util.c
==============================================================================
--- projects/clang1000-import/contrib/libarchive/libarchive/archive_util.c	Thu Mar  5 17:53:38 2020	(r358677)
+++ projects/clang1000-import/contrib/libarchive/libarchive/archive_util.c	Thu Mar  5 17:55:36 2020	(r358678)
@@ -365,6 +365,7 @@ __archive_mktempx(const char *tmpdir, wchar_t *templat
 		}
 		fd = _open_osfhandle((intptr_t)h, _O_BINARY | _O_RDWR);
 		if (fd == -1) {
+			la_dosmaperr(GetLastError());
 			CloseHandle(h);
 			goto exit_tmpfile;
 		} else

Modified: projects/clang1000-import/contrib/libarchive/libarchive/archive_write_disk_posix.c
==============================================================================
--- projects/clang1000-import/contrib/libarchive/libarchive/archive_write_disk_posix.c	Thu Mar  5 17:53:38 2020	(r358677)
+++ projects/clang1000-import/contrib/libarchive/libarchive/archive_write_disk_posix.c	Thu Mar  5 17:55:36 2020	(r358678)
@@ -1856,8 +1856,9 @@ finish_metadata:
 		if (a->tmpname) {
 			if (rename(a->tmpname, a->name) == -1) {
 				archive_set_error(&a->archive, errno,
-				    "rename failed");
-				ret = ARCHIVE_FATAL;
+				    "Failed to rename temporary file");
+				ret = ARCHIVE_FAILED;
+				unlink(a->tmpname);
 			}
 			a->tmpname = NULL;
 		}
@@ -2144,8 +2145,11 @@ restore_entry(struct archive_write_disk *a)
 			if ((a->flags & ARCHIVE_EXTRACT_SAFE_WRITES) &&
 			    S_ISREG(a->st.st_mode)) {
 				/* Use a temporary file to extract */
-				if ((a->fd = la_mktemp(a)) == -1)
+				if ((a->fd = la_mktemp(a)) == -1) {
+					archive_set_error(&a->archive, errno,
+					    "Can't create temporary file");
 					return ARCHIVE_FAILED;
+				}
 				a->pst = NULL;
 				en = 0;
 			} else {

Modified: projects/clang1000-import/contrib/libarchive/libarchive/archive_write_set_format_xar.c
==============================================================================
--- projects/clang1000-import/contrib/libarchive/libarchive/archive_write_set_format_xar.c	Thu Mar  5 17:53:38 2020	(r358677)
+++ projects/clang1000-import/contrib/libarchive/libarchive/archive_write_set_format_xar.c	Thu Mar  5 17:55:36 2020	(r358678)
@@ -681,7 +681,8 @@ xar_write_data(struct archive_write *a, const void *bu
 {
 	struct xar *xar;
 	enum la_zaction run;
-	size_t size, rsize;
+	size_t size = 0;
+	size_t rsize;
 	int r;
 
 	xar = (struct xar *)a->format_data;

Modified: projects/clang1000-import/contrib/libarchive/libarchive/cpio.5
==============================================================================
--- projects/clang1000-import/contrib/libarchive/libarchive/cpio.5	Thu Mar  5 17:53:38 2020	(r358677)
+++ projects/clang1000-import/contrib/libarchive/libarchive/cpio.5	Thu Mar  5 17:55:36 2020	(r358678)
@@ -244,7 +244,7 @@ Note that this format supports only 4 gigabyte files (
 older ASCII format, which supports 8 gigabyte files).
 .Pp
 In this format, hardlinked files are handled by setting the
-filesize to zero for each entry except the last one that
+filesize to zero for each entry except the first one that
 appears in the archive.
 .Ss New CRC Format
 The CRC format is identical to the new ASCII format described

Modified: projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_format_zip.c
==============================================================================
--- projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_format_zip.c	Thu Mar  5 17:53:38 2020	(r358677)
+++ projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_format_zip.c	Thu Mar  5 17:55:36 2020	(r358678)
@@ -916,3 +916,53 @@ DEFINE_TEST(test_read_format_zip_lzma_alone_leak)
 	 * suite under Valgrind or ASan, the test runner won't return with
 	 * exit code 0 in case if a memory leak. */
 }
+
+DEFINE_TEST(test_read_format_zip_lzma_stream_end)
+{
+	const char *refname = "test_read_format_zip_lzma_stream_end.zipx";
+	struct archive *a;
+	struct archive_entry *ae;
+
+	assert((a = archive_read_new()) != NULL);
+		if (ARCHIVE_OK != archive_read_support_filter_lzma(a)) {
+				skipping("lzma reading not fully supported on this platform");
+				assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+				return;
+		}
+	extract_reference_file(refname);
+
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_zip(a));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, refname, 37));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+	assertEqualString("ZIP 6.3 (lzma)", archive_format_name(a));
+	assertEqualString("vimrc", archive_entry_pathname(ae));
+	assertEqualIntA(a, 0, extract_one(a, ae, 0xBA8E3BAA));
+	assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a));
+}
+
+DEFINE_TEST(test_read_format_zip_lzma_stream_end_blockread)
+{
+	const char *refname = "test_read_format_zip_lzma_stream_end.zipx";
+	struct archive *a;
+	struct archive_entry *ae;
+
+	assert((a = archive_read_new()) != NULL);
+	if (ARCHIVE_OK != archive_read_support_filter_lzma(a)) {
+			skipping("lzma reading not fully supported on this platform");
+			assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+			return;
+	}
+	extract_reference_file(refname);
+
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_zip(a));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, refname, 37));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+	assertEqualString("ZIP 6.3 (lzma)", archive_format_name(a));
+	assertEqualString("vimrc", archive_entry_pathname(ae));
+	assertEqualIntA(a, 0, extract_one_using_blocks(a, 13, 0xBA8E3BAA));
+	assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a));
+}

Copied: projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_format_zip_lzma_stream_end.zipx.uu (from r358676, head/contrib/libarchive/libarchive/test/test_read_format_zip_lzma_stream_end.zipx.uu)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_format_zip_lzma_stream_end.zipx.uu	Thu Mar  5 17:55:36 2020	(r358678, copy of r358676, head/contrib/libarchive/libarchive/test/test_read_format_zip_lzma_stream_end.zipx.uu)
@@ -0,0 +1,19 @@
+begin 664 test_read_format_zip_lzma_stream_end.zipx
+M4$L#!#\``@`.`#TQD4VJ.XZZ/@(``)`#```%````=FEM<F,)!`4`70``@```
+M$0@$J,)\D;(#4L%<^$P5TO^CM0KI0HWG08B&_].4<,CJ")TW/L>)82Q1PWAL
+M+U`,N0L_$]^&650C/X$D6#4QFD$\A/"_![4!O/5O/!KH`WCQ*4?T2*]4P#/D
+M0'9I?EZG=N69Z0V;H0I=C<!C<J6O^834W097PY1$%=-++.YUA'!>P*$?".I\
+MGMG/80.A'^W>R4J'S/CZ%P`8`>F=R>R&R$2T at EM#X)"OQH1?A7,`:4IU9WV!
+M#2W*DXT',;.4YIN4A:-X)O=IREL201ZSOC=YSAU[C4-::/YV8\)%"L17+>VC
+M%/'B]ZCQN$2(Q*9*\KJZ`Y131`]5C&G';@1S-QES_RZF!2OX45 at 58+??ES%(
+MUJ<(\`11M$NO)HK#/MK-9RT"15.2I:IZN8<TJR>VTM1_?$G\L#BH67]$S%[4
+M%C-$\Q<+./&HV](4,7)OL- at C^M0F"2O!0N$OHOW54H87^QLBQVH*D%A<#SI%
+M/#+-5U(W';:KC)RE>0Y^5YI!RECQNR"R4.UW9IR!@:B!UB8?_D5$FT8YCJHJ
+M2[2"-&-_D2BJ6#XK[6G=%K"%;'^-+0]FHCY4ER#`^<I-M<!"D:-0H@);U"P"
+MPYX+4#8!&$7\M.+%%MZ:KQ2GX0<]$"P7F^HT)J5JM<$VO9/D[#7KZ\'FITL/
+MYIF"=GO+-L?F[8QS4KC7+=A)1`")V<.8DX629Q;;Y4XA\M-%O&MWC)^)`NO<
+M.J6(5V2UY9"I(C*QKA[Z-GJ<5/_O%<=P4$L!`C\#/P`"``X`/3&13:H[CKH^
+M`@``D`,```4``````````````+2!`````'9I;7)C4$L%!@`````!``$`,P``
+'`&$"````````
+`
+end

Modified: projects/clang1000-import/contrib/ntp/COPYRIGHT
==============================================================================
--- projects/clang1000-import/contrib/ntp/COPYRIGHT	Thu Mar  5 17:53:38 2020	(r358677)
+++ projects/clang1000-import/contrib/ntp/COPYRIGHT	Thu Mar  5 17:55:36 2020	(r358678)
@@ -3,7 +3,7 @@ This file is automatically generated from html/copyrig
 
    jpg "Clone me," says Dolly sheepishly.
 
-   Last update: 2-Jan-2017 11:58 UTC
+   Last update: 4-Feb-2020 23:47 UTC
      __________________________________________________________________
 
    The following copyright notice applies to all files collectively called
@@ -32,7 +32,7 @@ This file is automatically generated from html/copyrig
    Burnicki is:
 ***********************************************************************
 *                                                                     *
-* Copyright (c) Network Time Foundation 2011-2017                     *
+* Copyright (c) Network Time Foundation 2011-2020                     *
 *                                                                     *
 * All Rights Reserved                                                 *
 *                                                                     *

Modified: projects/clang1000-import/contrib/ntp/ChangeLog
==============================================================================
--- projects/clang1000-import/contrib/ntp/ChangeLog	Thu Mar  5 17:53:38 2020	(r358677)
+++ projects/clang1000-import/contrib/ntp/ChangeLog	Thu Mar  5 17:55:36 2020	(r358678)
@@ -1,4 +1,100 @@
 ---
+(4.2.8p14) 2020/03/03 Released by Harlan Stenn <stenn at ntp.org>
+
+* [Sec 3610] process_control() should bail earlier on short packets. stenn@
+  - Reported by Philippe Antoine
+* [Sec 3596] Highly predictable timestamp attack. <stenn at ntp.org>
+  - Reported by Miroslav Lichvar
+* [Sec 3592] DoS attack on client ntpd <perlinger at ntp.org>
+  - Reported by Miroslav Lichvar
+* [Bug 3637] Emit the version of ntpd in saveconfig.  stenn@
+* [Bug 3636] NMEA: combine time/date from multiple sentences <perlinger at ntp.org>
+* [Bug 3635] Make leapsecond file hash check optional <perlinger at ntp.org>
+* [Bug 3634] Typo in discipline.html, reported by Jason Harrison.  stenn@
+* [Bug 3628] raw DCF decoding - improve robustness with Zeller's congruence
+  - implement Zeller's congruence in libparse and libntp <perlinger at ntp.org>
+* [Bug 3627] SIGSEGV on FreeBSD-12 with stack limit and stack gap <perlinger at ntp.org>
+  - integrated patch by Cy Schubert
+* [Bug 3620] memory leak in ntpq sysinfo <perlinger at ntp.org>
+  - applied patch by Gerry Garvey
+* [Bug 3619] Honour drefid setting in cooked mode and sysinfo <perlinger at ntp.org>
+  - applied patch by Gerry Garvey
+* [Bug 3617] Add support for ACE III and Copernicus II receivers <perlinger at ntp.org>
+  - integrated patch by Richard Steedman
+* [Bug 3615] accelerate refclock startup <perlinger at ntp.org>
+* [Bug 3613] Propagate noselect to mobilized pool servers <stenn at ntp.org>
+  - Reported by Martin Burnicki
+* [Bug 3612] Use-of-uninitialized-value in receive function <perlinger at ntp.org>
+  - Reported by Philippe Antoine
+* [Bug 3611] NMEA time interpreted incorrectly <perlinger at ntp.org>
+  - officially document new "trust date" mode bit for NMEA driver
+  - restore the (previously undocumented) "trust date" feature lost with [bug 3577] 
+* [Bug 3609] Fixing wrong falseticker in case of non-statistic jitter <perlinger at ntp.org>
+  - mostly based on a patch by Michael Haardt, implementing 'fudge minjitter'
+* [Bug 3608] libparse fails to compile on S11.4SRU13 and later <perlinger at ntp.org>
+  - removed ffs() and fls() prototypes as per Brian Utterback
+* [Bug 3604] Wrong param byte order passing into record_raw_stats() in
+	ntp_io.c <perlinger at ntp.org>
+  - fixed byte and paramter order as suggested by wei6410 at sina.com 
+* [Bug 3601] Tests fail to link on platforms with ntp_cv_gc_sections_runs=no <perlinger at ntp.org>
+* [Bug 3599] Build fails on linux-m68k due to alignment issues <perlinger at ntp.org>
+  - added padding as suggested by John Paul Adrian Glaubitz 
+* [Bug 3594] ntpd discards messages coming through nmead <perlinger at ntp.org>
+* [Bug 3593] ntpd discards silently nmea messages after the 5th string <perlinger at ntp.org>
+* [Bug 3590] Update refclock_oncore.c to the new GPS date API <perlinger at ntp.org>
+* [Bug 3585] Unity tests mix buffered and unbuffered output <perlinger at ntp.org>
+  - stdout+stderr are set to line buffered during test setup now
+* [Bug 3583] synchronization error <perlinger at ntp.org>
+  - set clock to base date if system time is before that limit
+* [Bug 3582] gpsdjson refclock fudgetime1 adjustment is doubled <perlinger at ntp.org>
+* [Bug 3580] Possible bug ntpq-subs (NULL dereference in dogetassoc) <perlinger at ntp.org>
+  - Reported by Paulo Neves
+* [Bug 3577] Update refclock_zyfer.c to the new GPS date API <perlinger at ntp.org>
+  - also updates for refclock_nmea.c and refclock_jupiter.c
+* [Bug 3576] New GPS date function API <perlinger at ntp.org>
+* [Bug 3573] nptdate: missleading error message <perlinger at ntp.org>
+* [Bug 3570] NMEA driver docs: talker ID not mentioned, typo <perlinger at ntp.org>
+* [Bug 3569] cleanup MOD_NANO/STA_NANO handling for 'ntpadjtimex()' <perlinger at ntp.org>
+  - sidekick: service port resolution in 'ntpdate'
+* [Bug 3550] Reproducible build: Respect SOURCE_DATE_EPOCH <perlinger at ntp.org>
+  - applied patch by Douglas Royds
+* [Bug 3542] ntpdc monlist parameters cannot be set <perlinger at ntp.org>
+* [Bug 3533] ntpdc peer_info ipv6 issues <perlinger at ntp.org>
+  - applied patch by Gerry Garvey
+* [Bug 3531] make check: test-decodenetnum fails <perlinger at ntp.org>
+  - try to harden 'decodenetnum()' against 'getaddrinfo()' errors
+  - fix wrong cond-compile tests in unit tests
+* [Bug 3517] Reducing build noise <perlinger at ntp.org>
+* [Bug 3516] Require tooling from this decade <perlinger at ntp.org>
+  - patch by Philipp Prindeville
+* [Bug 3515] Refactor ntpdmain() dispatcher loop and group common code <perlinger at ntp.org>
+  - patch by Philipp Prindeville
+* [Bug 3511] Get rid of AC_LANG_SOURCE() warnings <perlinger at ntp.org>
+  - patch by Philipp Prindeville
+* [Bug 3510] Flatten out the #ifdef nesting in ntpdmain() <perlinger at ntp.org>
+  - partial application of patch by Philipp Prindeville
+* [Bug 3491] Signed values of LFP datatypes should always display a sign
+  - applied patch by Gerry Garvey & fixed unit tests <perlinger at ntp.org>
+* [Bug 3490] Patch to support Trimble Resolution Receivers <perlinger at ntp.org>
+  - applied (modified) patch by Richard Steedman
+* [Bug 3473] RefID of refclocks should always be text format <perlinger at ntp.org>
+  - applied patch by Gerry Garvey (with minor formatting changes)
+* [Bug 3132] Building 4.2.8p8 with disabled local libopts fails <perlinger at ntp.org>
+  - applied patch by Miroslav Lichvar
+* [Bug 3094] ntpd trying to listen for broadcasts on a completely ipv6 network
+  <perlinger at ntp.org>
+* [Bug 2420] ntpd doesn't run and exits with retval 0 when invalid user
+             is specified with -u <perlinger at ntp.org>
+  - monitor daemon child startup & propagate exit codes
+* [Bug 1433] runtime check whether the kernel really supports capabilities
+  - (modified) patch by Kurt Roeckx <perlinger at ntp.org>
+* Clean up sntp/networking.c:sendpkt() error message.  <stenn at ntp.org>
+* Provide more detail on unrecognized config file parser tokens. <stenn at ntp.org>
+* Startup log improvements. <stenn at ntp.org>
+* Update the copyright year.
+* html/confopt.html: cleanup. <stenn at ntp.org>
+
+---
 (4.2.8p13) 2019/03/07 Released by Harlan Stenn <stenn at ntp.org>
 
 * [Sec 3565] Crafted null dereference attack in authenticated

Modified: projects/clang1000-import/contrib/ntp/CommitLog
==============================================================================
--- projects/clang1000-import/contrib/ntp/CommitLog	Thu Mar  5 17:53:38 2020	(r358677)
+++ projects/clang1000-import/contrib/ntp/CommitLog	Thu Mar  5 17:55:36 2020	(r358678)
@@ -1,10 +1,3065 @@
-ChangeSet at 1.3849, 2019-02-20 17:13:36-08:00, harlan at ntp-build.tal1.ntfo.org
+ChangeSet at 1.3896, 2020-03-03 17:42:43-08:00, ntpreleng at ntp-build.tal1.ntfo.org
+  NTP_4_2_8P14
+  TAG: NTP_4_2_8P14
+
+  ChangeLog at 1.1974 +1 -1
+    NTP_4_2_8P14
+
+  ntpd/invoke-ntp.conf.texi at 1.221 +1 -1
+    NTP_4_2_8P14
+
+  ntpd/invoke-ntp.keys.texi at 1.206 +1 -1
+    NTP_4_2_8P14
+
+  ntpd/invoke-ntpd.texi at 1.520 +2 -2
+    NTP_4_2_8P14
+
+  ntpd/ntp.conf.5man at 1.255 +2 -2
+    NTP_4_2_8P14
+
+  ntpd/ntp.conf.5mdoc at 1.255 +1 -1
+    NTP_4_2_8P14
+
+  ntpd/ntp.conf.html at 1.203 +1 -1
+    NTP_4_2_8P14
+
+  ntpd/ntp.conf.man.in at 1.255 +2 -2
+    NTP_4_2_8P14
+
+  ntpd/ntp.conf.mdoc.in at 1.255 +1 -1
+    NTP_4_2_8P14
+
+  ntpd/ntp.keys.5man at 1.240 +2 -2
+    NTP_4_2_8P14
+
+  ntpd/ntp.keys.5mdoc at 1.240 +1 -1
+    NTP_4_2_8P14
+
+  ntpd/ntp.keys.html at 1.201 +1 -1
+    NTP_4_2_8P14
+
+  ntpd/ntp.keys.man.in at 1.240 +2 -2
+    NTP_4_2_8P14
+
+  ntpd/ntp.keys.mdoc.in at 1.240 +1 -1
+    NTP_4_2_8P14
+
+  ntpd/ntpd-opts.c at 1.543 +7 -7
+    NTP_4_2_8P14
+
+  ntpd/ntpd-opts.h at 1.542 +3 -3
+    NTP_4_2_8P14
+
+  ntpd/ntpd.1ntpdman at 1.349 +2 -2
+    NTP_4_2_8P14
+
+  ntpd/ntpd.1ntpdmdoc at 1.349 +1 -1
+    NTP_4_2_8P14
+
+  ntpd/ntpd.html at 1.194 +2 -2
+    NTP_4_2_8P14
+
+  ntpd/ntpd.man.in at 1.349 +2 -2
+    NTP_4_2_8P14
+
+  ntpd/ntpd.mdoc.in at 1.349 +1 -1
+    NTP_4_2_8P14
+
+  ntpdc/invoke-ntpdc.texi at 1.517 +2 -2
+    NTP_4_2_8P14
+
+  ntpdc/ntpdc-opts.c at 1.536 +7 -7
+    NTP_4_2_8P14
+
+  ntpdc/ntpdc-opts.h at 1.535 +3 -3
+    NTP_4_2_8P14
+
+  ntpdc/ntpdc.1ntpdcman at 1.348 +2 -2
+    NTP_4_2_8P14
+
+  ntpdc/ntpdc.1ntpdcmdoc at 1.348 +1 -1
+    NTP_4_2_8P14
+
+  ntpdc/ntpdc.html at 1.363 +2 -2
+    NTP_4_2_8P14
+
+  ntpdc/ntpdc.man.in at 1.348 +2 -2
+    NTP_4_2_8P14
+
+  ntpdc/ntpdc.mdoc.in at 1.348 +1 -1
+    NTP_4_2_8P14
+
+  ntpq/invoke-ntpq.texi at 1.527 +2 -2
+    NTP_4_2_8P14
+
+  ntpq/ntpq-opts.c at 1.545 +7 -7
+    NTP_4_2_8P14
+
+  ntpq/ntpq-opts.h at 1.543 +3 -3
+    NTP_4_2_8P14
+
+  ntpq/ntpq.1ntpqman at 1.355 +2 -2
+    NTP_4_2_8P14
+
+  ntpq/ntpq.1ntpqmdoc at 1.355 +1 -1
+    NTP_4_2_8P14
+
+  ntpq/ntpq.html at 1.194 +2 -2
+    NTP_4_2_8P14
+
+  ntpq/ntpq.man.in at 1.355 +2 -2
+    NTP_4_2_8P14
+
+  ntpq/ntpq.mdoc.in at 1.355 +1 -1
+    NTP_4_2_8P14
+
+  ntpsnmpd/invoke-ntpsnmpd.texi at 1.519 +1 -1
+    NTP_4_2_8P14
+
+  ntpsnmpd/ntpsnmpd-opts.c at 1.538 +7 -7
+    NTP_4_2_8P14
+
+  ntpsnmpd/ntpsnmpd-opts.h at 1.537 +3 -3
+    NTP_4_2_8P14
+
+  ntpsnmpd/ntpsnmpd.1ntpsnmpdman at 1.348 +2 -2
+    NTP_4_2_8P14
+
+  ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc at 1.348 +1 -1
+    NTP_4_2_8P14
+
+  ntpsnmpd/ntpsnmpd.html at 1.187 +1 -1
+    NTP_4_2_8P14
+
+  ntpsnmpd/ntpsnmpd.man.in at 1.348 +2 -2
+    NTP_4_2_8P14
+
+  ntpsnmpd/ntpsnmpd.mdoc.in at 1.348 +1 -1
+    NTP_4_2_8P14
+
+  packageinfo.sh at 1.544 +1 -1
+    NTP_4_2_8P14
+
+  scripts/calc_tickadj/calc_tickadj.1calc_tickadjman at 1.109 +2 -2
+    NTP_4_2_8P14
+
+  scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc at 1.110 +1 -1
+    NTP_4_2_8P14
+
+  scripts/calc_tickadj/calc_tickadj.html at 1.110 +1 -1
+    NTP_4_2_8P14
+
+  scripts/calc_tickadj/calc_tickadj.man.in at 1.108 +2 -2
+    NTP_4_2_8P14
+
+  scripts/calc_tickadj/calc_tickadj.mdoc.in at 1.110 +1 -1
+    NTP_4_2_8P14
+
+  scripts/calc_tickadj/invoke-calc_tickadj.texi at 1.113 +1 -1
+    NTP_4_2_8P14
+
+  scripts/invoke-plot_summary.texi at 1.131 +2 -2
+    NTP_4_2_8P14
+
+  scripts/invoke-summary.texi at 1.130 +2 -2
+    NTP_4_2_8P14
+
+  scripts/ntp-wait/invoke-ntp-wait.texi at 1.341 +2 -2
+    NTP_4_2_8P14
+
+  scripts/ntp-wait/ntp-wait-opts at 1.77 +2 -2
+    NTP_4_2_8P14
+
+  scripts/ntp-wait/ntp-wait.1ntp-waitman at 1.337 +2 -2
+    NTP_4_2_8P14
+
+  scripts/ntp-wait/ntp-wait.1ntp-waitmdoc at 1.338 +1 -1
+    NTP_4_2_8P14
+
+  scripts/ntp-wait/ntp-wait.html at 1.359 +2 -2
+    NTP_4_2_8P14
+
+  scripts/ntp-wait/ntp-wait.man.in at 1.337 +2 -2
+    NTP_4_2_8P14
+
+  scripts/ntp-wait/ntp-wait.mdoc.in at 1.338 +1 -1
+    NTP_4_2_8P14
+
+  scripts/ntpsweep/invoke-ntpsweep.texi at 1.128 +2 -2
+    NTP_4_2_8P14
+
+  scripts/ntpsweep/ntpsweep-opts at 1.79 +2 -2
+    NTP_4_2_8P14
+
+  scripts/ntpsweep/ntpsweep.1ntpsweepman at 1.116 +2 -2
+    NTP_4_2_8P14
+
+  scripts/ntpsweep/ntpsweep.1ntpsweepmdoc at 1.116 +1 -1
+    NTP_4_2_8P14
+
+  scripts/ntpsweep/ntpsweep.html at 1.131 +2 -2
+    NTP_4_2_8P14
+
+  scripts/ntpsweep/ntpsweep.man.in at 1.116 +2 -2
+    NTP_4_2_8P14
+
+  scripts/ntpsweep/ntpsweep.mdoc.in at 1.117 +1 -1
+    NTP_4_2_8P14
+
+  scripts/ntptrace/invoke-ntptrace.texi at 1.130 +2 -2
+    NTP_4_2_8P14
+
+  scripts/ntptrace/ntptrace-opts at 1.79 +2 -2
+    NTP_4_2_8P14
+
+  scripts/ntptrace/ntptrace.1ntptraceman at 1.116 +2 -2
+    NTP_4_2_8P14
+
+  scripts/ntptrace/ntptrace.1ntptracemdoc at 1.117 +1 -1
+    NTP_4_2_8P14
+
+  scripts/ntptrace/ntptrace.html at 1.132 +2 -2
+    NTP_4_2_8P14
+
+  scripts/ntptrace/ntptrace.man.in at 1.116 +2 -2
+    NTP_4_2_8P14
+
+  scripts/ntptrace/ntptrace.mdoc.in at 1.118 +1 -1
+    NTP_4_2_8P14
+
+  scripts/plot_summary-opts at 1.80 +2 -2
+    NTP_4_2_8P14
+
+  scripts/plot_summary.1plot_summaryman at 1.129 +2 -2
+    NTP_4_2_8P14
+
+  scripts/plot_summary.1plot_summarymdoc at 1.129 +1 -1
+    NTP_4_2_8P14
+
+  scripts/plot_summary.html at 1.134 +2 -2
+    NTP_4_2_8P14
+
+  scripts/plot_summary.man.in at 1.129 +2 -2
+    NTP_4_2_8P14
+
+  scripts/plot_summary.mdoc.in at 1.129 +1 -1
+    NTP_4_2_8P14
+
+  scripts/summary-opts at 1.79 +2 -2
+    NTP_4_2_8P14
+
+  scripts/summary.1summaryman at 1.128 +2 -2
+    NTP_4_2_8P14
+
+  scripts/summary.1summarymdoc at 1.128 +1 -1
+    NTP_4_2_8P14
+
+  scripts/summary.html at 1.133 +2 -2
+    NTP_4_2_8P14
+
+  scripts/summary.man.in at 1.128 +2 -2
+    NTP_4_2_8P14
+
+  scripts/summary.mdoc.in at 1.128 +1 -1
+    NTP_4_2_8P14
+
+  scripts/update-leap/invoke-update-leap.texi at 1.29 +1 -1
+    NTP_4_2_8P14
+
+  scripts/update-leap/update-leap-opts at 1.30 +2 -2
+    NTP_4_2_8P14
+
+  scripts/update-leap/update-leap.1update-leapman at 1.29 +2 -2
+    NTP_4_2_8P14
+
+  scripts/update-leap/update-leap.1update-leapmdoc at 1.29 +1 -1
+    NTP_4_2_8P14
+
+  scripts/update-leap/update-leap.html at 1.30 +1 -1
+    NTP_4_2_8P14
+
+  scripts/update-leap/update-leap.man.in at 1.29 +2 -2
+    NTP_4_2_8P14
+
+  scripts/update-leap/update-leap.mdoc.in at 1.29 +1 -1
+    NTP_4_2_8P14
+
+  sntp/invoke-sntp.texi at 1.519 +2 -2
+    NTP_4_2_8P14
+
+  sntp/sntp-opts.c at 1.539 +7 -7
+    NTP_4_2_8P14
+
+  sntp/sntp-opts.h at 1.537 +3 -3
+    NTP_4_2_8P14
+
+  sntp/sntp.1sntpman at 1.354 +2 -2
+    NTP_4_2_8P14
+
+  sntp/sntp.1sntpmdoc at 1.354 +1 -1
+    NTP_4_2_8P14
+
+  sntp/sntp.html at 1.535 +2 -2
+    NTP_4_2_8P14
+
+  sntp/sntp.man.in at 1.354 +2 -2
+    NTP_4_2_8P14
+
+  sntp/sntp.mdoc.in at 1.354 +1 -1
+    NTP_4_2_8P14
+
+  util/invoke-ntp-keygen.texi at 1.522 +2 -2
+    NTP_4_2_8P14
+
+  util/ntp-keygen-opts.c at 1.541 +7 -7
+    NTP_4_2_8P14
+
+  util/ntp-keygen-opts.h at 1.539 +3 -3
+    NTP_4_2_8P14
+
+  util/ntp-keygen.1ntp-keygenman at 1.350 +2 -2
+    NTP_4_2_8P14
+
+  util/ntp-keygen.1ntp-keygenmdoc at 1.350 +1 -1
+    NTP_4_2_8P14
+
+  util/ntp-keygen.html at 1.195 +2 -2
+    NTP_4_2_8P14
+
+  util/ntp-keygen.man.in at 1.350 +2 -2
+    NTP_4_2_8P14
+
+  util/ntp-keygen.mdoc.in at 1.350 +1 -1
+    NTP_4_2_8P14
+
+ChangeSet at 1.3895, 2020-03-03 17:09:57-08:00, ntpreleng at ntp-build.tal1.ntfo.org
+  quiet some debug messages
+
+  ntpd/ntp_config.c at 1.375 +0 -2
+    quiet some debug messages
+
+  ntpd/ntp_peer.c at 1.166 +2 -0
+    quiet some debug messages
+
+ChangeSet at 1.3894, 2020-03-03 16:49:54-08:00, ntpreleng at ntp-build.tal1.ntfo.org
+  NTP_4_2_8P13
+  TAG: NTP_4_2_8P13
+
+  ChangeLog at 1.1973 +1 -0
+    NTP_4_2_8P13
+
+  ntpd/invoke-ntp.conf.texi at 1.220 +31 -7
+    NTP_4_2_8P13
+
+  ntpd/invoke-ntp.keys.texi at 1.205 +1 -1
+    NTP_4_2_8P13
+
+  ntpd/invoke-ntpd.texi at 1.519 +3 -3
+    NTP_4_2_8P13
+
+  ntpd/ntp.conf.5man at 1.254 +34 -9
+    NTP_4_2_8P13
+
+  ntpd/ntp.conf.5mdoc at 1.254 +41 -6
+    NTP_4_2_8P13
+
+  ntpd/ntp.conf.html at 1.202 +33 -7
+    NTP_4_2_8P13
+
+  ntpd/ntp.conf.man.in at 1.254 +34 -9

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

More information about the svn-src-projects mailing list