Date: Sun, 6 Aug 2017 06:46:44 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r322114 - in projects/krb5: . 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/opensolaris/cm... Message-ID: <201708060646.v766ki9L059902@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Sun Aug 6 06:46:44 2017 New Revision: 322114 URL: https://svnweb.freebsd.org/changeset/base/322114 Log: MFH r321831-r322113. We are specifically interested in merging r322112 and r322113 from HEAD. Added: projects/krb5/crypto/openssh/regress/unittests/conversion/ - copied from r322113, head/crypto/openssh/regress/unittests/conversion/ projects/krb5/share/vt/keymaps/tr.f.kbd - copied unchanged from r322113, head/share/vt/keymaps/tr.f.kbd projects/krb5/sys/arm/conf/GENERIC-NODEBUG - copied unchanged from r322113, head/sys/arm/conf/GENERIC-NODEBUG projects/krb5/sys/arm/freescale/imx/imx6_ahci.c - copied unchanged from r322113, head/sys/arm/freescale/imx/imx6_ahci.c projects/krb5/sys/boot/efi/include/efi_driver_utils.h - copied unchanged from r322113, head/sys/boot/efi/include/efi_driver_utils.h projects/krb5/sys/boot/efi/include/efi_drivers.h - copied unchanged from r322113, head/sys/boot/efi/include/efi_drivers.h projects/krb5/sys/boot/efi/include/efizfs.h - copied unchanged from r322113, head/sys/boot/efi/include/efizfs.h projects/krb5/sys/boot/efi/libefi/devicename.c - copied unchanged from r322113, head/sys/boot/efi/libefi/devicename.c projects/krb5/sys/boot/efi/libefi/efi_driver_utils.c - copied unchanged from r322113, head/sys/boot/efi/libefi/efi_driver_utils.c projects/krb5/sys/boot/efi/libefi/efizfs.c - copied unchanged from r322113, head/sys/boot/efi/libefi/efizfs.c projects/krb5/sys/dev/cxgbe/cudbg/ - copied from r322113, head/sys/dev/cxgbe/cudbg/ projects/krb5/sys/dev/iicbus/isl12xx.c - copied unchanged from r322113, head/sys/dev/iicbus/isl12xx.c projects/krb5/sys/modules/i2c/isl12xx/ - copied from r322113, head/sys/modules/i2c/isl12xx/ Deleted: projects/krb5/crypto/openssh/auth1.c projects/krb5/sys/boot/efi/loader/devicename.c projects/krb5/sys/sys/ksyms.h Modified: projects/krb5/Makefile.inc1 projects/krb5/ObsoleteFiles.inc projects/krb5/bin/cat/Makefile projects/krb5/bin/chmod/tests/chmod_test.sh projects/krb5/bin/date/Makefile projects/krb5/bin/dd/Makefile projects/krb5/bin/echo/Makefile projects/krb5/bin/expr/Makefile projects/krb5/bin/ln/Makefile projects/krb5/bin/ls/Makefile projects/krb5/bin/mv/Makefile projects/krb5/bin/pax/Makefile projects/krb5/bin/pkill/Makefile projects/krb5/bin/sh/Makefile projects/krb5/bin/sleep/Makefile projects/krb5/bin/test/Makefile projects/krb5/cddl/Makefile projects/krb5/cddl/contrib/opensolaris/cmd/lockstat/sym.c projects/krb5/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c projects/krb5/cddl/lib/Makefile projects/krb5/cddl/sbin/Makefile projects/krb5/cddl/usr.bin/Makefile projects/krb5/cddl/usr.sbin/Makefile projects/krb5/contrib/ipfilter/tools/ippool.c projects/krb5/contrib/libxo/Makefile.am projects/krb5/contrib/libxo/configure.ac projects/krb5/contrib/libxo/doc/libxo-manual.html projects/krb5/contrib/libxo/libxo/libxo.3 projects/krb5/contrib/libxo/libxo/libxo.c projects/krb5/contrib/libxo/libxo/xo_attr.3 projects/krb5/contrib/libxo/libxo/xo_create.3 projects/krb5/contrib/libxo/libxo/xo_emit.3 projects/krb5/contrib/libxo/libxo/xo_emit_err.3 projects/krb5/contrib/libxo/libxo/xo_emit_f.3 projects/krb5/contrib/libxo/libxo/xo_err.3 projects/krb5/contrib/libxo/libxo/xo_error.3 projects/krb5/contrib/libxo/libxo/xo_finish.3 projects/krb5/contrib/libxo/libxo/xo_flush.3 projects/krb5/contrib/libxo/libxo/xo_format.5 projects/krb5/contrib/libxo/libxo/xo_message.3 projects/krb5/contrib/libxo/libxo/xo_no_setlocale.3 projects/krb5/contrib/libxo/libxo/xo_open_container.3 projects/krb5/contrib/libxo/libxo/xo_open_list.3 projects/krb5/contrib/libxo/libxo/xo_open_marker.3 projects/krb5/contrib/libxo/libxo/xo_options.7 projects/krb5/contrib/libxo/libxo/xo_parse_args.3 projects/krb5/contrib/libxo/libxo/xo_set_allocator.3 projects/krb5/contrib/libxo/libxo/xo_set_flags.3 projects/krb5/contrib/libxo/libxo/xo_set_info.3 projects/krb5/contrib/libxo/libxo/xo_set_options.3 projects/krb5/contrib/libxo/libxo/xo_set_style.3 projects/krb5/contrib/libxo/libxo/xo_set_syslog_enterprise_id.3 projects/krb5/contrib/libxo/libxo/xo_set_version.3 projects/krb5/contrib/libxo/libxo/xo_set_writer.3 projects/krb5/contrib/libxo/libxo/xo_syslog.3 projects/krb5/contrib/libxo/tests/core/saved/test_01.E.out projects/krb5/contrib/libxo/tests/core/saved/test_01.H.out projects/krb5/contrib/libxo/tests/core/saved/test_01.HIPx.out projects/krb5/contrib/libxo/tests/core/saved/test_01.HP.out projects/krb5/contrib/libxo/tests/core/saved/test_01.J.out projects/krb5/contrib/libxo/tests/core/saved/test_01.JP.out projects/krb5/contrib/libxo/tests/core/saved/test_01.T.out projects/krb5/contrib/libxo/tests/core/saved/test_01.X.out projects/krb5/contrib/libxo/tests/core/saved/test_01.XP.out projects/krb5/contrib/libxo/tests/core/saved/test_02.E.out projects/krb5/contrib/libxo/tests/core/saved/test_02.J.out projects/krb5/contrib/libxo/tests/core/saved/test_02.JP.out projects/krb5/contrib/libxo/tests/core/saved/test_02.X.out projects/krb5/contrib/libxo/tests/core/saved/test_02.XP.out projects/krb5/contrib/libxo/tests/core/test_01.c projects/krb5/contrib/libxo/tests/xo/saved/xo_01.H.out projects/krb5/contrib/libxo/tests/xo/saved/xo_01.HIPx.out projects/krb5/contrib/libxo/tests/xo/saved/xo_01.HP.out projects/krb5/contrib/libxo/tests/xo/saved/xo_01.J.out projects/krb5/contrib/libxo/tests/xo/saved/xo_01.JP.out projects/krb5/contrib/libxo/tests/xo/saved/xo_01.T.out projects/krb5/contrib/libxo/tests/xo/saved/xo_01.X.out projects/krb5/contrib/libxo/tests/xo/saved/xo_01.XP.out projects/krb5/contrib/libxo/tests/xo/xo_01.sh projects/krb5/contrib/libxo/xo/xo.1 projects/krb5/contrib/libxo/xohtml/xohtml.1 projects/krb5/contrib/libxo/xohtml/xohtml.sh.in projects/krb5/contrib/libxo/xolint/xolint.1 projects/krb5/contrib/libxo/xopo/xopo.1 projects/krb5/contrib/ofed/usr.bin/Makefile projects/krb5/crypto/openssh/ChangeLog projects/krb5/crypto/openssh/INSTALL projects/krb5/crypto/openssh/Makefile.in projects/krb5/crypto/openssh/README projects/krb5/crypto/openssh/auth-pam.c projects/krb5/crypto/openssh/auth2-pubkey.c projects/krb5/crypto/openssh/auth2.c projects/krb5/crypto/openssh/channels.c projects/krb5/crypto/openssh/channels.h projects/krb5/crypto/openssh/clientloop.c projects/krb5/crypto/openssh/compat.c projects/krb5/crypto/openssh/config.h projects/krb5/crypto/openssh/configure.ac projects/krb5/crypto/openssh/contrib/cygwin/ssh-host-config projects/krb5/crypto/openssh/contrib/redhat/openssh.spec projects/krb5/crypto/openssh/contrib/suse/openssh.spec projects/krb5/crypto/openssh/digest-openssl.c projects/krb5/crypto/openssh/freebsd-configure.sh projects/krb5/crypto/openssh/hostfile.c projects/krb5/crypto/openssh/kex.c projects/krb5/crypto/openssh/krl.c projects/krb5/crypto/openssh/log.c projects/krb5/crypto/openssh/match.c projects/krb5/crypto/openssh/match.h projects/krb5/crypto/openssh/misc.c projects/krb5/crypto/openssh/monitor.c projects/krb5/crypto/openssh/mux.c projects/krb5/crypto/openssh/openbsd-compat/bsd-misc.c projects/krb5/crypto/openssh/openbsd-compat/bsd-misc.h projects/krb5/crypto/openssh/openbsd-compat/fmt_scaled.c projects/krb5/crypto/openssh/packet.c projects/krb5/crypto/openssh/packet.h projects/krb5/crypto/openssh/pathnames.h projects/krb5/crypto/openssh/readconf.c projects/krb5/crypto/openssh/regress/Makefile projects/krb5/crypto/openssh/regress/agent-getpeereid.sh projects/krb5/crypto/openssh/regress/allow-deny-users.sh projects/krb5/crypto/openssh/regress/cert-file.sh projects/krb5/crypto/openssh/regress/forwarding.sh projects/krb5/crypto/openssh/regress/integrity.sh projects/krb5/crypto/openssh/regress/test-exec.sh projects/krb5/crypto/openssh/regress/unittests/Makefile projects/krb5/crypto/openssh/regress/unittests/match/tests.c projects/krb5/crypto/openssh/regress/unittests/test_helper/test_helper.c projects/krb5/crypto/openssh/regress/unittests/test_helper/test_helper.h projects/krb5/crypto/openssh/regress/unittests/utf8/tests.c projects/krb5/crypto/openssh/sandbox-seccomp-filter.c projects/krb5/crypto/openssh/servconf.c projects/krb5/crypto/openssh/serverloop.c projects/krb5/crypto/openssh/session.c projects/krb5/crypto/openssh/sftp-client.c projects/krb5/crypto/openssh/sftp.c projects/krb5/crypto/openssh/ssh-agent.c projects/krb5/crypto/openssh/ssh-keygen.c projects/krb5/crypto/openssh/ssh-keyscan.c projects/krb5/crypto/openssh/ssh.c projects/krb5/crypto/openssh/ssh_config projects/krb5/crypto/openssh/ssh_config.5 projects/krb5/crypto/openssh/ssh_namespace.h projects/krb5/crypto/openssh/sshconnect.c projects/krb5/crypto/openssh/sshconnect1.c projects/krb5/crypto/openssh/sshconnect2.c projects/krb5/crypto/openssh/sshd.8 projects/krb5/crypto/openssh/sshd.c projects/krb5/crypto/openssh/sshd_config projects/krb5/crypto/openssh/sshd_config.5 projects/krb5/crypto/openssh/sshkey.c projects/krb5/crypto/openssh/sshkey.h projects/krb5/crypto/openssh/utf8.c projects/krb5/crypto/openssh/version.h projects/krb5/gnu/Makefile projects/krb5/kerberos5/lib/libkafs5/Makefile projects/krb5/kerberos5/libexec/ipropd-master/Makefile projects/krb5/lib/atf/Makefile projects/krb5/lib/atf/libatf-c++/Makefile projects/krb5/lib/atf/libatf-c/Makefile projects/krb5/lib/libarchive/Makefile projects/krb5/lib/libc/Makefile projects/krb5/lib/libcasper/services/cap_dns/Makefile projects/krb5/lib/libcasper/services/cap_grp/Makefile projects/krb5/lib/libcasper/services/cap_pwd/Makefile projects/krb5/lib/libcasper/services/cap_sysctl/Makefile projects/krb5/lib/libcrypt/Makefile projects/krb5/lib/libmp/Makefile projects/krb5/lib/libnv/Makefile projects/krb5/lib/libpathconv/Makefile projects/krb5/lib/libproc/Makefile projects/krb5/lib/librt/Makefile projects/krb5/lib/libstand/Makefile projects/krb5/lib/libthr/Makefile projects/krb5/lib/libutil/Makefile projects/krb5/lib/libutil/flopen.3 projects/krb5/lib/libutil/flopen.c projects/krb5/lib/libutil/libutil.h projects/krb5/lib/libxo/Makefile projects/krb5/lib/libxo/add.man projects/krb5/lib/libxo/tests/Makefile projects/krb5/lib/libxo/xo_config.h projects/krb5/lib/msun/Makefile projects/krb5/libexec/atf/atf-check/Makefile projects/krb5/libexec/atf/atf-sh/Makefile projects/krb5/libexec/rtld-elf/Makefile projects/krb5/sbin/devd/Makefile projects/krb5/sbin/dhclient/Makefile projects/krb5/sbin/growfs/Makefile projects/krb5/sbin/ifconfig/Makefile projects/krb5/sbin/ifconfig/af_link.c projects/krb5/sbin/mdconfig/Makefile projects/krb5/sbin/pfctl/Makefile projects/krb5/secure/Makefile projects/krb5/secure/lib/Makefile projects/krb5/secure/libexec/Makefile projects/krb5/secure/usr.bin/Makefile projects/krb5/secure/usr.sbin/Makefile projects/krb5/share/Makefile projects/krb5/share/examples/Makefile projects/krb5/share/examples/ppp/ppp.conf.sample projects/krb5/share/man/man3/makedev.3 projects/krb5/share/man/man4/ehci.4 projects/krb5/share/man/man4/ksyms.4 projects/krb5/share/man/man4/linux.4 projects/krb5/share/man/man4/ohci.4 projects/krb5/share/man/man4/ucom.4 projects/krb5/share/man/man4/ugen.4 projects/krb5/share/man/man4/uhci.4 projects/krb5/share/man/man4/uhid.4 projects/krb5/share/man/man4/ukbd.4 projects/krb5/share/man/man4/ums.4 projects/krb5/share/man/man4/uplcom.4 projects/krb5/share/man/man4/usb.4 projects/krb5/share/man/man4/xhci.4 projects/krb5/share/man/man5/fdescfs.5 projects/krb5/share/man/man5/src.conf.5 projects/krb5/share/misc/organization.dot projects/krb5/share/mk/bsd.compiler.mk projects/krb5/share/mk/bsd.opts.mk projects/krb5/share/mk/src.opts.mk projects/krb5/share/vt/keymaps/INDEX.keymaps projects/krb5/share/vt/keymaps/Makefile projects/krb5/share/zoneinfo/Makefile projects/krb5/sys/amd64/amd64/elf_machdep.c projects/krb5/sys/amd64/amd64/initcpu.c projects/krb5/sys/amd64/amd64/machdep.c projects/krb5/sys/amd64/amd64/pmap.c projects/krb5/sys/amd64/amd64/trap.c projects/krb5/sys/amd64/cloudabi64/cloudabi64_sysvec.c projects/krb5/sys/amd64/include/cpufunc.h projects/krb5/sys/amd64/include/md_var.h projects/krb5/sys/amd64/linux/linux_sysvec.c projects/krb5/sys/arm/allwinner/aw_ccu.c projects/krb5/sys/arm/allwinner/axp209.c projects/krb5/sys/arm/allwinner/clk/aw_modclk.c projects/krb5/sys/arm/allwinner/clkng/aw_ccung.c projects/krb5/sys/arm/arm/generic_timer.c projects/krb5/sys/arm/conf/IMX6 projects/krb5/sys/arm/freescale/imx/files.imx6 projects/krb5/sys/arm/freescale/imx/imx6_ccm.c projects/krb5/sys/arm/freescale/imx/imx6_ccmreg.h projects/krb5/sys/arm/freescale/imx/imx_ccmvar.h projects/krb5/sys/arm/freescale/imx/imx_iomux.c projects/krb5/sys/arm/freescale/imx/imx_iomuxreg.h projects/krb5/sys/arm/freescale/imx/imx_iomuxvar.h projects/krb5/sys/arm/freescale/imx/std.imx6 projects/krb5/sys/arm64/arm64/gic_v3.c projects/krb5/sys/arm64/arm64/gic_v3_fdt.c projects/krb5/sys/arm64/arm64/gic_v3_var.h projects/krb5/sys/arm64/arm64/gicv3_its.c projects/krb5/sys/arm64/arm64/mp_machdep.c projects/krb5/sys/arm64/conf/GENERIC projects/krb5/sys/arm64/include/param.h projects/krb5/sys/boot/efi/include/efilib.h projects/krb5/sys/boot/efi/include/efiprot.h projects/krb5/sys/boot/efi/libefi/Makefile projects/krb5/sys/boot/efi/libefi/errno.c projects/krb5/sys/boot/efi/libefi/time.c projects/krb5/sys/boot/efi/loader/Makefile projects/krb5/sys/boot/efi/loader/loader_efi.h projects/krb5/sys/boot/efi/loader/main.c projects/krb5/sys/boot/fdt/dts/arm/nanopi-neo.dts projects/krb5/sys/boot/geli/Makefile projects/krb5/sys/boot/zfs/zfsimpl.c projects/krb5/sys/compat/linuxkpi/common/include/linux/cdev.h projects/krb5/sys/compat/linuxkpi/common/include/linux/fs.h projects/krb5/sys/compat/linuxkpi/common/include/linux/kdev_t.h projects/krb5/sys/compat/linuxkpi/common/include/linux/pci.h projects/krb5/sys/compat/linuxkpi/common/src/linux_compat.c projects/krb5/sys/compat/linuxkpi/common/src/linux_pci.c projects/krb5/sys/conf/files projects/krb5/sys/conf/files.amd64 projects/krb5/sys/conf/files.arm64 projects/krb5/sys/conf/options.arm64 projects/krb5/sys/contrib/ena-com/ena_plat.h projects/krb5/sys/contrib/ipfilter/netinet/ip_nat.c projects/krb5/sys/dev/cxgbe/common/common.h projects/krb5/sys/dev/cxgbe/common/t4_hw.h projects/krb5/sys/dev/cxgbe/t4_ioctl.h projects/krb5/sys/dev/cxgbe/t4_main.c projects/krb5/sys/dev/hyperv/netvsc/if_hn.c projects/krb5/sys/dev/hyperv/netvsc/if_hnvar.h projects/krb5/sys/dev/hyperv/utilities/hv_kvp.c projects/krb5/sys/dev/ichwd/ichwd.c projects/krb5/sys/dev/ksyms/ksyms.c projects/krb5/sys/dev/mlx5/mlx5_core/mlx5_cmd.c projects/krb5/sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c projects/krb5/sys/dev/mmc/bridge.h projects/krb5/sys/dev/mmc/mmc_subr.c projects/krb5/sys/dev/mmc/mmc_subr.h projects/krb5/sys/dev/mmc/mmcbus_if.m projects/krb5/sys/dev/mmc/mmcsd.c projects/krb5/sys/dev/nvd/nvd.c projects/krb5/sys/dev/nvme/nvme.h projects/krb5/sys/dev/nvme/nvme_sim.c projects/krb5/sys/dev/nvme/nvme_sysctl.c projects/krb5/sys/dev/pci/pci.c projects/krb5/sys/fs/fdescfs/fdesc.h projects/krb5/sys/fs/fdescfs/fdesc_vfsops.c projects/krb5/sys/fs/fdescfs/fdesc_vnops.c projects/krb5/sys/fs/pseudofs/pseudofs.h projects/krb5/sys/i386/i386/machdep.c projects/krb5/sys/i386/i386/pmap.c projects/krb5/sys/i386/i386/trap.c projects/krb5/sys/i386/include/cpufunc.h projects/krb5/sys/kern/subr_blist.c projects/krb5/sys/kern/subr_witness.c projects/krb5/sys/kern/vfs_syscalls.c projects/krb5/sys/modules/cxgbe/if_cxgbe/Makefile projects/krb5/sys/modules/dtb/allwinner/Makefile projects/krb5/sys/modules/i2c/Makefile projects/krb5/sys/net80211/ieee80211_ioctl.c projects/krb5/sys/net80211/ieee80211_mesh.c projects/krb5/sys/ofed/drivers/infiniband/core/addr.c projects/krb5/sys/ofed/drivers/infiniband/core/cm.c projects/krb5/sys/sys/_termios.h projects/krb5/sys/sys/blist.h projects/krb5/sys/sys/types.h projects/krb5/sys/sys/vnode.h projects/krb5/sys/x86/include/x86_var.h projects/krb5/sys/x86/x86/identcpu.c projects/krb5/tests/sys/aio/lio_test.c projects/krb5/tests/sys/fs/tmpfs/Makefile projects/krb5/tests/sys/kern/ptrace_test.c projects/krb5/tools/tools/bootparttest/Makefile projects/krb5/tools/tools/bootparttest/bootparttest.c projects/krb5/tools/tools/bootparttest/stub.c projects/krb5/tools/tools/zfsboottest/Makefile projects/krb5/tools/tools/zfsboottest/zfsboottest.c projects/krb5/usr.bin/Makefile projects/krb5/usr.bin/apply/Makefile projects/krb5/usr.bin/basename/Makefile projects/krb5/usr.bin/bsdcat/Makefile projects/krb5/usr.bin/calendar/Makefile projects/krb5/usr.bin/calendar/calendars/calendar.freebsd projects/krb5/usr.bin/cmp/Makefile projects/krb5/usr.bin/col/Makefile projects/krb5/usr.bin/comm/Makefile projects/krb5/usr.bin/compress/Makefile projects/krb5/usr.bin/cpio/Makefile projects/krb5/usr.bin/csplit/Makefile projects/krb5/usr.bin/cut/Makefile projects/krb5/usr.bin/cut/cut.1 projects/krb5/usr.bin/diff/Makefile projects/krb5/usr.bin/diff3/Makefile projects/krb5/usr.bin/dirname/Makefile projects/krb5/usr.bin/file2c/Makefile projects/krb5/usr.bin/getconf/Makefile projects/krb5/usr.bin/grep/Makefile projects/krb5/usr.bin/gzip/Makefile projects/krb5/usr.bin/hexdump/Makefile projects/krb5/usr.bin/ident/Makefile projects/krb5/usr.bin/indent/Makefile projects/krb5/usr.bin/join/Makefile projects/krb5/usr.bin/jot/Makefile projects/krb5/usr.bin/lastcomm/Makefile projects/krb5/usr.bin/limits/Makefile projects/krb5/usr.bin/m4/Makefile projects/krb5/usr.bin/mkimg/Makefile projects/krb5/usr.bin/mt/mt.1 projects/krb5/usr.bin/ncal/Makefile projects/krb5/usr.bin/pr/Makefile projects/krb5/usr.bin/printf/Makefile projects/krb5/usr.bin/procstat/Makefile projects/krb5/usr.bin/procstat/procstat_ptlwpinfo.c projects/krb5/usr.bin/ruptime/ruptime.1 projects/krb5/usr.bin/rwho/rwho.1 projects/krb5/usr.bin/sdiff/Makefile projects/krb5/usr.bin/sed/Makefile projects/krb5/usr.bin/soelim/Makefile projects/krb5/usr.bin/tail/Makefile projects/krb5/usr.bin/tar/Makefile projects/krb5/usr.bin/timeout/Makefile projects/krb5/usr.bin/tr/Makefile projects/krb5/usr.bin/truncate/Makefile projects/krb5/usr.bin/uniq/Makefile projects/krb5/usr.bin/units/Makefile projects/krb5/usr.bin/uudecode/Makefile projects/krb5/usr.bin/uuencode/Makefile projects/krb5/usr.bin/xargs/Makefile projects/krb5/usr.bin/xinstall/Makefile projects/krb5/usr.bin/xo/Makefile projects/krb5/usr.bin/xohtml/xohtml.sh projects/krb5/usr.bin/yacc/Makefile projects/krb5/usr.sbin/Makefile projects/krb5/usr.sbin/chown/Makefile projects/krb5/usr.sbin/cxgbetool/cxgbetool.c projects/krb5/usr.sbin/etcupdate/Makefile projects/krb5/usr.sbin/extattr/Makefile projects/krb5/usr.sbin/fstyp/Makefile projects/krb5/usr.sbin/makefs/Makefile projects/krb5/usr.sbin/makefs/tests/makefs_cd9660_tests.sh projects/krb5/usr.sbin/newsyslog/Makefile projects/krb5/usr.sbin/nmtree/Makefile projects/krb5/usr.sbin/pmcstat/pmcpl_gprof.c projects/krb5/usr.sbin/pw/Makefile projects/krb5/usr.sbin/rpcbind/Makefile projects/krb5/usr.sbin/rwhod/rwhod.8 projects/krb5/usr.sbin/sa/Makefile projects/krb5/usr.sbin/tzsetup/tzsetup.c projects/krb5/usr.sbin/ypldap/entries.c Directory Properties: projects/krb5/ (props changed) projects/krb5/cddl/ (props changed) projects/krb5/cddl/contrib/opensolaris/ (props changed) projects/krb5/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/krb5/contrib/ipfilter/ (props changed) projects/krb5/contrib/libxo/ (props changed) projects/krb5/crypto/openssh/ (props changed) projects/krb5/sys/contrib/ena-com/ (props changed) projects/krb5/sys/contrib/ipfilter/ (props changed) Modified: projects/krb5/Makefile.inc1 ============================================================================== --- projects/krb5/Makefile.inc1 Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/Makefile.inc1 Sun Aug 6 06:46:44 2017 (r322114) @@ -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} @@ -760,10 +760,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 @@ -2759,9 +2761,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 @@ -2855,7 +2854,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/krb5/ObsoleteFiles.inc ============================================================================== --- projects/krb5/ObsoleteFiles.inc Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/ObsoleteFiles.inc Sun Aug 6 06:46:44 2017 (r322114) @@ -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/krb5/bin/cat/Makefile ============================================================================== --- projects/krb5/bin/cat/Makefile Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/bin/cat/Makefile Sun Aug 6 06:46:44 2017 (r322114) @@ -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/krb5/bin/chmod/tests/chmod_test.sh ============================================================================== --- projects/krb5/bin/chmod/tests/chmod_test.sh Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/bin/chmod/tests/chmod_test.sh Sun Aug 6 06:46:44 2017 (r322114) @@ -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 @@ -103,7 +115,7 @@ f_flag_body() f_flag_cleanup() { - atf_check chflags 0 foo + chflags 0 foo || : } atf_test_case h_flag @@ -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/krb5/bin/date/Makefile ============================================================================== --- projects/krb5/bin/date/Makefile Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/bin/date/Makefile Sun Aug 6 06:46:44 2017 (r322114) @@ -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/krb5/bin/dd/Makefile ============================================================================== --- projects/krb5/bin/dd/Makefile Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/bin/dd/Makefile Sun Aug 6 06:46:44 2017 (r322114) @@ -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/krb5/bin/echo/Makefile ============================================================================== --- projects/krb5/bin/echo/Makefile Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/bin/echo/Makefile Sun Aug 6 06:46:44 2017 (r322114) @@ -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/krb5/bin/expr/Makefile ============================================================================== --- projects/krb5/bin/expr/Makefile Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/bin/expr/Makefile Sun Aug 6 06:46:44 2017 (r322114) @@ -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/krb5/bin/ln/Makefile ============================================================================== --- projects/krb5/bin/ln/Makefile Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/bin/ln/Makefile Sun Aug 6 06:46:44 2017 (r322114) @@ -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/krb5/bin/ls/Makefile ============================================================================== --- projects/krb5/bin/ls/Makefile Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/bin/ls/Makefile Sun Aug 6 06:46:44 2017 (r322114) @@ -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/krb5/bin/mv/Makefile ============================================================================== --- projects/krb5/bin/mv/Makefile Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/bin/mv/Makefile Sun Aug 6 06:46:44 2017 (r322114) @@ -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/krb5/bin/pax/Makefile ============================================================================== --- projects/krb5/bin/pax/Makefile Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/bin/pax/Makefile Sun Aug 6 06:46:44 2017 (r322114) @@ -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/krb5/bin/pkill/Makefile ============================================================================== --- projects/krb5/bin/pkill/Makefile Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/bin/pkill/Makefile Sun Aug 6 06:46:44 2017 (r322114) @@ -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/krb5/bin/sh/Makefile ============================================================================== --- projects/krb5/bin/sh/Makefile Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/bin/sh/Makefile Sun Aug 6 06:46:44 2017 (r322114) @@ -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/krb5/bin/sleep/Makefile ============================================================================== --- projects/krb5/bin/sleep/Makefile Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/bin/sleep/Makefile Sun Aug 6 06:46:44 2017 (r322114) @@ -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/krb5/bin/test/Makefile ============================================================================== --- projects/krb5/bin/test/Makefile Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/bin/test/Makefile Sun Aug 6 06:46:44 2017 (r322114) @@ -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/krb5/cddl/Makefile ============================================================================== --- projects/krb5/cddl/Makefile Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/cddl/Makefile Sun Aug 6 06:46:44 2017 (r322114) @@ -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/krb5/cddl/contrib/opensolaris/cmd/lockstat/sym.c ============================================================================== --- projects/krb5/cddl/contrib/opensolaris/cmd/lockstat/sym.c Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/cddl/contrib/opensolaris/cmd/lockstat/sym.c Sun Aug 6 06:46:44 2017 (r322114) @@ -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/krb5/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c ============================================================================== --- projects/krb5/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c Sun Aug 6 06:46:44 2017 (r322114) @@ -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/krb5/cddl/lib/Makefile ============================================================================== --- projects/krb5/cddl/lib/Makefile Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/cddl/lib/Makefile Sun Aug 6 06:46:44 2017 (r322114) @@ -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/krb5/cddl/sbin/Makefile ============================================================================== --- projects/krb5/cddl/sbin/Makefile Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/cddl/sbin/Makefile Sun Aug 6 06:46:44 2017 (r322114) @@ -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/krb5/cddl/usr.bin/Makefile ============================================================================== --- projects/krb5/cddl/usr.bin/Makefile Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/cddl/usr.bin/Makefile Sun Aug 6 06:46:44 2017 (r322114) @@ -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/krb5/cddl/usr.sbin/Makefile ============================================================================== --- projects/krb5/cddl/usr.sbin/Makefile Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/cddl/usr.sbin/Makefile Sun Aug 6 06:46:44 2017 (r322114) @@ -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" Modified: projects/krb5/contrib/ipfilter/tools/ippool.c ============================================================================== --- projects/krb5/contrib/ipfilter/tools/ippool.c Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/ipfilter/tools/ippool.c Sun Aug 6 06:46:44 2017 (r322114) @@ -77,7 +77,7 @@ usage(prog) fprintf(stderr, "Usage:\t%s\n", prog); fprintf(stderr, "\t-a [-dnv] -m <name> [-o <role>] [-t type] [-T ttl] -i <ipaddr>[/netmask]\n"); fprintf(stderr, "\t-A [-dnv] [-m <name>] [-o <role>] [-S <seed>] [-t <type>]\n"); - fprintf(stderr, "\t-f <file> [-dnuv]\n"); + fprintf(stderr, "\t-f <file> [-dnuvR]\n"); fprintf(stderr, "\t-F [-dv] [-o <role>] [-t <type>]\n"); fprintf(stderr, "\t-l [-dv] [-m <name>] [-t <type>] [-o <role>] [-M <core>] [-N <namelist>]\n"); fprintf(stderr, "\t-r [-dnv] [-m <name>] [-o <role>] [-t type] -i <ipaddr>[/netmask]\n"); Modified: projects/krb5/contrib/libxo/Makefile.am ============================================================================== --- projects/krb5/contrib/libxo/Makefile.am Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/libxo/Makefile.am Sun Aug 6 06:46:44 2017 (r322114) @@ -38,7 +38,14 @@ GH_PAGES_DIR = gh-pages/ GH_PAGES_DIR_VER = gh-pages/${PACKAGE_VERSION} PACKAGE_FILE = ${PACKAGE_TARNAME}-${PACKAGE_VERSION}.tar.gz -upload: dist upload-docs +XOHTML_FILES = \ + ${top_srcdir}/xohtml/xohtml.css \ + ${top_srcdir}/xohtml/xohtml.js \ + ${top_srcdir}/xohtml/external/jquery.js \ + ${top_srcdir}/xohtml/external/jquery.qtip.css \ + ${top_srcdir}/xohtml/external/jquery.qtip.js + +upload: dist upload-docs upload-xohtml-files @echo "Remember to run:" @echo " gt tag ${PACKAGE_VERSION}" @@ -54,6 +61,18 @@ upload-docs: docs && git add libxo-manual.html \ && git commit -m 'new docs' \ libxo-manual.html ${PACKAGE_VERSION} \ + && git push origin gh-pages ) ; true + +upload-xohtml-files: + @echo "Uploading xohtml files ... " + @-[ -d ${GH_PAGES_DIR} ] \ + && echo "Updating xohtml files on gh-pages ..." \ + && mkdir -p ${GH_PAGES_DIR_VER}/xohtml \ + && cp ${XOHTML_FILES} ${GH_PAGES_DIR_VER}/xohtml \ + && (cd ${GH_PAGES_DIR} \ + && git add ${PACKAGE_VERSION}/xohtml \ + && git commit -m 'new xohtml files' \ + ${PACKAGE_VERSION}/xohtml \ && git push origin gh-pages ) ; true pkgconfigdir=$(libdir)/pkgconfig Modified: projects/krb5/contrib/libxo/configure.ac ============================================================================== --- projects/krb5/contrib/libxo/configure.ac Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/libxo/configure.ac Sun Aug 6 06:46:44 2017 (r322114) @@ -12,7 +12,7 @@ # AC_PREREQ(2.2) -AC_INIT([libxo], [0.8.1], [phil@juniper.net]) +AC_INIT([libxo], [0.8.4], [phil@juniper.net]) AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability]) # Support silent build rules. Requires at least automake-1.11. Modified: projects/krb5/contrib/libxo/doc/libxo-manual.html ============================================================================== --- projects/krb5/contrib/libxo/doc/libxo-manual.html Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/libxo/doc/libxo-manual.html Sun Aug 6 06:46:44 2017 (r322114) @@ -515,7 +515,7 @@ li.indline1 { } @top-right { - content: "June 2017"; + content: "August 2017"; } @top-center { @@ -22011,7 +22011,7 @@ jQuery(function ($) { </tr> <tr> <td class="header left"></td> -<td class="header right">June 14, 2017</td> +<td class="header right">August 3, 2017</td> </tr> </table></div> <p id="title" class="title">libxo: The Easy Way to Generate text, XML, JSON, and HTML output<br><span class="filename">libxo-manual</span></p> Modified: projects/krb5/contrib/libxo/libxo/libxo.3 ============================================================================== --- projects/krb5/contrib/libxo/libxo/libxo.3 Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/libxo/libxo/libxo.3 Sun Aug 6 06:46:44 2017 (r322114) @@ -311,3 +311,13 @@ to use an alternative set of low-level output function .Xr xo_set_style 3 , .Xr xo_set_writer 3 , .Xr xo_format 5 +.Sh HISTORY +The +.Nm libxo +library first appeared in +.Fx 11.0 . +.Sh AUTHORS +.Nm libxo +was written by +.An Phil Shafer Aq Mt phil@freebsd.org . + Modified: projects/krb5/contrib/libxo/libxo/libxo.c ============================================================================== --- projects/krb5/contrib/libxo/libxo/libxo.c Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/libxo/libxo/libxo.c Sun Aug 6 06:46:44 2017 (r322114) @@ -137,7 +137,7 @@ static const char xo_default_format[] = "%s"; #define XO_INDENT_BY 2 /* Amount to indent when pretty printing */ #define XO_DEPTH 128 /* Default stack depth */ -#define XO_MAX_ANCHOR_WIDTH (8*1024) /* Anything wider is just sillyb */ +#define XO_MAX_ANCHOR_WIDTH (8*1024) /* Anything wider is just silly */ #define XO_FAILURE_NAME "failure" @@ -5071,16 +5071,60 @@ xo_find_width (xo_handle_t *xop, xo_field_info_t *xfip bp[vlen] = '\0'; width = strtol(bp, &cp, 0); - if (width == LONG_MIN || width == LONG_MAX - || bp == cp || *cp != '\0' ) { + if (width == LONG_MIN || width == LONG_MAX || bp == cp || *cp != '\0') { width = 0; xo_failure(xop, "invalid width for anchor: '%s'", bp); } } else if (flen) { - if (flen != 2 || strncmp("%d", fmt, flen) != 0) - xo_failure(xop, "invalid width format: '%*.*s'", flen, flen, fmt); - if (!XOF_ISSET(xop, XOF_NO_VA_ARG)) - width = va_arg(xop->xo_vap, int); + /* + * We really expect the format for width to be "{:/%d}" or + * "{:/%u}", so if that's the case, we just grab our width off + * the argument list. But we need to avoid optimized logic if + * there's a custom formatter. + */ + if (xop->xo_formatter == NULL && flen == 2 + && strncmp("%d", fmt, flen) == 0) { + if (!XOF_ISSET(xop, XOF_NO_VA_ARG)) + width = va_arg(xop->xo_vap, int); + } else if (xop->xo_formatter == NULL && flen == 2 + && strncmp("%u", fmt, flen) == 0) { + if (!XOF_ISSET(xop, XOF_NO_VA_ARG)) + width = va_arg(xop->xo_vap, unsigned); + } else { + /* + * So we have a format and it's not a simple one like + * "{:/%d}". That means we need to format the field, + * extract the value from the formatted output, and then + * discard that output. + */ + int anchor_was_set = FALSE; + xo_buffer_t *xbp = &xop->xo_data; + ssize_t start_offset = xo_buf_offset(xbp); + bp = xo_buf_cur(xbp); /* Save start of the string */ + cp = NULL; + + if (XOIF_ISSET(xop, XOIF_ANCHOR)) { + XOIF_CLEAR(xop, XOIF_ANCHOR); + anchor_was_set = TRUE; + } + + ssize_t rc = xo_do_format_field(xop, xbp, fmt, flen, 0); + if (rc >= 0) { + xo_buf_append(xbp, "", 1); /* Append a NUL */ + + width = strtol(bp, &cp, 0); + if (width == LONG_MIN || width == LONG_MAX + || bp == cp || *cp != '\0') { + width = 0; + xo_failure(xop, "invalid width for anchor: '%s'", bp); + } + } + + /* Reset the cur pointer to where we found it */ + xbp->xb_curp = xbp->xb_bufp + start_offset; + if (anchor_was_set) + XOIF_SET(xop, XOIF_ANCHOR); + } } return width; @@ -5107,9 +5151,6 @@ static void xo_anchor_start (xo_handle_t *xop, xo_field_info_t *xfip, const char *value, ssize_t vlen) { - if (xo_style(xop) != XO_STYLE_TEXT && xo_style(xop) != XO_STYLE_HTML) - return; - if (XOIF_ISSET(xop, XOIF_ANCHOR)) xo_failure(xop, "the anchor already recording is discarded"); @@ -5129,9 +5170,6 @@ static void xo_anchor_stop (xo_handle_t *xop, xo_field_info_t *xfip, const char *value, ssize_t vlen) { - if (xo_style(xop) != XO_STYLE_TEXT && xo_style(xop) != XO_STYLE_HTML) - return; - if (!XOIF_ISSET(xop, XOIF_ANCHOR)) { xo_failure(xop, "no start anchor"); return; Modified: projects/krb5/contrib/libxo/libxo/xo_attr.3 ============================================================================== --- projects/krb5/contrib/libxo/libxo/xo_attr.3 Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/libxo/libxo/xo_attr.3 Sun Aug 6 06:46:44 2017 (r322114) @@ -58,3 +58,13 @@ already emitted in other form. .Sh SEE ALSO .Xr xo_emit 3 , .Xr libxo 3 +.Sh HISTORY +The +.Nm libxo +library first appeared in +.Fx 11.0 . +.Sh AUTHORS +.Nm libxo +was written by +.An Phil Shafer Aq Mt phil@freebsd.org . + Modified: projects/krb5/contrib/libxo/libxo/xo_create.3 ============================================================================== --- projects/krb5/contrib/libxo/libxo/xo_create.3 Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/libxo/libxo/xo_create.3 Sun Aug 6 06:46:44 2017 (r322114) @@ -65,3 +65,13 @@ resources associated with the default handle. .Xr xo_emit 3 , .Xr xo_set_options 3 , .Xr libxo 3 +.Sh HISTORY +The +.Nm libxo +library first appeared in +.Fx 11.0 . +.Sh AUTHORS +.Nm libxo +was written by +.An Phil Shafer Aq Mt phil@freebsd.org . + Modified: projects/krb5/contrib/libxo/libxo/xo_emit.3 ============================================================================== --- projects/krb5/contrib/libxo/libxo/xo_emit.3 Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/libxo/libxo/xo_emit.3 Sun Aug 6 06:46:44 2017 (r322114) @@ -102,3 +102,13 @@ then the number of display columns consumed by the out .Xr xo_open_list 3 , .Xr xo_format 5 , .Xr libxo 3 +.Sh HISTORY +The +.Nm libxo +library first appeared in +.Fx 11.0 . +.Sh AUTHORS +.Nm libxo +was written by +.An Phil Shafer Aq Mt phil@freebsd.org . + Modified: projects/krb5/contrib/libxo/libxo/xo_emit_err.3 ============================================================================== --- projects/krb5/contrib/libxo/libxo/xo_emit_err.3 Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/libxo/libxo/xo_emit_err.3 Sun Aug 6 06:46:44 2017 (r322114) @@ -70,3 +70,13 @@ parameter. .Xr xo_format 5 , .Xr xo_err 3 , .Xr libxo 3 +.Sh HISTORY +The +.Nm libxo +library first appeared in +.Fx 11.0 . +.Sh AUTHORS +.Nm libxo +was written by +.An Phil Shafer Aq Mt phil@freebsd.org . + Modified: projects/krb5/contrib/libxo/libxo/xo_emit_f.3 ============================================================================== --- projects/krb5/contrib/libxo/libxo/xo_emit_f.3 Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/libxo/libxo/xo_emit_f.3 Sun Aug 6 06:46:44 2017 (r322114) @@ -109,3 +109,13 @@ for details. .Xr xo_open_list 3 , .Xr xo_format 5 , .Xr libxo 3 +.Sh HISTORY +The +.Nm libxo +library first appeared in +.Fx 11.0 . +.Sh AUTHORS +.Nm libxo +was written by +.An Phil Shafer Aq Mt phil@freebsd.org . + Modified: projects/krb5/contrib/libxo/libxo/xo_err.3 ============================================================================== --- projects/krb5/contrib/libxo/libxo/xo_err.3 Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/libxo/libxo/xo_err.3 Sun Aug 6 06:46:44 2017 (r322114) @@ -72,3 +72,13 @@ parameter. .Xr xo_emit 3 , .Xr xo_emit_err 3 , .Xr libxo 3 +.Sh HISTORY +The +.Nm libxo +library first appeared in +.Fx 11.0 . +.Sh AUTHORS +.Nm libxo +was written by +.An Phil Shafer Aq Mt phil@freebsd.org . + Modified: projects/krb5/contrib/libxo/libxo/xo_error.3 ============================================================================== --- projects/krb5/contrib/libxo/libxo/xo_error.3 Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/libxo/libxo/xo_error.3 Sun Aug 6 06:46:44 2017 (r322114) @@ -39,3 +39,13 @@ calls. .Xr printf 3 , .Xr xo_emit 3 , .Xr libxo 3 +.Sh HISTORY +The +.Nm libxo +library first appeared in +.Fx 11.0 . +.Sh AUTHORS +.Nm libxo +was written by +.An Phil Shafer Aq Mt phil@freebsd.org . + Modified: projects/krb5/contrib/libxo/libxo/xo_finish.3 ============================================================================== --- projects/krb5/contrib/libxo/libxo/xo_finish.3 Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/libxo/libxo/xo_finish.3 Sun Aug 6 06:46:44 2017 (r322114) @@ -37,3 +37,13 @@ especially for the non-TEXT output styles. .Sh SEE ALSO .Xr xo_emit 3 , .Xr libxo 3 +.Sh HISTORY +The +.Nm libxo +library first appeared in +.Fx 11.0 . +.Sh AUTHORS +.Nm libxo +was written by +.An Phil Shafer Aq Mt phil@freebsd.org . + Modified: projects/krb5/contrib/libxo/libxo/xo_flush.3 ============================================================================== --- projects/krb5/contrib/libxo/libxo/xo_flush.3 Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/libxo/libxo/xo_flush.3 Sun Aug 6 06:46:44 2017 (r322114) @@ -33,3 +33,13 @@ function is used for this. .Sh SEE ALSO .Xr xo_emit 3 , .Xr libxo 3 +.Sh HISTORY +The +.Nm libxo +library first appeared in +.Fx 11.0 . +.Sh AUTHORS +.Nm libxo +was written by +.An Phil Shafer Aq Mt phil@freebsd.org . + Modified: projects/krb5/contrib/libxo/libxo/xo_format.5 ============================================================================== --- projects/krb5/contrib/libxo/libxo/xo_format.5 Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/libxo/libxo/xo_format.5 Sun Aug 6 06:46:44 2017 (r322114) @@ -965,3 +965,13 @@ names to make that difference more obvious. .Xr libxo 3 , .Xr xolint 1 , .Xr xo_emit 3 +.Sh HISTORY +The +.Nm libxo +library first appeared in +.Fx 11.0 . +.Sh AUTHORS +.Nm libxo +was written by +.An Phil Shafer Aq Mt phil@freebsd.org . + Modified: projects/krb5/contrib/libxo/libxo/xo_message.3 ============================================================================== --- projects/krb5/contrib/libxo/libxo/xo_message.3 Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/libxo/libxo/xo_message.3 Sun Aug 6 06:46:44 2017 (r322114) @@ -66,3 +66,13 @@ and .Sh SEE ALSO .Xr xo_emit 3 , .Xr libxo 3 +.Sh HISTORY +The +.Nm libxo +library first appeared in +.Fx 11.0 . +.Sh AUTHORS +.Nm libxo +was written by +.An Phil Shafer Aq Mt phil@freebsd.org . + Modified: projects/krb5/contrib/libxo/libxo/xo_no_setlocale.3 ============================================================================== --- projects/krb5/contrib/libxo/libxo/xo_no_setlocale.3 Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/libxo/libxo/xo_no_setlocale.3 Sun Aug 6 06:46:44 2017 (r322114) @@ -41,3 +41,13 @@ function. .Xr xo_open_list 3 , .Xr xo_format 5 , .Xr libxo 3 +.Sh HISTORY +The +.Nm libxo +library first appeared in +.Fx 11.0 . +.Sh AUTHORS +.Nm libxo +was written by +.An Phil Shafer Aq Mt phil@freebsd.org . + Modified: projects/krb5/contrib/libxo/libxo/xo_open_container.3 ============================================================================== --- projects/krb5/contrib/libxo/libxo/xo_open_container.3 Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/libxo/libxo/xo_open_container.3 Sun Aug 6 06:46:44 2017 (r322114) @@ -186,3 +186,13 @@ and the name recorded do not match. .Sh SEE ALSO .Xr xo_emit 3 , .Xr libxo 3 +.Sh HISTORY +The +.Nm libxo +library first appeared in +.Fx 11.0 . +.Sh AUTHORS +.Nm libxo +was written by +.An Phil Shafer Aq Mt phil@freebsd.org . + Modified: projects/krb5/contrib/libxo/libxo/xo_open_list.3 ============================================================================== --- projects/krb5/contrib/libxo/libxo/xo_open_list.3 Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/libxo/libxo/xo_open_list.3 Sun Aug 6 06:46:44 2017 (r322114) @@ -156,3 +156,13 @@ are rendered as multiple leaf elements. .Sh SEE ALSO .Xr xo_emit 3 , .Xr libxo 3 +.Sh HISTORY +The +.Nm libxo +library first appeared in +.Fx 11.0 . +.Sh AUTHORS +.Nm libxo +was written by +.An Phil Shafer Aq Mt phil@freebsd.org . + Modified: projects/krb5/contrib/libxo/libxo/xo_open_marker.3 ============================================================================== --- projects/krb5/contrib/libxo/libxo/xo_open_marker.3 Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/libxo/libxo/xo_open_marker.3 Sun Aug 6 06:46:44 2017 (r322114) @@ -103,3 +103,13 @@ properly. .Sh SEE ALSO .Xr xo_emit 3 , .Xr libxo 3 +.Sh HISTORY +The +.Nm libxo +library first appeared in +.Fx 11.0 . +.Sh AUTHORS +.Nm libxo +was written by +.An Phil Shafer Aq Mt phil@freebsd.org . + Modified: projects/krb5/contrib/libxo/libxo/xo_options.7 ============================================================================== --- projects/krb5/contrib/libxo/libxo/xo_options.7 Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/libxo/libxo/xo_options.7 Sun Aug 6 06:46:44 2017 (r322114) @@ -145,3 +145,12 @@ The following are three example invocations of .Sh SEE ALSO .Xr libxo 3 , .Xr xo_format 5 +.Sh HISTORY +The +.Nm libxo +library first appeared in +.Fx 11.0 . +.Sh AUTHORS +.Nm libxo +was written by +.An Phil Shafer Aq Mt phil@freebsd.org . Modified: projects/krb5/contrib/libxo/libxo/xo_parse_args.3 ============================================================================== --- projects/krb5/contrib/libxo/libxo/xo_parse_args.3 Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/libxo/libxo/xo_parse_args.3 Sun Aug 6 06:46:44 2017 (r322114) @@ -150,3 +150,13 @@ must be maintained by the caller. .Sh SEE ALSO .Xr xo_emit 3 , .Xr libxo 3 +.Sh HISTORY +The +.Nm libxo +library first appeared in +.Fx 11.0 . +.Sh AUTHORS +.Nm libxo +was written by +.An Phil Shafer Aq Mt phil@freebsd.org . + Modified: projects/krb5/contrib/libxo/libxo/xo_set_allocator.3 ============================================================================== --- projects/krb5/contrib/libxo/libxo/xo_set_allocator.3 Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/libxo/libxo/xo_set_allocator.3 Sun Aug 6 06:46:44 2017 (r322114) @@ -52,3 +52,13 @@ functions are used. .Sh SEE ALSO .Xr xo_emit 3 , .Xr libxo 3 +.Sh HISTORY +The +.Nm libxo +library first appeared in +.Fx 11.0 . +.Sh AUTHORS +.Nm libxo +was written by +.An Phil Shafer Aq Mt phil@freebsd.org . + Modified: projects/krb5/contrib/libxo/libxo/xo_set_flags.3 ============================================================================== --- projects/krb5/contrib/libxo/libxo/xo_set_flags.3 Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/libxo/libxo/xo_set_flags.3 Sun Aug 6 06:46:44 2017 (r322114) @@ -137,3 +137,13 @@ handle. .Sh SEE ALSO .Xr xo_emit 3 , .Xr libxo 3 +.Sh HISTORY +The +.Nm libxo +library first appeared in +.Fx 11.0 . +.Sh AUTHORS +.Nm libxo +was written by +.An Phil Shafer Aq Mt phil@freebsd.org . + Modified: projects/krb5/contrib/libxo/libxo/xo_set_info.3 ============================================================================== --- projects/krb5/contrib/libxo/libxo/xo_set_info.3 Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/libxo/libxo/xo_set_info.3 Sun Aug 6 06:46:44 2017 (r322114) @@ -100,3 +100,13 @@ and "data-help" attributes: .Sh SEE ALSO .Xr xo_emit 3 , .Xr libxo 3 +.Sh HISTORY +The +.Nm libxo +library first appeared in +.Fx 11.0 . +.Sh AUTHORS +.Nm libxo +was written by +.An Phil Shafer Aq Mt phil@freebsd.org . + Modified: projects/krb5/contrib/libxo/libxo/xo_set_options.3 ============================================================================== --- projects/krb5/contrib/libxo/libxo/xo_set_options.3 Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/libxo/libxo/xo_set_options.3 Sun Aug 6 06:46:44 2017 (r322114) @@ -29,3 +29,13 @@ The options are identical to those listed in .Sh SEE ALSO .Xr xo_emit 3 , .Xr libxo 3 +.Sh HISTORY +The +.Nm libxo +library first appeared in +.Fx 11.0 . +.Sh AUTHORS +.Nm libxo +was written by +.An Phil Shafer Aq Mt phil@freebsd.org . + Modified: projects/krb5/contrib/libxo/libxo/xo_set_style.3 ============================================================================== --- projects/krb5/contrib/libxo/libxo/xo_set_style.3 Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/libxo/libxo/xo_set_style.3 Sun Aug 6 06:46:44 2017 (r322114) @@ -51,3 +51,13 @@ The name can be any of the styles: "text", "xml", "jso .Sh SEE ALSO .Xr xo_emit 3 , .Xr libxo 3 +.Sh HISTORY +The +.Nm libxo +library first appeared in +.Fx 11.0 . +.Sh AUTHORS +.Nm libxo +was written by +.An Phil Shafer Aq Mt phil@freebsd.org . + Modified: projects/krb5/contrib/libxo/libxo/xo_set_syslog_enterprise_id.3 ============================================================================== --- projects/krb5/contrib/libxo/libxo/xo_set_syslog_enterprise_id.3 Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/libxo/libxo/xo_set_syslog_enterprise_id.3 Sun Aug 6 06:46:44 2017 (r322114) @@ -34,3 +34,13 @@ https://www.iana.org/assignments/enterprise-numbers/en .Sh SEE ALSO .Xr xo_syslog 3 , .Xr libxo 3 +.Sh HISTORY +The +.Nm libxo +library first appeared in +.Fx 11.0 . +.Sh AUTHORS +.Nm libxo +was written by +.An Phil Shafer Aq Mt phil@freebsd.org . + Modified: projects/krb5/contrib/libxo/libxo/xo_set_version.3 ============================================================================== --- projects/krb5/contrib/libxo/libxo/xo_set_version.3 Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/libxo/libxo/xo_set_version.3 Sun Aug 6 06:46:44 2017 (r322114) @@ -32,3 +32,13 @@ is in use. .Sh SEE ALSO .Xr xo_emit 3 , .Xr libxo 3 +.Sh HISTORY +The +.Nm libxo +library first appeared in +.Fx 11.0 . +.Sh AUTHORS +.Nm libxo +was written by +.An Phil Shafer Aq Mt phil@freebsd.org . + Modified: projects/krb5/contrib/libxo/libxo/xo_set_writer.3 ============================================================================== --- projects/krb5/contrib/libxo/libxo/xo_set_writer.3 Sun Aug 6 06:35:40 2017 (r322113) +++ projects/krb5/contrib/libxo/libxo/xo_set_writer.3 Sun Aug 6 06:46:44 2017 (r322114) @@ -54,3 +54,13 @@ flush any pending data associated with the opaque poin .Sh SEE ALSO .Xr xo_emit 3 , .Xr libxo 3 +.Sh HISTORY +The +.Nm libxo +library first appeared in +.Fx 11.0 . +.Sh AUTHORS +.Nm libxo +was written by +.An Phil Shafer Aq Mt phil@freebsd.org . *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708060646.v766ki9L059902>