svn commit: r263909 - in projects/random_number_generator: . bin bin/sh cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/lib/libzfs/common contrib/gcclibs/libcpp contrib/libstdc++/includ...
Mark Murray
markm at FreeBSD.org
Sat Mar 29 09:27:15 UTC 2014
Author: markm
Date: Sat Mar 29 09:27:08 2014
New Revision: 263909
URL: http://svnweb.freebsd.org/changeset/base/263909
Log:
MFC - tracking commit.
Added:
projects/random_number_generator/contrib/llvm/patches/patch-r263891-dwarf2-freebsd10.diff
- copied unchanged from r263908, head/contrib/llvm/patches/patch-r263891-dwarf2-freebsd10.diff
projects/random_number_generator/crypto/openssh/digest-libc.c
- copied unchanged from r263908, head/crypto/openssh/digest-libc.c
projects/random_number_generator/crypto/openssh/digest-openssl.c
- copied unchanged from r263908, head/crypto/openssh/digest-openssl.c
projects/random_number_generator/crypto/openssh/freebsd-post-merge.sh
- copied unchanged from r263908, head/crypto/openssh/freebsd-post-merge.sh
projects/random_number_generator/crypto/openssh/freebsd-pre-merge.sh
- copied unchanged from r263908, head/crypto/openssh/freebsd-pre-merge.sh
projects/random_number_generator/crypto/openssh/hmac.c
- copied unchanged from r263908, head/crypto/openssh/hmac.c
projects/random_number_generator/crypto/openssh/hmac.h
- copied unchanged from r263908, head/crypto/openssh/hmac.h
projects/random_number_generator/crypto/openssh/openbsd-compat/explicit_bzero.c
- copied unchanged from r263908, head/crypto/openssh/openbsd-compat/explicit_bzero.c
projects/random_number_generator/crypto/openssh/regress/dhgex.sh
- copied unchanged from r263908, head/crypto/openssh/regress/dhgex.sh
projects/random_number_generator/share/man/man4/man4.arm/ti_adc.4
- copied unchanged from r263908, head/share/man/man4/man4.arm/ti_adc.4
projects/random_number_generator/sys/amd64/vmm/io/vatpit.c
- copied unchanged from r263908, head/sys/amd64/vmm/io/vatpit.c
projects/random_number_generator/sys/amd64/vmm/io/vatpit.h
- copied unchanged from r263908, head/sys/amd64/vmm/io/vatpit.h
projects/random_number_generator/sys/arm/allwinner/a20/a20_mp.c
- copied unchanged from r263908, head/sys/arm/allwinner/a20/a20_mp.c
projects/random_number_generator/sys/arm/ti/ti_adc.c
- copied unchanged from r263908, head/sys/arm/ti/ti_adc.c
projects/random_number_generator/sys/arm/ti/ti_adcreg.h
- copied unchanged from r263908, head/sys/arm/ti/ti_adcreg.h
projects/random_number_generator/sys/arm/ti/ti_adcvar.h
- copied unchanged from r263908, head/sys/arm/ti/ti_adcvar.h
projects/random_number_generator/sys/sys/efi.h
- copied unchanged from r263908, head/sys/sys/efi.h
Deleted:
projects/random_number_generator/crypto/openssh/FREEBSD-tricks
projects/random_number_generator/crypto/openssh/auth2-jpake.c
projects/random_number_generator/crypto/openssh/digest.c
projects/random_number_generator/crypto/openssh/jpake.c
projects/random_number_generator/crypto/openssh/jpake.h
projects/random_number_generator/crypto/openssh/schnorr.h
projects/random_number_generator/sys/cam/ctl/ctl_mem_pool.c
projects/random_number_generator/sys/cam/ctl/ctl_mem_pool.h
projects/random_number_generator/sys/ia64/include/efi.h
projects/random_number_generator/tests/sys/netinet/udp_dontroute.c
projects/random_number_generator/usr.sbin/bhyve/pit_8254.c
projects/random_number_generator/usr.sbin/bhyve/pit_8254.h
Modified:
projects/random_number_generator/Makefile.inc1
projects/random_number_generator/UPDATING
projects/random_number_generator/bin/Makefile
projects/random_number_generator/bin/sh/alias.c
projects/random_number_generator/bin/sh/exec.c
projects/random_number_generator/bin/sh/expand.c
projects/random_number_generator/bin/sh/redir.c
projects/random_number_generator/bin/sh/var.c
projects/random_number_generator/cddl/contrib/opensolaris/cmd/zpool/zpool.8
projects/random_number_generator/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
projects/random_number_generator/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
projects/random_number_generator/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
projects/random_number_generator/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
projects/random_number_generator/contrib/gcclibs/libcpp/files.c
projects/random_number_generator/contrib/libstdc++/include/bits/cpp_type_traits.h
projects/random_number_generator/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
projects/random_number_generator/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp
projects/random_number_generator/contrib/tzdata/africa
projects/random_number_generator/contrib/tzdata/antarctica
projects/random_number_generator/contrib/tzdata/australasia
projects/random_number_generator/contrib/tzdata/europe
projects/random_number_generator/contrib/tzdata/zone.tab
projects/random_number_generator/crypto/openssh/ChangeLog
projects/random_number_generator/crypto/openssh/FREEBSD-upgrade
projects/random_number_generator/crypto/openssh/Makefile.in
projects/random_number_generator/crypto/openssh/README
projects/random_number_generator/crypto/openssh/auth-rsa.c
projects/random_number_generator/crypto/openssh/auth.c
projects/random_number_generator/crypto/openssh/auth.h
projects/random_number_generator/crypto/openssh/auth1.c
projects/random_number_generator/crypto/openssh/auth2-chall.c
projects/random_number_generator/crypto/openssh/auth2-gss.c
projects/random_number_generator/crypto/openssh/auth2-passwd.c
projects/random_number_generator/crypto/openssh/auth2.c
projects/random_number_generator/crypto/openssh/authfd.c
projects/random_number_generator/crypto/openssh/authfile.c
projects/random_number_generator/crypto/openssh/bufaux.c
projects/random_number_generator/crypto/openssh/bufbn.c
projects/random_number_generator/crypto/openssh/bufec.c
projects/random_number_generator/crypto/openssh/buffer.c
projects/random_number_generator/crypto/openssh/canohost.c
projects/random_number_generator/crypto/openssh/channels.c
projects/random_number_generator/crypto/openssh/cipher-3des1.c
projects/random_number_generator/crypto/openssh/cipher-chachapoly.c
projects/random_number_generator/crypto/openssh/cipher.c
projects/random_number_generator/crypto/openssh/clientloop.c
projects/random_number_generator/crypto/openssh/compat.c
projects/random_number_generator/crypto/openssh/config.h
projects/random_number_generator/crypto/openssh/config.h.in
projects/random_number_generator/crypto/openssh/configure
projects/random_number_generator/crypto/openssh/configure.ac
projects/random_number_generator/crypto/openssh/contrib/caldera/openssh.spec
projects/random_number_generator/crypto/openssh/contrib/redhat/openssh.spec
projects/random_number_generator/crypto/openssh/contrib/ssh-copy-id.1 (contents, props changed)
projects/random_number_generator/crypto/openssh/contrib/suse/openssh.spec
projects/random_number_generator/crypto/openssh/digest.h
projects/random_number_generator/crypto/openssh/gss-serv.c
projects/random_number_generator/crypto/openssh/hostfile.c
projects/random_number_generator/crypto/openssh/kex.c
projects/random_number_generator/crypto/openssh/kex.h
projects/random_number_generator/crypto/openssh/kexc25519.c
projects/random_number_generator/crypto/openssh/kexdhc.c
projects/random_number_generator/crypto/openssh/kexdhs.c
projects/random_number_generator/crypto/openssh/kexecdhc.c
projects/random_number_generator/crypto/openssh/kexecdhs.c
projects/random_number_generator/crypto/openssh/kexgexc.c
projects/random_number_generator/crypto/openssh/kexgexs.c
projects/random_number_generator/crypto/openssh/key.c
projects/random_number_generator/crypto/openssh/krl.c
projects/random_number_generator/crypto/openssh/mac.c
projects/random_number_generator/crypto/openssh/misc.c
projects/random_number_generator/crypto/openssh/moduli.0
projects/random_number_generator/crypto/openssh/moduli.5 (contents, props changed)
projects/random_number_generator/crypto/openssh/monitor.c
projects/random_number_generator/crypto/openssh/monitor.h
projects/random_number_generator/crypto/openssh/monitor_wrap.c
projects/random_number_generator/crypto/openssh/monitor_wrap.h
projects/random_number_generator/crypto/openssh/mux.c (contents, props changed)
projects/random_number_generator/crypto/openssh/openbsd-compat/Makefile.in
projects/random_number_generator/crypto/openssh/openbsd-compat/blowfish.c (contents, props changed)
projects/random_number_generator/crypto/openssh/openbsd-compat/bsd-misc.h (contents, props changed)
projects/random_number_generator/crypto/openssh/openbsd-compat/bsd-poll.c
projects/random_number_generator/crypto/openssh/openbsd-compat/openbsd-compat.h
projects/random_number_generator/crypto/openssh/openbsd-compat/openssl-compat.c
projects/random_number_generator/crypto/openssh/openbsd-compat/openssl-compat.h
projects/random_number_generator/crypto/openssh/packet.c
projects/random_number_generator/crypto/openssh/pathnames.h (contents, props changed)
projects/random_number_generator/crypto/openssh/readconf.c
projects/random_number_generator/crypto/openssh/readconf.h
projects/random_number_generator/crypto/openssh/readpass.c
projects/random_number_generator/crypto/openssh/regress/Makefile
projects/random_number_generator/crypto/openssh/regress/agent-ptrace.sh
projects/random_number_generator/crypto/openssh/regress/agent.sh
projects/random_number_generator/crypto/openssh/regress/cert-hostkey.sh
projects/random_number_generator/crypto/openssh/regress/host-expand.sh
projects/random_number_generator/crypto/openssh/regress/login-timeout.sh
projects/random_number_generator/crypto/openssh/regress/scp-ssh-wrapper.sh
projects/random_number_generator/crypto/openssh/regress/scp.sh
projects/random_number_generator/crypto/openssh/regress/setuid-allowed.c
projects/random_number_generator/crypto/openssh/regress/sftp-chroot.sh
projects/random_number_generator/crypto/openssh/rsa.c
projects/random_number_generator/crypto/openssh/sandbox-capsicum.c (contents, props changed)
projects/random_number_generator/crypto/openssh/sandbox-seccomp-filter.c
projects/random_number_generator/crypto/openssh/sandbox-systrace.c
projects/random_number_generator/crypto/openssh/schnorr.c
projects/random_number_generator/crypto/openssh/scp.0
projects/random_number_generator/crypto/openssh/scp.1 (contents, props changed)
projects/random_number_generator/crypto/openssh/servconf.c
projects/random_number_generator/crypto/openssh/servconf.h
projects/random_number_generator/crypto/openssh/serverloop.c
projects/random_number_generator/crypto/openssh/session.c
projects/random_number_generator/crypto/openssh/sftp-client.c
projects/random_number_generator/crypto/openssh/sftp-common.c (contents, props changed)
projects/random_number_generator/crypto/openssh/sftp-server.0
projects/random_number_generator/crypto/openssh/sftp.0
projects/random_number_generator/crypto/openssh/sftp.c
projects/random_number_generator/crypto/openssh/ssh-add.0
projects/random_number_generator/crypto/openssh/ssh-add.1 (contents, props changed)
projects/random_number_generator/crypto/openssh/ssh-add.c
projects/random_number_generator/crypto/openssh/ssh-agent.0
projects/random_number_generator/crypto/openssh/ssh-agent.c
projects/random_number_generator/crypto/openssh/ssh-dss.c
projects/random_number_generator/crypto/openssh/ssh-ecdsa.c
projects/random_number_generator/crypto/openssh/ssh-ed25519.c
projects/random_number_generator/crypto/openssh/ssh-gss.h (contents, props changed)
projects/random_number_generator/crypto/openssh/ssh-keygen.0
projects/random_number_generator/crypto/openssh/ssh-keygen.1
projects/random_number_generator/crypto/openssh/ssh-keygen.c
projects/random_number_generator/crypto/openssh/ssh-keyscan.0
projects/random_number_generator/crypto/openssh/ssh-keyscan.1
projects/random_number_generator/crypto/openssh/ssh-keysign.0
projects/random_number_generator/crypto/openssh/ssh-keysign.8 (contents, props changed)
projects/random_number_generator/crypto/openssh/ssh-pkcs11-helper.0
projects/random_number_generator/crypto/openssh/ssh-pkcs11-helper.8 (contents, props changed)
projects/random_number_generator/crypto/openssh/ssh-rsa.c
projects/random_number_generator/crypto/openssh/ssh.0
projects/random_number_generator/crypto/openssh/ssh.c
projects/random_number_generator/crypto/openssh/ssh2.h
projects/random_number_generator/crypto/openssh/ssh_config
projects/random_number_generator/crypto/openssh/ssh_config.0
projects/random_number_generator/crypto/openssh/ssh_config.5
projects/random_number_generator/crypto/openssh/ssh_namespace.h
projects/random_number_generator/crypto/openssh/sshconnect.c
projects/random_number_generator/crypto/openssh/sshconnect1.c
projects/random_number_generator/crypto/openssh/sshconnect2.c
projects/random_number_generator/crypto/openssh/sshd.0
projects/random_number_generator/crypto/openssh/sshd.c
projects/random_number_generator/crypto/openssh/sshd_config
projects/random_number_generator/crypto/openssh/sshd_config.0
projects/random_number_generator/crypto/openssh/sshd_config.5
projects/random_number_generator/crypto/openssh/sshlogin.c
projects/random_number_generator/crypto/openssh/version.h
projects/random_number_generator/etc/rc.d/devd
projects/random_number_generator/gnu/usr.bin/Makefile
projects/random_number_generator/lib/Makefile
projects/random_number_generator/lib/clang/Makefile
projects/random_number_generator/lib/libc/capability/cap_rights_init.3
projects/random_number_generator/lib/libc/gen/cap_rights_get.3
projects/random_number_generator/lib/libc/gen/cap_sandboxed.3
projects/random_number_generator/lib/libc/sys/cap_enter.2
projects/random_number_generator/lib/libc/sys/cap_fcntls_limit.2
projects/random_number_generator/lib/libc/sys/cap_ioctls_limit.2
projects/random_number_generator/lib/libc/sys/cap_rights_limit.2
projects/random_number_generator/lib/libmd/ripemd.3
projects/random_number_generator/lib/libmd/sha.3
projects/random_number_generator/lib/libmd/sha256.3
projects/random_number_generator/lib/libmd/sha512.3
projects/random_number_generator/lib/libvmmapi/vmmapi.c
projects/random_number_generator/lib/libvmmapi/vmmapi.h
projects/random_number_generator/release/doc/en_US.ISO8859-1/relnotes/article.xml
projects/random_number_generator/sbin/Makefile
projects/random_number_generator/sbin/devd/devd.cc
projects/random_number_generator/sbin/mdconfig/tests/legacy_test.sh
projects/random_number_generator/secure/lib/libssh/Makefile
projects/random_number_generator/secure/usr.sbin/sshd/Makefile
projects/random_number_generator/share/man/man4/devctl.4
projects/random_number_generator/share/man/man4/man4.arm/Makefile
projects/random_number_generator/share/man/man4/sysmouse.4
projects/random_number_generator/share/man/man7/build.7
projects/random_number_generator/share/man/man9/cd.9
projects/random_number_generator/share/mk/bsd.subdir.mk
projects/random_number_generator/sys/amd64/amd64/machdep.c
projects/random_number_generator/sys/amd64/amd64/mp_machdep.c
projects/random_number_generator/sys/amd64/amd64/pmap.c
projects/random_number_generator/sys/amd64/conf/GENERIC
projects/random_number_generator/sys/amd64/include/metadata.h
projects/random_number_generator/sys/amd64/include/vmm.h (contents, props changed)
projects/random_number_generator/sys/amd64/include/vmm_dev.h (contents, props changed)
projects/random_number_generator/sys/amd64/vmm/amd/amdv.c
projects/random_number_generator/sys/amd64/vmm/intel/vmx.c
projects/random_number_generator/sys/amd64/vmm/vmm.c
projects/random_number_generator/sys/amd64/vmm/vmm_dev.c
projects/random_number_generator/sys/amd64/vmm/vmm_ioport.c
projects/random_number_generator/sys/arm/allwinner/a10_clk.c
projects/random_number_generator/sys/arm/allwinner/a10_clk.h
projects/random_number_generator/sys/arm/allwinner/a10_common.c
projects/random_number_generator/sys/arm/allwinner/a10_ehci.c
projects/random_number_generator/sys/arm/allwinner/a10_gpio.c
projects/random_number_generator/sys/arm/allwinner/a10_gpio.h
projects/random_number_generator/sys/arm/allwinner/a10_machdep.c
projects/random_number_generator/sys/arm/allwinner/a10_sramc.c
projects/random_number_generator/sys/arm/allwinner/a10_sramc.h
projects/random_number_generator/sys/arm/allwinner/a20/a20_cpu_cfg.c
projects/random_number_generator/sys/arm/allwinner/a20/a20_cpu_cfg.h
projects/random_number_generator/sys/arm/allwinner/a20/files.a20
projects/random_number_generator/sys/arm/allwinner/aintc.c
projects/random_number_generator/sys/arm/allwinner/console.c
projects/random_number_generator/sys/arm/allwinner/if_emac.c
projects/random_number_generator/sys/arm/allwinner/if_emacreg.h
projects/random_number_generator/sys/arm/allwinner/timer.c
projects/random_number_generator/sys/arm/conf/BEAGLEBONE
projects/random_number_generator/sys/arm/conf/CUBIEBOARD2
projects/random_number_generator/sys/arm/include/pmap.h
projects/random_number_generator/sys/arm/rockchip/rk30xx_common.c
projects/random_number_generator/sys/arm/rockchip/rk30xx_gpio.c
projects/random_number_generator/sys/arm/rockchip/rk30xx_grf.c
projects/random_number_generator/sys/arm/rockchip/rk30xx_grf.h
projects/random_number_generator/sys/arm/rockchip/rk30xx_machdep.c
projects/random_number_generator/sys/arm/rockchip/rk30xx_pmu.c
projects/random_number_generator/sys/arm/rockchip/rk30xx_pmu.h
projects/random_number_generator/sys/arm/rockchip/rk30xx_wdog.c
projects/random_number_generator/sys/arm/rockchip/rk30xx_wdog.h
projects/random_number_generator/sys/arm/ti/am335x/am335x_prcm.c
projects/random_number_generator/sys/arm/ti/files.ti
projects/random_number_generator/sys/arm/ti/ti_prcm.h
projects/random_number_generator/sys/boot/fdt/dts/arm/am335x.dtsi
projects/random_number_generator/sys/boot/fdt/dts/arm/cubieboard.dts
projects/random_number_generator/sys/boot/fdt/dts/arm/cubieboard2.dts
projects/random_number_generator/sys/boot/fdt/dts/arm/rk3188-radxa.dts
projects/random_number_generator/sys/boot/fdt/dts/arm/rk3188.dtsi
projects/random_number_generator/sys/boot/fdt/dts/mips/beri-netfpga.dts
projects/random_number_generator/sys/cam/ctl/README.ctl.txt
projects/random_number_generator/sys/cam/ctl/ctl_frontend_cam_sim.c
projects/random_number_generator/sys/cam/ctl/ctl_frontend_internal.c
projects/random_number_generator/sys/cam/ctl/ctl_frontend_iscsi.c
projects/random_number_generator/sys/conf/files
projects/random_number_generator/sys/conf/kern.mk
projects/random_number_generator/sys/dev/iscsi/icl.c
projects/random_number_generator/sys/dev/iscsi/icl.h
projects/random_number_generator/sys/dev/iscsi/iscsi.c
projects/random_number_generator/sys/dev/vt/hw/efifb/efifb.c
projects/random_number_generator/sys/dev/vt/hw/vga/vga.c
projects/random_number_generator/sys/dev/vt/vt.h
projects/random_number_generator/sys/dev/vt/vt_core.c
projects/random_number_generator/sys/i386/conf/GENERIC
projects/random_number_generator/sys/i386/conf/XEN
projects/random_number_generator/sys/ia64/acpica/OsdEnvironment.c
projects/random_number_generator/sys/ia64/ia64/clock.c
projects/random_number_generator/sys/ia64/ia64/dump_machdep.c
projects/random_number_generator/sys/ia64/ia64/efi.c
projects/random_number_generator/sys/ia64/ia64/iodev_machdep.c
projects/random_number_generator/sys/ia64/ia64/machdep.c
projects/random_number_generator/sys/ia64/ia64/mem.c
projects/random_number_generator/sys/ia64/ia64/nexus.c
projects/random_number_generator/sys/ia64/ia64/pmap.c
projects/random_number_generator/sys/ia64/ia64/sal.c
projects/random_number_generator/sys/ia64/ia64/trap.c
projects/random_number_generator/sys/kern/subr_bus.c
projects/random_number_generator/sys/kern/subr_devstat.c
projects/random_number_generator/sys/modules/ctl/Makefile
projects/random_number_generator/sys/modules/vmm/Makefile
projects/random_number_generator/sys/net/pfvar.h
projects/random_number_generator/sys/netinet/if_ether.c
projects/random_number_generator/sys/netinet/in.c
projects/random_number_generator/sys/netinet/tcp_input.c
projects/random_number_generator/sys/netpfil/pf/if_pfsync.c
projects/random_number_generator/sys/netpfil/pf/pf.c
projects/random_number_generator/sys/netpfil/pf/pf_ioctl.c
projects/random_number_generator/sys/powerpc/include/psl.h
projects/random_number_generator/sys/sparc64/conf/GENERIC
projects/random_number_generator/sys/x86/acpica/madt.c
projects/random_number_generator/sys/x86/xen/hvm.c
projects/random_number_generator/tests/sys/netinet/Makefile
projects/random_number_generator/tests/sys/netinet/fibs_test.sh
projects/random_number_generator/tools/tools/nanobsd/nanobsd.sh
projects/random_number_generator/tools/tools/sysdoc/tunables.mdoc
projects/random_number_generator/usr.bin/Makefile
projects/random_number_generator/usr.bin/brandelf/brandelf.1
projects/random_number_generator/usr.bin/clang/Makefile
projects/random_number_generator/usr.bin/kdump/kdump.1
projects/random_number_generator/usr.bin/kdump/kdump.c
projects/random_number_generator/usr.sbin/Makefile
projects/random_number_generator/usr.sbin/bhyve/Makefile
projects/random_number_generator/usr.sbin/bhyve/bhyverun.c
projects/random_number_generator/usr.sbin/bsdinstall/scripts/zfsboot
projects/random_number_generator/usr.sbin/pkg/Makefile
Directory Properties:
projects/random_number_generator/ (props changed)
projects/random_number_generator/cddl/ (props changed)
projects/random_number_generator/cddl/contrib/opensolaris/ (props changed)
projects/random_number_generator/cddl/contrib/opensolaris/lib/libzfs/ (props changed)
projects/random_number_generator/contrib/libstdc++/ (props changed)
projects/random_number_generator/contrib/llvm/ (props changed)
projects/random_number_generator/contrib/llvm/tools/clang/ (props changed)
projects/random_number_generator/contrib/llvm/tools/lldb/ (props changed)
projects/random_number_generator/contrib/tzdata/ (props changed)
projects/random_number_generator/crypto/openssh/ (props changed)
projects/random_number_generator/etc/ (props changed)
projects/random_number_generator/lib/libc/ (props changed)
projects/random_number_generator/lib/libvmmapi/ (props changed)
projects/random_number_generator/sbin/ (props changed)
projects/random_number_generator/share/man/man4/ (props changed)
projects/random_number_generator/sys/ (props changed)
projects/random_number_generator/sys/amd64/vmm/ (props changed)
projects/random_number_generator/sys/boot/ (props changed)
projects/random_number_generator/sys/conf/ (props changed)
projects/random_number_generator/sys/modules/vmm/ (props changed)
projects/random_number_generator/usr.sbin/bhyve/ (props changed)
Modified: projects/random_number_generator/Makefile.inc1
==============================================================================
--- projects/random_number_generator/Makefile.inc1 Sat Mar 29 09:05:25 2014 (r263908)
+++ projects/random_number_generator/Makefile.inc1 Sat Mar 29 09:27:08 2014 (r263909)
@@ -1899,7 +1899,7 @@ CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}"
CDTMP= ${MAKEOBJDIRPREFIX}/${XDDIR}/${.CURDIR}/tmp
CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${PATH} ${MAKE} ${NOFUN}
CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/usr/bin:${PATH} ${MAKE} ${NOFUN}
-XDDESTDIR=${DESTDIR}/${XDTP}
+XDDESTDIR?=${DESTDIR}/${XDTP}
.if !defined(OSREL)
OSREL!= uname -r | sed -e 's/[-(].*//'
.endif
Modified: projects/random_number_generator/UPDATING
==============================================================================
--- projects/random_number_generator/UPDATING Sat Mar 29 09:05:25 2014 (r263908)
+++ projects/random_number_generator/UPDATING Sat Mar 29 09:27:08 2014 (r263909)
@@ -31,6 +31,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20140325:
+ It is no longer necessary to include the dwarf version in your DEBUG
+ options in your kernel config file. The bug that required it to be
+ placed in the config file has bene fixed. DEBUG should now just
+ contain -g. The build system will automatically update things
+ to do the right thing. Ignore the entry from 20140216.
+
20140306:
Support for libwrap (TCP wrappers) in rpcbind was disabled by default
to improve performance. To re-enable it, if needed, run rpcbind
@@ -46,6 +53,17 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
20140216:
Clang and llvm have been upgraded to 3.4 release.
+ Please note that clang 3.4 now defaults to DWARF4 debug information
+ format when you specify -g. Since kgdb(1) only supports DWARF2, you
+ should update any customized kernel configurations which include debug
+ information to explicitly use -gdwarf-2, e.g:
+
+ makeoptions DEBUG=-gdwarf-2
+
+ This has already been applied to the appropriate GENERIC configuration
+ files, so if you inherit from those, no changes are required.
+ Please note: this bug has been fixed, please see 20140325.
+
20140216:
The nve(4) driver has been removed. Please use the nfe(4) driver
for NVIDIA nForce MCP Ethernet adapters instead.
Modified: projects/random_number_generator/bin/Makefile
==============================================================================
--- projects/random_number_generator/bin/Makefile Sat Mar 29 09:05:25 2014 (r263908)
+++ projects/random_number_generator/bin/Makefile Sat Mar 29 09:27:08 2014 (r263909)
@@ -60,4 +60,6 @@ SUBDIR+= tests
SUBDIR:= ${SUBDIR:O}
+SUBDIR_PARALLEL=
+
.include <bsd.subdir.mk>
Modified: projects/random_number_generator/bin/sh/alias.c
==============================================================================
--- projects/random_number_generator/bin/sh/alias.c Sat Mar 29 09:05:25 2014 (r263908)
+++ projects/random_number_generator/bin/sh/alias.c Sat Mar 29 09:27:08 2014 (r263909)
@@ -180,6 +180,7 @@ printaliases(void)
int i, j;
struct alias **sorted, *ap;
+ INTOFF;
sorted = ckmalloc(aliases * sizeof(*sorted));
j = 0;
for (i = 0; i < ATABSIZE; i++)
@@ -187,9 +188,13 @@ printaliases(void)
if (*ap->name != '\0')
sorted[j++] = ap;
qsort(sorted, aliases, sizeof(*sorted), comparealiases);
- for (i = 0; i < aliases; i++)
+ for (i = 0; i < aliases; i++) {
printalias(sorted[i]);
+ if (int_pending())
+ break;
+ }
ckfree(sorted);
+ INTON;
}
int
Modified: projects/random_number_generator/bin/sh/exec.c
==============================================================================
--- projects/random_number_generator/bin/sh/exec.c Sat Mar 29 09:05:25 2014 (r263908)
+++ projects/random_number_generator/bin/sh/exec.c Sat Mar 29 09:27:08 2014 (r263909)
@@ -612,6 +612,7 @@ defun(const char *name, union node *func
/*
* Delete a function if it exists.
+ * Called with interrupts off.
*/
int
Modified: projects/random_number_generator/bin/sh/expand.c
==============================================================================
--- projects/random_number_generator/bin/sh/expand.c Sat Mar 29 09:05:25 2014 (r263908)
+++ projects/random_number_generator/bin/sh/expand.c Sat Mar 29 09:27:08 2014 (r263909)
@@ -956,6 +956,7 @@ recordregion(int start, int end, int inq
{
struct ifsregion *ifsp;
+ INTOFF;
if (ifslastp == NULL) {
ifsp = &ifsfirst;
} else {
@@ -963,6 +964,7 @@ recordregion(int start, int end, int inq
&& ifslastp->inquotes == inquotes) {
/* extend previous area */
ifslastp->endoff = end;
+ INTON;
return;
}
ifsp = (struct ifsregion *)ckmalloc(sizeof (struct ifsregion));
@@ -973,6 +975,7 @@ recordregion(int start, int end, int inq
ifslastp->begoff = start;
ifslastp->endoff = end;
ifslastp->inquotes = inquotes;
+ INTON;
}
Modified: projects/random_number_generator/bin/sh/redir.c
==============================================================================
--- projects/random_number_generator/bin/sh/redir.c Sat Mar 29 09:05:25 2014 (r263908)
+++ projects/random_number_generator/bin/sh/redir.c Sat Mar 29 09:27:08 2014 (r263909)
@@ -92,6 +92,13 @@ static int openhere(union node *);
* undone by calling popredir. If the REDIR_BACKQ flag is set, then the
* standard output, and the standard error if it becomes a duplicate of
* stdout, is saved in memory.
+*
+ * We suppress interrupts so that we won't leave open file
+ * descriptors around. Because the signal handler remains
+ * installed and we do not use system call restart, interrupts
+ * will still abort blocking opens such as fifos (they will fail
+ * with EINTR). There is, however, a race condition if an interrupt
+ * arrives after INTOFF and before open blocks.
*/
void
@@ -103,6 +110,7 @@ redirect(union node *redir, int flags)
int fd;
char memory[10]; /* file descriptors to write to memory */
+ INTOFF;
for (i = 10 ; --i >= 0 ; )
memory[i] = 0;
memory[1] = flags & REDIR_BACKQ;
@@ -139,11 +147,14 @@ redirect(union node *redir, int flags)
INTON;
}
openredirect(n, memory);
+ INTON;
+ INTOFF;
}
if (memory[1])
out1 = &memout;
if (memory[2])
out2 = &memout;
+ INTON;
}
@@ -156,15 +167,6 @@ openredirect(union node *redir, char mem
int f;
int e;
- /*
- * We suppress interrupts so that we won't leave open file
- * descriptors around. Because the signal handler remains
- * installed and we do not use system call restart, interrupts
- * will still abort blocking opens such as fifos (they will fail
- * with EINTR). There is, however, a race condition if an interrupt
- * arrives after INTOFF and before open blocks.
- */
- INTOFF;
memory[fd] = 0;
switch (redir->nfile.type) {
case NFROM:
@@ -237,7 +239,6 @@ movefd:
default:
abort();
}
- INTON;
}
Modified: projects/random_number_generator/bin/sh/var.c
==============================================================================
--- projects/random_number_generator/bin/sh/var.c Sat Mar 29 09:05:25 2014 (r263908)
+++ projects/random_number_generator/bin/sh/var.c Sat Mar 29 09:27:08 2014 (r263909)
@@ -249,6 +249,7 @@ setvar(const char *name, const char *val
vallen = strlen(val);
len += vallen;
}
+ INTOFF;
nameeq = ckmalloc(len);
memcpy(nameeq, name, namelen);
nameeq[namelen] = '=';
@@ -257,6 +258,7 @@ setvar(const char *name, const char *val
else
nameeq[namelen + 1] = '\0';
setvareq(nameeq, flags);
+ INTON;
}
static int
@@ -289,6 +291,7 @@ change_env(const char *s, int set)
char *eqp;
char *ss;
+ INTOFF;
ss = savestr(s);
if ((eqp = strchr(ss, '=')) != NULL)
*eqp = '\0';
@@ -297,6 +300,7 @@ change_env(const char *s, int set)
else
(void) unsetenv(ss);
ckfree(ss);
+ INTON;
return;
}
@@ -321,10 +325,16 @@ setvareq(char *s, int flags)
mklocal(s);
vp = find_var(s, &vpp, &nlen);
if (vp != NULL) {
- if (vp->flags & VREADONLY)
+ if (vp->flags & VREADONLY) {
+ if ((flags & (VTEXTFIXED|VSTACK)) == 0)
+ ckfree(s);
error("%.*s: is read only", vp->name_len, s);
- if (flags & VNOSET)
+ }
+ if (flags & VNOSET) {
+ if ((flags & (VTEXTFIXED|VSTACK)) == 0)
+ ckfree(s);
return;
+ }
INTOFF;
if (vp->func && (flags & VNOFUNC) == 0)
@@ -357,15 +367,18 @@ setvareq(char *s, int flags)
return;
}
/* not found */
- if (flags & VNOSET)
+ if (flags & VNOSET) {
+ if ((flags & (VTEXTFIXED|VSTACK)) == 0)
+ ckfree(s);
return;
+ }
+ INTOFF;
vp = ckmalloc(sizeof (*vp));
vp->flags = flags;
vp->text = s;
vp->name_len = nlen;
vp->next = *vpp;
vp->func = NULL;
- INTOFF;
*vpp = vp;
if ((vp->flags & VEXPORT) && localevar(s)) {
change_env(s, 1);
@@ -773,6 +786,7 @@ poplocalvars(void)
struct localvar *lvp;
struct var *vp;
+ INTOFF;
while ((lvp = localvars) != NULL) {
localvars = lvp->next;
vp = lvp->vp;
@@ -790,6 +804,7 @@ poplocalvars(void)
}
ckfree(lvp);
}
+ INTON;
}
@@ -828,18 +843,21 @@ unsetcmd(int argc __unused, char **argv
if (flg_func == 0 && flg_var == 0)
flg_var = 1;
+ INTOFF;
for (ap = argptr; *ap ; ap++) {
if (flg_func)
ret |= unsetfunc(*ap);
if (flg_var)
ret |= unsetvar(*ap);
}
+ INTON;
return ret;
}
/*
* Unset the specified variable.
+ * Called with interrupts off.
*/
int
@@ -853,7 +871,6 @@ unsetvar(const char *s)
return (0);
if (vp->flags & VREADONLY)
return (1);
- INTOFF;
if (vp->text[vp->name_len + 1] != '\0')
setvar(s, nullstr, 0);
if ((vp->flags & VEXPORT) && localevar(vp->text)) {
@@ -869,7 +886,6 @@ unsetvar(const char *s)
*vpp = vp->next;
ckfree(vp);
}
- INTON;
return (0);
}
Modified: projects/random_number_generator/cddl/contrib/opensolaris/cmd/zpool/zpool.8
==============================================================================
--- projects/random_number_generator/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Sat Mar 29 09:05:25 2014 (r263908)
+++ projects/random_number_generator/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Sat Mar 29 09:27:08 2014 (r263909)
@@ -1,5 +1,6 @@
'\" te
.\" Copyright (c) 2012, Martin Matuska <mm at FreeBSD.org>.
+.\" Copyright (c) 2013-2014, Xin Li <delphij at FreeBSD.org>.
.\" All Rights Reserved.
.\"
.\" The contents of this file are subject to the terms of the
@@ -25,7 +26,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd March 20, 2014
+.Dd March 28, 2014
.Dt ZPOOL 8
.Os
.Sh NAME
@@ -70,6 +71,8 @@
.Ar pool ...
.Nm
.Cm get
+.Op Fl Hp
+.Op Fl o Ar field Ns Op , Ns Ar ...
.Ar all | property Ns Op , Ns Ar ...
.Ar pool ...
.Nm
@@ -120,7 +123,7 @@
.Ar device
.Nm
.Cm list
-.Op Fl H
+.Op Fl Hpv
.Op Fl o Ar property Ns Op , Ns Ar ...
.Op Fl T Cm d Ns | Ns Cm u
.Op Ar pool
@@ -1018,6 +1021,8 @@ is currently being used. This may lead t
.It Xo
.Nm
.Cm get
+.Op Fl Hp
+.Op Fl o Ar field Ns Op , Ns Ar ...
.Ar all | property Ns Op , Ns Ar ...
.Ar pool ...
.Xc
@@ -1036,6 +1041,19 @@ the following fields:
See the
.Qq Sx Properties
section for more information on the available pool properties.
+.Pp
+.It Fl H
+Scripted mode. Do not display headers, and separate fields by a single tab
+instead of arbitrary space.
+.It Fl p
+Display numbers in parsable (exact) values.
+.It Fl o Ar field
+A comma-separated list of columns to display.
+.Sy name Ns , Ns
+.Sy property Ns , Ns
+.Sy value Ns , Ns
+.Sy source
+is the default value.
.It Xo
.Nm
.Cm history
@@ -1335,7 +1353,7 @@ Treat exported or foreign devices as ina
.It Xo
.Nm
.Cm list
-.Op Fl Hv
+.Op Fl Hpv
.Op Fl o Ar property Ns Op , Ns Ar ...
.Op Fl T Cm d Ns | Ns Cm u
.Op Ar pool
@@ -1371,6 +1389,8 @@ for unixtime
.It Fl H
Scripted mode. Do not display headers, and separate fields by a single tab
instead of arbitrary space.
+.It Fl p
+Display numbers in parsable (exact) values.
.It Fl v
Show more detailed information.
.It Fl o Ar property Ns Op , Ns Ar ...
Modified: projects/random_number_generator/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- projects/random_number_generator/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Sat Mar 29 09:05:25 2014 (r263908)
+++ projects/random_number_generator/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Sat Mar 29 09:27:08 2014 (r263909)
@@ -236,7 +236,7 @@ get_usage(zpool_help_t idx) {
case HELP_LABELCLEAR:
return (gettext("\tlabelclear [-f] <vdev>\n"));
case HELP_LIST:
- return (gettext("\tlist [-Hv] [-o property[,...]] "
+ return (gettext("\tlist [-Hpv] [-o property[,...]] "
"[-T d|u] [pool] ... [interval [count]]\n"));
case HELP_OFFLINE:
return (gettext("\toffline [-t] <pool> <device> ...\n"));
@@ -258,8 +258,8 @@ get_usage(zpool_help_t idx) {
return (gettext("\tupgrade [-v]\n"
"\tupgrade [-V version] <-a | pool ...>\n"));
case HELP_GET:
- return (gettext("\tget <\"all\" | property[,...]> "
- "<pool> ...\n"));
+ return (gettext("\tget [-Hp] [-o \"all\" | field[,...]] "
+ "<\"all\" | property[,...]> <pool> ...\n"));
case HELP_SET:
return (gettext("\tset <property=value> <pool> \n"));
case HELP_SPLIT:
@@ -2765,6 +2765,7 @@ typedef struct list_cbdata {
int cb_namewidth;
boolean_t cb_scripted;
zprop_list_t *cb_proplist;
+ boolean_t cb_literal;
} list_cbdata_t;
/*
@@ -2860,7 +2861,7 @@ print_pool(zpool_handle_t *zhp, list_cbd
zpool_get_prop_int(zhp, pl->pl_prop, NULL) == 0)
propstr = "-";
else if (zpool_get_prop(zhp, pl->pl_prop, property,
- sizeof (property), NULL) != 0)
+ sizeof (property), NULL, cb->cb_literal) != 0)
propstr = "-";
else
propstr = property;
@@ -3011,12 +3012,13 @@ list_callback(zpool_handle_t *zhp, void
}
/*
- * zpool list [-H] [-o prop[,prop]*] [-T d|u] [pool] ... [interval [count]]
+ * zpool list [-Hp] [-o prop[,prop]*] [-T d|u] [pool] ... [interval [count]]
*
* -H Scripted mode. Don't display headers, and separate properties
* by a single tab.
* -o List of properties to display. Defaults to
* "name,size,allocated,free,capacity,health,altroot"
+ * -p Diplay values in parsable (exact) format.
* -T Display a timestamp in date(1) or Unix format
*
* List all pools in the system, whether or not they're healthy. Output space
@@ -3037,7 +3039,7 @@ zpool_do_list(int argc, char **argv)
boolean_t first = B_TRUE;
/* check options */
- while ((c = getopt(argc, argv, ":Ho:T:v")) != -1) {
+ while ((c = getopt(argc, argv, ":Ho:pT:v")) != -1) {
switch (c) {
case 'H':
cb.cb_scripted = B_TRUE;
@@ -3045,6 +3047,9 @@ zpool_do_list(int argc, char **argv)
case 'o':
props = optarg;
break;
+ case 'p':
+ cb.cb_literal = B_TRUE;
+ break;
case 'T':
get_timestamp_arg(*optarg);
break;
@@ -5199,7 +5204,7 @@ get_callback(zpool_handle_t *zhp, void *
}
} else {
if (zpool_get_prop(zhp, pl->pl_prop, value,
- sizeof (value), &srctype) != 0)
+ sizeof (value), &srctype, cbp->cb_literal) != 0)
continue;
zprop_print_one_property(zpool_get_name(zhp), cbp,
@@ -5210,20 +5215,32 @@ get_callback(zpool_handle_t *zhp, void *
return (0);
}
+/*
+ * zpool get [-Hp] [-o "all" | field[,...]] <"all" | property[,...]> <pool> ...
+ *
+ * -H Scripted mode. Don't display headers, and separate properties
+ * by a single tab.
+ * -o List of columns to display. Defaults to
+ * "name,property,value,source".
+ * -p Diplay values in parsable (exact) format.
+ *
+ * Get properties of pools in the system. Output space statistics
+ * for each one as well as other attributes.
+ */
int
zpool_do_get(int argc, char **argv)
{
zprop_get_cbdata_t cb = { 0 };
zprop_list_t fake_name = { 0 };
int ret;
-
- if (argc < 2) {
- (void) fprintf(stderr, gettext("missing property "
- "argument\n"));
- usage(B_FALSE);
- }
+ int c, i;
+ char *value;
cb.cb_first = B_TRUE;
+
+ /*
+ * Set up default columns and sources.
+ */
cb.cb_sources = ZPROP_SRC_ALL;
cb.cb_columns[0] = GET_COL_NAME;
cb.cb_columns[1] = GET_COL_PROPERTY;
@@ -5231,10 +5248,89 @@ zpool_do_get(int argc, char **argv)
cb.cb_columns[3] = GET_COL_SOURCE;
cb.cb_type = ZFS_TYPE_POOL;
- if (zprop_get_list(g_zfs, argv[1], &cb.cb_proplist,
+ /* check options */
+ while ((c = getopt(argc, argv, ":Hpo:")) != -1) {
+ switch (c) {
+ case 'p':
+ cb.cb_literal = B_TRUE;
+ break;
+ case 'H':
+ cb.cb_scripted = B_TRUE;
+ break;
+ case 'o':
+ bzero(&cb.cb_columns, sizeof (cb.cb_columns));
+ i = 0;
+ while (*optarg != '\0') {
+ static char *col_subopts[] =
+ { "name", "property", "value", "source",
+ "all", NULL };
+
+ if (i == ZFS_GET_NCOLS) {
+ (void) fprintf(stderr, gettext("too "
+ "many fields given to -o "
+ "option\n"));
+ usage(B_FALSE);
+ }
+
+ switch (getsubopt(&optarg, col_subopts,
+ &value)) {
+ case 0:
+ cb.cb_columns[i++] = GET_COL_NAME;
+ break;
+ case 1:
+ cb.cb_columns[i++] = GET_COL_PROPERTY;
+ break;
+ case 2:
+ cb.cb_columns[i++] = GET_COL_VALUE;
+ break;
+ case 3:
+ cb.cb_columns[i++] = GET_COL_SOURCE;
+ break;
+ case 4:
+ if (i > 0) {
+ (void) fprintf(stderr,
+ gettext("\"all\" conflicts "
+ "with specific fields "
+ "given to -o option\n"));
+ usage(B_FALSE);
+ }
+ cb.cb_columns[0] = GET_COL_NAME;
+ cb.cb_columns[1] = GET_COL_PROPERTY;
+ cb.cb_columns[2] = GET_COL_VALUE;
+ cb.cb_columns[3] = GET_COL_SOURCE;
+ i = ZFS_GET_NCOLS;
+ break;
+ default:
+ (void) fprintf(stderr,
+ gettext("invalid column name "
+ "'%s'\n"), value);
+ usage(B_FALSE);
+ }
+ }
+ break;
+ case '?':
+ (void) fprintf(stderr, gettext("invalid option '%c'\n"),
+ optopt);
+ usage(B_FALSE);
+ }
+ }
+
+ argc -= optind;
+ argv += optind;
+
+ if (argc < 1) {
+ (void) fprintf(stderr, gettext("missing property "
+ "argument\n"));
+ usage(B_FALSE);
+ }
+
+ if (zprop_get_list(g_zfs, argv[0], &cb.cb_proplist,
ZFS_TYPE_POOL) != 0)
usage(B_FALSE);
+ argc--;
+ argv++;
+
if (cb.cb_proplist != NULL) {
fake_name.pl_prop = ZPOOL_PROP_NAME;
fake_name.pl_width = strlen(gettext("NAME"));
@@ -5242,7 +5338,7 @@ zpool_do_get(int argc, char **argv)
cb.cb_proplist = &fake_name;
}
- ret = for_each_pool(argc - 2, argv + 2, B_TRUE, &cb.cb_proplist,
+ ret = for_each_pool(argc, argv, B_TRUE, &cb.cb_proplist,
get_callback, &cb);
if (cb.cb_proplist == &fake_name)
Modified: projects/random_number_generator/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
==============================================================================
--- projects/random_number_generator/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Sat Mar 29 09:05:25 2014 (r263908)
+++ projects/random_number_generator/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Sat Mar 29 09:27:08 2014 (r263909)
@@ -270,7 +270,7 @@ extern int zpool_label_disk(libzfs_handl
*/
extern int zpool_set_prop(zpool_handle_t *, const char *, const char *);
extern int zpool_get_prop(zpool_handle_t *, zpool_prop_t, char *,
- size_t proplen, zprop_source_t *);
+ size_t proplen, zprop_source_t *, boolean_t);
extern uint64_t zpool_get_prop_int(zpool_handle_t *, zpool_prop_t,
zprop_source_t *);
Modified: projects/random_number_generator/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- projects/random_number_generator/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Sat Mar 29 09:05:25 2014 (r263908)
+++ projects/random_number_generator/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Sat Mar 29 09:27:08 2014 (r263909)
@@ -2237,8 +2237,8 @@ zfs_prop_get(zfs_handle_t *zhp, zfs_prop
}
if ((zpool_get_prop(zhp->zpool_hdl,
- ZPOOL_PROP_ALTROOT, buf, MAXPATHLEN, NULL)) ||
- (strcmp(root, "-") == 0))
+ ZPOOL_PROP_ALTROOT, buf, MAXPATHLEN, NULL,
+ B_FALSE)) || (strcmp(root, "-") == 0))
root[0] = '\0';
/*
* Special case an alternate root of '/'. This will
Modified: projects/random_number_generator/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
==============================================================================
--- projects/random_number_generator/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Sat Mar 29 09:05:25 2014 (r263908)
+++ projects/random_number_generator/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Sat Mar 29 09:27:08 2014 (r263909)
@@ -240,7 +240,7 @@ zpool_pool_state_to_name(pool_state_t st
*/
int
zpool_get_prop(zpool_handle_t *zhp, zpool_prop_t prop, char *buf, size_t len,
- zprop_source_t *srctype)
+ zprop_source_t *srctype, boolean_t literal)
{
uint64_t intval;
const char *strval;
@@ -272,9 +272,7 @@ zpool_get_prop(zpool_handle_t *zhp, zpoo
(void) strlcpy(buf,
zpool_get_prop_string(zhp, prop, &src),
len);
- if (srctype != NULL)
- *srctype = src;
- return (0);
+ break;
}
/* FALLTHROUGH */
default:
@@ -306,12 +304,22 @@ zpool_get_prop(zpool_handle_t *zhp, zpoo
case ZPOOL_PROP_FREE:
case ZPOOL_PROP_FREEING:
case ZPOOL_PROP_EXPANDSZ:
- (void) zfs_nicenum(intval, buf, len);
+ if (literal) {
+ (void) snprintf(buf, len, "%llu",
+ (u_longlong_t)intval);
+ } else {
+ (void) zfs_nicenum(intval, buf, len);
+ }
break;
case ZPOOL_PROP_CAPACITY:
- (void) snprintf(buf, len, "%llu%%",
- (u_longlong_t)intval);
+ if (literal) {
+ (void) snprintf(buf, len, "%llu",
+ (u_longlong_t)intval);
+ } else {
+ (void) snprintf(buf, len, "%llu%%",
+ (u_longlong_t)intval);
+ }
break;
case ZPOOL_PROP_DEDUPRATIO:
@@ -407,7 +415,7 @@ zpool_is_bootable(zpool_handle_t *zhp)
char bootfs[ZPOOL_MAXNAMELEN];
return (zpool_get_prop(zhp, ZPOOL_PROP_BOOTFS, bootfs,
- sizeof (bootfs), NULL) == 0 && strncmp(bootfs, "-",
+ sizeof (bootfs), NULL, B_FALSE) == 0 && strncmp(bootfs, "-",
sizeof (bootfs)) != 0);
}
@@ -806,7 +814,7 @@ zpool_expand_proplist(zpool_handle_t *zh
if (entry->pl_prop != ZPROP_INVAL &&
zpool_get_prop(zhp, entry->pl_prop, buf, sizeof (buf),
- NULL) == 0) {
+ NULL, B_FALSE) == 0) {
if (strlen(buf) > entry->pl_width)
entry->pl_width = strlen(buf);
}
Modified: projects/random_number_generator/contrib/gcclibs/libcpp/files.c
==============================================================================
--- projects/random_number_generator/contrib/gcclibs/libcpp/files.c Sat Mar 29 09:05:25 2014 (r263908)
+++ projects/random_number_generator/contrib/gcclibs/libcpp/files.c Sat Mar 29 09:27:08 2014 (r263909)
@@ -546,6 +546,7 @@ static bool
read_file_guts (cpp_reader *pfile, _cpp_file *file)
{
ssize_t size, total, count;
+ off_t offset;
uchar *buf;
bool regular;
@@ -573,6 +574,21 @@ read_file_guts (cpp_reader *pfile, _cpp_
}
size = file->st.st_size;
+
+ if ((offset = lseek(file->fd, 0, SEEK_CUR)) < 0)
+ {
+ cpp_error (pfile, CPP_DL_ERROR, "%s has no current position",
+ file->path);
+ return false;
+ }
+ else if (offset > INTTYPE_MAXIMUM (ssize_t) || (ssize_t)offset > size)
+ {
+ cpp_error (pfile, CPP_DL_ERROR, "current position of %s is too large",
+ file->path);
+ return false;
+ }
+
+ size -= (ssize_t)offset;
}
else
/* 8 kilobytes is a sensible starting size. It ought to be bigger
Modified: projects/random_number_generator/contrib/libstdc++/include/bits/cpp_type_traits.h
==============================================================================
--- projects/random_number_generator/contrib/libstdc++/include/bits/cpp_type_traits.h Sat Mar 29 09:05:25 2014 (r263908)
+++ projects/random_number_generator/contrib/libstdc++/include/bits/cpp_type_traits.h Sat Mar 29 09:27:08 2014 (r263909)
@@ -80,6 +80,13 @@ _GLIBCXX_END_NAMESPACE
_GLIBCXX_BEGIN_NAMESPACE(std)
+#ifdef __clang__
+// When using clang, suppress warnings about possible keywords (such as
+// __is_void, __is_pod, etc) being used as identifiers.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wkeyword-compat"
+#endif
+
namespace __detail
{
// NB: g++ can not compile these if declared within the class
@@ -398,6 +405,10 @@ namespace __detail
};
#endif
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
_GLIBCXX_END_NAMESPACE
#endif //_CPP_TYPE_TRAITS_H
Copied: projects/random_number_generator/contrib/llvm/patches/patch-r263891-dwarf2-freebsd10.diff (from r263908, head/contrib/llvm/patches/patch-r263891-dwarf2-freebsd10.diff)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/random_number_generator/contrib/llvm/patches/patch-r263891-dwarf2-freebsd10.diff Sat Mar 29 09:27:08 2014 (r263909, copy of r263908, head/contrib/llvm/patches/patch-r263891-dwarf2-freebsd10.diff)
@@ -0,0 +1,22 @@
+This patch makes clang default to DWARF2 debug info format for FreeBSD
+10.x and earlier.
+
+Introduced here: http://svnweb.freebsd.org/changeset/base/263891
+
+Index: tools/clang/lib/Driver/Tools.cpp
+===================================================================
+--- tools/clang/lib/Driver/Tools.cpp
++++ tools/clang/lib/Driver/Tools.cpp
+@@ -2628,8 +2628,10 @@ void Clang::ConstructJob(Compilation &C, const Job
+ CmdArgs.push_back("-gdwarf-4");
+ else if (!A->getOption().matches(options::OPT_g0) &&
+ !A->getOption().matches(options::OPT_ggdb0)) {
+- // Default is dwarf-2 for darwin.
+- if (getToolChain().getTriple().isOSDarwin())
++ // Default is dwarf-2 for darwin and FreeBSD <= 10.
++ const llvm::Triple &Triple = getToolChain().getTriple();
++ if (Triple.isOSDarwin() || (Triple.getOS() == llvm::Triple::FreeBSD &&
++ Triple.getOSMajorVersion() <= 10))
+ CmdArgs.push_back("-gdwarf-2");
+ else
+ CmdArgs.push_back("-g");
Modified: projects/random_number_generator/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
==============================================================================
--- projects/random_number_generator/contrib/llvm/tools/clang/lib/Driver/Tools.cpp Sat Mar 29 09:05:25 2014 (r263908)
+++ projects/random_number_generator/contrib/llvm/tools/clang/lib/Driver/Tools.cpp Sat Mar 29 09:27:08 2014 (r263909)
@@ -2635,8 +2635,10 @@ void Clang::ConstructJob(Compilation &C,
CmdArgs.push_back("-gdwarf-4");
else if (!A->getOption().matches(options::OPT_g0) &&
!A->getOption().matches(options::OPT_ggdb0)) {
- // Default is dwarf-2 for darwin.
- if (getToolChain().getTriple().isOSDarwin())
+ // Default is dwarf-2 for darwin and FreeBSD <= 10.
+ const llvm::Triple &Triple = getToolChain().getTriple();
+ if (Triple.isOSDarwin() || (Triple.getOS() == llvm::Triple::FreeBSD &&
+ Triple.getOSMajorVersion() <= 10))
CmdArgs.push_back("-gdwarf-2");
else
CmdArgs.push_back("-g");
Modified: projects/random_number_generator/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp
==============================================================================
--- projects/random_number_generator/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp Sat Mar 29 09:05:25 2014 (r263908)
+++ projects/random_number_generator/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp Sat Mar 29 09:27:08 2014 (r263909)
@@ -335,11 +335,9 @@ ProcessPOSIX::DoDestroy()
if (!HasExited())
{
- // Drive the exit event to completion (do not keep the inferior in
- // limbo).
+ assert (m_monitor);
m_exit_now = true;
-
- if ((m_monitor == NULL || kill(m_monitor->GetPID(), SIGKILL)) && error.Success())
+ if (m_monitor->BringProcessIntoLimbo())
{
error.SetErrorToErrno();
return error;
Modified: projects/random_number_generator/contrib/tzdata/africa
==============================================================================
--- projects/random_number_generator/contrib/tzdata/africa Sat Mar 29 09:05:25 2014 (r263908)
+++ projects/random_number_generator/contrib/tzdata/africa Sat Mar 29 09:27:08 2014 (r263909)
@@ -868,7 +868,10 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J
# Another source (specifying the time for start and end in the decree):
# http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html
-# From Paul Eggert (2013-10-03):
+# From Sebastien Willemijns (2014-03-18):
+# http://www.afriquinfos.com/articles/2014/3/18/maroc-heure-dete-avancez-tous-horloges-247891.asp
+
+# From Paul Eggert (2014-03-19):
# To estimate what the Moroccan government will do in future years,
# transition dates for 2014 through 2038 were determined by running
# the following program under GNU Emacs 24.3:
Modified: projects/random_number_generator/contrib/tzdata/antarctica
==============================================================================
--- projects/random_number_generator/contrib/tzdata/antarctica Sat Mar 29 09:05:25 2014 (r263908)
+++ projects/random_number_generator/contrib/tzdata/antarctica Sat Mar 29 09:27:08 2014 (r263909)
@@ -230,24 +230,41 @@ Zone Antarctica/Syowa 0 - zzz 1957 Jan 2
# year-round base
# Scott Base, Ross Island, since 1957-01.
# See Pacific/Auckland.
-#
-# These rules for New Zealand are stolen from the 'australasia' file.
-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule NZAQ 1974 only - Nov 3 2:00s 1:00 D
-Rule NZAQ 1975 1988 - Oct lastSun 2:00s 1:00 D
-Rule NZAQ 1989 only - Oct 8 2:00s 1:00 D
-Rule NZAQ 1990 2006 - Oct Sun>=1 2:00s 1:00 D
-Rule NZAQ 1975 only - Feb 23 2:00s 0 S
-Rule NZAQ 1976 1989 - Mar Sun>=1 2:00s 0 S
-Rule NZAQ 1990 2007 - Mar Sun>=15 2:00s 0 S
-Rule NZAQ 2007 max - Sep lastSun 2:00s 1:00 D
-Rule NZAQ 2008 max - Apr Sun>=1 2:00s 0 S
# Norway - territories
# Bouvet (never inhabited)
#
# claims
# Peter I Island (never inhabited)
+#
+# year-round base
+# Troll, Queen Maud Land, -720041+0023206, since 2005-02-12
+#
+# From Paul-Inge Flakstad (2014-03-10):
+# I recently had a long dialog about this with the developer of timegenie.com.
+# In the absence of specific dates, he decided to choose some likely ones:
+# GMT +1 - From March 1 to the last Sunday in March
+# GMT +2 - From the last Sunday in March until the last Sunday in October
+# GMT +1 - From the last Sunday in October until November 7
+# GMT +0 - From November 7 until March 1
+# The dates for switching to and from UTC+0 will probably not be absolutely
+# correct, but they should be quite close to the actual dates.
+#
+# From Paul Eggert (2014-03-21):
+# The CET-switching Troll rules require zic from tzcode 2014b or later, so as
+# suggested by Bengt-Inge Larsson comment them out for now, and approximate
+# with only UTC and CEST. Uncomment them when 2014b is more prevalent.
+#
+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+#Rule Troll 2005 max - Mar 1 1:00u 1:00 CET
+Rule Troll 2005 max - Mar lastSun 1:00u 2:00 CEST
+#Rule Troll 2005 max - Oct lastSun 1:00u 1:00 CET
+#Rule Troll 2004 max - Nov 7 1:00u 0:00 UTC
+# Remove the following line when uncommenting the above '#Rule' lines.
+Rule Troll 2004 max - Oct lastSun 1:00u 0:00 UTC
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Antarctica/Troll 0 - zzz 2005 Feb 12
+ 0:00 Troll %s
# Poland - year-round base
# Arctowski, King George Island, -620945-0582745, since 1977
Modified: projects/random_number_generator/contrib/tzdata/australasia
==============================================================================
--- projects/random_number_generator/contrib/tzdata/australasia Sat Mar 29 09:05:25 2014 (r263908)
+++ projects/random_number_generator/contrib/tzdata/australasia Sat Mar 29 09:27:08 2014 (r263909)
@@ -763,14 +763,29 @@ Zone Pacific/Funafuti 11:56:52 - LMT 190
# Johnston
#
-# From Paul Eggert (2013-09-03):
+# From Paul Eggert (2014-03-11):
+# Sometimes Johnston kept Hawaii time, and sometimes it was an hour behind.
+# Details are uncertain. We have no data for Johnston after 1970, so
+# treat it like Hawaii for now.
+#
# In his memoirs of June 6th to October 4, 1945
# <http://www.315bw.org/Herb_Bach.htm> (2005), Herbert C. Bach writes,
# "We started our letdown to Kwajalein Atoll and landed there at 5:00 AM
# Johnston time, 1:30 AM Kwajalein time." This was in June 1945, and
# confirms that Johnston kept the same time as Honolulu in summer 1945.
-# We have no better information, so for now, assume this has been true
-# indefinitely into the past.
+#
+# From Lyle McElhaney (2014-03-11):
+# [W]hen JI was being used for that [atomic bomb] testing, the time being used
+# was not Hawaiian time but rather the same time being used on the ships,
+# which had a GMT offset of -11 hours. This apparently applied to at least the
+# time from Operation Newsreel (Hardtack I/Teak shot, 1958-08-01) to the last
+# Operation Fishbowl shot (Tightrope, 1962-11-04).... [See] Herman Hoerlin,
+# "The United States High-Altitude Test Experience: A Review Emphasizing the
+# Impact on the Environment", Los Alamos LA-6405, Oct 1976
+# <http://www.fas.org/sgp/othergov/doe/lanl/docs1/00322994.pdf>.
+# See the table on page 4 where he lists GMT and local times for the tests; a
+# footnote for the JI tests reads that local time is "JI time = Hawaii Time
+# Minus One Hour".
#
# See 'northamerica' for Pacific/Johnston.
Modified: projects/random_number_generator/contrib/tzdata/europe
==============================================================================
--- projects/random_number_generator/contrib/tzdata/europe Sat Mar 29 09:05:25 2014 (r263908)
+++ projects/random_number_generator/contrib/tzdata/europe Sat Mar 29 09:27:08 2014 (r263909)
@@ -2963,7 +2963,11 @@ Zone Europe/Simferopol 2:16:24 - LMT 188
# Assume it happened in March by not changing the clocks.
3:00 Russia MSK/MSD 1997
3:00 - MSK 1997 Mar lastSun 1:00u
- 2:00 EU EE%sT
+# From Alexander Krivenyshev (2014-03-17):
+# time change at 2:00 (2am) on March 30, 2014
+# http://vz.ru/news/2014/3/17/677464.html
+ 2:00 EU EE%sT 2014 Mar 30 2:00
+ 4:00 - MSK
# Vatican City
# See Europe/Rome.
Modified: projects/random_number_generator/contrib/tzdata/zone.tab
==============================================================================
--- projects/random_number_generator/contrib/tzdata/zone.tab Sat Mar 29 09:05:25 2014 (r263908)
+++ projects/random_number_generator/contrib/tzdata/zone.tab Sat Mar 29 09:27:08 2014 (r263909)
@@ -52,6 +52,7 @@ AQ -6617+11031 Antarctica/Casey Casey St
AQ -7824+10654 Antarctica/Vostok Vostok Station, Lake Vostok
AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Terre Adelie
AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I
+AQ -720041+0023206 Antarctica/Troll Troll Station, Queen Maud Land
AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF)
AR -3124-06411 America/Argentina/Cordoba most locations (CB, CC, CN, ER, FM, MN, SE, SF)
AR -2447-06525 America/Argentina/Salta (SA, LP, NQ, RN)
@@ -344,6 +345,7 @@ RU +5443+02030 Europe/Kaliningrad Moscow
RU +5545+03735 Europe/Moscow Moscow+00 - west Russia
RU +4844+04425 Europe/Volgograd Moscow+00 - Caspian Sea
RU +5312+05009 Europe/Samara Moscow+00 - Samara, Udmurtia
+RU +4457+03406 Europe/Simferopol Moscow+00 - Crimea
RU +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals
RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia
RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk
@@ -399,7 +401,6 @@ TZ -0648+03917 Africa/Dar_es_Salaam
UA +5026+03031 Europe/Kiev most locations
UA +4837+02218 Europe/Uzhgorod Ruthenia
UA +4750+03510 Europe/Zaporozhye Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk
-UA +4457+03406 Europe/Simferopol central Crimea
UG +0019+03225 Africa/Kampala
UM +1645-16931 Pacific/Johnston Johnston Atoll
UM +2813-17722 Pacific/Midway Midway Islands
Modified: projects/random_number_generator/crypto/openssh/ChangeLog
==============================================================================
--- projects/random_number_generator/crypto/openssh/ChangeLog Sat Mar 29 09:05:25 2014 (r263908)
+++ projects/random_number_generator/crypto/openssh/ChangeLog Sat Mar 29 09:27:08 2014 (r263909)
@@ -1,3 +1,224 @@
+20140313
+ - (djm) Release OpenSSH 6.6
+
+20140304
+ - OpenBSD CVS Sync
+ - djm at cvs.openbsd.org 2014/03/03 22:22:30
+ [session.c]
+ ignore enviornment variables with embedded '=' or '\0' characters;
+ spotted by Jann Horn; ok deraadt@
+
+20140301
+ - (djm) [regress/Makefile] Disable dhgex regress test; it breaks when
+ no moduli file exists at the expected location.
+
+20140228
+ - OpenBSD CVS Sync
+ - djm at cvs.openbsd.org 2014/02/27 00:41:49
+ [bufbn.c]
+ fix unsigned overflow that could lead to reading a short ssh protocol
+ 1 bignum value; found by Ben Hawkes; ok deraadt@
+ - djm at cvs.openbsd.org 2014/02/27 08:25:09
+ [bufbn.c]
+ off by one in range check
+ - djm at cvs.openbsd.org 2014/02/27 22:47:07
+ [sshd_config.5]
+ bz#2184 clarify behaviour of a keyword that appears in multiple
+ matching Match blocks; ok dtucker@
+ - djm at cvs.openbsd.org 2014/02/27 22:57:40
+ [version.h]
+ openssh-6.6
+ - dtucker at cvs.openbsd.org 2014/01/19 23:43:02
+ [regress/sftp-chroot.sh]
+ Don't use -q on sftp as it suppresses logging, instead redirect the
+ output to the regress logfile.
+ - dtucker at cvs.openbsd.org 2014/01/20 00:00:30
+ [sregress/ftp-chroot.sh]
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list