Date: Sat, 15 Oct 2016 22:49:04 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r307383 - in projects/clang390-import: . cddl/contrib/opensolaris/lib/libdtrace/common contrib/libarchive/cpio/test contrib/libarchive/libarchive contrib/libarchive/libarchive/test cont... Message-ID: <201610152249.u9FMn4HC061121@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Sat Oct 15 22:49:04 2016 New Revision: 307383 URL: https://svnweb.freebsd.org/changeset/base/307383 Log: Merge ^/head r306906 through r307382. Added: projects/clang390-import/etc/rc.d/zfsbe - copied unchanged from r307382, head/etc/rc.d/zfsbe projects/clang390-import/lib/libc/libc_nossp.ldscript - copied unchanged from r307382, head/lib/libc/libc_nossp.ldscript projects/clang390-import/lib/libefivar/ - copied from r307382, head/lib/libefivar/ projects/clang390-import/lib/libgcc_eh/ - copied from r307382, head/lib/libgcc_eh/ projects/clang390-import/lib/libgcc_s/ - copied from r307382, head/lib/libgcc_s/ projects/clang390-import/share/mk/bsd.suffixes-posix.mk - copied unchanged from r307382, head/share/mk/bsd.suffixes-posix.mk projects/clang390-import/share/mk/bsd.suffixes.mk - copied unchanged from r307382, head/share/mk/bsd.suffixes.mk projects/clang390-import/sys/arm64/conf/RPI3 - copied unchanged from r307382, head/sys/arm64/conf/RPI3 projects/clang390-import/sys/dev/efidev/ - copied from r307382, head/sys/dev/efidev/ projects/clang390-import/sys/dev/gpio/gpioregulator.c - copied unchanged from r307382, head/sys/dev/gpio/gpioregulator.c projects/clang390-import/sys/i386/include/efi.h - copied unchanged from r307382, head/sys/i386/include/efi.h projects/clang390-import/sys/mips/include/efi.h - copied unchanged from r307382, head/sys/mips/include/efi.h projects/clang390-import/sys/pc98/include/efi.h - copied unchanged from r307382, head/sys/pc98/include/efi.h projects/clang390-import/sys/powerpc/include/efi.h - copied unchanged from r307382, head/sys/powerpc/include/efi.h projects/clang390-import/sys/riscv/include/efi.h - copied unchanged from r307382, head/sys/riscv/include/efi.h projects/clang390-import/sys/sparc64/include/efi.h - copied unchanged from r307382, head/sys/sparc64/include/efi.h projects/clang390-import/sys/sys/efiio.h - copied unchanged from r307382, head/sys/sys/efiio.h projects/clang390-import/usr.sbin/efivar/ - copied from r307382, head/usr.sbin/efivar/ Deleted: projects/clang390-import/gnu/usr.bin/rcs/ projects/clang390-import/lib/libefi/ projects/clang390-import/share/doc/psd/13.rcs/ projects/clang390-import/tools/build/options/WITH_RCS projects/clang390-import/usr.bin/sdiff/common.c projects/clang390-import/usr.bin/sdiff/common.h Modified: projects/clang390-import/ObsoleteFiles.inc projects/clang390-import/UPDATING projects/clang390-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c projects/clang390-import/contrib/libarchive/cpio/test/main.c projects/clang390-import/contrib/libarchive/cpio/test/test.h projects/clang390-import/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c projects/clang390-import/contrib/libarchive/libarchive/archive_read_disk_set_standard_lookup.c projects/clang390-import/contrib/libarchive/libarchive/test/main.c projects/clang390-import/contrib/libarchive/libarchive/test/test.h projects/clang390-import/contrib/libarchive/libarchive/test/test_read_set_format.c projects/clang390-import/contrib/libarchive/tar/test/main.c projects/clang390-import/contrib/libarchive/tar/test/test.h projects/clang390-import/contrib/libarchive/tar/test/test_missing_file.c projects/clang390-import/contrib/mdocml/mandocdb.c projects/clang390-import/contrib/netbsd-tests/fs/tmpfs/h_tools.c projects/clang390-import/contrib/netbsd-tests/fs/tmpfs/t_mount.sh projects/clang390-import/contrib/netbsd-tests/fs/tmpfs/t_remove.sh projects/clang390-import/etc/defaults/rc.conf projects/clang390-import/etc/mtree/BSD.usr.dist projects/clang390-import/etc/rc.d/Makefile projects/clang390-import/etc/rc.d/jail projects/clang390-import/etc/rc.d/zfs projects/clang390-import/gnu/usr.bin/Makefile projects/clang390-import/gnu/usr.bin/groff/mdate.sh projects/clang390-import/include/Makefile projects/clang390-import/include/search.h projects/clang390-import/lib/Makefile projects/clang390-import/lib/libc/Makefile projects/clang390-import/lib/libc/gen/arc4random.c projects/clang390-import/lib/libc/gen/recvmmsg.c projects/clang390-import/lib/libc/mips/string/strchr.S projects/clang390-import/lib/libc/mips/string/strrchr.S projects/clang390-import/lib/libc/stdlib/random.c projects/clang390-import/lib/libc/stdlib/tdelete.c projects/clang390-import/lib/libc/stdlib/tfind.c projects/clang390-import/lib/libc/stdlib/tsearch.3 projects/clang390-import/lib/libc/stdlib/tsearch.c projects/clang390-import/lib/libc/stdlib/twalk.c projects/clang390-import/lib/libc/tests/stdio/printbasic_test.c projects/clang390-import/lib/libc/tests/stdlib/tsearch_test.c projects/clang390-import/lib/libdevdctl/consumer.cc projects/clang390-import/lib/libucl/Makefile projects/clang390-import/lib/msun/Makefile projects/clang390-import/lib/msun/src/s_fmax.c projects/clang390-import/lib/msun/src/s_fmin.c projects/clang390-import/release/Makefile.vm projects/clang390-import/release/arm/BANANAPI.conf projects/clang390-import/release/arm/CUBIEBOARD2.conf projects/clang390-import/release/arm/RPI2.conf projects/clang390-import/release/doc/en_US.ISO8859-1/hardware/article.xml projects/clang390-import/release/doc/share/xml/sponsor.ent projects/clang390-import/release/picobsd/build/picobsd projects/clang390-import/release/tools/vmimage.subr projects/clang390-import/sbin/pfctl/parse.y projects/clang390-import/share/doc/psd/Makefile projects/clang390-import/share/man/man5/pf.conf.5 projects/clang390-import/share/man/man5/src.conf.5 projects/clang390-import/share/man/man9/Makefile projects/clang390-import/share/man/man9/mbuf.9 projects/clang390-import/share/man/man9/mbuf_tags.9 projects/clang390-import/share/misc/bsd-family-tree projects/clang390-import/share/mk/Makefile projects/clang390-import/share/mk/bsd.lib.mk projects/clang390-import/share/mk/bsd.libnames.mk projects/clang390-import/share/mk/src.libnames.mk projects/clang390-import/share/mk/src.opts.mk projects/clang390-import/share/mk/sys.mk projects/clang390-import/sys/amd64/amd64/efirt.c (contents, props changed) projects/clang390-import/sys/amd64/amd64/mem.c projects/clang390-import/sys/amd64/conf/GENERIC projects/clang390-import/sys/arm/allwinner/axp209.c projects/clang390-import/sys/arm/allwinner/axp209reg.h projects/clang390-import/sys/arm/allwinner/clk/aw_gate.c projects/clang390-import/sys/arm/allwinner/clk/aw_pll.c projects/clang390-import/sys/arm/arm/mem.c projects/clang390-import/sys/arm/arm/nexus.c projects/clang390-import/sys/arm/broadcom/bcm2835/bcm2835_bsc.c projects/clang390-import/sys/arm/broadcom/bcm2835/bcm2835_common.c projects/clang390-import/sys/arm/broadcom/bcm2835/bcm2835_dma.c projects/clang390-import/sys/arm/broadcom/bcm2835/bcm2835_fb.c projects/clang390-import/sys/arm/broadcom/bcm2835/bcm2835_fbd.c projects/clang390-import/sys/arm/broadcom/bcm2835/bcm2835_gpio.c projects/clang390-import/sys/arm/broadcom/bcm2835/bcm2835_intr.c projects/clang390-import/sys/arm/broadcom/bcm2835/bcm2835_mbox.c projects/clang390-import/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c projects/clang390-import/sys/arm/broadcom/bcm2835/bcm2835_spi.c projects/clang390-import/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h projects/clang390-import/sys/arm/broadcom/bcm2835/bcm2835_wdog.c projects/clang390-import/sys/arm/broadcom/bcm2835/bcm283x_dwc_fdt.c projects/clang390-import/sys/arm/broadcom/bcm2835/files.bcm283x projects/clang390-import/sys/arm/conf/ATMEL projects/clang390-import/sys/arm/conf/AVILA projects/clang390-import/sys/arm/conf/BWCT projects/clang390-import/sys/arm/conf/CAMBRIA projects/clang390-import/sys/arm/conf/CNS11XXNAS projects/clang390-import/sys/arm/conf/CRB projects/clang390-import/sys/arm/conf/DB-78XXX projects/clang390-import/sys/arm/conf/DB-88F5XXX projects/clang390-import/sys/arm/conf/DB-88F6XXX projects/clang390-import/sys/arm/conf/DOCKSTAR projects/clang390-import/sys/arm/conf/DREAMPLUG-1001 projects/clang390-import/sys/arm/conf/EA3250 projects/clang390-import/sys/arm/conf/EB9200 projects/clang390-import/sys/arm/conf/ETHERNUT5 projects/clang390-import/sys/arm/conf/EXYNOS5.common projects/clang390-import/sys/arm/conf/GENERIC projects/clang390-import/sys/arm/conf/GUMSTIX projects/clang390-import/sys/arm/conf/HL200 projects/clang390-import/sys/arm/conf/HL201 projects/clang390-import/sys/arm/conf/KB920X projects/clang390-import/sys/arm/conf/NSLU projects/clang390-import/sys/arm/conf/QILA9G20 projects/clang390-import/sys/arm/conf/SAM9260EK projects/clang390-import/sys/arm/conf/SAM9G20EK projects/clang390-import/sys/arm/conf/SAM9X25EK projects/clang390-import/sys/arm/conf/SHEEVAPLUG projects/clang390-import/sys/arm/conf/SN9G45 projects/clang390-import/sys/arm/conf/TS7800 projects/clang390-import/sys/arm/conf/std.armv6 projects/clang390-import/sys/arm/include/efi.h projects/clang390-import/sys/arm64/arm64/identcpu.c projects/clang390-import/sys/arm64/arm64/locore.S projects/clang390-import/sys/arm64/arm64/machdep.c projects/clang390-import/sys/arm64/arm64/mem.c projects/clang390-import/sys/arm64/arm64/mp_machdep.c projects/clang390-import/sys/arm64/arm64/nexus.c projects/clang390-import/sys/arm64/arm64/vfp.c projects/clang390-import/sys/arm64/arm64/vm_machdep.c projects/clang390-import/sys/arm64/conf/GENERIC projects/clang390-import/sys/arm64/include/armreg.h projects/clang390-import/sys/arm64/include/efi.h projects/clang390-import/sys/arm64/include/pcb.h projects/clang390-import/sys/arm64/include/vfp.h projects/clang390-import/sys/boot/arm/uboot/Makefile projects/clang390-import/sys/boot/common/bootstrap.h projects/clang390-import/sys/boot/common/dev_net.c projects/clang390-import/sys/boot/common/interp.c projects/clang390-import/sys/boot/common/interp_forth.c projects/clang390-import/sys/boot/common/loader.8 projects/clang390-import/sys/boot/common/pnp.c projects/clang390-import/sys/boot/efi/loader/Makefile projects/clang390-import/sys/boot/efi/loader/arch/amd64/ldscript.amd64 projects/clang390-import/sys/boot/efi/loader/arch/arm/ldscript.arm projects/clang390-import/sys/boot/efi/loader/arch/arm64/ldscript.arm64 projects/clang390-import/sys/boot/efi/loader/arch/i386/efimd.c projects/clang390-import/sys/boot/efi/loader/arch/i386/elf32_freebsd.c projects/clang390-import/sys/boot/efi/loader/arch/i386/exec.c projects/clang390-import/sys/boot/efi/loader/arch/i386/ldscript.i386 projects/clang390-import/sys/boot/efi/loader/main.c projects/clang390-import/sys/boot/ficl/ficl.h projects/clang390-import/sys/boot/ficl/i386/sysdep.c projects/clang390-import/sys/boot/ficl/loader.c projects/clang390-import/sys/boot/i386/libi386/Makefile projects/clang390-import/sys/boot/i386/libi386/biospci.c projects/clang390-import/sys/boot/i386/libi386/libi386.h projects/clang390-import/sys/boot/mips/beri/loader/loader.ldscript projects/clang390-import/sys/boot/mips/uboot/Makefile projects/clang390-import/sys/boot/pc98/libpc98/Makefile projects/clang390-import/sys/boot/powerpc/kboot/Makefile projects/clang390-import/sys/boot/powerpc/ofw/Makefile projects/clang390-import/sys/boot/powerpc/ps3/Makefile projects/clang390-import/sys/boot/sparc64/loader/Makefile projects/clang390-import/sys/boot/userboot/userboot/Makefile projects/clang390-import/sys/cam/cam_compat.c projects/clang390-import/sys/cam/ctl/ctl.c projects/clang390-import/sys/cam/ctl/ctl.h projects/clang390-import/sys/cam/ctl/ctl_backend.c projects/clang390-import/sys/cam/scsi/scsi_enc_ses.c projects/clang390-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c projects/clang390-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/clang390-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h projects/clang390-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c projects/clang390-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/clang390-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/clang390-import/sys/conf/NOTES projects/clang390-import/sys/conf/files projects/clang390-import/sys/conf/files.arm64 projects/clang390-import/sys/conf/kern.mk projects/clang390-import/sys/conf/kern.opts.mk projects/clang390-import/sys/conf/options projects/clang390-import/sys/conf/options.arm64 projects/clang390-import/sys/contrib/octeon-sdk/cvmx-dma-engine.h projects/clang390-import/sys/contrib/octeon-sdk/cvmx-higig.h projects/clang390-import/sys/contrib/octeon-sdk/cvmx-pcie.c projects/clang390-import/sys/contrib/octeon-sdk/cvmx-raid.h projects/clang390-import/sys/contrib/vchiq/interface/vchiq_arm/vchiq_kmod.c projects/clang390-import/sys/dev/acpi_support/atk0110.c projects/clang390-import/sys/dev/cxgbe/t4_main.c projects/clang390-import/sys/dev/drm2/i915/i915_gem.c projects/clang390-import/sys/dev/drm2/ttm/ttm_bo_vm.c projects/clang390-import/sys/dev/hyperv/include/vmbus.h projects/clang390-import/sys/dev/hyperv/netvsc/hv_net_vsc.h projects/clang390-import/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/clang390-import/sys/dev/hyperv/netvsc/hv_rndis_filter.c projects/clang390-import/sys/dev/hyperv/netvsc/if_hnvar.h projects/clang390-import/sys/dev/hyperv/netvsc/ndis.h projects/clang390-import/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c projects/clang390-import/sys/dev/hyperv/vmbus/vmbus_br.c projects/clang390-import/sys/dev/hyperv/vmbus/vmbus_chan.c projects/clang390-import/sys/dev/iicbus/iicsmb.c projects/clang390-import/sys/dev/iwm/if_iwm.c projects/clang390-import/sys/dev/kbd/kbd.c projects/clang390-import/sys/dev/otus/if_otus.c projects/clang390-import/sys/dev/sfxge/common/ef10_nic.c projects/clang390-import/sys/dev/sfxge/common/ef10_tlv_layout.h projects/clang390-import/sys/dev/smbus/smbconf.h projects/clang390-import/sys/dev/smbus/smbus.c projects/clang390-import/sys/dev/usb/controller/dwc_otg_fdt.c projects/clang390-import/sys/dev/usb/net/if_smsc.c projects/clang390-import/sys/dev/usb/wlan/if_rsu.c projects/clang390-import/sys/fs/nandfs/nandfs_vnops.c projects/clang390-import/sys/i386/conf/GENERIC projects/clang390-import/sys/i386/i386/mem.c projects/clang390-import/sys/kern/kern_linker.c projects/clang390-import/sys/kern/subr_gtaskqueue.c projects/clang390-import/sys/kern/subr_intr.c projects/clang390-import/sys/kern/uipc_accf.c projects/clang390-import/sys/kern/vfs_bio.c projects/clang390-import/sys/mips/conf/ADM5120 projects/clang390-import/sys/mips/conf/ALCHEMY projects/clang390-import/sys/mips/conf/AR71XX_BASE projects/clang390-import/sys/mips/conf/AR724X_BASE projects/clang390-import/sys/mips/conf/BCM projects/clang390-import/sys/mips/conf/BERI_TEMPLATE projects/clang390-import/sys/mips/conf/ERL projects/clang390-import/sys/mips/conf/GXEMUL projects/clang390-import/sys/mips/conf/GXEMUL32 projects/clang390-import/sys/mips/conf/IDT projects/clang390-import/sys/mips/conf/MT7620 projects/clang390-import/sys/mips/conf/OCTEON1 projects/clang390-import/sys/mips/conf/PB92 projects/clang390-import/sys/mips/conf/QCA953X_BASE projects/clang390-import/sys/mips/conf/QEMU projects/clang390-import/sys/mips/conf/RT305X projects/clang390-import/sys/mips/conf/RT5350 projects/clang390-import/sys/mips/conf/SENTRY5 projects/clang390-import/sys/mips/conf/XLR projects/clang390-import/sys/mips/conf/XLR64 projects/clang390-import/sys/mips/conf/XLRN32 projects/clang390-import/sys/mips/conf/std.AR5312 projects/clang390-import/sys/mips/conf/std.AR5315 projects/clang390-import/sys/mips/conf/std.AR91XX projects/clang390-import/sys/mips/conf/std.AR933X projects/clang390-import/sys/mips/conf/std.AR934X projects/clang390-import/sys/mips/conf/std.MALTA projects/clang390-import/sys/mips/conf/std.QCA955X projects/clang390-import/sys/mips/conf/std.SWARM projects/clang390-import/sys/mips/conf/std.XLP projects/clang390-import/sys/mips/mips/nexus.c projects/clang390-import/sys/modules/bwn/Makefile projects/clang390-import/sys/modules/cc/Makefile projects/clang390-import/sys/modules/dtb/allwinner/Makefile projects/clang390-import/sys/modules/efirt/Makefile projects/clang390-import/sys/modules/khelp/Makefile projects/clang390-import/sys/net/if.c projects/clang390-import/sys/net/if_llatbl.c projects/clang390-import/sys/net/if_llatbl.h projects/clang390-import/sys/net/rndis.h projects/clang390-import/sys/net80211/ieee80211.h projects/clang390-import/sys/net80211/ieee80211_ht.c projects/clang390-import/sys/net80211/ieee80211_input.c projects/clang390-import/sys/net80211/ieee80211_proto.h projects/clang390-import/sys/netinet/in_pcb.c projects/clang390-import/sys/netinet/ip_output.c projects/clang390-import/sys/netinet/sctp_pcb.c projects/clang390-import/sys/netinet/tcp_input.c projects/clang390-import/sys/netinet/tcp_output.c projects/clang390-import/sys/netinet/tcp_stacks/fastpath.c projects/clang390-import/sys/netinet/tcp_subr.c projects/clang390-import/sys/netinet/tcp_syncache.c projects/clang390-import/sys/netinet/tcp_timer.c projects/clang390-import/sys/netinet/tcp_usrreq.c projects/clang390-import/sys/netinet/tcp_var.h projects/clang390-import/sys/netinet6/ip6_output.c projects/clang390-import/sys/netpfil/pf/pf.c projects/clang390-import/sys/netpfil/pf/pf_norm.c projects/clang390-import/sys/pc98/conf/GENERIC projects/clang390-import/sys/powerpc/conf/GENERIC projects/clang390-import/sys/powerpc/conf/GENERIC64 projects/clang390-import/sys/powerpc/conf/MPC85XX projects/clang390-import/sys/powerpc/powerpc/mem.c projects/clang390-import/sys/riscv/conf/GENERIC projects/clang390-import/sys/sparc64/conf/GENERIC projects/clang390-import/sys/sys/efi.h projects/clang390-import/sys/sys/linker.h projects/clang390-import/sys/sys/mbuf.h projects/clang390-import/sys/sys/param.h projects/clang390-import/sys/vm/vm_fault.c projects/clang390-import/sys/vm/vm_object.c projects/clang390-import/sys/vm/vm_page.c projects/clang390-import/sys/vm/vm_page.h projects/clang390-import/sys/x86/x86/io_apic.c projects/clang390-import/targets/pseudo/userland/misc/Makefile.depend projects/clang390-import/tests/sys/kern/kern_copyin.c projects/clang390-import/tests/sys/kern/pipe/pipe_fstat_bug_test.c projects/clang390-import/tools/build/mk/OptionalObsoleteFiles.inc projects/clang390-import/tools/build/options/WITHOUT_MANDOCDB projects/clang390-import/usr.bin/sdiff/Makefile projects/clang390-import/usr.bin/sdiff/edit.c projects/clang390-import/usr.bin/sdiff/sdiff.c projects/clang390-import/usr.bin/truss/syscalls.c projects/clang390-import/usr.sbin/Makefile projects/clang390-import/usr.sbin/chown/chown.c projects/clang390-import/usr.sbin/ctladm/ctladm.8 projects/clang390-import/usr.sbin/freebsd-update/freebsd-update.sh Directory Properties: projects/clang390-import/ (props changed) projects/clang390-import/cddl/ (props changed) projects/clang390-import/cddl/contrib/opensolaris/ (props changed) projects/clang390-import/contrib/libarchive/ (props changed) projects/clang390-import/contrib/mdocml/ (props changed) projects/clang390-import/contrib/netbsd-tests/ (props changed) projects/clang390-import/sys/cddl/contrib/opensolaris/ (props changed) projects/clang390-import/sys/contrib/octeon-sdk/ (props changed) Modified: projects/clang390-import/ObsoleteFiles.inc ============================================================================== --- projects/clang390-import/ObsoleteFiles.inc Sat Oct 15 20:04:14 2016 (r307382) +++ projects/clang390-import/ObsoleteFiles.inc Sat Oct 15 22:49:04 2016 (r307383) @@ -130,6 +130,32 @@ OLD_FILES+=usr/lib/clang/3.8.0/lib/freeb OLD_DIRS+=usr/lib/clang/3.8.0/lib/freebsd OLD_DIRS+=usr/lib/clang/3.8.0/lib OLD_DIRS+=usr/lib/clang/3.8.0 +# 20161015: Remove GNU rcs +OLD_FILES+=usr/bin/ci +OLD_FILES+=usr/bin/co +OLD_FILES+=usr/bin/merge +OLD_FILES+=usr/bin/rcs +OLD_FILES+=usr/bin/rcsclean +OLD_FILES+=usr/bin/rcsdiff +OLD_FILES+=usr/bin/rcsfreeze +OLD_FILES+=usr/bin/rcsmerge +OLD_FILES+=usr/bin/rlog +OLD_FILES+=usr/share/doc/psd/13.rcs/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/13.rcs/rcs_func.ascii.gz +OLD_DIRS+=usr/share/doc/psd/13.rcs +OLD_FILES+=usr/share/man/man1/ci.1.gz +OLD_FILES+=usr/share/man/man1/co.1.gz +OLD_FILES+=usr/share/man/man1/merge.1.gz +OLD_FILES+=usr/share/man/man1/rcs.1.gz +OLD_FILES+=usr/share/man/man1/rcsclean.1.gz +OLD_FILES+=usr/share/man/man1/rcsdiff.1.gz +OLD_FILES+=usr/share/man/man1/rcsfreeze.1.gz +OLD_FILES+=usr/share/man/man1/rcsintro.1.gz +OLD_FILES+=usr/share/man/man1/rcsmerge.1.gz +OLD_FILES+=usr/share/man/man1/rlog.1.gz +OLD_FILES+=usr/share/man/man5/rcsfile.5.gz +# 20161010: remove link to removed m_getclr(9) macro +OLD_FILES+=usr/share/man/man9/m_getclr.9.gz # 20161003: MK_ELFCOPY_AS_OBJCOPY option retired OLD_FILES+=usr/bin/elfcopy OLD_FILES+=usr/share/man/man1/elfcopy.1.gz @@ -572,9 +598,6 @@ OLD_FILES+=usr/lib/clang/3.7.0/lib/freeb OLD_DIRS+=usr/lib/clang/3.7.0/lib/freebsd OLD_DIRS+=usr/lib/clang/3.7.0/lib OLD_DIRS+=usr/lib/clang/3.7.0 -# 20151201: mqueue tests 3 and 4 disabled -OLD_FILES+=usr/tests/sys/mqueue/mqtest3 -OLD_FILES+=usr/tests/sys/mqueue/mqtest4 # 20151130: libelf moved from /usr/lib to /lib (libkvm dependency in r291406) OLD_LIBS+=usr/lib/libelf.so.2 # 20151115: Fox bad upgrade scheme Modified: projects/clang390-import/UPDATING ============================================================================== --- projects/clang390-import/UPDATING Sat Oct 15 20:04:14 2016 (r307382) +++ projects/clang390-import/UPDATING Sat Oct 15 22:49:04 2016 (r307383) @@ -31,6 +31,17 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20161015: + GNU rcs has been removed from base. It is available as packages: + - rcs: Latest GPLv3 GNU rcs version. + - rcs57: Copy of the latest version of GNU rcs (GPLv2) before it was + removed from base. + +20161008: + Use of the cc_cdg, cc_chd, cc_hd, or cc_vegas congestion control + modules now requires that the kernel configuration contain the + TCP_HHOOK option. (This option is included in the GENERIC kernel.) + 20161003: The WITHOUT_ELFCOPY_AS_OBJCOPY src.conf(5) knob has been retired. ELF Tool Chain's elfcopy is always installed as /usr/bin/objcopy. Modified: projects/clang390-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c ============================================================================== --- projects/clang390-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c Sat Oct 15 20:04:14 2016 (r307382) +++ projects/clang390-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c Sat Oct 15 22:49:04 2016 (r307383) @@ -581,6 +581,7 @@ int dt_printf(dtrace_hdl_t *dtp, FILE *fp, const char *format, ...) { va_list ap; + va_list ap2; int n; #ifndef illumos @@ -605,11 +606,13 @@ dt_printf(dtrace_hdl_t *dtp, FILE *fp, c len = dtp->dt_sprintf_buflen - len; assert(len >= 0); - if ((n = vsnprintf(buf, len, format, ap)) < 0) + va_copy(ap2, ap); + if ((n = vsnprintf(buf, len, format, ap2)) < 0) n = dt_set_errno(dtp, errno); + va_end(ap2); va_end(ap); - + return (n); } @@ -640,11 +643,14 @@ dt_printf(dtrace_hdl_t *dtp, FILE *fp, c dtp->dt_buffered_buf[0] = '\0'; } - if ((needed = vsnprintf(NULL, 0, format, ap)) < 0) { + va_copy(ap2, ap); + if ((needed = vsnprintf(NULL, 0, format, ap2)) < 0) { rval = dt_set_errno(dtp, errno); + va_end(ap2); va_end(ap); return (rval); } + va_end(ap2); if (needed == 0) { va_end(ap); @@ -670,12 +676,15 @@ dt_printf(dtrace_hdl_t *dtp, FILE *fp, c dtp->dt_buffered_size <<= 1; } + va_copy(ap2, ap); if (vsnprintf(&dtp->dt_buffered_buf[dtp->dt_buffered_offs], - avail, format, ap) < 0) { + avail, format, ap2) < 0) { rval = dt_set_errno(dtp, errno); + va_end(ap2); va_end(ap); return (rval); } + va_end(ap2); dtp->dt_buffered_offs += needed; assert(dtp->dt_buffered_buf[dtp->dt_buffered_offs] == '\0'); @@ -683,8 +692,10 @@ dt_printf(dtrace_hdl_t *dtp, FILE *fp, c return (0); } - n = vfprintf(fp, format, ap); + va_copy(ap2, ap); + n = vfprintf(fp, format, ap2); fflush(fp); + va_end(ap2); va_end(ap); if (n < 0) { Modified: projects/clang390-import/contrib/libarchive/cpio/test/main.c ============================================================================== --- projects/clang390-import/contrib/libarchive/cpio/test/main.c Sat Oct 15 20:04:14 2016 (r307382) +++ projects/clang390-import/contrib/libarchive/cpio/test/main.c Sat Oct 15 22:49:04 2016 (r307383) @@ -130,6 +130,13 @@ __FBSDID("$FreeBSD$"); # include <crtdbg.h> #endif +mode_t umasked(mode_t expected_mode) +{ + mode_t mode = umask(0); + umask(mode); + return expected_mode & ~mode; +} + /* Path to working directory for current test */ const char *testworkdir; #ifdef PROGRAM @@ -1294,6 +1301,11 @@ assertion_file_time(const char *file, in switch (type) { case 'a': filet_nsec = st.st_atimespec.tv_nsec; break; case 'b': filet = st.st_birthtime; + /* FreeBSD filesystems that don't support birthtime + * (e.g., UFS1) always return -1 here. */ + if (filet == -1) { + return (1); + } filet_nsec = st.st_birthtimespec.tv_nsec; break; case 'm': filet_nsec = st.st_mtimespec.tv_nsec; break; default: fprintf(stderr, "INTERNAL: Bad type %c for file time", type); @@ -1425,7 +1437,7 @@ assertion_file_nlinks(const char *file, assertion_count(file, line); r = lstat(pathname, &st); if (r == 0 && (int)st.st_nlink == nlinks) - return (1); + return (1); failure_start(file, line, "File %s has %d links, expected %d", pathname, st.st_nlink, nlinks); failure_finish(NULL); @@ -1661,6 +1673,7 @@ assertion_make_file(const char *file, in if (0 != chmod(path, mode)) { failure_start(file, line, "Could not chmod %s", path); failure_finish(NULL); + close(fd); return (0); } if (contents != NULL) { @@ -1675,6 +1688,7 @@ assertion_make_file(const char *file, in failure_start(file, line, "Could not write to %s", path); failure_finish(NULL); + close(fd); return (0); } } Modified: projects/clang390-import/contrib/libarchive/cpio/test/test.h ============================================================================== --- projects/clang390-import/contrib/libarchive/cpio/test/test.h Sat Oct 15 20:04:14 2016 (r307382) +++ projects/clang390-import/contrib/libarchive/cpio/test/test.h Sat Oct 15 22:49:04 2016 (r307383) @@ -182,6 +182,8 @@ assertion_file_nlinks(__FILE__, __LINE__, pathname, nlinks) #define assertFileSize(pathname, size) \ assertion_file_size(__FILE__, __LINE__, pathname, size) +#define assertFileMode(pathname, mode) \ + assertion_file_mode(__FILE__, __LINE__, pathname, mode) #define assertTextFileContents(text, pathname) \ assertion_text_file_contents(__FILE__, __LINE__, text, pathname) #define assertFileContainsLinesAnyOrder(pathname, lines) \ @@ -327,6 +329,9 @@ void copy_reference_file(const char *); */ void extract_reference_files(const char **); +/* Subtract umask from mode */ +mode_t umasked(mode_t expected_mode); + /* Path to working directory for current test */ extern const char *testworkdir; Modified: projects/clang390-import/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c ============================================================================== --- projects/clang390-import/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c Sat Oct 15 20:04:14 2016 (r307382) +++ projects/clang390-import/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c Sat Oct 15 22:49:04 2016 (r307383) @@ -627,7 +627,6 @@ translate_acl(struct archive_read_disk * archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, "Unknown ACL brand"); return (ARCHIVE_WARN); - break; } #endif Modified: projects/clang390-import/contrib/libarchive/libarchive/archive_read_disk_set_standard_lookup.c ============================================================================== --- projects/clang390-import/contrib/libarchive/libarchive/archive_read_disk_set_standard_lookup.c Sat Oct 15 20:04:14 2016 (r307382) +++ projects/clang390-import/contrib/libarchive/libarchive/archive_read_disk_set_standard_lookup.c Sat Oct 15 22:49:04 2016 (r307383) @@ -232,6 +232,7 @@ static const char * lookup_uname_helper(struct name_cache *cache, id_t id) { struct passwd *result; + (void)cache; /* UNUSED */ result = getpwuid((uid_t)id); @@ -298,6 +299,7 @@ static const char * lookup_gname_helper(struct name_cache *cache, id_t id) { struct group *result; + (void)cache; /* UNUSED */ result = getgrgid((gid_t)id); Modified: projects/clang390-import/contrib/libarchive/libarchive/test/main.c ============================================================================== --- projects/clang390-import/contrib/libarchive/libarchive/test/main.c Sat Oct 15 20:04:14 2016 (r307382) +++ projects/clang390-import/contrib/libarchive/libarchive/test/main.c Sat Oct 15 22:49:04 2016 (r307383) @@ -128,6 +128,13 @@ __FBSDID("$FreeBSD$"); # include <crtdbg.h> #endif +mode_t umasked(mode_t expected_mode) +{ + mode_t mode = umask(0); + umask(mode); + return expected_mode & ~mode; +} + /* Path to working directory for current test */ const char *testworkdir; #ifdef PROGRAM @@ -1364,6 +1371,31 @@ assertion_file_birthtime_recent(const ch return assertion_file_time(file, line, pathname, 0, 0, 'b', 1); } +/* Verify mode of 'pathname'. */ +int +assertion_file_mode(const char *file, int line, const char *pathname, int expected_mode) +{ + int mode; + int r; + + assertion_count(file, line); +#if defined(_WIN32) && !defined(__CYGWIN__) + failure_start(file, line, "assertFileMode not yet implemented for Windows"); +#else + { + struct stat st; + r = lstat(pathname, &st); + mode = (int)(st.st_mode & 0777); + } + if (r == 0 && mode == expected_mode) + return (1); + failure_start(file, line, "File %s has mode %o, expected %o", + pathname, mode, expected_mode); +#endif + failure_finish(NULL); + return (0); +} + /* Verify mtime of 'pathname'. */ int assertion_file_mtime(const char *file, int line, @@ -1403,7 +1435,7 @@ assertion_file_nlinks(const char *file, assertion_count(file, line); r = lstat(pathname, &st); if (r == 0 && (int)st.st_nlink == nlinks) - return (1); + return (1); failure_start(file, line, "File %s has %d links, expected %d", pathname, st.st_nlink, nlinks); failure_finish(NULL); @@ -1440,31 +1472,6 @@ assertion_file_size(const char *file, in return (0); } -/* Verify mode of 'pathname'. */ -int -assertion_file_mode(const char *file, int line, const char *pathname, int expected_mode) -{ - int mode; - int r; - - assertion_count(file, line); -#if defined(_WIN32) && !defined(__CYGWIN__) - failure_start(file, line, "assertFileMode not yet implemented for Windows"); -#else - { - struct stat st; - r = lstat(pathname, &st); - mode = (int)(st.st_mode & 0777); - } - if (r == 0 && mode == expected_mode) - return (1); - failure_start(file, line, "File %s has mode %o, expected %o", - pathname, mode, expected_mode); -#endif - failure_finish(NULL); - return (0); -} - /* Assert that 'pathname' is a dir. If mode >= 0, verify that too. */ int assertion_is_dir(const char *file, int line, const char *pathname, int mode) @@ -1664,6 +1671,7 @@ assertion_make_file(const char *file, in if (0 != chmod(path, mode)) { failure_start(file, line, "Could not chmod %s", path); failure_finish(NULL); + close(fd); return (0); } if (contents != NULL) { @@ -1678,6 +1686,7 @@ assertion_make_file(const char *file, in failure_start(file, line, "Could not write to %s", path); failure_finish(NULL); + close(fd); return (0); } } Modified: projects/clang390-import/contrib/libarchive/libarchive/test/test.h ============================================================================== --- projects/clang390-import/contrib/libarchive/libarchive/test/test.h Sat Oct 15 20:04:14 2016 (r307382) +++ projects/clang390-import/contrib/libarchive/libarchive/test/test.h Sat Oct 15 22:49:04 2016 (r307383) @@ -243,12 +243,12 @@ int assertion_file_birthtime_recent(cons int assertion_file_contains_lines_any_order(const char *, int, const char *, const char **); int assertion_file_contents(const char *, int, const void *, int, const char *); int assertion_file_exists(const char *, int, const char *); +int assertion_file_mode(const char *, int, const char *, int); int assertion_file_mtime(const char *, int, const char *, long, long); int assertion_file_mtime_recent(const char *, int, const char *); int assertion_file_nlinks(const char *, int, const char *, int); int assertion_file_not_exists(const char *, int, const char *); int assertion_file_size(const char *, int, const char *, long); -int assertion_file_mode(const char *, int, const char *, int); int assertion_is_dir(const char *, int, const char *, int); int assertion_is_hardlink(const char *, int, const char *, const char *); int assertion_is_not_hardlink(const char *, int, const char *, const char *); @@ -329,6 +329,9 @@ void copy_reference_file(const char *); */ void extract_reference_files(const char **); +/* Subtract umask from mode */ +mode_t umasked(mode_t expected_mode); + /* Path to working directory for current test */ extern const char *testworkdir; Modified: projects/clang390-import/contrib/libarchive/libarchive/test/test_read_set_format.c ============================================================================== --- projects/clang390-import/contrib/libarchive/libarchive/test/test_read_set_format.c Sat Oct 15 20:04:14 2016 (r307382) +++ projects/clang390-import/contrib/libarchive/libarchive/test/test_read_set_format.c Sat Oct 15 22:49:04 2016 (r307383) @@ -200,6 +200,8 @@ DEFINE_TEST(test_read_append_filter_wron { struct archive_entry *ae; struct archive *a; + int fd; + fpos_t pos; /* * If we have "bunzip2 -q", try using that. @@ -208,6 +210,13 @@ DEFINE_TEST(test_read_append_filter_wron skipping("Can't run bunzip2 program on this platform"); return; } + + /* bunzip2 will write to stderr, redirect it to a file */ + fflush(stderr); + fgetpos(stderr, &pos); + fd = dup(fileno(stderr)); + freopen("stderr1", "w", stderr); + assert((a = archive_read_new()) != NULL); assertA(0 == archive_read_set_format(a, ARCHIVE_FORMAT_TAR)); assertEqualIntA(a, ARCHIVE_OK, @@ -217,4 +226,13 @@ DEFINE_TEST(test_read_append_filter_wron assertA(archive_read_next_header(a, &ae) < (ARCHIVE_WARN)); assertEqualIntA(a, ARCHIVE_WARN, archive_read_close(a)); assertEqualInt(ARCHIVE_OK, archive_read_free(a)); + + /* restore stderr */ + fflush(stderr); + dup2(fd, fileno(stderr)); + close(fd); + clearerr(stderr); + fsetpos(stderr, &pos); + + assertTextFileContents("bunzip2: (stdin) is not a bzip2 file.\n", "stderr1"); } Modified: projects/clang390-import/contrib/libarchive/tar/test/main.c ============================================================================== --- projects/clang390-import/contrib/libarchive/tar/test/main.c Sat Oct 15 20:04:14 2016 (r307382) +++ projects/clang390-import/contrib/libarchive/tar/test/main.c Sat Oct 15 22:49:04 2016 (r307383) @@ -1164,6 +1164,35 @@ assertion_file_contains_lines_any_order( return (0); } +/* Verify that a text file does not contains the specified strings */ +int +assertion_file_contains_no_invalid_strings(const char *file, int line, + const char *pathname, const char *strings[]) +{ + char *buff; + int i; + + buff = slurpfile(NULL, "%s", pathname); + if (buff == NULL) { + failure_start(file, line, "Can't read file: %s", pathname); + failure_finish(NULL); + return (0); + } + + for (i = 0; strings[i] != NULL; ++i) { + if (strstr(buff, strings[i]) != NULL) { + failure_start(file, line, "Invalid string in %s: %s", pathname, + strings[i]); + failure_finish(NULL); + free(buff); + return(0); + } + } + + free(buff); + return (0); +} + /* Test that two paths point to the same file. */ /* As a side-effect, asserts that both files exist. */ static int @@ -1301,6 +1330,11 @@ assertion_file_time(const char *file, in switch (type) { case 'a': filet_nsec = st.st_atimespec.tv_nsec; break; case 'b': filet = st.st_birthtime; + /* FreeBSD filesystems that don't support birthtime + * (e.g., UFS1) always return -1 here. */ + if (filet == -1) { + return (1); + } filet_nsec = st.st_birthtimespec.tv_nsec; break; case 'm': filet_nsec = st.st_mtimespec.tv_nsec; break; default: fprintf(stderr, "INTERNAL: Bad type %c for file time", type); @@ -1432,7 +1466,7 @@ assertion_file_nlinks(const char *file, assertion_count(file, line); r = lstat(pathname, &st); if (r == 0 && (int)st.st_nlink == nlinks) - return (1); + return (1); failure_start(file, line, "File %s has %d links, expected %d", pathname, st.st_nlink, nlinks); failure_finish(NULL); @@ -1668,6 +1702,7 @@ assertion_make_file(const char *file, in if (0 != chmod(path, mode)) { failure_start(file, line, "Could not chmod %s", path); failure_finish(NULL); + close(fd); return (0); } if (contents != NULL) { @@ -1682,6 +1717,7 @@ assertion_make_file(const char *file, in failure_start(file, line, "Could not write to %s", path); failure_finish(NULL); + close(fd); return (0); } } Modified: projects/clang390-import/contrib/libarchive/tar/test/test.h ============================================================================== --- projects/clang390-import/contrib/libarchive/tar/test/test.h Sat Oct 15 20:04:14 2016 (r307382) +++ projects/clang390-import/contrib/libarchive/tar/test/test.h Sat Oct 15 22:49:04 2016 (r307383) @@ -174,6 +174,9 @@ /* Assert that file contents match a string. */ #define assertFileContents(data, data_size, pathname) \ assertion_file_contents(__FILE__, __LINE__, data, data_size, pathname) +/* Verify that a file does not contain invalid strings */ +#define assertFileContainsNoInvalidStrings(pathname, strings) \ + assertion_file_contains_no_invalid_strings(__FILE__, __LINE__, pathname, strings) #define assertFileMtime(pathname, sec, nsec) \ assertion_file_mtime(__FILE__, __LINE__, pathname, sec, nsec) #define assertFileMtimeRecent(pathname) \ @@ -182,6 +185,8 @@ assertion_file_nlinks(__FILE__, __LINE__, pathname, nlinks) #define assertFileSize(pathname, size) \ assertion_file_size(__FILE__, __LINE__, pathname, size) +#define assertFileMode(pathname, mode) \ + assertion_file_mode(__FILE__, __LINE__, pathname, mode) #define assertTextFileContents(text, pathname) \ assertion_text_file_contents(__FILE__, __LINE__, text, pathname) #define assertFileContainsLinesAnyOrder(pathname, lines) \ @@ -239,6 +244,7 @@ int assertion_file_atime_recent(const ch int assertion_file_birthtime(const char *, int, const char *, long, long); int assertion_file_birthtime_recent(const char *, int, const char *); int assertion_file_contains_lines_any_order(const char *, int, const char *, const char **); +int assertion_file_contains_no_invalid_strings(const char *, int, const char *, const char **); int assertion_file_contents(const char *, int, const void *, int, const char *); int assertion_file_exists(const char *, int, const char *); int assertion_file_mode(const char *, int, const char *, int); Modified: projects/clang390-import/contrib/libarchive/tar/test/test_missing_file.c ============================================================================== --- projects/clang390-import/contrib/libarchive/tar/test/test_missing_file.c Sat Oct 15 20:04:14 2016 (r307382) +++ projects/clang390-import/contrib/libarchive/tar/test/test_missing_file.c Sat Oct 15 22:49:04 2016 (r307383) @@ -27,11 +27,15 @@ __FBSDID("$FreeBSD$"); DEFINE_TEST(test_missing_file) { + const char * invalid_stderr[] = { "INTERNAL ERROR", NULL }; assertMakeFile("file1", 0644, "file1"); assertMakeFile("file2", 0644, "file2"); assert(0 == systemf("%s -cf archive.tar file1 file2 2>stderr1", testprog)); assertEmptyFile("stderr1"); assert(0 != systemf("%s -cf archive.tar file1 file2 file3 2>stderr2", testprog)); + assertFileContainsNoInvalidStrings("stderr2", invalid_stderr); assert(0 != systemf("%s -cf archive.tar 2>stderr3", testprog)); - assert(0 != systemf("%s -cf archive.tar file3 2>stderr4", testprog)); + assertFileContainsNoInvalidStrings("stderr3", invalid_stderr); + assert(0 != systemf("%s -cf archive.tar file3 file4 2>stderr4", testprog)); + assertFileContainsNoInvalidStrings("stderr4", invalid_stderr); } Modified: projects/clang390-import/contrib/mdocml/mandocdb.c ============================================================================== --- projects/clang390-import/contrib/mdocml/mandocdb.c Sat Oct 15 20:04:14 2016 (r307382) +++ projects/clang390-import/contrib/mdocml/mandocdb.c Sat Oct 15 22:49:04 2016 (r307383) @@ -103,6 +103,7 @@ struct mpage { char *arch; /* architecture from file content */ char *title; /* title from file content */ char *desc; /* description from file content */ + struct mpage *next; /* singly linked list */ struct mlink *mlinks; /* singly linked list */ int form; /* format from file content */ int name_head_done; @@ -146,6 +147,7 @@ static void dbadd_mlink_name(const stru static int dbopen(int); static void dbprune(void); static void filescan(const char *); +static int fts_compare(const FTSENT *const *, const FTSENT *const *); static void mlink_add(struct mlink *, const struct stat *); static void mlink_check(struct mpage *, struct mlink *); static void mlink_free(struct mlink *); @@ -204,6 +206,7 @@ static struct ohash strings; /* table o static sqlite3 *db = NULL; /* current database */ static sqlite3_stmt *stmts[STMT__MAX]; /* current statements */ static uint64_t name_mask; +static struct mpage *mpage_head; static const struct mdoc_handler mdocs[MDOC_MAX] = { { NULL, 0 }, /* Ap */ @@ -571,6 +574,20 @@ usage: return (int)MANDOCLEVEL_BADARG; } +static int +fts_compare(const FTSENT *const *a, const FTSENT *const *b) +{ + + /* + * The mpage list is processed in the opposite order to which pages are + * added, so traverse the hierarchy in reverse alpha order, resulting + * in database inserts in alpha order. This is not required for correct + * operation, but is helpful when inspecting the database during + * development. + */ + return -strcmp((*a)->fts_name, (*b)->fts_name); +} + /* * Scan a directory tree rooted at "basedir" for manpages. * We use fts(), scanning directory parts along the way for clues to our @@ -600,8 +617,8 @@ treescan(void) argv[0] = "."; argv[1] = (char *)NULL; - f = fts_open((char * const *)argv, - FTS_PHYSICAL | FTS_NOCHDIR, NULL); + f = fts_open((char * const *)argv, FTS_PHYSICAL | FTS_NOCHDIR, + fts_compare); if (f == NULL) { exitcode = (int)MANDOCLEVEL_SYSERR; say("", "&fts_open"); @@ -966,6 +983,8 @@ mlink_add(struct mlink *mlink, const str mpage = mandoc_calloc(1, sizeof(struct mpage)); mpage->inodev.st_ino = inodev.st_ino; mpage->inodev.st_dev = inodev.st_dev; + mpage->next = mpage_head; + mpage_head = mpage; ohash_insert(&mpages, slot, mpage); } else mlink->next = mpage->mlinks; @@ -989,20 +1008,18 @@ mpages_free(void) { struct mpage *mpage; struct mlink *mlink; - unsigned int slot; - mpage = ohash_first(&mpages, &slot); - while (NULL != mpage) { + while (NULL != (mpage = mpage_head)) { while (NULL != (mlink = mpage->mlinks)) { mpage->mlinks = mlink->next; mlink_free(mlink); } + mpage_head = mpage->next; free(mpage->sec); free(mpage->arch); free(mpage->title); free(mpage->desc); free(mpage); - mpage = ohash_next(&mpages, &slot); } } @@ -1123,16 +1140,14 @@ mpages_merge(struct mparse *mp) char *sodest; char *cp; int fd; - unsigned int pslot; if ( ! nodb) SQL_EXEC("BEGIN TRANSACTION"); - mpage = ohash_first(&mpages, &pslot); - while (mpage != NULL) { + for (mpage = mpage_head; mpage != NULL; mpage = mpage->next) { mlinks_undupe(mpage); if ((mlink = mpage->mlinks) == NULL) { - mpage = ohash_next(&mpages, &pslot); + mpage = mpage->next; continue; } @@ -1256,7 +1271,6 @@ mpages_merge(struct mparse *mp) nextpage: ohash_delete(&strings); ohash_delete(&names); - mpage = ohash_next(&mpages, &pslot); } if (0 == nodb) Modified: projects/clang390-import/contrib/netbsd-tests/fs/tmpfs/h_tools.c ============================================================================== --- projects/clang390-import/contrib/netbsd-tests/fs/tmpfs/h_tools.c Sat Oct 15 20:04:14 2016 (r307382) +++ projects/clang390-import/contrib/netbsd-tests/fs/tmpfs/h_tools.c Sat Oct 15 22:49:04 2016 (r307383) @@ -50,6 +50,10 @@ #include <string.h> #include <unistd.h> +#ifdef __FreeBSD__ +#include <inttypes.h> +#endif + /* --------------------------------------------------------------------- */ static int getfh_main(int, char **); @@ -70,7 +74,12 @@ getfh_main(int argc, char **argv) if (argc < 2) return EXIT_FAILURE; +#ifdef __FreeBSD__ + fh_size = sizeof(fhandle_t); +#else fh_size = 0; +#endif + fh = NULL; for (;;) { if (fh_size) { @@ -85,7 +94,11 @@ getfh_main(int argc, char **argv) * but it may change if someone moves things around, * so retry untill we have enough memory. */ +#ifdef __FreeBSD__ + error = getfh(argv[1], fh); +#else error = getfh(argv[1], fh, &fh_size); +#endif if (error == 0) { break; } else { Modified: projects/clang390-import/contrib/netbsd-tests/fs/tmpfs/t_mount.sh ============================================================================== --- projects/clang390-import/contrib/netbsd-tests/fs/tmpfs/t_mount.sh Sat Oct 15 20:04:14 2016 (r307382) +++ projects/clang390-import/contrib/netbsd-tests/fs/tmpfs/t_mount.sh Sat Oct 15 22:49:04 2016 (r307383) @@ -93,7 +93,18 @@ negative_body() { test_unmount } +# Begin FreeBSD +if true; then +atf_test_case large cleanup +large_cleanup() { + umount -f tmp 2>/dev/null +} +else +# End FreeBSD atf_test_case large +# Begin FreeBSD +fi +# End FreeBSD large_head() { atf_set "descr" "Tests that extremely long values passed to -s" \ "are handled correctly" @@ -103,6 +114,10 @@ large_body() { test_mount -o -s9223372036854775807 test_unmount + # Begin FreeBSD + atf_expect_fail "-o -s<large-size> succeeds unexpectedly on FreeBSD - bug 212862" + # End FreeBSD + mkdir tmp atf_check -s eq:1 -o empty -e ignore \ mount -t tmpfs -o -s9223372036854775808 tmpfs tmp Modified: projects/clang390-import/contrib/netbsd-tests/fs/tmpfs/t_remove.sh ============================================================================== --- projects/clang390-import/contrib/netbsd-tests/fs/tmpfs/t_remove.sh Sat Oct 15 20:04:14 2016 (r307382) +++ projects/clang390-import/contrib/netbsd-tests/fs/tmpfs/t_remove.sh Sat Oct 15 22:49:04 2016 (r307383) @@ -46,13 +46,28 @@ single_body() { test_unmount } +# Begin FreeBSD +if true; then +atf_test_case uchg cleanup +uchg_cleanup() { + Mount_Point=$(pwd)/mntpt test_unmount || : +} +else +# End FreeBSD atf_test_case uchg +# Begin FreeBSD +fi +# End FreeBSD uchg_head() { atf_set "descr" "Checks that files with the uchg flag set cannot" \ "be removed" atf_set "require.user" "root" } uchg_body() { + # Begin FreeBSD + atf_expect_fail "this fails on FreeBSD with root - bug 212861" + # End FreeBSD + test_mount atf_check -s eq:0 -o empty -e empty touch a Modified: projects/clang390-import/etc/defaults/rc.conf ============================================================================== --- projects/clang390-import/etc/defaults/rc.conf Sat Oct 15 20:04:14 2016 (r307382) +++ projects/clang390-import/etc/defaults/rc.conf Sat Oct 15 22:49:04 2016 (r307383) @@ -695,6 +695,7 @@ iovctl_files="" # Config files for iovc ### Jail Configuration (see rc.conf(5) manual page) ########## ############################################################## jail_enable="NO" # Set to NO to disable starting of any jails +jail_confwarn="YES" # Prevent warning about obsolete per-jail configuration jail_parallel_start="NO" # Start jails in the background jail_list="" # Space separated list of names of jails jail_reverse_stop="NO" # Stop jails in reverse order Modified: projects/clang390-import/etc/mtree/BSD.usr.dist ============================================================================== --- projects/clang390-import/etc/mtree/BSD.usr.dist Sat Oct 15 20:04:14 2016 (r307382) +++ projects/clang390-import/etc/mtree/BSD.usr.dist Sat Oct 15 22:49:04 2016 (r307383) @@ -228,8 +228,6 @@ .. 12.make .. - 13.rcs - .. 15.yacc .. 16.lex Modified: projects/clang390-import/etc/rc.d/Makefile ============================================================================== --- projects/clang390-import/etc/rc.d/Makefile Sat Oct 15 20:04:14 2016 (r307382) +++ projects/clang390-import/etc/rc.d/Makefile Sat Oct 15 22:49:04 2016 (r307383) @@ -314,6 +314,7 @@ FILES+= wpa_supplicant .if ${MK_ZFS} != "no" FILESGROUPS+= ZFS ZFS+= zfs +ZFS+= zfsbe ZFS+= zfsd ZFS+= zvol ZFSPACKAGE= zfs Modified: projects/clang390-import/etc/rc.d/jail ============================================================================== --- projects/clang390-import/etc/rc.d/jail Sat Oct 15 20:04:14 2016 (r307382) +++ projects/clang390-import/etc/rc.d/jail Sat Oct 15 22:49:04 2016 (r307383) @@ -147,7 +147,8 @@ parse_options() # # To relieve confusion, show a warning message. # - _confwarn=1 + : ${jail_confwarn:=YES} + checkyesno jail_confwarn && _confwarn=1 if [ -r "$jail_conf" -o -r "$_jconf" ]; then if ! checkyesno jail_parallel_start; then warn "$_conf is created and used for jail $_j." Modified: projects/clang390-import/etc/rc.d/zfs ============================================================================== --- projects/clang390-import/etc/rc.d/zfs Sat Oct 15 20:04:14 2016 (r307382) +++ projects/clang390-import/etc/rc.d/zfs Sat Oct 15 22:49:04 2016 (r307383) @@ -4,7 +4,7 @@ # # PROVIDE: zfs -# REQUIRE: mountcritlocal +# REQUIRE: zfsbe # BEFORE: FILESYSTEMS var . /etc/rc.subr Copied: projects/clang390-import/etc/rc.d/zfsbe (from r307382, head/etc/rc.d/zfsbe) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang390-import/etc/rc.d/zfsbe Sat Oct 15 22:49:04 2016 (r307383, copy of r307382, head/etc/rc.d/zfsbe) @@ -0,0 +1,71 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: zfsbe +# REQUIRE: mountcritlocal + +# Handle boot environment subordinate filesystems +# that may have canmount property set to noauto. +# For these filesystems mountpoint relative to / +# must be the same as their dataset name relative +# to BE root dataset. + +. /etc/rc.subr + +name="zfsbe" +rcvar="zfs_enable" +start_cmd="be_start" +stop_cmd="be_stop" +required_modules="zfs" + +mount_subordinate() +{ + local _be + + _be=$1 + zfs list -rH -o mountpoint,name,canmount,mounted -s mountpoint -t filesystem $_be | \ + while read _mp _name _canmount _mounted ; do + # skip filesystems that must not be mounted + [ "$_canmount" = "off" ] && continue + # skip filesystems that are already mounted + [ "$_mounted" = "yes" ] && continue + case "$_mp" in + "none" | "legacy" | "/" | "/$_be") + # do nothing for filesystems with unset or legacy mountpoint + # or those that would be mounted over / + ;; + "/$_be/"*) + # filesystems with mountpoint relative to BE + mount -t zfs $_name ${_mp#/$_be} + ;; + *) + # filesystems with mountpoint elsewhere + zfs mount $_name + ;; + esac + done +} + +be_start() +{ + if [ `$SYSCTL_N security.jail.jailed` -eq 1 ]; then + : + else + mount -p | while read _dev _mp _type _rest; do + [ $_mp = "/" ] || continue + if [ $_type = "zfs" ] ; then + mount_subordinate $_dev + fi + break + done + fi +} + +be_stop() +{ +} + +load_rc_config $name +run_rc_command "$1" Modified: projects/clang390-import/gnu/usr.bin/Makefile ============================================================================== --- projects/clang390-import/gnu/usr.bin/Makefile Sat Oct 15 20:04:14 2016 (r307382) +++ projects/clang390-import/gnu/usr.bin/Makefile Sat Oct 15 22:49:04 2016 (r307383) @@ -11,7 +11,6 @@ SUBDIR= ${_binutils} \ ${_gperf} \ grep \ ${_groff} \ - ${_rcs} \ ${_tests} SUBDIR_DEPEND_gdb= ${_binutils} @@ -29,10 +28,6 @@ _groff= groff _dtc= dtc .endif -.if ${MK_RCS} != "no" -_rcs= rcs -.endif - .if ${MK_TESTS} != "no" _tests= tests .endif Modified: projects/clang390-import/gnu/usr.bin/groff/mdate.sh ============================================================================== --- projects/clang390-import/gnu/usr.bin/groff/mdate.sh Sat Oct 15 20:04:14 2016 (r307382) +++ projects/clang390-import/gnu/usr.bin/groff/mdate.sh Sat Oct 15 22:49:04 2016 (r307383) @@ -4,6 +4,5 @@ set -e test -r "$1" export LC_ALL=C -changelog_date=$(sed -E -n 's/^([0-9]{4}-[0-9]{2}-[0-9]{2}).*$/\1/p' "$1" |\ - head -n 1) +changelog_date=$(sed -E -n '1s/^([0-9]{4}-[0-9]{2}-[0-9]{2}).*$/\1/p' "$1") echo $(date -j -f %Y-%m-%d +"%e %B %Y" $changelog_date) Modified: projects/clang390-import/include/Makefile ============================================================================== --- projects/clang390-import/include/Makefile Sat Oct 15 20:04:14 2016 (r307382) +++ projects/clang390-import/include/Makefile Sat Oct 15 22:49:04 2016 (r307383) @@ -237,6 +237,17 @@ copies: .PHONY .META cd ${.CURDIR}/../sys/teken; \ ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 teken.h \ ${DESTDIR}${INCLUDEDIR}/teken +.if ${MK_CDDL} != "no" + cd ${.CURDIR}/../cddl/contrib/opensolaris/lib/libzfs_core/common; \ + ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 libzfs_core.h \ + ${DESTDIR}${INCLUDEDIR} + cd ${.CURDIR}/../cddl/contrib/opensolaris/lib/libnvpair; \ + ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 libnvpair.h \ + ${DESTDIR}${INCLUDEDIR} + cd ${.CURDIR}/../sys/cddl/contrib/opensolaris/uts/common/sys; \ + ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 nvpair.h \ + ${DESTDIR}${INCLUDEDIR}/sys +.endif symlinks: .PHONY .META @${ECHO} "Setting up symlinks to kernel source tree..." Modified: projects/clang390-import/include/search.h ============================================================================== --- projects/clang390-import/include/search.h Sat Oct 15 20:04:14 2016 (r307382) +++ projects/clang390-import/include/search.h Sat Oct 15 22:49:04 2016 (r307383) @@ -34,16 +34,18 @@ typedef enum { } VISIT; #ifdef _SEARCH_PRIVATE -typedef struct node { - void *key; - struct node *llink, *rlink; - signed char balance; -} node_t; +typedef struct __posix_tnode { + void *key; + struct __posix_tnode *llink, *rlink; + signed char balance; +} posix_tnode; struct que_elem { struct que_elem *next; struct que_elem *prev; }; +#else +typedef void posix_tnode; #endif #if __BSD_VISIBLE @@ -62,12 +64,15 @@ void *lfind(const void *, const void *, void *lsearch(const void *, void *, size_t *, size_t, int (*)(const void *, const void *)); void remque(void *); -void *tdelete(const void * __restrict, void ** __restrict, +void *tdelete(const void * __restrict, posix_tnode ** __restrict, int (*)(const void *, const void *)); -void *tfind(const void *, void * const *, +posix_tnode * + tfind(const void *, posix_tnode * const *, int (*)(const void *, const void *)); -void *tsearch(const void *, void **, int (*)(const void *, const void *)); -void twalk(const void *, void (*)(const void *, VISIT, int)); +posix_tnode * + tsearch(const void *, posix_tnode **, + int (*)(const void *, const void *)); +void twalk(const posix_tnode *, void (*)(const posix_tnode *, VISIT, int)); #if __BSD_VISIBLE int hcreate_r(size_t, struct hsearch_data *); Modified: projects/clang390-import/lib/Makefile ============================================================================== --- projects/clang390-import/lib/Makefile Sat Oct 15 20:04:14 2016 (r307382) +++ projects/clang390-import/lib/Makefile Sat Oct 15 22:49:04 2016 (r307383) @@ -26,114 +26,76 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \ .WAIT \ libalias \ libarchive \ - ${_libatm} \ libauditd \ libbegemot \ - ${_libblacklist} \ libblocksruntime \ - ${_libbluetooth} \ - ${_libbsnmp} \ libbsdstat \ libbsm \ libbz2 \ libcalendar \ libcam \ libcapsicum \ - ${_libcasper} \ - ${_libcom_err} \ libcompat \ libcrypt \ libdevctl \ - ${_libdevdctl} \ libdevinfo \ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610152249.u9FMn4HC061121>