svn commit: r291236 - in user/ngie/more-tests2: . bin/rmail cddl/contrib/opensolaris/cmd/zfs contrib/sendmail/include/sm contrib/xz contrib/xz/src/common contrib/xz/src/liblzma/api contrib/xz/src/l...

Garrett Cooper ngie at FreeBSD.org
Tue Nov 24 05:12:45 UTC 2015 

Author: ngie
Date: Tue Nov 24 05:12:40 2015
New Revision: 291236
URL: https://svnweb.freebsd.org/changeset/base/291236

Log:
  MFhead @ r291235

Added:
  user/ngie/more-tests2/share/man/man4/mlx5en.4
     - copied unchanged from r291235, head/share/man/man4/mlx5en.4
  user/ngie/more-tests2/sys/dev/ath/if_ath_descdma.c
     - copied unchanged from r291235, head/sys/dev/ath/if_ath_descdma.c
  user/ngie/more-tests2/sys/dev/ath/if_ath_descdma.h
     - copied unchanged from r291235, head/sys/dev/ath/if_ath_descdma.h
  user/ngie/more-tests2/sys/dev/ath/if_ath_ioctl.c
     - copied unchanged from r291235, head/sys/dev/ath/if_ath_ioctl.c
  user/ngie/more-tests2/sys/dev/ath/if_ath_ioctl.h
     - copied unchanged from r291235, head/sys/dev/ath/if_ath_ioctl.h
     - copied from r291235, head/usr.bin/colldef/
     - copied from r291235, head/usr.bin/mklocale/
  user/ngie/more-tests2/usr.sbin/bsdconfig/includes/includes.sh
     - copied unchanged from r291235, head/usr.sbin/bsdconfig/includes/includes.sh
Directory Properties:
  user/ngie/more-tests2/usr.bin/colldef/   (props changed)
  user/ngie/more-tests2/usr.bin/mklocale/   (props changed)
Deleted:
  user/ngie/more-tests2/sys/boot/i386/boot0/boot0ext.S
  user/ngie/more-tests2/sys/boot/i386/boot0ext/
  user/ngie/more-tests2/sys/modules/ispfw/isp_1040_it/
  user/ngie/more-tests2/sys/modules/ispfw/isp_1080_it/
  user/ngie/more-tests2/sys/modules/ispfw/isp_12160_it/
  user/ngie/more-tests2/tools/build/options/WITH_OPENSSH_NONE_CIPHER
  user/ngie/more-tests2/usr.sbin/bsdconfig/includes/includes
