svn commit: r338622 - in projects/krb5: . bin/csh bin/rm bin/rm/tests bin/sh contrib/elftoolchain/elfcopy contrib/elftoolchain/libelf contrib/libarchive contrib/libarchive/cpio/test contrib/libarch...

Cy Schubert cy at FreeBSD.org
Thu Sep 13 06:21:15 UTC 2018 

Author: cy
Date: Thu Sep 13 06:21:07 2018
New Revision: 338622
URL: https://svnweb.freebsd.org/changeset/base/338622

Log:
  MFH to 338620

Added:
  projects/krb5/bin/csh/dot.cshrc
     - copied unchanged from r338620, head/bin/csh/dot.cshrc
  projects/krb5/bin/rm/tests/
     - copied from r338620, head/bin/rm/tests/
  projects/krb5/bin/sh/dot.profile
     - copied unchanged from r338620, head/bin/sh/dot.profile
  projects/krb5/contrib/elftoolchain/libelf/gelf_mips64el.c
     - copied unchanged from r338620, head/contrib/elftoolchain/libelf/gelf_mips64el.c
  projects/krb5/crypto/openssh/openbsd-compat/bsd-getline.c
     - copied unchanged from r338620, head/crypto/openssh/openbsd-compat/bsd-getline.c
  projects/krb5/crypto/openssh/regress/cfgmatchlisten.sh
     - copied unchanged from r338620, head/crypto/openssh/regress/cfgmatchlisten.sh
  projects/krb5/crypto/openssh/regress/mkdtemp.c
     - copied unchanged from r338620, head/crypto/openssh/regress/mkdtemp.c
  projects/krb5/libexec/getty/gettytab
     - copied unchanged from r338620, head/libexec/getty/gettytab
  projects/krb5/sbin/init/ttys.aarch64
     - copied unchanged from r338620, head/sbin/init/ttys.aarch64
  projects/krb5/sbin/init/ttys.amd64
     - copied unchanged from r338620, head/sbin/init/ttys.amd64
  projects/krb5/sbin/init/ttys.arm
     - copied unchanged from r338620, head/sbin/init/ttys.arm
  projects/krb5/sbin/init/ttys.i386
     - copied unchanged from r338620, head/sbin/init/ttys.i386
  projects/krb5/sbin/init/ttys.mips
     - copied unchanged from r338620, head/sbin/init/ttys.mips
  projects/krb5/sbin/init/ttys.powerpc
     - copied unchanged from r338620, head/sbin/init/ttys.powerpc
  projects/krb5/sbin/init/ttys.riscv
     - copied unchanged from r338620, head/sbin/init/ttys.riscv
  projects/krb5/sbin/init/ttys.sparc64
     - copied unchanged from r338620, head/sbin/init/ttys.sparc64
  projects/krb5/share/vt/fonts/INDEX.fonts
     - copied unchanged from r338620, head/share/vt/fonts/INDEX.fonts
  projects/krb5/stand/userboot/userboot_4th/
     - copied from r338620, head/stand/userboot/userboot_4th/
  projects/krb5/stand/userboot/userboot_lua/
     - copied from r338620, head/stand/userboot/userboot_lua/
  projects/krb5/sys/amd64/amd64/efirt_support.S
     - copied unchanged from r338620, head/sys/amd64/amd64/efirt_support.S
  projects/krb5/sys/dev/sound/pci/csamidi.c
     - copied unchanged from r338620, head/sys/dev/sound/pci/csamidi.c
  projects/krb5/tests/sys/netinet/reuseport_lb.c
     - copied unchanged from r338620, head/tests/sys/netinet/reuseport_lb.c
  projects/krb5/usr.bin/login/fbtab
     - copied unchanged from r338620, head/usr.bin/login/fbtab
  projects/krb5/usr.bin/login/login.conf
     - copied unchanged from r338620, head/usr.bin/login/login.conf
  projects/krb5/usr.bin/login/motd
     - copied unchanged from r338620, head/usr.bin/login/motd
  projects/krb5/usr.sbin/cron/cron/crontab
     - copied unchanged from r338620, head/usr.sbin/cron/cron/crontab
Deleted:
  projects/krb5/crypto/openssh/bufaux.c
  projects/krb5/crypto/openssh/bufbn.c
  projects/krb5/crypto/openssh/bufec.c
  projects/krb5/crypto/openssh/buffer.c
  projects/krb5/crypto/openssh/buffer.h
  projects/krb5/crypto/openssh/key.c
  projects/krb5/crypto/openssh/key.h
  projects/krb5/etc/crontab
  projects/krb5/etc/etc.aarch64/
  projects/krb5/etc/etc.amd64/
  projects/krb5/etc/etc.arm/
  projects/krb5/etc/etc.i386/
  projects/krb5/etc/etc.mips/
  projects/krb5/etc/etc.powerpc/
  projects/krb5/etc/etc.riscv/
  projects/krb5/etc/etc.sparc64/
  projects/krb5/etc/fbtab
  projects/krb5/etc/gettytab
  projects/krb5/etc/login.conf
  projects/krb5/etc/motd
  projects/krb5/etc/root/dot.cshrc
  projects/krb5/etc/root/dot.profile
  projects/krb5/sys/riscv/include/riscv_opcode.h
