svn commit: r258007 - in projects/pf/head: . bin/pkill bin/sh cddl/contrib/opensolaris/common/ctf cddl/contrib/opensolaris/lib/libdtrace/common cddl/contrib/opensolaris/lib/libnvpair cddl/lib/libnv...

Gleb Smirnoff glebius at FreeBSD.org
Mon Nov 11 20:33:33 UTC 2013


Author: glebius
Date: Mon Nov 11 20:33:25 2013
New Revision: 258007
URL: http://svnweb.freebsd.org/changeset/base/258007

Log:
  Merge head r232040 through r258006.

Added:
  projects/pf/head/contrib/tzdata/leap-seconds.list
     - copied unchanged from r258006, head/contrib/tzdata/leap-seconds.list
  projects/pf/head/lib/atf/libatf-c++/Makefile.inc
     - copied unchanged from r258006, head/lib/atf/libatf-c++/Makefile.inc
  projects/pf/head/lib/atf/libatf-c++/tests/
     - copied from r258006, head/lib/atf/libatf-c++/tests/
  projects/pf/head/lib/atf/libatf-c/Makefile.inc
     - copied unchanged from r258006, head/lib/atf/libatf-c/Makefile.inc
  projects/pf/head/lib/atf/libatf-c/tests/
     - copied from r258006, head/lib/atf/libatf-c/tests/
  projects/pf/head/lib/atf/tests/
     - copied from r258006, head/lib/atf/tests/
  projects/pf/head/lib/libc/capability/cap_rights_init.3
     - copied unchanged from r258006, head/lib/libc/capability/cap_rights_init.3
  projects/pf/head/lib/libc/gen/cap_rights_get.3
     - copied unchanged from r258006, head/lib/libc/gen/cap_rights_get.3
  projects/pf/head/lib/tests/
     - copied from r258006, head/lib/tests/
  projects/pf/head/libexec/atf/atf-check/Makefile.inc
     - copied unchanged from r258006, head/libexec/atf/atf-check/Makefile.inc
  projects/pf/head/libexec/atf/atf-check/tests/
     - copied from r258006, head/libexec/atf/atf-check/tests/
  projects/pf/head/libexec/atf/tests/
     - copied from r258006, head/libexec/atf/tests/
  projects/pf/head/libexec/tests/
     - copied from r258006, head/libexec/tests/
  projects/pf/head/share/examples/libusb20/util.c
     - copied unchanged from r258006, head/share/examples/libusb20/util.c
  projects/pf/head/share/examples/libusb20/util.h
     - copied unchanged from r258006, head/share/examples/libusb20/util.h
  projects/pf/head/share/man/man4/rights.4
     - copied unchanged from r258006, head/share/man/man4/rights.4
  projects/pf/head/sys/arm/arm/bus_space-v6.c
     - copied unchanged from r258006, head/sys/arm/arm/bus_space-v6.c
  projects/pf/head/sys/arm/arm/devmap.c
     - copied unchanged from r258006, head/sys/arm/arm/devmap.c
  projects/pf/head/sys/arm/conf/WANDBOARD-DUAL
     - copied unchanged from r258006, head/sys/arm/conf/WANDBOARD-DUAL
  projects/pf/head/sys/arm/conf/WANDBOARD-QUAD
     - copied unchanged from r258006, head/sys/arm/conf/WANDBOARD-QUAD
  projects/pf/head/sys/arm/conf/WANDBOARD-SOLO
     - copied unchanged from r258006, head/sys/arm/conf/WANDBOARD-SOLO
  projects/pf/head/sys/arm/conf/WANDBOARD.common
     - copied unchanged from r258006, head/sys/arm/conf/WANDBOARD.common
  projects/pf/head/sys/arm/freescale/imx/files.imx6
     - copied unchanged from r258006, head/sys/arm/freescale/imx/files.imx6
  projects/pf/head/sys/arm/freescale/imx/imx6_machdep.c
     - copied unchanged from r258006, head/sys/arm/freescale/imx/imx6_machdep.c
  projects/pf/head/sys/arm/freescale/imx/imx6_pl310.c
     - copied unchanged from r258006, head/sys/arm/freescale/imx/imx6_pl310.c
  projects/pf/head/sys/arm/freescale/imx/std.imx6
     - copied unchanged from r258006, head/sys/arm/freescale/imx/std.imx6
  projects/pf/head/sys/arm/include/devmap.h
     - copied unchanged from r258006, head/sys/arm/include/devmap.h
  projects/pf/head/sys/boot/fdt/dts/imx6.dtsi
     - copied unchanged from r258006, head/sys/boot/fdt/dts/imx6.dtsi
  projects/pf/head/sys/boot/fdt/dts/wandboard-dual.dts
     - copied unchanged from r258006, head/sys/boot/fdt/dts/wandboard-dual.dts
  projects/pf/head/sys/boot/fdt/dts/wandboard-quad.dts
     - copied unchanged from r258006, head/sys/boot/fdt/dts/wandboard-quad.dts
  projects/pf/head/sys/boot/fdt/dts/wandboard-solo.dts
     - copied unchanged from r258006, head/sys/boot/fdt/dts/wandboard-solo.dts
  projects/pf/head/sys/dev/netmap/netmap_mem2.h
     - copied unchanged from r258006, head/sys/dev/netmap/netmap_mem2.h
  projects/pf/head/sys/powerpc/mpc85xx/platform_mpc85xx.c
     - copied unchanged from r258006, head/sys/powerpc/mpc85xx/platform_mpc85xx.c
  projects/pf/head/sys/powerpc/powerpc/swtch32.S
     - copied unchanged from r258006, head/sys/powerpc/powerpc/swtch32.S
  projects/pf/head/sys/powerpc/powerpc/swtch64.S
     - copied unchanged from r258006, head/sys/powerpc/powerpc/swtch64.S
  projects/pf/head/sys/x86/iommu/intel_qi.c
     - copied unchanged from r258006, head/sys/x86/iommu/intel_qi.c
  projects/pf/head/tools/regression/bin/sh/builtins/command12.0
     - copied unchanged from r258006, head/tools/regression/bin/sh/builtins/command12.0
  projects/pf/head/tools/regression/bin/sh/parser/var-assign1.0
     - copied unchanged from r258006, head/tools/regression/bin/sh/parser/var-assign1.0
  projects/pf/head/usr.bin/atf/atf-sh/tests/
     - copied from r258006, head/usr.bin/atf/atf-sh/tests/
  projects/pf/head/usr.bin/atf/tests/
     - copied from r258006, head/usr.bin/atf/tests/
  projects/pf/head/usr.bin/tests/
     - copied from r258006, head/usr.bin/tests/
  projects/pf/head/usr.sbin/mfiutil/mfi_properties.c
     - copied unchanged from r258006, head/usr.sbin/mfiutil/mfi_properties.c
Deleted:
  projects/pf/head/etc/namedb/
  projects/pf/head/etc/periodic/daily/470.status-named
  projects/pf/head/etc/rc.d/named
  projects/pf/head/lib/libiconv_compat/
  projects/pf/head/release/doc/fr_FR.ISO8859-1/installation/common/abstract.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/installation/common/abstract.xml
  projects/pf/head/release/generate-release.sh
  projects/pf/head/share/examples/libusb20/aux.c
  projects/pf/head/share/examples/libusb20/aux.h
  projects/pf/head/sys/amd64/vmm/io/vdev.c
  projects/pf/head/sys/amd64/vmm/io/vdev.h
  projects/pf/head/sys/arm/allwinner/bus_space.c
  projects/pf/head/sys/arm/broadcom/bcm2835/bus_space.c
  projects/pf/head/sys/arm/freescale/imx/bus_space.c
  projects/pf/head/sys/arm/rockchip/bus_space.c
  projects/pf/head/sys/arm/ti/bus_space.c
  projects/pf/head/sys/powerpc/aim/swtch32.S
  projects/pf/head/sys/powerpc/aim/swtch64.S
  projects/pf/head/sys/powerpc/booke/swtch.S