Modified:
  user/ngie/more-tests2/ObsoleteFiles.inc
  user/ngie/more-tests2/bin/rmail/Makefile.depend
  user/ngie/more-tests2/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  user/ngie/more-tests2/contrib/sendmail/include/sm/conf.h
  user/ngie/more-tests2/contrib/xz/ChangeLog
  user/ngie/more-tests2/contrib/xz/THANKS
  user/ngie/more-tests2/contrib/xz/src/common/tuklib_physmem.c
  user/ngie/more-tests2/contrib/xz/src/liblzma/api/lzma.h
  user/ngie/more-tests2/contrib/xz/src/liblzma/api/lzma/version.h
  user/ngie/more-tests2/contrib/xz/src/liblzma/common/index.c
  user/ngie/more-tests2/contrib/xz/src/liblzma/lz/lz_encoder.c
  user/ngie/more-tests2/contrib/xz/src/liblzma/lzma/lzma_encoder.c
  user/ngie/more-tests2/contrib/xz/src/xz/args.h
  user/ngie/more-tests2/contrib/xz/src/xz/file_io.c
  user/ngie/more-tests2/contrib/xz/src/xz/main.c
  user/ngie/more-tests2/contrib/xz/src/xz/message.c
  user/ngie/more-tests2/contrib/xz/src/xz/options.c
  user/ngie/more-tests2/contrib/xz/src/xz/xz.1
  user/ngie/more-tests2/crypto/openssh/README.hpn
  user/ngie/more-tests2/crypto/openssh/cipher.c
  user/ngie/more-tests2/crypto/openssh/kex.c
  user/ngie/more-tests2/crypto/openssh/kex.h
  user/ngie/more-tests2/crypto/openssh/myproposal.h
  user/ngie/more-tests2/crypto/openssh/openbsd-compat/bsd-misc.h
  user/ngie/more-tests2/crypto/openssh/packet.c
  user/ngie/more-tests2/crypto/openssh/packet.h
  user/ngie/more-tests2/crypto/openssh/pathnames.h
  user/ngie/more-tests2/crypto/openssh/readconf.c
  user/ngie/more-tests2/crypto/openssh/readconf.h
  user/ngie/more-tests2/crypto/openssh/servconf.c
  user/ngie/more-tests2/crypto/openssh/servconf.h
  user/ngie/more-tests2/crypto/openssh/ssh.c
  user/ngie/more-tests2/crypto/openssh/sshconnect2.c
  user/ngie/more-tests2/crypto/openssh/sshd.c
  user/ngie/more-tests2/gnu/usr.bin/binutils/ld/Makefile
  user/ngie/more-tests2/lib/libc/gen/popen.c
  user/ngie/more-tests2/lib/libc/stdio/fopen.3
  user/ngie/more-tests2/lib/libc/tests/net/Makefile
  user/ngie/more-tests2/lib/libc/yp/yplib.c
  user/ngie/more-tests2/lib/liblzma/config.h
  user/ngie/more-tests2/lib/libmilter/Makefile.depend
  user/ngie/more-tests2/lib/libsm/Makefile.depend
  user/ngie/more-tests2/lib/libsmdb/Makefile.depend
  user/ngie/more-tests2/lib/libsmutil/Makefile.depend
  user/ngie/more-tests2/libexec/mail.local/Makefile.depend
  user/ngie/more-tests2/libexec/smrsh/Makefile.depend
  user/ngie/more-tests2/sbin/dumpon/dumpon.c
  user/ngie/more-tests2/sbin/newfs_msdos/mkfs_msdos.c
  user/ngie/more-tests2/sbin/newfs_msdos/mkfs_msdos.h
  user/ngie/more-tests2/sbin/newfs_msdos/newfs_msdos.c
  user/ngie/more-tests2/secure/lib/libssh/Makefile
  user/ngie/more-tests2/secure/usr.bin/ssh/Makefile
  user/ngie/more-tests2/secure/usr.sbin/sshd/Makefile
  user/ngie/more-tests2/share/examples/ses/srcs/getencstat.c
  user/ngie/more-tests2/share/man/man4/Makefile
  user/ngie/more-tests2/share/man/man4/isp.4
  user/ngie/more-tests2/share/man/man4/witness.4
  user/ngie/more-tests2/share/man/man7/release.7
  user/ngie/more-tests2/share/man/man9/malloc.9
  user/ngie/more-tests2/share/man/man9/printf.9
  user/ngie/more-tests2/share/man/man9/style.9
  user/ngie/more-tests2/share/misc/committers-src.dot
  user/ngie/more-tests2/share/mk/bsd.cpu.mk
  user/ngie/more-tests2/share/mk/bsd.crunchgen.mk
  user/ngie/more-tests2/share/mk/bsd.lib.mk
  user/ngie/more-tests2/share/mk/bsd.sys.mk
  user/ngie/more-tests2/share/mk/local.meta.sys.mk
  user/ngie/more-tests2/share/mk/src.opts.mk
  user/ngie/more-tests2/sys/amd64/amd64/elf_machdep.c
  user/ngie/more-tests2/sys/amd64/linux/linux_dummy.c
  user/ngie/more-tests2/sys/arm/allwinner/a20/std.a20
  user/ngie/more-tests2/sys/arm/allwinner/files.allwinner
  user/ngie/more-tests2/sys/arm/allwinner/std.a10
  user/ngie/more-tests2/sys/arm/altera/socfpga/files.socfpga
  user/ngie/more-tests2/sys/arm/altera/socfpga/std.socfpga
  user/ngie/more-tests2/sys/arm/amlogic/aml8726/files.aml8726
  user/ngie/more-tests2/sys/arm/annapurna/alpine/files.alpine
  user/ngie/more-tests2/sys/arm/annapurna/alpine/std.alpine
  user/ngie/more-tests2/sys/arm/arm/bus_space_base.c
  user/ngie/more-tests2/sys/arm/arm/exception.S
  user/ngie/more-tests2/sys/arm/arm/pmap-v6-new.c
  user/ngie/more-tests2/sys/arm/arm/pmu.c
  user/ngie/more-tests2/sys/arm/arm/trap-v6.c
  user/ngie/more-tests2/sys/arm/at91/files.at91
  user/ngie/more-tests2/sys/arm/broadcom/bcm2835/files.bcm2836
  user/ngie/more-tests2/sys/arm/broadcom/bcm2835/files.bcm283x
  user/ngie/more-tests2/sys/arm/broadcom/bcm2835/std.rpi
  user/ngie/more-tests2/sys/arm/cavium/cns11xx/files.econa
  user/ngie/more-tests2/sys/arm/conf/AML8726
  user/ngie/more-tests2/sys/arm/conf/EXYNOS5.common
  user/ngie/more-tests2/sys/arm/conf/IMX6
  user/ngie/more-tests2/sys/arm/conf/PANDABOARD
  user/ngie/more-tests2/sys/arm/conf/RK3188
  user/ngie/more-tests2/sys/arm/conf/RPI2
  user/ngie/more-tests2/sys/arm/conf/SOCKIT.common
  user/ngie/more-tests2/sys/arm/conf/VERSATILEPB
  user/ngie/more-tests2/sys/arm/conf/VIRT
  user/ngie/more-tests2/sys/arm/conf/VYBRID
  user/ngie/more-tests2/sys/arm/conf/ZEDBOARD
  user/ngie/more-tests2/sys/arm/freescale/imx/files.imx5
  user/ngie/more-tests2/sys/arm/freescale/imx/files.imx6
  user/ngie/more-tests2/sys/arm/freescale/imx/imx_machdep.c
  user/ngie/more-tests2/sys/arm/freescale/imx/std.imx51
  user/ngie/more-tests2/sys/arm/freescale/imx/std.imx53
  user/ngie/more-tests2/sys/arm/freescale/imx/std.imx6
  user/ngie/more-tests2/sys/arm/freescale/vybrid/files.vybrid
  user/ngie/more-tests2/sys/arm/freescale/vybrid/std.vybrid
  user/ngie/more-tests2/sys/arm/include/bus.h
  user/ngie/more-tests2/sys/arm/lpc/files.lpc
  user/ngie/more-tests2/sys/arm/mv/armadaxp/std.armadaxp
  user/ngie/more-tests2/sys/arm/mv/files.mv
  user/ngie/more-tests2/sys/arm/qemu/files.qemu
  user/ngie/more-tests2/sys/arm/qemu/std.virt
  user/ngie/more-tests2/sys/arm/rockchip/files.rk30xx
  user/ngie/more-tests2/sys/arm/rockchip/std.rk30xx
  user/ngie/more-tests2/sys/arm/samsung/exynos/files.exynos5
  user/ngie/more-tests2/sys/arm/samsung/exynos/std.exynos5250
  user/ngie/more-tests2/sys/arm/samsung/exynos/std.exynos5420
  user/ngie/more-tests2/sys/arm/ti/am335x/files.am335x
  user/ngie/more-tests2/sys/arm/ti/am335x/std.am335x
  user/ngie/more-tests2/sys/arm/ti/files.ti
  user/ngie/more-tests2/sys/arm/ti/omap4/files.omap4
  user/ngie/more-tests2/sys/arm/ti/omap4/std.omap4
  user/ngie/more-tests2/sys/arm/versatile/files.versatile
  user/ngie/more-tests2/sys/arm/versatile/versatile_pci.c
  user/ngie/more-tests2/sys/arm/xilinx/files.zynq7
  user/ngie/more-tests2/sys/arm/xilinx/std.zynq7
  user/ngie/more-tests2/sys/arm/xscale/i80321/files.i80219
  user/ngie/more-tests2/sys/arm/xscale/i80321/files.i80321
  user/ngie/more-tests2/sys/arm/xscale/i8134x/files.i81342
  user/ngie/more-tests2/sys/arm/xscale/ixp425/files.ixp425
  user/ngie/more-tests2/sys/arm/xscale/pxa/files.pxa
  user/ngie/more-tests2/sys/arm64/arm64/busdma_bounce.c
  user/ngie/more-tests2/sys/boot/i386/Makefile
  user/ngie/more-tests2/sys/boot/i386/boot0/Makefile
  user/ngie/more-tests2/sys/boot/powerpc/kboot/Makefile
  user/ngie/more-tests2/sys/boot/uboot/common/main.c
  user/ngie/more-tests2/sys/cam/scsi/scsi_enc.c
  user/ngie/more-tests2/sys/cam/scsi/scsi_enc.h
  user/ngie/more-tests2/sys/cam/scsi/scsi_enc_ses.c
  user/ngie/more-tests2/sys/cddl/dev/dtrace/amd64/dtrace_isa.c
  user/ngie/more-tests2/sys/compat/ia32/ia32_sysvec.c
  user/ngie/more-tests2/sys/conf/NOTES
  user/ngie/more-tests2/sys/conf/files
  user/ngie/more-tests2/sys/conf/files.arm
  user/ngie/more-tests2/sys/conf/kern.opts.mk
  user/ngie/more-tests2/sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c
  user/ngie/more-tests2/sys/dev/ath/if_ath.c
  user/ngie/more-tests2/sys/dev/ath/if_ath_misc.h
  user/ngie/more-tests2/sys/dev/ath/if_ath_rx.c
  user/ngie/more-tests2/sys/dev/ath/if_ath_rx_edma.c
  user/ngie/more-tests2/sys/dev/ath/if_ath_tx_edma.c
  user/ngie/more-tests2/sys/dev/de/if_de.c
  user/ngie/more-tests2/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  user/ngie/more-tests2/sys/dev/isp/isp.c
  user/ngie/more-tests2/sys/dev/isp/isp_freebsd.c
  user/ngie/more-tests2/sys/dev/isp/isp_freebsd.h
  user/ngie/more-tests2/sys/dev/isp/isp_library.c
  user/ngie/more-tests2/sys/dev/isp/isp_library.h
  user/ngie/more-tests2/sys/dev/isp/isp_pci.c
  user/ngie/more-tests2/sys/dev/isp/isp_sbus.c
  user/ngie/more-tests2/sys/dev/isp/isp_target.c
  user/ngie/more-tests2/sys/dev/isp/ispmbox.h
  user/ngie/more-tests2/sys/dev/isp/ispvar.h
  user/ngie/more-tests2/sys/dev/ispfw/asm_1040.h
  user/ngie/more-tests2/sys/dev/ispfw/asm_1080.h
  user/ngie/more-tests2/sys/dev/ispfw/asm_12160.h
  user/ngie/more-tests2/sys/dev/ispfw/asm_2200.h
  user/ngie/more-tests2/sys/dev/ispfw/asm_2300.h
  user/ngie/more-tests2/sys/dev/ispfw/asm_2322.h
  user/ngie/more-tests2/sys/dev/ispfw/ispfw.c
  user/ngie/more-tests2/sys/dev/mlx5/mlx5_en/en.h
  user/ngie/more-tests2/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c
  user/ngie/more-tests2/sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c
  user/ngie/more-tests2/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
  user/ngie/more-tests2/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c
  user/ngie/more-tests2/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c
  user/ngie/more-tests2/sys/dev/mlx5/mlx5_en/tcp_tlro.c
  user/ngie/more-tests2/sys/dev/mlx5/mlx5_en/tcp_tlro.h
  user/ngie/more-tests2/sys/dev/ntb/if_ntb/if_ntb.c
  user/ngie/more-tests2/sys/dev/ntb/ntb_hw/ntb_hw.h
  user/ngie/more-tests2/sys/dev/ntb/ntb_hw/ntb_regs.h
  user/ngie/more-tests2/sys/dev/pci/pcireg.h
  user/ngie/more-tests2/sys/dev/pci/pcivar.h
  user/ngie/more-tests2/sys/dev/usb/controller/uhci.h
  user/ngie/more-tests2/sys/dev/usb/input/ukbd.c
  user/ngie/more-tests2/sys/fs/nfs/nfs_var.h
  user/ngie/more-tests2/sys/fs/nfsclient/nfs_clrpcops.c
  user/ngie/more-tests2/sys/fs/nfsserver/nfs_nfsdkrpc.c
  user/ngie/more-tests2/sys/fs/nfsserver/nfs_nfsdstate.c
  user/ngie/more-tests2/sys/i386/i386/elf_machdep.c
  user/ngie/more-tests2/sys/kern/kern_malloc.c
  user/ngie/more-tests2/sys/kern/kern_sharedpage.c
  user/ngie/more-tests2/sys/kern/subr_prf.c
  user/ngie/more-tests2/sys/kern/subr_stack.c
  user/ngie/more-tests2/sys/kern/subr_witness.c
  user/ngie/more-tests2/sys/kern/vfs_subr.c
  user/ngie/more-tests2/sys/kern/vfs_syscalls.c
  user/ngie/more-tests2/sys/mips/conf/ALFA_HORNET_UB
  user/ngie/more-tests2/sys/mips/conf/AP121
  user/ngie/more-tests2/sys/mips/conf/AP135
  user/ngie/more-tests2/sys/mips/conf/AP143
  user/ngie/more-tests2/sys/mips/conf/AP91
  user/ngie/more-tests2/sys/mips/conf/AP93
  user/ngie/more-tests2/sys/mips/conf/AP94
  user/ngie/more-tests2/sys/mips/conf/AP96
  user/ngie/more-tests2/sys/mips/conf/BERI_DE4_MDROOT
  user/ngie/more-tests2/sys/mips/conf/BERI_DE4_SDROOT
  user/ngie/more-tests2/sys/mips/conf/BERI_SIM_MDROOT
  user/ngie/more-tests2/sys/mips/conf/BERI_SIM_SDROOT
  user/ngie/more-tests2/sys/mips/conf/BERI_SIM_VIRTIO
  user/ngie/more-tests2/sys/mips/conf/CARAMBOLA2
  user/ngie/more-tests2/sys/mips/conf/DB120
  user/ngie/more-tests2/sys/mips/conf/DIR-655A1
  user/ngie/more-tests2/sys/mips/conf/DIR-825B1
  user/ngie/more-tests2/sys/mips/conf/DIR-825C1
  user/ngie/more-tests2/sys/mips/conf/ENH200
  user/ngie/more-tests2/sys/mips/conf/ONIONOMEGA
  user/ngie/more-tests2/sys/mips/conf/PB47
  user/ngie/more-tests2/sys/mips/conf/PICOSTATION_M2HP
  user/ngie/more-tests2/sys/mips/conf/ROUTERSTATION
  user/ngie/more-tests2/sys/mips/conf/ROUTERSTATION_MFS
  user/ngie/more-tests2/sys/mips/conf/RSPRO
  user/ngie/more-tests2/sys/mips/conf/RSPRO_MFS
  user/ngie/more-tests2/sys/mips/conf/TL-ARCHERC7V2
  user/ngie/more-tests2/sys/mips/conf/TL-WDR4300
  user/ngie/more-tests2/sys/mips/conf/TL-WR1043NDv2
  user/ngie/more-tests2/sys/mips/conf/TL-WR740Nv4
  user/ngie/more-tests2/sys/mips/conf/TP-MR3020
  user/ngie/more-tests2/sys/mips/conf/TP-WN1043ND
  user/ngie/more-tests2/sys/mips/conf/WZR-300HP
  user/ngie/more-tests2/sys/mips/conf/WZR-HPAG300H
  user/ngie/more-tests2/sys/mips/malta/malta_machdep.c
  user/ngie/more-tests2/sys/modules/Makefile
  user/ngie/more-tests2/sys/modules/ath/Makefile
  user/ngie/more-tests2/sys/modules/cryptodev/Makefile
  user/ngie/more-tests2/sys/modules/ipoib/Makefile
  user/ngie/more-tests2/sys/modules/ispfw/Makefile
  user/ngie/more-tests2/sys/modules/linux64/Makefile
  user/ngie/more-tests2/sys/netinet/in_mcast.c
  user/ngie/more-tests2/sys/netinet/sctp_pcb.c
  user/ngie/more-tests2/sys/netinet/sctp_usrreq.c
  user/ngie/more-tests2/sys/netinet6/in6_mcast.c
  user/ngie/more-tests2/sys/netpfil/ipfw/ip_fw_private.h
  user/ngie/more-tests2/sys/netpfil/ipfw/ip_fw_sockopt.c
  user/ngie/more-tests2/sys/ofed/drivers/net/mlx4/cmd.c
  user/ngie/more-tests2/sys/opencrypto/cryptodev.c
  user/ngie/more-tests2/sys/powerpc/booke/pmap.c
  user/ngie/more-tests2/sys/powerpc/include/asm.h
  user/ngie/more-tests2/sys/powerpc/include/bus.h
  user/ngie/more-tests2/sys/powerpc/include/md_var.h
  user/ngie/more-tests2/sys/powerpc/include/profile.h
  user/ngie/more-tests2/sys/powerpc/mpc85xx/pci_mpc85xx.c
  user/ngie/more-tests2/sys/powerpc/mpc85xx/pci_mpc85xx_pcib.c
  user/ngie/more-tests2/sys/powerpc/powerpc/elf64_machdep.c
  user/ngie/more-tests2/sys/powerpc/powerpc/exec_machdep.c
  user/ngie/more-tests2/sys/powerpc/powerpc/sigcode64.S
  user/ngie/more-tests2/sys/rpc/svc.c
  user/ngie/more-tests2/sys/sparc64/include/md_var.h
  user/ngie/more-tests2/sys/sparc64/sparc64/machdep.c
  user/ngie/more-tests2/sys/sparc64/sparc64/mp_machdep.c
  user/ngie/more-tests2/sys/sys/mount.h
  user/ngie/more-tests2/sys/sys/sysent.h
  user/ngie/more-tests2/sys/sys/systm.h
  user/ngie/more-tests2/sys/sys/vdso.h
  user/ngie/more-tests2/sys/vm/uma_core.c
  user/ngie/more-tests2/sys/vm/vm_pageout.c
  user/ngie/more-tests2/sys/vm/vnode_pager.c
  user/ngie/more-tests2/sys/x86/x86/busdma_bounce.c
  user/ngie/more-tests2/targets/pseudo/userland/Makefile.depend
  user/ngie/more-tests2/targets/pseudo/userland/misc/Makefile.depend
  user/ngie/more-tests2/tests/Makefile
  user/ngie/more-tests2/tests/README
  user/ngie/more-tests2/tests/sys/kern/Makefile
  user/ngie/more-tests2/tests/sys/kern/acct/Makefile
  user/ngie/more-tests2/tools/debugscripts/kld_deb.py
  user/ngie/more-tests2/tools/regression/netinet/ip_id_period/ip_id_period.py
  user/ngie/more-tests2/tools/sched/schedgraph.py
  user/ngie/more-tests2/tools/tools/nanobsd/defaults.sh
  user/ngie/more-tests2/tools/tools/shlib-compat/shlib-compat.py
  user/ngie/more-tests2/usr.bin/Makefile
  user/ngie/more-tests2/usr.bin/bc/bc.1
  user/ngie/more-tests2/usr.bin/bc/bc.y
  user/ngie/more-tests2/usr.bin/bc/extern.h
  user/ngie/more-tests2/usr.bin/bc/tty.c
  user/ngie/more-tests2/usr.bin/fortune/tools/do_uniq.py
  user/ngie/more-tests2/usr.bin/m4/eval.c
  user/ngie/more-tests2/usr.bin/m4/extern.h
  user/ngie/more-tests2/usr.bin/m4/m4.1
  user/ngie/more-tests2/usr.bin/m4/main.c
  user/ngie/more-tests2/usr.bin/m4/mdef.h
  user/ngie/more-tests2/usr.bin/m4/pathnames.h
  user/ngie/more-tests2/usr.bin/ministat/ministat.c
  user/ngie/more-tests2/usr.bin/netstat/if.c
  user/ngie/more-tests2/usr.bin/netstat/route.c
  user/ngie/more-tests2/usr.bin/vacation/Makefile.depend
  user/ngie/more-tests2/usr.bin/vmstat/Makefile
  user/ngie/more-tests2/usr.bin/vmstat/vmstat.8
  user/ngie/more-tests2/usr.bin/vmstat/vmstat.c
  user/ngie/more-tests2/usr.bin/xinstall/xinstall.c
  user/ngie/more-tests2/usr.sbin/Makefile
  user/ngie/more-tests2/usr.sbin/Makefile.mips
  user/ngie/more-tests2/usr.sbin/bluetooth/bthidd/kbd.c
  user/ngie/more-tests2/usr.sbin/bsdconfig/includes/Makefile
  user/ngie/more-tests2/usr.sbin/editmap/Makefile.depend
  user/ngie/more-tests2/usr.sbin/mailstats/Makefile.depend
  user/ngie/more-tests2/usr.sbin/makefs/ffs/newfs_extern.h
  user/ngie/more-tests2/usr.sbin/makemap/Makefile.depend
  user/ngie/more-tests2/usr.sbin/pciconf/pciconf.8
  user/ngie/more-tests2/usr.sbin/pciconf/pciconf.c
  user/ngie/more-tests2/usr.sbin/praliases/Makefile.depend
  user/ngie/more-tests2/usr.sbin/uathload/Makefile