Modified:
  projects/krb5/Makefile.inc1
  projects/krb5/UPDATING
  projects/krb5/bin/csh/Makefile
  projects/krb5/bin/rm/Makefile
  projects/krb5/bin/rm/rm.1
  projects/krb5/bin/rm/rm.c
  projects/krb5/bin/sh/Makefile
  projects/krb5/bin/sh/expand.c
  projects/krb5/contrib/elftoolchain/elfcopy/main.c
  projects/krb5/contrib/elftoolchain/libelf/Makefile
  projects/krb5/contrib/elftoolchain/libelf/_libelf.h
  projects/krb5/contrib/elftoolchain/libelf/gelf_rel.c
  projects/krb5/contrib/elftoolchain/libelf/gelf_rela.c
  projects/krb5/contrib/libarchive/NEWS
  projects/krb5/contrib/libarchive/README.md
  projects/krb5/contrib/libarchive/cpio/test/test_basic.c
  projects/krb5/contrib/libarchive/cpio/test/test_format_newc.c
  projects/krb5/contrib/libarchive/libarchive/archive.h
  projects/krb5/contrib/libarchive/libarchive/archive_cryptor.c
  projects/krb5/contrib/libarchive/libarchive/archive_entry.h
  projects/krb5/contrib/libarchive/libarchive/archive_pack_dev.c
  projects/krb5/contrib/tcpdump/tcpdump.c
  projects/krb5/contrib/unbound/Makefile.in
  projects/krb5/contrib/unbound/compat/arc4random.c
  projects/krb5/contrib/unbound/config.h
  projects/krb5/contrib/unbound/config.h.in
  projects/krb5/contrib/unbound/configure
  projects/krb5/contrib/unbound/configure.ac
  projects/krb5/contrib/unbound/contrib/libunbound.pc.in
  projects/krb5/contrib/unbound/daemon/acl_list.c
  projects/krb5/contrib/unbound/daemon/acl_list.h
  projects/krb5/contrib/unbound/daemon/cachedump.c
  projects/krb5/contrib/unbound/daemon/cachedump.h
  projects/krb5/contrib/unbound/daemon/daemon.c
  projects/krb5/contrib/unbound/daemon/remote.c
  projects/krb5/contrib/unbound/daemon/remote.h
  projects/krb5/contrib/unbound/daemon/unbound.c
  projects/krb5/contrib/unbound/daemon/worker.c
  projects/krb5/contrib/unbound/doc/Changelog
  projects/krb5/contrib/unbound/doc/README
  projects/krb5/contrib/unbound/doc/example.conf
  projects/krb5/contrib/unbound/doc/example.conf.in
  projects/krb5/contrib/unbound/doc/libunbound.3
  projects/krb5/contrib/unbound/doc/libunbound.3.in
  projects/krb5/contrib/unbound/doc/unbound-anchor.8
  projects/krb5/contrib/unbound/doc/unbound-anchor.8.in
  projects/krb5/contrib/unbound/doc/unbound-checkconf.8
  projects/krb5/contrib/unbound/doc/unbound-checkconf.8.in
  projects/krb5/contrib/unbound/doc/unbound-control.8
  projects/krb5/contrib/unbound/doc/unbound-control.8.in
  projects/krb5/contrib/unbound/doc/unbound-host.1
  projects/krb5/contrib/unbound/doc/unbound-host.1.in
  projects/krb5/contrib/unbound/doc/unbound.8
  projects/krb5/contrib/unbound/doc/unbound.8.in
  projects/krb5/contrib/unbound/doc/unbound.conf.5
  projects/krb5/contrib/unbound/doc/unbound.conf.5.in
  projects/krb5/contrib/unbound/iterator/iter_utils.c
  projects/krb5/contrib/unbound/iterator/iterator.c
  projects/krb5/contrib/unbound/libunbound/context.c
  projects/krb5/contrib/unbound/libunbound/context.h
  projects/krb5/contrib/unbound/libunbound/libunbound.c
  projects/krb5/contrib/unbound/libunbound/libworker.c
  projects/krb5/contrib/unbound/services/authzone.c
  projects/krb5/contrib/unbound/services/cache/infra.c
  projects/krb5/contrib/unbound/services/listen_dnsport.c
  projects/krb5/contrib/unbound/services/mesh.c
  projects/krb5/contrib/unbound/services/outside_network.c
  projects/krb5/contrib/unbound/services/outside_network.h
  projects/krb5/contrib/unbound/smallapp/unbound-checkconf.c
  projects/krb5/contrib/unbound/smallapp/unbound-control.c
  projects/krb5/contrib/unbound/smallapp/unbound-host.c
  projects/krb5/contrib/unbound/util/alloc.c
  projects/krb5/contrib/unbound/util/alloc.h
  projects/krb5/contrib/unbound/util/config_file.c
  projects/krb5/contrib/unbound/util/config_file.h
  projects/krb5/contrib/unbound/util/configlexer.lex
  projects/krb5/contrib/unbound/util/configparser.y
  projects/krb5/contrib/unbound/util/net_help.c
  projects/krb5/contrib/unbound/util/net_help.h
  projects/krb5/contrib/unbound/util/netevent.c
  projects/krb5/crypto/openssh/.depend
  projects/krb5/crypto/openssh/.skipped-commit-ids
  projects/krb5/crypto/openssh/ChangeLog
  projects/krb5/crypto/openssh/INSTALL
  projects/krb5/crypto/openssh/Makefile.in
  projects/krb5/crypto/openssh/OVERVIEW
  projects/krb5/crypto/openssh/PROTOCOL
  projects/krb5/crypto/openssh/PROTOCOL.certkeys
  projects/krb5/crypto/openssh/PROTOCOL.chacha20poly1305
  projects/krb5/crypto/openssh/PROTOCOL.krl
  projects/krb5/crypto/openssh/README
  projects/krb5/crypto/openssh/README.platform
  projects/krb5/crypto/openssh/TODO
  projects/krb5/crypto/openssh/aclocal.m4
  projects/krb5/crypto/openssh/addrmatch.c
  projects/krb5/crypto/openssh/audit-bsm.c
  projects/krb5/crypto/openssh/audit.c
  projects/krb5/crypto/openssh/auth-bsdauth.c
  projects/krb5/crypto/openssh/auth-krb5.c
  projects/krb5/crypto/openssh/auth-options.c
  projects/krb5/crypto/openssh/auth-options.h
  projects/krb5/crypto/openssh/auth-pam.c
  projects/krb5/crypto/openssh/auth-passwd.c
  projects/krb5/crypto/openssh/auth-rhosts.c
  projects/krb5/crypto/openssh/auth-shadow.c
  projects/krb5/crypto/openssh/auth-sia.c
  projects/krb5/crypto/openssh/auth-skey.c
  projects/krb5/crypto/openssh/auth.c
  projects/krb5/crypto/openssh/auth.h
  projects/krb5/crypto/openssh/auth2-chall.c
  projects/krb5/crypto/openssh/auth2-gss.c
  projects/krb5/crypto/openssh/auth2-hostbased.c
  projects/krb5/crypto/openssh/auth2-kbdint.c
  projects/krb5/crypto/openssh/auth2-none.c
  projects/krb5/crypto/openssh/auth2-passwd.c
  projects/krb5/crypto/openssh/auth2-pubkey.c
  projects/krb5/crypto/openssh/auth2.c
  projects/krb5/crypto/openssh/authfd.c
  projects/krb5/crypto/openssh/authfd.h
  projects/krb5/crypto/openssh/authfile.c
  projects/krb5/crypto/openssh/channels.c
  projects/krb5/crypto/openssh/channels.h
  projects/krb5/crypto/openssh/cipher.c
  projects/krb5/crypto/openssh/clientloop.c
  projects/krb5/crypto/openssh/clientloop.h
  projects/krb5/crypto/openssh/compat.c
  projects/krb5/crypto/openssh/compat.h
  projects/krb5/crypto/openssh/config.h
  projects/krb5/crypto/openssh/configure.ac
  projects/krb5/crypto/openssh/contrib/aix/buildbff.sh
  projects/krb5/crypto/openssh/contrib/cygwin/ssh-host-config
  projects/krb5/crypto/openssh/contrib/cygwin/ssh-user-config
  projects/krb5/crypto/openssh/contrib/redhat/openssh.spec
  projects/krb5/crypto/openssh/contrib/solaris/README
  projects/krb5/crypto/openssh/contrib/suse/openssh.spec
  projects/krb5/crypto/openssh/defines.h
  projects/krb5/crypto/openssh/dh.c
  projects/krb5/crypto/openssh/entropy.c
  projects/krb5/crypto/openssh/entropy.h
  projects/krb5/crypto/openssh/gss-genr.c
  projects/krb5/crypto/openssh/gss-serv-krb5.c
  projects/krb5/crypto/openssh/gss-serv.c
  projects/krb5/crypto/openssh/hostfile.c
  projects/krb5/crypto/openssh/kex.c
  projects/krb5/crypto/openssh/kex.h
  projects/krb5/crypto/openssh/kexdhs.c
  projects/krb5/crypto/openssh/kexgexs.c
  projects/krb5/crypto/openssh/log.c
  projects/krb5/crypto/openssh/log.h
  projects/krb5/crypto/openssh/loginrec.c
  projects/krb5/crypto/openssh/match.c
  projects/krb5/crypto/openssh/match.h
  projects/krb5/crypto/openssh/misc.c
  projects/krb5/crypto/openssh/misc.h
  projects/krb5/crypto/openssh/moduli
  projects/krb5/crypto/openssh/monitor.c
  projects/krb5/crypto/openssh/monitor.h
  projects/krb5/crypto/openssh/monitor_wrap.c
  projects/krb5/crypto/openssh/monitor_wrap.h
  projects/krb5/crypto/openssh/msg.c
  projects/krb5/crypto/openssh/mux.c
  projects/krb5/crypto/openssh/myproposal.h
  projects/krb5/crypto/openssh/opacket.c
  projects/krb5/crypto/openssh/opacket.h
  projects/krb5/crypto/openssh/openbsd-compat/Makefile.in
  projects/krb5/crypto/openssh/openbsd-compat/arc4random.c
  projects/krb5/crypto/openssh/openbsd-compat/bcrypt_pbkdf.c
  projects/krb5/crypto/openssh/openbsd-compat/bsd-closefrom.c
  projects/krb5/crypto/openssh/openbsd-compat/bsd-cygwin_util.c
  projects/krb5/crypto/openssh/openbsd-compat/bsd-cygwin_util.h
  projects/krb5/crypto/openssh/openbsd-compat/bsd-misc.c
  projects/krb5/crypto/openssh/openbsd-compat/bsd-nextstep.h
  projects/krb5/crypto/openssh/openbsd-compat/bsd-snprintf.c
  projects/krb5/crypto/openssh/openbsd-compat/bsd-waitpid.h
  projects/krb5/crypto/openssh/openbsd-compat/explicit_bzero.c
  projects/krb5/crypto/openssh/openbsd-compat/fmt_scaled.c
  projects/krb5/crypto/openssh/openbsd-compat/freezero.c
  projects/krb5/crypto/openssh/openbsd-compat/openbsd-compat.h
  projects/krb5/crypto/openssh/openbsd-compat/port-aix.c
  projects/krb5/crypto/openssh/openbsd-compat/port-aix.h
  projects/krb5/crypto/openssh/openbsd-compat/port-uw.c
  projects/krb5/crypto/openssh/openbsd-compat/sha2.c
  projects/krb5/crypto/openssh/openbsd-compat/strndup.c
  projects/krb5/crypto/openssh/openbsd-compat/strnlen.c
  projects/krb5/crypto/openssh/openbsd-compat/sys-queue.h
  projects/krb5/crypto/openssh/packet.c
  projects/krb5/crypto/openssh/packet.h
  projects/krb5/crypto/openssh/platform.c
  projects/krb5/crypto/openssh/readconf.c
  projects/krb5/crypto/openssh/readconf.h
  projects/krb5/crypto/openssh/readpass.c
  projects/krb5/crypto/openssh/regress/Makefile
  projects/krb5/crypto/openssh/regress/allow-deny-users.sh
  projects/krb5/crypto/openssh/regress/authinfo.sh
  projects/krb5/crypto/openssh/regress/cert-file.sh
  projects/krb5/crypto/openssh/regress/cert-hostkey.sh
  projects/krb5/crypto/openssh/regress/cfgparse.sh
  projects/krb5/crypto/openssh/regress/forward-control.sh
  projects/krb5/crypto/openssh/regress/forwarding.sh
  projects/krb5/crypto/openssh/regress/key-options.sh
  projects/krb5/crypto/openssh/regress/keygen-knownhosts.sh
  projects/krb5/crypto/openssh/regress/multiplex.sh
  projects/krb5/crypto/openssh/regress/rekey.sh
  projects/krb5/crypto/openssh/regress/setuid-allowed.c
  projects/krb5/crypto/openssh/regress/sshcfgparse.sh
  projects/krb5/crypto/openssh/regress/test-exec.sh
  projects/krb5/crypto/openssh/regress/unittests/hostkeys/test_iterate.c
  projects/krb5/crypto/openssh/regress/unittests/match/tests.c
  projects/krb5/crypto/openssh/regress/unittests/sshkey/test_sshkey.c
  projects/krb5/crypto/openssh/regress/valgrind-unit.sh
  projects/krb5/crypto/openssh/sandbox-seccomp-filter.c
  projects/krb5/crypto/openssh/sandbox-systrace.c
  projects/krb5/crypto/openssh/scp.1
  projects/krb5/crypto/openssh/scp.c
  projects/krb5/crypto/openssh/servconf.c
  projects/krb5/crypto/openssh/servconf.h
  projects/krb5/crypto/openssh/serverloop.c
  projects/krb5/crypto/openssh/session.c
  projects/krb5/crypto/openssh/sftp-client.c
  projects/krb5/crypto/openssh/sftp-server.c
  projects/krb5/crypto/openssh/sftp.1
  projects/krb5/crypto/openssh/sftp.c
  projects/krb5/crypto/openssh/ssh-agent.c
  projects/krb5/crypto/openssh/ssh-gss.h
  projects/krb5/crypto/openssh/ssh-keygen.1
  projects/krb5/crypto/openssh/ssh-keygen.c
  projects/krb5/crypto/openssh/ssh-keyscan.c
  projects/krb5/crypto/openssh/ssh-keysign.c
  projects/krb5/crypto/openssh/ssh-pkcs11-client.c
  projects/krb5/crypto/openssh/ssh-rsa.c
  projects/krb5/crypto/openssh/ssh.1
  projects/krb5/crypto/openssh/ssh.c
  projects/krb5/crypto/openssh/ssh.h
  projects/krb5/crypto/openssh/ssh_api.h
  projects/krb5/crypto/openssh/ssh_config
  projects/krb5/crypto/openssh/ssh_config.5
  projects/krb5/crypto/openssh/ssh_namespace.h
  projects/krb5/crypto/openssh/sshbuf.c
  projects/krb5/crypto/openssh/sshbuf.h
  projects/krb5/crypto/openssh/sshconnect.c
  projects/krb5/crypto/openssh/sshconnect.h
  projects/krb5/crypto/openssh/sshconnect2.c
  projects/krb5/crypto/openssh/sshd.8
  projects/krb5/crypto/openssh/sshd.c
  projects/krb5/crypto/openssh/sshd_config
  projects/krb5/crypto/openssh/sshd_config.5
  projects/krb5/crypto/openssh/ssherr.c
  projects/krb5/crypto/openssh/ssherr.h
  projects/krb5/crypto/openssh/sshkey-xmss.c
  projects/krb5/crypto/openssh/sshkey.c
  projects/krb5/crypto/openssh/sshkey.h
  projects/krb5/crypto/openssh/sshlogin.c
  projects/krb5/crypto/openssh/ttymodes.c
  projects/krb5/crypto/openssh/uidswap.c
  projects/krb5/crypto/openssh/uidswap.h
  projects/krb5/crypto/openssh/umac.c
  projects/krb5/crypto/openssh/utf8.c
  projects/krb5/crypto/openssh/version.h
  projects/krb5/crypto/openssh/xmss_wots.c
  projects/krb5/etc/Makefile
  projects/krb5/etc/mtree/BSD.tests.dist
  projects/krb5/lib/geom/eli/geom_eli.c
  projects/krb5/lib/libbe/be.c
  projects/krb5/lib/libbe/be.h
  projects/krb5/lib/libbe/be_access.c
  projects/krb5/lib/libbe/be_error.c
  projects/krb5/lib/libbe/be_info.c
  projects/krb5/lib/libbe/libbe.3
  projects/krb5/lib/libelf/Makefile
  projects/krb5/lib/libpam/modules/pam_exec/pam_exec.8
  projects/krb5/lib/libpam/modules/pam_exec/pam_exec.c
  projects/krb5/lib/libpam/modules/pam_ssh/pam_ssh.c
  projects/krb5/lib/libunbound/Makefile
  projects/krb5/lib/libusb/libusb10.c
  projects/krb5/lib/libusb/libusb10.h
  projects/krb5/lib/libusb/libusb10_io.c
  projects/krb5/lib/libvmmapi/vmmapi.c
  projects/krb5/libexec/getty/Makefile
  projects/krb5/libexec/rtld-elf/aarch64/rtld_machdep.h
  projects/krb5/libexec/rtld-elf/arm/rtld_machdep.h
  projects/krb5/libexec/rtld-elf/libmap.c
  projects/krb5/libexec/rtld-elf/mips/rtld_machdep.h
  projects/krb5/libexec/rtld-elf/powerpc/rtld_machdep.h
  projects/krb5/libexec/rtld-elf/powerpc64/rtld_machdep.h
  projects/krb5/libexec/rtld-elf/riscv/rtld_machdep.h
  projects/krb5/libexec/rtld-elf/rtld.c
  projects/krb5/release/tools/arm.subr
  projects/krb5/sbin/dhclient/Makefile
  projects/krb5/sbin/geom/core/geom.c
  projects/krb5/sbin/init/Makefile
  projects/krb5/sbin/ping/Makefile
  projects/krb5/sbin/sysctl/sysctl.c
  projects/krb5/secure/lib/libssh/Makefile
  projects/krb5/secure/libexec/ssh-keysign/Makefile
  projects/krb5/secure/usr.sbin/sshd/Makefile
  projects/krb5/share/man/man4/man4.arm/bcm283x_pwm.4
  projects/krb5/share/man/man4/u3g.4
  projects/krb5/share/man/man8/diskless.8
  projects/krb5/share/man/man9/EVENTHANDLER.9
  projects/krb5/share/misc/committers-ports.dot
  projects/krb5/share/mk/bsd.cpu.mk
  projects/krb5/share/vt/fonts/Makefile
  projects/krb5/stand/common/bootstrap.h
  projects/krb5/stand/common/interp_forth.c
  projects/krb5/stand/common/interp_lua.c
  projects/krb5/stand/common/interp_simple.c
  projects/krb5/stand/defaults/loader.conf
  projects/krb5/stand/defs.mk
  projects/krb5/stand/libsa/tftp.c
  projects/krb5/stand/lua/core.lua
  projects/krb5/stand/lua/loader.lua
  projects/krb5/stand/userboot/Makefile
  projects/krb5/stand/userboot/userboot.h
  projects/krb5/stand/userboot/userboot/Makefile
  projects/krb5/stand/userboot/userboot/main.c
  projects/krb5/stand/userboot/userboot/version
  projects/krb5/sys/amd64/amd64/efirt_machdep.c   (contents, props changed)
  projects/krb5/sys/amd64/amd64/genassym.c
  projects/krb5/sys/amd64/amd64/pmap.c
  projects/krb5/sys/amd64/amd64/support.S
  projects/krb5/sys/amd64/amd64/trap.c
  projects/krb5/sys/amd64/conf/GENERIC
  projects/krb5/sys/amd64/conf/MINIMAL
  projects/krb5/sys/amd64/include/efi.h
  projects/krb5/sys/amd64/include/proc.h
  projects/krb5/sys/arm/arm/gic.c
  projects/krb5/sys/arm/arm/gic_acpi.c
  projects/krb5/sys/arm/arm/physmem.c
  projects/krb5/sys/arm/arm/pmap-v6.c
  projects/krb5/sys/arm/nvidia/tegra_sdhci.c
  projects/krb5/sys/arm/ti/omap4/omap4_prcm_clks.c
  projects/krb5/sys/arm64/arm64/efirt_machdep.c
  projects/krb5/sys/arm64/arm64/machdep.c
  projects/krb5/sys/arm64/arm64/pmap.c
  projects/krb5/sys/arm64/include/efi.h
  projects/krb5/sys/cam/ctl/ctl.c
  projects/krb5/sys/cam/ctl/ctl_frontend_iscsi.c
  projects/krb5/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/krb5/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h
  projects/krb5/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
  projects/krb5/sys/cddl/dev/dtrace/riscv/dtrace_subr.c
  projects/krb5/sys/cddl/dev/fbt/fbt.c
  projects/krb5/sys/cddl/dev/fbt/riscv/fbt_isa.c
  projects/krb5/sys/conf/files.amd64
  projects/krb5/sys/conf/kern.mk
  projects/krb5/sys/conf/kern.post.mk
  projects/krb5/sys/conf/newvers.sh
  projects/krb5/sys/contrib/rdma/krping/krping.c
  projects/krb5/sys/crypto/ccp/ccp.c
  projects/krb5/sys/dev/efidev/efirt.c   (contents, props changed)
  projects/krb5/sys/dev/efidev/efirtc.c
  projects/krb5/sys/dev/extres/regulator/regulator.c
  projects/krb5/sys/dev/intel/spi.c
  projects/krb5/sys/dev/ixgbe/if_ixv.c
  projects/krb5/sys/dev/ixgbe/ix_txrx.c
  projects/krb5/sys/dev/mlx5/driver.h
  projects/krb5/sys/dev/mlx5/mlx5_core/mlx5_main.c
  projects/krb5/sys/dev/mlx5/mlx5_en/en.h
  projects/krb5/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c
  projects/krb5/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
  projects/krb5/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c
  projects/krb5/sys/dev/mmc/mmc.c
  projects/krb5/sys/dev/pci/pci_user.c
  projects/krb5/sys/dev/random/randomdev.c
  projects/krb5/sys/dev/sdhci/sdhci.c
  projects/krb5/sys/dev/sdhci/sdhci_fdt.c
  projects/krb5/sys/dev/sdhci/sdhci_xenon.c
  projects/krb5/sys/dev/sound/midi/midi.c
  projects/krb5/sys/dev/usb/input/wmt.c
  projects/krb5/sys/i386/i386/pmap.c
  projects/krb5/sys/kern/imgact_elf.c
  projects/krb5/sys/kern/kern_clock.c
  projects/krb5/sys/kern/kern_clocksource.c
  projects/krb5/sys/kern/kern_thread.c
  projects/krb5/sys/kern/subr_blist.c
  projects/krb5/sys/kern/subr_rtc.c
  projects/krb5/sys/kern/vfs_vnops.c
  projects/krb5/sys/mips/conf/MALTA64EL
  projects/krb5/sys/mips/mips/pmap.c
  projects/krb5/sys/modules/dtb/omap4/Makefile
  projects/krb5/sys/modules/efirt/Makefile
  projects/krb5/sys/modules/sound/driver/csa/Makefile
  projects/krb5/sys/net/iflib.c
  projects/krb5/sys/net/route.h
  projects/krb5/sys/net/vnet.h
  projects/krb5/sys/netinet/in_kdtrace.c
  projects/krb5/sys/netinet/in_pcb.c
  projects/krb5/sys/netinet/in_pcb.h
  projects/krb5/sys/netinet/ip_fastfwd.c
  projects/krb5/sys/netinet/tcp_hpts.c
  projects/krb5/sys/netinet/tcp_stacks/rack.c
  projects/krb5/sys/netinet6/frag6.c
  projects/krb5/sys/netinet6/in6_pcb.c
  projects/krb5/sys/netinet6/ip6_output.c
  projects/krb5/sys/ofed/drivers/infiniband/core/ib_cm.c
  projects/krb5/sys/ofed/drivers/infiniband/core/ib_cma.c
  projects/krb5/sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c
  projects/krb5/sys/ofed/drivers/infiniband/core/ib_uverbs_marshall.c
  projects/krb5/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
  projects/krb5/sys/ofed/include/rdma/ib_addr.h
  projects/krb5/sys/ofed/include/rdma/ib_cm.h
  projects/krb5/sys/powerpc/include/pcb.h
  projects/krb5/sys/powerpc/include/pcpu.h
  projects/krb5/sys/riscv/conf/GENERIC
  projects/krb5/sys/riscv/include/asm.h
  projects/krb5/sys/riscv/include/riscvreg.h
  projects/krb5/sys/riscv/riscv/copyinout.S
  projects/krb5/sys/riscv/riscv/elf_machdep.c
  projects/krb5/sys/riscv/riscv/exception.S
  projects/krb5/sys/riscv/riscv/locore.S
  projects/krb5/sys/riscv/riscv/machdep.c
  projects/krb5/sys/riscv/riscv/pmap.c
  projects/krb5/sys/riscv/riscv/support.S
  projects/krb5/sys/riscv/riscv/vm_machdep.c
  projects/krb5/sys/security/audit/audit_bsm_db.c
  projects/krb5/sys/sys/efi.h
  projects/krb5/sys/sys/param.h
  projects/krb5/sys/sys/pcpu.h
  projects/krb5/sys/sys/systm.h
  projects/krb5/sys/sys/vmmeter.h
  projects/krb5/sys/ufs/ffs/ffs_alloc.c
  projects/krb5/sys/vm/vm_domainset.c
  projects/krb5/sys/vm/vm_domainset.h
  projects/krb5/sys/vm/vm_fault.c
  projects/krb5/sys/vm/vm_glue.c
  projects/krb5/sys/vm/vm_init.c
  projects/krb5/sys/vm/vm_map.c
  projects/krb5/sys/vm/vm_map.h
  projects/krb5/sys/vm/vm_page.c
  projects/krb5/sys/vm/vm_page.h
  projects/krb5/sys/vm/vm_pageout.h
  projects/krb5/sys/vm/vm_phys.c
  projects/krb5/sys/x86/x86/intr_machdep.c
  projects/krb5/tests/sys/netinet/Makefile
  projects/krb5/tools/build/mk/OptionalObsoleteFiles.inc
  projects/krb5/tools/tools/build_option_survey/mkhtml.sh
  projects/krb5/tools/tools/build_option_survey/option_survey.sh
  projects/krb5/usr.bin/bsdcat/Makefile
  projects/krb5/usr.bin/calendar/calendars/calendar.freebsd
  projects/krb5/usr.bin/cpio/Makefile
  projects/krb5/usr.bin/fetch/fetch.c
  projects/krb5/usr.bin/login/Makefile
  projects/krb5/usr.bin/objcopy/Makefile
  projects/krb5/usr.bin/sed/extern.h
  projects/krb5/usr.bin/sed/main.c
  projects/krb5/usr.bin/sed/process.c
  projects/krb5/usr.bin/sed/tests/sed2_test.sh
  projects/krb5/usr.bin/tar/Makefile
  projects/krb5/usr.sbin/bhyveload/bhyveload.c
  projects/krb5/usr.sbin/cpucontrol/amd10h.c
  projects/krb5/usr.sbin/cron/cron/Makefile
  projects/krb5/usr.sbin/efibootmgr/efibootmgr.c
  projects/krb5/usr.sbin/periodic/Makefile
  projects/krb5/usr.sbin/ppp/ppp.conf
  projects/krb5/usr.sbin/services_mkdb/services