Modified:
  projects/pf/head/MAINTAINERS   (contents, props changed)
  projects/pf/head/Makefile.inc1
  projects/pf/head/ObsoleteFiles.inc
  projects/pf/head/UPDATING
  projects/pf/head/bin/pkill/pkill.c
  projects/pf/head/bin/sh/exec.c
  projects/pf/head/bin/sh/nodetypes
  projects/pf/head/bin/sh/sh.1
  projects/pf/head/cddl/contrib/opensolaris/common/ctf/ctf_create.c
  projects/pf/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
  projects/pf/head/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c
  projects/pf/head/cddl/lib/libnvpair/Makefile
  projects/pf/head/contrib/binutils/binutils/readelf.c
  projects/pf/head/contrib/binutils/opcodes/i386-dis.c
  projects/pf/head/contrib/libpcap/bpf/net/bpf_filter.c
  projects/pf/head/contrib/libpcap/bpf_dump.c
  projects/pf/head/contrib/libpcap/bpf_image.c
  projects/pf/head/contrib/libpcap/pcap/bpf.h
  projects/pf/head/contrib/libpcap/pcap/pcap.h
  projects/pf/head/contrib/libreadline/display.c
  projects/pf/head/contrib/libreadline/input.c
  projects/pf/head/contrib/libreadline/search.c
  projects/pf/head/contrib/libreadline/support/shobj-conf
  projects/pf/head/contrib/llvm/include/llvm/Support/Dwarf.h
  projects/pf/head/contrib/llvm/include/llvm/Support/ELF.h
  projects/pf/head/contrib/llvm/lib/Support/Dwarf.cpp
  projects/pf/head/contrib/nvi/README
  projects/pf/head/contrib/nvi/common/main.c
  projects/pf/head/contrib/nvi/docs/USD.doc/vi.man/vi.1
  projects/pf/head/contrib/nvi/ex/ex_print.c
  projects/pf/head/contrib/nvi/ex/version.h
  projects/pf/head/contrib/nvi/vi/v_txt.c
  projects/pf/head/contrib/nvi/vi/vs_refresh.c
  projects/pf/head/contrib/smbfs/lib/smb/nls.c
  projects/pf/head/contrib/subversion/CHANGES
  projects/pf/head/contrib/subversion/INSTALL
  projects/pf/head/contrib/subversion/Makefile.in
  projects/pf/head/contrib/subversion/build-outputs.mk
  projects/pf/head/contrib/subversion/build.conf
  projects/pf/head/contrib/subversion/configure
  projects/pf/head/contrib/subversion/subversion/include/private/svn_client_private.h
  projects/pf/head/contrib/subversion/subversion/include/private/svn_subr_private.h
  projects/pf/head/contrib/subversion/subversion/include/svn_config.h
  projects/pf/head/contrib/subversion/subversion/include/svn_types.h
  projects/pf/head/contrib/subversion/subversion/include/svn_version.h
  projects/pf/head/contrib/subversion/subversion/libsvn_client/commit.c
  projects/pf/head/contrib/subversion/subversion/libsvn_client/merge.c
  projects/pf/head/contrib/subversion/subversion/libsvn_client/mergeinfo.c
  projects/pf/head/contrib/subversion/subversion/libsvn_client/update.c
  projects/pf/head/contrib/subversion/subversion/libsvn_diff/diff_file.c
  projects/pf/head/contrib/subversion/subversion/libsvn_fs/fs-loader.c
  projects/pf/head/contrib/subversion/subversion/libsvn_fs_base/fs.c
  projects/pf/head/contrib/subversion/subversion/libsvn_fs_fs/fs.c
  projects/pf/head/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c
  projects/pf/head/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h
  projects/pf/head/contrib/subversion/subversion/libsvn_ra/ra_loader.c
  projects/pf/head/contrib/subversion/subversion/libsvn_ra/ra_loader.h
  projects/pf/head/contrib/subversion/subversion/libsvn_ra_local/ra_plugin.c
  projects/pf/head/contrib/subversion/subversion/libsvn_ra_local/split_url.c
  projects/pf/head/contrib/subversion/subversion/libsvn_ra_serf/commit.c
  projects/pf/head/contrib/subversion/subversion/libsvn_ra_serf/ra_serf.h
  projects/pf/head/contrib/subversion/subversion/libsvn_ra_serf/replay.c
  projects/pf/head/contrib/subversion/subversion/libsvn_ra_serf/serf.c
  projects/pf/head/contrib/subversion/subversion/libsvn_ra_serf/util.c
  projects/pf/head/contrib/subversion/subversion/libsvn_ra_svn/client.c
  projects/pf/head/contrib/subversion/subversion/libsvn_subr/auth.c
  projects/pf/head/contrib/subversion/subversion/libsvn_subr/cache_config.c
  projects/pf/head/contrib/subversion/subversion/libsvn_subr/cmdline.c
  projects/pf/head/contrib/subversion/subversion/libsvn_subr/config_auth.c
  projects/pf/head/contrib/subversion/subversion/libsvn_subr/deprecated.c
  projects/pf/head/contrib/subversion/subversion/libsvn_subr/dirent_uri.c
  projects/pf/head/contrib/subversion/subversion/libsvn_subr/internal_statements.h
  projects/pf/head/contrib/subversion/subversion/libsvn_subr/io.c
  projects/pf/head/contrib/subversion/subversion/libsvn_subr/sysinfo.c
  projects/pf/head/contrib/subversion/subversion/libsvn_subr/utf.c
  projects/pf/head/contrib/subversion/subversion/libsvn_subr/version.c
  projects/pf/head/contrib/subversion/subversion/libsvn_subr/win32_crashrpt.c
  projects/pf/head/contrib/subversion/subversion/libsvn_wc/diff_editor.c
  projects/pf/head/contrib/subversion/subversion/libsvn_wc/diff_local.c
  projects/pf/head/contrib/subversion/subversion/libsvn_wc/info.c
  projects/pf/head/contrib/subversion/subversion/libsvn_wc/old-and-busted.c
  projects/pf/head/contrib/subversion/subversion/libsvn_wc/update_editor.c
  projects/pf/head/contrib/subversion/subversion/libsvn_wc/wc-checks.h
  projects/pf/head/contrib/subversion/subversion/libsvn_wc/wc-metadata.h
  projects/pf/head/contrib/subversion/subversion/libsvn_wc/wc-queries.h
  projects/pf/head/contrib/subversion/subversion/libsvn_wc/wc-queries.sql
  projects/pf/head/contrib/subversion/subversion/libsvn_wc/wc_db.c
  projects/pf/head/contrib/subversion/subversion/libsvn_wc/wc_db.h
  projects/pf/head/contrib/subversion/subversion/libsvn_wc/wc_db_private.h
  projects/pf/head/contrib/subversion/subversion/libsvn_wc/wc_db_update_move.c
  projects/pf/head/contrib/subversion/subversion/svn/cl.h
  projects/pf/head/contrib/subversion/subversion/svn/status-cmd.c
  projects/pf/head/contrib/subversion/subversion/svn/status.c
  projects/pf/head/contrib/subversion/subversion/svn/svn.c
  projects/pf/head/contrib/subversion/subversion/svnadmin/svnadmin.c
  projects/pf/head/contrib/subversion/subversion/svndumpfilter/svndumpfilter.c
  projects/pf/head/contrib/subversion/subversion/svnlook/svnlook.c
  projects/pf/head/contrib/subversion/subversion/svnmucc/svnmucc.c
  projects/pf/head/contrib/subversion/subversion/svnserve/svnserve.c
  projects/pf/head/contrib/subversion/subversion/svnsync/svnsync.c
  projects/pf/head/contrib/subversion/subversion/svnversion/svnversion.c
  projects/pf/head/contrib/telnet/telnetd/sys_term.c
  projects/pf/head/contrib/tzdata/africa
  projects/pf/head/contrib/tzdata/antarctica
  projects/pf/head/contrib/tzdata/asia
  projects/pf/head/contrib/tzdata/australasia
  projects/pf/head/contrib/tzdata/backward
  projects/pf/head/contrib/tzdata/etcetera
  projects/pf/head/contrib/tzdata/europe
  projects/pf/head/contrib/tzdata/northamerica
  projects/pf/head/contrib/tzdata/southamerica
  projects/pf/head/contrib/tzdata/zone.tab
  projects/pf/head/crypto/openssh/ChangeLog
  projects/pf/head/crypto/openssh/README
  projects/pf/head/crypto/openssh/auth-options.c
  projects/pf/head/crypto/openssh/auth2-chall.c
  projects/pf/head/crypto/openssh/authfd.c
  projects/pf/head/crypto/openssh/channels.c
  projects/pf/head/crypto/openssh/cipher-3des1.c
  projects/pf/head/crypto/openssh/clientloop.c
  projects/pf/head/crypto/openssh/contrib/caldera/openssh.spec
  projects/pf/head/crypto/openssh/contrib/redhat/openssh.spec
  projects/pf/head/crypto/openssh/contrib/suse/openssh.spec
  projects/pf/head/crypto/openssh/gss-genr.c
  projects/pf/head/crypto/openssh/monitor_mm.c
  projects/pf/head/crypto/openssh/monitor_wrap.c
  projects/pf/head/crypto/openssh/packet.c
  projects/pf/head/crypto/openssh/schnorr.c
  projects/pf/head/crypto/openssh/sftp-client.c
  projects/pf/head/crypto/openssh/sftp-glob.c
  projects/pf/head/crypto/openssh/sftp-server.0
  projects/pf/head/crypto/openssh/sftp.0
  projects/pf/head/crypto/openssh/ssh_config
  projects/pf/head/crypto/openssh/ssh_config.5
  projects/pf/head/crypto/openssh/sshd_config
  projects/pf/head/crypto/openssh/sshd_config.5
  projects/pf/head/crypto/openssh/umac.c
  projects/pf/head/crypto/openssh/version.h
  projects/pf/head/etc/defaults/periodic.conf
  projects/pf/head/etc/defaults/rc.conf
  projects/pf/head/etc/freebsd-update.conf
  projects/pf/head/etc/mtree/BSD.tests.dist
  projects/pf/head/etc/network.subr
  projects/pf/head/etc/pkg/FreeBSD.conf
  projects/pf/head/etc/rc.d/Makefile
  projects/pf/head/etc/rc.d/ntpdate
  projects/pf/head/etc/rc.d/rpcbind
  projects/pf/head/etc/rc.d/syslogd
  projects/pf/head/gnu/usr.bin/binutils/ld/Makefile
  projects/pf/head/include/Makefile
  projects/pf/head/include/iconv.h
  projects/pf/head/lib/Makefile
  projects/pf/head/lib/atf/Makefile
  projects/pf/head/lib/atf/Makefile.inc
  projects/pf/head/lib/atf/libatf-c++/Makefile
  projects/pf/head/lib/atf/libatf-c/Makefile
  projects/pf/head/lib/libc/capability/Makefile.inc
  projects/pf/head/lib/libc/gen/Makefile.inc
  projects/pf/head/lib/libc/iconv/Symbol.map
  projects/pf/head/lib/libc/iconv/citrus_csmapper.h
  projects/pf/head/lib/libc/iconv/iconv.c
  projects/pf/head/lib/libc/string/strcasecmp.3
  projects/pf/head/lib/libc/string/strlcpy.3
  projects/pf/head/lib/libc/sys/Makefile.inc
  projects/pf/head/lib/libc/sys/cap_ioctls_limit.2
  projects/pf/head/lib/libc/sys/cap_rights_limit.2
  projects/pf/head/lib/libc/sys/kqueue.2
  projects/pf/head/lib/libproc/proc_bkpt.c
  projects/pf/head/lib/libproc/proc_sym.c
  projects/pf/head/lib/libz/FREEBSD-upgrade   (contents, props changed)
  projects/pf/head/lib/libz/Makefile   (contents, props changed)
  projects/pf/head/lib/libz/Symbol.map   (contents, props changed)
  projects/pf/head/lib/libz/Versions.def   (contents, props changed)
  projects/pf/head/lib/libz/zopen.c   (contents, props changed)
  projects/pf/head/lib/msun/Makefile
  projects/pf/head/lib/msun/src/s_round.c
  projects/pf/head/lib/msun/src/s_roundf.c
  projects/pf/head/lib/msun/src/s_roundl.c
  projects/pf/head/libexec/Makefile
  projects/pf/head/libexec/atf/Makefile
  projects/pf/head/libexec/atf/Makefile.inc
  projects/pf/head/libexec/atf/atf-check/Makefile
  projects/pf/head/libexec/rbootd/bpf.c
  projects/pf/head/libexec/rtld-elf/rtld.c
  projects/pf/head/release/Makefile
  projects/pf/head/release/doc/de_DE.ISO8859-1/early-adopter/article.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/errata/article.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/hardware/alpha/article.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/hardware/common/artheader.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/hardware/common/dev.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/hardware/common/intro.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/hardware/i386/article.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/hardware/ia64/article.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/hardware/pc98/article.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/hardware/pc98/proc-pc98.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/installation/alpha/Makefile
  projects/pf/head/release/doc/de_DE.ISO8859-1/installation/alpha/article.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/installation/common/abstract.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/installation/common/artheader.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/installation/common/install.ent
  projects/pf/head/release/doc/de_DE.ISO8859-1/installation/common/install.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/installation/common/layout.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/installation/common/trouble.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/installation/common/upgrade.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/installation/i386/Makefile
  projects/pf/head/release/doc/de_DE.ISO8859-1/installation/i386/article.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/installation/ia64/Makefile
  projects/pf/head/release/doc/de_DE.ISO8859-1/installation/ia64/article.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/installation/pc98/Makefile
  projects/pf/head/release/doc/de_DE.ISO8859-1/installation/pc98/article.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/installation/sparc64/article.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/installation/sparc64/install.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/readme/article.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/relnotes/common/new.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/relnotes/i386/article.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.xml
  projects/pf/head/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.xml
  projects/pf/head/release/doc/en_US.ISO8859-1/errata/article.xml
  projects/pf/head/release/doc/en_US.ISO8859-1/hardware/article.xml
  projects/pf/head/release/doc/en_US.ISO8859-1/readme/article.xml
  projects/pf/head/release/doc/en_US.ISO8859-1/relnotes/article.xml
  projects/pf/head/release/doc/fr_FR.ISO8859-1/early-adopter/article.xml
  projects/pf/head/release/doc/fr_FR.ISO8859-1/errata/article.xml
  projects/pf/head/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.xml
  projects/pf/head/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.xml
  projects/pf/head/release/doc/fr_FR.ISO8859-1/hardware/common/artheader.xml
  projects/pf/head/release/doc/fr_FR.ISO8859-1/hardware/common/dev.xml
  projects/pf/head/release/doc/fr_FR.ISO8859-1/hardware/common/intro.xml
  projects/pf/head/release/doc/fr_FR.ISO8859-1/hardware/i386/article.xml
  projects/pf/head/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.xml
  projects/pf/head/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.xml
  projects/pf/head/release/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.xml
  projects/pf/head/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.xml
  projects/pf/head/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.xml
  projects/pf/head/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.xml
  projects/pf/head/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.xml
  projects/pf/head/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.xml
  projects/pf/head/release/doc/fr_FR.ISO8859-1/installation/alpha/Makefile
  projects/pf/head/release/doc/fr_FR.ISO8859-1/installation/alpha/article.xml
  projects/pf/head/release/doc/fr_FR.ISO8859-1/installation/common/artheader.xml
  projects/pf/head/release/doc/fr_FR.ISO8859-1/installation/common/install.ent
  projects/pf/head/release/doc/fr_FR.ISO8859-1/installation/common/install.xml
  projects/pf/head/release/doc/fr_FR.ISO8859-1/installation/common/layout.xml
  projects/pf/head/release/doc/fr_FR.ISO8859-1/installation/common/trouble.xml
  projects/pf/head/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.xml
  projects/pf/head/release/doc/fr_FR.ISO8859-1/installation/i386/Makefile
  projects/pf/head/release/doc/fr_FR.ISO8859-1/installation/i386/article.xml
  projects/pf/head/release/doc/fr_FR.ISO8859-1/installation/pc98/Makefile
  projects/pf/head/release/doc/fr_FR.ISO8859-1/installation/pc98/article.xml
  projects/pf/head/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.xml
  projects/pf/head/release/doc/fr_FR.ISO8859-1/installation/sparc64/install.xml
  projects/pf/head/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.xml
  projects/pf/head/release/doc/fr_FR.ISO8859-1/relnotes/common/new.xml
  projects/pf/head/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.xml
  projects/pf/head/release/doc/ja_JP.eucJP/errata/article.xml
  projects/pf/head/release/doc/ja_JP.eucJP/hardware/alpha/article.xml
  projects/pf/head/release/doc/ja_JP.eucJP/hardware/amd64/article.xml
  projects/pf/head/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.xml
  projects/pf/head/release/doc/ja_JP.eucJP/hardware/common/artheader.xml
  projects/pf/head/release/doc/ja_JP.eucJP/hardware/common/dev.xml
  projects/pf/head/release/doc/ja_JP.eucJP/hardware/common/intro.xml
  projects/pf/head/release/doc/ja_JP.eucJP/hardware/i386/article.xml
  projects/pf/head/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.xml
  projects/pf/head/release/doc/ja_JP.eucJP/hardware/ia64/article.xml
  projects/pf/head/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.xml
  projects/pf/head/release/doc/ja_JP.eucJP/hardware/pc98/article.xml
  projects/pf/head/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.xml
  projects/pf/head/release/doc/ja_JP.eucJP/hardware/sparc64/article.xml
  projects/pf/head/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.xml
  projects/pf/head/release/doc/ja_JP.eucJP/relnotes/alpha/article.xml
  projects/pf/head/release/doc/ja_JP.eucJP/relnotes/amd64/article.xml
  projects/pf/head/release/doc/ja_JP.eucJP/relnotes/common/new.xml
  projects/pf/head/release/doc/ja_JP.eucJP/relnotes/i386/article.xml
  projects/pf/head/release/doc/ja_JP.eucJP/relnotes/ia64/article.xml
  projects/pf/head/release/doc/ja_JP.eucJP/relnotes/pc98/article.xml
  projects/pf/head/release/doc/ja_JP.eucJP/relnotes/sparc64/article.xml
  projects/pf/head/release/doc/ja_JP.eucJP/share/xml/catalog.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/errata/article.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/hardware/alpha/article.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/hardware/amd64/article.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/hardware/common/artheader.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/hardware/common/dev.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/hardware/common/intro.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/hardware/i386/article.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/hardware/ia64/article.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/hardware/pc98/article.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/installation/alpha/Makefile
  projects/pf/head/release/doc/ru_RU.KOI8-R/installation/alpha/article.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/installation/amd64/Makefile
  projects/pf/head/release/doc/ru_RU.KOI8-R/installation/amd64/article.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/installation/common/artheader.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/installation/common/install.ent
  projects/pf/head/release/doc/ru_RU.KOI8-R/installation/common/install.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/installation/common/layout.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/installation/common/trouble.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/installation/common/upgrade.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/installation/i386/Makefile
  projects/pf/head/release/doc/ru_RU.KOI8-R/installation/i386/article.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/installation/ia64/Makefile
  projects/pf/head/release/doc/ru_RU.KOI8-R/installation/ia64/article.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/installation/pc98/Makefile
  projects/pf/head/release/doc/ru_RU.KOI8-R/installation/pc98/article.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/installation/sparc64/Makefile
  projects/pf/head/release/doc/ru_RU.KOI8-R/installation/sparc64/article.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/readme/article.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/relnotes/common/new.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/relnotes/i386/article.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.xml
  projects/pf/head/release/doc/ru_RU.KOI8-R/share/xml/catalog.xml
  projects/pf/head/release/doc/share/misc/man2hwnotes.pl
  projects/pf/head/release/doc/share/xml/catalog.xml
  projects/pf/head/release/doc/zh_CN.GB2312/errata/article.xml
  projects/pf/head/release/doc/zh_CN.GB2312/hardware/article.xml
  projects/pf/head/release/doc/zh_CN.GB2312/readme/article.xml
  projects/pf/head/release/doc/zh_CN.GB2312/relnotes/article.xml
  projects/pf/head/release/picobsd/build/picobsd
  projects/pf/head/release/release.sh
  projects/pf/head/sbin/devd/devd.cc
  projects/pf/head/sbin/hastd/hastd.8
  projects/pf/head/sbin/ifconfig/ifconfig.c
  projects/pf/head/sbin/nvmecontrol/perftest.c
  projects/pf/head/share/dict/README
  projects/pf/head/share/doc/Makefile
  projects/pf/head/share/examples/Makefile
  projects/pf/head/share/examples/libusb20/Makefile
  projects/pf/head/share/examples/libusb20/bulk.c
  projects/pf/head/share/examples/libusb20/control.c
  projects/pf/head/share/i18n/csmapper/JIS/JISX0201-KANA%UCS.src
  projects/pf/head/share/i18n/csmapper/JIS/JISX0208 at 1990%UCS.src
  projects/pf/head/share/i18n/csmapper/JIS/UCS%JISX0201-KANA.src
  projects/pf/head/share/i18n/csmapper/JIS/UCS%JISX0208 at 1990.src
  projects/pf/head/share/i18n/csmapper/JIS/charset.pivot.JIS.src
  projects/pf/head/share/i18n/csmapper/JIS/mapper.dir.JIS.src
  projects/pf/head/share/i18n/esdb/EUC/EUC-JP.src
  projects/pf/head/share/man/man1/Makefile
  projects/pf/head/share/man/man3/tree.3
  projects/pf/head/share/man/man4/Makefile
  projects/pf/head/share/man/man4/altera_atse.4
  projects/pf/head/share/man/man4/capsicum.4
  projects/pf/head/share/man/man4/ddb.4
  projects/pf/head/share/man/man4/natm.4
  projects/pf/head/share/man/man4/netmap.4
  projects/pf/head/share/man/man4/run.4
  projects/pf/head/share/man/man4/runfw.4
  projects/pf/head/share/man/man4/tcp.4
  projects/pf/head/share/man/man7/release.7
  projects/pf/head/share/man/man9/ifnet.9
  projects/pf/head/share/misc/bsd-family-tree
  projects/pf/head/share/misc/committers-ports.dot   (contents, props changed)
  projects/pf/head/share/misc/committers-src.dot
  projects/pf/head/share/mk/Makefile
  projects/pf/head/share/mk/bsd.own.mk
  projects/pf/head/share/mk/bsd.prog.mk
  projects/pf/head/sys/amd64/amd64/identcpu.c
  projects/pf/head/sys/amd64/include/vmparam.h
  projects/pf/head/sys/amd64/vmm/io/vlapic.c
  projects/pf/head/sys/amd64/vmm/io/vlapic.h
  projects/pf/head/sys/amd64/vmm/vmm_lapic.c
  projects/pf/head/sys/arm/allwinner/a10_machdep.c
  projects/pf/head/sys/arm/allwinner/a20/files.a20
  projects/pf/head/sys/arm/allwinner/files.a10
  projects/pf/head/sys/arm/arm/bus_space_generic.c
  projects/pf/head/sys/arm/arm/machdep.c
  projects/pf/head/sys/arm/arm/nexus.c
  projects/pf/head/sys/arm/arm/pmap-v6.c
  projects/pf/head/sys/arm/arm/pmap.c
  projects/pf/head/sys/arm/at91/at91.c
  projects/pf/head/sys/arm/at91/at91_machdep.c
  projects/pf/head/sys/arm/broadcom/bcm2835/bcm2835_fb.c
  projects/pf/head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
  projects/pf/head/sys/arm/broadcom/bcm2835/files.bcm2835
  projects/pf/head/sys/arm/econa/econa_machdep.c
  projects/pf/head/sys/arm/freescale/imx/files.imx51
  projects/pf/head/sys/arm/freescale/imx/files.imx53
  projects/pf/head/sys/arm/freescale/imx/imx51_machdep.c
  projects/pf/head/sys/arm/freescale/imx/imx53_machdep.c
  projects/pf/head/sys/arm/freescale/imx/imx6_anatopreg.h
  projects/pf/head/sys/arm/freescale/imx/imx_machdep.c
  projects/pf/head/sys/arm/freescale/imx/imx_machdep.h
  projects/pf/head/sys/arm/freescale/imx/imx_sdhci.c
  projects/pf/head/sys/arm/freescale/imx/tzic.c
  projects/pf/head/sys/arm/include/fdt.h
  projects/pf/head/sys/arm/include/machdep.h
  projects/pf/head/sys/arm/include/pmap.h
  projects/pf/head/sys/arm/include/vmparam.h
  projects/pf/head/sys/arm/lpc/lpc_machdep.c
  projects/pf/head/sys/arm/mv/mv_localbus.c
  projects/pf/head/sys/arm/mv/mv_machdep.c
  projects/pf/head/sys/arm/mv/mv_pci.c
  projects/pf/head/sys/arm/mv/mvvar.h
  projects/pf/head/sys/arm/rockchip/files.rk30xx
  projects/pf/head/sys/arm/rockchip/rk30xx_machdep.c
  projects/pf/head/sys/arm/s3c2xx0/files.s3c2xx0
  projects/pf/head/sys/arm/s3c2xx0/s3c24x0_machdep.c
  projects/pf/head/sys/arm/s3c2xx0/s3c2xx0_space.c
  projects/pf/head/sys/arm/sa11x0/assabet_machdep.c
  projects/pf/head/sys/arm/samsung/exynos/exynos5_machdep.c
  projects/pf/head/sys/arm/tegra/tegra2_machdep.c
  projects/pf/head/sys/arm/ti/files.ti
  projects/pf/head/sys/arm/ti/ti_machdep.c
  projects/pf/head/sys/arm/ti/ti_sdhci.c
  projects/pf/head/sys/arm/versatile/versatile_machdep.c
  projects/pf/head/sys/arm/xilinx/zy7_machdep.c
  projects/pf/head/sys/arm/xscale/i80321/ep80219_machdep.c
  projects/pf/head/sys/arm/xscale/i80321/iq31244_machdep.c
  projects/pf/head/sys/arm/xscale/i8134x/crb_machdep.c
  projects/pf/head/sys/arm/xscale/ixp425/avila_machdep.c
  projects/pf/head/sys/arm/xscale/pxa/pxa_machdep.c
  projects/pf/head/sys/boot/fdt/dts/am335x.dtsi
  projects/pf/head/sys/boot/fdt/dts/beaglebone-black.dts
  projects/pf/head/sys/boot/forth/beastie.4th
  projects/pf/head/sys/boot/forth/loader.4th
  projects/pf/head/sys/boot/forth/loader.4th.8
  projects/pf/head/sys/boot/forth/loader.conf
  projects/pf/head/sys/boot/forth/loader.conf.5
  projects/pf/head/sys/boot/forth/loader.rc
  projects/pf/head/sys/boot/forth/menu-commands.4th
  projects/pf/head/sys/boot/forth/menu.4th
  projects/pf/head/sys/boot/forth/menu.rc
  projects/pf/head/sys/boot/forth/menusets.4th
  projects/pf/head/sys/boot/i386/loader/loader.rc
  projects/pf/head/sys/cam/cam_xpt.c
  projects/pf/head/sys/cam/ctl/ctl.c
  projects/pf/head/sys/cam/ctl/ctl_frontend.c
  projects/pf/head/sys/cam/ctl/ctl_private.h
  projects/pf/head/sys/cam/scsi/scsi_da.c
  projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h
  projects/pf/head/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c
  projects/pf/head/sys/compat/linux/linux_ioctl.c
  projects/pf/head/sys/compat/svr4/svr4_sockio.c
  projects/pf/head/sys/conf/files
  projects/pf/head/sys/conf/files.amd64
  projects/pf/head/sys/conf/files.arm
  projects/pf/head/sys/conf/files.i386
  projects/pf/head/sys/conf/files.powerpc
  projects/pf/head/sys/conf/kern.pre.mk
  projects/pf/head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c
  projects/pf/head/sys/crypto/aesni/aesencdec.h
  projects/pf/head/sys/crypto/aesni/aesni.h
  projects/pf/head/sys/crypto/aesni/aesni_wrap.c
  projects/pf/head/sys/dev/aacraid/aacraid.c
  projects/pf/head/sys/dev/aacraid/aacraid_cam.c
  projects/pf/head/sys/dev/aacraid/aacraid_reg.h
  projects/pf/head/sys/dev/aacraid/aacraid_var.h
  projects/pf/head/sys/dev/aic7xxx/aicasm/Makefile
  projects/pf/head/sys/dev/cxgbe/t4_main.c
  projects/pf/head/sys/dev/drm2/drm_crtc.c
  projects/pf/head/sys/dev/drm2/radeon/radeon_display.c
  projects/pf/head/sys/dev/drm2/radeon/radeon_gem.c
  projects/pf/head/sys/dev/e1000/if_em.c
  projects/pf/head/sys/dev/e1000/if_igb.c
  projects/pf/head/sys/dev/e1000/if_lem.c
  projects/pf/head/sys/dev/e1000/if_lem.h
  projects/pf/head/sys/dev/fdt/fdt_pci.c
  projects/pf/head/sys/dev/fdt/simplebus.c
  projects/pf/head/sys/dev/isp/isp.c
  projects/pf/head/sys/dev/isp/isp_freebsd.h
  projects/pf/head/sys/dev/isp/isp_library.c
  projects/pf/head/sys/dev/isp/isp_pci.c
  projects/pf/head/sys/dev/iwn/if_iwn.c
  projects/pf/head/sys/dev/iwn/if_iwn_debug.h
  projects/pf/head/sys/dev/iwn/if_iwn_devid.h
  projects/pf/head/sys/dev/iwn/if_iwnreg.h
  projects/pf/head/sys/dev/ixgbe/ixgbe.c
  projects/pf/head/sys/dev/mii/atphy.c
  projects/pf/head/sys/dev/mii/miidevs
  projects/pf/head/sys/dev/msk/if_msk.c
  projects/pf/head/sys/dev/nand/nand.h
  projects/pf/head/sys/dev/nand/nand_generic.c
  projects/pf/head/sys/dev/nand/nand_id.c
  projects/pf/head/sys/dev/netmap/if_em_netmap.h
  projects/pf/head/sys/dev/netmap/if_igb_netmap.h
  projects/pf/head/sys/dev/netmap/if_lem_netmap.h
  projects/pf/head/sys/dev/netmap/if_re_netmap.h
  projects/pf/head/sys/dev/netmap/ixgbe_netmap.h
  projects/pf/head/sys/dev/netmap/netmap.c
  projects/pf/head/sys/dev/netmap/netmap_kern.h
  projects/pf/head/sys/dev/netmap/netmap_mem2.c
  projects/pf/head/sys/dev/nvme/nvme_ctrlr.c
  projects/pf/head/sys/dev/nvme/nvme_ns.c
  projects/pf/head/sys/dev/ofw/ofw_fdt.c
  projects/pf/head/sys/dev/ppc/ppc_pci.c
  projects/pf/head/sys/dev/random/harvest.c
  projects/pf/head/sys/dev/re/if_re.c
  projects/pf/head/sys/dev/tsec/if_tsec.c
  projects/pf/head/sys/dev/tsec/if_tsec.h
  projects/pf/head/sys/dev/tsec/if_tsec_fdt.c
  projects/pf/head/sys/dev/tsec/if_tsecreg.h
  projects/pf/head/sys/dev/uart/uart.h
  projects/pf/head/sys/dev/uart/uart_bus_fdt.c
  projects/pf/head/sys/dev/uart/uart_bus_pci.c
  projects/pf/head/sys/dev/uart/uart_cpu_fdt.c
  projects/pf/head/sys/dev/usb/controller/ehci_pci.c
  projects/pf/head/sys/dev/usb/usbdevs
  projects/pf/head/sys/dev/usb/wlan/if_rsu.c
  projects/pf/head/sys/dev/usb/wlan/if_rum.c
  projects/pf/head/sys/dev/usb/wlan/if_run.c
  projects/pf/head/sys/dev/usb/wlan/if_runreg.h
  projects/pf/head/sys/dev/usb/wlan/if_runvar.h
  projects/pf/head/sys/dev/usb/wlan/if_uath.c
  projects/pf/head/sys/dev/usb/wlan/if_upgt.c
  projects/pf/head/sys/dev/usb/wlan/if_ural.c
  projects/pf/head/sys/dev/usb/wlan/if_urtw.c
  projects/pf/head/sys/dev/usb/wlan/if_urtwn.c
  projects/pf/head/sys/dev/usb/wlan/if_zyd.c
  projects/pf/head/sys/dev/xen/control/control.c
  projects/pf/head/sys/dev/xen/netback/netback.c
  projects/pf/head/sys/dev/xen/netback/netback_unit_tests.c
  projects/pf/head/sys/dev/xen/netfront/netfront.c
  projects/pf/head/sys/fs/nfs/nfs_commonkrpc.c
  projects/pf/head/sys/fs/nfs/nfs_commonsubs.c
  projects/pf/head/sys/fs/nfs/nfs_var.h
  projects/pf/head/sys/fs/nfsclient/nfs_clcomsubs.c
  projects/pf/head/sys/geom/eli/g_eli.c
  projects/pf/head/sys/geom/eli/g_eli_ctl.c
  projects/pf/head/sys/i386/i386/identcpu.c
  projects/pf/head/sys/i386/i386/machdep.c
  projects/pf/head/sys/i386/include/vmparam.h
  projects/pf/head/sys/ia64/ia64/machdep.c
  projects/pf/head/sys/ia64/ia64/mp_machdep.c
  projects/pf/head/sys/ia64/ia64/pmap.c
  projects/pf/head/sys/ia64/include/param.h
  projects/pf/head/sys/ia64/include/pmap.h
  projects/pf/head/sys/ia64/include/vmparam.h
  projects/pf/head/sys/kern/capabilities.conf
  projects/pf/head/sys/kern/kern_environment.c
  projects/pf/head/sys/kern/kern_event.c
  projects/pf/head/sys/kern/kern_jail.c
  projects/pf/head/sys/kern/kern_malloc.c
  projects/pf/head/sys/kern/subr_param.c
  projects/pf/head/sys/kern/uipc_socket.c
  projects/pf/head/sys/kern/vfs_lookup.c
  projects/pf/head/sys/kern/vfs_vnops.c
  projects/pf/head/sys/kern/vnode_if.src
  projects/pf/head/sys/mips/cavium/std.octeon1
  projects/pf/head/sys/mips/include/vmparam.h
  projects/pf/head/sys/mips/mips/nexus.c
  projects/pf/head/sys/modules/aic7xxx/Makefile
  projects/pf/head/sys/modules/aic7xxx/ahc/Makefile
  projects/pf/head/sys/modules/aic7xxx/ahd/Makefile
  projects/pf/head/sys/modules/bwi/Makefile
  projects/pf/head/sys/modules/iwnfw/Makefile
  projects/pf/head/sys/modules/vmm/Makefile
  projects/pf/head/sys/net/bpf.c
  projects/pf/head/sys/net/if.c
  projects/pf/head/sys/net/if.h
  projects/pf/head/sys/net/if_gif.c
  projects/pf/head/sys/net/if_gre.c
  projects/pf/head/sys/net/if_tap.c
  projects/pf/head/sys/net/if_var.h
  projects/pf/head/sys/net/netmap.h
  projects/pf/head/sys/net80211/ieee80211_amrr.c
  projects/pf/head/sys/net80211/ieee80211_output.c
  projects/pf/head/sys/netgraph/ng_pipe.c
  projects/pf/head/sys/netinet/if_ether.c
  projects/pf/head/sys/netinet/in.c
  projects/pf/head/sys/netinet/in_rmx.c
  projects/pf/head/sys/netinet/in_var.h
  projects/pf/head/sys/netinet/raw_ip.c
  projects/pf/head/sys/netinet/sctp_asconf.c
  projects/pf/head/sys/netinet/sctp_auth.c
  projects/pf/head/sys/netinet/sctp_auth.h
  projects/pf/head/sys/netinet/sctp_output.c
  projects/pf/head/sys/netinet/sctp_pcb.c
  projects/pf/head/sys/netinet/sctp_usrreq.c
  projects/pf/head/sys/netinet/sctputil.c
  projects/pf/head/sys/netinet/tcp_usrreq.c
  projects/pf/head/sys/netinet6/in6.c
  projects/pf/head/sys/netinet6/nd6_nbr.c
  projects/pf/head/sys/netinet6/sctp6_usrreq.c
  projects/pf/head/sys/netipsec/ipsec_input.c
  projects/pf/head/sys/netpfil/ipfw/ip_fw2.c
  projects/pf/head/sys/netpfil/pf/pf.c
  projects/pf/head/sys/netpfil/pf/pf.h
  projects/pf/head/sys/netpfil/pf/pf_ioctl.c
  projects/pf/head/sys/netsmb/smb_trantcp.c
  projects/pf/head/sys/ofed/drivers/net/mlx4/en_ethtool.c
  projects/pf/head/sys/ofed/drivers/net/mlx4/en_netdev.c
  projects/pf/head/sys/ofed/drivers/net/mlx4/mlx4_en.h
  projects/pf/head/sys/ofed/include/linux/bitops.h
  projects/pf/head/sys/powerpc/aim/mmu_oea64.c
  projects/pf/head/sys/powerpc/booke/locore.S
  projects/pf/head/sys/powerpc/booke/machdep.c
  projects/pf/head/sys/powerpc/booke/mp_cpudep.c
  projects/pf/head/sys/powerpc/booke/platform_bare.c
  projects/pf/head/sys/powerpc/booke/pmap.c
  projects/pf/head/sys/powerpc/booke/trap_subr.S
  projects/pf/head/sys/powerpc/include/pcpu.h
  projects/pf/head/sys/powerpc/include/vmparam.h
  projects/pf/head/sys/powerpc/mpc85xx/lbc.c
  projects/pf/head/sys/powerpc/mpc85xx/pci_mpc85xx.c
  projects/pf/head/sys/powerpc/ofw/ofw_machdep.c
  projects/pf/head/sys/powerpc/powerpc/dump_machdep.c
  projects/pf/head/sys/powerpc/pseries/mmu_phyp.c
  projects/pf/head/sys/sparc64/include/vmparam.h
  projects/pf/head/sys/sys/jail.h
  projects/pf/head/sys/sys/mount.h
  projects/pf/head/sys/sys/param.h
  projects/pf/head/sys/sys/random.h
  projects/pf/head/sys/sys/sockio.h
  projects/pf/head/sys/sys/systm.h
  projects/pf/head/sys/vm/vm_object.c
  projects/pf/head/sys/vm/vm_pageout.c
  projects/pf/head/sys/x86/cpufreq/hwpstate.c
  projects/pf/head/sys/x86/include/specialreg.h
  projects/pf/head/sys/x86/iommu/busdma_dmar.c
  projects/pf/head/sys/x86/iommu/intel_ctx.c
  projects/pf/head/sys/x86/iommu/intel_dmar.h
  projects/pf/head/sys/x86/iommu/intel_drv.c
  projects/pf/head/sys/x86/iommu/intel_fault.c
  projects/pf/head/sys/x86/iommu/intel_gas.c
  projects/pf/head/sys/x86/iommu/intel_idpgtbl.c
  projects/pf/head/sys/x86/iommu/intel_reg.h
  projects/pf/head/sys/x86/iommu/intel_utils.c
  projects/pf/head/tests/Makefile
  projects/pf/head/tests/README
  projects/pf/head/tools/build/mk/OptionalObsoleteFiles.inc
  projects/pf/head/tools/tools/ath/athstats/Makefile
  projects/pf/head/tools/tools/netmap/nm_util.c
  projects/pf/head/tools/tools/netmap/pkt-gen.c
  projects/pf/head/tools/tools/syscall_timing/syscall_timing.c
  projects/pf/head/usr.bin/Makefile
  projects/pf/head/usr.bin/atf/Makefile
  projects/pf/head/usr.bin/atf/Makefile.inc
  projects/pf/head/usr.bin/atf/atf-sh/Makefile
  projects/pf/head/usr.bin/calendar/calendars/calendar.freebsd   (contents, props changed)
  projects/pf/head/usr.bin/dtc/fdt.cc
  projects/pf/head/usr.bin/iscsictl/iscsictl.c
  projects/pf/head/usr.bin/limits/limits.1
  projects/pf/head/usr.bin/split/Makefile
  projects/pf/head/usr.bin/split/split.c
  projects/pf/head/usr.bin/svn/svn_private_config.h
  projects/pf/head/usr.sbin/arp/arp.4
  projects/pf/head/usr.sbin/bhyve/acpi.c
  projects/pf/head/usr.sbin/bhyve/bhyverun.c
  projects/pf/head/usr.sbin/bhyve/block_if.c
  projects/pf/head/usr.sbin/bhyve/mevent.c
  projects/pf/head/usr.sbin/bhyve/pci_ahci.c
  projects/pf/head/usr.sbin/bhyve/pci_emul.c
  projects/pf/head/usr.sbin/bhyve/pci_virtio_net.c
  projects/pf/head/usr.sbin/bhyve/pit_8254.c
  projects/pf/head/usr.sbin/bsdconfig/bsdconfig
  projects/pf/head/usr.sbin/bsdconfig/include/messages.subr
  projects/pf/head/usr.sbin/bsdconfig/share/common.subr
  projects/pf/head/usr.sbin/bsdconfig/share/dialog.subr
  projects/pf/head/usr.sbin/bsdconfig/share/media/http.subr
  projects/pf/head/usr.sbin/bsdconfig/share/media/tcpip.subr
  projects/pf/head/usr.sbin/bsdconfig/share/packages/index.subr
  projects/pf/head/usr.sbin/bsdconfig/share/packages/packages.subr
  projects/pf/head/usr.sbin/bsdconfig/share/strings.subr
  projects/pf/head/usr.sbin/bsdconfig/startup/share/rcconf.subr
  projects/pf/head/usr.sbin/bsdinstall/bsdinstall
  projects/pf/head/usr.sbin/bsdinstall/bsdinstall.8
  projects/pf/head/usr.sbin/bsdinstall/scripts/auto
  projects/pf/head/usr.sbin/bsdinstall/scripts/config
  projects/pf/head/usr.sbin/bsdinstall/scripts/docsinstall
  projects/pf/head/usr.sbin/bsdinstall/scripts/jail
  projects/pf/head/usr.sbin/bsdinstall/scripts/netconfig_ipv4
  projects/pf/head/usr.sbin/bsdinstall/scripts/netconfig_ipv6
  projects/pf/head/usr.sbin/bsdinstall/scripts/script
  projects/pf/head/usr.sbin/bsdinstall/scripts/wlanconfig
  projects/pf/head/usr.sbin/bsdinstall/scripts/zfsboot
  projects/pf/head/usr.sbin/crashinfo/crashinfo.sh
  projects/pf/head/usr.sbin/ctld/ctl.conf.5
  projects/pf/head/usr.sbin/freebsd-update/freebsd-update.sh
  projects/pf/head/usr.sbin/mfiutil/Makefile
  projects/pf/head/usr.sbin/mfiutil/mfiutil.8
  projects/pf/head/usr.sbin/mfiutil/mfiutil.c
  projects/pf/head/usr.sbin/mount_smbfs/Makefile
  projects/pf/head/usr.sbin/newsyslog/newsyslog.c
  projects/pf/head/usr.sbin/pkg/pkg.7
  projects/pf/head/usr.sbin/pkg/pkg.c
  projects/pf/head/usr.sbin/route6d/route6d.c
  projects/pf/head/usr.sbin/sysrc/sysrc
  projects/pf/head/usr.sbin/sysrc/sysrc.8
  projects/pf/head/usr.sbin/utx/Makefile
  projects/pf/head/usr.sbin/utx/utx.8
  projects/pf/head/usr.sbin/utx/utx.c