Directory Properties:
  user/ngie/more-tests2/   (props changed)
  user/ngie/more-tests2/cddl/   (props changed)
  user/ngie/more-tests2/cddl/contrib/opensolaris/   (props changed)
  user/ngie/more-tests2/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  user/ngie/more-tests2/contrib/sendmail/   (props changed)
  user/ngie/more-tests2/contrib/xz/   (props changed)
  user/ngie/more-tests2/crypto/openssh/   (props changed)
  user/ngie/more-tests2/gnu/usr.bin/binutils/   (props changed)
  user/ngie/more-tests2/lib/libc/   (props changed)
  user/ngie/more-tests2/sbin/   (props changed)
  user/ngie/more-tests2/sbin/dumpon/   (props changed)
  user/ngie/more-tests2/share/   (props changed)
  user/ngie/more-tests2/share/man/man4/   (props changed)
  user/ngie/more-tests2/sys/   (props changed)
  user/ngie/more-tests2/sys/boot/   (props changed)
  user/ngie/more-tests2/sys/boot/powerpc/kboot/   (props changed)
  user/ngie/more-tests2/sys/conf/   (props changed)
  user/ngie/more-tests2/sys/dev/hyperv/   (props changed)
  user/ngie/more-tests2/targets/   (props changed)

Modified: user/ngie/more-tests2/ObsoleteFiles.inc
==============================================================================
--- user/ngie/more-tests2/ObsoleteFiles.inc	Tue Nov 24 04:19:55 2015	(r291235)
+++ user/ngie/more-tests2/ObsoleteFiles.inc	Tue Nov 24 05:12:40 2015	(r291236)
@@ -142,10 +142,6 @@ OLD_FILES+=usr/share/locale/sr_YU.UTF-8/
 OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_MESSAGES
 OLD_DIRS+=usr/share/locale/sr_YU.UTF-8
-OLD_FILES+=usr/bin/colldef
-OLD_FILES+=usr/share/man/man1/colldef.1.gz
-OLD_FILES+=usr/bin/mklocale
-OLD_FILES+=usr/share/man/man1/mklocale.1.gz
 # 20151101: added missing _test suffix on multiple tests in lib/libc
 OLD_FILES+=usr/tests/lib/libc/c063/faccessat
 OLD_FILES+=usr/tests/lib/libc/c063/fchmodat