Directory Properties:
  projects/krb5/   (props changed)
  projects/krb5/contrib/blacklist/   (props changed)
  projects/krb5/contrib/elftoolchain/   (props changed)
  projects/krb5/contrib/libarchive/   (props changed)
  projects/krb5/contrib/tcpdump/   (props changed)
  projects/krb5/contrib/unbound/   (props changed)
  projects/krb5/crypto/openssh/   (props changed)
  projects/krb5/sys/cddl/contrib/opensolaris/   (props changed)

Modified: projects/krb5/Makefile.inc1
==============================================================================
--- projects/krb5/Makefile.inc1	Thu Sep 13 04:08:48 2018	(r338621)
+++ projects/krb5/Makefile.inc1	Thu Sep 13 06:21:07 2018	(r338622)
@@ -1933,7 +1933,8 @@ update: .PHONY
 # r296685 fix cross-endian objcopy
 # r310724 fixed PR 215350, a crash in libdwarf with objects built by GCC 6.2.
 # r334881 added libdwarf constants used by ctfconvert.
-.if ${BOOTSTRAPPING} < 1200067
+# r338478 fixed a crash in objcopy for mips64el objects
+.if ${BOOTSTRAPPING} < 1200084
 _elftoolchain_libs= lib/libelf lib/libdwarf
 .endif
 

