Date: Tue, 11 Sep 2018 18:41:01 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r338596 - in projects/clang700-import: . bin/sh contrib/elftoolchain/elfcopy contrib/elftoolchain/libelf contrib/unbound contrib/unbound/compat contrib/unbound/contrib contrib/unbound/d... Message-ID: <201809111841.w8BIf1MR095795@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Tue Sep 11 18:41:00 2018 New Revision: 338596 URL: https://svnweb.freebsd.org/changeset/base/338596 Log: Merge ^/head r338392 through r338594. Added: projects/clang700-import/contrib/elftoolchain/libelf/gelf_mips64el.c - copied unchanged from r338594, head/contrib/elftoolchain/libelf/gelf_mips64el.c projects/clang700-import/crypto/openssh/openbsd-compat/bsd-getline.c - copied unchanged from r338594, head/crypto/openssh/openbsd-compat/bsd-getline.c projects/clang700-import/crypto/openssh/regress/cfgmatchlisten.sh - copied unchanged from r338594, head/crypto/openssh/regress/cfgmatchlisten.sh projects/clang700-import/crypto/openssh/regress/mkdtemp.c - copied unchanged from r338594, head/crypto/openssh/regress/mkdtemp.c projects/clang700-import/libexec/getty/gettytab - copied unchanged from r338594, head/libexec/getty/gettytab projects/clang700-import/sbin/init/ttys.aarch64 - copied unchanged from r338594, head/sbin/init/ttys.aarch64 projects/clang700-import/sbin/init/ttys.amd64 - copied unchanged from r338594, head/sbin/init/ttys.amd64 projects/clang700-import/sbin/init/ttys.arm - copied unchanged from r338594, head/sbin/init/ttys.arm projects/clang700-import/sbin/init/ttys.i386 - copied unchanged from r338594, head/sbin/init/ttys.i386 projects/clang700-import/sbin/init/ttys.mips - copied unchanged from r338594, head/sbin/init/ttys.mips projects/clang700-import/sbin/init/ttys.powerpc - copied unchanged from r338594, head/sbin/init/ttys.powerpc projects/clang700-import/sbin/init/ttys.riscv - copied unchanged from r338594, head/sbin/init/ttys.riscv projects/clang700-import/sbin/init/ttys.sparc64 - copied unchanged from r338594, head/sbin/init/ttys.sparc64 projects/clang700-import/share/vt/fonts/INDEX.fonts - copied unchanged from r338594, head/share/vt/fonts/INDEX.fonts projects/clang700-import/stand/userboot/userboot_4th/ - copied from r338594, head/stand/userboot/userboot_4th/ projects/clang700-import/stand/userboot/userboot_lua/ - copied from r338594, head/stand/userboot/userboot_lua/ projects/clang700-import/sys/amd64/amd64/efirt_support.S - copied unchanged from r338594, head/sys/amd64/amd64/efirt_support.S projects/clang700-import/sys/dev/sound/pci/csamidi.c - copied unchanged from r338594, head/sys/dev/sound/pci/csamidi.c projects/clang700-import/usr.bin/login/fbtab - copied unchanged from r338594, head/usr.bin/login/fbtab projects/clang700-import/usr.bin/login/login.conf - copied unchanged from r338594, head/usr.bin/login/login.conf projects/clang700-import/usr.bin/login/motd - copied unchanged from r338594, head/usr.bin/login/motd projects/clang700-import/usr.sbin/cron/cron/crontab - copied unchanged from r338594, head/usr.sbin/cron/cron/crontab Deleted: projects/clang700-import/crypto/openssh/bufaux.c projects/clang700-import/crypto/openssh/bufbn.c projects/clang700-import/crypto/openssh/bufec.c projects/clang700-import/crypto/openssh/buffer.c projects/clang700-import/crypto/openssh/buffer.h projects/clang700-import/crypto/openssh/key.c projects/clang700-import/crypto/openssh/key.h projects/clang700-import/etc/crontab projects/clang700-import/etc/etc.aarch64/ projects/clang700-import/etc/etc.amd64/ projects/clang700-import/etc/etc.arm/ projects/clang700-import/etc/etc.i386/ projects/clang700-import/etc/etc.mips/ projects/clang700-import/etc/etc.powerpc/ projects/clang700-import/etc/etc.riscv/ projects/clang700-import/etc/etc.sparc64/ projects/clang700-import/etc/fbtab projects/clang700-import/etc/gettytab projects/clang700-import/etc/login.conf projects/clang700-import/etc/motd projects/clang700-import/sys/riscv/include/riscv_opcode.h Modified: projects/clang700-import/Makefile.inc1 projects/clang700-import/bin/sh/expand.c projects/clang700-import/contrib/elftoolchain/elfcopy/main.c projects/clang700-import/contrib/elftoolchain/libelf/Makefile projects/clang700-import/contrib/elftoolchain/libelf/_libelf.h projects/clang700-import/contrib/elftoolchain/libelf/gelf_rel.c projects/clang700-import/contrib/elftoolchain/libelf/gelf_rela.c projects/clang700-import/contrib/unbound/Makefile.in projects/clang700-import/contrib/unbound/compat/arc4random.c projects/clang700-import/contrib/unbound/config.h projects/clang700-import/contrib/unbound/config.h.in projects/clang700-import/contrib/unbound/configure projects/clang700-import/contrib/unbound/configure.ac projects/clang700-import/contrib/unbound/contrib/libunbound.pc.in projects/clang700-import/contrib/unbound/daemon/acl_list.c projects/clang700-import/contrib/unbound/daemon/acl_list.h projects/clang700-import/contrib/unbound/daemon/cachedump.c projects/clang700-import/contrib/unbound/daemon/cachedump.h projects/clang700-import/contrib/unbound/daemon/daemon.c projects/clang700-import/contrib/unbound/daemon/remote.c projects/clang700-import/contrib/unbound/daemon/remote.h projects/clang700-import/contrib/unbound/daemon/unbound.c projects/clang700-import/contrib/unbound/daemon/worker.c projects/clang700-import/contrib/unbound/doc/Changelog projects/clang700-import/contrib/unbound/doc/README projects/clang700-import/contrib/unbound/doc/example.conf projects/clang700-import/contrib/unbound/doc/example.conf.in projects/clang700-import/contrib/unbound/doc/libunbound.3 projects/clang700-import/contrib/unbound/doc/libunbound.3.in projects/clang700-import/contrib/unbound/doc/unbound-anchor.8 projects/clang700-import/contrib/unbound/doc/unbound-anchor.8.in projects/clang700-import/contrib/unbound/doc/unbound-checkconf.8 projects/clang700-import/contrib/unbound/doc/unbound-checkconf.8.in projects/clang700-import/contrib/unbound/doc/unbound-control.8 projects/clang700-import/contrib/unbound/doc/unbound-control.8.in projects/clang700-import/contrib/unbound/doc/unbound-host.1 projects/clang700-import/contrib/unbound/doc/unbound-host.1.in projects/clang700-import/contrib/unbound/doc/unbound.8 projects/clang700-import/contrib/unbound/doc/unbound.8.in projects/clang700-import/contrib/unbound/doc/unbound.conf.5 projects/clang700-import/contrib/unbound/doc/unbound.conf.5.in projects/clang700-import/contrib/unbound/iterator/iter_utils.c projects/clang700-import/contrib/unbound/iterator/iterator.c projects/clang700-import/contrib/unbound/libunbound/context.c projects/clang700-import/contrib/unbound/libunbound/context.h projects/clang700-import/contrib/unbound/libunbound/libunbound.c projects/clang700-import/contrib/unbound/libunbound/libworker.c projects/clang700-import/contrib/unbound/services/authzone.c projects/clang700-import/contrib/unbound/services/cache/infra.c projects/clang700-import/contrib/unbound/services/listen_dnsport.c projects/clang700-import/contrib/unbound/services/mesh.c projects/clang700-import/contrib/unbound/services/outside_network.c projects/clang700-import/contrib/unbound/services/outside_network.h projects/clang700-import/contrib/unbound/smallapp/unbound-checkconf.c projects/clang700-import/contrib/unbound/smallapp/unbound-control.c projects/clang700-import/contrib/unbound/smallapp/unbound-host.c projects/clang700-import/contrib/unbound/util/alloc.c projects/clang700-import/contrib/unbound/util/alloc.h projects/clang700-import/contrib/unbound/util/config_file.c projects/clang700-import/contrib/unbound/util/config_file.h projects/clang700-import/contrib/unbound/util/configlexer.lex projects/clang700-import/contrib/unbound/util/configparser.y projects/clang700-import/contrib/unbound/util/net_help.c projects/clang700-import/contrib/unbound/util/net_help.h projects/clang700-import/contrib/unbound/util/netevent.c projects/clang700-import/crypto/openssh/.depend projects/clang700-import/crypto/openssh/.skipped-commit-ids projects/clang700-import/crypto/openssh/ChangeLog projects/clang700-import/crypto/openssh/INSTALL projects/clang700-import/crypto/openssh/Makefile.in projects/clang700-import/crypto/openssh/OVERVIEW projects/clang700-import/crypto/openssh/PROTOCOL projects/clang700-import/crypto/openssh/PROTOCOL.certkeys projects/clang700-import/crypto/openssh/PROTOCOL.chacha20poly1305 projects/clang700-import/crypto/openssh/PROTOCOL.krl projects/clang700-import/crypto/openssh/README projects/clang700-import/crypto/openssh/README.platform projects/clang700-import/crypto/openssh/TODO projects/clang700-import/crypto/openssh/aclocal.m4 projects/clang700-import/crypto/openssh/addrmatch.c projects/clang700-import/crypto/openssh/audit-bsm.c projects/clang700-import/crypto/openssh/audit.c projects/clang700-import/crypto/openssh/auth-bsdauth.c projects/clang700-import/crypto/openssh/auth-krb5.c projects/clang700-import/crypto/openssh/auth-options.c projects/clang700-import/crypto/openssh/auth-options.h projects/clang700-import/crypto/openssh/auth-pam.c projects/clang700-import/crypto/openssh/auth-passwd.c projects/clang700-import/crypto/openssh/auth-rhosts.c projects/clang700-import/crypto/openssh/auth-shadow.c projects/clang700-import/crypto/openssh/auth-sia.c projects/clang700-import/crypto/openssh/auth-skey.c projects/clang700-import/crypto/openssh/auth.c projects/clang700-import/crypto/openssh/auth.h projects/clang700-import/crypto/openssh/auth2-chall.c projects/clang700-import/crypto/openssh/auth2-gss.c projects/clang700-import/crypto/openssh/auth2-hostbased.c projects/clang700-import/crypto/openssh/auth2-kbdint.c projects/clang700-import/crypto/openssh/auth2-none.c projects/clang700-import/crypto/openssh/auth2-passwd.c projects/clang700-import/crypto/openssh/auth2-pubkey.c projects/clang700-import/crypto/openssh/auth2.c projects/clang700-import/crypto/openssh/authfd.c projects/clang700-import/crypto/openssh/authfd.h projects/clang700-import/crypto/openssh/authfile.c projects/clang700-import/crypto/openssh/channels.c projects/clang700-import/crypto/openssh/channels.h projects/clang700-import/crypto/openssh/cipher.c projects/clang700-import/crypto/openssh/clientloop.c projects/clang700-import/crypto/openssh/clientloop.h projects/clang700-import/crypto/openssh/compat.c projects/clang700-import/crypto/openssh/compat.h projects/clang700-import/crypto/openssh/config.h projects/clang700-import/crypto/openssh/configure.ac projects/clang700-import/crypto/openssh/contrib/aix/buildbff.sh projects/clang700-import/crypto/openssh/contrib/cygwin/ssh-host-config projects/clang700-import/crypto/openssh/contrib/cygwin/ssh-user-config projects/clang700-import/crypto/openssh/contrib/redhat/openssh.spec projects/clang700-import/crypto/openssh/contrib/solaris/README projects/clang700-import/crypto/openssh/contrib/suse/openssh.spec projects/clang700-import/crypto/openssh/defines.h projects/clang700-import/crypto/openssh/dh.c projects/clang700-import/crypto/openssh/entropy.c projects/clang700-import/crypto/openssh/entropy.h projects/clang700-import/crypto/openssh/gss-genr.c projects/clang700-import/crypto/openssh/gss-serv-krb5.c projects/clang700-import/crypto/openssh/gss-serv.c projects/clang700-import/crypto/openssh/hostfile.c projects/clang700-import/crypto/openssh/kex.c projects/clang700-import/crypto/openssh/kex.h projects/clang700-import/crypto/openssh/kexdhs.c projects/clang700-import/crypto/openssh/kexgexs.c projects/clang700-import/crypto/openssh/log.c projects/clang700-import/crypto/openssh/log.h projects/clang700-import/crypto/openssh/loginrec.c projects/clang700-import/crypto/openssh/match.c projects/clang700-import/crypto/openssh/match.h projects/clang700-import/crypto/openssh/misc.c projects/clang700-import/crypto/openssh/misc.h projects/clang700-import/crypto/openssh/moduli projects/clang700-import/crypto/openssh/monitor.c projects/clang700-import/crypto/openssh/monitor.h projects/clang700-import/crypto/openssh/monitor_wrap.c projects/clang700-import/crypto/openssh/monitor_wrap.h projects/clang700-import/crypto/openssh/msg.c projects/clang700-import/crypto/openssh/mux.c projects/clang700-import/crypto/openssh/myproposal.h projects/clang700-import/crypto/openssh/opacket.c projects/clang700-import/crypto/openssh/opacket.h projects/clang700-import/crypto/openssh/openbsd-compat/Makefile.in projects/clang700-import/crypto/openssh/openbsd-compat/arc4random.c projects/clang700-import/crypto/openssh/openbsd-compat/bcrypt_pbkdf.c projects/clang700-import/crypto/openssh/openbsd-compat/bsd-closefrom.c projects/clang700-import/crypto/openssh/openbsd-compat/bsd-cygwin_util.c projects/clang700-import/crypto/openssh/openbsd-compat/bsd-cygwin_util.h projects/clang700-import/crypto/openssh/openbsd-compat/bsd-misc.c projects/clang700-import/crypto/openssh/openbsd-compat/bsd-nextstep.h projects/clang700-import/crypto/openssh/openbsd-compat/bsd-snprintf.c projects/clang700-import/crypto/openssh/openbsd-compat/bsd-waitpid.h projects/clang700-import/crypto/openssh/openbsd-compat/explicit_bzero.c projects/clang700-import/crypto/openssh/openbsd-compat/fmt_scaled.c projects/clang700-import/crypto/openssh/openbsd-compat/freezero.c projects/clang700-import/crypto/openssh/openbsd-compat/openbsd-compat.h projects/clang700-import/crypto/openssh/openbsd-compat/port-aix.c projects/clang700-import/crypto/openssh/openbsd-compat/port-aix.h projects/clang700-import/crypto/openssh/openbsd-compat/port-uw.c projects/clang700-import/crypto/openssh/openbsd-compat/sha2.c projects/clang700-import/crypto/openssh/openbsd-compat/strndup.c projects/clang700-import/crypto/openssh/openbsd-compat/strnlen.c projects/clang700-import/crypto/openssh/openbsd-compat/sys-queue.h projects/clang700-import/crypto/openssh/packet.c projects/clang700-import/crypto/openssh/packet.h projects/clang700-import/crypto/openssh/platform.c projects/clang700-import/crypto/openssh/readconf.c projects/clang700-import/crypto/openssh/readconf.h projects/clang700-import/crypto/openssh/readpass.c projects/clang700-import/crypto/openssh/regress/Makefile projects/clang700-import/crypto/openssh/regress/allow-deny-users.sh projects/clang700-import/crypto/openssh/regress/authinfo.sh projects/clang700-import/crypto/openssh/regress/cert-file.sh projects/clang700-import/crypto/openssh/regress/cert-hostkey.sh projects/clang700-import/crypto/openssh/regress/cfgparse.sh projects/clang700-import/crypto/openssh/regress/forward-control.sh projects/clang700-import/crypto/openssh/regress/forwarding.sh projects/clang700-import/crypto/openssh/regress/key-options.sh projects/clang700-import/crypto/openssh/regress/keygen-knownhosts.sh projects/clang700-import/crypto/openssh/regress/multiplex.sh projects/clang700-import/crypto/openssh/regress/rekey.sh projects/clang700-import/crypto/openssh/regress/setuid-allowed.c projects/clang700-import/crypto/openssh/regress/sshcfgparse.sh projects/clang700-import/crypto/openssh/regress/test-exec.sh projects/clang700-import/crypto/openssh/regress/unittests/hostkeys/test_iterate.c projects/clang700-import/crypto/openssh/regress/unittests/match/tests.c projects/clang700-import/crypto/openssh/regress/unittests/sshkey/test_sshkey.c projects/clang700-import/crypto/openssh/regress/valgrind-unit.sh projects/clang700-import/crypto/openssh/sandbox-seccomp-filter.c projects/clang700-import/crypto/openssh/sandbox-systrace.c projects/clang700-import/crypto/openssh/scp.1 projects/clang700-import/crypto/openssh/scp.c projects/clang700-import/crypto/openssh/servconf.c projects/clang700-import/crypto/openssh/servconf.h projects/clang700-import/crypto/openssh/serverloop.c projects/clang700-import/crypto/openssh/session.c projects/clang700-import/crypto/openssh/sftp-client.c projects/clang700-import/crypto/openssh/sftp-server.c projects/clang700-import/crypto/openssh/sftp.1 projects/clang700-import/crypto/openssh/sftp.c projects/clang700-import/crypto/openssh/ssh-agent.c projects/clang700-import/crypto/openssh/ssh-gss.h projects/clang700-import/crypto/openssh/ssh-keygen.1 projects/clang700-import/crypto/openssh/ssh-keygen.c projects/clang700-import/crypto/openssh/ssh-keyscan.c projects/clang700-import/crypto/openssh/ssh-keysign.c projects/clang700-import/crypto/openssh/ssh-pkcs11-client.c projects/clang700-import/crypto/openssh/ssh-rsa.c projects/clang700-import/crypto/openssh/ssh.1 projects/clang700-import/crypto/openssh/ssh.c projects/clang700-import/crypto/openssh/ssh.h projects/clang700-import/crypto/openssh/ssh_api.h projects/clang700-import/crypto/openssh/ssh_config projects/clang700-import/crypto/openssh/ssh_config.5 projects/clang700-import/crypto/openssh/ssh_namespace.h projects/clang700-import/crypto/openssh/sshbuf.c projects/clang700-import/crypto/openssh/sshbuf.h projects/clang700-import/crypto/openssh/sshconnect.c projects/clang700-import/crypto/openssh/sshconnect.h projects/clang700-import/crypto/openssh/sshconnect2.c projects/clang700-import/crypto/openssh/sshd.8 projects/clang700-import/crypto/openssh/sshd.c projects/clang700-import/crypto/openssh/sshd_config projects/clang700-import/crypto/openssh/sshd_config.5 projects/clang700-import/crypto/openssh/ssherr.c projects/clang700-import/crypto/openssh/ssherr.h projects/clang700-import/crypto/openssh/sshkey-xmss.c projects/clang700-import/crypto/openssh/sshkey.c projects/clang700-import/crypto/openssh/sshkey.h projects/clang700-import/crypto/openssh/sshlogin.c projects/clang700-import/crypto/openssh/ttymodes.c projects/clang700-import/crypto/openssh/uidswap.c projects/clang700-import/crypto/openssh/uidswap.h projects/clang700-import/crypto/openssh/umac.c projects/clang700-import/crypto/openssh/utf8.c projects/clang700-import/crypto/openssh/version.h projects/clang700-import/crypto/openssh/xmss_wots.c projects/clang700-import/etc/Makefile projects/clang700-import/lib/geom/eli/geom_eli.c projects/clang700-import/lib/libbe/be.c projects/clang700-import/lib/libbe/be.h projects/clang700-import/lib/libbe/be_access.c projects/clang700-import/lib/libbe/be_error.c projects/clang700-import/lib/libbe/be_info.c projects/clang700-import/lib/libbe/libbe.3 projects/clang700-import/lib/libelf/Makefile projects/clang700-import/lib/libpam/modules/pam_exec/pam_exec.8 projects/clang700-import/lib/libpam/modules/pam_exec/pam_exec.c projects/clang700-import/lib/libpam/modules/pam_ssh/pam_ssh.c projects/clang700-import/lib/libunbound/Makefile projects/clang700-import/lib/libvmmapi/vmmapi.c projects/clang700-import/libexec/getty/Makefile projects/clang700-import/libexec/rtld-elf/aarch64/rtld_machdep.h projects/clang700-import/libexec/rtld-elf/arm/rtld_machdep.h projects/clang700-import/libexec/rtld-elf/libmap.c projects/clang700-import/libexec/rtld-elf/mips/rtld_machdep.h projects/clang700-import/libexec/rtld-elf/powerpc/rtld_machdep.h projects/clang700-import/libexec/rtld-elf/powerpc64/rtld_machdep.h projects/clang700-import/libexec/rtld-elf/riscv/rtld_machdep.h projects/clang700-import/libexec/rtld-elf/rtld.c projects/clang700-import/release/tools/arm.subr projects/clang700-import/sbin/dhclient/Makefile projects/clang700-import/sbin/geom/core/geom.c projects/clang700-import/sbin/init/Makefile projects/clang700-import/sbin/ping/Makefile projects/clang700-import/sbin/sysctl/sysctl.c projects/clang700-import/secure/lib/libssh/Makefile projects/clang700-import/secure/libexec/ssh-keysign/Makefile projects/clang700-import/secure/usr.sbin/sshd/Makefile projects/clang700-import/share/man/man4/man4.arm/bcm283x_pwm.4 projects/clang700-import/share/man/man4/u3g.4 projects/clang700-import/share/man/man8/diskless.8 projects/clang700-import/share/man/man9/EVENTHANDLER.9 projects/clang700-import/share/misc/committers-ports.dot projects/clang700-import/share/mk/bsd.cpu.mk projects/clang700-import/share/vt/fonts/Makefile projects/clang700-import/stand/common/bootstrap.h projects/clang700-import/stand/common/interp_forth.c projects/clang700-import/stand/common/interp_lua.c projects/clang700-import/stand/common/interp_simple.c projects/clang700-import/stand/defaults/loader.conf projects/clang700-import/stand/defs.mk projects/clang700-import/stand/libsa/tftp.c projects/clang700-import/stand/lua/core.lua projects/clang700-import/stand/lua/loader.lua projects/clang700-import/stand/userboot/Makefile projects/clang700-import/stand/userboot/userboot.h projects/clang700-import/stand/userboot/userboot/Makefile projects/clang700-import/stand/userboot/userboot/main.c projects/clang700-import/stand/userboot/userboot/version projects/clang700-import/sys/amd64/amd64/efirt_machdep.c projects/clang700-import/sys/amd64/amd64/genassym.c projects/clang700-import/sys/amd64/amd64/pmap.c projects/clang700-import/sys/amd64/amd64/support.S projects/clang700-import/sys/amd64/amd64/trap.c projects/clang700-import/sys/amd64/include/efi.h projects/clang700-import/sys/amd64/include/proc.h projects/clang700-import/sys/arm/arm/gic.c projects/clang700-import/sys/arm/arm/gic_acpi.c projects/clang700-import/sys/arm/arm/physmem.c projects/clang700-import/sys/arm/ti/omap4/omap4_prcm_clks.c projects/clang700-import/sys/arm64/arm64/efirt_machdep.c projects/clang700-import/sys/arm64/arm64/machdep.c projects/clang700-import/sys/arm64/include/efi.h projects/clang700-import/sys/cam/ctl/ctl.c projects/clang700-import/sys/cam/ctl/ctl_frontend_iscsi.c projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h projects/clang700-import/sys/cddl/dev/dtrace/riscv/dtrace_subr.c projects/clang700-import/sys/cddl/dev/fbt/fbt.c projects/clang700-import/sys/cddl/dev/fbt/riscv/fbt_isa.c projects/clang700-import/sys/conf/files.amd64 projects/clang700-import/sys/conf/kern.mk projects/clang700-import/sys/conf/newvers.sh projects/clang700-import/sys/contrib/rdma/krping/krping.c projects/clang700-import/sys/crypto/ccp/ccp.c projects/clang700-import/sys/dev/efidev/efirt.c projects/clang700-import/sys/dev/efidev/efirtc.c projects/clang700-import/sys/dev/extres/regulator/regulator.c projects/clang700-import/sys/dev/intel/spi.c projects/clang700-import/sys/dev/ixgbe/if_ixv.c projects/clang700-import/sys/dev/ixgbe/ix_txrx.c projects/clang700-import/sys/dev/mlx5/driver.h projects/clang700-import/sys/dev/mlx5/mlx5_core/mlx5_main.c projects/clang700-import/sys/dev/mlx5/mlx5_en/en.h projects/clang700-import/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c projects/clang700-import/sys/dev/mlx5/mlx5_en/mlx5_en_main.c projects/clang700-import/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c projects/clang700-import/sys/dev/mmc/mmc.c projects/clang700-import/sys/dev/pci/pci_user.c projects/clang700-import/sys/dev/random/randomdev.c projects/clang700-import/sys/dev/sdhci/sdhci.c projects/clang700-import/sys/dev/sound/midi/midi.c projects/clang700-import/sys/dev/usb/input/wmt.c projects/clang700-import/sys/kern/kern_clock.c projects/clang700-import/sys/kern/kern_clocksource.c projects/clang700-import/sys/kern/kern_thread.c projects/clang700-import/sys/kern/subr_blist.c projects/clang700-import/sys/kern/subr_rtc.c projects/clang700-import/sys/mips/conf/MALTA64EL projects/clang700-import/sys/modules/dtb/omap4/Makefile projects/clang700-import/sys/modules/efirt/Makefile projects/clang700-import/sys/modules/sound/driver/csa/Makefile projects/clang700-import/sys/net/iflib.c projects/clang700-import/sys/net/route.h projects/clang700-import/sys/netinet/in_kdtrace.c projects/clang700-import/sys/netinet/in_pcb.c projects/clang700-import/sys/netinet/in_pcb.h projects/clang700-import/sys/netinet/ip_fastfwd.c projects/clang700-import/sys/netinet/tcp_hpts.c projects/clang700-import/sys/netinet6/frag6.c projects/clang700-import/sys/netinet6/in6_pcb.c projects/clang700-import/sys/netinet6/ip6_output.c projects/clang700-import/sys/ofed/drivers/infiniband/core/ib_cm.c projects/clang700-import/sys/ofed/drivers/infiniband/core/ib_cma.c projects/clang700-import/sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c projects/clang700-import/sys/ofed/drivers/infiniband/core/ib_uverbs_marshall.c projects/clang700-import/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c projects/clang700-import/sys/ofed/include/rdma/ib_addr.h projects/clang700-import/sys/ofed/include/rdma/ib_cm.h projects/clang700-import/sys/powerpc/include/pcb.h projects/clang700-import/sys/powerpc/include/pcpu.h projects/clang700-import/sys/riscv/conf/GENERIC projects/clang700-import/sys/riscv/include/asm.h projects/clang700-import/sys/riscv/include/riscvreg.h projects/clang700-import/sys/riscv/riscv/copyinout.S projects/clang700-import/sys/riscv/riscv/exception.S projects/clang700-import/sys/riscv/riscv/locore.S projects/clang700-import/sys/riscv/riscv/machdep.c projects/clang700-import/sys/riscv/riscv/support.S projects/clang700-import/sys/riscv/riscv/vm_machdep.c projects/clang700-import/sys/security/audit/audit_bsm_db.c projects/clang700-import/sys/sys/efi.h projects/clang700-import/sys/sys/param.h projects/clang700-import/sys/sys/systm.h projects/clang700-import/sys/sys/vmmeter.h projects/clang700-import/sys/ufs/ffs/ffs_alloc.c projects/clang700-import/sys/vm/vm_domainset.c projects/clang700-import/sys/vm/vm_domainset.h projects/clang700-import/sys/vm/vm_fault.c projects/clang700-import/sys/vm/vm_glue.c projects/clang700-import/sys/vm/vm_page.c projects/clang700-import/sys/vm/vm_page.h projects/clang700-import/sys/vm/vm_pageout.h projects/clang700-import/sys/vm/vm_phys.c projects/clang700-import/sys/x86/x86/intr_machdep.c projects/clang700-import/tools/build/mk/OptionalObsoleteFiles.inc projects/clang700-import/tools/tools/build_option_survey/mkhtml.sh projects/clang700-import/tools/tools/build_option_survey/option_survey.sh projects/clang700-import/usr.bin/calendar/calendars/calendar.freebsd projects/clang700-import/usr.bin/fetch/fetch.c projects/clang700-import/usr.bin/login/Makefile projects/clang700-import/usr.sbin/bhyveload/bhyveload.c projects/clang700-import/usr.sbin/cpucontrol/amd10h.c projects/clang700-import/usr.sbin/cron/cron/Makefile projects/clang700-import/usr.sbin/efibootmgr/efibootmgr.c projects/clang700-import/usr.sbin/periodic/Makefile projects/clang700-import/usr.sbin/ppp/ppp.conf projects/clang700-import/usr.sbin/services_mkdb/services Directory Properties: projects/clang700-import/ (props changed) projects/clang700-import/contrib/elftoolchain/ (props changed) projects/clang700-import/contrib/unbound/ (props changed) projects/clang700-import/crypto/openssh/ (props changed) projects/clang700-import/sys/cddl/contrib/opensolaris/ (props changed) Modified: projects/clang700-import/Makefile.inc1 ============================================================================== --- projects/clang700-import/Makefile.inc1 Tue Sep 11 18:39:04 2018 (r338595) +++ projects/clang700-import/Makefile.inc1 Tue Sep 11 18:41:00 2018 (r338596) @@ -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/clang700-import/bin/sh/expand.c ============================================================================== --- projects/clang700-import/bin/sh/expand.c Tue Sep 11 18:39:04 2018 (r338595) +++ projects/clang700-import/bin/sh/expand.c Tue Sep 11 18:41:00 2018 (r338596) @@ -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/clang700-import/contrib/elftoolchain/elfcopy/main.c ============================================================================== --- projects/clang700-import/contrib/elftoolchain/elfcopy/main.c Tue Sep 11 18:39:04 2018 (r338595) +++ projects/clang700-import/contrib/elftoolchain/elfcopy/main.c Tue Sep 11 18:41:00 2018 (r338596) @@ -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/clang700-import/contrib/elftoolchain/libelf/Makefile ============================================================================== --- projects/clang700-import/contrib/elftoolchain/libelf/Makefile Tue Sep 11 18:39:04 2018 (r338595) +++ projects/clang700-import/contrib/elftoolchain/libelf/Makefile Tue Sep 11 18:41:00 2018 (r338596) @@ -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/clang700-import/contrib/elftoolchain/libelf/_libelf.h ============================================================================== --- projects/clang700-import/contrib/elftoolchain/libelf/_libelf.h Tue Sep 11 18:39:04 2018 (r338595) +++ projects/clang700-import/contrib/elftoolchain/libelf/_libelf.h Tue Sep 11 18:41:00 2018 (r338596) @@ -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/clang700-import/contrib/elftoolchain/libelf/gelf_mips64el.c (from r338594, head/contrib/elftoolchain/libelf/gelf_mips64el.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang700-import/contrib/elftoolchain/libelf/gelf_mips64el.c Tue Sep 11 18:41:00 2018 (r338596, copy of r338594, 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/clang700-import/contrib/elftoolchain/libelf/gelf_rel.c ============================================================================== --- projects/clang700-import/contrib/elftoolchain/libelf/gelf_rel.c Tue Sep 11 18:39:04 2018 (r338595) +++ projects/clang700-import/contrib/elftoolchain/libelf/gelf_rel.c Tue Sep 11 18:41:00 2018 (r338596) @@ -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/clang700-import/contrib/elftoolchain/libelf/gelf_rela.c ============================================================================== --- projects/clang700-import/contrib/elftoolchain/libelf/gelf_rela.c Tue Sep 11 18:39:04 2018 (r338595) +++ projects/clang700-import/contrib/elftoolchain/libelf/gelf_rela.c Tue Sep 11 18:41:00 2018 (r338596) @@ -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/clang700-import/contrib/unbound/Makefile.in ============================================================================== --- projects/clang700-import/contrib/unbound/Makefile.in Tue Sep 11 18:39:04 2018 (r338595) +++ projects/clang700-import/contrib/unbound/Makefile.in Tue Sep 11 18:41:00 2018 (r338596) @@ -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/clang700-import/contrib/unbound/compat/arc4random.c ============================================================================== --- projects/clang700-import/contrib/unbound/compat/arc4random.c Tue Sep 11 18:39:04 2018 (r338595) +++ projects/clang700-import/contrib/unbound/compat/arc4random.c Tue Sep 11 18:41:00 2018 (r338596) @@ -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/clang700-import/contrib/unbound/config.h ============================================================================== --- projects/clang700-import/contrib/unbound/config.h Tue Sep 11 18:39:04 2018 (r338595) +++ projects/clang700-import/contrib/unbound/config.h Tue Sep 11 18:41:00 2018 (r338596) @@ -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/clang700-import/contrib/unbound/config.h.in ============================================================================== --- projects/clang700-import/contrib/unbound/config.h.in Tue Sep 11 18:39:04 2018 (r338595) +++ projects/clang700-import/contrib/unbound/config.h.in Tue Sep 11 18:41:00 2018 (r338596) @@ -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/clang700-import/contrib/unbound/configure ============================================================================== --- projects/clang700-import/contrib/unbound/configure Tue Sep 11 18:39:04 2018 (r338595) +++ projects/clang700-import/contrib/unbound/configure Tue Sep 11 18:41:00 2018 (r338596) @@ -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@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@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. +\`configure' configures unbound 1.7.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1505,7 +1505,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unbound 1.7.1:";; + short | recursive ) echo "Configuration of unbound 1.7.3:";; esac cat <<\_ACEOF @@ -1722,7 +1722,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unbound configure 1.7.1 +unbound configure 1.7.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2431,7 +2431,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by unbound $as_me 1.7.1, which was +It was created by unbound $as_me 1.7.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2783,11 +2783,11 @@ UNBOUND_VERSION_MAJOR=1 UNBOUND_VERSION_MINOR=7 -UNBOUND_VERSION_MICRO=1 +UNBOUND_VERSION_MICRO=3 LIBUNBOUND_CURRENT=7 -LIBUNBOUND_REVISION=9 +LIBUNBOUND_REVISION=11 LIBUNBOUND_AGE=5 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -2848,6 +2848,8 @@ LIBUNBOUND_AGE=5 # 1.6.8 had 7:7:5 # 1.7.0 had 7:8:5 # 1.7.1 had 7:9:5 +# 1.7.2 had 7:10:5 +# 1.7.3 had 7:11:5 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -19467,7 +19469,7 @@ else WINDRES="$ac_cv_prog_WINDRES" fi - LIBS="$LIBS -liphlpapi" + LIBS="$LIBS -liphlpapi -lcrypt32" WINAPPS="unbound-service-install.exe unbound-service-remove.exe anchor-update.exe" WIN_DAEMON_SRC="winrc/win_svc.c winrc/w_inst.c" @@ -19701,7 +19703,7 @@ if test "$ac_res" != no; then : fi -for ac_func in tzset sigprocmask fcntl getpwnam endpwent getrlimit setrlimit setsid chroot kill chown sleep usleep random srandom recvmsg sendmsg writev socketpair glob initgroups strftime localtime_r setusercontext _beginthreadex endservent endprotoent fsync shmget +for ac_func in tzset sigprocmask fcntl getpwnam endpwent getrlimit setrlimit setsid chroot kill chown sleep usleep random srandom recvmsg sendmsg writev socketpair glob initgroups strftime localtime_r setusercontext _beginthreadex endservent endprotoent fsync shmget accept4 do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -19761,7 +19763,7 @@ done # check if setreuid en setregid fail, on MacOSX10.4(darwin8). -if echo $build_os | grep darwin8 > /dev/null; then +if echo $target_os | grep darwin8 > /dev/null; then $as_echo "#define DARWIN_BROKEN_SETREUID 1" >>confdefs.h @@ -20854,6 +20856,8 @@ if test "${enable_cachedb+set}" = set; then : enableval=$enable_cachedb; fi +# turn on cachedb when hiredis support is enabled. +if test "$found_libhiredis" = "yes"; then enable_cachedb="yes"; fi case "$enable_cachedb" in yes) @@ -21041,7 +21045,7 @@ _ACEOF -version=1.7.1 +version=1.7.3 date=`date +'%b %e, %Y'` @@ -21560,7 +21564,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by unbound $as_me 1.7.1, which was +This file was extended by unbound $as_me 1.7.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21626,7 +21630,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -unbound config.status 1.7.1 +unbound config.status 1.7.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" Modified: projects/clang700-import/contrib/unbound/configure.ac ============================================================================== --- projects/clang700-import/contrib/unbound/configure.ac Tue Sep 11 18:39:04 2018 (r338595) +++ projects/clang700-import/contrib/unbound/configure.ac Tue Sep 11 18:41:00 2018 (r338596) @@ -11,14 +11,14 @@ sinclude(dnscrypt/dnscrypt.m4) # must be numbers. ac_defun because of later processing m4_define([VERSION_MAJOR],[1]) m4_define([VERSION_MINOR],[7]) -m4_define([VERSION_MICRO],[1]) +m4_define([VERSION_MICRO],[3]) AC_INIT(unbound, m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]), unbound-bugs@nlnetlabs.nl, unbound) AC_SUBST(UNBOUND_VERSION_MAJOR, [VERSION_MAJOR]) AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR]) AC_SUBST(UNBOUND_VERSION_MICRO, [VERSION_MICRO]) LIBUNBOUND_CURRENT=7 -LIBUNBOUND_REVISION=9 +LIBUNBOUND_REVISION=11 LIBUNBOUND_AGE=5 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -79,6 +79,8 @@ LIBUNBOUND_AGE=5 # 1.6.8 had 7:7:5 # 1.7.0 had 7:8:5 # 1.7.1 had 7:9:5 +# 1.7.2 had 7:10:5 +# 1.7.3 had 7:11:5 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -1245,7 +1247,7 @@ if test "$USE_WINSOCK" = 1; then #include <windows.h> ]) AC_CHECK_TOOL(WINDRES, windres) - LIBS="$LIBS -liphlpapi" + LIBS="$LIBS -liphlpapi -lcrypt32" WINAPPS="unbound-service-install.exe unbound-service-remove.exe anchor-update.exe" AC_SUBST(WINAPPS) WIN_DAEMON_SRC="winrc/win_svc.c winrc/w_inst.c" @@ -1318,12 +1320,12 @@ AC_INCLUDES_DEFAULT #endif ]) AC_SEARCH_LIBS([setusercontext], [util]) -AC_CHECK_FUNCS([tzset sigprocmask fcntl getpwnam endpwent getrlimit setrlimit setsid chroot kill chown sleep usleep random srandom recvmsg sendmsg writev socketpair glob initgroups strftime localtime_r setusercontext _beginthreadex endservent endprotoent fsync shmget]) +AC_CHECK_FUNCS([tzset sigprocmask fcntl getpwnam endpwent getrlimit setrlimit setsid chroot kill chown sleep usleep random srandom recvmsg sendmsg writev socketpair glob initgroups strftime localtime_r setusercontext _beginthreadex endservent endprotoent fsync shmget accept4]) AC_CHECK_FUNCS([setresuid],,[AC_CHECK_FUNCS([setreuid])]) AC_CHECK_FUNCS([setresgid],,[AC_CHECK_FUNCS([setregid])]) # check if setreuid en setregid fail, on MacOSX10.4(darwin8). -if echo $build_os | grep darwin8 > /dev/null; then +if echo $target_os | grep darwin8 > /dev/null; then AC_DEFINE(DARWIN_BROKEN_SETREUID, 1, [Define this if on macOSX10.4-darwin8 and setreuid and setregid do not work]) fi AC_CHECK_DECLS([inet_pton,inet_ntop], [], [], [ @@ -1488,6 +1490,8 @@ dnsc_DNSCRYPT([ # check for cachedb if requested AC_ARG_ENABLE(cachedb, AC_HELP_STRING([--enable-cachedb], [enable cachedb module that can use external cache storage])) +# turn on cachedb when hiredis support is enabled. +if test "$found_libhiredis" = "yes"; then enable_cachedb="yes"; fi case "$enable_cachedb" in yes) AC_DEFINE([USE_CACHEDB], [1], [Define to 1 to use cachedb support]) Modified: projects/clang700-import/contrib/unbound/contrib/libunbound.pc.in ============================================================================== --- projects/clang700-import/contrib/unbound/contrib/libunbound.pc.in Tue Sep 11 18:39:04 2018 (r338595) +++ projects/clang700-import/contrib/unbound/contrib/libunbound.pc.in Tue Sep 11 18:41:00 2018 (r338596) @@ -7,7 +7,7 @@ Name: unbound Description: Library with validating, recursive, and caching DNS resolver URL: http://www.unbound.net Version: @PACKAGE_VERSION@ -Requires: libcrypto libssl @PC_LIBEVENT_DEPENDENCY@ @PC_PY_DEPENDENCY@ -Libs: -L${libdir} -lunbound +Requires: @PC_LIBEVENT_DEPENDENCY@ @PC_PY_DEPENDENCY@ +Libs: -L${libdir} -lunbound -lssl -lcrypto Libs.private: @SSLLIB@ @LIBS@ Cflags: -I${includedir} Modified: projects/clang700-import/contrib/unbound/daemon/acl_list.c ============================================================================== --- projects/clang700-import/contrib/unbound/daemon/acl_list.c Tue Sep 11 18:39:04 2018 (r338595) +++ projects/clang700-import/contrib/unbound/daemon/acl_list.c Tue Sep 11 18:41:00 2018 (r338596) @@ -111,6 +111,8 @@ acl_list_str_cfg(struct acl_list* acl, const char* str control = acl_refuse_non_local; else if(strcmp(s2, "allow_snoop") == 0) control = acl_allow_snoop; + else if(strcmp(s2, "allow_setrd") == 0) + control = acl_allow_setrd; else { log_err("access control type %s unknown", str); return 0; Modified: projects/clang700-import/contrib/unbound/daemon/acl_list.h ============================================================================== --- projects/clang700-import/contrib/unbound/daemon/acl_list.h Tue Sep 11 18:39:04 2018 (r338595) +++ projects/clang700-import/contrib/unbound/daemon/acl_list.h Tue Sep 11 18:41:00 2018 (r338596) @@ -63,7 +63,9 @@ enum acl_access { /** allow full access for recursion (+RD) queries */ acl_allow, /** allow full access for all queries, recursion and cache snooping */ - acl_allow_snoop + acl_allow_snoop, + /** allow full access for recursion queries and set RD flag regardless of request */ + acl_allow_setrd }; /** Modified: projects/clang700-import/contrib/unbound/daemon/cachedump.c ============================================================================== --- projects/clang700-import/contrib/unbound/daemon/cachedump.c Tue Sep 11 18:39:04 2018 (r338595) +++ projects/clang700-import/contrib/unbound/daemon/cachedump.c Tue Sep 11 18:41:00 2018 (r338596) @@ -62,7 +62,7 @@ /** dump one rrset zonefile line */ static int -dump_rrset_line(SSL* ssl, struct ub_packed_rrset_key* k, time_t now, size_t i) +dump_rrset_line(RES* ssl, struct ub_packed_rrset_key* k, time_t now, size_t i) { char s[65535]; if(!packed_rr_to_string(k, i, now, s, sizeof(s))) { @@ -73,7 +73,7 @@ dump_rrset_line(SSL* ssl, struct ub_packed_rrset_key* /** dump rrset key and data info */ static int -dump_rrset(SSL* ssl, struct ub_packed_rrset_key* k, +dump_rrset(RES* ssl, struct ub_packed_rrset_key* k, struct packed_rrset_data* d, time_t now) { size_t i; @@ -99,7 +99,7 @@ dump_rrset(SSL* ssl, struct ub_packed_rrset_key* k, /** dump lruhash rrset cache */ static int -dump_rrset_lruhash(SSL* ssl, struct lruhash* h, time_t now) +dump_rrset_lruhash(RES* ssl, struct lruhash* h, time_t now) { struct lruhash_entry* e; /* lruhash already locked by caller */ @@ -118,7 +118,7 @@ dump_rrset_lruhash(SSL* ssl, struct lruhash* h, time_t /** dump rrset cache */ static int -dump_rrset_cache(SSL* ssl, struct worker* worker) +dump_rrset_cache(RES* ssl, struct worker* worker) { struct rrset_cache* r = worker->env.rrset_cache; size_t slab; @@ -137,7 +137,7 @@ dump_rrset_cache(SSL* ssl, struct worker* worker) /** dump message to rrset reference */ static int -dump_msg_ref(SSL* ssl, struct ub_packed_rrset_key* k) +dump_msg_ref(RES* ssl, struct ub_packed_rrset_key* k) { char* nm, *tp, *cl; nm = sldns_wire2str_dname(k->rk.dname, k->rk.dname_len); @@ -164,7 +164,7 @@ dump_msg_ref(SSL* ssl, struct ub_packed_rrset_key* k) /** dump message entry */ static int -dump_msg(SSL* ssl, struct query_info* k, struct reply_info* d, +dump_msg(RES* ssl, struct query_info* k, struct reply_info* d, time_t now) { size_t i; @@ -246,7 +246,7 @@ copy_msg(struct regional* region, struct lruhash_entry /** dump lruhash msg cache */ static int -dump_msg_lruhash(SSL* ssl, struct worker* worker, struct lruhash* h) +dump_msg_lruhash(RES* ssl, struct worker* worker, struct lruhash* h) { struct lruhash_entry* e; struct query_info* k; @@ -274,7 +274,7 @@ dump_msg_lruhash(SSL* ssl, struct worker* worker, stru /** dump msg cache */ static int -dump_msg_cache(SSL* ssl, struct worker* worker) +dump_msg_cache(RES* ssl, struct worker* worker) { struct slabhash* sh = worker->env.msg_cache; size_t slab; @@ -291,7 +291,7 @@ dump_msg_cache(SSL* ssl, struct worker* worker) } int -dump_cache(SSL* ssl, struct worker* worker) +dump_cache(RES* ssl, struct worker* worker) { if(!dump_rrset_cache(ssl, worker)) return 0; @@ -302,7 +302,7 @@ dump_cache(SSL* ssl, struct worker* worker) /** read a line from ssl into buffer */ static int -ssl_read_buf(SSL* ssl, sldns_buffer* buf) +ssl_read_buf(RES* ssl, sldns_buffer* buf) { return ssl_read_line(ssl, (char*)sldns_buffer_begin(buf), sldns_buffer_capacity(buf)); @@ -310,7 +310,7 @@ ssl_read_buf(SSL* ssl, sldns_buffer* buf) /** check fixed text on line */ static int -read_fixed(SSL* ssl, sldns_buffer* buf, const char* str) +read_fixed(RES* ssl, sldns_buffer* buf, const char* str) { if(!ssl_read_buf(ssl, buf)) return 0; return (strcmp((char*)sldns_buffer_begin(buf), str) == 0); @@ -318,7 +318,7 @@ read_fixed(SSL* ssl, sldns_buffer* buf, const char* st /** load an RR into rrset */ static int -load_rr(SSL* ssl, sldns_buffer* buf, struct regional* region, +load_rr(RES* ssl, sldns_buffer* buf, struct regional* region, struct ub_packed_rrset_key* rk, struct packed_rrset_data* d, unsigned int i, int is_rrsig, int* go_on, time_t now) { @@ -435,7 +435,7 @@ move_into_cache(struct ub_packed_rrset_key* k, /** load an rrset entry */ static int -load_rrset(SSL* ssl, sldns_buffer* buf, struct worker* worker) +load_rrset(RES* ssl, sldns_buffer* buf, struct worker* worker) { char* s = (char*)sldns_buffer_begin(buf); struct regional* region = worker->scratchpad; @@ -519,7 +519,7 @@ load_rrset(SSL* ssl, sldns_buffer* buf, struct worker* /** load rrset cache */ static int -load_rrset_cache(SSL* ssl, struct worker* worker) +load_rrset_cache(RES* ssl, struct worker* worker) { sldns_buffer* buf = worker->env.scratch_buffer; if(!read_fixed(ssl, buf, "START_RRSET_CACHE")) return 0; @@ -575,7 +575,7 @@ load_qinfo(char* str, struct query_info* qinfo, struct /** load a msg rrset reference */ static int -load_ref(SSL* ssl, sldns_buffer* buf, struct worker* worker, +load_ref(RES* ssl, sldns_buffer* buf, struct worker* worker, struct regional *region, struct ub_packed_rrset_key** rrset, int* go_on) { @@ -620,7 +620,7 @@ load_ref(SSL* ssl, sldns_buffer* buf, struct worker* w /** load a msg entry */ static int -load_msg(SSL* ssl, sldns_buffer* buf, struct worker* worker) +load_msg(RES* ssl, sldns_buffer* buf, struct worker* worker) { struct regional* region = worker->scratchpad; struct query_info qinf; @@ -685,7 +685,7 @@ load_msg(SSL* ssl, sldns_buffer* buf, struct worker* w /** load msg cache */ static int -load_msg_cache(SSL* ssl, struct worker* worker) +load_msg_cache(RES* ssl, struct worker* worker) { sldns_buffer* buf = worker->env.scratch_buffer; if(!read_fixed(ssl, buf, "START_MSG_CACHE")) return 0; @@ -698,7 +698,7 @@ load_msg_cache(SSL* ssl, struct worker* worker) } int -load_cache(SSL* ssl, struct worker* worker) +load_cache(RES* ssl, struct worker* worker) { if(!load_rrset_cache(ssl, worker)) return 0; @@ -709,7 +709,7 @@ load_cache(SSL* ssl, struct worker* worker) /** print details on a delegation point */ static void -print_dp_details(SSL* ssl, struct worker* worker, struct delegpt* dp) +print_dp_details(RES* ssl, struct worker* worker, struct delegpt* dp) { char buf[257]; struct delegpt_addr* a; @@ -785,7 +785,7 @@ print_dp_details(SSL* ssl, struct worker* worker, stru /** print main dp info */ static void -print_dp_main(SSL* ssl, struct delegpt* dp, struct dns_msg* msg) +print_dp_main(RES* ssl, struct delegpt* dp, struct dns_msg* msg) { size_t i, n_ns, n_miss, n_addr, n_res, n_avail; @@ -813,7 +813,7 @@ print_dp_main(SSL* ssl, struct delegpt* dp, struct dns return; } -int print_deleg_lookup(SSL* ssl, struct worker* worker, uint8_t* nm, +int print_deleg_lookup(RES* ssl, struct worker* worker, uint8_t* nm, size_t nmlen, int ATTR_UNUSED(nmlabs)) { /* deep links into the iterator module */ Modified: projects/clang700-import/contrib/unbound/daemon/cachedump.h ============================================================================== --- projects/clang700-import/contrib/unbound/daemon/cachedump.h Tue Sep 11 18:39:04 2018 (r338595) +++ projects/clang700-import/contrib/unbound/daemon/cachedump.h Tue Sep 11 18:41:00 2018 (r338596) @@ -72,6 +72,7 @@ #ifndef DAEMON_DUMPCACHE_H #define DAEMON_DUMPCACHE_H struct worker; +#include "daemon/remote.h" /** * Dump cache(s) to text @@ -80,7 +81,7 @@ struct worker; * ptrs to the caches. * @return false on ssl print error. */ -int dump_cache(SSL* ssl, struct worker* worker); +int dump_cache(RES* ssl, struct worker* worker); /** * Load cache(s) from text @@ -89,7 +90,7 @@ int dump_cache(SSL* ssl, struct worker* worker); * ptrs to the caches. * @return false on ssl error. */ -int load_cache(SSL* ssl, struct worker* worker); +int load_cache(RES* ssl, struct worker* worker); /** * Print the delegation used to lookup for this name. @@ -101,7 +102,7 @@ int load_cache(SSL* ssl, struct worker* worker); * @param nmlabs: labels in name. * @return false on ssl error. */ -int print_deleg_lookup(SSL* ssl, struct worker* worker, uint8_t* nm, +int print_deleg_lookup(RES* ssl, struct worker* worker, uint8_t* nm, size_t nmlen, int nmlabs); #endif /* DAEMON_DUMPCACHE_H */ Modified: projects/clang700-import/contrib/unbound/daemon/daemon.c ============================================================================== --- projects/clang700-import/contrib/unbound/daemon/daemon.c Tue Sep 11 18:39:04 2018 (r338595) +++ projects/clang700-import/contrib/unbound/daemon/daemon.c Tue Sep 11 18:41:00 2018 (r338596) @@ -704,6 +704,7 @@ daemon_cleanup(struct daemon* daemon) free(daemon->workers); daemon->workers = NULL; daemon->num = 0; + alloc_clear_special(&daemon->superalloc); #ifdef USE_DNSTAP dt_delete(daemon->dtenv); daemon->dtenv = NULL; Modified: projects/clang700-import/contrib/unbound/daemon/remote.c ============================================================================== --- projects/clang700-import/contrib/unbound/daemon/remote.c Tue Sep 11 18:39:04 2018 (r338595) +++ projects/clang700-import/contrib/unbound/daemon/remote.c Tue Sep 11 18:41:00 2018 (r338596) @@ -142,130 +142,20 @@ timeval_divide(struct timeval* avg, const struct timev #endif } -/* - * The following function was generated using the openssl utility, using - * the command : "openssl dhparam -C 2048" - * (some openssl versions reject DH that is 'too small', eg. 512). - */ -#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL) -#ifndef S_SPLINT_S -static DH *get_dh2048(void) +static int +remote_setup_ctx(struct daemon_remote* rc, struct config_file* cfg) { - static unsigned char dh2048_p[]={ - 0xE7,0x36,0x28,0x3B,0xE4,0xC3,0x32,0x1C,0x01,0xC3,0x67,0xD6, - 0xF5,0xF3,0xDA,0xDC,0x71,0xC0,0x42,0x8B,0xE6,0xEB,0x8D,0x80, - 0x35,0x7F,0x09,0x45,0x30,0xE5,0xB2,0x92,0x81,0x3F,0x08,0xCD, - 0x36,0x5E,0x19,0x83,0x62,0xCC,0xAE,0x9B,0x81,0x66,0x24,0xEE, - 0x16,0x6F,0xA9,0x9E,0xF4,0x82,0x1B,0xDD,0x46,0xC7,0x33,0x5D, - 0xF4,0xCA,0xE6,0x8F,0xFC,0xD4,0xD8,0x58,0x94,0x24,0x5D,0xFF, - 0x0A,0xE8,0xEF,0x3D,0xCE,0xBB,0x50,0x94,0xE0,0x5F,0xE8,0x41, - 0xC3,0x35,0x30,0x37,0xD5,0xCB,0x8F,0x3D,0x95,0x15,0x1A,0x77, - 0x42,0xB2,0x06,0x86,0xF6,0x09,0x66,0x0E,0x9A,0x25,0x94,0x3E, - 0xD2,0x04,0x25,0x25,0x1D,0x23,0xEB,0xDC,0x4D,0x0C,0x83,0x28, - 0x2E,0x15,0x81,0x2D,0xC1,0xAF,0x8D,0x36,0x64,0xE3,0x9A,0x83, - 0x78,0xC2,0x8D,0xC0,0x9D,0xD9,0x3A,0x1C,0xC5,0x2B,0x50,0x68, *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809111841.w8BIf1MR095795>