Date: Thu, 3 Aug 2017 05:30:12 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r321971 - in projects/runtime-coverage: . bin/cat bin/chmod/tests bin/date bin/dd bin/echo bin/expr bin/ln bin/ls bin/mv bin/pax bin/pkill bin/sh bin/sleep bin/test cddl cddl/contrib/op... Message-ID: <201708030530.v735UCMZ041307@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Thu Aug 3 05:30:11 2017 New Revision: 321971 URL: https://svnweb.freebsd.org/changeset/base/321971 Log: MFhead@r321970 Added: projects/runtime-coverage/contrib/hyperv/tools/scripts/hyperv_vfattach - copied unchanged from r321970, head/contrib/hyperv/tools/scripts/hyperv_vfattach projects/runtime-coverage/contrib/hyperv/tools/scripts/hyperv_vfup - copied unchanged from r321970, head/contrib/hyperv/tools/scripts/hyperv_vfup projects/runtime-coverage/contrib/mdocml/compat_recallocarray.c - copied unchanged from r321970, head/contrib/mdocml/compat_recallocarray.c projects/runtime-coverage/contrib/mdocml/mandoc_xr.c - copied unchanged from r321970, head/contrib/mdocml/mandoc_xr.c projects/runtime-coverage/contrib/mdocml/mandoc_xr.h - copied unchanged from r321970, head/contrib/mdocml/mandoc_xr.h projects/runtime-coverage/contrib/mdocml/test-recallocarray.c - copied unchanged from r321970, head/contrib/mdocml/test-recallocarray.c projects/runtime-coverage/share/vt/keymaps/tr.f.kbd - copied unchanged from r321970, head/share/vt/keymaps/tr.f.kbd projects/runtime-coverage/sys/dev/iicbus/isl12xx.c - copied unchanged from r321970, head/sys/dev/iicbus/isl12xx.c projects/runtime-coverage/sys/modules/i2c/ds1307/ - copied from r321970, head/sys/modules/i2c/ds1307/ projects/runtime-coverage/sys/modules/i2c/ds3231/ - copied from r321970, head/sys/modules/i2c/ds3231/ projects/runtime-coverage/sys/modules/i2c/isl12xx/ - copied from r321970, head/sys/modules/i2c/isl12xx/ projects/runtime-coverage/sys/modules/i2c/nxprtc/ - copied from r321970, head/sys/modules/i2c/nxprtc/ Deleted: projects/runtime-coverage/sys/sys/ksyms.h Modified: projects/runtime-coverage/Makefile.inc1 projects/runtime-coverage/ObsoleteFiles.inc projects/runtime-coverage/bin/cat/Makefile projects/runtime-coverage/bin/chmod/tests/chmod_test.sh projects/runtime-coverage/bin/date/Makefile projects/runtime-coverage/bin/dd/Makefile projects/runtime-coverage/bin/echo/Makefile projects/runtime-coverage/bin/expr/Makefile projects/runtime-coverage/bin/ln/Makefile projects/runtime-coverage/bin/ls/Makefile projects/runtime-coverage/bin/mv/Makefile projects/runtime-coverage/bin/pax/Makefile projects/runtime-coverage/bin/pkill/Makefile projects/runtime-coverage/bin/sh/Makefile projects/runtime-coverage/bin/sleep/Makefile projects/runtime-coverage/bin/test/Makefile projects/runtime-coverage/cddl/Makefile projects/runtime-coverage/cddl/contrib/opensolaris/cmd/lockstat/sym.c projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c projects/runtime-coverage/cddl/lib/Makefile projects/runtime-coverage/cddl/sbin/Makefile projects/runtime-coverage/cddl/usr.bin/Makefile projects/runtime-coverage/cddl/usr.sbin/Makefile projects/runtime-coverage/contrib/mdocml/INSTALL projects/runtime-coverage/contrib/mdocml/LICENSE projects/runtime-coverage/contrib/mdocml/Makefile projects/runtime-coverage/contrib/mdocml/Makefile.depend projects/runtime-coverage/contrib/mdocml/NEWS projects/runtime-coverage/contrib/mdocml/TODO projects/runtime-coverage/contrib/mdocml/apropos.1 projects/runtime-coverage/contrib/mdocml/att.c projects/runtime-coverage/contrib/mdocml/cgi.c projects/runtime-coverage/contrib/mdocml/chars.c projects/runtime-coverage/contrib/mdocml/config.h projects/runtime-coverage/contrib/mdocml/configure projects/runtime-coverage/contrib/mdocml/configure.local.example projects/runtime-coverage/contrib/mdocml/demandoc.c projects/runtime-coverage/contrib/mdocml/eqn.7 projects/runtime-coverage/contrib/mdocml/eqn.c projects/runtime-coverage/contrib/mdocml/eqn_html.c projects/runtime-coverage/contrib/mdocml/eqn_term.c projects/runtime-coverage/contrib/mdocml/gmdiff projects/runtime-coverage/contrib/mdocml/html.c projects/runtime-coverage/contrib/mdocml/html.h projects/runtime-coverage/contrib/mdocml/lib.c projects/runtime-coverage/contrib/mdocml/libmandoc.h projects/runtime-coverage/contrib/mdocml/libroff.h projects/runtime-coverage/contrib/mdocml/main.c projects/runtime-coverage/contrib/mdocml/man.7 projects/runtime-coverage/contrib/mdocml/man.c projects/runtime-coverage/contrib/mdocml/man.options.1 projects/runtime-coverage/contrib/mdocml/man_html.c projects/runtime-coverage/contrib/mdocml/man_macro.c projects/runtime-coverage/contrib/mdocml/man_term.c projects/runtime-coverage/contrib/mdocml/man_validate.c projects/runtime-coverage/contrib/mdocml/manconf.h projects/runtime-coverage/contrib/mdocml/mandoc.1 projects/runtime-coverage/contrib/mdocml/mandoc.3 projects/runtime-coverage/contrib/mdocml/mandoc.c projects/runtime-coverage/contrib/mdocml/mandoc.css projects/runtime-coverage/contrib/mdocml/mandoc.h projects/runtime-coverage/contrib/mdocml/mandoc_aux.c projects/runtime-coverage/contrib/mdocml/mandoc_aux.h projects/runtime-coverage/contrib/mdocml/mandoc_char.7 projects/runtime-coverage/contrib/mdocml/mandoc_escape.3 projects/runtime-coverage/contrib/mdocml/mandoc_headers.3 projects/runtime-coverage/contrib/mdocml/mandoc_html.3 projects/runtime-coverage/contrib/mdocml/mandocd.c projects/runtime-coverage/contrib/mdocml/mandocdb.c projects/runtime-coverage/contrib/mdocml/manpath.c projects/runtime-coverage/contrib/mdocml/mansearch.c projects/runtime-coverage/contrib/mdocml/mdoc.7 projects/runtime-coverage/contrib/mdocml/mdoc.c projects/runtime-coverage/contrib/mdocml/mdoc_html.c projects/runtime-coverage/contrib/mdocml/mdoc_man.c projects/runtime-coverage/contrib/mdocml/mdoc_markdown.c projects/runtime-coverage/contrib/mdocml/mdoc_term.c projects/runtime-coverage/contrib/mdocml/mdoc_validate.c projects/runtime-coverage/contrib/mdocml/msec.in projects/runtime-coverage/contrib/mdocml/out.c projects/runtime-coverage/contrib/mdocml/out.h projects/runtime-coverage/contrib/mdocml/read.c projects/runtime-coverage/contrib/mdocml/roff.7 projects/runtime-coverage/contrib/mdocml/roff.c projects/runtime-coverage/contrib/mdocml/roff.h projects/runtime-coverage/contrib/mdocml/roff_html.c projects/runtime-coverage/contrib/mdocml/roff_int.h projects/runtime-coverage/contrib/mdocml/roff_term.c projects/runtime-coverage/contrib/mdocml/roff_validate.c projects/runtime-coverage/contrib/mdocml/soelim.1 projects/runtime-coverage/contrib/mdocml/st.c projects/runtime-coverage/contrib/mdocml/st.in projects/runtime-coverage/contrib/mdocml/tbl.7 projects/runtime-coverage/contrib/mdocml/tbl.c projects/runtime-coverage/contrib/mdocml/tbl_data.c projects/runtime-coverage/contrib/mdocml/tbl_html.c projects/runtime-coverage/contrib/mdocml/tbl_layout.c projects/runtime-coverage/contrib/mdocml/tbl_term.c projects/runtime-coverage/contrib/mdocml/term.c projects/runtime-coverage/contrib/mdocml/term.h projects/runtime-coverage/contrib/mdocml/term_ascii.c projects/runtime-coverage/contrib/mdocml/term_tab.c projects/runtime-coverage/contrib/mdocml/tree.c projects/runtime-coverage/contrib/ofed/usr.bin/Makefile projects/runtime-coverage/etc/devd/hyperv.conf projects/runtime-coverage/gnu/Makefile projects/runtime-coverage/lib/atf/Makefile projects/runtime-coverage/lib/atf/libatf-c++/Makefile projects/runtime-coverage/lib/atf/libatf-c/Makefile projects/runtime-coverage/lib/libarchive/Makefile projects/runtime-coverage/lib/libc/Makefile projects/runtime-coverage/lib/libcasper/services/cap_dns/Makefile projects/runtime-coverage/lib/libcasper/services/cap_grp/Makefile projects/runtime-coverage/lib/libcasper/services/cap_pwd/Makefile projects/runtime-coverage/lib/libcasper/services/cap_sysctl/Makefile projects/runtime-coverage/lib/libcrypt/Makefile projects/runtime-coverage/lib/libmp/Makefile projects/runtime-coverage/lib/libnv/Makefile projects/runtime-coverage/lib/libpathconv/Makefile projects/runtime-coverage/lib/libproc/Makefile projects/runtime-coverage/lib/librt/Makefile projects/runtime-coverage/lib/libtelnet/Makefile projects/runtime-coverage/lib/libthr/Makefile projects/runtime-coverage/lib/libutil/Makefile projects/runtime-coverage/lib/libxo/Makefile projects/runtime-coverage/lib/msun/Makefile projects/runtime-coverage/libexec/atf/atf-check/Makefile projects/runtime-coverage/libexec/atf/atf-sh/Makefile projects/runtime-coverage/libexec/hyperv/Makefile projects/runtime-coverage/libexec/rtld-elf/Makefile projects/runtime-coverage/sbin/devd/Makefile projects/runtime-coverage/sbin/dhclient/Makefile projects/runtime-coverage/sbin/growfs/Makefile projects/runtime-coverage/sbin/ifconfig/Makefile projects/runtime-coverage/sbin/mdconfig/Makefile projects/runtime-coverage/sbin/pfctl/Makefile projects/runtime-coverage/sbin/sysctl/sysctl.c projects/runtime-coverage/secure/Makefile projects/runtime-coverage/secure/lib/Makefile projects/runtime-coverage/secure/libexec/Makefile projects/runtime-coverage/secure/usr.bin/Makefile projects/runtime-coverage/secure/usr.sbin/Makefile projects/runtime-coverage/share/Makefile projects/runtime-coverage/share/examples/Makefile projects/runtime-coverage/share/examples/ppp/ppp.conf.sample projects/runtime-coverage/share/man/man4/ksyms.4 projects/runtime-coverage/share/man/man4/linux.4 projects/runtime-coverage/share/man/man5/fdescfs.5 projects/runtime-coverage/share/man/man5/src.conf.5 projects/runtime-coverage/share/misc/organization.dot projects/runtime-coverage/share/misc/pci_vendors projects/runtime-coverage/share/mk/bsd.compiler.mk projects/runtime-coverage/share/mk/bsd.opts.mk projects/runtime-coverage/share/mk/src.opts.mk projects/runtime-coverage/share/vt/keymaps/INDEX.keymaps projects/runtime-coverage/share/vt/keymaps/Makefile projects/runtime-coverage/share/zoneinfo/Makefile projects/runtime-coverage/sys/amd64/amd64/elf_machdep.c projects/runtime-coverage/sys/amd64/amd64/initcpu.c projects/runtime-coverage/sys/amd64/amd64/pmap.c projects/runtime-coverage/sys/amd64/amd64/trap.c projects/runtime-coverage/sys/amd64/cloudabi64/cloudabi64_sysvec.c projects/runtime-coverage/sys/amd64/include/md_var.h projects/runtime-coverage/sys/amd64/linux/linux_sysvec.c projects/runtime-coverage/sys/arm/allwinner/aw_ccu.c projects/runtime-coverage/sys/arm/allwinner/clk/aw_modclk.c projects/runtime-coverage/sys/arm/allwinner/clkng/aw_ccung.c projects/runtime-coverage/sys/arm/arm/generic_timer.c projects/runtime-coverage/sys/arm/freescale/imx/files.imx6 projects/runtime-coverage/sys/arm/freescale/imx/imx_iomux.c projects/runtime-coverage/sys/arm/freescale/imx/imx_iomuxvar.h projects/runtime-coverage/sys/arm/freescale/imx/std.imx6 projects/runtime-coverage/sys/arm64/conf/GENERIC projects/runtime-coverage/sys/boot/arm/at91/libat91/lib.h projects/runtime-coverage/sys/boot/arm/at91/libat91/printf.c projects/runtime-coverage/sys/boot/arm/at91/libat91/putchar.c projects/runtime-coverage/sys/boot/arm/ixp425/boot2/ixp425_board.c projects/runtime-coverage/sys/boot/arm/ixp425/boot2/lib.h projects/runtime-coverage/sys/boot/fdt/dts/arm/nanopi-neo.dts projects/runtime-coverage/sys/boot/geli/Makefile projects/runtime-coverage/sys/boot/i386/boot2/boot2.c projects/runtime-coverage/sys/boot/zfs/zfsimpl.c projects/runtime-coverage/sys/compat/linuxkpi/common/include/linux/cdev.h projects/runtime-coverage/sys/compat/linuxkpi/common/include/linux/clocksource.h projects/runtime-coverage/sys/compat/linuxkpi/common/include/linux/fs.h projects/runtime-coverage/sys/compat/linuxkpi/common/include/linux/kdev_t.h projects/runtime-coverage/sys/compat/linuxkpi/common/src/linux_compat.c projects/runtime-coverage/sys/conf/files projects/runtime-coverage/sys/conf/files.arm64 projects/runtime-coverage/sys/conf/options.arm64 projects/runtime-coverage/sys/contrib/ena-com/ena_plat.h projects/runtime-coverage/sys/dev/hyperv/netvsc/if_hn.c projects/runtime-coverage/sys/dev/hyperv/netvsc/if_hnvar.h projects/runtime-coverage/sys/dev/hyperv/utilities/hv_kvp.c projects/runtime-coverage/sys/dev/ichwd/ichwd.c projects/runtime-coverage/sys/dev/iicbus/ds1307.c projects/runtime-coverage/sys/dev/iicbus/ds3231.c projects/runtime-coverage/sys/dev/iicbus/ds3231reg.h projects/runtime-coverage/sys/dev/ksyms/ksyms.c projects/runtime-coverage/sys/dev/mlx4/device.h projects/runtime-coverage/sys/dev/mlx4/mlx4_core/mlx4_main.c projects/runtime-coverage/sys/dev/mlx4/mlx4_core/mlx4_port.c projects/runtime-coverage/sys/dev/mlx4/mlx4_en/en.h projects/runtime-coverage/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c projects/runtime-coverage/sys/dev/mlx4/mlx4_ib/mlx4_ib_mad.c projects/runtime-coverage/sys/dev/mlx4/mlx4_ib/mlx4_ib_main.c projects/runtime-coverage/sys/dev/mlx4/stats.h projects/runtime-coverage/sys/dev/mmc/bridge.h projects/runtime-coverage/sys/dev/mmc/mmc_subr.c projects/runtime-coverage/sys/dev/mmc/mmc_subr.h projects/runtime-coverage/sys/dev/mmc/mmcbus_if.m projects/runtime-coverage/sys/dev/mmc/mmcsd.c projects/runtime-coverage/sys/dev/mpr/mpr_pci.c projects/runtime-coverage/sys/dev/mps/mps_pci.c projects/runtime-coverage/sys/dev/pci/pci.c projects/runtime-coverage/sys/fs/fdescfs/fdesc.h projects/runtime-coverage/sys/fs/fdescfs/fdesc_vfsops.c projects/runtime-coverage/sys/fs/fdescfs/fdesc_vnops.c projects/runtime-coverage/sys/fs/nfsserver/nfs_fha_new.c projects/runtime-coverage/sys/i386/i386/pmap.c projects/runtime-coverage/sys/i386/i386/trap.c projects/runtime-coverage/sys/kern/subr_blist.c projects/runtime-coverage/sys/kern/subr_witness.c projects/runtime-coverage/sys/kern/vfs_bio.c projects/runtime-coverage/sys/kern/vfs_syscalls.c projects/runtime-coverage/sys/modules/dtb/allwinner/Makefile projects/runtime-coverage/sys/modules/i2c/Makefile projects/runtime-coverage/sys/net/if_enc.c projects/runtime-coverage/sys/net/if_enc.h projects/runtime-coverage/sys/net80211/ieee80211_ioctl.c projects/runtime-coverage/sys/net80211/ieee80211_mesh.c projects/runtime-coverage/sys/netipsec/ipsec.h projects/runtime-coverage/sys/netipsec/ipsec_input.c projects/runtime-coverage/sys/netipsec/ipsec_output.c projects/runtime-coverage/sys/nfs/nfs_fha.c projects/runtime-coverage/sys/nfs/nfs_fha.h projects/runtime-coverage/sys/sys/blist.h projects/runtime-coverage/sys/sys/types.h projects/runtime-coverage/sys/sys/vnode.h projects/runtime-coverage/sys/ufs/ffs/ffs_snapshot.c projects/runtime-coverage/sys/x86/x86/stack_machdep.c projects/runtime-coverage/tests/sys/aio/lio_test.c projects/runtime-coverage/tests/sys/file/newfileops_on_fork_test.c projects/runtime-coverage/tests/sys/fs/tmpfs/Makefile projects/runtime-coverage/tests/sys/kern/ptrace_test.c projects/runtime-coverage/tools/tools/bootparttest/Makefile projects/runtime-coverage/tools/tools/bootparttest/bootparttest.c projects/runtime-coverage/tools/tools/bootparttest/stub.c projects/runtime-coverage/tools/tools/net80211/wlanwds/wlanwds.c projects/runtime-coverage/tools/tools/zfsboottest/Makefile projects/runtime-coverage/tools/tools/zfsboottest/zfsboottest.c projects/runtime-coverage/usr.bin/apply/Makefile projects/runtime-coverage/usr.bin/basename/Makefile projects/runtime-coverage/usr.bin/bsdcat/Makefile projects/runtime-coverage/usr.bin/calendar/Makefile projects/runtime-coverage/usr.bin/calendar/calendars/calendar.freebsd projects/runtime-coverage/usr.bin/cmp/Makefile projects/runtime-coverage/usr.bin/col/Makefile projects/runtime-coverage/usr.bin/comm/Makefile projects/runtime-coverage/usr.bin/compress/Makefile projects/runtime-coverage/usr.bin/cpio/Makefile projects/runtime-coverage/usr.bin/csplit/Makefile projects/runtime-coverage/usr.bin/cut/Makefile projects/runtime-coverage/usr.bin/diff/Makefile projects/runtime-coverage/usr.bin/diff3/Makefile projects/runtime-coverage/usr.bin/dirname/Makefile projects/runtime-coverage/usr.bin/file2c/Makefile projects/runtime-coverage/usr.bin/getconf/Makefile projects/runtime-coverage/usr.bin/grep/Makefile projects/runtime-coverage/usr.bin/gzip/Makefile projects/runtime-coverage/usr.bin/hexdump/Makefile projects/runtime-coverage/usr.bin/ident/Makefile projects/runtime-coverage/usr.bin/indent/Makefile projects/runtime-coverage/usr.bin/join/Makefile projects/runtime-coverage/usr.bin/jot/Makefile projects/runtime-coverage/usr.bin/lastcomm/Makefile projects/runtime-coverage/usr.bin/limits/Makefile projects/runtime-coverage/usr.bin/m4/Makefile projects/runtime-coverage/usr.bin/mandoc/Makefile projects/runtime-coverage/usr.bin/mkimg/Makefile projects/runtime-coverage/usr.bin/ncal/Makefile projects/runtime-coverage/usr.bin/pr/Makefile projects/runtime-coverage/usr.bin/printf/Makefile projects/runtime-coverage/usr.bin/procstat/Makefile projects/runtime-coverage/usr.bin/sdiff/Makefile projects/runtime-coverage/usr.bin/sed/Makefile projects/runtime-coverage/usr.bin/soelim/Makefile projects/runtime-coverage/usr.bin/tail/Makefile projects/runtime-coverage/usr.bin/tar/Makefile projects/runtime-coverage/usr.bin/timeout/Makefile projects/runtime-coverage/usr.bin/tr/Makefile projects/runtime-coverage/usr.bin/truncate/Makefile projects/runtime-coverage/usr.bin/uniq/Makefile projects/runtime-coverage/usr.bin/units/Makefile projects/runtime-coverage/usr.bin/uudecode/Makefile projects/runtime-coverage/usr.bin/uuencode/Makefile projects/runtime-coverage/usr.bin/xargs/Makefile projects/runtime-coverage/usr.bin/xinstall/Makefile projects/runtime-coverage/usr.bin/xo/Makefile projects/runtime-coverage/usr.bin/yacc/Makefile projects/runtime-coverage/usr.sbin/chown/Makefile projects/runtime-coverage/usr.sbin/etcupdate/Makefile projects/runtime-coverage/usr.sbin/extattr/Makefile projects/runtime-coverage/usr.sbin/fstyp/Makefile projects/runtime-coverage/usr.sbin/makefs/Makefile projects/runtime-coverage/usr.sbin/makefs/tests/makefs_cd9660_tests.sh projects/runtime-coverage/usr.sbin/newsyslog/Makefile projects/runtime-coverage/usr.sbin/nmtree/Makefile projects/runtime-coverage/usr.sbin/pw/Makefile projects/runtime-coverage/usr.sbin/rpcbind/Makefile projects/runtime-coverage/usr.sbin/sa/Makefile projects/runtime-coverage/usr.sbin/ypldap/entries.c Directory Properties: projects/runtime-coverage/ (props changed) projects/runtime-coverage/cddl/ (props changed) projects/runtime-coverage/cddl/contrib/opensolaris/ (props changed) projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/runtime-coverage/contrib/mdocml/ (props changed) projects/runtime-coverage/sys/contrib/ena-com/ (props changed) Modified: projects/runtime-coverage/Makefile.inc1 ============================================================================== --- projects/runtime-coverage/Makefile.inc1 Thu Aug 3 05:28:15 2017 (r321970) +++ projects/runtime-coverage/Makefile.inc1 Thu Aug 3 05:30:11 2017 (r321971) @@ -444,7 +444,7 @@ BUILD_ARCH!= uname -p .endif .endif WORLDTMP= ${OBJTREE}${.CURDIR}/tmp -BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/bin +BPATH= ${CCACHE_WRAPPER_PATH_PFX}${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/bin XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin STRICTTMPPATH= ${BPATH}:${XPATH} TMPPATH= ${STRICTTMPPATH}:${PATH} @@ -761,10 +761,12 @@ _worldtmp: .PHONY rm -rf ${LIBCOMPATTMP} .endif .else +.if exists(${WORLDTMP}) @echo ">>> Deleting stale files in build tree..." ${_+_}cd ${.CURDIR}; ${WMAKE} -DBATCH_DELETE_OLD_FILES \ delete-old delete-old-libs >/dev/null -.if defined(LIBCOMPAT) +.endif +.if defined(LIBCOMPAT) && exists(${LIBCOMPATTMP}) ${_+_}cd ${.CURDIR}; ${WMAKE} -DBATCH_DELETE_OLD_FILES \ DESTDIR=${LIBCOMPATTMP} \ delete-old delete-old-libs >/dev/null @@ -2767,9 +2769,6 @@ CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/u CD2MAKE+= BUILD_TOOLS_META=.NOMETA .endif XDDESTDIR=${DESTDIR}/${XDTP} -.if !defined(OSREL) -OSREL!= uname -r | sed -e 's/[-(].*//' -.endif .ORDER: xdev-build xdev-install xdev-links xdev: xdev-build xdev-install .PHONY @@ -2863,7 +2862,7 @@ xdev-links: .PHONY ln -sf ../../${XDTP}/usr/bin/$$i \ ../../../../usr/bin/${XDDIR}-$$i; \ ln -sf ../../${XDTP}/usr/bin/$$i \ - ../../../../usr/bin/${XDDIR}${OSREL}-$$i; \ + ../../../../usr/bin/${XDDIR}${_REVISION}-$$i; \ done .else xdev xdev-build xdev-install xdev-links: .PHONY Modified: projects/runtime-coverage/ObsoleteFiles.inc ============================================================================== --- projects/runtime-coverage/ObsoleteFiles.inc Thu Aug 3 05:28:15 2017 (r321970) +++ projects/runtime-coverage/ObsoleteFiles.inc Thu Aug 3 05:30:11 2017 (r321971) @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20170802: ksyms(4) ioctl interface was removed +OLD_FILES+=usr/include/sys/ksyms.h + # 20170722: new clang import which bumps version from 4.0.0 to 5.0.0. OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/allocator_interface.h OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/asan_interface.h Modified: projects/runtime-coverage/bin/cat/Makefile ============================================================================== --- projects/runtime-coverage/bin/cat/Makefile Thu Aug 3 05:28:15 2017 (r321970) +++ projects/runtime-coverage/bin/cat/Makefile Thu Aug 3 05:30:11 2017 (r321971) @@ -6,8 +6,6 @@ PACKAGE=runtime PROG= cat -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/runtime-coverage/bin/chmod/tests/chmod_test.sh ============================================================================== --- projects/runtime-coverage/bin/chmod/tests/chmod_test.sh Thu Aug 3 05:28:15 2017 (r321970) +++ projects/runtime-coverage/bin/chmod/tests/chmod_test.sh Thu Aug 3 05:30:11 2017 (r321971) @@ -25,6 +25,13 @@ # # $FreeBSD$ +get_filesystem() +{ + local mountpoint=$1 + + df -T $mountpoint | tail -n 1 | cut -wf 2 +} + atf_test_case RH_flag RH_flag_head() { @@ -94,6 +101,11 @@ f_flag_body() { atf_check truncate -s 0 foo bar atf_check chmod 0750 foo bar + case "$(get_filesystem .)" in + zfs) + atf_expect_fail "ZFS doesn't support UF_IMMUTABLE; returns EPERM - bug 221189" + ;; + esac atf_check chflags uchg foo atf_check -e not-empty -s not-exit:0 chmod 0700 foo bar atf_check -o inline:'100750\n100700\n' stat -f '%p' foo bar @@ -140,6 +152,11 @@ v_flag_body() atf_check truncate -s 0 foo bar atf_check chmod 0600 foo atf_check chmod 0750 bar + case "$(get_filesystem .)" in + zfs) + atf_expect_fail "ZFS updates mode for foo unnecessarily - bug 221188" + ;; + esac atf_check -o 'inline:bar\n' chmod -v 0600 foo bar atf_check chmod -v 0600 foo bar for f in foo bar; do Modified: projects/runtime-coverage/bin/date/Makefile ============================================================================== --- projects/runtime-coverage/bin/date/Makefile Thu Aug 3 05:28:15 2017 (r321970) +++ projects/runtime-coverage/bin/date/Makefile Thu Aug 3 05:30:11 2017 (r321971) @@ -7,8 +7,6 @@ PACKAGE=runtime PROG= date SRCS= date.c netdate.c vary.c -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/runtime-coverage/bin/dd/Makefile ============================================================================== --- projects/runtime-coverage/bin/dd/Makefile Thu Aug 3 05:28:15 2017 (r321970) +++ projects/runtime-coverage/bin/dd/Makefile Thu Aug 3 05:30:11 2017 (r321971) @@ -38,8 +38,6 @@ test: ${PROG} gen @rm -f gen 1M_zeroes* obs_zeroes -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/runtime-coverage/bin/echo/Makefile ============================================================================== --- projects/runtime-coverage/bin/echo/Makefile Thu Aug 3 05:28:15 2017 (r321970) +++ projects/runtime-coverage/bin/echo/Makefile Thu Aug 3 05:30:11 2017 (r321971) @@ -6,8 +6,6 @@ PACKAGE=runtime PROG= echo -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/runtime-coverage/bin/expr/Makefile ============================================================================== --- projects/runtime-coverage/bin/expr/Makefile Thu Aug 3 05:28:15 2017 (r321970) +++ projects/runtime-coverage/bin/expr/Makefile Thu Aug 3 05:30:11 2017 (r321971) @@ -12,8 +12,6 @@ CFLAGS+= -fwrapv NO_WMISSING_VARIABLE_DECLARATIONS= -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/runtime-coverage/bin/ln/Makefile ============================================================================== --- projects/runtime-coverage/bin/ln/Makefile Thu Aug 3 05:28:15 2017 (r321970) +++ projects/runtime-coverage/bin/ln/Makefile Thu Aug 3 05:30:11 2017 (r321971) @@ -10,8 +10,6 @@ MAN= ln.1 symlink.7 LINKS= ${BINDIR}/ln ${BINDIR}/link MLINKS= ln.1 link.1 -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/runtime-coverage/bin/ls/Makefile ============================================================================== --- projects/runtime-coverage/bin/ls/Makefile Thu Aug 3 05:28:15 2017 (r321970) +++ projects/runtime-coverage/bin/ls/Makefile Thu Aug 3 05:30:11 2017 (r321971) @@ -14,8 +14,6 @@ CFLAGS+= -DCOLORLS LIBADD+= termcapw .endif -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/runtime-coverage/bin/mv/Makefile ============================================================================== --- projects/runtime-coverage/bin/mv/Makefile Thu Aug 3 05:28:15 2017 (r321970) +++ projects/runtime-coverage/bin/mv/Makefile Thu Aug 3 05:30:11 2017 (r321971) @@ -6,8 +6,6 @@ PACKAGE=runtime PROG= mv -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/runtime-coverage/bin/pax/Makefile ============================================================================== --- projects/runtime-coverage/bin/pax/Makefile Thu Aug 3 05:28:15 2017 (r321970) +++ projects/runtime-coverage/bin/pax/Makefile Thu Aug 3 05:30:11 2017 (r321971) @@ -33,8 +33,6 @@ SRCS= ar_io.c ar_subs.c buf_subs.c cache.c cpio.c file gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c \ tables.c tar.c tty_subs.c -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/runtime-coverage/bin/pkill/Makefile ============================================================================== --- projects/runtime-coverage/bin/pkill/Makefile Thu Aug 3 05:28:15 2017 (r321970) +++ projects/runtime-coverage/bin/pkill/Makefile Thu Aug 3 05:30:11 2017 (r321971) @@ -19,8 +19,6 @@ MLINKS= pkill.1 pgrep.1 SYMLINKS= ../..${BINDIR}/pkill /usr/bin/pkill SYMLINKS+= ../..${BINDIR}/pgrep /usr/bin/pgrep -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/runtime-coverage/bin/sh/Makefile ============================================================================== --- projects/runtime-coverage/bin/sh/Makefile Thu Aug 3 05:28:15 2017 (r321970) +++ projects/runtime-coverage/bin/sh/Makefile Thu Aug 3 05:30:11 2017 (r321971) @@ -64,8 +64,6 @@ syntax.c syntax.h: mksyntax token.h: mktokens sh ${.CURDIR}/mktokens -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/runtime-coverage/bin/sleep/Makefile ============================================================================== --- projects/runtime-coverage/bin/sleep/Makefile Thu Aug 3 05:28:15 2017 (r321970) +++ projects/runtime-coverage/bin/sleep/Makefile Thu Aug 3 05:30:11 2017 (r321971) @@ -6,8 +6,6 @@ PACKAGE=runtime PROG= sleep -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/runtime-coverage/bin/test/Makefile ============================================================================== --- projects/runtime-coverage/bin/test/Makefile Thu Aug 3 05:28:15 2017 (r321970) +++ projects/runtime-coverage/bin/test/Makefile Thu Aug 3 05:30:11 2017 (r321971) @@ -8,8 +8,6 @@ PROG= test LINKS= ${BINDIR}/test ${BINDIR}/[ MLINKS= test.1 [.1 -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/runtime-coverage/cddl/Makefile ============================================================================== --- projects/runtime-coverage/cddl/Makefile Thu Aug 3 05:28:15 2017 (r321970) +++ projects/runtime-coverage/cddl/Makefile Thu Aug 3 05:30:11 2017 (r321971) @@ -5,9 +5,7 @@ SUBDIR= lib .WAIT \ sbin usr.bin usr.sbin -.if ${MK_TESTS} != "no" -SUBDIR+=tests -.endif +SUBDIR.${MK_TESTS}+= tests SUBDIR_PARALLEL= Modified: projects/runtime-coverage/cddl/contrib/opensolaris/cmd/lockstat/sym.c ============================================================================== --- projects/runtime-coverage/cddl/contrib/opensolaris/cmd/lockstat/sym.c Thu Aug 3 05:28:15 2017 (r321970) +++ projects/runtime-coverage/cddl/contrib/opensolaris/cmd/lockstat/sym.c Thu Aug 3 05:30:11 2017 (r321971) @@ -48,7 +48,6 @@ #include <kstat.h> #else #include <sys/elf.h> -#include <sys/ksyms.h> #include <sys/param.h> #include <sys/module.h> #include <sys/linker.h> @@ -175,10 +174,6 @@ symtab_init(void) int fd; int i; int strindex = -1; -#ifndef illumos - void *ksyms; - size_t sz; -#endif #ifndef illumos if ((fd = open("/dev/ksyms", O_RDONLY)) == -1) { @@ -194,33 +189,9 @@ symtab_init(void) return (-1); #endif -#ifdef illumos (void) elf_version(EV_CURRENT); elf = elf_begin(fd, ELF_C_READ, NULL); -#else - /* - * XXX - libelf needs to be fixed so it will work with - * non 'ordinary' files like /dev/ksyms. The following - * is a work around for now. - */ - if (elf_version(EV_CURRENT) == EV_NONE) { - close(fd); - return (-1); - } - if (ioctl(fd, KIOCGSIZE, &sz) < 0) { - close(fd); - return (-1); - } - if (ioctl(fd, KIOCGADDR, &ksyms) < 0) { - close(fd); - return (-1); - } - if ((elf = elf_memory(ksyms, sz)) == NULL) { - close(fd); - return (-1); - } -#endif for (cnt = 1; (scn = elf_nextscn(elf, scn)) != NULL; cnt++) { Shdr *shdr = elf_getshdr(scn); Modified: projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c ============================================================================== --- projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c Thu Aug 3 05:28:15 2017 (r321970) +++ projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c Thu Aug 3 05:30:11 2017 (r321971) @@ -74,6 +74,9 @@ zcmd_ioctl(int fd, int request, zfs_cmd_t *zc) if (zfs_ioctl_version >= ZFS_IOCVER_DEADMAN) { switch (zfs_ioctl_version) { + case ZFS_IOCVER_INLANES: + cflag = ZFS_CMD_COMPAT_INLANES; + break; case ZFS_IOCVER_RESUME: cflag = ZFS_CMD_COMPAT_RESUME; break; Modified: projects/runtime-coverage/cddl/lib/Makefile ============================================================================== --- projects/runtime-coverage/cddl/lib/Makefile Thu Aug 3 05:28:15 2017 (r321970) +++ projects/runtime-coverage/cddl/lib/Makefile Thu Aug 3 05:30:11 2017 (r321971) @@ -12,11 +12,8 @@ SUBDIR= ${_drti} \ ${_libzfs_core} \ ${_libzfs} \ ${_libzpool} \ - ${_tests} -.if ${MK_TESTS} != "no" -_tests= tests -.endif +SUBDIR.${MK_TESTS}+= tests .if ${MK_ZFS} != "no" _libzfs_core= libzfs_core Modified: projects/runtime-coverage/cddl/sbin/Makefile ============================================================================== --- projects/runtime-coverage/cddl/sbin/Makefile Thu Aug 3 05:28:15 2017 (r321970) +++ projects/runtime-coverage/cddl/sbin/Makefile Thu Aug 3 05:30:11 2017 (r321971) @@ -2,11 +2,9 @@ .include <src.opts.mk> -SUBDIR= ${_tests} ${_zfs} ${_zpool} +SUBDIR= ${_zfs} ${_zpool} -.if ${MK_TESTS} != "no" -_tests= tests -.endif +SUBDIR.${MK_TESTS}+= tests .if ${MK_ZFS} != "no" _zfs= zfs Modified: projects/runtime-coverage/cddl/usr.bin/Makefile ============================================================================== --- projects/runtime-coverage/cddl/usr.bin/Makefile Thu Aug 3 05:28:15 2017 (r321970) +++ projects/runtime-coverage/cddl/usr.bin/Makefile Thu Aug 3 05:30:11 2017 (r321971) @@ -6,15 +6,12 @@ SUBDIR= \ ctfconvert \ ctfdump \ ctfmerge \ - ${_tests} \ ${_zinject} \ ${_zlook} \ ${_zstreamdump} \ ${_ztest} -.if ${MK_TESTS} != "no" -_tests= tests -.endif +SUBDIR.${MK_TESTS}+= tests .if ${MK_ZFS} != "no" _zinject= zinject Modified: projects/runtime-coverage/cddl/usr.sbin/Makefile ============================================================================== --- projects/runtime-coverage/cddl/usr.sbin/Makefile Thu Aug 3 05:28:15 2017 (r321970) +++ projects/runtime-coverage/cddl/usr.sbin/Makefile Thu Aug 3 05:30:11 2017 (r321971) @@ -5,14 +5,11 @@ SUBDIR= ${_dtrace} \ ${_lockstat} \ ${_plockstat} \ - ${_tests} \ ${_zdb} \ ${_zfsd} \ ${_zhack} -.if ${MK_TESTS} != "no" -_tests= tests -.endif +SUBDIR.${MK_TESTS}+= tests .if ${MK_ZFS} != "no" .if ${MK_LIBTHR} != "no" Copied: projects/runtime-coverage/contrib/hyperv/tools/scripts/hyperv_vfattach (from r321970, head/contrib/hyperv/tools/scripts/hyperv_vfattach) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/runtime-coverage/contrib/hyperv/tools/scripts/hyperv_vfattach Thu Aug 3 05:30:11 2017 (r321971, copy of r321970, head/contrib/hyperv/tools/scripts/hyperv_vfattach) @@ -0,0 +1,79 @@ +#!/bin/sh + +# +# If transparent VF is enabled, don't do anything. +# + +sysctl -n hw.hn.vf_transparent > /dev/null 2>&1 +if [ $? -ne 0 ] +then + # Old kernel; no transparent VF. + vf_transparent=0 +else + vf_transparent=`sysctl -n hw.hn.vf_transparent` +fi + +if [ $vf_transparent -ne 0 ] +then + # Transparent VF; done! + exit 0 +fi + +iface=$1 +delay=$2 + +if [ $delay -gt 0 ] +then + # + # Delayed VF up. + # + sleep $delay + ifconfig $iface up + # Done! + exit $? +fi + +# +# Check to see whether $iface is a VF or not. +# If $iface is a VF, bring it up now. +# + +# for hyperv_vf_delay +. /etc/rc.conf + +sysctl -n hw.hn.vflist > /dev/null 2>&1 +if [ $? -ne 0 ] +then + # Old kernel; nothing could be done properly. + exit 0 +fi +vf_list=`sysctl -n hw.hn.vflist` + +for vf in $vf_list +do + if [ $vf = $iface ] + then + # + # Linger a little bit (at least 2 seconds) mainly to + # make sure that $iface is fully attached. + # + # NOTE: + # In Azure hyperv_vf_delay should be configured to a + # large value, e.g. 120 seconds, to avoid racing cloud + # agent goofs. + # + test $hyperv_vf_delay -ge 2 > /dev/null 2>&1 + if [ $? -ne 0 ] + then + hyperv_vf_delay=2 + fi + # + # NOTE: + # "(sleep ..; ifconfig .. up) > /dev/null 2>&1 &" + # does _not_ work. + # + daemon -f /usr/libexec/hyperv/hyperv_vfattach \ + $iface $hyperv_vf_delay + break + fi +done Copied: projects/runtime-coverage/contrib/hyperv/tools/scripts/hyperv_vfup (from r321970, head/contrib/hyperv/tools/scripts/hyperv_vfup) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/runtime-coverage/contrib/hyperv/tools/scripts/hyperv_vfup Thu Aug 3 05:30:11 2017 (r321971, copy of r321970, head/contrib/hyperv/tools/scripts/hyperv_vfup) @@ -0,0 +1,119 @@ +#!/bin/sh + +. /etc/rc.subr +. /etc/network.subr + +load_rc_config netif + +# +# Customized per-interface setup, e.g. hyperv_vfup.hn1 +# +# NOTE-CUSTOMIZE: +# Comment this out, if this script is used as template +# for the customized per-interface setup. +# +if [ -f /usr/libexec/hyperv/hyperv_vfup.$1 ] +then + /usr/libexec/hyperv/hyperv_vfup.$1 + exit $? +fi + +# NOTE-CUSTOMIZE: +#hn=${0##*.} +hn=$1 +hn_unit=`echo $hn | sed 's/[^0-9]*//g'` + +vf=`sysctl -n dev.hn.$hn_unit.vf` +if [ ! $vf ] +then + # Race happened; VF was removed, before we ran. + echo "$hn: VF was detached" + exit 0 +fi + +# +# Create laggX for hnX. +# Add VF and hnX to laggX. +# + +lagg=lagg$hn_unit + +ifconfig $lagg > /dev/null 2>&1 +if [ $? -ne 0 ] +then + # + # No laggX, create it now. + # + ifconfig $lagg create > /dev/null 2>&1 + if [ $? -ne 0 ] + then + echo "$lagg creation failed" + exit 1 + fi + + # + # Configure laggX (failover), add hnX and VF to it. + # + ifconfig $lagg laggproto failover laggport $hn laggport $vf + ifconfig $lagg inet6 no_dad + + # + # Stop dhclient on hnX, if any. + # + pidfile=/var/run/dhclient.$hn.pid + if [ -f $pidfile ] + then + kill -TERM `cat $pidfile` + fi + + # + # Remove all configured IPv4 addresses on hnX, e.g. + # configured by dhclient. laggX will take over the + # network operations. + # + while true + do + ifconfig $hn -alias > /dev/null 2>&1 + if [ $? -ne 0 ] + then + break + fi + done + + # TODO: Remove IPv6 addresses on hnX + + # + # Use hnX's configuration for laggX + # + # NOTE-CUSTOMIZE: + # If this script is used as template for the customized + # per-interface setup, replace this with whatever you + # want to do with the laggX. + # + if dhcpif $hn; + then + ifconfig $lagg up + if syncdhcpif $hn; + then + dhclient $lagg + else + dhclient -b $lagg + fi + else + ifconfig_args=`ifconfig_getargs $hn` + if [ -n "$ifconfig_args" ] + then + ifconfig $lagg $ifconfig_args + fi + fi +else + # + # laggX exists. Check whether VF was there or not. + # If VF was not added to laggX, add it now. + # + ifconfig $lagg | grep "laggport: $vf" > /dev/null 2>&1 + if [ $? -ne 0 ] + then + ifconfig $lagg laggport $vf + fi +fi Modified: projects/runtime-coverage/contrib/mdocml/INSTALL ============================================================================== --- projects/runtime-coverage/contrib/mdocml/INSTALL Thu Aug 3 05:28:15 2017 (r321970) +++ projects/runtime-coverage/contrib/mdocml/INSTALL Thu Aug 3 05:30:11 2017 (r321971) @@ -1,22 +1,24 @@ -$Id: INSTALL,v 1.18 2017/02/08 12:24:10 schwarze Exp $ +$Id: INSTALL,v 1.20 2017/07/28 14:57:56 schwarze Exp $ -About mdocml, the portable mandoc distribution ----------------------------------------------- -The mandoc manpage compiler toolset is a suite of tools compiling -mdoc(7), the roff(7) macro language of choice for BSD manual pages, -and man(7), the predominant historical language for UNIX manuals. +About the portable mandoc distribution +-------------------------------------- +The mandoc manpage compiler toolset (formerly called "mdocml") +is a suite of tools compiling mdoc(7), the roff(7) macro language +of choice for BSD manual pages, and man(7), the predominant +historical language for UNIX manuals. + It includes a man(1) manual viewer and additional tools. -For general information, see <http://mdocml.bsd.lv/>. +For general information, see <http://mandoc.bsd.lv/>. In case you have questions or want to provide feedback, read -<http://mdocml.bsd.lv/contact.html>. Consider subscribing to the +<http://mandoc.bsd.lv/contact.html>. Consider subscribing to the discuss@ mailing list mentioned on that page. If you intend to help with the development of mandoc, consider subscribing to the tech@ mailing list, too. Enjoy using the mandoc toolset! -Ingo Schwarze, Karlsruhe, February 2017 +Ingo Schwarze, Karlsruhe, July 2017 Installation @@ -25,7 +27,7 @@ Before manually installing mandoc on your system, plea whether the newest version of mandoc is already installed by default or available via a binary package or a ports system. A list of the latest bundled and ported versions of mandoc for various operating -systems is maintained at <http://mdocml.bsd.lv/ports.html>. +systems is maintained at <http://mandoc.bsd.lv/ports.html>. Regarding how packages and ports are maintained for your operating system, please consult your operating system documentation. @@ -35,7 +37,7 @@ To install mandoc manually, the following steps are ne run the command "echo BUILD_CGI=1 >> configure.local". Then run "cp cgi.h.example cgi.h" and edit cgi.h as desired. -2. If you also want to build the new catman(8) utility, run the +2. If you also want to build the catman(8) utility, run the command "echo BUILD_CATMAN=1 >> configure.local". Note that it is unlikely to be a drop-in replacement providing the same functionality as your system's "catman", if your operating @@ -75,7 +77,7 @@ command like "make DESTDIR=... install". Read the *-i in the "Makefile" to understand how DESTDIR is used. 9. Run the command "sudo makewhatis" to build mandoc.db(5) databases -in all the directory trees configured in step 6. Whenever installing +in all the directory trees configured in step 3. Whenever installing new manual pages, re-run makewhatis(8) to update the databases, or apropos(1) will not find the new pages. Modified: projects/runtime-coverage/contrib/mdocml/LICENSE ============================================================================== --- projects/runtime-coverage/contrib/mdocml/LICENSE Thu Aug 3 05:28:15 2017 (r321970) +++ projects/runtime-coverage/contrib/mdocml/LICENSE Thu Aug 3 05:30:11 2017 (r321971) @@ -1,7 +1,7 @@ -$Id: LICENSE,v 1.15 2017/02/21 00:37:03 schwarze Exp $ +$Id: LICENSE,v 1.17 2017/06/23 15:58:14 schwarze Exp $ With the exceptions noted below, all code and documentation -contained in the mdocml toolkit is protected by the Copyright +contained in the mandoc toolkit is protected by the Copyright of the following developers: Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv> @@ -13,7 +13,7 @@ Copyright (c) 2016 Ed Maste <emaste@freebsd.org> Copyright (c) 2017 Michael Stapelberg <stapelberg@debian.org> Copyright (c) 1999, 2004 Marc Espie <espie@openbsd.org> Copyright (c) 1998, 2004, 2010 Todd C. Miller <Todd.Miller@courtesan.com> -Copyright (c) 2008 Otto Moerbeek <otto@drijf.net> +Copyright (c) 2008, 2017 Otto Moerbeek <otto@drijf.net> Copyright (c) 2004 Ted Unangst <tedu@openbsd.org> Copyright (c) 1994 Christos Zoulas <christos@netbsd.org> Copyright (c) 2003, 2007, 2008, 2014 Jason McIntyre <jmc@openbsd.org> @@ -22,7 +22,7 @@ See the individual source files for information about to which file during which years. -The mdocml distribution as a whole is distributed by its developers +The mandoc distribution as a whole is distributed by its developers under the following license: Permission to use, copy, modify, and distribute this software for any Modified: projects/runtime-coverage/contrib/mdocml/Makefile ============================================================================== --- projects/runtime-coverage/contrib/mdocml/Makefile Thu Aug 3 05:28:15 2017 (r321970) +++ projects/runtime-coverage/contrib/mdocml/Makefile Thu Aug 3 05:30:11 2017 (r321971) @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.512 2017/05/07 17:31:45 schwarze Exp $ +# $Id: Makefile,v 1.516 2017/07/20 16:24:53 schwarze Exp $ # # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> # Copyright (c) 2011, 2013-2017 Ingo Schwarze <schwarze@openbsd.org> @@ -15,7 +15,7 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -VERSION = 1.14.1 +VERSION = 1.14.2 # === LIST OF FILES ==================================================== @@ -38,6 +38,7 @@ TESTSRCS = test-be32toh.c \ test-progname.c \ test-recvmsg.c \ test-reallocarray.c \ + test-recallocarray.c \ test-rewb-bsd.c \ test-rewb-sysv.c \ test-sandbox_init.c \ @@ -64,6 +65,7 @@ SRCS = att.c \ compat_ohash.c \ compat_progname.c \ compat_reallocarray.c \ + compat_recallocarray.c \ compat_strcasestr.c \ compat_stringlist.c \ compat_strlcat.c \ @@ -92,6 +94,7 @@ SRCS = att.c \ mandoc.c \ mandoc_aux.c \ mandoc_ohash.c \ + mandoc_xr.c \ mandocd.c \ mandocdb.c \ manpath.c \ @@ -178,6 +181,7 @@ DISTFILES = INSTALL \ mandoc_html.3 \ mandoc_malloc.3 \ mandoc_ohash.h \ + mandoc_xr.h \ mandocd.8 \ mansearch.3 \ mansearch.h \ @@ -227,6 +231,7 @@ LIBMANDOC_OBJS = $(LIBMAN_OBJS) \ mandoc.o \ mandoc_aux.o \ mandoc_ohash.o \ + mandoc_xr.o \ msec.o \ preconv.o \ read.o @@ -240,6 +245,7 @@ COMPAT_OBJS = compat_err.o \ compat_ohash.o \ compat_progname.o \ compat_reallocarray.o \ + compat_recallocarray.o \ compat_strcasestr.o \ compat_strlcat.o \ compat_strlcpy.o \ @@ -341,9 +347,6 @@ WWW_MANS = apropos.1.html \ mdoc.h.html \ roff.h.html -WWW_OBJS = mdocml.tar.gz \ - mdocml.sha256 - # === USER CONFIGURATION =============================================== include Makefile.local @@ -354,7 +357,7 @@ all: mandoc demandoc soelim $(BUILD_TARGETS) Makefile. install: base-install $(INSTALL_TARGETS) -www: $(WWW_OBJS) $(WWW_MANS) +www: $(WWW_MANS) $(WWW_MANS): mandoc @@ -372,10 +375,10 @@ clean: rm -f libmandoc.a $(LIBMANDOC_OBJS) $(COMPAT_OBJS) rm -f mandoc $(MAIN_OBJS) rm -f man.cgi $(CGI_OBJS) - rm -f mandocd catman $(MANDOCD_OBJS) + rm -f mandocd catman catman.o $(MANDOCD_OBJS) rm -f demandoc $(DEMANDOC_OBJS) rm -f soelim $(SOELIM_OBJS) - rm -f $(WWW_MANS) $(WWW_OBJS) + rm -f $(WWW_MANS) mandoc.tar.gz mandoc.sha256 rm -rf *.dSYM base-install: mandoc demandoc soelim @@ -509,13 +512,7 @@ soelim: $(SOELIM_OBJS) # --- maintainer targets --- www-install: www - mkdir -p $(HTDOCDIR)/snapshots $(INSTALL_DATA) $(WWW_MANS) mandoc.css $(HTDOCDIR) - $(INSTALL_DATA) $(WWW_OBJS) $(HTDOCDIR)/snapshots - $(INSTALL_DATA) mdocml.tar.gz \ - $(HTDOCDIR)/snapshots/mdocml-$(VERSION).tar.gz - $(INSTALL_DATA) mdocml.sha256 \ - $(HTDOCDIR)/snapshots/mdocml-$(VERSION).sha256 depend: config.h mkdep -f Makefile.depend $(CFLAGS) $(SRCS) @@ -542,24 +539,25 @@ regress-distcheck: ! -name '*.out_ascii' \ ! -name '*.out_utf8' \ ! -name '*.out_html' \ + ! -name '*.out_markdown' \ ! -name '*.out_lint' \ ! -path regress/regress.pl \ ! -path regress/regress.pl.1 -dist: mdocml.sha256 +dist: mandoc.sha256 -mdocml.sha256: mdocml.tar.gz - sha256 mdocml.tar.gz > $@ +mandoc.sha256: mandoc.tar.gz + sha256 mandoc.tar.gz > $@ -mdocml.tar.gz: $(DISTFILES) +mandoc.tar.gz: $(DISTFILES) ls regress/*/*/*.mandoc_* && exit 1 || true - mkdir -p .dist/mdocml-$(VERSION)/ - $(INSTALL) -m 0644 $(DISTFILES) .dist/mdocml-$(VERSION) - cp -pR regress .dist/mdocml-$(VERSION) - find .dist/mdocml-$(VERSION)/regress \ + mkdir -p .dist/mandoc-$(VERSION)/ + $(INSTALL) -m 0644 $(DISTFILES) .dist/mandoc-$(VERSION) + cp -pR regress .dist/mandoc-$(VERSION) + find .dist/mandoc-$(VERSION)/regress \ -type d -name CVS -print0 | xargs -0 rm -rf - chmod 755 .dist/mdocml-$(VERSION)/configure - ( cd .dist/ && tar zcf ../$@ mdocml-$(VERSION) ) + chmod 755 .dist/mandoc-$(VERSION)/configure + ( cd .dist/ && tar zcf ../$@ mandoc-$(VERSION) ) rm -rf .dist/ # === SUFFIX RULES ===================================================== Modified: projects/runtime-coverage/contrib/mdocml/Makefile.depend ============================================================================== --- projects/runtime-coverage/contrib/mdocml/Makefile.depend Thu Aug 3 05:28:15 2017 (r321970) +++ projects/runtime-coverage/contrib/mdocml/Makefile.depend Thu Aug 3 05:30:11 2017 (r321971) @@ -1,4 +1,4 @@ -att.o: att.c config.h roff.h mdoc.h libmdoc.h +att.o: att.c config.h mandoc.h roff.h mdoc.h libmdoc.h catman.o: catman.c config.h compat_fts.h cgi.o: cgi.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h man.h main.h manconf.h mansearch.h cgi.h chars.o: chars.c config.h mandoc.h mandoc_aux.h mandoc_ohash.h compat_ohash.h libmandoc.h @@ -11,6 +11,7 @@ compat_mkdtemp.o: compat_mkdtemp.c config.h compat_ohash.o: compat_ohash.c config.h compat_ohash.h compat_progname.o: compat_progname.c config.h compat_reallocarray.o: compat_reallocarray.c config.h +compat_recallocarray.o: compat_recallocarray.c config.h compat_strcasestr.o: compat_strcasestr.c config.h compat_stringlist.o: compat_stringlist.c config.h compat_stringlist.h compat_strlcat.o: compat_strlcat.c config.h @@ -24,44 +25,45 @@ dba_read.o: dba_read.c mandoc_aux.h mansearch.h dba_ar dba_write.o: dba_write.c config.h dba_write.h dbm.o: dbm.c config.h mansearch.h dbm_map.h dbm.h dbm_map.o: dbm_map.c config.h mansearch.h dbm_map.h dbm.h -demandoc.o: demandoc.c config.h roff.h man.h mdoc.h mandoc.h -eqn.o: eqn.c config.h mandoc.h mandoc_aux.h libmandoc.h libroff.h +demandoc.o: demandoc.c config.h mandoc.h roff.h man.h mdoc.h +eqn.o: eqn.c config.h mandoc_aux.h mandoc.h roff.h libmandoc.h libroff.h eqn_html.o: eqn_html.c config.h mandoc.h out.h html.h eqn_term.o: eqn_term.c config.h mandoc.h out.h term.h html.o: html.c config.h mandoc_aux.h mandoc.h roff.h out.h html.h manconf.h main.h -lib.o: lib.c config.h roff.h mdoc.h libmdoc.h lib.in -main.o: main.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h man.h tag.h main.h manconf.h mansearch.h +lib.o: lib.c config.h mandoc.h roff.h mdoc.h libmdoc.h lib.in +main.o: main.c config.h mandoc_aux.h mandoc.h mandoc_xr.h roff.h mdoc.h man.h tag.h main.h manconf.h mansearch.h man.o: man.c config.h mandoc_aux.h mandoc.h roff.h man.h libmandoc.h roff_int.h libman.h -man_html.o: man_html.c config.h mandoc_aux.h roff.h man.h out.h html.h main.h +man_html.o: man_html.c config.h mandoc_aux.h mandoc.h roff.h man.h out.h html.h main.h man_macro.o: man_macro.c config.h mandoc.h roff.h man.h libmandoc.h roff_int.h libman.h man_term.o: man_term.c config.h mandoc_aux.h mandoc.h roff.h man.h out.h term.h main.h man_validate.o: man_validate.c config.h mandoc_aux.h mandoc.h roff.h man.h libmandoc.h roff_int.h libman.h -mandoc.o: mandoc.c config.h mandoc.h mandoc_aux.h libmandoc.h +mandoc.o: mandoc.c config.h mandoc_aux.h mandoc.h roff.h libmandoc.h mandoc_aux.o: mandoc_aux.c config.h mandoc.h mandoc_aux.h mandoc_ohash.o: mandoc_ohash.c mandoc_aux.h mandoc_ohash.h compat_ohash.h +mandoc_xr.o: mandoc_xr.c mandoc_aux.h mandoc_ohash.h compat_ohash.h mandoc_xr.h mandocd.o: mandocd.c config.h mandoc.h roff.h mdoc.h man.h main.h manconf.h mandocdb.o: mandocdb.c config.h compat_fts.h mandoc_aux.h mandoc_ohash.h compat_ohash.h mandoc.h roff.h mdoc.h man.h manconf.h mansearch.h dba_array.h dba.h manpath.o: manpath.c config.h mandoc_aux.h manconf.h mansearch.o: mansearch.c config.h mandoc.h mandoc_aux.h mandoc_ohash.h compat_ohash.h manconf.h mansearch.h dbm.h mdoc.o: mdoc.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h mdoc_argv.o: mdoc_argv.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h -mdoc_html.o: mdoc_html.c config.h mandoc_aux.h roff.h mdoc.h out.h html.h main.h +mdoc_html.o: mdoc_html.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h out.h html.h main.h mdoc_macro.o: mdoc_macro.c config.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h mdoc_man.o: mdoc_man.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h man.h out.h main.h mdoc_markdown.o: mdoc_markdown.c mandoc_aux.h mandoc.h roff.h mdoc.h main.h mdoc_state.o: mdoc_state.c mandoc.h roff.h mdoc.h libmandoc.h libmdoc.h mdoc_term.o: mdoc_term.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h out.h term.h tag.h main.h -mdoc_validate.o: mdoc_validate.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h +mdoc_validate.o: mdoc_validate.c config.h mandoc_aux.h mandoc.h mandoc_xr.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h msec.o: msec.c config.h mandoc.h libmandoc.h msec.in out.o: out.c config.h mandoc_aux.h mandoc.h out.h preconv.o: preconv.c config.h mandoc.h libmandoc.h -read.o: read.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h man.h libmandoc.h roff_int.h +read.o: read.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h man.h libmandoc.h roff.o: roff.c config.h mandoc.h mandoc_aux.h mandoc_ohash.h compat_ohash.h roff.h libmandoc.h roff_int.h libroff.h predefs.in -roff_html.o: roff_html.c roff.h out.h html.h -roff_term.o: roff_term.c roff.h out.h term.h +roff_html.o: roff_html.c mandoc.h roff.h out.h html.h +roff_term.o: roff_term.c mandoc.h roff.h out.h term.h roff_validate.o: roff_validate.c mandoc.h roff.h libmandoc.h roff_int.h soelim.o: soelim.c config.h compat_stringlist.h -st.o: st.c config.h roff.h mdoc.h libmdoc.h st.in +st.o: st.c config.h mandoc.h roff.h mdoc.h libmdoc.h st.in tag.o: tag.c config.h mandoc_aux.h mandoc_ohash.h compat_ohash.h tag.h tbl.o: tbl.c config.h mandoc.h mandoc_aux.h libmandoc.h libroff.h tbl_data.o: tbl_data.c config.h mandoc.h mandoc_aux.h libmandoc.h libroff.h Modified: projects/runtime-coverage/contrib/mdocml/NEWS ============================================================================== --- projects/runtime-coverage/contrib/mdocml/NEWS Thu Aug 3 05:28:15 2017 (r321970) +++ projects/runtime-coverage/contrib/mdocml/NEWS Thu Aug 3 05:30:11 2017 (r321971) @@ -1,7 +1,93 @@ -$Id: NEWS,v 1.21 2017/02/21 00:37:03 schwarze Exp $ +$Id: NEWS,v 1.26 2017/07/28 14:57:56 schwarze Exp $ -This file lists the most important changes in the mdocml.bsd.lv distribution. +This file lists the most important changes in the mandoc.bsd.lv distribution. +Changes in version 1.14.2, released on July 28, 2017 + + --- MAJOR NEW FEATURES --- + * New mdoc(7) -Tmarkdown output mode. + * For -Thtml, implement internal hyperlinks pointing to authoritative + definitions of various syntax elements, similar to the ctags(1)-like + less(1) :t internal searching in terminal mode. + * Provide a superset of the functionality of the former mdoclint(1) + utility and a new -Wstyle message level with several new messages, + including validity checking of .Xr cross references. + * tbl(7): Implement automatic line breaking inside individual table + cells, and several other formatting improvements. + * eqn(7): Complete rewrite of the lexer, resulting in several bugfixes. + * Continue parser unification, in particular allowing generation + of syntax tree nodes on the roff(7) level, allowing implementation + of many additional roff requests. + --- REMOVED FUNCTIONALITY --- + * Delete the manpage(1) utility. It was never enabled in any release. + * Delete the -Txhtml command line option. It has been an obsolete + alias for the -Thtml output mode for more than two years. + --- MINOR NEW FEATURES --- + * -Tlint now puts parser messages on stdout instead of stderr, + making commands like "man -l -Tlint *.1" useful. + * mdoc(7): Various .Lk formatting improvements. + * mdoc(7) -Thtml: Better CSS for .Bl lists. + * man(7): Implement the .MT/.ME block macro (mailto hyperlink). + * man(7): Implement the .DT macro (restore default tab positions). + * man(7): Improved support for manuals generated with reStructuredText + by partial support for the \n[an-margin] number register. + * man(7) -Thtml: Support deep linking to .SH and .SS headers. + * tbl(7): Implement the "allbox" table option. + * tbl(7): Implement the column spacing and the 'w' (minimum column + width) layout modifiers. + * tbl(7): Significant improvements of the manual page. + * eqn(7): Much improved font selection, including recognition of + well-known function names, and a few other formatting improvements. + * eqn(7) -Thtml: Use <mn> and <mo> in addition to <mi>. + * roff(7): Implement the .ce (centering), .mc (margin character), + .rj (right justify), .ta (define tab stops), .ti (temporary indent), + .als (macro alias), .ec and .eo (escape character control), + .po (page offset), and .rn (macro rename) requests. + * roff(7) .am: Implement appending to mdoc(7) and man(7) macros. + * roff(7): implement the \h (horizontol motion), \l (horizontal + line drawing), and \p (break output line) escape sequences, + and also several additional character escape sequences. + * roff(7): Implement the 'd' conditional (macro or string defined). + * man.cgi(8) now uses pledge(2), too. + * regress.pl(1): simpler user interface, better summary output, + simpler code, and no more recursion. + --- THANKS TO --- + * Anthony Bentley (OpenBSD) for the implementation of .MT/.ME, + reports of many bugs and missing features, and suggestions + for a number of feature and documentation improvements. + * Sebastien Marie (OpenBSD) for two source code patches and + for some useful discussions. + * Florian Obser (OpenBSD) for a bugfix patch and a bug report. + * Jonathan Gray (OpenBSD) for several bug reports from afl(1) + and several more from static analysis tools. + * Theo Buehler (OpenBSD) for several bug reports, most from afl(1). + * Jason McIntyre (OpenBSD) for many useful discussions about a + wide variety of topics, lots of continuous testing, a number of + bug reports, and some suggestions for messages and documentation. + * Thomas Klausner (NetBSD) for lots of help while migrating + mdoclint(1) functionality to mandoc -Tlint, for suggesting + several useful new messages, and for release testing. + * Reyk Floeter (OpenBSD) and Vsevolod Stakhov (FreeBSD) for + suggesting a markdown output mode. + * Thomas Guettler for suggesting -Thtml internal hyperlinks. + * Yuri Pankov (Illumos) for inspiring new warning messages and + for extensive release testing. + * Anton Lindqvist and TJ Townsend (both OpenBSD) and Jan Stary + for multiple bug reports. + * Leah Neukirchen (Void Linux) for bug reports and release testing. *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708030530.v735UCMZ041307>