Modified: projects/krb5/UPDATING
==============================================================================
--- projects/krb5/UPDATING	Thu Sep 13 04:08:48 2018	(r338621)
+++ projects/krb5/UPDATING	Thu Sep 13 06:21:07 2018	(r338622)
@@ -36,8 +36,8 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 	supported by its designers since at least 2003. Fortuna has been the
 	default since FreeBSD-11.
 
-20170822:
-	devctl freeze/that have gone into the tree, the rc scripts have been
+20180822:
+	devctl freeze/thaw have gone into the tree, the rc scripts have been
 	updated to use them and devmatch has been changed.  You should update
 	kernel, userland and rc scripts all at the same time.
 

Modified: projects/krb5/bin/csh/Makefile
==============================================================================
--- projects/krb5/bin/csh/Makefile	Thu Sep 13 04:08:48 2018	(r338621)
+++ projects/krb5/bin/csh/Makefile	Thu Sep 13 06:21:07 2018	(r338622)
@@ -10,8 +10,9 @@
 
 CONFGROUPS=	ETC ROOT
 ETC=	csh.cshrc csh.login csh.logout
-ROOT=	dot.login
+ROOT=	dot.cshrc dot.login
 ROOTDIR=	/root
+ROOTNAME_dot.cshrc=	.cshrc
 ROOTNAME_dot.login=	.login
 PACKAGE=runtime
 TCSHDIR= ${SRCTOP}/contrib/tcsh
@@ -152,5 +153,11 @@ tc.const.h: tc.const.c sh.char.h config.h config_f.h s
 	    sed -e 's/Char \([a-zA-Z0-9_]*\)\(.*\)/extern Char \1[];/' | \
 	    sort >> ${.TARGET}
 	@echo '#endif /* _h_tc_const */' >> ${.TARGET}
+
+beforeinstallconfig:
+	rm -f ${DESTDIR}/.cshrc
+
+afterinstallconfig:
+	${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc
 
 .include <bsd.prog.mk>

Copied: projects/krb5/bin/csh/dot.cshrc (from r338620, head/bin/csh/dot.cshrc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/krb5/bin/csh/dot.cshrc	Thu Sep 13 06:21:07 2018	(r338622, copy of r338620, head/bin/csh/dot.cshrc)
@@ -0,0 +1,43 @@
+# $FreeBSD$
+#
+# .cshrc - csh resource script, read at beginning of execution by each shell
+#
+# see also csh(1), environ(7).
+# more examples available at /usr/share/examples/csh/
+#
+
+alias h		history 25
+alias j		jobs -l
+alias la	ls -aF
+alias lf	ls -FA
+alias ll	ls -lAF
+
+# A righteous umask
+umask 22
+
+set path = (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin $HOME/bin)
+
+setenv	EDITOR	vi
+setenv	PAGER	less
+setenv	BLOCKSIZE	K
+
+if ($?prompt) then
+	# An interactive shell -- set some stuff up
+	set prompt = "%N@%m:%~ %# "
+	set promptchars = "%#"
+
+	set filec
+	set history = 1000
+	set savehist = (1000 merge)
+	set autolist = ambiguous
+	# Use history to aid expansion
+	set autoexpand
+	set autorehash
+	set mail = (/var/mail/$USER)
+	if ( $?tcsh ) then
+		bindkey "^W" backward-delete-word
+		bindkey -k up history-search-backward
+		bindkey -k down history-search-forward
+	endif
+
+endif

Modified: projects/krb5/bin/rm/Makefile
==============================================================================
--- projects/krb5/bin/rm/Makefile	Thu Sep 13 04:08:48 2018	(r338621)
+++ projects/krb5/bin/rm/Makefile	Thu Sep 13 06:21:07 2018	(r338622)
@@ -1,10 +1,15 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 PACKAGE=runtime
 PROG=	rm
 
 LINKS=	${BINDIR}/rm ${BINDIR}/unlink
 MLINKS=	rm.1 unlink.1
+
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>

Modified: projects/krb5/bin/rm/rm.1
==============================================================================
--- projects/krb5/bin/rm/rm.1	Thu Sep 13 04:08:48 2018	(r338621)
+++ projects/krb5/bin/rm/rm.1	Thu Sep 13 06:21:07 2018	(r338622)
@@ -32,7 +32,7 @@
 .\"	@(#)rm.1	8.5 (Berkeley) 12/5/94
 .\" $FreeBSD$
 .\"
-.Dd November 7, 2015
+.Dd September 12, 2018
 .Dt RM 1
 .Os
 .Sh NAME
@@ -45,6 +45,7 @@
 .Op Fl dIPRrvWx
 .Ar
 .Nm unlink
+.Op Fl -
 .Ar file
 .Sh DESCRIPTION
 The
@@ -154,6 +155,9 @@ No options may be supplied in this simple mode of oper
 which performs an
 .Xr unlink 2
 operation on the passed argument.
+However, the usual option-end delimiter,
+.Fl - ,
+may optionally precede the argument.
 .Sh EXIT STATUS
 The
 .Nm
@@ -201,11 +205,12 @@ directory hierarchy:
 .Pp
 .Dl $ rm -rf foobar
 .Pp
-Either of these commands will remove the file
+Any of these commands will remove the file
 .Pa -f :
 .Bd -literal -offset indent
 $ rm -- -f
 $ rm ./-f
+$ unlink -f
 .Ed
 .Sh COMPATIBILITY
 The

Modified: projects/krb5/bin/rm/rm.c
==============================================================================
--- projects/krb5/bin/rm/rm.c	Thu Sep 13 04:08:48 2018	(r338621)
+++ projects/krb5/bin/rm/rm.c	Thu Sep 13 06:21:07 2018	(r338622)
@@ -101,13 +101,12 @@ main(int argc, char *argv[])
 	else
 		++p;
 	if (strcmp(p, "unlink") == 0) {
-		while (getopt(argc, argv, "") != -1)
+		if (argc == 2)
+			rm_file(&argv[1]);
+		else if (argc == 3 && strcmp(argv[1], "--") == 0)
+			rm_file(&argv[2]);
+		else
 			usage();
-		argc -= optind;
-		argv += optind;
-		if (argc != 1)
-			usage();
-		rm_file(&argv[0]);
 		exit(eval);
 	}
 
@@ -634,7 +633,7 @@ usage(void)
 
 	(void)fprintf(stderr, "%s\n%s\n",
 	    "usage: rm [-f | -i] [-dIPRrvWx] file ...",
-	    "       unlink file");
+	    "       unlink [--] file");
 	exit(EX_USAGE);
 }
 

Modified: projects/krb5/bin/sh/Makefile
==============================================================================
--- projects/krb5/bin/sh/Makefile	Thu Sep 13 04:08:48 2018	(r338621)
+++ projects/krb5/bin/sh/Makefile	Thu Sep 13 06:21:07 2018	(r338622)
@@ -3,7 +3,9 @@
 
 .include <src.opts.mk>
 
-CONFS=	profile
+CONFS=	dot.profile profile
+CONFSDIR_dot.profile=	/root
+CONFSNAME_dot.profile=	.profile
 PACKAGE=runtime
 PROG=	sh
 INSTALLFLAGS= -S
@@ -60,5 +62,11 @@ token.h: mktokens
 
 HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