Modified: user/ngie/more-tests2/bin/rmail/Makefile.depend
==============================================================================
--- user/ngie/more-tests2/bin/rmail/Makefile.depend	Tue Nov 24 04:19:55 2015	(r291235)
+++ user/ngie/more-tests2/bin/rmail/Makefile.depend	Tue Nov 24 05:12:40 2015	(r291236)
@@ -10,7 +10,6 @@ DIRDEPS = \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/libsm \
-	lib/libutil \
 
 
 .include <dirdeps.mk>

Modified: user/ngie/more-tests2/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- user/ngie/more-tests2/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Tue Nov 24 04:19:55 2015	(r291235)
+++ user/ngie/more-tests2/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Tue Nov 24 05:12:40 2015	(r291236)
@@ -117,7 +117,7 @@
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
 .Nm
 .Cm set
-.Ar property Ns = Ns Ar value Oc ...
+.Ar property Ns = Ns Ar value Oo Ar property Ns = Ns Ar value Oc Ns ...
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot Ns ...
 .Nm
 .Cm get
@@ -2123,7 +2123,7 @@ option, but sorts by property in descend
 .It Xo
 .Nm
 .Cm set
-.Ar property Ns = Ns Ar value Oc ...
+.Ar property Ns = Ns Ar value Oo Ar property Ns = Ns Ar value Oc Ns ...
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
 .Xc
 .Pp

Modified: user/ngie/more-tests2/contrib/sendmail/include/sm/conf.h
==============================================================================
--- user/ngie/more-tests2/contrib/sendmail/include/sm/conf.h	Tue Nov 24 04:19:55 2015	(r291235)
+++ user/ngie/more-tests2/contrib/sendmail/include/sm/conf.h	Tue Nov 24 05:12:40 2015	(r291236)
@@ -1019,7 +1019,9 @@ extern unsigned int sleepX __P((unsigned
 #   if __FreeBSD__ >= 2
 #    include <osreldate.h>
 #    if __FreeBSD_version >= 199512	/* 2.2-current when it appeared */
+#      if __FreeBSD_version < 500012
 #     include <libutil.h>
+#      endif
 #     define SPT_TYPE	SPT_BUILTIN
 #    endif /* __FreeBSD_version >= 199512 */
 #    if __FreeBSD_version >= 222000	/* 2.2.2-release and later */

Modified: user/ngie/more-tests2/contrib/xz/ChangeLog
==============================================================================
--- user/ngie/more-tests2/contrib/xz/ChangeLog	Tue Nov 24 04:19:55 2015	(r291235)
+++ user/ngie/more-tests2/contrib/xz/ChangeLog	Tue Nov 24 05:12:40 2015	(r291236)
@@ -1,3 +1,313 @@
+commit 9815cdf6987ef91a85493bfcfd1ce2aaf3b47a0a
+Author: Lasse Collin <lasse.collin at tukaani.org>
+Date:   2015-09-29 13:59:35 +0300
+
+    Bump version and soname for 5.2.2.
+
+ src/liblzma/Makefile.am        | 2 +-
+ src/liblzma/api/lzma/version.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit cbe0cec8476bdd0416c7ca9bc83895c9bea1cf78
+Author: Lasse Collin <lasse.collin at tukaani.org>
+Date:   2015-09-29 13:57:28 +0300
+
+    Update NEWS for 5.2.2.
+
+ NEWS | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+commit 49427ce7eececdd18bbd35dab23c81910d083e1c
+Author: Andre Noll <maan at tuebingen.mpg.de>
+Date:   2015-05-28 15:50:00 +0200
+
+    Fix typo in German translation.
+    
+    As pointed out by Robert Pollak, there's a typo in the German
+    translation of the compression preset option (-0 ... -9) help text.
+    "The compressor" translates to "der Komprimierer", and the genitive
+    form is "des Komprimierers". The old word makes no sense at all.
+
+ po/de.po | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 608d6f06c940e7f28c25de005e8b99bdff42d27c
+Author: Hauke Henningsen <sqrt at entless.org>
+Date:   2015-08-17 04:59:54 +0200
+
+    Update German translation, mostly wrt orthography
+    
+    Provide an update of the German translation.
+    * A lot of compound words were previously written with spaces, while
+      German orthography is relatively clear in that the components
+      should not be separated.
+    * When referring to the actual process of (de)compression rather than the
+      concept, replace “(De-)Kompression” with “(De-)Komprimierung”.
+      Previously, both forms were used in this context and are now used in a
+      manner consistent with “Komprimierung” being more likely to refer to
+      a process.
+    * Consistently translate “standard input”/“output”
+    * Use “Zeichen” instead of false friend “Charakter” for “character”
+    * Insert commas around relative clauses (as required in German)
+    * Some other minor corrections
+    * Capitalize “ß” as “ẞ”
+    * Consistently start option descriptions in --help with capital letters
+    
+    Acked-By: Andre Noll <maan at tuebingen.mpg.de>
+    
+    * Update after msgmerge
+
+ po/de.po | 383 ++++++++++++++++++++++++++++++++-------------------------------
+ 1 file changed, 196 insertions(+), 187 deletions(-)
+
+commit c8988414e5b67b8ef2fe0ba7b1ccdd0ec73c60d3
+Author: Lasse Collin <lasse.collin at tukaani.org>
+Date:   2015-08-11 13:23:04 +0300
+
+    Build: Minor Cygwin cleanup.
+    
+    Some tests used "cygwin*" and some used "cygwin". I changed
+    them all to use "cygwin". Shouldn't affect anything in practice.
+
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit 85a6dfed53477906bfe9a7c0123dd412e391cb48
+Author: Lasse Collin <lasse.collin at tukaani.org>
+Date:   2015-08-11 13:21:52 +0300
+
+    Build: Support building of MSYS2 binaries.
+
+ configure.ac | 16 +++++++++++-----
+ 1 file changed, 11 insertions(+), 5 deletions(-)
+
+commit 77f270be8432df2e4516a0c48814b6976d6618c5
+Author: Lasse Collin <lasse.collin at tukaani.org>
+Date:   2015-08-09 21:06:26 +0300
+
+    Windows: Define DLL_EXPORT when building liblzma.dll with MSVC.
+    
+    src/liblzma/common/common.h uses it to set __declspec(dllexport)
+    for the API symbols.
+    
+    Thanks to Adam Walling.
+
+ windows/liblzma_dll.vcxproj | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+commit 8c975446c5903090a5a8493b5b96b71003056a88
+Author: Lasse Collin <lasse.collin at tukaani.org>
+Date:   2015-08-09 21:02:20 +0300
+
+    Windows: Omit unneeded header files from MSVC project files.
+
+ windows/liblzma.vcxproj     | 5 -----
+ windows/liblzma_dll.vcxproj | 5 -----
+ 2 files changed, 10 deletions(-)
+
+commit 119a00434954726ca58e4a578e6469f530fca30e
+Author: Lasse Collin <lasse.collin at tukaani.org>
+Date:   2015-07-12 20:48:19 +0300
+
+    liblzma: A MSVC-specific hack isn't needed with MSVC 2013 and newer.
+
+ src/liblzma/api/lzma.h | 18 +++++++++++++-----
+ 1 file changed, 13 insertions(+), 5 deletions(-)
+
+commit d4e7c557fcab353539c9481a8d95cb04bcb15c7c
+Author: Lasse Collin <lasse.collin at tukaani.org>
+Date:   2015-06-19 20:38:55 +0300
+
+    Update THANKS.
+
+ THANKS | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 98001740ca56c894a7bd32eb47e9857a8a7d878d
+Author: Lasse Collin <lasse.collin at tukaani.org>
+Date:   2015-06-19 20:21:30 +0300
+
+    Windows: Update the docs.
+
+ INSTALL                     |  29 ++++++----
+ windows/INSTALL-MSVC.txt    |  47 +++++++++++++++
+ windows/INSTALL-MinGW.txt   | 138 ++++++++++++++++++++++++++++++++++++++++++++
+ windows/INSTALL-Windows.txt | 138 --------------------------------------------
+ 4 files changed, 204 insertions(+), 148 deletions(-)
+
+commit 28195e4c877007cc760ecea1d17f740693d66873
+Author: Lasse Collin <lasse.collin at tukaani.org>
+Date:   2015-06-19 17:25:31 +0300
+
+    Windows: Add MSVC project files for building liblzma.
+    
+    Thanks to Adam Walling for creating these files.
+
+ windows/liblzma.vcxproj     | 359 ++++++++++++++++++++++++++++++++++++++++
+ windows/liblzma_dll.vcxproj | 388 ++++++++++++++++++++++++++++++++++++++++++++
+ windows/xz_win.sln          |  48 ++++++
+ 3 files changed, 795 insertions(+)
+
+commit 960440f3230dc628f6966d9f7614fc1b28baf44e
+Author: Lasse Collin <lasse.collin at tukaani.org>
+Date:   2015-05-13 20:57:55 +0300
+
+    Tests: Fix a memory leak in test_bcj_exact_size.
+    
+    Thanks to Cristian Rodríguez.
+
+ tests/test_bcj_exact_size.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 68cd35acafbdcdf4e8ea8b5bb843c736939d6f8b
+Author: Lasse Collin <lasse.collin at tukaani.org>
+Date:   2015-05-12 18:08:24 +0300
+
+    Fix NEWS about threading in 5.2.0.
+    
+    Thanks to Andy Hochhaus.
+
+ NEWS | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit ff96ed6d25786728356017a13baf8c14731b4f1e
+Author: Lasse Collin <lasse.collin at tukaani.org>
+Date:   2015-05-11 21:26:16 +0300
+
+    xz: Document that threaded decompression hasn't been implemented yet.
+
+ src/xz/xz.1 | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+commit 00d37b64a64ea8597fd2422d5187afd761ab9531
+Author: Lasse Collin <lasse.collin at tukaani.org>
+Date:   2015-04-20 20:20:29 +0300
+
+    Update THANKS.
+
+ THANKS | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit db190a832c49ca3aed6d69cc992fa5583cae7b11
+Author: Lasse Collin <lasse.collin at tukaani.org>
+Date:   2015-04-20 19:59:18 +0300
+
+    Revert "xz: Use pipe2() if available."
+    
+    This reverts commit 7a11c4a8e5e15f13d5fa59233b3172e65428efdd.
+    It is a problem when libc has pipe2() but the kernel is too
+    old to have pipe2() and thus pipe2() fails. In xz it's pointless
+    to have a fallback for non-functioning pipe2(); it's better to
+    avoid pipe2() completely.
+    
+    Thanks to Michael Fox for the bug report.
+
+ configure.ac     | 4 ++--
+ src/xz/file_io.c | 9 +--------
+ 2 files changed, 3 insertions(+), 10 deletions(-)
+
+commit eccd8155e107c5ada03d13e7730675cdf1a44ddc
+Author: Lasse Collin <lasse.collin at tukaani.org>
+Date:   2015-03-29 22:14:47 +0300
+
+    Update THANKS.
+
+ THANKS | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 25263fd9e7a8a913395cb93d7c104cd48c2b4a00
+Author: Lasse Collin <lasse.collin at tukaani.org>
+Date:   2015-03-29 22:13:48 +0300
+
+    Fix the detection of installed RAM on QNX.
+    
+    The earlier version compiled but didn't actually work
+    since sysconf(_SC_PHYS_PAGES) always fails (or so I was told).
+    
+    Thanks to Ole André Vadla Ravnås for the patch and testing.
+
+ m4/tuklib_physmem.m4        |  6 +++---
+ src/common/tuklib_physmem.c | 14 +++++++++++++-
+ 2 files changed, 16 insertions(+), 4 deletions(-)
+
+commit 4c544d2410903d38402221cb783ed85585b6a007
+Author: Lasse Collin <lasse.collin at tukaani.org>
+Date:   2015-03-27 22:39:07 +0200
+
+    Fix CPU core count detection on QNX.
+    
+    It tried to use sysctl() on QNX but
+      - it broke the build because sysctl() needs -lsocket on QNX;
+      - sysctl() doesn't work for detecting the core count on QNX
+        even if it compiled.
+    
+    sysconf() works. An alternative would have been to use
+    QNX-specific SYSPAGE_ENTRY(num_cpu) from <sys/syspage.h>.
+    
+    Thanks to Ole André Vadla Ravnås.
+
+ m4/tuklib_cpucores.m4 | 15 +++++++++++----
+ 1 file changed, 11 insertions(+), 4 deletions(-)
+
+commit e0ea6737b03e83ccaff4514d00e31bb926f8f0f3
+Author: Lasse Collin <lasse.collin at tukaani.org>
+Date:   2015-03-07 22:05:57 +0200
+
+    xz: size_t/uint32_t cleanup in options.c.
+
+ src/xz/options.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+commit 8bcca29a65335fd679c13814b70b35b68fa5daed
+Author: Lasse Collin <lasse.collin at tukaani.org>
+Date:   2015-03-07 22:04:23 +0200
+
+    xz: Fix a comment and silence a warning in message.c.
+
+ src/xz/message.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+commit f243f5f44c6b19a7c289a0ec73a03ee08364cb5b
+Author: Lasse Collin <lasse.collin at tukaani.org>
+Date:   2015-03-07 22:01:00 +0200
+
+    liblzma: Silence more uint32_t vs. size_t warnings.
+
+ src/liblzma/lz/lz_encoder.c     | 2 +-
+ src/liblzma/lzma/lzma_encoder.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 7f0a4c50f4a374c40acf4b86848f301ad1e82d34
+Author: Lasse Collin <lasse.collin at tukaani.org>
+Date:   2015-03-07 19:54:00 +0200
+
+    xz: Make arg_count an unsigned int to silence a warning.
+    
+    Actually the value of arg_count cannot exceed INT_MAX
+    but it's nicer as an unsigned int.
+
+ src/xz/args.h | 2 +-
+ src/xz/main.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit f6ec46801588b1be29c07c9db98558b521304002
+Author: Lasse Collin <lasse.collin at tukaani.org>
+Date:   2015-03-07 19:33:17 +0200
+
+    liblzma: Fix a warning in index.c.
+
+ src/liblzma/common/index.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+commit a24518971cc621315af142dd3bb7614fab04ad27
+Author: Lasse Collin <lasse.collin at tukaani.org>
+Date:   2015-02-26 20:46:14 +0200
+
+    Build: Fix a CR+LF problem when running autoreconf -fi on OS/2.
+
+ build-aux/version.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 commit dec11497a71518423b5ff0e759100cf8aadf6c7b
 Author: Lasse Collin <lasse.collin at tukaani.org>
 Date:   2015-02-26 16:53:44 +0200

Modified: user/ngie/more-tests2/contrib/xz/THANKS
==============================================================================
--- user/ngie/more-tests2/contrib/xz/THANKS	Tue Nov 24 04:19:55 2015	(r291235)
+++ user/ngie/more-tests2/contrib/xz/THANKS	Tue Nov 24 05:12:40 2015	(r291236)
@@ -21,6 +21,7 @@ has been important. :-) In alphabetical 
   - Milo Casagrande
   - Marek Černocký
   - Tomer Chachamu
+  - Gabi Davar
   - Chris Donawa
   - Andrew Dudman
   - Markus Duft
@@ -29,6 +30,7 @@ has been important. :-) In alphabetical 
   - Gilles Espinasse
   - Denis Excoffier
   - Michael Felt