Directory Properties:
  projects/pf/head/   (props changed)
  projects/pf/head/cddl/   (props changed)
  projects/pf/head/cddl/contrib/opensolaris/   (props changed)
  projects/pf/head/contrib/binutils/   (props changed)
  projects/pf/head/contrib/libpcap/   (props changed)
  projects/pf/head/contrib/llvm/   (props changed)
  projects/pf/head/contrib/nvi/   (props changed)
  projects/pf/head/contrib/subversion/   (props changed)
  projects/pf/head/contrib/tzdata/   (props changed)
  projects/pf/head/crypto/openssh/   (props changed)
  projects/pf/head/gnu/usr.bin/binutils/   (props changed)
  projects/pf/head/lib/libc/   (props changed)
  projects/pf/head/lib/libz/   (props changed)
  projects/pf/head/sbin/   (props changed)
  projects/pf/head/share/man/man4/   (props changed)
  projects/pf/head/sys/   (props changed)
  projects/pf/head/sys/amd64/vmm/   (props changed)
  projects/pf/head/sys/boot/   (props changed)
  projects/pf/head/sys/cddl/contrib/opensolaris/   (props changed)
  projects/pf/head/sys/conf/   (props changed)
  projects/pf/head/sys/modules/vmm/   (props changed)
  projects/pf/head/usr.bin/calendar/   (props changed)
  projects/pf/head/usr.sbin/bhyve/   (props changed)