+
+beforeinstallconfig:
+	rm -f ${DESTDIR}/.profile
+
+afterinstallconfig:
+	${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.profile ${DESTDIR}/.profile
 
 .include <bsd.prog.mk>

Copied: projects/krb5/bin/sh/dot.profile (from r338620, head/bin/sh/dot.profile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/krb5/bin/sh/dot.profile	Thu Sep 13 06:21:07 2018	(r338622, copy of r338620, head/bin/sh/dot.profile)
@@ -0,0 +1,16 @@
+# $FreeBSD$
+#
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:~/bin
+export PATH
+HOME=/root
+export HOME
+TERM=${TERM:-xterm}
+export TERM
+PAGER=less
+export PAGER
+
+# Query terminal size; useful for serial lines.
+if [ -x /usr/bin/resizewin ] ; then /usr/bin/resizewin -z ; fi
+
+# Uncomment to display a random cookie on each login.
+# if [ -x /usr/bin/fortune ] ; then /usr/bin/fortune -s ; fi

Modified: projects/krb5/bin/sh/expand.c
==============================================================================
--- projects/krb5/bin/sh/expand.c	Thu Sep 13 04:08:48 2018	(r338621)
+++ projects/krb5/bin/sh/expand.c	Thu Sep 13 06:21:07 2018	(r338622)
@@ -896,7 +896,7 @@ reprocess(int startloc, int flag, int subtype, int quo
 
 	startp = stackblock() + startloc;
 	len = expdest - startp;
-	if (len >= SIZE_MAX / 2)
+	if (len >= SIZE_MAX / 2 || len > PTRDIFF_MAX)
 		abort();
 	INTOFF;
 	if (len >= buflen) {
@@ -912,7 +912,7 @@ reprocess(int startloc, int flag, int subtype, int quo
 	INTON;
 	memcpy(buf, startp, len);
 	buf[len] = '\0';
-	STADJUST(-len, expdest);
+	STADJUST(-(ptrdiff_t)len, expdest);
 	for (zpos = 0;;) {
 		zlen = strlen(buf + zpos);
 		strtodest(buf + zpos, flag, subtype, quoted, dst);

Modified: projects/krb5/contrib/elftoolchain/elfcopy/main.c
==============================================================================
--- projects/krb5/contrib/elftoolchain/elfcopy/main.c	Thu Sep 13 04:08:48 2018	(r338621)
+++ projects/krb5/contrib/elftoolchain/elfcopy/main.c	Thu Sep 13 06:21:07 2018	(r338622)
@@ -372,6 +372,14 @@ create_elf(struct elfcopy *ecp)
 		create_symtab(ecp);
 
 	/*
+	 * Write the underlying ehdr. Note that it should be called
+	 * before elf_setshstrndx() since it will overwrite e->e_shstrndx.
+	 */
+	if (gelf_update_ehdr(ecp->eout, &oeh) == 0)
+		errx(EXIT_FAILURE, "gelf_update_ehdr() failed: %s",
+		    elf_errmsg(-1));
+
+	/*
 	 * First processing of output sections: at this stage we copy the
 	 * content of each section from input to output object.  Section
 	 * content will be modified and printed (mcs) if need. Also content of
@@ -379,14 +387,6 @@ create_elf(struct elfcopy *ecp)
 	 * to symbol table changes.
 	 */
 	copy_content(ecp);
-
-	/*
-	 * Write the underlying ehdr. Note that it should be called
-	 * before elf_setshstrndx() since it will overwrite e->e_shstrndx.
-	 */
-	if (gelf_update_ehdr(ecp->eout, &oeh) == 0)
-		errx(EXIT_FAILURE, "gelf_update_ehdr() failed: %s",
-		    elf_errmsg(-1));
 
 	/* Generate section name string table (.shstrtab). */
 	set_shstrtab(ecp);

Modified: projects/krb5/contrib/elftoolchain/libelf/Makefile
==============================================================================
--- projects/krb5/contrib/elftoolchain/libelf/Makefile	Thu Sep 13 04:08:48 2018	(r338621)
+++ projects/krb5/contrib/elftoolchain/libelf/Makefile	Thu Sep 13 06:21:07 2018	(r338622)
@@ -35,6 +35,7 @@ SRCS=	elf.c							\
 	gelf_ehdr.c						\
 	gelf_getclass.c						\
 	gelf_fsize.c						\
+	gelf_mips64el.c						\
 	gelf_move.c						\
 	gelf_phdr.c						\
 	gelf_rel.c						\

Modified: projects/krb5/contrib/elftoolchain/libelf/_libelf.h
==============================================================================
--- projects/krb5/contrib/elftoolchain/libelf/_libelf.h	Thu Sep 13 04:08:48 2018	(r338621)
+++ projects/krb5/contrib/elftoolchain/libelf/_libelf.h	Thu Sep 13 06:21:07 2018	(r338622)
@@ -216,12 +216,15 @@ int	(*_libelf_get_translator(Elf_Type _t, int _directi
 void	*_libelf_getphdr(Elf *_e, int _elfclass);
 void	*_libelf_getshdr(Elf_Scn *_scn, int _elfclass);
 void	_libelf_init_elf(Elf *_e, Elf_Kind _kind);
+int	_libelf_is_mips64el(Elf *e);
 int	_libelf_load_section_headers(Elf *e, void *ehdr);
 unsigned int _libelf_malign(Elf_Type _t, int _elfclass);
 Elf	*_libelf_memory(unsigned char *_image, size_t _sz, int _reporterror);
 size_t	_libelf_msize(Elf_Type _t, int _elfclass, unsigned int _version);
 void	*_libelf_newphdr(Elf *_e, int _elfclass, size_t _count);
 Elf	*_libelf_open_object(int _fd, Elf_Cmd _c, int _reporterror);
+Elf64_Xword _libelf_mips64el_r_info_tof(Elf64_Xword r_info);
+Elf64_Xword _libelf_mips64el_r_info_tom(Elf64_Xword r_info);
 struct _Libelf_Data *_libelf_release_data(struct _Libelf_Data *_d);
 Elf	*_libelf_release_elf(Elf *_e);
 Elf_Scn	*_libelf_release_scn(Elf_Scn *_s);

Copied: projects/krb5/contrib/elftoolchain/libelf/gelf_mips64el.c (from r338620, head/contrib/elftoolchain/libelf/gelf_mips64el.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/krb5/contrib/elftoolchain/libelf/gelf_mips64el.c	Thu Sep 13 06:21:07 2018	(r338622, copy of r338620, head/contrib/elftoolchain/libelf/gelf_mips64el.c)
@@ -0,0 +1,81 @@
+/*-
+ * Copyright (c) 2018 John Baldwin
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <gelf.h>
+
+#include "_libelf.h"
+
+ELFTC_VCSID("$Id$");
+
+int
+_libelf_is_mips64el(Elf *e)
+{
+
+	return (e->e_kind == ELF_K_ELF && e->e_byteorder == ELFDATA2LSB &&
+	    e->e_u.e_elf.e_ehdr.e_ehdr64->e_machine == EM_MIPS);
+}
+
+/*
+ * For MIPS64, the r_info field is actually stored as a 32-bit symbol
+ * index (r_sym) followed by four single-byte fields (r_ssym, r_type3,
+ * r_type2, and r_type).  The byte-swap for the little-endian case
+ * jumbles this incorrectly so compensate.
+ */
+Elf64_Xword
+_libelf_mips64el_r_info_tof(Elf64_Xword r_info)
+{
+	Elf64_Xword new_info;
+	uint8_t ssym, type3, type2, type;
+
+	ssym = r_info >> 24;
+	type3 = r_info >> 16;
+	type2 = r_info >> 8;
+	type = r_info;
+	new_info = r_info >> 32;
+	new_info |= (Elf64_Xword)ssym << 32;
+	new_info |= (Elf64_Xword)type3 << 40;
+	new_info |= (Elf64_Xword)type2 << 48;
+	new_info |= (Elf64_Xword)type << 56;
+	return (new_info);
+}
+
+Elf64_Xword
+_libelf_mips64el_r_info_tom(Elf64_Xword r_info)
+{
+	Elf64_Xword new_info;
+	uint8_t ssym, type3, type2, type;
+
+	ssym = r_info >> 32;
+	type3 = r_info >> 40;
+	type2 = r_info >> 48;
+	type = r_info >> 56;
+	new_info = (r_info & 0xffffffff) << 32;
+	new_info |= (Elf64_Xword)ssym << 24;
+	new_info |= (Elf64_Xword)type3 << 16;
+	new_info |= (Elf64_Xword)type2 << 8;
+	new_info |= (Elf64_Xword)type;
+	return (new_info);
+}

Modified: projects/krb5/contrib/elftoolchain/libelf/gelf_rel.c
==============================================================================
--- projects/krb5/contrib/elftoolchain/libelf/gelf_rel.c	Thu Sep 13 04:08:48 2018	(r338621)
+++ projects/krb5/contrib/elftoolchain/libelf/gelf_rel.c	Thu Sep 13 06:21:07 2018	(r338622)
@@ -90,6 +90,9 @@ gelf_getrel(Elf_Data *ed, int ndx, GElf_Rel *dst)
 		rel64 = (Elf64_Rel *) d->d_data.d_buf + ndx;
 
 		*dst = *rel64;
+
+		if (_libelf_is_mips64el(e))
+			dst->r_info = _libelf_mips64el_r_info_tom(rel64->r_info);
 	}
 
 	return (dst);
@@ -156,6 +159,9 @@ gelf_update_rel(Elf_Data *ed, int ndx, GElf_Rel *dr)
 		rel64 = (Elf64_Rel *) d->d_data.d_buf + ndx;
 
 		*rel64 = *dr;
+
+		if (_libelf_is_mips64el(e))
+			rel64->r_info = _libelf_mips64el_r_info_tof(dr->r_info);
 	}
 
 	return (1);

Modified: projects/krb5/contrib/elftoolchain/libelf/gelf_rela.c
==============================================================================
--- projects/krb5/contrib/elftoolchain/libelf/gelf_rela.c	Thu Sep 13 04:08:48 2018	(r338621)
+++ projects/krb5/contrib/elftoolchain/libelf/gelf_rela.c	Thu Sep 13 06:21:07 2018	(r338622)
@@ -91,6 +91,10 @@ gelf_getrela(Elf_Data *ed, int ndx, GElf_Rela *dst)
 		rela64 = (Elf64_Rela *) d->d_data.d_buf + ndx;
 
 		*dst = *rela64;
+
+		if (_libelf_is_mips64el(e))
+			dst->r_info =
+			    _libelf_mips64el_r_info_tom(rela64->r_info);
 	}
 
 	return (dst);
@@ -159,6 +163,9 @@ gelf_update_rela(Elf_Data *ed, int ndx, GElf_Rela *dr)
 		rela64 = (Elf64_Rela *) d->d_data.d_buf + ndx;
 
 		*rela64 = *dr;
+
+		if (_libelf_is_mips64el(e))
+			rela64->r_info = _libelf_mips64el_r_info_tof(dr->r_info);
 	}
 
 	return (1);

Modified: projects/krb5/contrib/libarchive/NEWS
==============================================================================
--- projects/krb5/contrib/libarchive/NEWS	Thu Sep 13 04:08:48 2018	(r338621)
+++ projects/krb5/contrib/libarchive/NEWS	Thu Sep 13 06:21:07 2018	(r338622)
@@ -1,3 +1,13 @@
+Sep 03, 2018: libarchive 3.3.3 released
+
+Jul 19, 2018: Avoid super-linear slowdown on malformed mtree files
+
+Jan 27, 2018: Many fixes for building with Visual Studio
+
+Oct 19, 2017: NO_OVERWRITE doesn't change existing directory attributes
+
+Aug 12, 2017: New support for Zstandard read and write filters
+
 Jul 09, 2017: libarchive 3.3.2 released
 
 Mar 16, 2017: NFSv4 ACL support for Linux (librichacl)

Modified: projects/krb5/contrib/libarchive/README.md
==============================================================================
--- projects/krb5/contrib/libarchive/README.md	Thu Sep 13 04:08:48 2018	(r338621)
+++ projects/krb5/contrib/libarchive/README.md	Thu Sep 13 06:21:07 2018	(r338622)
@@ -99,6 +99,7 @@ The library also detects and handles any of the follow
   * lzma, lzip, and xz compression
   * lz4 compression
   * lzop compression
+  * zstandard compression
 
 The library can create archives in any of the following formats:
   * POSIX ustar
@@ -125,6 +126,7 @@ When creating archives, the result can be filtered wit
   * lzma, lzip, and xz compression
   * lz4 compression
   * lzop compression
+  * zstandard compression
 
 ## Notes about the Library Design
 
@@ -159,7 +161,7 @@ questions we are asked about libarchive:
 
 * On read, compression and format are always detected automatically.
 
-* The same API is used for all formats; in particular, it's very
+* The same API is used for all formats; it should be very
   easy for software using libarchive to transparently handle
   any of libarchive's archiving formats.
 

Modified: projects/krb5/contrib/libarchive/cpio/test/test_basic.c
==============================================================================
--- projects/krb5/contrib/libarchive/cpio/test/test_basic.c	Thu Sep 13 04:08:48 2018	(r338621)
+++ projects/krb5/contrib/libarchive/cpio/test/test_basic.c	Thu Sep 13 06:21:07 2018	(r338622)
@@ -144,49 +144,79 @@ DEFINE_TEST(test_basic)
 	/* File with 10 bytes content. */
 	assertMakeFile("file", 0644, "1234567890");
 	fprintf(filelist, "file\n");
-	if (is_LargeInode("file"))
+	if (is_LargeInode("file")) {
 		strncat(result,
-		    "bsdcpio: file: large inode number truncated: "
-		    "Numerical result out of range\n",
+		    "bsdcpio: file: large inode number truncated: ",
 		    sizeof(result) - strlen(result) -1);
+		strncat(result,
+		    strerror(ERANGE),
+		    sizeof(result) - strlen(result) -1);
+		strncat(result,
+		    "\n",
+		    sizeof(result) - strlen(result) -1);
+	}
 
 	/* hardlink to above file. */
 	assertMakeHardlink("linkfile", "file");
 	fprintf(filelist, "linkfile\n");
-	if (is_LargeInode("linkfile"))
+	if (is_LargeInode("linkfile")) {
 		strncat(result,
-		    "bsdcpio: linkfile: large inode number truncated: "
-		    "Numerical result out of range\n",
+		    "bsdcpio: linkfile: large inode number truncated: ",
 		    sizeof(result) - strlen(result) -1);
+		strncat(result,
+		    strerror(ERANGE),
+		    sizeof(result) - strlen(result) -1);
+		strncat(result,
+		    "\n",
+		    sizeof(result) - strlen(result) -1);
+	}
 
 	/* Symlink to above file. */
 	if (canSymlink()) {
 		assertMakeSymlink("symlink", "file");
 		fprintf(filelist, "symlink\n");
-		if (is_LargeInode("symlink"))
+		if (is_LargeInode("symlink")) {
 			strncat(result,
-			    "bsdcpio: symlink: large inode number truncated: "
-				"Numerical result out of range\n",
+			    "bsdcpio: symlink: large inode number truncated: ",
 			    sizeof(result) - strlen(result) -1);
+			strncat(result,
+			    strerror(ERANGE),
+			    sizeof(result) - strlen(result) -1);
+			strncat(result,
+			    "\n",
+			    sizeof(result) - strlen(result) -1);
+		}
 	}
 
 	/* Another file with different permissions. */
 	assertMakeFile("file2", 0777, "1234567890");
 	fprintf(filelist, "file2\n");
-	if (is_LargeInode("file2"))
+	if (is_LargeInode("file2")) {
 		strncat(result,
-		    "bsdcpio: file2: large inode number truncated: "
-		    "Numerical result out of range\n",
+		    "bsdcpio: file2: large inode number truncated: ",
 		    sizeof(result) - strlen(result) -1);
+		strncat(result,
+		    strerror(ERANGE),
+		    sizeof(result) - strlen(result) -1);
+		strncat(result,
+		    "\n",
+		    sizeof(result) - strlen(result) -1);
+	}
 
 	/* Directory. */
 	assertMakeDir("dir", 0775);
 	fprintf(filelist, "dir\n");
-	if (is_LargeInode("dir"))
+	if (is_LargeInode("dir")) {
 		strncat(result,
-		    "bsdcpio: dir: large inode number truncated: "
-		    "Numerical result out of range\n",
+		    "bsdcpio: dir: large inode number truncated: ",
 		    sizeof(result) - strlen(result) -1);
+		strncat(result,
+		    strerror(ERANGE),
+		    sizeof(result) - strlen(result) -1);
+		strncat(result,
+		    "\n",
+		    sizeof(result) - strlen(result) -1);
+	}
 	strncat(result, "2 blocks\n", sizeof(result) - strlen(result) -1);
 
 	/* All done. */

Modified: projects/krb5/contrib/libarchive/cpio/test/test_format_newc.c
==============================================================================
--- projects/krb5/contrib/libarchive/cpio/test/test_format_newc.c	Thu Sep 13 04:08:48 2018	(r338621)
+++ projects/krb5/contrib/libarchive/cpio/test/test_format_newc.c	Thu Sep 13 06:21:07 2018	(r338622)
@@ -124,26 +124,42 @@ DEFINE_TEST(test_format_newc)
 
 	/* Setup result message. */
 	memset(result, 0, sizeof(result));
-	if (is_LargeInode("file1"))
+	if (is_LargeInode("file1")) {
 		strncat(result,
-		    "bsdcpio: file1: large inode number truncated: "
-		    "Numerical result out of range\n",
+		    "bsdcpio: file1: large inode number truncated: ",
 		    sizeof(result) - strlen(result) -1);
-	if (canSymlink() && is_LargeInode("symlink"))
+		strncat(result, strerror(ERANGE),
+		    sizeof(result) - strlen(result) -1);
+		strncat(result, "\n",
+		    sizeof(result) - strlen(result) -1);
+	}
+	if (canSymlink() && is_LargeInode("symlink")) {
 		strncat(result,
-		    "bsdcpio: symlink: large inode number truncated: "
-			"Numerical result out of range\n",
+		    "bsdcpio: symlink: large inode number truncated: ",
 		    sizeof(result) - strlen(result) -1);
-	if (is_LargeInode("dir"))
+		strncat(result, strerror(ERANGE),
+		    sizeof(result) - strlen(result) -1);
+		strncat(result, "\n",
+		    sizeof(result) - strlen(result) -1);
+	}
+	if (is_LargeInode("dir")) {
 		strncat(result,
-		    "bsdcpio: dir: large inode number truncated: "
-		    "Numerical result out of range\n",
+		    "bsdcpio: dir: large inode number truncated: ",
 		    sizeof(result) - strlen(result) -1);
-	if (is_LargeInode("hardlink"))
+		strncat(result, strerror(ERANGE),
+		    sizeof(result) - strlen(result) -1);
+		strncat(result, "\n",
+		    sizeof(result) - strlen(result) -1);
+	}
+	if (is_LargeInode("hardlink")) {
 		strncat(result,
-		    "bsdcpio: hardlink: large inode number truncated: "
-		    "Numerical result out of range\n",
+		    "bsdcpio: hardlink: large inode number truncated: ",
 		    sizeof(result) - strlen(result) -1);
+		strncat(result, strerror(ERANGE),
+		    sizeof(result) - strlen(result) -1);
+		strncat(result, "\n",
+		    sizeof(result) - strlen(result) -1);
+	}
 
 	/* Record some facts about what we just created: */
 	now = time(NULL); /* They were all created w/in last two seconds. */

Modified: projects/krb5/contrib/libarchive/libarchive/archive.h
==============================================================================
--- projects/krb5/contrib/libarchive/libarchive/archive.h	Thu Sep 13 04:08:48 2018	(r338621)
+++ projects/krb5/contrib/libarchive/libarchive/archive.h	Thu Sep 13 06:21:07 2018	(r338622)
@@ -36,7 +36,7 @@
  * assert that ARCHIVE_VERSION_NUMBER >= 2012108.
  */
 /* Note: Compiler will complain if this does not match archive_entry.h! */
-#define	ARCHIVE_VERSION_NUMBER 3003002
+#define	ARCHIVE_VERSION_NUMBER 3003003
 
 #include <sys/stat.h>
 #include <stddef.h>  /* for wchar_t */
@@ -155,7 +155,7 @@ __LA_DECL int		archive_version_number(void);
 /*
  * Textual name/version of the library, useful for version displays.
  */
-#define	ARCHIVE_VERSION_ONLY_STRING "3.3.2"
+#define	ARCHIVE_VERSION_ONLY_STRING "3.3.3"
 #define	ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING
 __LA_DECL const char *	archive_version_string(void);
 

Modified: projects/krb5/contrib/libarchive/libarchive/archive_cryptor.c
==============================================================================
--- projects/krb5/contrib/libarchive/libarchive/archive_cryptor.c	Thu Sep 13 04:08:48 2018	(r338621)
+++ projects/krb5/contrib/libarchive/libarchive/archive_cryptor.c	Thu Sep 13 06:21:07 2018	(r338622)
@@ -153,7 +153,7 @@ aes_ctr_encrypt_counter(archive_crypto_ctx *ctx)
 	CCCryptorStatus r;
 
 	r = CCCryptorReset(ref, NULL);
-	if (r != kCCSuccess)
+	if (r != kCCSuccess && r != kCCUnimplemented)
 		return -1;
 	r = CCCryptorUpdate(ref, ctx->nonce, AES_BLOCK_SIZE, ctx->encr_buf,
 	    AES_BLOCK_SIZE, NULL);

Modified: projects/krb5/contrib/libarchive/libarchive/archive_entry.h
==============================================================================
--- projects/krb5/contrib/libarchive/libarchive/archive_entry.h	Thu Sep 13 04:08:48 2018	(r338621)
+++ projects/krb5/contrib/libarchive/libarchive/archive_entry.h	Thu Sep 13 06:21:07 2018	(r338622)
@@ -30,7 +30,7 @@
 #define	ARCHIVE_ENTRY_H_INCLUDED
 
 /* Note: Compiler will complain if this does not match archive.h! */
-#define	ARCHIVE_VERSION_NUMBER 3003002
+#define	ARCHIVE_VERSION_NUMBER 3003003
 
 /*
  * Note: archive_entry.h is for use outside of libarchive; the

Modified: projects/krb5/contrib/libarchive/libarchive/archive_pack_dev.c
==============================================================================
--- projects/krb5/contrib/libarchive/libarchive/archive_pack_dev.c	Thu Sep 13 04:08:48 2018	(r338621)
+++ projects/krb5/contrib/libarchive/libarchive/archive_pack_dev.c	Thu Sep 13 06:21:07 2018	(r338622)
@@ -57,6 +57,9 @@ __RCSID("$NetBSD$");
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
+#ifdef HAVE_SYS_SYSMACROS_H
+#include <sys/sysmacros.h>
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

Modified: projects/krb5/contrib/tcpdump/tcpdump.c
==============================================================================
--- projects/krb5/contrib/tcpdump/tcpdump.c	Thu Sep 13 04:08:48 2018	(r338621)
+++ projects/krb5/contrib/tcpdump/tcpdump.c	Thu Sep 13 06:21:07 2018	(r338622)
@@ -2069,6 +2069,9 @@ main(int argc, char **argv)
 #else
 	cansandbox = (cansandbox && ndo->ndo_nflag);
 #endif	/* HAVE_CASPER */
+	cansandbox = (cansandbox && (pcap_fileno(pd) != -1 ||
+	    RFileName != NULL));
+
 	if (cansandbox && cap_enter() < 0 && errno != ENOSYS)
 		error("unable to enter the capability mode");
 #endif	/* HAVE_CAPSICUM */

Modified: projects/krb5/contrib/unbound/Makefile.in
==============================================================================
--- projects/krb5/contrib/unbound/Makefile.in	Thu Sep 13 04:08:48 2018	(r338621)
+++ projects/krb5/contrib/unbound/Makefile.in	Thu Sep 13 06:21:07 2018	(r338622)
@@ -327,7 +327,7 @@ unbound-control$(EXEEXT):	$(CONTROL_OBJ_LINK) libunbou
 	$(LINK) -o $@ $(CONTROL_OBJ_LINK) $(EXTRALINK) $(SSLLIB) $(LIBS)
 
 unbound-host$(EXEEXT):	$(HOST_OBJ_LINK) libunbound.la
-	$(LINK) -o $@ $(HOST_OBJ_LINK) -L. -L.libs -lunbound $(LIBS)
+	$(LINK) -o $@ $(HOST_OBJ_LINK) -L. -L.libs -lunbound $(SSLLIB) $(LIBS)
 
 unbound-anchor$(EXEEXT):	$(UBANCHOR_OBJ_LINK) libunbound.la
 	$(LINK) -o $@ $(UBANCHOR_OBJ_LINK) -L. -L.libs -lunbound -lexpat $(SSLLIB) $(LIBS)
@@ -360,7 +360,7 @@ memstats$(EXEEXT):	$(MEMSTATS_OBJ_LINK)
 	$(LINK) -o $@ $(MEMSTATS_OBJ_LINK) $(SSLLIB) $(LIBS)
 
 asynclook$(EXEEXT):	$(ASYNCLOOK_OBJ_LINK) libunbound.la
-	$(LINK) -o $@ $(ASYNCLOOK_OBJ_LINK) $(LIBS) -L. -L.libs -lunbound
+	$(LINK) -o $@ $(ASYNCLOOK_OBJ_LINK) -L. -L.libs -lunbound $(SSLLIB) $(LIBS)
 
 streamtcp$(EXEEXT):	$(STREAMTCP_OBJ_LINK)
 	$(LINK) -o $@ $(STREAMTCP_OBJ_LINK) $(SSLLIB) $(LIBS)
@@ -858,10 +858,11 @@ fptr_wlist.lo fptr_wlist.o: $(srcdir)/util/fptr_wlist.
  $(srcdir)/validator/val_utils.h $(srcdir)/validator/val_anchor.h $(srcdir)/validator/val_nsec3.h \
  $(srcdir)/validator/val_sigcrypt.h $(srcdir)/validator/val_kentry.h $(srcdir)/validator/val_neg.h \
  $(srcdir)/validator/autotrust.h $(srcdir)/libunbound/libworker.h $(srcdir)/libunbound/context.h \
- $(srcdir)/util/alloc.h $(srcdir)/libunbound/unbound.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \
- $(srcdir)/util/config_file.h $(srcdir)/respip/respip.h $(PYTHONMOD_HEADER) \
- $(srcdir)/cachedb/cachedb.h $(srcdir)/ipsecmod/ipsecmod.h $(srcdir)/edns-subnet/subnetmod.h \
- $(srcdir)/util/net_help.h $(srcdir)/edns-subnet/addrtree.h $(srcdir)/edns-subnet/edns-subnet.h
+ $(srcdir)/util/alloc.h $(srcdir)/libunbound/unbound.h $(srcdir)/libunbound/unbound-event.h \
+ $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h $(srcdir)/respip/respip.h \
+ $(PYTHONMOD_HEADER) $(srcdir)/cachedb/cachedb.h $(srcdir)/ipsecmod/ipsecmod.h \
+ $(srcdir)/edns-subnet/subnetmod.h $(srcdir)/util/net_help.h $(srcdir)/edns-subnet/addrtree.h \
+ $(srcdir)/edns-subnet/edns-subnet.h
 locks.lo locks.o: $(srcdir)/util/locks.c config.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
  $(srcdir)/testcode/checklocks.h
 log.lo log.o: $(srcdir)/util/log.c config.h $(srcdir)/util/log.h $(srcdir)/util/locks.h $(srcdir)/testcode/checklocks.h \
@@ -1257,8 +1258,8 @@ worker.lo worker.o: $(srcdir)/daemon/worker.c config.h
  $(srcdir)/services/localzone.h $(srcdir)/util/data/msgencode.h $(srcdir)/util/data/dname.h \
  $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h \
  $(srcdir)/validator/autotrust.h $(srcdir)/validator/val_anchor.h $(srcdir)/respip/respip.h \
- $(srcdir)/libunbound/context.h $(srcdir)/libunbound/libworker.h $(srcdir)/sldns/wire2str.h \
- $(srcdir)/util/shm_side/shm_main.h
+ $(srcdir)/libunbound/context.h $(srcdir)/libunbound/unbound-event.h $(srcdir)/libunbound/libworker.h \
+ $(srcdir)/sldns/wire2str.h $(srcdir)/util/shm_side/shm_main.h
 testbound.lo testbound.o: $(srcdir)/testcode/testbound.c config.h $(srcdir)/testcode/testpkts.h \
  $(srcdir)/testcode/replay.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \
   $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
@@ -1291,8 +1292,8 @@ worker.lo worker.o: $(srcdir)/daemon/worker.c config.h
  $(srcdir)/services/localzone.h $(srcdir)/util/data/msgencode.h $(srcdir)/util/data/dname.h \
  $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h \
  $(srcdir)/validator/autotrust.h $(srcdir)/validator/val_anchor.h $(srcdir)/respip/respip.h \
- $(srcdir)/libunbound/context.h $(srcdir)/libunbound/libworker.h $(srcdir)/sldns/wire2str.h \
- $(srcdir)/util/shm_side/shm_main.h
+ $(srcdir)/libunbound/context.h $(srcdir)/libunbound/unbound-event.h $(srcdir)/libunbound/libworker.h \
+ $(srcdir)/sldns/wire2str.h $(srcdir)/util/shm_side/shm_main.h
 acl_list.lo acl_list.o: $(srcdir)/daemon/acl_list.c config.h $(srcdir)/daemon/acl_list.h \
  $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/services/view.h $(srcdir)/util/locks.h \
  $(srcdir)/util/log.h $(srcdir)/testcode/checklocks.h $(srcdir)/util/regional.h $(srcdir)/util/config_file.h \
@@ -1375,22 +1376,22 @@ unbound-checkconf.lo unbound-checkconf.o: $(srcdir)/sm
  $(PYTHONMOD_HEADER) $(srcdir)/edns-subnet/subnet-whitelist.h
 worker_cb.lo worker_cb.o: $(srcdir)/smallapp/worker_cb.c config.h $(srcdir)/libunbound/context.h \
  $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/testcode/checklocks.h $(srcdir)/util/alloc.h $(srcdir)/util/rbtree.h \
- $(srcdir)/services/modstack.h $(srcdir)/libunbound/unbound.h $(srcdir)/util/data/packed_rrset.h \
- $(srcdir)/util/storage/lruhash.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \
- $(srcdir)/util/fptr_wlist.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \
+ $(srcdir)/services/modstack.h $(srcdir)/libunbound/unbound.h $(srcdir)/libunbound/unbound-event.h \
+ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/libunbound/worker.h \
+ $(srcdir)/sldns/sbuffer.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \
   $(srcdir)/dnscrypt/cert.h $(srcdir)/util/module.h \
  $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \
  $(srcdir)/util/tube.h $(srcdir)/services/mesh.h
 context.lo context.o: $(srcdir)/libunbound/context.c config.h $(srcdir)/libunbound/context.h \
  $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/testcode/checklocks.h $(srcdir)/util/alloc.h $(srcdir)/util/rbtree.h \
- $(srcdir)/services/modstack.h $(srcdir)/libunbound/unbound.h $(srcdir)/util/data/packed_rrset.h \
- $(srcdir)/util/storage/lruhash.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \
- $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/config_file.h \
- $(srcdir)/util/net_help.h $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h \
- $(srcdir)/services/view.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h \
- $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \
-  $(srcdir)/dnscrypt/cert.h $(srcdir)/services/authzone.h \
- $(srcdir)/services/mesh.h $(srcdir)/sldns/sbuffer.h
+ $(srcdir)/services/modstack.h $(srcdir)/libunbound/unbound.h $(srcdir)/libunbound/unbound-event.h \
+ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/module.h \
+ $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \
+ $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h $(srcdir)/services/localzone.h \
+ $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h $(srcdir)/services/cache/rrset.h \
+ $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h \
+ $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h  \
+ $(srcdir)/dnscrypt/cert.h $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h $(srcdir)/sldns/sbuffer.h
 libunbound.lo libunbound.o: $(srcdir)/libunbound/libunbound.c $(srcdir)/libunbound/unbound.h \
  $(srcdir)/libunbound/unbound-event.h config.h $(srcdir)/libunbound/context.h $(srcdir)/util/locks.h \
  $(srcdir)/util/log.h $(srcdir)/testcode/checklocks.h $(srcdir)/util/alloc.h $(srcdir)/util/rbtree.h \
@@ -1407,7 +1408,7 @@ libworker.lo libworker.o: $(srcdir)/libunbound/libwork
  $(srcdir)/libunbound/libworker.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \
  $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/testcode/checklocks.h $(srcdir)/libunbound/context.h \
  $(srcdir)/util/alloc.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h $(srcdir)/libunbound/unbound.h \
- $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h $(srcdir)/libunbound/unbound-event.h \
+ $(srcdir)/libunbound/unbound-event.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \
  $(srcdir)/services/outside_network.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \
   $(srcdir)/dnscrypt/cert.h  \
  $(srcdir)/services/mesh.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \
@@ -1419,11 +1420,14 @@ libworker.lo libworker.o: $(srcdir)/libunbound/libwork
  $(srcdir)/util/data/dname.h $(srcdir)/util/data/msgencode.h $(srcdir)/iterator/iter_fwd.h \
  $(srcdir)/iterator/iter_hints.h $(srcdir)/sldns/str2wire.h
 unbound-host.lo unbound-host.o: $(srcdir)/smallapp/unbound-host.c config.h $(srcdir)/libunbound/unbound.h \
- $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/wire2str.h
+ $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/wire2str.h \
+ 
 asynclook.lo asynclook.o: $(srcdir)/testcode/asynclook.c config.h $(srcdir)/libunbound/unbound.h \
  $(srcdir)/libunbound/context.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/testcode/checklocks.h \
- $(srcdir)/util/alloc.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h $(srcdir)/util/data/packed_rrset.h \
- $(srcdir)/util/storage/lruhash.h $(srcdir)/sldns/rrdef.h
+ $(srcdir)/util/alloc.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h \
+ $(srcdir)/libunbound/unbound-event.h $(srcdir)/util/data/packed_rrset.h \
+ $(srcdir)/util/storage/lruhash.h $(srcdir)/sldns/rrdef.h \
+ 
 streamtcp.lo streamtcp.o: $(srcdir)/testcode/streamtcp.c config.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
  $(srcdir)/testcode/checklocks.h $(srcdir)/util/net_help.h $(srcdir)/util/data/msgencode.h \
  $(srcdir)/util/data/msgparse.h $(srcdir)/util/storage/lruhash.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \
@@ -1463,7 +1467,7 @@ win_svc.lo win_svc.o: $(srcdir)/winrc/win_svc.c config
  $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h \
  $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h \
  $(srcdir)/daemon/remote.h \
- $(srcdir)/util/config_file.h $(srcdir)/util/ub_event.h
+ $(srcdir)/util/config_file.h $(srcdir)/util/ub_event.h $(srcdir)/util/net_help.h
 w_inst.lo w_inst.o: $(srcdir)/winrc/w_inst.c config.h $(srcdir)/winrc/w_inst.h $(srcdir)/winrc/win_svc.h
 unbound-service-install.lo unbound-service-install.o: $(srcdir)/winrc/unbound-service-install.c config.h \
  $(srcdir)/winrc/w_inst.h

Modified: projects/krb5/contrib/unbound/compat/arc4random.c
==============================================================================
--- projects/krb5/contrib/unbound/compat/arc4random.c	Thu Sep 13 04:08:48 2018	(r338621)
+++ projects/krb5/contrib/unbound/compat/arc4random.c	Thu Sep 13 06:21:07 2018	(r338622)
@@ -71,6 +71,72 @@ static struct {
 
 static inline void _rs_rekey(u_char *dat, size_t datlen);
 
+/*
+ * Basic sanity checking; wish we could do better.
+ */
+static int
+fallback_gotdata(char *buf, size_t len)
+{
+	char	any_set = 0;
+	size_t	i;
+
+	for (i = 0; i < len; ++i)
+		any_set |= buf[i];
+	if (any_set == 0)
+		return -1;
+	return 0;
+}
+
+/* fallback for getentropy in case libc returns failure */
+static int
+fallback_getentropy_urandom(void *buf, size_t len)
+{
+	size_t i;
+	int fd, flags;
+	int save_errno = errno;
+
+start:
+
+	flags = O_RDONLY;
+#ifdef O_NOFOLLOW
+	flags |= O_NOFOLLOW;
+#endif
+#ifdef O_CLOEXEC
+	flags |= O_CLOEXEC;
+#endif
+	fd = open("/dev/urandom", flags, 0);
+	if (fd == -1) {
+		if (errno == EINTR)
+			goto start;
+		goto nodevrandom;
+	}
+#ifndef O_CLOEXEC
+#  ifdef HAVE_FCNTL
+	fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
+#  endif
+#endif
+	for (i = 0; i < len; ) {
+		size_t wanted = len - i;
+		ssize_t ret = read(fd, (char*)buf + i, wanted);
+
+		if (ret == -1) {
+			if (errno == EAGAIN || errno == EINTR)
+				continue;
+			close(fd);
+			goto nodevrandom;
+		}
+		i += ret;
+	}
+	close(fd);
+	if (fallback_gotdata(buf, len) == 0) {
+		errno = save_errno;
+		return 0;		/* satisfied */
+	}
+nodevrandom:
+	errno = EIO;
+	return -1;
+}
+
 static inline void
 _rs_init(u_char *buf, size_t n)
 {
@@ -114,11 +180,14 @@ _rs_stir(void)
 	u_char rnd[KEYSZ + IVSZ];
 
 	if (getentropy(rnd, sizeof rnd) == -1) {
+		if(errno != ENOSYS ||
+			fallback_getentropy_urandom(rnd, sizeof rnd) == -1) {
 #ifdef SIGKILL
-		raise(SIGKILL);
+			raise(SIGKILL);
 #else
-		exit(9); /* windows */
+			exit(9); /* windows */
 #endif
+		}
 	}
 
 	if (!rs)

Modified: projects/krb5/contrib/unbound/config.h
==============================================================================
--- projects/krb5/contrib/unbound/config.h	Thu Sep 13 04:08:48 2018	(r338621)
+++ projects/krb5/contrib/unbound/config.h	Thu Sep 13 06:21:07 2018	(r338622)
@@ -31,6 +31,9 @@
    internal symbols */
 /* #undef EXPORT_ALL_SYMBOLS */
 
+/* Define to 1 if you have the `accept4' function. */
+#define HAVE_ACCEPT4 1
+
 /* Define to 1 if you have the `arc4random' function. */
 #define HAVE_ARC4RANDOM 1
 
@@ -628,7 +631,7 @@
 #define PACKAGE_NAME "unbound"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "unbound 1.7.1"
+#define PACKAGE_STRING "unbound 1.7.3"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "unbound"
@@ -637,7 +640,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.7.1"
+#define PACKAGE_VERSION "1.7.3"
 
 /* default pidfile location */
 #define PIDFILE "/var/unbound/unbound.pid"
@@ -656,7 +659,7 @@
 #define ROOT_CERT_FILE "/var/unbound/icannbundle.pem"
 
 /* version number for resource files */
-#define RSRC_PACKAGE_VERSION 1,7,1,0
+#define RSRC_PACKAGE_VERSION 1,7,3,0
 
 /* Directory to chdir to */
 #define RUN_DIR "/var/unbound"

Modified: projects/krb5/contrib/unbound/config.h.in
==============================================================================
--- projects/krb5/contrib/unbound/config.h.in	Thu Sep 13 04:08:48 2018	(r338621)
+++ projects/krb5/contrib/unbound/config.h.in	Thu Sep 13 06:21:07 2018	(r338622)
@@ -30,6 +30,9 @@
    internal symbols */
 #undef EXPORT_ALL_SYMBOLS
 
+/* Define to 1 if you have the `accept4' function. */
+#undef HAVE_ACCEPT4
+
 /* Define to 1 if you have the `arc4random' function. */
 #undef HAVE_ARC4RANDOM
 

Modified: projects/krb5/contrib/unbound/configure
==============================================================================
--- projects/krb5/contrib/unbound/configure	Thu Sep 13 04:08:48 2018	(r338621)
+++ projects/krb5/contrib/unbound/configure	Thu Sep 13 06:21:07 2018	(r338622)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for unbound 1.7.1.
+# Generated by GNU Autoconf 2.69 for unbound 1.7.3.
 #
 # Report bugs to <unbound-bugs at nlnetlabs.nl>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='unbound'
 PACKAGE_TARNAME='unbound'
-PACKAGE_VERSION='1.7.1'
-PACKAGE_STRING='unbound 1.7.1'
+PACKAGE_VERSION='1.7.3'
+PACKAGE_STRING='unbound 1.7.3'
 PACKAGE_BUGREPORT='unbound-bugs at nlnetlabs.nl'
 PACKAGE_URL=''
 
@@ -1440,7 +1440,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures unbound 1.7.1 to adapt to many kinds of systems.

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

More information about the svn-src-projects mailing list