+  - Michael Fox
   - Mike Frysinger
   - Daniel Richard G.
   - Bill Glessner
@@ -74,6 +76,7 @@ has been important. :-) In alphabetical 
   - Mikko Pouru
   - Trần Ngọc Quân
   - Pavel Raiskup
+  - Ole André Vadla Ravnås
   - Robert Readman
   - Bernhard Reutner-Fischer
   - Eric S. Raymond
@@ -95,6 +98,7 @@ has been important. :-) In alphabetical 
   - Alexey Tourbin
   - Patrick J. Volkerding
   - Martin Väth
+  - Adam Walling
   - Christian Weisgerber
   - Bert Wesarg
   - Fredrik Wikstrom

Modified: user/ngie/more-tests2/contrib/xz/src/common/tuklib_physmem.c
==============================================================================
--- user/ngie/more-tests2/contrib/xz/src/common/tuklib_physmem.c	Tue Nov 24 04:19:55 2015	(r291235)
+++ user/ngie/more-tests2/contrib/xz/src/common/tuklib_physmem.c	Tue Nov 24 05:12:40 2015	(r291236)
@@ -37,7 +37,10 @@
 #	define __USE_INLINE__
 #	include <proto/exec.h>
 
-// AIX
+#elif defined(__QNX__)
+#	include <sys/syspage.h>
+#	include <string.h>
+
 #elif defined(TUKLIB_PHYSMEM_AIX)
 #	include <sys/systemcfg.h>
 
@@ -126,6 +129,15 @@ tuklib_physmem(void)
 #elif defined(AMIGA) || defined(__AROS__)
 	ret = AvailMem(MEMF_TOTAL);
 
+#elif defined(__QNX__)
+	const struct asinfo_entry *entries = SYSPAGE_ENTRY(asinfo);
+	size_t count = SYSPAGE_ENTRY_SIZE(asinfo) / sizeof(struct asinfo_entry);
+	const char *strings = SYSPAGE_ENTRY(strings)->data;
+
+	for (size_t i = 0; i < count; ++i)
+		if (strcmp(strings + entries[i].name, "ram") == 0)
+			ret += entries[i].end - entries[i].start + 1;
+
 #elif defined(TUKLIB_PHYSMEM_AIX)
 	ret = _system_configuration.physmem;
 

Modified: user/ngie/more-tests2/contrib/xz/src/liblzma/api/lzma.h
==============================================================================
--- user/ngie/more-tests2/contrib/xz/src/liblzma/api/lzma.h	Tue Nov 24 04:19:55 2015	(r291235)
+++ user/ngie/more-tests2/contrib/xz/src/liblzma/api/lzma.h	Tue Nov 24 05:12:40 2015	(r291236)
@@ -82,12 +82,20 @@
 #	if !defined(UINT32_C) || !defined(UINT64_C) \
 			|| !defined(UINT32_MAX) || !defined(UINT64_MAX)
 		/*
-		 * MSVC has no C99 support, and thus it cannot be used to
-		 * compile liblzma. The liblzma API has to still be usable
-		 * from MSVC, so we need to define the required standard
-		 * integer types here.
+		 * MSVC versions older than 2013 have no C99 support, and
+		 * thus they cannot be used to compile liblzma. Using an
+		 * existing liblzma.dll with old MSVC can work though(*),
+		 * but we need to define the required standard integer
+		 * types here in a MSVC-specific way.
+		 *
+		 * (*) If you do this, the existing liblzma.dll probably uses
+		 *     a different runtime library than your MSVC-built
+		 *     application. Mixing runtimes is generally bad, but
+		 *     in this case it should work as long as you avoid
+		 *     the few rarely-needed liblzma functions that allocate
+		 *     memory and expect the caller to free it using free().
 		 */