Modified: projects/pf/head/MAINTAINERS
==============================================================================
--- projects/pf/head/MAINTAINERS	Mon Nov 11 20:22:03 2013	(r258006)
+++ projects/pf/head/MAINTAINERS	Mon Nov 11 20:33:25 2013	(r258007)
@@ -99,7 +99,6 @@ nfs		alfred	Will be happy to review code
 rpc.lockd	alfred	Will be happy to review code, but not mandatory.
 truss		alfred	Will be happy to review code, but not mandatory.
 rpc		alfred	Pre-commit review requested.
-pkg_install	portmgr	Pre-commit review or approval from portmgr@ requested.
 linux emul	emulation	Please discuss changes here.
 bs{diff,patch}	cperciva	Pre-commit review requested.
 portsnap	cperciva	Pre-commit review requested.

Modified: projects/pf/head/Makefile.inc1
==============================================================================
--- projects/pf/head/Makefile.inc1	Mon Nov 11 20:22:03 2013	(r258006)
+++ projects/pf/head/Makefile.inc1	Mon Nov 11 20:33:25 2013	(r258007)
@@ -263,6 +263,21 @@ XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		-DWITHOUT_GDB
 
+# kernel-tools stage
+KTMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \
+		PATH=${BPATH}:${PATH} \
+		WORLDTMP=${WORLDTMP} \
+		VERSION="${VERSION}" \
+		COMPILER_TYPE=${COMPILER_TYPE}
+KTMAKE=		TOOLS_PREFIX=${WORLDTMP} MAKEOBJDIRPREFIX=${WORLDTMP} \
+		${KTMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
+		DESTDIR= \
+		BOOTSTRAPPING=${OSRELDATE} \
+		SSP_CFLAGS= \
+		-DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
+		-DNO_PIC -DNO_PROFILE -DNO_SHARED \
+		-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD
+
 # world stage
 WMAKEENV=	${CROSSENV} \
 		_SHLIBDIRPREFIX=${WORLDTMP} \
@@ -540,6 +555,7 @@ _cross-tools:
 	@echo ">>> stage 3: cross tools"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${XMAKE} cross-tools
+	${_+_}cd ${.CURDIR}; ${XMAKE} kernel-tools
 _includes:
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -1019,20 +1035,7 @@ buildkernel:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2.3: build tools"
 	@echo "--------------------------------------------------------------"
-	cd ${KRNLOBJDIR}/${_kernel}; \
-	    PATH=${BPATH}:${PATH} \
-	    MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \
-	    ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF -DEARLY_BUILD \
-	    -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile
-# XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case.
-.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules)
-.for target in obj depend all
-	cd ${KERNSRCDIR}/modules/aic7xxx/aicasm; \
-	    PATH=${BPATH}:${PATH} \
-	    MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \
-	    ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF -DEARLY_BUILD ${target}
-.endfor
-.endif
+	${_+_}cd ${.CURDIR}; ${KTMAKE} kernel-tools
 .if !defined(NO_KERNELDEPEND)
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -1319,10 +1322,6 @@ bootstrap-tools: .MAKE
 #
 # build-tools: Build special purpose build tools
 #
