Date: Tue, 9 Aug 2016 23:47:41 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r303898 - in user/alc/PG_CACHED: . bin/sh bin/uuidgen cddl/contrib/opensolaris/lib/libdtrace/arm cddl/contrib/opensolaris/lib/libdtrace/i386 cddl/contrib/opensolaris/lib/libzpool/common... Message-ID: <201608092347.u79Nlfvx063026@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Tue Aug 9 23:47:40 2016 New Revision: 303898 URL: https://svnweb.freebsd.org/changeset/base/303898 Log: Merge from PQ_LAUNDRY at r303897. Added: user/alc/PG_CACHED/lib/libc/stdlib/cxa_thread_atexit.c - copied unchanged from r303897, user/alc/PQ_LAUNDRY/lib/libc/stdlib/cxa_thread_atexit.c user/alc/PG_CACHED/lib/libc/tests/stdlib/cxa_thread_atexit_nothr_test.cc - copied unchanged from r303897, user/alc/PQ_LAUNDRY/lib/libc/tests/stdlib/cxa_thread_atexit_nothr_test.cc user/alc/PG_CACHED/lib/libc/tests/stdlib/cxa_thread_atexit_test.cc - copied unchanged from r303897, user/alc/PQ_LAUNDRY/lib/libc/tests/stdlib/cxa_thread_atexit_test.cc user/alc/PG_CACHED/share/man/man4/ng_checksum.4 - copied unchanged from r303897, user/alc/PQ_LAUNDRY/share/man/man4/ng_checksum.4 user/alc/PG_CACHED/sys/arm/arm/gic.h - copied unchanged from r303897, user/alc/PQ_LAUNDRY/sys/arm/arm/gic.h user/alc/PG_CACHED/sys/arm/arm/gic_fdt.c - copied unchanged from r303897, user/alc/PQ_LAUNDRY/sys/arm/arm/gic_fdt.c user/alc/PG_CACHED/sys/contrib/cloudabi/cloudabi_types.h - copied unchanged from r303897, user/alc/PQ_LAUNDRY/sys/contrib/cloudabi/cloudabi_types.h user/alc/PG_CACHED/sys/contrib/cloudabi/cloudabi_vdso_aarch64.c - copied unchanged from r303897, user/alc/PQ_LAUNDRY/sys/contrib/cloudabi/cloudabi_vdso_aarch64.c user/alc/PG_CACHED/sys/contrib/cloudabi/cloudabi_vdso_x86_64.c - copied unchanged from r303897, user/alc/PQ_LAUNDRY/sys/contrib/cloudabi/cloudabi_vdso_x86_64.c user/alc/PG_CACHED/sys/dev/ixl/ixl_pf_iov.c - copied unchanged from r303897, user/alc/PQ_LAUNDRY/sys/dev/ixl/ixl_pf_iov.c user/alc/PG_CACHED/sys/dev/ixl/ixl_pf_iov.h - copied unchanged from r303897, user/alc/PQ_LAUNDRY/sys/dev/ixl/ixl_pf_iov.h user/alc/PG_CACHED/sys/dev/ixl/ixl_pf_main.c - copied unchanged from r303897, user/alc/PQ_LAUNDRY/sys/dev/ixl/ixl_pf_main.c user/alc/PG_CACHED/sys/dev/ixl/ixl_pf_qmgr.c - copied unchanged from r303897, user/alc/PQ_LAUNDRY/sys/dev/ixl/ixl_pf_qmgr.c user/alc/PG_CACHED/sys/dev/ixl/ixl_pf_qmgr.h - copied unchanged from r303897, user/alc/PQ_LAUNDRY/sys/dev/ixl/ixl_pf_qmgr.h user/alc/PG_CACHED/sys/mips/conf/std.AR933X - copied unchanged from r303897, user/alc/PQ_LAUNDRY/sys/mips/conf/std.AR933X user/alc/PG_CACHED/sys/mips/conf/std.AR934X - copied unchanged from r303897, user/alc/PQ_LAUNDRY/sys/mips/conf/std.AR934X user/alc/PG_CACHED/sys/modules/netgraph/checksum/ - copied from r303897, user/alc/PQ_LAUNDRY/sys/modules/netgraph/checksum/ user/alc/PG_CACHED/sys/netgraph/ng_checksum.c - copied unchanged from r303897, user/alc/PQ_LAUNDRY/sys/netgraph/ng_checksum.c user/alc/PG_CACHED/sys/netgraph/ng_checksum.h - copied unchanged from r303897, user/alc/PQ_LAUNDRY/sys/netgraph/ng_checksum.h user/alc/PG_CACHED/sys/netinet/in_jail.c - copied unchanged from r303897, user/alc/PQ_LAUNDRY/sys/netinet/in_jail.c user/alc/PG_CACHED/sys/netinet6/in6_jail.c - copied unchanged from r303897, user/alc/PQ_LAUNDRY/sys/netinet6/in6_jail.c user/alc/PG_CACHED/sys/x86/x86/mp_watchdog.c - copied unchanged from r303897, user/alc/PQ_LAUNDRY/sys/x86/x86/mp_watchdog.c Deleted: user/alc/PG_CACHED/sys/amd64/amd64/mp_watchdog.c user/alc/PG_CACHED/sys/dev/mlx5/mlx5_en/tcp_tlro.c user/alc/PG_CACHED/sys/dev/mlx5/mlx5_en/tcp_tlro.h user/alc/PG_CACHED/sys/i386/i386/mp_watchdog.c user/alc/PG_CACHED/sys/mips/conf/AR933X_BASE user/alc/PG_CACHED/sys/mips/conf/AR934X_BASE user/alc/PG_CACHED/sys/ofed/drivers/infiniband/ulp/sdp/Kconfig user/alc/PG_CACHED/sys/ofed/drivers/infiniband/ulp/sdp/Makefile Modified: user/alc/PG_CACHED/Makefile user/alc/PG_CACHED/Makefile.inc1 user/alc/PG_CACHED/bin/sh/expand.c user/alc/PG_CACHED/bin/uuidgen/uuidgen.c user/alc/PG_CACHED/cddl/contrib/opensolaris/lib/libdtrace/arm/dt_isadep.c user/alc/PG_CACHED/cddl/contrib/opensolaris/lib/libdtrace/i386/dt_isadep.c user/alc/PG_CACHED/cddl/contrib/opensolaris/lib/libzpool/common/util.c user/alc/PG_CACHED/contrib/binutils/bfd/ppcboot.c user/alc/PG_CACHED/contrib/blacklist/lib/bl.c user/alc/PG_CACHED/contrib/elftoolchain/readelf/readelf.c user/alc/PG_CACHED/contrib/libexecinfo/backtrace.c user/alc/PG_CACHED/contrib/libpcap/pcap-bpf.c user/alc/PG_CACHED/contrib/llvm/projects/libunwind/src/Unwind-EHABI.cpp user/alc/PG_CACHED/contrib/netbsd-tests/lib/libc/sys/t_timer_create.c user/alc/PG_CACHED/contrib/ofed/usr.lib/libibverbs/config.h user/alc/PG_CACHED/crypto/openssh/FREEBSD-upgrade user/alc/PG_CACHED/crypto/openssh/config.h user/alc/PG_CACHED/crypto/openssh/configure.ac user/alc/PG_CACHED/crypto/openssh/myproposal.h user/alc/PG_CACHED/crypto/openssh/servconf.c user/alc/PG_CACHED/crypto/openssh/ssh_config.5 user/alc/PG_CACHED/crypto/openssh/sshd_config.5 user/alc/PG_CACHED/etc/rc.d/sshd user/alc/PG_CACHED/include/grp.h user/alc/PG_CACHED/include/stdio.h user/alc/PG_CACHED/include/xlocale/_locale.h user/alc/PG_CACHED/lib/libc/Versions.def user/alc/PG_CACHED/lib/libc/gen/Makefile.inc user/alc/PG_CACHED/lib/libc/gen/clock_getcpuclockid.3 user/alc/PG_CACHED/lib/libc/gen/getgrent.3 user/alc/PG_CACHED/lib/libc/gen/getgrent.c user/alc/PG_CACHED/lib/libc/gen/glob.3 user/alc/PG_CACHED/lib/libc/gen/glob.c user/alc/PG_CACHED/lib/libc/include/libc_private.h user/alc/PG_CACHED/lib/libc/locale/freelocale.3 user/alc/PG_CACHED/lib/libc/locale/xlocale.c user/alc/PG_CACHED/lib/libc/stdio/dprintf.c user/alc/PG_CACHED/lib/libc/stdio/getline.3 user/alc/PG_CACHED/lib/libc/stdio/getline.c user/alc/PG_CACHED/lib/libc/stdio/printf.3 user/alc/PG_CACHED/lib/libc/stdlib/Makefile.inc user/alc/PG_CACHED/lib/libc/stdlib/Symbol.map user/alc/PG_CACHED/lib/libc/stdlib/exit.c user/alc/PG_CACHED/lib/libc/sys/mprotect.2 user/alc/PG_CACHED/lib/libc/tests/stdio/getdelim_test.c user/alc/PG_CACHED/lib/libc/tests/stdlib/Makefile user/alc/PG_CACHED/lib/libc/tests/stdlib/Makefile.depend user/alc/PG_CACHED/lib/libproc/Makefile user/alc/PG_CACHED/lib/libproc/_libproc.h user/alc/PG_CACHED/lib/libproc/libproc.h user/alc/PG_CACHED/lib/libproc/proc_create.c user/alc/PG_CACHED/lib/libproc/proc_rtld.c user/alc/PG_CACHED/lib/libproc/proc_util.c user/alc/PG_CACHED/lib/librtld_db/Makefile user/alc/PG_CACHED/lib/librtld_db/rtld_db.c user/alc/PG_CACHED/lib/librtld_db/rtld_db.h user/alc/PG_CACHED/lib/libthr/arch/mips/include/pthread_md.h user/alc/PG_CACHED/lib/libthr/thread/thr_exit.c user/alc/PG_CACHED/lib/msun/tests/Makefile user/alc/PG_CACHED/libexec/rtld-elf/mips/reloc.c user/alc/PG_CACHED/release/Makefile.gce user/alc/PG_CACHED/sbin/etherswitchcfg/etherswitchcfg.8 user/alc/PG_CACHED/sbin/etherswitchcfg/etherswitchcfg.c user/alc/PG_CACHED/sbin/fsdb/fsdb.c user/alc/PG_CACHED/sbin/geom/class/eli/geli.8 user/alc/PG_CACHED/sbin/ipfw/ipfw2.c user/alc/PG_CACHED/sbin/ipfw/tables.c user/alc/PG_CACHED/sbin/pfctl/parse.y user/alc/PG_CACHED/sbin/pfctl/pfctl.c user/alc/PG_CACHED/sbin/pfctl/pfctl_altq.c user/alc/PG_CACHED/sbin/pfctl/pfctl_optimize.c user/alc/PG_CACHED/sbin/pfctl/pfctl_osfp.c user/alc/PG_CACHED/sbin/pfctl/pfctl_parser.c user/alc/PG_CACHED/sbin/pfctl/pfctl_radix.c user/alc/PG_CACHED/sbin/resolvconf/Makefile user/alc/PG_CACHED/share/man/man3/pthread_getcpuclockid.3 user/alc/PG_CACHED/share/man/man3/queue.3 user/alc/PG_CACHED/share/man/man4/gpioled.4 user/alc/PG_CACHED/share/man/man4/if_ntb.4 user/alc/PG_CACHED/share/man/man4/ntb_transport.4 user/alc/PG_CACHED/share/man/man9/Makefile user/alc/PG_CACHED/share/man/man9/bitset.9 user/alc/PG_CACHED/share/man/man9/cpuset.9 user/alc/PG_CACHED/share/man/man9/lock.9 user/alc/PG_CACHED/share/man/man9/pci.9 user/alc/PG_CACHED/share/misc/bsd-family-tree user/alc/PG_CACHED/share/misc/organization.dot user/alc/PG_CACHED/share/mk/src.libnames.mk user/alc/PG_CACHED/sys/amd64/amd64/mem.c user/alc/PG_CACHED/sys/amd64/amd64/support.S user/alc/PG_CACHED/sys/amd64/vmm/vmm.c user/alc/PG_CACHED/sys/arm/allwinner/axp209.c user/alc/PG_CACHED/sys/arm/arm/gic.c user/alc/PG_CACHED/sys/arm/include/elf.h user/alc/PG_CACHED/sys/arm64/arm64/machdep.c user/alc/PG_CACHED/sys/arm64/arm64/mp_machdep.c user/alc/PG_CACHED/sys/arm64/arm64/nexus.c user/alc/PG_CACHED/sys/arm64/arm64/pmap.c user/alc/PG_CACHED/sys/arm64/include/armreg.h user/alc/PG_CACHED/sys/arm64/include/machdep.h user/alc/PG_CACHED/sys/boot/common/bcache.c user/alc/PG_CACHED/sys/boot/common/interp_parse.c user/alc/PG_CACHED/sys/boot/efi/boot1/boot1.c user/alc/PG_CACHED/sys/boot/efi/boot1/ufs_module.c user/alc/PG_CACHED/sys/boot/efi/boot1/zfs_module.c user/alc/PG_CACHED/sys/boot/fdt/dts/arm/zynq-7000.dtsi user/alc/PG_CACHED/sys/boot/fdt/dts/riscv/spike.dts user/alc/PG_CACHED/sys/boot/i386/libi386/biosdisk.c user/alc/PG_CACHED/sys/boot/zfs/libzfs.h user/alc/PG_CACHED/sys/boot/zfs/zfs.c user/alc/PG_CACHED/sys/boot/zfs/zfsimpl.c user/alc/PG_CACHED/sys/cddl/boot/zfs/zfsimpl.h user/alc/PG_CACHED/sys/cddl/compat/opensolaris/sys/vnode.h user/alc/PG_CACHED/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c user/alc/PG_CACHED/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h user/alc/PG_CACHED/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h user/alc/PG_CACHED/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h user/alc/PG_CACHED/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c user/alc/PG_CACHED/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c user/alc/PG_CACHED/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c user/alc/PG_CACHED/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c user/alc/PG_CACHED/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_sa.c user/alc/PG_CACHED/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c user/alc/PG_CACHED/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c user/alc/PG_CACHED/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c user/alc/PG_CACHED/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h user/alc/PG_CACHED/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c user/alc/PG_CACHED/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S user/alc/PG_CACHED/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c user/alc/PG_CACHED/sys/cddl/dev/dtrace/riscv/dtrace_asm.S user/alc/PG_CACHED/sys/cddl/dev/dtrace/riscv/dtrace_subr.c user/alc/PG_CACHED/sys/compat/freebsd32/freebsd32_proto.h user/alc/PG_CACHED/sys/compat/freebsd32/freebsd32_syscall.h user/alc/PG_CACHED/sys/compat/freebsd32/freebsd32_syscalls.c user/alc/PG_CACHED/sys/compat/freebsd32/freebsd32_sysent.c user/alc/PG_CACHED/sys/compat/freebsd32/freebsd32_systrace_args.c user/alc/PG_CACHED/sys/compat/freebsd32/syscalls.master user/alc/PG_CACHED/sys/conf/files user/alc/PG_CACHED/sys/conf/files.amd64 user/alc/PG_CACHED/sys/conf/files.arm user/alc/PG_CACHED/sys/conf/files.arm64 user/alc/PG_CACHED/sys/conf/files.i386 user/alc/PG_CACHED/sys/conf/files.pc98 user/alc/PG_CACHED/sys/conf/files.powerpc user/alc/PG_CACHED/sys/conf/ldscript.riscv user/alc/PG_CACHED/sys/conf/options.powerpc user/alc/PG_CACHED/sys/contrib/cloudabi/cloudabi_types_common.h user/alc/PG_CACHED/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_xmit.c user/alc/PG_CACHED/sys/contrib/libnv/nvlist.c user/alc/PG_CACHED/sys/ddb/db_ps.c user/alc/PG_CACHED/sys/dev/ath/if_athioctl.h user/alc/PG_CACHED/sys/dev/bxe/bxe.c user/alc/PG_CACHED/sys/dev/cfe/cfe_api.c user/alc/PG_CACHED/sys/dev/cfe/cfe_api.h user/alc/PG_CACHED/sys/dev/cfe/cfe_api_int.h user/alc/PG_CACHED/sys/dev/cfe/cfe_error.h user/alc/PG_CACHED/sys/dev/cfe/cfe_ioctl.h user/alc/PG_CACHED/sys/dev/cxgbe/adapter.h user/alc/PG_CACHED/sys/dev/cxgbe/iw_cxgbe/cq.c user/alc/PG_CACHED/sys/dev/cxgbe/iw_cxgbe/qp.c user/alc/PG_CACHED/sys/dev/cxgbe/t4_if.m user/alc/PG_CACHED/sys/dev/cxgbe/t4_iov.c user/alc/PG_CACHED/sys/dev/cxgbe/t4_main.c user/alc/PG_CACHED/sys/dev/cxgbe/t4_netmap.c user/alc/PG_CACHED/sys/dev/cxgbe/t4_sge.c user/alc/PG_CACHED/sys/dev/cxgbe/tom/t4_ddp.c user/alc/PG_CACHED/sys/dev/cxgbe/tom/t4_tom.h user/alc/PG_CACHED/sys/dev/e1000/if_em.c user/alc/PG_CACHED/sys/dev/etherswitch/arswitch/arswitch.c user/alc/PG_CACHED/sys/dev/etherswitch/arswitch/arswitch_8327.c user/alc/PG_CACHED/sys/dev/etherswitch/arswitch/arswitch_8327.h user/alc/PG_CACHED/sys/dev/etherswitch/arswitch/arswitch_phy.c user/alc/PG_CACHED/sys/dev/etherswitch/arswitch/arswitch_reg.c user/alc/PG_CACHED/sys/dev/etherswitch/arswitch/arswitchvar.h user/alc/PG_CACHED/sys/dev/etherswitch/etherswitch.h user/alc/PG_CACHED/sys/dev/fdt/fdt_common.c user/alc/PG_CACHED/sys/dev/fdt/fdt_common.h user/alc/PG_CACHED/sys/dev/gpio/gpioled.c user/alc/PG_CACHED/sys/dev/hwpmc/hwpmc_core.c user/alc/PG_CACHED/sys/dev/hyperv/include/vmbus.h user/alc/PG_CACHED/sys/dev/hyperv/netvsc/hv_net_vsc.c user/alc/PG_CACHED/sys/dev/hyperv/netvsc/hv_net_vsc.h user/alc/PG_CACHED/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c user/alc/PG_CACHED/sys/dev/hyperv/netvsc/hv_rndis_filter.c user/alc/PG_CACHED/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c user/alc/PG_CACHED/sys/dev/hyperv/utilities/hv_heartbeat.c user/alc/PG_CACHED/sys/dev/hyperv/utilities/hv_kvp.c user/alc/PG_CACHED/sys/dev/hyperv/utilities/hv_shutdown.c user/alc/PG_CACHED/sys/dev/hyperv/utilities/hv_timesync.c user/alc/PG_CACHED/sys/dev/hyperv/utilities/hv_util.c user/alc/PG_CACHED/sys/dev/hyperv/utilities/hv_util.h user/alc/PG_CACHED/sys/dev/hyperv/vmbus/vmbus_brvar.h user/alc/PG_CACHED/sys/dev/hyperv/vmbus/vmbus_chan.c user/alc/PG_CACHED/sys/dev/ioat/ioat.c user/alc/PG_CACHED/sys/dev/iwm/if_iwm.c user/alc/PG_CACHED/sys/dev/ixl/i40e_adminq.c user/alc/PG_CACHED/sys/dev/ixl/i40e_adminq.h user/alc/PG_CACHED/sys/dev/ixl/i40e_adminq_cmd.h user/alc/PG_CACHED/sys/dev/ixl/i40e_common.c user/alc/PG_CACHED/sys/dev/ixl/i40e_devids.h user/alc/PG_CACHED/sys/dev/ixl/i40e_nvm.c user/alc/PG_CACHED/sys/dev/ixl/i40e_osdep.c user/alc/PG_CACHED/sys/dev/ixl/i40e_osdep.h user/alc/PG_CACHED/sys/dev/ixl/i40e_prototype.h user/alc/PG_CACHED/sys/dev/ixl/i40e_register.h user/alc/PG_CACHED/sys/dev/ixl/i40e_type.h user/alc/PG_CACHED/sys/dev/ixl/i40e_virtchnl.h user/alc/PG_CACHED/sys/dev/ixl/if_ixl.c user/alc/PG_CACHED/sys/dev/ixl/if_ixlv.c user/alc/PG_CACHED/sys/dev/ixl/ixl.h user/alc/PG_CACHED/sys/dev/ixl/ixl_pf.h user/alc/PG_CACHED/sys/dev/ixl/ixl_txrx.c user/alc/PG_CACHED/sys/dev/ixl/ixlv.h user/alc/PG_CACHED/sys/dev/ixl/ixlvc.c user/alc/PG_CACHED/sys/dev/mlx5/mlx5_en/en.h user/alc/PG_CACHED/sys/dev/mlx5/mlx5_en/mlx5_en_main.c user/alc/PG_CACHED/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c user/alc/PG_CACHED/sys/dev/ntb/if_ntb/if_ntb.c user/alc/PG_CACHED/sys/dev/ntb/ntb.c user/alc/PG_CACHED/sys/dev/ntb/ntb_hw/ntb_hw.c user/alc/PG_CACHED/sys/dev/ntb/ntb_transport.c user/alc/PG_CACHED/sys/dev/ntb/ntb_transport.h user/alc/PG_CACHED/sys/dev/ofw/ofw_fdt.c user/alc/PG_CACHED/sys/dev/pci/pci_if.m user/alc/PG_CACHED/sys/dev/pci/pci_iov.c user/alc/PG_CACHED/sys/dev/pci/pci_iov.h user/alc/PG_CACHED/sys/dev/pci/pci_pci.c user/alc/PG_CACHED/sys/dev/pci/pci_private.h user/alc/PG_CACHED/sys/dev/usb/input/ukbd.c user/alc/PG_CACHED/sys/dev/usb/usbdevs user/alc/PG_CACHED/sys/dev/xen/netfront/netfront.c user/alc/PG_CACHED/sys/fs/ext2fs/ext2_dinode.h user/alc/PG_CACHED/sys/fs/ext2fs/ext2fs.h user/alc/PG_CACHED/sys/fs/nfsclient/nfs_clbio.c user/alc/PG_CACHED/sys/fs/nfsclient/nfs_clsubs.c user/alc/PG_CACHED/sys/fs/nfsclient/nfs_clvnops.c user/alc/PG_CACHED/sys/fs/nfsclient/nfsnode.h user/alc/PG_CACHED/sys/fs/pseudofs/pseudofs.c user/alc/PG_CACHED/sys/fs/pseudofs/pseudofs.h user/alc/PG_CACHED/sys/fs/pseudofs/pseudofs_fileno.c user/alc/PG_CACHED/sys/fs/pseudofs/pseudofs_vncache.c user/alc/PG_CACHED/sys/geom/geom_disk.c user/alc/PG_CACHED/sys/kern/init_sysent.c user/alc/PG_CACHED/sys/kern/kern_fork.c user/alc/PG_CACHED/sys/kern/kern_jail.c user/alc/PG_CACHED/sys/kern/kern_mutex.c user/alc/PG_CACHED/sys/kern/kern_rwlock.c user/alc/PG_CACHED/sys/kern/kern_sx.c user/alc/PG_CACHED/sys/kern/kern_tc.c user/alc/PG_CACHED/sys/kern/makesyscalls.sh user/alc/PG_CACHED/sys/kern/sched_4bsd.c user/alc/PG_CACHED/sys/kern/subr_lock.c user/alc/PG_CACHED/sys/kern/syscalls.c user/alc/PG_CACHED/sys/kern/syscalls.master user/alc/PG_CACHED/sys/kern/systrace_args.c user/alc/PG_CACHED/sys/kern/uipc_usrreq.c user/alc/PG_CACHED/sys/kern/vfs_aio.c user/alc/PG_CACHED/sys/kern/vfs_subr.c user/alc/PG_CACHED/sys/kern/vnode_if.src user/alc/PG_CACHED/sys/mips/atheros/ar71xx_gpio.c user/alc/PG_CACHED/sys/mips/atheros/if_arge.c user/alc/PG_CACHED/sys/mips/broadcom/uart_cpu_chipc.c user/alc/PG_CACHED/sys/mips/conf/ALFA_HORNET_UB user/alc/PG_CACHED/sys/mips/conf/AP121 user/alc/PG_CACHED/sys/mips/conf/CARAMBOLA2 user/alc/PG_CACHED/sys/mips/conf/DB120 user/alc/PG_CACHED/sys/mips/conf/DIR-825C1 user/alc/PG_CACHED/sys/mips/conf/ONIONOMEGA user/alc/PG_CACHED/sys/mips/conf/SENTRY5.hints user/alc/PG_CACHED/sys/mips/conf/TL-WDR4300 user/alc/PG_CACHED/sys/mips/conf/TL-WDR4300.hints user/alc/PG_CACHED/sys/mips/conf/TL-WR740Nv4 user/alc/PG_CACHED/sys/mips/conf/TP-MR3020 user/alc/PG_CACHED/sys/mips/include/cpufunc.h user/alc/PG_CACHED/sys/mips/include/cpuinfo.h user/alc/PG_CACHED/sys/mips/include/cpuregs.h user/alc/PG_CACHED/sys/mips/mips/cpu.c user/alc/PG_CACHED/sys/mips/mips/genassym.c user/alc/PG_CACHED/sys/mips/mips/swtch.S user/alc/PG_CACHED/sys/mips/mips/sys_machdep.c user/alc/PG_CACHED/sys/mips/mips/trap.c user/alc/PG_CACHED/sys/mips/mips/vm_machdep.c user/alc/PG_CACHED/sys/modules/ixl/Makefile user/alc/PG_CACHED/sys/modules/ixlv/Makefile (contents, props changed) user/alc/PG_CACHED/sys/modules/mlx5en/Makefile user/alc/PG_CACHED/sys/net/ethernet.h user/alc/PG_CACHED/sys/net/if_ethersubr.c user/alc/PG_CACHED/sys/net/if_gif.c user/alc/PG_CACHED/sys/net/iflib.c user/alc/PG_CACHED/sys/net/route.h user/alc/PG_CACHED/sys/net80211/ieee80211_input.c user/alc/PG_CACHED/sys/netgraph/ng_base.c user/alc/PG_CACHED/sys/netgraph/ng_patch.c user/alc/PG_CACHED/sys/netgraph/ng_patch.h user/alc/PG_CACHED/sys/netinet/sctp_indata.c user/alc/PG_CACHED/sys/netinet/sctp_input.c user/alc/PG_CACHED/sys/netinet/sctp_output.c user/alc/PG_CACHED/sys/netinet/sctp_pcb.c user/alc/PG_CACHED/sys/netinet/sctp_ss_functions.c user/alc/PG_CACHED/sys/netinet/sctp_structs.h user/alc/PG_CACHED/sys/netinet/sctp_usrreq.c user/alc/PG_CACHED/sys/netinet/sctputil.c user/alc/PG_CACHED/sys/netinet/tcp_lro.c user/alc/PG_CACHED/sys/netinet/tcp_lro.h user/alc/PG_CACHED/sys/netinet/tcp_subr.c user/alc/PG_CACHED/sys/netinet6/icmp6.c user/alc/PG_CACHED/sys/netinet6/ip6_output.c user/alc/PG_CACHED/sys/ofed/drivers/infiniband/core/cma.c user/alc/PG_CACHED/sys/ofed/drivers/infiniband/hw/mthca/mthca_cmd.c user/alc/PG_CACHED/sys/ofed/drivers/infiniband/hw/mthca/mthca_cmd.h user/alc/PG_CACHED/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c user/alc/PG_CACHED/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h user/alc/PG_CACHED/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c user/alc/PG_CACHED/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c user/alc/PG_CACHED/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c user/alc/PG_CACHED/sys/opencrypto/xform_aes_icm.c user/alc/PG_CACHED/sys/powerpc/conf/MPC85XX user/alc/PG_CACHED/sys/powerpc/conf/dpaa/DPAA user/alc/PG_CACHED/sys/powerpc/include/hid.h user/alc/PG_CACHED/sys/powerpc/mpc85xx/mpc85xx.c user/alc/PG_CACHED/sys/powerpc/mpc85xx/mpc85xx.h user/alc/PG_CACHED/sys/powerpc/mpc85xx/pci_mpc85xx.c user/alc/PG_CACHED/sys/powerpc/mpc85xx/platform_mpc85xx.c user/alc/PG_CACHED/sys/powerpc/powerpc/busdma_machdep.c user/alc/PG_CACHED/sys/riscv/conf/GENERIC user/alc/PG_CACHED/sys/riscv/htif/htif.c user/alc/PG_CACHED/sys/riscv/htif/htif_block.c user/alc/PG_CACHED/sys/riscv/htif/htif_console.c user/alc/PG_CACHED/sys/riscv/include/cpu.h user/alc/PG_CACHED/sys/riscv/include/cpufunc.h user/alc/PG_CACHED/sys/riscv/include/db_machdep.h user/alc/PG_CACHED/sys/riscv/include/intr.h user/alc/PG_CACHED/sys/riscv/include/pte.h user/alc/PG_CACHED/sys/riscv/include/riscvreg.h user/alc/PG_CACHED/sys/riscv/include/vmparam.h user/alc/PG_CACHED/sys/riscv/riscv/exception.S user/alc/PG_CACHED/sys/riscv/riscv/genassym.c user/alc/PG_CACHED/sys/riscv/riscv/identcpu.c user/alc/PG_CACHED/sys/riscv/riscv/intr_machdep.c user/alc/PG_CACHED/sys/riscv/riscv/locore.S user/alc/PG_CACHED/sys/riscv/riscv/machdep.c user/alc/PG_CACHED/sys/riscv/riscv/pmap.c user/alc/PG_CACHED/sys/riscv/riscv/swtch.S user/alc/PG_CACHED/sys/riscv/riscv/timer.c user/alc/PG_CACHED/sys/riscv/riscv/trap.c user/alc/PG_CACHED/sys/riscv/riscv/vm_machdep.c user/alc/PG_CACHED/sys/sys/buf.h user/alc/PG_CACHED/sys/sys/bus.h user/alc/PG_CACHED/sys/sys/elf_common.h user/alc/PG_CACHED/sys/sys/jail.h user/alc/PG_CACHED/sys/sys/lock.h user/alc/PG_CACHED/sys/sys/lockmgr.h user/alc/PG_CACHED/sys/sys/mman.h user/alc/PG_CACHED/sys/sys/pmc.h user/alc/PG_CACHED/sys/sys/syscall.h user/alc/PG_CACHED/sys/sys/syscall.mk user/alc/PG_CACHED/sys/sys/sysproto.h user/alc/PG_CACHED/sys/sys/unpcb.h user/alc/PG_CACHED/sys/sys/vmmeter.h user/alc/PG_CACHED/sys/sys/vnode.h user/alc/PG_CACHED/sys/vm/swap_pager.c user/alc/PG_CACHED/sys/vm/vm_meter.c user/alc/PG_CACHED/sys/vm/vm_page.c user/alc/PG_CACHED/sys/vm/vm_pageout.c user/alc/PG_CACHED/sys/x86/iommu/intel_drv.c user/alc/PG_CACHED/tests/sys/aio/aio_test.c user/alc/PG_CACHED/tools/build/mk/OptionalObsoleteFiles.inc user/alc/PG_CACHED/tools/regression/zfs/zpool/add/option-f_size_mismatch.t user/alc/PG_CACHED/tools/regression/zfs/zpool/add/option-f_type_mismatch.t user/alc/PG_CACHED/tools/regression/zfs/zpool/create/files.t user/alc/PG_CACHED/usr.bin/at/at.c user/alc/PG_CACHED/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common user/alc/PG_CACHED/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.holiday (contents, props changed) user/alc/PG_CACHED/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.military user/alc/PG_CACHED/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.orthodox user/alc/PG_CACHED/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan user/alc/PG_CACHED/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.common user/alc/PG_CACHED/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.military user/alc/PG_CACHED/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.pagan user/alc/PG_CACHED/usr.bin/calendar/io.c user/alc/PG_CACHED/usr.bin/checknr/checknr.c user/alc/PG_CACHED/usr.bin/comm/comm.c user/alc/PG_CACHED/usr.bin/cpuset/cpuset.1 user/alc/PG_CACHED/usr.bin/getconf/getconf.1 user/alc/PG_CACHED/usr.bin/getconf/progenv.gperf user/alc/PG_CACHED/usr.bin/grep/grep.c user/alc/PG_CACHED/usr.bin/grep/regex/tre-fastmatch.c user/alc/PG_CACHED/usr.bin/gzip/gzip.c user/alc/PG_CACHED/usr.bin/indent/args.c user/alc/PG_CACHED/usr.bin/indent/indent.1 user/alc/PG_CACHED/usr.bin/indent/indent.c user/alc/PG_CACHED/usr.bin/indent/indent.h user/alc/PG_CACHED/usr.bin/indent/indent_codes.h user/alc/PG_CACHED/usr.bin/indent/indent_globs.h user/alc/PG_CACHED/usr.bin/indent/io.c user/alc/PG_CACHED/usr.bin/indent/lexi.c user/alc/PG_CACHED/usr.bin/indent/parse.c user/alc/PG_CACHED/usr.bin/indent/pr_comment.c user/alc/PG_CACHED/usr.bin/locale/locale.c user/alc/PG_CACHED/usr.bin/mandoc/Makefile user/alc/PG_CACHED/usr.bin/netstat/pfkey.c user/alc/PG_CACHED/usr.bin/nl/nl.c user/alc/PG_CACHED/usr.bin/procstat/procstat_files.c user/alc/PG_CACHED/usr.bin/resizewin/resizewin.1 user/alc/PG_CACHED/usr.bin/sdiff/sdiff.c user/alc/PG_CACHED/usr.bin/sed/Makefile user/alc/PG_CACHED/usr.bin/sed/compile.c user/alc/PG_CACHED/usr.bin/sed/defs.h user/alc/PG_CACHED/usr.bin/sed/extern.h user/alc/PG_CACHED/usr.bin/sed/main.c user/alc/PG_CACHED/usr.bin/sed/misc.c user/alc/PG_CACHED/usr.bin/sed/process.c user/alc/PG_CACHED/usr.bin/soelim/soelim.c user/alc/PG_CACHED/usr.bin/systat/vmstat.c user/alc/PG_CACHED/usr.bin/tar/tests/Makefile user/alc/PG_CACHED/usr.bin/truss/setup.c user/alc/PG_CACHED/usr.bin/uniq/uniq.c user/alc/PG_CACHED/usr.bin/vmstat/vmstat.c user/alc/PG_CACHED/usr.sbin/Makefile user/alc/PG_CACHED/usr.sbin/autofs/common.c user/alc/PG_CACHED/usr.sbin/bsdinstall/scripts/hardening user/alc/PG_CACHED/usr.sbin/etcupdate/etcupdate.sh user/alc/PG_CACHED/usr.sbin/kgzip/kgzip.8 user/alc/PG_CACHED/usr.sbin/pciconf/cap.c user/alc/PG_CACHED/usr.sbin/pkg/pkg.c user/alc/PG_CACHED/usr.sbin/pw/pw.h user/alc/PG_CACHED/usr.sbin/pw/pw_vpw.c user/alc/PG_CACHED/usr.sbin/pw/pwupd.h user/alc/PG_CACHED/usr.sbin/services_mkdb/services_mkdb.c user/alc/PG_CACHED/usr.sbin/uathload/uathload.c Directory Properties: user/alc/PG_CACHED/ (props changed) user/alc/PG_CACHED/cddl/ (props changed) user/alc/PG_CACHED/cddl/contrib/opensolaris/ (props changed) user/alc/PG_CACHED/contrib/binutils/ (props changed) user/alc/PG_CACHED/contrib/elftoolchain/ (props changed) user/alc/PG_CACHED/contrib/libexecinfo/ (props changed) user/alc/PG_CACHED/contrib/libpcap/ (props changed) user/alc/PG_CACHED/contrib/llvm/ (props changed) user/alc/PG_CACHED/contrib/llvm/projects/libunwind/ (props changed) user/alc/PG_CACHED/crypto/openssh/ (props changed) user/alc/PG_CACHED/sys/cddl/contrib/opensolaris/ (props changed) Modified: user/alc/PG_CACHED/Makefile ============================================================================== --- user/alc/PG_CACHED/Makefile Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/Makefile Tue Aug 9 23:47:40 2016 (r303898) @@ -315,7 +315,7 @@ world: upgrade_checks .PHONY ${_+_}@cd ${.CURDIR}; ${_MAKE} pre-world .endif ${_+_}@cd ${.CURDIR}; ${_MAKE} buildworld - ${_+_}@cd ${.CURDIR}; ${_MAKE} -B installworld + ${_+_}@cd ${.CURDIR}; ${_MAKE} installworld MK_META_MODE=no .if target(post-world) @echo @echo "--------------------------------------------------------------" Modified: user/alc/PG_CACHED/Makefile.inc1 ============================================================================== --- user/alc/PG_CACHED/Makefile.inc1 Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/Makefile.inc1 Tue Aug 9 23:47:40 2016 (r303898) @@ -2095,7 +2095,10 @@ cddl/lib/libctf__L: lib/libz__L # cddl/lib/libdtrace requires lib/libproc and lib/librtld_db; it's only built # on select architectures though (see cddl/lib/Makefile) .if ${MACHINE_CPUARCH} != "sparc64" -_prebuild_libs+= lib/libproc lib/librtld_db +_prebuild_libs+= lib/libprocstat lib/libproc lib/librtld_db +lib/libprocstat__L: lib/libelf__L lib/libkvm__L lib/libutil__L +lib/libproc__L: lib/libprocstat__L +lib/librtld_db__L: lib/libprocstat__L .endif .if ${MK_CRYPT} != "no" Modified: user/alc/PG_CACHED/bin/sh/expand.c ============================================================================== --- user/alc/PG_CACHED/bin/sh/expand.c Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/bin/sh/expand.c Tue Aug 9 23:47:40 2016 (r303898) @@ -473,7 +473,8 @@ expbackq(union node *cmd, int quoted, in if (--in.nleft < 0) { if (in.fd < 0) break; - while ((i = read(in.fd, buf, sizeof buf)) < 0 && errno == EINTR); + while ((i = read(in.fd, buf, sizeof buf)) < 0 && errno == EINTR) + ; TRACE(("expbackq: read returns %d\n", i)); if (i <= 0) break; Modified: user/alc/PG_CACHED/bin/uuidgen/uuidgen.c ============================================================================== --- user/alc/PG_CACHED/bin/uuidgen/uuidgen.c Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/bin/uuidgen/uuidgen.c Tue Aug 9 23:47:40 2016 (r303898) @@ -47,7 +47,7 @@ main(int argc, char *argv[]) FILE *fp; uuid_t *store, *uuid; char *p; - int ch, count, i, iterate; + int ch, count, i, iterate, status; count = -1; /* no count yet */ fp = stdout; /* default output file */ @@ -101,7 +101,9 @@ main(int argc, char *argv[]) uuid = store; while (count--) { - uuid_to_string(uuid++, &p, NULL); + uuid_to_string(uuid++, &p, &status); + if (status != uuid_s_ok) + err(1, "cannot stringify a UUID"); fprintf(fp, "%s\n", p); free(p); } Modified: user/alc/PG_CACHED/cddl/contrib/opensolaris/lib/libdtrace/arm/dt_isadep.c ============================================================================== --- user/alc/PG_CACHED/cddl/contrib/opensolaris/lib/libdtrace/arm/dt_isadep.c Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/cddl/contrib/opensolaris/lib/libdtrace/arm/dt_isadep.c Tue Aug 9 23:47:40 2016 (r303898) @@ -38,9 +38,7 @@ #include <dt_impl.h> #include <dt_pid.h> -#if !defined(sun) -#define PR_MODEL_ILP32 1 -#define PR_MODEL_LP64 2 +#ifdef __FreeBSD__ #include <libproc_compat.h> #endif Modified: user/alc/PG_CACHED/cddl/contrib/opensolaris/lib/libdtrace/i386/dt_isadep.c ============================================================================== --- user/alc/PG_CACHED/cddl/contrib/opensolaris/lib/libdtrace/i386/dt_isadep.c Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/cddl/contrib/opensolaris/lib/libdtrace/i386/dt_isadep.c Tue Aug 9 23:47:40 2016 (r303898) @@ -39,9 +39,8 @@ #include <dis_tables.h> -#ifndef illumos -#define PR_MODEL_ILP32 1 -#define PR_MODEL_LP64 2 +#ifdef __FreeBSD__ +#include <libproc.h> #include <libproc_compat.h> #endif @@ -93,11 +92,7 @@ dt_pid_has_jump_table(struct ps_prochand char dmodel = Pstatus(P)->pr_dmodel; #else pid_t pid = proc_getpid(P); -#if __i386__ - char dmodel = PR_MODEL_ILP32; -#elif __amd64__ - char dmodel = PR_MODEL_LP64; -#endif + char dmodel = proc_getmodel(P); #endif /* @@ -149,11 +144,7 @@ dt_pid_create_return_probe(struct ps_pro char dmodel = Pstatus(P)->pr_dmodel; #else pid_t pid = proc_getpid(P); -#if __i386__ - char dmodel = PR_MODEL_ILP32; -#elif __amd64__ - char dmodel = PR_MODEL_LP64; -#endif + char dmodel = proc_getmodel(P); #endif /* @@ -310,11 +301,7 @@ dt_pid_create_offset_probe(struct ps_pro char dmodel = Pstatus(P)->pr_dmodel; #else pid_t pid = proc_getpid(P); -#if __i386__ - char dmodel = PR_MODEL_ILP32; -#elif __amd64__ - char dmodel = PR_MODEL_LP64; -#endif + char dmodel = proc_getmodel(P); #endif if ((text = malloc(symp->st_size)) == NULL) { @@ -393,11 +380,7 @@ dt_pid_create_glob_offset_probes(struct char dmodel = Pstatus(P)->pr_dmodel; #else pid_t pid = proc_getpid(P); -#if __i386__ - char dmodel = PR_MODEL_ILP32; -#elif __amd64__ - char dmodel = PR_MODEL_LP64; -#endif + char dmodel = proc_getmodel(P); #endif ftp->ftps_type = DTFTP_OFFSETS; Modified: user/alc/PG_CACHED/cddl/contrib/opensolaris/lib/libzpool/common/util.c ============================================================================== --- user/alc/PG_CACHED/cddl/contrib/opensolaris/lib/libzpool/common/util.c Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/cddl/contrib/opensolaris/lib/libzpool/common/util.c Tue Aug 9 23:47:40 2016 (r303898) @@ -108,7 +108,7 @@ show_vdev_stats(const char *desc, const (void) printf("%*s%s%*s%*s%*s %5s %5s %5s %5s %5s %5s %5s\n", indent, "", prefix, - indent + strlen(prefix) - 25 - (vs->vs_space ? 0 : 12), + (int)(indent + strlen(prefix) - 25 - (vs->vs_space ? 0 : 12)), desc, vs->vs_space ? 6 : 0, vs->vs_space ? used : "", vs->vs_space ? 6 : 0, vs->vs_space ? avail : "", Modified: user/alc/PG_CACHED/contrib/binutils/bfd/ppcboot.c ============================================================================== --- user/alc/PG_CACHED/contrib/binutils/bfd/ppcboot.c Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/contrib/binutils/bfd/ppcboot.c Tue Aug 9 23:47:40 2016 (r303898) @@ -419,7 +419,7 @@ ppcboot_bfd_print_private_bfd_data (abfd if (tdata->header.os_id) fprintf (f, "OS_ID = 0x%.2x\n", tdata->header.os_id); - if (tdata->header.partition_name) + if (tdata->header.partition_name[0]) fprintf (f, _("Partition name = \"%s\"\n"), tdata->header.partition_name); for (i = 0; i < 4; i++) Modified: user/alc/PG_CACHED/contrib/blacklist/lib/bl.c ============================================================================== --- user/alc/PG_CACHED/contrib/blacklist/lib/bl.c Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/contrib/blacklist/lib/bl.c Tue Aug 9 23:47:40 2016 (r303898) @@ -152,8 +152,8 @@ bl_init(bl_t b, bool srv) b->b_fd = socket(PF_LOCAL, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK|SOCK_NOSIGPIPE, 0); if (b->b_fd == -1) { - bl_log(b->b_fun, LOG_ERR, "%s: socket failed (%m)", - __func__); + bl_log(b->b_fun, LOG_ERR, "%s: socket failed (%s)", + __func__, strerror(errno)); BL_UNLOCK(b); return -1; } @@ -200,8 +200,8 @@ bl_init(bl_t b, bool srv) */ if (b->b_connected != 1) { bl_log(b->b_fun, LOG_DEBUG, - "%s: connect failed for `%s' (%m)", - __func__, sun->sun_path); + "%s: connect failed for `%s' (%s)", + __func__, sun->sun_path, strerror(errno)); b->b_connected = 1; } BL_UNLOCK(b); @@ -220,8 +220,8 @@ bl_init(bl_t b, bool srv) errno = serrno; if (rv == -1) { bl_log(b->b_fun, LOG_ERR, - "%s: bind failed for `%s' (%m)", - __func__, sun->sun_path); + "%s: bind failed for `%s' (%s)", + __func__, sun->sun_path, strerror(errno)); goto out; } } @@ -260,7 +260,8 @@ bl_init(bl_t b, bool srv) if (setsockopt(b->b_fd, CRED_LEVEL, CRED_NAME, &one, (socklen_t)sizeof(one)) == -1) { bl_log(b->b_fun, LOG_ERR, "%s: setsockopt %s " - "failed (%m)", __func__, __STRING(CRED_NAME)); + "failed (%s)", __func__, __STRING(CRED_NAME), + strerror(errno)); goto out; } #endif @@ -296,7 +297,8 @@ bl_create(bool srv, const char *path, vo return b; out: free(b); - bl_log(fun, LOG_ERR, "%s: malloc failed (%m)", __func__); + bl_log(fun, LOG_ERR, "%s: malloc failed (%s)", __func__, + strerror(errno)); return NULL; } @@ -451,7 +453,8 @@ bl_recv(bl_t b) rlen = recvmsg(b->b_fd, &msg, 0); if (rlen == -1) { - bl_log(b->b_fun, LOG_ERR, "%s: recvmsg failed (%m)", __func__); + bl_log(b->b_fun, LOG_ERR, "%s: recvmsg failed (%s)", __func__, + strerror(errno)); return NULL; } Modified: user/alc/PG_CACHED/contrib/elftoolchain/readelf/readelf.c ============================================================================== --- user/alc/PG_CACHED/contrib/elftoolchain/readelf/readelf.c Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/contrib/elftoolchain/readelf/readelf.c Tue Aug 9 23:47:40 2016 (r303898) @@ -343,7 +343,7 @@ static const char *note_type_openbsd(uns static const char *note_type_unknown(unsigned int nt); static const char *note_type_xen(unsigned int nt); static const char *option_kind(uint8_t kind); -static const char *phdr_type(unsigned int ptype); +static const char *phdr_type(unsigned int mach, unsigned int ptype); static const char *ppc_abi_fp(uint64_t fp); static const char *ppc_abi_vector(uint64_t vec); static void readelf_usage(int status); @@ -622,10 +622,24 @@ elf_ver(unsigned int ver) } static const char * -phdr_type(unsigned int ptype) +phdr_type(unsigned int mach, unsigned int ptype) { static char s_ptype[32]; + if (ptype >= PT_LOPROC && ptype <= PT_HIPROC) { + switch (mach) { + case EM_ARM: + switch (ptype) { + case PT_ARM_ARCHEXT: return "ARM_ARCHEXT"; + case PT_ARM_EXIDX: return "ARM_EXIDX"; + } + break; + } + snprintf(s_ptype, sizeof(s_ptype), "LOPROC+%#x", + ptype - PT_LOPROC); + return (s_ptype); + } + switch (ptype) { case PT_NULL: return "NULL"; case PT_LOAD: return "LOAD"; @@ -639,10 +653,7 @@ phdr_type(unsigned int ptype) case PT_GNU_STACK: return "GNU_STACK"; case PT_GNU_RELRO: return "GNU_RELRO"; default: - if (ptype >= PT_LOPROC && ptype <= PT_HIPROC) - snprintf(s_ptype, sizeof(s_ptype), "LOPROC+%#x", - ptype - PT_LOPROC); - else if (ptype >= PT_LOOS && ptype <= PT_HIOS) + if (ptype >= PT_LOOS && ptype <= PT_HIOS) snprintf(s_ptype, sizeof(s_ptype), "LOOS+%#x", ptype - PT_LOOS); else @@ -659,6 +670,15 @@ section_type(unsigned int mach, unsigned if (stype >= SHT_LOPROC && stype <= SHT_HIPROC) { switch (mach) { + case EM_ARM: + switch (stype) { + case SHT_ARM_EXIDX: return "ARM_EXIDX"; + case SHT_ARM_PREEMPTMAP: return "ARM_PREEMPTMAP"; + case SHT_ARM_ATTRIBUTES: return "ARM_ATTRIBUTES"; + case SHT_ARM_DEBUGOVERLAY: return "ARM_DEBUGOVERLAY"; + case SHT_ARM_OVERLAYSECTION: return "ARM_OVERLAYSECTION"; + } + break; case EM_X86_64: switch (stype) { case SHT_X86_64_UNWIND: return "X86_64_UNWIND"; @@ -2273,9 +2293,10 @@ dump_phdr(struct readelf *re) #define PH_HDR "Type", "Offset", "VirtAddr", "PhysAddr", "FileSiz", \ "MemSiz", "Flg", "Align" -#define PH_CT phdr_type(phdr.p_type), (uintmax_t)phdr.p_offset, \ - (uintmax_t)phdr.p_vaddr, (uintmax_t)phdr.p_paddr, \ - (uintmax_t)phdr.p_filesz, (uintmax_t)phdr.p_memsz, \ +#define PH_CT phdr_type(re->ehdr.e_machine, phdr.p_type), \ + (uintmax_t)phdr.p_offset, (uintmax_t)phdr.p_vaddr, \ + (uintmax_t)phdr.p_paddr, (uintmax_t)phdr.p_filesz, \ + (uintmax_t)phdr.p_memsz, \ phdr.p_flags & PF_R ? 'R' : ' ', \ phdr.p_flags & PF_W ? 'W' : ' ', \ phdr.p_flags & PF_X ? 'E' : ' ', \ Modified: user/alc/PG_CACHED/contrib/libexecinfo/backtrace.c ============================================================================== --- user/alc/PG_CACHED/contrib/libexecinfo/backtrace.c Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/contrib/libexecinfo/backtrace.c Tue Aug 9 23:47:40 2016 (r303898) @@ -33,7 +33,6 @@ __RCSID("$NetBSD: backtrace.c,v 1.3 2013 #include <sys/param.h> #include <assert.h> -#define _WITH_DPRINTF #include <stdio.h> #include <string.h> #include <stdlib.h> Modified: user/alc/PG_CACHED/contrib/libpcap/pcap-bpf.c ============================================================================== --- user/alc/PG_CACHED/contrib/libpcap/pcap-bpf.c Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/contrib/libpcap/pcap-bpf.c Tue Aug 9 23:47:40 2016 (r303898) @@ -431,6 +431,22 @@ pcap_create_interface(const char *device p->activate_op = pcap_activate_bpf; p->can_set_rfmon_op = pcap_can_set_rfmon_bpf; +#ifdef BIOCSTSTAMP + /* + * We claim that we support microsecond and nanosecond time + * stamps. + */ + p->tstamp_precision_count = 2; + p->tstamp_precision_list = malloc(2 * sizeof(u_int)); + if (p->tstamp_precision_list == NULL) { + snprintf(ebuf, PCAP_ERRBUF_SIZE, "malloc: %s", + pcap_strerror(errno)); + free(p); + return (NULL); + } + p->tstamp_precision_list[0] = PCAP_TSTAMP_PRECISION_MICRO; + p->tstamp_precision_list[1] = PCAP_TSTAMP_PRECISION_NANO; +#endif /* BIOCSTSTAMP */ return (p); } @@ -946,7 +962,11 @@ pcap_read_bpf(pcap_t *p, int cnt, pcap_h /* * Loop through each packet. */ +#ifdef BIOCSTSTAMP +#define bhp ((struct bpf_xhdr *)bp) +#else #define bhp ((struct bpf_hdr *)bp) +#endif ep = bp + cc; #ifdef PCAP_FDDIPAD pad = p->fddipad; @@ -1008,7 +1028,25 @@ pcap_read_bpf(pcap_t *p, int cnt, pcap_h if (pb->filtering_in_kernel || bpf_filter(p->fcode.bf_insns, datap, bhp->bh_datalen, caplen)) { struct pcap_pkthdr pkthdr; +#ifdef BIOCSTSTAMP + struct bintime bt; + + bt.sec = bhp->bh_tstamp.bt_sec; + bt.frac = bhp->bh_tstamp.bt_frac; + if (p->opt.tstamp_precision == PCAP_TSTAMP_PRECISION_NANO) { + struct timespec ts; + + bintime2timespec(&bt, &ts); + pkthdr.ts.tv_sec = ts.tv_sec; + pkthdr.ts.tv_usec = ts.tv_nsec; + } else { + struct timeval tv; + bintime2timeval(&bt, &tv); + pkthdr.ts.tv_sec = tv.tv_sec; + pkthdr.ts.tv_usec = tv.tv_usec; + } +#else pkthdr.ts.tv_sec = bhp->bh_tstamp.tv_sec; #ifdef _AIX /* @@ -1019,6 +1057,7 @@ pcap_read_bpf(pcap_t *p, int cnt, pcap_h #else pkthdr.ts.tv_usec = bhp->bh_tstamp.tv_usec; #endif +#endif /* BIOCSTSTAMP */ #ifdef PCAP_FDDIPAD if (caplen > pad) pkthdr.caplen = caplen - pad; @@ -2192,6 +2231,16 @@ pcap_activate_bpf(pcap_t *p) } } +#ifdef BIOCSTSTAMP + v = BPF_T_BINTIME; + if (ioctl(p->fd, BIOCSTSTAMP, &v) < 0) { + snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "BIOCSTSTAMP: %s", + pcap_strerror(errno)); + status = PCAP_ERROR; + goto bad; + } +#endif /* BIOCSTSTAMP */ + if (ioctl(fd, BIOCGBLEN, (caddr_t)&v) < 0) { snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "BIOCGBLEN: %s", pcap_strerror(errno)); Modified: user/alc/PG_CACHED/contrib/llvm/projects/libunwind/src/Unwind-EHABI.cpp ============================================================================== --- user/alc/PG_CACHED/contrib/llvm/projects/libunwind/src/Unwind-EHABI.cpp Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/contrib/llvm/projects/libunwind/src/Unwind-EHABI.cpp Tue Aug 9 23:47:40 2016 (r303898) @@ -572,7 +572,7 @@ static _Unwind_Reason_Code unwind_phase2 unw_get_reg(cursor, UNW_REG_SP, &sp); if (unw_get_proc_info(cursor, &frameInfo) != UNW_ESUCCESS) { _LIBUNWIND_TRACE_UNWINDING("unwind_phase2(ex_ojb=%p): unw_get_proc_info " - "failed => _URC_FATAL_PHASE1_ERROR\n", + "failed => _URC_FATAL_PHASE2_ERROR\n", static_cast<void *>(exception_object)); return _URC_FATAL_PHASE2_ERROR; } Modified: user/alc/PG_CACHED/contrib/netbsd-tests/lib/libc/sys/t_timer_create.c ============================================================================== --- user/alc/PG_CACHED/contrib/netbsd-tests/lib/libc/sys/t_timer_create.c Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/contrib/netbsd-tests/lib/libc/sys/t_timer_create.c Tue Aug 9 23:47:40 2016 (r303898) @@ -116,6 +116,61 @@ timer_signal_create(clockid_t cid, bool ATF_REQUIRE(timer_delete(t) == 0); } +#ifdef __FreeBSD__ +static void +timer_callback(union sigval value) +{ + timer_t *tp; + + tp = value.sival_ptr; + + if (*tp == t) + fail = false; +} + +static void +timer_thread_create(clockid_t cid, bool expire) +{ + struct itimerspec tim; + struct sigevent evt; + + t = 0; + fail = true; + + (void)memset(&evt, 0, sizeof(struct sigevent)); + (void)memset(&tim, 0, sizeof(struct itimerspec)); + + /* + * Create the timer (SIGEV_THREAD). + */ + evt.sigev_notify_function = timer_callback; + evt.sigev_value.sival_ptr = &t; + evt.sigev_notify = SIGEV_THREAD; + + ATF_REQUIRE(timer_create(cid, &evt, &t) == 0); + + /* + * Start the timer. + */ + tim.it_value.tv_sec = expire ? 5 : 1; + tim.it_value.tv_nsec = 0; + + ATF_REQUIRE(timer_settime(t, 0, &tim, NULL) == 0); + + (void)sleep(2); + + if (expire) { + if (!fail) + atf_tc_fail("timer fired too soon"); + } else { + if (fail) + atf_tc_fail("timer failed to fire"); + } + + ATF_REQUIRE(timer_delete(t) == 0); +} +#endif + ATF_TC(timer_create_err); ATF_TC_HEAD(timer_create_err, tc) { @@ -198,6 +253,64 @@ ATF_TC_BODY(timer_create_mono_expire, tc timer_signal_create(CLOCK_MONOTONIC, true); } +ATF_TC(timer_thread_create_real); +ATF_TC_HEAD(timer_thread_create_real, tc) +{ + + atf_tc_set_md_var(tc, "descr", + "Checks timer_create(2) with CLOCK_REALTIME and sigevent(3), " + "SIGEV_THREAD"); +} + +#ifdef __FreeBSD__ +ATF_TC_BODY(timer_thread_create_real, tc) +{ + timer_thread_create(CLOCK_REALTIME, false); +} + +ATF_TC(timer_thread_create_mono); +ATF_TC_HEAD(timer_thread_create_mono, tc) +{ + + atf_tc_set_md_var(tc, "descr", + "Checks timer_create(2) with CLOCK_MONOTONIC and sigevent(3), " + "SIGEV_THREAD"); +} + +ATF_TC_BODY(timer_thread_create_mono, tc) +{ + timer_thread_create(CLOCK_MONOTONIC, false); +} + +ATF_TC(timer_thread_create_real_expire); +ATF_TC_HEAD(timer_thread_create_real_expire, tc) +{ + + atf_tc_set_md_var(tc, "descr", + "Checks timer_create(2) with CLOCK_REALTIME and sigevent(3), " + "SIGEV_THREAD, with expiration"); +} + +ATF_TC_BODY(timer_thread_create_real_expire, tc) +{ + timer_thread_create(CLOCK_REALTIME, true); +} + +ATF_TC(timer_thread_create_mono_expire); +ATF_TC_HEAD(timer_thread_create_mono_expire, tc) +{ + + atf_tc_set_md_var(tc, "descr", + "Checks timer_create(2) with CLOCK_MONOTONIC and sigevent(3), " + "SIGEV_THREAD, with expiration"); +} + +ATF_TC_BODY(timer_thread_create_mono_expire, tc) +{ + timer_thread_create(CLOCK_MONOTONIC, true); +} +#endif + ATF_TP_ADD_TCS(tp) { @@ -206,6 +319,12 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, timer_create_mono); ATF_TP_ADD_TC(tp, timer_create_real_expire); ATF_TP_ADD_TC(tp, timer_create_mono_expire); +#ifdef __FreeBSD__ + ATF_TP_ADD_TC(tp, timer_thread_create_real); + ATF_TP_ADD_TC(tp, timer_thread_create_mono); + ATF_TP_ADD_TC(tp, timer_thread_create_real_expire); + ATF_TP_ADD_TC(tp, timer_thread_create_mono_expire); +#endif return atf_no_error(); } Modified: user/alc/PG_CACHED/contrib/ofed/usr.lib/libibverbs/config.h ============================================================================== --- user/alc/PG_CACHED/contrib/ofed/usr.lib/libibverbs/config.h Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/contrib/ofed/usr.lib/libibverbs/config.h Tue Aug 9 23:47:40 2016 (r303898) @@ -1,2 +1 @@ -#define _WITH_GETLINE #include <alloca.h> Modified: user/alc/PG_CACHED/crypto/openssh/FREEBSD-upgrade ============================================================================== --- user/alc/PG_CACHED/crypto/openssh/FREEBSD-upgrade Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/crypto/openssh/FREEBSD-upgrade Tue Aug 9 23:47:40 2016 (r303898) @@ -142,30 +142,25 @@ Support for TCP wrappers was removed in upstream 6.7p1. We've added it back by porting the 6.6p1 code forward. -6) DSA keys - - DSA keys were disabled by default in upstream 6.9p1. We've added - them back. - -7) Agent client reference counting +6) Agent client reference counting We've added code to ssh-agent.c to implement client reference counting; the agent will automatically exit when the last client disconnects. -8) Class-based login restrictions +7) Class-based login restrictions We've added code to auth2.c to enforce the host.allow, host.deny, times.allow and times.deny login class capabilities. -9) HPN +8) HPN We no longer have the HPN patches (adaptive buffer size for increased throughput on high-BxD links), but we recognize and ignore HPN-related configuration options to avoid breaking existing configurations. -A) AES-CBC +9) AES-CBC The AES-CBC ciphers were removed from the server-side proposal list in 6.7p1 due to theoretical weaknesses and the availability of Modified: user/alc/PG_CACHED/crypto/openssh/config.h ============================================================================== --- user/alc/PG_CACHED/crypto/openssh/config.h Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/crypto/openssh/config.h Tue Aug 9 23:47:40 2016 (r303898) @@ -1701,7 +1701,7 @@ /* #undef WITH_SELINUX */ /* include SSH protocol version 1 support */ -#define WITH_SSH1 1 +/* #undef WITH_SSH1 */ /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ Modified: user/alc/PG_CACHED/crypto/openssh/configure.ac ============================================================================== --- user/alc/PG_CACHED/crypto/openssh/configure.ac Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/crypto/openssh/configure.ac Tue Aug 9 23:47:40 2016 (r303898) @@ -123,7 +123,7 @@ AC_CHECK_DECL([PR_SET_NO_NEW_PRIVS], [ha ]) openssl=yes -ssh1=yes +ssh1=no AC_ARG_WITH([openssl], [ --without-openssl Disable use of OpenSSL; use only limited internal crypto **EXPERIMENTAL** ], [ if test "x$withval" = "xno" ; then Modified: user/alc/PG_CACHED/crypto/openssh/myproposal.h ============================================================================== --- user/alc/PG_CACHED/crypto/openssh/myproposal.h Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/crypto/openssh/myproposal.h Tue Aug 9 23:47:40 2016 (r303898) @@ -100,13 +100,11 @@ HOSTKEY_ECDSA_CERT_METHODS \ "ssh-ed25519-cert-v01@openssh.com," \ "ssh-rsa-cert-v01@openssh.com," \ - "ssh-dss-cert-v01@openssh.com," \ HOSTKEY_ECDSA_METHODS \ "ssh-ed25519," \ "rsa-sha2-512," \ "rsa-sha2-256," \ - "ssh-rsa," \ - "ssh-dss" + "ssh-rsa" /* the actual algorithms */ Modified: user/alc/PG_CACHED/crypto/openssh/servconf.c ============================================================================== --- user/alc/PG_CACHED/crypto/openssh/servconf.c Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/crypto/openssh/servconf.c Tue Aug 9 23:47:40 2016 (r303898) @@ -22,6 +22,7 @@ __RCSID("$FreeBSD$"); #include <netinet/ip.h> #include <ctype.h> +#include <fcntl.h> #include <netdb.h> #include <pwd.h> #include <stdio.h> @@ -206,26 +207,28 @@ fill_default_server_options(ServerOption /* Standard Options */ if (options->protocol == SSH_PROTO_UNKNOWN) options->protocol = SSH_PROTO_2; - if (options->protocol & SSH_PROTO_1) - error("WARNING: SSH protocol version 1 enabled"); +#define add_host_key_file(path) \ + do { \ + if (access((path), O_RDONLY) == 0) \ + options->host_key_files \ + [options->num_host_key_files++] = (path); \ + } while (0) if (options->num_host_key_files == 0) { /* fill default hostkeys for protocols */ if (options->protocol & SSH_PROTO_1) - options->host_key_files[options->num_host_key_files++] = - _PATH_HOST_KEY_FILE; + add_host_key_file(_PATH_HOST_KEY_FILE); if (options->protocol & SSH_PROTO_2) { - options->host_key_files[options->num_host_key_files++] = - _PATH_HOST_RSA_KEY_FILE; - options->host_key_files[options->num_host_key_files++] = - _PATH_HOST_DSA_KEY_FILE; + add_host_key_file(_PATH_HOST_RSA_KEY_FILE); + add_host_key_file(_PATH_HOST_DSA_KEY_FILE); #ifdef OPENSSL_HAS_ECC - options->host_key_files[options->num_host_key_files++] = - _PATH_HOST_ECDSA_KEY_FILE; + add_host_key_file(_PATH_HOST_ECDSA_KEY_FILE); #endif - options->host_key_files[options->num_host_key_files++] = - _PATH_HOST_ED25519_KEY_FILE; + add_host_key_file(_PATH_HOST_ED25519_KEY_FILE); } } +#undef add_host_key_file + if (options->num_host_key_files == 0) + fatal("No host key files found"); /* No certificates by default */ if (options->num_ports == 0) options->ports[options->num_ports++] = SSH_DEFAULT_PORT; Modified: user/alc/PG_CACHED/crypto/openssh/ssh_config.5 ============================================================================== --- user/alc/PG_CACHED/crypto/openssh/ssh_config.5 Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/crypto/openssh/ssh_config.5 Tue Aug 9 23:47:40 2016 (r303898) @@ -871,10 +871,8 @@ ecdsa-sha2-nistp384-cert-v01@openssh.com ecdsa-sha2-nistp521-cert-v01@openssh.com, ssh-ed25519-cert-v01@openssh.com, ssh-rsa-cert-v01@openssh.com, -ssh-dss-cert-v01@openssh.com, -ecdsa-sha2-nistp256,ecdsa-sha2-nistp384, -ecdsa-sha2-nistp521,ssh-ed25519, -ssh-rsa,ssh-dss +ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, +ssh-ed25519,ssh-rsa .Ed .Pp The @@ -896,10 +894,8 @@ ecdsa-sha2-nistp384-cert-v01@openssh.com ecdsa-sha2-nistp521-cert-v01@openssh.com, ssh-ed25519-cert-v01@openssh.com, ssh-rsa-cert-v01@openssh.com, -ssh-dss-cert-v01@openssh.com, -ecdsa-sha2-nistp256,ecdsa-sha2-nistp384, -ecdsa-sha2-nistp521,ssh-ed25519, -ssh-rsa,ssh-dss +ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, +ssh-ed25519,ssh-rsa .Ed .Pp If hostkeys are known for the destination host then this default is modified @@ -1336,10 +1332,8 @@ ecdsa-sha2-nistp384-cert-v01@openssh.com ecdsa-sha2-nistp521-cert-v01@openssh.com, ssh-ed25519-cert-v01@openssh.com, ssh-rsa-cert-v01@openssh.com, -ssh-dss-cert-v01@openssh.com, -ecdsa-sha2-nistp256,ecdsa-sha2-nistp384, -ecdsa-sha2-nistp521,ssh-ed25519, -ssh-rsa,ssh-dss +ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, +ssh-ed25519,ssh-rsa .Ed .Pp The Modified: user/alc/PG_CACHED/crypto/openssh/sshd_config.5 ============================================================================== --- user/alc/PG_CACHED/crypto/openssh/sshd_config.5 Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/crypto/openssh/sshd_config.5 Tue Aug 9 23:47:40 2016 (r303898) @@ -659,10 +659,8 @@ ecdsa-sha2-nistp384-cert-v01@openssh.com ecdsa-sha2-nistp521-cert-v01@openssh.com, ssh-ed25519-cert-v01@openssh.com, ssh-rsa-cert-v01@openssh.com, -ssh-dss-cert-v01@openssh.com, -ecdsa-sha2-nistp256,ecdsa-sha2-nistp384, -ecdsa-sha2-nistp521,ssh-ed25519, -ssh-rsa,ssh-dss +ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, +ssh-ed25519,ssh-rsa .Ed .Pp The @@ -753,10 +751,8 @@ ecdsa-sha2-nistp384-cert-v01@openssh.com ecdsa-sha2-nistp521-cert-v01@openssh.com, ssh-ed25519-cert-v01@openssh.com, ssh-rsa-cert-v01@openssh.com, -ssh-dss-cert-v01@openssh.com, -ecdsa-sha2-nistp256,ecdsa-sha2-nistp384, -ecdsa-sha2-nistp521,ssh-ed25519, -ssh-rsa,ssh-dss +ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, +ssh-ed25519,ssh-rsa .Ed .Pp The list of available key types may also be obtained using the @@ -1372,10 +1368,8 @@ ecdsa-sha2-nistp384-cert-v01@openssh.com ecdsa-sha2-nistp521-cert-v01@openssh.com, ssh-ed25519-cert-v01@openssh.com, ssh-rsa-cert-v01@openssh.com, -ssh-dss-cert-v01@openssh.com, -ecdsa-sha2-nistp256,ecdsa-sha2-nistp384, -ecdsa-sha2-nistp521,ssh-ed25519, -ssh-rsa,ssh-dss +ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, +ssh-ed25519,ssh-rsa .Ed .Pp The Modified: user/alc/PG_CACHED/etc/rc.d/sshd ============================================================================== --- user/alc/PG_CACHED/etc/rc.d/sshd Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/etc/rc.d/sshd Tue Aug 9 23:47:40 2016 (r303898) @@ -23,7 +23,7 @@ extra_commands="configtest keygen reload : ${sshd_rsa1_enable:="no"} : ${sshd_rsa_enable:="yes"} -: ${sshd_dsa_enable:="yes"} +: ${sshd_dsa_enable:="no"} : ${sshd_ecdsa_enable:="yes"} : ${sshd_ed25519_enable:="yes"} Modified: user/alc/PG_CACHED/include/grp.h ============================================================================== --- user/alc/PG_CACHED/include/grp.h Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/include/grp.h Tue Aug 9 23:47:40 2016 (r303898) @@ -75,8 +75,7 @@ int pwcache_groupdb(int (*)(int), void struct group * (*)(gid_t)); #endif #if __XSI_VISIBLE -/* XXX IEEE Std 1003.1, 2003 specifies `void setgrent(void)' */ -int setgrent(void); +void setgrent(void); #endif #if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE int getgrgid_r(gid_t, struct group *, char *, size_t, Modified: user/alc/PG_CACHED/include/stdio.h ============================================================================== --- user/alc/PG_CACHED/include/stdio.h Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/include/stdio.h Tue Aug 9 23:47:40 2016 (r303898) @@ -357,44 +357,9 @@ ssize_t getdelim(char ** __restrict, si FILE *open_memstream(char **, size_t *); int renameat(int, const char *, int, const char *); int vdprintf(int, const char * __restrict, __va_list); - -/* - * Every programmer and his dog wrote functions called getline() and dprintf() - * before POSIX.1-2008 came along and decided to usurp the names, so we - * don't prototype them by default unless one of the following is true: - * a) the app has requested them specifically by defining _WITH_GETLINE or - * _WITH_DPRINTF, respectively - * b) the app has requested a POSIX.1-2008 environment via _POSIX_C_SOURCE - * c) the app defines a GNUism such as _BSD_SOURCE or _GNU_SOURCE - */ -#ifndef _WITH_GETLINE -#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE) -#define _WITH_GETLINE -#elif defined(_POSIX_C_SOURCE) -#if _POSIX_C_SOURCE >= 200809 -#define _WITH_GETLINE -#endif -#endif -#endif - -#ifdef _WITH_GETLINE +/* _WITH_GETLINE to allow pre 11 sources to build on 11+ systems */ ssize_t getline(char ** __restrict, size_t * __restrict, FILE * __restrict); -#endif - -#ifndef _WITH_DPRINTF -#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE) -#define _WITH_DPRINTF -#elif defined(_POSIX_C_SOURCE) -#if _POSIX_C_SOURCE >= 200809 -#define _WITH_DPRINTF -#endif -#endif -#endif - -#ifdef _WITH_DPRINTF -int (dprintf)(int, const char * __restrict, ...); -#endif - +int dprintf(int, const char * __restrict, ...); #endif /* __POSIX_VISIBLE >= 200809 */ /* Modified: user/alc/PG_CACHED/include/xlocale/_locale.h ============================================================================== --- user/alc/PG_CACHED/include/xlocale/_locale.h Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/include/xlocale/_locale.h Tue Aug 9 23:47:40 2016 (r303898) @@ -48,7 +48,7 @@ typedef struct _xlocale *locale_t; #endif locale_t duplocale(locale_t base); -int freelocale(locale_t loc); +void freelocale(locale_t loc); locale_t newlocale(int mask, const char *locale, locale_t base); const char *querylocale(int mask, locale_t loc); locale_t uselocale(locale_t loc); Modified: user/alc/PG_CACHED/lib/libc/Versions.def ============================================================================== --- user/alc/PG_CACHED/lib/libc/Versions.def Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/lib/libc/Versions.def Tue Aug 9 23:47:40 2016 (r303898) @@ -27,6 +27,10 @@ FBSD_1.3 { FBSD_1.4 { } FBSD_1.3; +# This version was first added to 12.0-current. +FBSD_1.5 { +} FBSD_1.4; + # This is our private namespace. Any global interfaces that are # strictly for use only by other FreeBSD applications and libraries @@ -35,4 +39,4 @@ FBSD_1.4 { # # Please do NOT increment the version of this namespace. FBSDprivate_1.0 { -} FBSD_1.4; +} FBSD_1.5; Modified: user/alc/PG_CACHED/lib/libc/gen/Makefile.inc ============================================================================== --- user/alc/PG_CACHED/lib/libc/gen/Makefile.inc Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/lib/libc/gen/Makefile.inc Tue Aug 9 23:47:40 2016 (r303898) @@ -390,6 +390,7 @@ MLINKS+=getgrent.3 endgrent.3 \ getgrent.3 getgrgid_r.3 MLINKS+=gethostname.3 sethostname.3 MLINKS+=getnetgrent.3 endnetgrent.3 \ + getnetgrent.3 getnetgrent_r.3 \ getnetgrent.3 innetgr.3 \ getnetgrent.3 setnetgrent.3 MLINKS+=getprogname.3 setprogname.3 Modified: user/alc/PG_CACHED/lib/libc/gen/clock_getcpuclockid.3 ============================================================================== --- user/alc/PG_CACHED/lib/libc/gen/clock_getcpuclockid.3 Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/lib/libc/gen/clock_getcpuclockid.3 Tue Aug 9 23:47:40 2016 (r303898) @@ -70,7 +70,9 @@ Upon successful completion, returns zero; otherwise, an error number is returned to indicate the error. .Sh ERRORS -The clock_getcpuclockid() function will fail if: +The +.Fn clock_getcpuclockid +function will fail if: .Bl -tag -width Er .It Bq Er EPERM The requesting process does not have permission to access the CPU-time @@ -84,7 +86,7 @@ No process can be found corresponding to .Sh STANDARDS The .Fn clock_getcpuclockid -function conform to +function conforms to .St -p1003.1-2001 . .Sh HISTORY The Modified: user/alc/PG_CACHED/lib/libc/gen/getgrent.3 ============================================================================== --- user/alc/PG_CACHED/lib/libc/gen/getgrent.3 Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/lib/libc/gen/getgrent.3 Tue Aug 9 23:47:40 2016 (r303898) @@ -28,7 +28,7 @@ .\" From: @(#)getgrent.3 8.2 (Berkeley) 4/19/94 .\" $FreeBSD$ .\" -.Dd April 16, 2003 +.Dd July 31, 2016 .Dt GETGRENT 3 .Os .Sh NAME @@ -60,7 +60,7 @@ .Fn getgrgid_r "gid_t gid" "struct group *grp" "char *buffer" "size_t bufsize" "struct group **result" .Ft int .Fn setgroupent "int stayopen" -.Ft int +.Ft void .Fn setgrent void .Ft void .Fn endgrent void @@ -188,14 +188,13 @@ is set to .Dv NULL and the return value is 0, no matching entry exists.) .Pp -The functions +The function .Fn setgroupent -and -.Fn setgrent -return the value 1 if successful, otherwise the value +returns the value 1 if successful, otherwise the value 0 is returned. The functions -.Fn endgrent +.Fn endgrent , +.Fn setgrent and .Fn setgrfile have no return value. Modified: user/alc/PG_CACHED/lib/libc/gen/getgrent.c ============================================================================== --- user/alc/PG_CACHED/lib/libc/gen/getgrent.c Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/lib/libc/gen/getgrent.c Tue Aug 9 23:47:40 2016 (r303898) @@ -533,12 +533,10 @@ out: return (rv); } -/* XXX IEEE Std 1003.1, 2003 specifies `void setgrent(void)' */ -int +void setgrent(void) { (void)_nsdispatch(NULL, setgrent_dtab, NSDB_GROUP, "setgrent", defaultsrc, 0); - return (1); } Modified: user/alc/PG_CACHED/lib/libc/gen/glob.3 ============================================================================== --- user/alc/PG_CACHED/lib/libc/gen/glob.3 Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/lib/libc/gen/glob.3 Tue Aug 9 23:47:40 2016 (r303898) @@ -363,7 +363,7 @@ file .It Dv GLOB_NOSPACE An attempt to allocate memory failed, or if .Fa errno -was 0 +was E2BIG, .Dv GLOB_LIMIT was specified in the flags and .Fa pglob\->gl_matchc Modified: user/alc/PG_CACHED/lib/libc/gen/glob.c ============================================================================== --- user/alc/PG_CACHED/lib/libc/gen/glob.c Tue Aug 9 22:48:46 2016 (r303897) +++ user/alc/PG_CACHED/lib/libc/gen/glob.c Tue Aug 9 23:47:40 2016 (r303898) @@ -177,6 +177,8 @@ static int globexp2(const Char *, const static int globfinal(glob_t *, struct glob_limit *, size_t, const char *); static int match(Char *, Char *, Char *); +static int err_nomatch(glob_t *, struct glob_limit *, const char *); +static int err_aborted(glob_t *, int, char *); #ifdef DEBUG static void qprintf(const char *, Char *); #endif @@ -217,8 +219,7 @@ glob(const char * __restrict pattern, in while (bufnext <= bufend) { clen = mbrtowc(&wc, patnext, MB_LEN_MAX, &mbs); if (clen == (size_t)-1 || clen == (size_t)-2) - return (globfinal(pglob, &limit, - pglob->gl_pathc, pattern)); + return (err_nomatch(pglob, &limit, pattern)); else if (clen == 0) { too_long = 0; break; @@ -240,8 +241,7 @@ glob(const char * __restrict pattern, in prot = 0; clen = mbrtowc(&wc, patnext, MB_LEN_MAX, &mbs); if (clen == (size_t)-1 || clen == (size_t)-2) - return (globfinal(pglob, &limit, - pglob->gl_pathc, pattern)); + return (err_nomatch(pglob, &limit, pattern)); else if (clen == 0) { too_long = 0; break; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608092347.u79Nlfvx063026>