-#		if defined(_WIN32) && defined(_MSC_VER)
+#		if defined(_WIN32) && defined(_MSC_VER) && _MSC_VER < 1800
 			typedef unsigned __int8 uint8_t;
 			typedef unsigned __int32 uint32_t;
 			typedef unsigned __int64 uint64_t;

Modified: user/ngie/more-tests2/contrib/xz/src/liblzma/api/lzma/version.h
==============================================================================
--- user/ngie/more-tests2/contrib/xz/src/liblzma/api/lzma/version.h	Tue Nov 24 04:19:55 2015	(r291235)
+++ user/ngie/more-tests2/contrib/xz/src/liblzma/api/lzma/version.h	Tue Nov 24 05:12:40 2015	(r291236)
@@ -22,7 +22,7 @@
  */
 #define LZMA_VERSION_MAJOR 5
 #define LZMA_VERSION_MINOR 2
-#define LZMA_VERSION_PATCH 1
+#define LZMA_VERSION_PATCH 2
 #define LZMA_VERSION_STABILITY LZMA_VERSION_STABILITY_STABLE
 
 #ifndef LZMA_VERSION_COMMIT

Modified: user/ngie/more-tests2/contrib/xz/src/liblzma/common/index.c
==============================================================================
--- user/ngie/more-tests2/contrib/xz/src/liblzma/common/index.c	Tue Nov 24 04:19:55 2015	(r291235)
+++ user/ngie/more-tests2/contrib/xz/src/liblzma/common/index.c	Tue Nov 24 05:12:40 2015	(r291236)
@@ -339,7 +339,7 @@ index_tree_locate(const index_tree *tree
 /// Allocate and initialize a new Stream using the given base offsets.
 static index_stream *
 index_stream_init(lzma_vli compressed_base, lzma_vli uncompressed_base,
-		lzma_vli stream_number, lzma_vli block_number_base,
+		uint32_t stream_number, lzma_vli block_number_base,
 		const lzma_allocator *allocator)
 {
 	index_stream *s = lzma_alloc(sizeof(index_stream), allocator);
@@ -1008,6 +1008,8 @@ iter_set_info(lzma_index_iter *iter)
 		iter->internal[ITER_GROUP].p = NULL;
 	}
 
+	// NOTE: lzma_index_iter.stream.number is lzma_vli but we use uint32_t
+	// internally.
 	iter->stream.number = stream->number;
 	iter->stream.block_count = stream->record_count;
 	iter->stream.compressed_offset = stream->node.compressed_base;

Modified: user/ngie/more-tests2/contrib/xz/src/liblzma/lz/lz_encoder.c
==============================================================================
--- user/ngie/more-tests2/contrib/xz/src/liblzma/lz/lz_encoder.c	Tue Nov 24 04:19:55 2015	(r291235)
+++ user/ngie/more-tests2/contrib/xz/src/liblzma/lz/lz_encoder.c	Tue Nov 24 05:12:40 2015	(r291236)
@@ -139,7 +139,7 @@ fill_window(lzma_coder *coder, const lzm
 			&& coder->mf.read_pos < coder->mf.read_limit) {
 		// Match finder may update coder->pending and expects it to
 		// start from zero, so use a temporary variable.
-		const size_t pending = coder->mf.pending;
+		const uint32_t pending = coder->mf.pending;
 		coder->mf.pending = 0;
 
 		// Rewind read_pos so that the match finder can hash

Modified: user/ngie/more-tests2/contrib/xz/src/liblzma/lzma/lzma_encoder.c
==============================================================================
--- user/ngie/more-tests2/contrib/xz/src/liblzma/lzma/lzma_encoder.c	Tue Nov 24 04:19:55 2015	(r291235)
+++ user/ngie/more-tests2/contrib/xz/src/liblzma/lzma/lzma_encoder.c	Tue Nov 24 05:12:40 2015	(r291236)
@@ -464,7 +464,7 @@ length_encoder_reset(lzma_length_encoder
 	bittree_reset(lencoder->high, LEN_HIGH_BITS);
 
 	if (!fast_mode)
-		for (size_t pos_state = 0; pos_state < num_pos_states;
+		for (uint32_t pos_state = 0; pos_state < num_pos_states;
 				++pos_state)
 			length_update_prices(lencoder, pos_state);
 

Modified: user/ngie/more-tests2/contrib/xz/src/xz/args.h
==============================================================================
--- user/ngie/more-tests2/contrib/xz/src/xz/args.h	Tue Nov 24 04:19:55 2015	(r291235)
+++ user/ngie/more-tests2/contrib/xz/src/xz/args.h	Tue Nov 24 05:12:40 2015	(r291236)
@@ -15,7 +15,7 @@ typedef struct {
 	char **arg_names;
 
 	/// Number of filenames from command line
-	size_t arg_count;
+	unsigned int arg_count;
 
 	/// Name of the file from which to read filenames. This is NULL
 	/// if --files or --files0 was not used.

Modified: user/ngie/more-tests2/contrib/xz/src/xz/file_io.c
==============================================================================
--- user/ngie/more-tests2/contrib/xz/src/xz/file_io.c	Tue Nov 24 04:19:55 2015	(r291235)
+++ user/ngie/more-tests2/contrib/xz/src/xz/file_io.c	Tue Nov 24 05:12:40 2015	(r291236)
@@ -82,13 +82,7 @@ io_init(void)
 	// we are root.
 	warn_fchown = geteuid() == 0;
 
-	// Create a pipe for the self-pipe trick. If pipe2() is available,
-	// we can avoid the fcntl() calls.
-#	ifdef HAVE_PIPE2
-	if (pipe2(user_abort_pipe, O_NONBLOCK))
-		message_fatal(_("Error creating a pipe: %s"),
-				strerror(errno));
-#	else
+	// Create a pipe for the self-pipe trick.
 	if (pipe(user_abort_pipe))
 		message_fatal(_("Error creating a pipe: %s"),
 				strerror(errno));
@@ -101,7 +95,6 @@ io_init(void)
 			message_fatal(_("Error creating a pipe: %s"),
 					strerror(errno));
 	}
-#	endif
 #endif
 
 #ifdef __DJGPP__

Modified: user/ngie/more-tests2/contrib/xz/src/xz/main.c
==============================================================================
--- user/ngie/more-tests2/contrib/xz/src/xz/main.c	Tue Nov 24 04:19:55 2015	(r291235)
+++ user/ngie/more-tests2/contrib/xz/src/xz/main.c	Tue Nov 24 05:12:40 2015	(r291236)
@@ -212,7 +212,7 @@ main(int argc, char **argv)
 
 	// Process the files given on the command line. Note that if no names
 	// were given, args_parse() gave us a fake "-" filename.
-	for (size_t i = 0; i < args.arg_count && !user_abort; ++i) {
+	for (unsigned i = 0; i < args.arg_count && !user_abort; ++i) {
 		if (strcmp("-", args.arg_names[i]) == 0) {
 			// Processing from stdin to stdout. Check that we
 			// aren't writing compressed data to a terminal or

Modified: user/ngie/more-tests2/contrib/xz/src/xz/message.c
==============================================================================
--- user/ngie/more-tests2/contrib/xz/src/xz/message.c	Tue Nov 24 04:19:55 2015	(r291235)
+++ user/ngie/more-tests2/contrib/xz/src/xz/message.c	Tue Nov 24 05:12:40 2015	(r291236)
@@ -381,7 +381,7 @@ progress_speed(uint64_t uncompressed_pos
 }
 
 
-/// Make a string indicating elapsed or remaining time. The format is either
+/// Make a string indicating elapsed time. The format is either
 /// M:SS or H:MM:SS depending on if the time is an hour or more.
 static const char *
 progress_time(uint64_t mseconds)
@@ -389,7 +389,8 @@ progress_time(uint64_t mseconds)
 	// 9999 hours = 416 days
 	static char buf[sizeof("9999:59:59")];
 
-	uint32_t seconds = mseconds / 1000;
+	// 32-bit variable is enough for elapsed time (136 years).
+	uint32_t seconds = (uint32_t)(mseconds / 1000);
 
 	// Don't show anything if the time is zero or ridiculously big.
 	if (seconds == 0 || seconds > ((9999 * 60) + 59) * 60 + 59)

Modified: user/ngie/more-tests2/contrib/xz/src/xz/options.c
==============================================================================
--- user/ngie/more-tests2/contrib/xz/src/xz/options.c	Tue Nov 24 04:19:55 2015	(r291235)
+++ user/ngie/more-tests2/contrib/xz/src/xz/options.c	Tue Nov 24 05:12:40 2015	(r291236)
@@ -59,7 +59,7 @@ typedef struct {
 static void
 parse_options(const char *str, const option_map *opts,
 		void (*set)(void *filter_options,
-			uint32_t key, uint64_t value, const char *valuestr),
+			unsigned key, uint64_t value, const char *valuestr),
 		void *filter_options)
 {
 	if (str == NULL || str[0] == '\0')
@@ -87,7 +87,7 @@ parse_options(const char *str, const opt
 					"pairs separated with commas"), str);
 
 		// Look for the option name from the option map.
-		size_t i = 0;
+		unsigned i = 0;
 		while (true) {
 			if (opts[i].name == NULL)
 				message_fatal(_("%s: Invalid option name"),
@@ -103,7 +103,7 @@ parse_options(const char *str, const opt
 		if (opts[i].map != NULL) {
 			// value is a string which we should map
 			// to an integer.
-			size_t j;
+			unsigned j;
 			for (j = 0; opts[i].map[j].name != NULL; ++j) {
 				if (strcmp(opts[i].map[j].name, value) == 0)
 					break;
@@ -149,7 +149,7 @@ enum {
 
 
 static void
-set_delta(void *options, uint32_t key, uint64_t value,
+set_delta(void *options, unsigned key, uint64_t value,
 		const char *valuestr lzma_attribute((__unused__)))
 {
 	lzma_options_delta *opt = options;
@@ -193,7 +193,7 @@ enum {
 
 
 static void
-set_bcj(void *options, uint32_t key, uint64_t value,
+set_bcj(void *options, unsigned key, uint64_t value,
 		const char *valuestr lzma_attribute((__unused__)))
 {
 	lzma_options_bcj *opt = options;
@@ -249,7 +249,7 @@ error_lzma_preset(const char *valuestr)
 
 
 static void
-set_lzma(void *options, uint32_t key, uint64_t value, const char *valuestr)
+set_lzma(void *options, unsigned key, uint64_t value, const char *valuestr)
 {
 	lzma_options_lzma *opt = options;
 

Modified: user/ngie/more-tests2/contrib/xz/src/xz/xz.1
==============================================================================
--- user/ngie/more-tests2/contrib/xz/src/xz/xz.1	Tue Nov 24 04:19:55 2015	(r291235)
+++ user/ngie/more-tests2/contrib/xz/src/xz/xz.1	Tue Nov 24 05:12:40 2015	(r291236)
@@ -5,7 +5,7 @@
 .\" This file has been put into the public domain.
 .\" You can do whatever you want with this file.
 .\"
-.TH XZ 1 "2014-12-16" "Tukaani" "XZ Utils"
+.TH XZ 1 "2015-05-11" "Tukaani" "XZ Utils"
 .
 .SH NAME
 xz, unxz, xzcat, lzma, unlzma, lzcat \- Compress or decompress .xz and .lzma files
@@ -1055,6 +1055,14 @@ The default block size depends on the co
 can be overriden with the
 .BI \-\-block\-size= size
 option.
+.IP ""
+Threaded decompression hasn't been implemented yet.
+It will only work on files that contain multiple blocks
+with size information in block headers.
+All files compressed in multi-threaded mode meet this condition,
+but files compressed in single-threaded mode don't even if
+.BI \-\-block\-size= size
+is used.
 .
 .SS "Custom compressor filter chains"
 A custom filter chain allows specifying

Modified: user/ngie/more-tests2/crypto/openssh/README.hpn
==============================================================================
--- user/ngie/more-tests2/crypto/openssh/README.hpn	Tue Nov 24 04:19:55 2015	(r291235)
+++ user/ngie/more-tests2/crypto/openssh/README.hpn	Tue Nov 24 05:12:40 2015	(r291236)
@@ -1,14 +1,5 @@
 Notes:
 
-NONE CIPHER:
-  To use the NONE option you must have the NoneEnabled switch set on the server
-  and you MUST have *both* NoneEnabled and NoneSwitch set to yes on the client.
-  The NONE feature works with ALL ssh subsystems (as far as we can tell)
-  as long as there is no tty allocated.
-  If a user uses the -T switch to prevent a tty being created the NONE cipher
-  will be disabled. 
-
-
 PERFORMANCE:
   The performance increase will only be as good as the network and TCP stack
   tuning on the reciever side of the connection allows.  As a rule of thumb a
@@ -93,22 +84,6 @@ HPN SPECIFIC CONFIGURATION OPTIONS:
   the throughput will be no more than n/RTT.  The minimum buffer size is 1KB. 
   Default is the current system wide TCP receive buffer size.
 
-- NoneEnabled=[yes/no] client/server
-  Enable or disable the use of the None cipher.  Care must always be used when
-  enabling this as it will allow users to send data in the clear.  However, it
-  is important to note that authentication information remains encrypted even
-  if this option is enabled.  Set to no by default.
-
-- NoneSwitch=[yes/no] client
-  Switch the encryption cipher being used to the None cipher after
-  authentication takes place.  NoneEnabled must be enabled on both the client
-  and server side of the connection.  When the connection switches to the NONE
-  cipher a warning is sent to STDERR.  The connection attempt will fail with an
-  error if a client requests a NoneSwitch from the server that does not
-  explicitly have NoneEnabled set to yes.
-  Note: The NONE cipher cannot be used in interactive (shell) sessions and it
-  will fail silently.  Set to no by default.
-
 
 CREDITS:
 

Modified: user/ngie/more-tests2/crypto/openssh/cipher.c
==============================================================================
--- user/ngie/more-tests2/crypto/openssh/cipher.c	Tue Nov 24 04:19:55 2015	(r291235)
+++ user/ngie/more-tests2/crypto/openssh/cipher.c	Tue Nov 24 05:12:40 2015	(r291236)
@@ -36,7 +36,6 @@
  */
 
 #include "includes.h"
-__RCSID("$FreeBSD$");
 
 #include <sys/types.h>
 
@@ -225,12 +224,7 @@ ciphers_valid(const char *names)
 	for ((p = strsep(&cp, CIPHER_SEP)); p && *p != '\0';
 	    (p = strsep(&cp, CIPHER_SEP))) {
 		c = cipher_by_name(p);
-#ifdef NONE_CIPHER_ENABLED
-		if (c == NULL || (c->number != SSH_CIPHER_SSH2 &&
-		    c->number != SSH_CIPHER_NONE)) {
-#else
-		if (c == NULL || (c->number != SSH_CIPHER_SSH2)) {
-#endif
+		if (c == NULL || c->number != SSH_CIPHER_SSH2) {
 			debug("bad cipher %s [%s]", p, names);
 			free(cipher_list);
 			return 0;
@@ -485,9 +479,6 @@ cipher_get_keyiv(CipherContext *cc, u_ch
 	}
 
 	switch (c->number) {
-#ifdef	NONE_CIPHER_ENABLED
-	case SSH_CIPHER_NONE:
-#endif
 	case SSH_CIPHER_SSH2:
 	case SSH_CIPHER_DES:
 	case SSH_CIPHER_BLOWFISH:
@@ -527,9 +518,6 @@ cipher_set_keyiv(CipherContext *cc, u_ch
 		return;
 
 	switch (c->number) {
-#ifdef	NONE_CIPHER_ENABLED
-	case SSH_CIPHER_NONE:
-#endif
 	case SSH_CIPHER_SSH2:
 	case SSH_CIPHER_DES:
 	case SSH_CIPHER_BLOWFISH:

Modified: user/ngie/more-tests2/crypto/openssh/kex.c
==============================================================================
--- user/ngie/more-tests2/crypto/openssh/kex.c	Tue Nov 24 04:19:55 2015	(r291235)
+++ user/ngie/more-tests2/crypto/openssh/kex.c	Tue Nov 24 05:12:40 2015	(r291236)
@@ -24,7 +24,6 @@
  */
 
 #include "includes.h"
-__RCSID("$FreeBSD$");
 
 #include <sys/param.h>
 
@@ -146,13 +145,8 @@ kex_names_valid(const char *names)
 	return 1;
 }
 
-/* put algorithm proposal into buffer. */
-#ifndef NONE_CIPHER_ENABLED
+/* put algorithm proposal into buffer */
 static void
-#else
-/* Also used in sshconnect2.c. */
-void
-#endif
 kex_prop2buf(Buffer *b, char *proposal[PROPOSAL_MAX])
 {
 	u_int i;
@@ -466,9 +460,6 @@ kex_choose_conf(Kex *kex)
 	int nenc, nmac, ncomp;
 	u_int mode, ctos, need, dh_need, authlen;
 	int first_kex_follows, type;
-#ifdef	NONE_CIPHER_ENABLED
-	int auth_flag;
-#endif
 
 	my   = kex_buf2prop(&kex->my, NULL);
 	peer = kex_buf2prop(&kex->peer, &first_kex_follows);
@@ -492,10 +483,6 @@ kex_choose_conf(Kex *kex)
 	}
 
 	/* Algorithm Negotiation */
-#ifdef	NONE_CIPHER_ENABLED
-	auth_flag = packet_get_authentication_state();
-	debug ("AUTH STATE is %d", auth_flag);
-#endif
 	for (mode = 0; mode < MODE_MAX; mode++) {
 		newkeys = xcalloc(1, sizeof(*newkeys));
 		kex->newkeys[mode] = newkeys;
@@ -510,17 +497,6 @@ kex_choose_conf(Kex *kex)
 		if (authlen == 0)
 			choose_mac(&newkeys->mac, cprop[nmac], sprop[nmac]);
 		choose_comp(&newkeys->comp, cprop[ncomp], sprop[ncomp]);
-#ifdef	NONE_CIPHER_ENABLED
-		debug("REQUESTED ENC.NAME is '%s'", newkeys->enc.name);
-		if (strcmp(newkeys->enc.name, "none") == 0) {
-			debug("Requesting NONE. Authflag is %d", auth_flag);
-			if (auth_flag == 1)
-				debug("None requested post authentication.");
-			else
-				fatal("Pre-authentication none cipher requests "
-				    "are not allowed.");
-		}
-#endif
 		debug("kex: %s %s %s %s",
 		    ctos ? "client->server" : "server->client",
 		    newkeys->enc.name,

Modified: user/ngie/more-tests2/crypto/openssh/kex.h
==============================================================================
--- user/ngie/more-tests2/crypto/openssh/kex.h	Tue Nov 24 04:19:55 2015	(r291235)
+++ user/ngie/more-tests2/crypto/openssh/kex.h	Tue Nov 24 05:12:40 2015	(r291236)
@@ -1,5 +1,4 @@
 /* $OpenBSD: kex.h,v 1.62 2014/01/27 18:58:14 markus Exp $ */
-/* $FreeBSD$ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -149,10 +148,6 @@ struct Kex {
 int	 kex_names_valid(const char *);
 char	*kex_alg_list(char);
 
-#ifdef	NONE_CIPHER_ENABLED
-void	 kex_prop2buf(Buffer *, char *[PROPOSAL_MAX]);
-#endif
-
 Kex	*kex_setup(char *[PROPOSAL_MAX]);
 void	 kex_finish(Kex *);
 

Modified: user/ngie/more-tests2/crypto/openssh/myproposal.h
==============================================================================
--- user/ngie/more-tests2/crypto/openssh/myproposal.h	Tue Nov 24 04:19:55 2015	(r291235)
+++ user/ngie/more-tests2/crypto/openssh/myproposal.h	Tue Nov 24 05:12:40 2015	(r291236)
@@ -1,5 +1,4 @@
 /* $OpenBSD: myproposal.h,v 1.35 2013/12/06 13:39:49 markus Exp $ */
-/* $FreeBSD$ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -110,10 +109,6 @@
 	"chacha20-poly1305 at openssh.com," \
 	"aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \
 	"aes192-cbc,aes256-cbc,arcfour,rijndael-cbc at lysator.liu.se"
-#ifdef	NONE_CIPHER_ENABLED
-#define KEX_ENCRYPT_INCLUDE_NONE KEX_DEFAULT_ENCRYPT \
-	",none"
-#endif
 
 #define	KEX_DEFAULT_MAC \
 	"hmac-md5-etm at openssh.com," \

Modified: user/ngie/more-tests2/crypto/openssh/openbsd-compat/bsd-misc.h
==============================================================================
--- user/ngie/more-tests2/crypto/openssh/openbsd-compat/bsd-misc.h	Tue Nov 24 04:19:55 2015	(r291235)
+++ user/ngie/more-tests2/crypto/openssh/openbsd-compat/bsd-misc.h	Tue Nov 24 05:12:40 2015	(r291236)
@@ -20,7 +20,6 @@
 #define _BSD_MISC_H
 
 #include "includes.h"
-__RCSID("$FreeBSD$");
 
 char *ssh_get_progname(char *);
 

Modified: user/ngie/more-tests2/crypto/openssh/packet.c
==============================================================================
--- user/ngie/more-tests2/crypto/openssh/packet.c	Tue Nov 24 04:19:55 2015	(r291235)
+++ user/ngie/more-tests2/crypto/openssh/packet.c	Tue Nov 24 05:12:40 2015	(r291236)
@@ -202,9 +202,6 @@ struct session_state {
 };
 
 static struct session_state *active_state, *backup_state;
-#ifdef	NONE_CIPHER_ENABLED
-static int rekey_requested = 0;
-#endif
 
 static struct session_state *
 alloc_session_state(void)
@@ -1316,7 +1313,6 @@ packet_read_poll2(u_int32_t *seqnr_p)
 		    buffer_ptr(&active_state->input), block_size, 0, 0) != 0)
 			fatal("Decryption integrity check failed");
 		cp = buffer_ptr(&active_state->incoming_packet);
-
 		active_state->packlen = get_u32(cp);
 		if (active_state->packlen < 1 + 4 ||
 		    active_state->packlen > PACKET_MAX_SIZE) {
@@ -1943,26 +1939,12 @@ packet_send_ignore(int nbytes)
 	}
 }
 
-#ifdef	NONE_CIPHER_ENABLED
-void
-packet_request_rekeying(void)
-{
-	rekey_requested = 1;
-}
-#endif
-
 #define MAX_PACKETS	(1U<<31)
 int
 packet_need_rekeying(void)
 {
 	if (datafellows & SSH_BUG_NOREKEY)
 		return 0;
-#ifdef	NONE_CIPHER_ENABLED
-	if (rekey_requested == 1) {
-		rekey_requested = 0;
-		return 1;
-	}
-#endif
 	return
 	    (active_state->p_send.packets > MAX_PACKETS) ||
 	    (active_state->p_read.packets > MAX_PACKETS) ||
@@ -2074,11 +2056,3 @@ packet_restore_state(void)
 		add_recv_bytes(len);
 	}
 }
-
-#ifdef	NONE_CIPHER_ENABLED
-int
-packet_get_authentication_state(void)
-{
-	return (active_state->after_authentication);
-}
-#endif

Modified: user/ngie/more-tests2/crypto/openssh/packet.h
==============================================================================
--- user/ngie/more-tests2/crypto/openssh/packet.h	Tue Nov 24 04:19:55 2015	(r291235)
+++ user/ngie/more-tests2/crypto/openssh/packet.h	Tue Nov 24 05:12:40 2015	(r291236)
@@ -1,5 +1,4 @@
 /* $OpenBSD: packet.h,v 1.59 2013/07/12 00:19:59 djm Exp $ */
-/* $FreeBSD$ */
 
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
@@ -39,9 +38,6 @@ void     packet_set_interactive(int, int
 int      packet_is_interactive(void);
 void     packet_set_server(void);
 void     packet_set_authenticated(void);
-#ifdef	NONE_CIPHER_ENABLED
-int      packet_get_authentication_state(void);
-#endif
 
 void     packet_start(u_char);
 void     packet_put_char(int ch);
@@ -119,9 +115,6 @@ do { \
 } while (0)
 
 int	 packet_need_rekeying(void);
-#ifdef	NONE_CIPHER_ENABLED
-void	 packet_request_rekeying(void);
-#endif
 void	 packet_set_rekey_limits(u_int32_t, time_t);
 time_t	 packet_get_rekey_timeout(void);
 

Modified: user/ngie/more-tests2/crypto/openssh/pathnames.h
==============================================================================
--- user/ngie/more-tests2/crypto/openssh/pathnames.h	Tue Nov 24 04:19:55 2015	(r291235)
+++ user/ngie/more-tests2/crypto/openssh/pathnames.h	Tue Nov 24 05:12:40 2015	(r291236)
@@ -1,5 +1,4 @@
 /* $OpenBSD: pathnames.h,v 1.24 2013/12/06 13:39:49 markus Exp $ */
-/* $FreeBSD$ */
 
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
@@ -122,7 +121,7 @@
  * Default location of askpass
  */
 #ifndef _PATH_SSH_ASKPASS_DEFAULT
-#define _PATH_SSH_ASKPASS_DEFAULT	"/usr/local/bin/ssh-askpass"
+#define _PATH_SSH_ASKPASS_DEFAULT	"/usr/X11R6/bin/ssh-askpass"
 #endif
 
 /* Location of ssh-keysign for hostbased authentication */
@@ -137,7 +136,7 @@
 
 /* xauth for X11 forwarding */
 #ifndef _PATH_XAUTH
-#define _PATH_XAUTH			"/usr/local/bin/xauth"
+#define _PATH_XAUTH			"/usr/X11R6/bin/xauth"
 #endif
 
 /* UNIX domain socket for X11 server; displaynum will replace %u */

Modified: user/ngie/more-tests2/crypto/openssh/readconf.c
==============================================================================
--- user/ngie/more-tests2/crypto/openssh/readconf.c	Tue Nov 24 04:19:55 2015	(r291235)
+++ user/ngie/more-tests2/crypto/openssh/readconf.c	Tue Nov 24 05:12:40 2015	(r291236)
@@ -154,9 +154,6 @@ typedef enum {
 	oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs,
 	oIgnoredUnknownOption,
 	oHPNDisabled, oHPNBufferSize, oTcpRcvBufPoll, oTcpRcvBuf,
-#ifdef NONE_CIPHER_ENABLED
-	oNoneEnabled, oNoneSwitch,
-#endif
 	oVersionAddendum, oDeprecated, oUnsupported
 } OpCodes;
 
@@ -274,10 +271,6 @@ static struct {
 	{ "hpnbuffersize", oHPNBufferSize },
 	{ "tcprcvbufpoll", oTcpRcvBufPoll },
 	{ "tcprcvbuf", oTcpRcvBuf },
-#ifdef	NONE_CIPHER_ENABLED
-	{ "noneenabled", oNoneEnabled },
-	{ "noneswitch", oNoneSwitch },
-#endif
 	{ "versionaddendum", oVersionAddendum },
 
 	{ NULL, oBadOption }
@@ -1375,31 +1368,6 @@ parse_int:
 		intptr = &options->tcp_rcv_buf;

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-user mailing list