-.if defined(MODULES_WITH_WORLD) && exists(${KERNSRCDIR}/modules)
-_aicasm= sys/modules/aic7xxx/aicasm
-.endif
-
 .if !defined(NO_SHARE)
 _share=	share/syscons/scrnmaps
 .endif
@@ -1344,7 +1343,6 @@ build-tools: .MAKE
     lib/ncurses/ncurses \
     lib/ncurses/ncursesw \
     ${_share} \
-    ${_aicasm} \
     usr.bin/awk \
     lib/libmagic \
     usr.bin/mkesdb_static \
@@ -1365,6 +1363,23 @@ build-tools: .MAKE
 .endfor
 
 #
+# kernel-tools: Build kernel-building tools
+#
+kernel-tools: .MAKE
+	mkdir -p ${MAKEOBJDIRPREFIX}/usr
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
+	    -p ${MAKEOBJDIRPREFIX}/usr >/dev/null
+.for _tool in \
+    sys/dev/aic7xxx/aicasm
+	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
+		cd ${.CURDIR}/${_tool} && \
+		${MAKE} DIRPRFX=${_tool}/ obj && \
+		${MAKE} DIRPRFX=${_tool}/ depend && \
+		${MAKE} DIRPRFX=${_tool}/ all && \
+		${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install
+.endfor
+
+#
 # cross-tools: Build cross-building tools
 #
 .if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 800035
@@ -1478,7 +1493,7 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 		${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \
 		${_kerberos5_lib_libroken} \
 		${_kerberos5_lib_libwind} \
-		${_lib_atf_libatf_c} \
+		${_lib_atf} \
 		lib/libbz2 ${_libcom_err} lib/libcrypt \
 		lib/libelf lib/libexpat \
 		${_lib_libgssapi} ${_lib_libipx} \
@@ -1492,8 +1507,8 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 		${_secure_lib_libcrypto} ${_lib_libldns} \
 		${_secure_lib_libssh} ${_secure_lib_libssl}
 
-.if ${MK_ATF} != "no"
-_lib_atf_libatf_c=	lib/atf/libatf-c
+.if ${MK_TESTS} != "no"
+_lib_atf=	lib/atf
 .endif
 
 .if ${MK_LIBTHR} != "no"
@@ -1602,10 +1617,12 @@ ${_lib}__PL: .PHONY .MAKE
 .if exists(${.CURDIR}/${_lib})
 	${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_lib} && \
-		${MAKE} DIRPRFX=${_lib}/ obj && \
-		${MAKE} DIRPRFX=${_lib}/ depend && \
-		${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all && \
-		${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install
+		${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ obj && \
+		${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ depend && \
+		${MAKE} -DNO_TESTS -DNO_PROFILE -DNO_PIC \
+		    DIRPRFX=${_lib}/ all && \
+		${MAKE} -DNO_TESTS -DNO_PROFILE -DNO_PIC \
+		    DIRPRFX=${_lib}/ install
 .endif
 .endfor
 
@@ -1614,10 +1631,10 @@ ${_lib}__L: .PHONY .MAKE
 .if exists(${.CURDIR}/${_lib})
 	${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_lib} && \
-		${MAKE} DIRPRFX=${_lib}/ obj && \
-		${MAKE} DIRPRFX=${_lib}/ depend && \
-		${MAKE} DIRPRFX=${_lib}/ all && \
-		${MAKE} DIRPRFX=${_lib}/ install
+		${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ obj && \
+		${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ depend && \
+		${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ all && \
+		${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ install
 .endif
 .endfor
 
@@ -1627,10 +1644,12 @@ ${_lib}__L: .PHONY .MAKE
 lib/libpam__L: .PHONY .MAKE
 	${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \
 		cd ${.CURDIR}/lib/libpam && \
-		${MAKE} DIRPRFX=lib/libpam/ obj && \
-		${MAKE} DIRPRFX=lib/libpam/ depend && \
-		${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all && \
-		${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install
+		${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ obj && \
+		${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ depend && \
+		${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ \
+		    -D_NO_LIBPAM_SO_YET all && \
+		${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ \
+		    -D_NO_LIBPAM_SO_YET install
 
 _prereq_libs: ${_prereq_libs:S/$/__PL/}
 _startup_libs: ${_startup_libs:S/$/__L/}

Modified: projects/pf/head/ObsoleteFiles.inc
==============================================================================
--- projects/pf/head/ObsoleteFiles.inc	Mon Nov 11 20:22:03 2013	(r258006)
+++ projects/pf/head/ObsoleteFiles.inc	Mon Nov 11 20:33:25 2013	(r258007)
@@ -38,6 +38,21 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20131109: extattr(2) mlinks fixed
+OLD_FILES+=usr/share/man/man2/extattr_delete_list.2.gz
+OLD_FILES+=usr/share/man/man2/extattr_get_list.2.gz
+# 20131107: example files removed
+OLD_FILES+=usr/share/examples/libusb20/aux.c
+OLD_FILES+=usr/share/examples/libusb20/aux.h
+# 20131103: WITH_LIBICONV_COMPAT removal
+OLD_FILES+=usr/include/_libiconv_compat.h
+OLD_FILES+=usr/lib/libiconv.a
+OLD_FILES+=usr/lib/libiconv.so
+OLD_FILES+=usr/lib/libiconv.so.3
+OLD_FILES+=usr/lib/libiconv_p.a
+# 20131103: removal of utxrm(8), use 'utx rm' instead.
+OLD_FILES+=usr/sbin/utxrm
+OLD_FILES+=usr/share/man/man8/utxrm.8.gz
 # 20131031: pkg_install has been removed
 OLD_FILES+=etc/periodic/daily/220.backup-pkgdb
 OLD_FILES+=etc/periodic/daily/490.status-pkg-changes

Modified: projects/pf/head/UPDATING
==============================================================================
--- projects/pf/head/UPDATING	Mon Nov 11 20:22:03 2013	(r258006)
+++ projects/pf/head/UPDATING	Mon Nov 11 20:33:25 2013	(r258007)
@@ -31,6 +31,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20131108:
+	The WITHOUT_ATF build knob has been removed and its functionality
+	has been subsumed into the more generic WITHOUT_TESTS.  If you were
+	using the former to disable the build of the ATF libraries, you
+	should change your settings to use the latter.
+
 20131025:
 	The default version of mtree is nmtree which is obtained from
 	NetBSD.  The output is generally the same, but may vary

Modified: projects/pf/head/bin/pkill/pkill.c
==============================================================================
--- projects/pf/head/bin/pkill/pkill.c	Mon Nov 11 20:22:03 2013	(r258006)
+++ projects/pf/head/bin/pkill/pkill.c	Mon Nov 11 20:33:25 2013	(r258007)
@@ -318,7 +318,10 @@ main(int argc, char **argv)
 	 * Use KERN_PROC_PROC instead of KERN_PROC_ALL, since we
 	 * just want processes and not individual kernel threads.
 	 */
-	plist = kvm_getprocs(kd, KERN_PROC_PROC, 0, &nproc);
+	if (pidfromfile >= 0)
+		plist = kvm_getprocs(kd, KERN_PROC_PID, pidfromfile, &nproc);
+	else
+		plist = kvm_getprocs(kd, KERN_PROC_PROC, 0, &nproc);
 	if (plist == NULL) {
 		errx(STATUS_ERROR, "Cannot get process list (%s)",
 		    kvm_geterr(kd));

Modified: projects/pf/head/bin/sh/exec.c
==============================================================================
--- projects/pf/head/bin/sh/exec.c	Mon Nov 11 20:22:03 2013	(r258006)
+++ projects/pf/head/bin/sh/exec.c	Mon Nov 11 20:33:25 2013	(r258007)
@@ -672,9 +672,11 @@ typecmd_impl(int argc, char **argv, int 
 
 		/* Then look at the aliases */
 		if ((ap = lookupalias(argv[i], 1)) != NULL) {
-			if (cmd == TYPECMD_SMALLV)
-				out1fmt("alias %s='%s'\n", argv[i], ap->val);
-			else
+			if (cmd == TYPECMD_SMALLV) {
+				out1fmt("alias %s=", argv[i]);
+				out1qstr(ap->val);
+				outcslow('\n', out1);
+			} else
 				out1fmt("%s is an alias for %s\n", argv[i],
 				    ap->val);
 			continue;

Modified: projects/pf/head/bin/sh/nodetypes
==============================================================================
--- projects/pf/head/bin/sh/nodetypes	Mon Nov 11 20:22:03 2013	(r258006)
+++ projects/pf/head/bin/sh/nodetypes	Mon Nov 11 20:33:25 2013	(r258007)
@@ -118,16 +118,16 @@ NFROMTO nfile			# fd<> fname
 NAPPEND nfile			# fd>> fname
 NCLOBBER nfile			# fd>| fname
 	type	  int
-	next	  nodeptr		# next redirection in list
 	fd	  int			# file descriptor being redirected
+	next	  nodeptr		# next redirection in list
 	fname	  nodeptr		# file name, in a NARG node
 	expfname  temp	char *expfname	# actual file name
 
 NTOFD ndup			# fd<&dupfd
 NFROMFD ndup			# fd>&dupfd
 	type	  int
-	next	  nodeptr		# next redirection in list
 	fd	  int			# file descriptor being redirected
+	next	  nodeptr		# next redirection in list
 	dupfd	  int			# file descriptor to duplicate
 	vname	  nodeptr		# file name if fd>&$var
 
@@ -135,8 +135,8 @@ NFROMFD ndup			# fd>&dupfd
 NHERE nhere			# fd<<\!
 NXHERE nhere			# fd<<!
 	type	  int
-	next	  nodeptr		# next redirection in list
 	fd	  int			# file descriptor being redirected
+	next	  nodeptr		# next redirection in list
 	doc	  nodeptr		# input to command (NARG node)
 	expdoc    temp	char *expdoc	# actual document (for NXHERE)
 

Modified: projects/pf/head/bin/sh/sh.1
==============================================================================
--- projects/pf/head/bin/sh/sh.1	Mon Nov 11 20:22:03 2013	(r258006)
+++ projects/pf/head/bin/sh/sh.1	Mon Nov 11 20:33:25 2013	(r258007)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd June 14, 2013
+.Dd November 1, 2013
 .Dt SH 1
 .Os
 .Sh NAME
@@ -2551,7 +2551,7 @@ and not found.
 For aliases the alias expansion is printed;
 for commands and tracked aliases
 the complete pathname of the command is printed.
-.It Ic ulimit Oo Fl HSabcdflmnpstuvw Oc Op Ar limit
+.It Ic ulimit Oo Fl HSabcdfklmnpstuvw Oc Op Ar limit
 Set or display resource limits (see
 .Xr getrlimit 2 ) .
 If
@@ -2598,6 +2598,11 @@ The maximal size of core dump files, in 
 The maximal size of the data segment of a process, in kilobytes.
 .It Fl f Ar filesize
 The maximal size of a file, in 512-byte blocks.
+.It Fl k Ar kqueues
+The maximal number of kqueues
+(see
+.Xr kqueue 2 )
+for this user ID.
 .It Fl l Ar lockedmem
 The maximal size of memory that can be locked by a process, in
 kilobytes.

Modified: projects/pf/head/cddl/contrib/opensolaris/common/ctf/ctf_create.c
==============================================================================
--- projects/pf/head/cddl/contrib/opensolaris/common/ctf/ctf_create.c	Mon Nov 11 20:22:03 2013	(r258006)
+++ projects/pf/head/cddl/contrib/opensolaris/common/ctf/ctf_create.c	Mon Nov 11 20:33:25 2013	(r258007)
@@ -65,7 +65,7 @@ ctf_create(int *errp)
 	cts.cts_name = _CTF_SECTION;
 	cts.cts_type = SHT_PROGBITS;
 	cts.cts_flags = 0;
-	cts.cts_data = &hdr;
+	cts.cts_data = (void *)&hdr;
 	cts.cts_size = sizeof (hdr);
 	cts.cts_entsize = 1;
 	cts.cts_offset = 0;

Modified: projects/pf/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
==============================================================================
--- projects/pf/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Mon Nov 11 20:22:03 2013	(r258006)
+++ projects/pf/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Mon Nov 11 20:33:25 2013	(r258007)
@@ -1864,7 +1864,7 @@ dtrace_program_link(dtrace_hdl_t *dtp, d
 		 * Arches which default to 64-bit need to explicitly use
 		 * the 32-bit library path.
 		 */
-		int use_32 = !(dtp->dt_oflags & DTRACE_O_LP64);
+		int use_32 = (dtp->dt_oflags & DTRACE_O_ILP32);
 #else
 		/*
 		 * Arches which are 32-bit only just use the normal
@@ -1879,9 +1879,7 @@ dtrace_program_link(dtrace_hdl_t *dtp, d
 		len = snprintf(&tmp, 1, fmt, dtp->dt_ld_path, file, tfile,
 		    drti) + 1;
 
-#if !defined(sun)
 		len *= 2;
-#endif
 		cmd = alloca(len);
 
 		(void) snprintf(cmd, len, fmt, dtp->dt_ld_path, file,

Modified: projects/pf/head/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c
==============================================================================
--- projects/pf/head/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c	Mon Nov 11 20:22:03 2013	(r258006)
+++ projects/pf/head/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c	Mon Nov 11 20:33:25 2013	(r258007)
@@ -210,7 +210,7 @@ NVLIST_PRTFUNC(int32, int32_t, int32_t, 
 NVLIST_PRTFUNC(uint32, uint32_t, uint32_t, "0x%x")
 NVLIST_PRTFUNC(int64, int64_t, longlong_t, "%lld")
 NVLIST_PRTFUNC(uint64, uint64_t, u_longlong_t, "0x%llx")
-NVLIST_PRTFUNC(double, double, double, "0x%llf")
+NVLIST_PRTFUNC(double, double, double, "0x%f")
 NVLIST_PRTFUNC(string, char *, char *, "%s")
 NVLIST_PRTFUNC(hrtime, hrtime_t, hrtime_t, "0x%llx")
 

Modified: projects/pf/head/cddl/lib/libnvpair/Makefile
==============================================================================
--- projects/pf/head/cddl/lib/libnvpair/Makefile	Mon Nov 11 20:22:03 2013	(r258006)
+++ projects/pf/head/cddl/lib/libnvpair/Makefile	Mon Nov 11 20:33:25 2013	(r258007)
@@ -21,4 +21,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
 
+# This library uses macros to define fprintf behavior for several object types
+# The compiler will see the non-string literal arguments to the fprintf calls and
+# omit warnings for them. Quiesce these warnings in contrib code: 
+#
+# cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c:743:12: warning: format
+#   string is not a string literal (potentially insecure) [-Wformat-security]
+#    ARENDER(pctl, nvlist_array, nvl, name, val, nelem);
+#
+CFLAGS+= -Wno-format-security
 .include <bsd.lib.mk>

Modified: projects/pf/head/contrib/binutils/binutils/readelf.c
==============================================================================
--- projects/pf/head/contrib/binutils/binutils/readelf.c	Mon Nov 11 20:22:03 2013	(r258006)
+++ projects/pf/head/contrib/binutils/binutils/readelf.c	Mon Nov 11 20:33:25 2013	(r258007)
@@ -7118,7 +7118,7 @@ process_symbol_table (FILE *file)
 
 	      n = print_vma (si, DEC_5);
 	      if (n < 5)
-		fputs ("     " + n, stdout);
+		fputs (&"     "[n], stdout);
 	      printf (" %3lu: ", hn);
 	      print_vma (psym->st_value, LONG_HEX);
 	      putchar (' ');

Modified: projects/pf/head/contrib/binutils/opcodes/i386-dis.c
==============================================================================
--- projects/pf/head/contrib/binutils/opcodes/i386-dis.c	Mon Nov 11 20:22:03 2013	(r258006)
+++ projects/pf/head/contrib/binutils/opcodes/i386-dis.c	Mon Nov 11 20:33:25 2013	(r258007)
@@ -3474,7 +3474,7 @@ static bfd_vma start_pc;
  * The function returns the length of this instruction in bytes.
  */
 
-static char intel_syntax;
+static int intel_syntax;
 static char open_char;
 static char close_char;
 static char separator_char;
@@ -3547,7 +3547,7 @@ print_insn (bfd_vma pc, disassemble_info
   else
     address_mode = mode_32bit;
 
-  if (intel_syntax == (char) -1)
+  if (intel_syntax == -1)
     intel_syntax = (info->mach == bfd_mach_i386_i386_intel_syntax
 		    || info->mach == bfd_mach_x86_64_intel_syntax);
 
@@ -4326,7 +4326,7 @@ dofloat (int sizeflag)
 static void
 OP_ST (int bytemode ATTRIBUTE_UNUSED, int sizeflag ATTRIBUTE_UNUSED)
 {
-  oappend ("%st" + intel_syntax);
+  oappend (&"%st"[intel_syntax]);
 }
 
 static void
@@ -4677,32 +4677,32 @@ append_seg (void)
   if (prefixes & PREFIX_CS)
     {
       used_prefixes |= PREFIX_CS;
-      oappend ("%cs:" + intel_syntax);
+      oappend (&"%cs:"[intel_syntax]);
     }
   if (prefixes & PREFIX_DS)
     {
       used_prefixes |= PREFIX_DS;
-      oappend ("%ds:" + intel_syntax);
+      oappend (&"%ds:"[intel_syntax]);
     }
   if (prefixes & PREFIX_SS)
     {
       used_prefixes |= PREFIX_SS;
-      oappend ("%ss:" + intel_syntax);
+      oappend (&"%ss:"[intel_syntax]);
     }
   if (prefixes & PREFIX_ES)
     {
       used_prefixes |= PREFIX_ES;
-      oappend ("%es:" + intel_syntax);
+      oappend (&"%es:"[intel_syntax]);
     }
   if (prefixes & PREFIX_FS)
     {
       used_prefixes |= PREFIX_FS;
-      oappend ("%fs:" + intel_syntax);
+      oappend (&"%fs:"[intel_syntax]);
     }
   if (prefixes & PREFIX_GS)
     {
       used_prefixes |= PREFIX_GS;
-      oappend ("%gs:" + intel_syntax);
+      oappend (&"%gs:"[intel_syntax]);
     }
 }
 
@@ -5474,7 +5474,7 @@ OP_I (int bytemode, int sizeflag)
   op &= mask;
   scratchbuf[0] = '$';
   print_operand_value (scratchbuf + 1, 1, op);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
   scratchbuf[0] = '\0';
 }
 
@@ -5525,7 +5525,7 @@ OP_I64 (int bytemode, int sizeflag)
   op &= mask;
   scratchbuf[0] = '$';
   print_operand_value (scratchbuf + 1, 1, op);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
   scratchbuf[0] = '\0';
 }
 
@@ -5575,7 +5575,7 @@ OP_sI (int bytemode, int sizeflag)
 
   scratchbuf[0] = '$';
   print_operand_value (scratchbuf + 1, 1, op);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
 }
 
 static void
@@ -5755,7 +5755,7 @@ OP_ESreg (int code, int sizeflag)
 	  intel_operand_size (b_mode, sizeflag);
 	}
     }
-  oappend ("%es:" + intel_syntax);
+  oappend (&"%es:"[intel_syntax]);
   ptr_reg (code, sizeflag);
 }
 
@@ -5805,7 +5805,7 @@ OP_C (int dummy ATTRIBUTE_UNUSED, int si
       add = 8;
     }
   sprintf (scratchbuf, "%%cr%d", modrm.reg + add);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
 }
 
 static void
@@ -5826,7 +5826,7 @@ static void
 OP_T (int dummy ATTRIBUTE_UNUSED, int sizeflag ATTRIBUTE_UNUSED)
 {
   sprintf (scratchbuf, "%%tr%d", modrm.reg);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
 }
 
 static void
@@ -5852,7 +5852,7 @@ OP_MMX (int bytemode ATTRIBUTE_UNUSED, i
     }
   else
     sprintf (scratchbuf, "%%mm%d", modrm.reg);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
 }
 
 static void
@@ -5863,7 +5863,7 @@ OP_XMM (int bytemode ATTRIBUTE_UNUSED, i
   if (rex & REX_R)
     add = 8;
   sprintf (scratchbuf, "%%xmm%d", modrm.reg + add);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
 }
 
 static void
@@ -5895,7 +5895,7 @@ OP_EM (int bytemode, int sizeflag)
     }
   else
     sprintf (scratchbuf, "%%mm%d", modrm.rm);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
 }
 
 /* cvt* are the only instructions in sse2 which have
@@ -5922,7 +5922,7 @@ OP_EMC (int bytemode, int sizeflag)
   codep++;
   used_prefixes |= (prefixes & PREFIX_DATA);
   sprintf (scratchbuf, "%%mm%d", modrm.rm);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
 }
 
 static void
@@ -5930,7 +5930,7 @@ OP_MXC (int bytemode ATTRIBUTE_UNUSED, i
 {
   used_prefixes |= (prefixes & PREFIX_DATA);
   sprintf (scratchbuf, "%%mm%d", modrm.reg);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
 }
 
 static void
@@ -5950,7 +5950,7 @@ OP_EX (int bytemode, int sizeflag)
   MODRM_CHECK;
   codep++;
   sprintf (scratchbuf, "%%xmm%d", modrm.rm + add);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
 }
 
 static void
@@ -6547,7 +6547,7 @@ static void
 XMM_Fixup (int reg, int sizeflag ATTRIBUTE_UNUSED)
 {
   sprintf (scratchbuf, "%%xmm%d", reg);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
 }
 
 static void

Modified: projects/pf/head/contrib/libpcap/bpf/net/bpf_filter.c
==============================================================================
--- projects/pf/head/contrib/libpcap/bpf/net/bpf_filter.c	Mon Nov 11 20:22:03 2013	(r258006)
+++ projects/pf/head/contrib/libpcap/bpf/net/bpf_filter.c	Mon Nov 11 20:33:25 2013	(r258007)
@@ -209,8 +209,8 @@ m_xhalf(m, k, err)
  */
 u_int
 bpf_filter(pc, p, wirelen, buflen)
-	register struct bpf_insn *pc;
-	register u_char *p;
+	register const struct bpf_insn *pc;
+	register const u_char *p;
 	u_int wirelen;
 	register u_int buflen;
 {

Modified: projects/pf/head/contrib/libpcap/bpf_dump.c
==============================================================================
--- projects/pf/head/contrib/libpcap/bpf_dump.c	Mon Nov 11 20:22:03 2013	(r258006)
+++ projects/pf/head/contrib/libpcap/bpf_dump.c	Mon Nov 11 20:33:25 2013	(r258007)
@@ -31,7 +31,7 @@ static const char rcsid[] _U_ =
 #include <stdio.h>
 
 void
-bpf_dump(struct bpf_program *p, int option)
+bpf_dump(const struct bpf_program *p, int option)
 {
 	const struct bpf_insn *insn;
 	int i;

Modified: projects/pf/head/contrib/libpcap/bpf_image.c
==============================================================================
--- projects/pf/head/contrib/libpcap/bpf_image.c	Mon Nov 11 20:22:03 2013	(r258006)
+++ projects/pf/head/contrib/libpcap/bpf_image.c	Mon Nov 11 20:33:25 2013	(r258007)
@@ -53,7 +53,7 @@ static const char rcsid[] _U_ =
 
 char *
 bpf_image(p, n)
-	struct bpf_insn *p;
+	const struct bpf_insn *p;
 	int n;
 {
 	int v;

Modified: projects/pf/head/contrib/libpcap/pcap/bpf.h
==============================================================================
--- projects/pf/head/contrib/libpcap/pcap/bpf.h	Mon Nov 11 20:22:03 2013	(r258006)
+++ projects/pf/head/contrib/libpcap/pcap/bpf.h	Mon Nov 11 20:33:25 2013	(r258007)
@@ -1285,7 +1285,7 @@ struct bpf_insn {
 
 #if __STDC__ || defined(__cplusplus)
 extern int bpf_validate(const struct bpf_insn *, int);
-extern u_int bpf_filter(struct bpf_insn *, u_char *, u_int, u_int);
+extern u_int bpf_filter(const struct bpf_insn *, const u_char *, u_int, u_int);
 #else
 extern int bpf_validate();
 extern u_int bpf_filter();

Modified: projects/pf/head/contrib/libpcap/pcap/pcap.h
==============================================================================
--- projects/pf/head/contrib/libpcap/pcap/pcap.h	Mon Nov 11 20:22:03 2013	(r258006)
+++ projects/pf/head/contrib/libpcap/pcap/pcap.h	Mon Nov 11 20:33:25 2013	(r258007)
@@ -409,11 +409,11 @@ const char *pcap_lib_version(void);
  * declared when we build pcap-bpf.c.
  */
 #ifndef __NetBSD__
-u_int	bpf_filter(struct bpf_insn *, u_char *, u_int, u_int); 
+u_int	bpf_filter(const struct bpf_insn *, const u_char *, u_int, u_int); 
 #endif
 int	bpf_validate(const struct bpf_insn *f, int len);
-char	*bpf_image(struct bpf_insn *, int);
-void	bpf_dump(struct bpf_program *, int);
+char	*bpf_image(const struct bpf_insn *, int);
+void	bpf_dump(const struct bpf_program *, int);
 
 #if defined(WIN32)
 

Modified: projects/pf/head/contrib/libreadline/display.c
==============================================================================
--- projects/pf/head/contrib/libreadline/display.c	Mon Nov 11 20:22:03 2013	(r258006)
+++ projects/pf/head/contrib/libreadline/display.c	Mon Nov 11 20:33:25 2013	(r258007)
@@ -392,14 +392,14 @@ rl_expand_prompt (prompt)
       t = ++p;
       local_prompt = expand_prompt (p, &prompt_visible_length,
 				       &prompt_last_invisible,
-				       (int *)NULL,
+				       &prompt_invis_chars_first_line,
 				       &prompt_physical_chars);
       c = *t; *t = '\0';
       /* The portion of the prompt string up to and including the
 	 final newline is now null-terminated. */
       local_prompt_prefix = expand_prompt (prompt, &prompt_prefix_length,
 						   (int *)NULL,
-						   &prompt_invis_chars_first_line,
+						   (int *)NULL,
 						   (int *)NULL);
       *t = c;
       local_prompt_len = local_prompt ? strlen (local_prompt) : 0;
@@ -911,6 +911,10 @@ rl_redisplay ()
 	     second and subsequent lines start at inv_lbreaks[N], offset by
 	     OFFSET (which has already been calculated above).  */
 
+#define INVIS_FIRST()	(prompt_physical_chars > _rl_screenwidth ? prompt_invis_chars_first_line : wrap_offset)
+#define WRAP_OFFSET(line, offset)  ((line == 0) \
+					? (offset ? INVIS_FIRST() : 0) \
+					: ((line == prompt_last_screen_line) ? wrap_offset-prompt_invis_chars_first_line : 0))
 #define W_OFFSET(line, offset) ((line) == 0 ? offset : 0)
 #define VIS_LLEN(l)	((l) > _rl_vis_botlin ? 0 : (vis_lbreaks[l+1] - vis_lbreaks[l]))
 #define INV_LLEN(l)	(inv_lbreaks[l+1] - inv_lbreaks[l])
@@ -945,7 +949,13 @@ rl_redisplay ()
 		  _rl_last_c_pos != o_cpos &&
 		  _rl_last_c_pos > wrap_offset &&
 		  o_cpos < prompt_last_invisible)
-		_rl_last_c_pos -= wrap_offset;
+		_rl_last_c_pos -= prompt_invis_chars_first_line;	/* XXX - was wrap_offset */
+	      else if (linenum == prompt_last_screen_line && prompt_physical_chars > _rl_screenwidth &&
+			(MB_CUR_MAX > 1 && rl_byte_oriented == 0) &&
+			cpos_adjusted == 0 &&
+			_rl_last_c_pos != o_cpos &&
+			_rl_last_c_pos > (prompt_last_invisible - _rl_screenwidth - prompt_invis_chars_first_line))
+		_rl_last_c_pos -= (wrap_offset-prompt_invis_chars_first_line);
 		  
 	      /* If this is the line with the prompt, we might need to
 		 compensate for invisible characters in the new line. Do
@@ -1049,7 +1059,7 @@ rl_redisplay ()
 		tx = _rl_col_width (&visible_line[pos], 0, nleft) - visible_wrap_offset;
 	      else
 		tx = nleft;
-	      if (_rl_last_c_pos > tx)
+	      if (tx >= 0 && _rl_last_c_pos > tx)
 		{
 	          _rl_backspace (_rl_last_c_pos - tx);	/* XXX */
 	          _rl_last_c_pos = tx;
@@ -1205,7 +1215,7 @@ update_line (old, new, current_line, oma
      int current_line, omax, nmax, inv_botlin;
 {
   register char *ofd, *ols, *oe, *nfd, *nls, *ne;
-  int temp, lendiff, wsatend, od, nd;
+  int temp, lendiff, wsatend, od, nd, twidth, o_cpos;
   int current_invis_chars;
   int col_lendiff, col_temp;
 #if defined (HANDLE_MULTIBYTE)
@@ -1221,7 +1231,7 @@ update_line (old, new, current_line, oma
   if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
     temp = _rl_last_c_pos;
   else
-    temp = _rl_last_c_pos - W_OFFSET(_rl_last_v_pos, visible_wrap_offset);
+    temp = _rl_last_c_pos - WRAP_OFFSET (_rl_last_v_pos, visible_wrap_offset);
   if (temp == _rl_screenwidth && _rl_term_autowrap && !_rl_horizontal_scroll_mode
 	&& _rl_last_v_pos == current_line - 1)
     {
@@ -1466,6 +1476,8 @@ update_line (old, new, current_line, oma
 	_rl_last_c_pos = lendiff;
     }
 
+  o_cpos = _rl_last_c_pos;
+
   /* When this function returns, _rl_last_c_pos is correct, and an absolute
      cursor postion in multibyte mode, but a buffer index when not in a
      multibyte locale. */
@@ -1475,7 +1487,9 @@ update_line (old, new, current_line, oma
   /* We need to indicate that the cursor position is correct in the presence of
      invisible characters in the prompt string.  Let's see if setting this when
      we make sure we're at the end of the drawn prompt string works. */
-  if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && _rl_last_c_pos == prompt_physical_chars)
+  if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && 
+      (_rl_last_c_pos > 0 || o_cpos > 0) &&
+      _rl_last_c_pos == prompt_physical_chars)
     cpos_adjusted = 1;
 #endif
 #endif
@@ -1566,11 +1580,16 @@ update_line (old, new, current_line, oma
 	    }
 	  else
 	    {
-	      /* We have horizontal scrolling and we are not inserting at
-		 the end.  We have invisible characters in this line.  This
-		 is a dumb update. */
 	      _rl_output_some_chars (nfd, temp);
 	      _rl_last_c_pos += col_temp;
+	      /* If nfd begins before any invisible characters in the prompt,
+		 adjust _rl_last_c_pos to account for wrap_offset and set
+		 cpos_adjusted to let the caller know. */
+	      if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible))
+		{
+		  _rl_last_c_pos -= wrap_offset;
+		  cpos_adjusted = 1;
+		}
 	      return;
 	    }
 	  /* Copy (new) chars to screen from first diff to last match. */
@@ -1578,15 +1597,15 @@ update_line (old, new, current_line, oma
 	  if ((temp - lendiff) > 0)
 	    {
 	      _rl_output_some_chars (nfd + lendiff, temp - lendiff);
-#if 1
 	     /* XXX -- this bears closer inspection.  Fixes a redisplay bug
 		reported against bash-3.0-alpha by Andreas Schwab involving
 		multibyte characters and prompt strings with invisible
 		characters, but was previously disabled. */
-	      _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-col_lendiff);
-#else
-	      _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-lendiff);
-#endif
+	      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+		twidth = _rl_col_width (nfd+lendiff, 0, temp-col_lendiff);
+	      else
+		twidth = temp - lendiff;
+	      _rl_last_c_pos += twidth;
 	    }
 	}
       else
@@ -1780,7 +1799,7 @@ _rl_move_cursor_relative (new, data)
   int woff;			/* number of invisible chars on current line */
   int cpos, dpos;		/* current and desired cursor positions */
 
-  woff = W_OFFSET (_rl_last_v_pos, wrap_offset);
+  woff = WRAP_OFFSET (_rl_last_v_pos, wrap_offset);
   cpos = _rl_last_c_pos;
 #if defined (HANDLE_MULTIBYTE)
   /* If we have multibyte characters, NEW is indexed by the buffer point in
@@ -1794,7 +1813,11 @@ _rl_move_cursor_relative (new, data)
       /* Use NEW when comparing against the last invisible character in the
 	 prompt string, since they're both buffer indices and DPOS is a
 	 desired display position. */
-      if (new > prompt_last_invisible)		/* XXX - don't use woff here */
+      if ((new > prompt_last_invisible) ||		/* XXX - don't use woff here */
+	  (prompt_physical_chars > _rl_screenwidth &&
+	   _rl_last_v_pos == prompt_last_screen_line &&
+	   wrap_offset != woff &&
+	   new > (prompt_last_invisible-_rl_screenwidth-wrap_offset)))
 	{
 	  dpos -= woff;
 	  /* Since this will be assigned to _rl_last_c_pos at the end (more

Modified: projects/pf/head/contrib/libreadline/input.c
==============================================================================
--- projects/pf/head/contrib/libreadline/input.c	Mon Nov 11 20:22:03 2013	(r258006)
+++ projects/pf/head/contrib/libreadline/input.c	Mon Nov 11 20:33:25 2013	(r258007)
@@ -154,7 +154,7 @@ _rl_unget_char (key)
     {
       pop_index--;
       if (pop_index < 0)
-	pop_index = ibuffer_len - 1;
+	pop_index = ibuffer_len;
       ibuffer[pop_index] = key;
       return (1);
     }

Modified: projects/pf/head/contrib/libreadline/search.c
==============================================================================
--- projects/pf/head/contrib/libreadline/search.c	Mon Nov 11 20:22:03 2013	(r258006)
+++ projects/pf/head/contrib/libreadline/search.c	Mon Nov 11 20:33:25 2013	(r258007)
@@ -211,7 +211,11 @@ _rl_nsearch_init (dir, pchar)
   rl_end = rl_point = 0;
 
   p = _rl_make_prompt_for_search (pchar ? pchar : ':');
+#if defined (PREFER_STDARG)
+  rl_message ("%s", p);
+#else
   rl_message ("%s", p, 0);
+#endif
   free (p);
 
   RL_SETSTATE(RL_STATE_NSEARCH);

Modified: projects/pf/head/contrib/libreadline/support/shobj-conf
==============================================================================
--- projects/pf/head/contrib/libreadline/support/shobj-conf	Mon Nov 11 20:22:03 2013	(r258006)
+++ projects/pf/head/contrib/libreadline/support/shobj-conf	Mon Nov 11 20:33:25 2013	(r258007)
@@ -10,7 +10,7 @@
 # Chet Ramey
 # chet at po.cwru.edu
 
-# Copyright (C) 1996-2002 Free Software Foundation, Inc.
+# Copyright (C) 1996-2007 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -114,7 +114,7 @@ linux*-*|gnu*-*|k*bsd*-gnu-*)
 	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
 	;;
 
-freebsd2* | netbsd*)
+freebsd2*)
 	SHOBJ_CFLAGS=-fpic
 	SHOBJ_LD=ld
 	SHOBJ_LDFLAGS='-x -Bshareable'
@@ -125,7 +125,7 @@ freebsd2* | netbsd*)
 
 # FreeBSD-3.x ELF
 freebsd[3-9]*|freebsdelf[3-9]*|freebsdaout[3-9]*|dragonfly*)
-	SHOBJ_CFLAGS=-fpic
+	SHOBJ_CFLAGS=-fPIC
 	SHOBJ_LD='${CC}'
 
 	if [ -x /usr/bin/objformat ] && [ "`/usr/bin/objformat`" = "elf" ]; then
@@ -142,7 +142,7 @@ freebsd[3-9]*|freebsdelf[3-9]*|freebsdao
 	;;
 
 # Darwin/MacOS X
-darwin8*)
+darwin[89]*)
 	SHOBJ_STATUS=supported
 	SHLIB_STATUS=supported
 	
@@ -153,7 +153,7 @@ darwin8*)
 	SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)'
 	SHLIB_LIBSUFF='dylib'
 
-	SHOBJ_LDFLAGS='-undefined dynamic_lookup'
+	SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup -arch_only `/usr/bin/arch`'
 	SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
 
 	SHLIB_LIBS='-lncurses'	# see if -lcurses works on MacOS X 10.1 
@@ -171,7 +171,7 @@ darwin*|macosx*)
 	SHLIB_LIBSUFF='dylib'
 
 	case "${host_os}" in
-	darwin[78]*)	SHOBJ_LDFLAGS=''
+	darwin[789]*)	SHOBJ_LDFLAGS=''
 			SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
 			;;
 	*)		SHOBJ_LDFLAGS='-dynamic'
@@ -182,7 +182,7 @@ darwin*|macosx*)
 	SHLIB_LIBS='-lncurses'	# see if -lcurses works on MacOS X 10.1 
 	;;
 
-openbsd*)
+openbsd*|netbsd*)
 	SHOBJ_CFLAGS=-fPIC
 	SHOBJ_LD='${CC}'
 	SHOBJ_LDFLAGS='-shared'
@@ -247,7 +247,7 @@ osf*)
 	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
 	;;
 
-aix4.[2-9]*-*gcc*)		# lightly tested by jik at cisco.com
+aix4.[2-9]*-*gcc*|aix[5-9].*-*gcc*)		# lightly tested by jik at cisco.com
 	SHOBJ_CFLAGS=-fpic
 	SHOBJ_LD='ld'
 	SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall'
@@ -258,7 +258,7 @@ aix4.[2-9]*-*gcc*)		# lightly tested by 
 	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
 	;;
 
-aix4.[2-9]*)
+aix4.[2-9]*|aix[5-9].*)
 	SHOBJ_CFLAGS=-K
 	SHOBJ_LD='ld'
 	SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall'
@@ -329,7 +329,7 @@ hpux10*-*gcc*)
 	SHOBJ_LD='${CC}'
 	# if you have problems linking here, moving the `-Wl,+h,$@' from
 	# SHLIB_XLDFLAGS to SHOBJ_LDFLAGS has been reported to work
-	SHOBJ_LDFLAGS='-shared -Wl,-b -Wl,+s'
+	SHOBJ_LDFLAGS='-shared -fpic -Wl,-b -Wl,+s'
 
 	SHLIB_XLDFLAGS='-Wl,+h,$@ -Wl,+b,$(libdir)'
 	SHLIB_LIBSUFF='sl'

Modified: projects/pf/head/contrib/llvm/include/llvm/Support/Dwarf.h
==============================================================================
--- projects/pf/head/contrib/llvm/include/llvm/Support/Dwarf.h	Mon Nov 11 20:22:03 2013	(r258006)
+++ projects/pf/head/contrib/llvm/include/llvm/Support/Dwarf.h	Mon Nov 11 20:33:25 2013	(r258007)
@@ -484,6 +484,9 @@ enum dwarf_constants {
   DW_OP_lo_user = 0xe0,
   DW_OP_hi_user = 0xff,
 
+  // Extensions for GNU-style thread-local storage.
+  DW_OP_GNU_push_tls_address = 0xe0,
+
   // Extensions for Fission proposal.
   DW_OP_GNU_addr_index = 0xfb,
   DW_OP_GNU_const_index = 0xfc,

Modified: projects/pf/head/contrib/llvm/include/llvm/Support/ELF.h
==============================================================================
--- projects/pf/head/contrib/llvm/include/llvm/Support/ELF.h	Mon Nov 11 20:22:03 2013	(r258006)
+++ projects/pf/head/contrib/llvm/include/llvm/Support/ELF.h	Mon Nov 11 20:33:25 2013	(r258007)
@@ -1468,7 +1468,81 @@ enum {
   DT_VERDEF       = 0X6FFFFFFC, // The address of the version definition table.
   DT_VERDEFNUM    = 0X6FFFFFFD, // The number of entries in DT_VERDEF.
   DT_VERNEED      = 0X6FFFFFFE, // The address of the version Dependency table.
-  DT_VERNEEDNUM   = 0X6FFFFFFF  // The number of entries in DT_VERNEED.
+  DT_VERNEEDNUM   = 0X6FFFFFFF, // The number of entries in DT_VERNEED.
+
+  // Mips specific dynamic table entry tags.
+  DT_MIPS_RLD_VERSION   = 0x70000001, // 32 bit version number for runtime
+                                      // linker interface.
+  DT_MIPS_TIME_STAMP    = 0x70000002, // Time stamp.
+  DT_MIPS_ICHECKSUM     = 0x70000003, // Checksum of external strings
+                                      // and common sizes.
+  DT_MIPS_IVERSION      = 0x70000004, // Index of version string
+                                      // in string table.
+  DT_MIPS_FLAGS         = 0x70000005, // 32 bits of flags.
+  DT_MIPS_BASE_ADDRESS  = 0x70000006, // Base address of the segment.
+  DT_MIPS_MSYM          = 0x70000007, // Address of .msym section.
+  DT_MIPS_CONFLICT      = 0x70000008, // Address of .conflict section.
+  DT_MIPS_LIBLIST       = 0x70000009, // Address of .liblist section.
+  DT_MIPS_LOCAL_GOTNO   = 0x7000000a, // Number of local global offset
+                                      // table entries.
+  DT_MIPS_CONFLICTNO    = 0x7000000b, // Number of entries
+                                      // in the .conflict section.
+  DT_MIPS_LIBLISTNO     = 0x70000010, // Number of entries
+                                      // in the .liblist section.
+  DT_MIPS_SYMTABNO      = 0x70000011, // Number of entries
+                                      // in the .dynsym section.
+  DT_MIPS_UNREFEXTNO    = 0x70000012, // Index of first external dynamic symbol
+                                      // not referenced locally.
+  DT_MIPS_GOTSYM        = 0x70000013, // Index of first dynamic symbol
+                                      // in global offset table.
+  DT_MIPS_HIPAGENO      = 0x70000014, // Number of page table entries
+                                      // in global offset table.
+  DT_MIPS_RLD_MAP       = 0x70000016, // Address of run time loader map,
+                                      // used for debugging.
+  DT_MIPS_DELTA_CLASS       = 0x70000017, // Delta C++ class definition.
+  DT_MIPS_DELTA_CLASS_NO    = 0x70000018, // Number of entries
+                                          // in DT_MIPS_DELTA_CLASS.
+  DT_MIPS_DELTA_INSTANCE    = 0x70000019, // Delta C++ class instances.
+  DT_MIPS_DELTA_INSTANCE_NO = 0x7000001A, // Number of entries
+                                          // in DT_MIPS_DELTA_INSTANCE.
+  DT_MIPS_DELTA_RELOC       = 0x7000001B, // Delta relocations.
+  DT_MIPS_DELTA_RELOC_NO    = 0x7000001C, // Number of entries
+                                          // in DT_MIPS_DELTA_RELOC.
+  DT_MIPS_DELTA_SYM         = 0x7000001D, // Delta symbols that Delta
+                                          // relocations refer to.
+  DT_MIPS_DELTA_SYM_NO      = 0x7000001E, // Number of entries
+                                          // in DT_MIPS_DELTA_SYM.
+  DT_MIPS_DELTA_CLASSSYM    = 0x70000020, // Delta symbols that hold
+                                          // class declarations.
+  DT_MIPS_DELTA_CLASSSYM_NO = 0x70000021, // Number of entries
+                                          // in DT_MIPS_DELTA_CLASSSYM.
+  DT_MIPS_CXX_FLAGS         = 0x70000022, // Flags indicating information
+                                          // about C++ flavor.
+  DT_MIPS_PIXIE_INIT        = 0x70000023, // Pixie information.
+  DT_MIPS_SYMBOL_LIB        = 0x70000024, // Address of .MIPS.symlib
+  DT_MIPS_LOCALPAGE_GOTIDX  = 0x70000025, // The GOT index of the first PTE
+                                          // for a segment
+  DT_MIPS_LOCAL_GOTIDX      = 0x70000026, // The GOT index of the first PTE
+                                          // for a local symbol
+  DT_MIPS_HIDDEN_GOTIDX     = 0x70000027, // The GOT index of the first PTE
+                                          // for a hidden symbol
+  DT_MIPS_PROTECTED_GOTIDX  = 0x70000028, // The GOT index of the first PTE
+                                          // for a protected symbol
+  DT_MIPS_OPTIONS           = 0x70000029, // Address of `.MIPS.options'.
+  DT_MIPS_INTERFACE         = 0x7000002A, // Address of `.interface'.
+  DT_MIPS_DYNSTR_ALIGN      = 0x7000002B, // Unknown.
+  DT_MIPS_INTERFACE_SIZE    = 0x7000002C, // Size of the .interface section.
+  DT_MIPS_RLD_TEXT_RESOLVE_ADDR = 0x7000002D, // Size of rld_text_resolve
+                                              // function stored in the GOT.
+  DT_MIPS_PERF_SUFFIX       = 0x7000002E, // Default suffix of DSO to be added
+                                          // by rld on dlopen() calls.
+  DT_MIPS_COMPACT_SIZE      = 0x7000002F, // Size of compact relocation
+                                          // section (O32).
+  DT_MIPS_GP_VALUE          = 0x70000030, // GP value for auxiliary GOTs.
+  DT_MIPS_AUX_DYNAMIC       = 0x70000031, // Address of auxiliary .dynamic.
+  DT_MIPS_PLTGOT            = 0x70000032, // Address of the base of the PLTGOT.
+  DT_MIPS_RWPLT             = 0x70000034  // Points to the base
+                                          // of a writable PLT.
 };
 
 // DT_FLAGS values.
@@ -1501,6 +1575,31 @@ enum {
   DF_1_DISPRELPND = 0x00010000  // Disp reloc applied at run-time.
 };
 

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


More information about the svn-src-projects mailing list