svn commit: r260905 - in projects/sendfile: . bin/cat bin/df bin/pax/tests bin/sh bin/sh/tests bin/test/tests cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zinject cddl/usr.bin/zinj...

Gleb Smirnoff glebius at FreeBSD.org
Mon Jan 20 12:11:58 UTC 2014 

Author: glebius
Date: Mon Jan 20 12:11:47 2014
New Revision: 260905
URL: http://svnweb.freebsd.org/changeset/base/260905

Log:
  Merge head up to r260904.

Added:
  projects/sendfile/bin/pax/tests/legacy_test.pl
     - copied unchanged from r260904, head/bin/pax/tests/legacy_test.pl
  projects/sendfile/contrib/atf/atf-c++/atf-c++.pc.in
     - copied unchanged from r260904, head/contrib/atf/atf-c++/atf-c++.pc.in
  projects/sendfile/contrib/atf/atf-c/atf-c.pc.in
     - copied unchanged from r260904, head/contrib/atf/atf-c/atf-c.pc.in
  projects/sendfile/contrib/atf/atf-sh/atf-sh.pc.in
     - copied unchanged from r260904, head/contrib/atf/atf-sh/atf-sh.pc.in
  projects/sendfile/lib/atf/common.mk
     - copied unchanged from r260904, head/lib/atf/common.mk
  projects/sendfile/lib/atf/libatf-c++/tests/Makefile.inc
     - copied unchanged from r260904, head/lib/atf/libatf-c++/tests/Makefile.inc
  projects/sendfile/lib/atf/libatf-c++/tests/detail/
     - copied from r260904, head/lib/atf/libatf-c++/tests/detail/
  projects/sendfile/lib/atf/libatf-c/tests/Makefile.inc
     - copied unchanged from r260904, head/lib/atf/libatf-c/tests/Makefile.inc
  projects/sendfile/lib/atf/libatf-c/tests/detail/
     - copied from r260904, head/lib/atf/libatf-c/tests/detail/
  projects/sendfile/release/doc/en_US.ISO8859-1/share/xml/catalog.xml
     - copied unchanged from r260904, head/release/doc/en_US.ISO8859-1/share/xml/catalog.xml
  projects/sendfile/release/doc/en_US.ISO8859-1/share/xml/release.xsl
     - copied unchanged from r260904, head/release/doc/en_US.ISO8859-1/share/xml/release.xsl
  projects/sendfile/release/doc/share/xml/release.xsl
     - copied unchanged from r260904, head/release/doc/share/xml/release.xsl
  projects/sendfile/release/pkg_repos/
     - copied from r260904, head/release/pkg_repos/
  projects/sendfile/share/man/man4/geom_uncompress.4
     - copied unchanged from r260904, head/share/man/man4/geom_uncompress.4
  projects/sendfile/share/man/man4/virtio_random.4
     - copied unchanged from r260904, head/share/man/man4/virtio_random.4
  projects/sendfile/sys/amd64/conf/VT
     - copied unchanged from r260904, head/sys/amd64/conf/VT
  projects/sendfile/sys/arm/at91/at91_gpio.h
     - copied unchanged from r260904, head/sys/arm/at91/at91_gpio.h
  projects/sendfile/sys/arm/at91/at91_smc.c
     - copied unchanged from r260904, head/sys/arm/at91/at91_smc.c
  projects/sendfile/sys/arm/at91/at91_smc.h
     - copied unchanged from r260904, head/sys/arm/at91/at91_smc.h
  projects/sendfile/sys/contrib/dev/iwn/iwlwifi-105-6-18.168.6.1.fw.uu
     - copied unchanged from r260904, head/sys/contrib/dev/iwn/iwlwifi-105-6-18.168.6.1.fw.uu
  projects/sendfile/sys/dev/nand/nfc_at91.h
     - copied unchanged from r260904, head/sys/dev/nand/nfc_at91.h
  projects/sendfile/sys/dev/virtio/random/
     - copied from r260904, head/sys/dev/virtio/random/
  projects/sendfile/sys/i386/conf/VT
     - copied unchanged from r260904, head/sys/i386/conf/VT
  projects/sendfile/sys/modules/iwnfw/iwn105/
     - copied from r260904, head/sys/modules/iwnfw/iwn105/
  projects/sendfile/sys/modules/virtio/random/
     - copied from r260904, head/sys/modules/virtio/random/
Deleted:
  projects/sendfile/bin/pax/tests/legacy_test.sh
  projects/sendfile/release/amd64/pkg-stage.conf
  projects/sendfile/release/doc/de_DE.ISO8859-1/
  projects/sendfile/release/doc/en_US.ISO8859-1/share/xml/catalog
  projects/sendfile/release/doc/en_US.ISO8859-1/share/xml/release.dsl
  projects/sendfile/release/doc/fr_FR.ISO8859-1/
  projects/sendfile/release/doc/ja_JP.eucJP/
  projects/sendfile/release/doc/ru_RU.KOI8-R/
  projects/sendfile/release/doc/share/xml/catalog
  projects/sendfile/release/doc/share/xml/default.dsl
  projects/sendfile/release/doc/share/xml/release.dsl
  projects/sendfile/release/doc/zh_CN.GB2312/
  projects/sendfile/release/i386/pkg-stage.conf
Modified:
  projects/sendfile/UPDATING
  projects/sendfile/bin/cat/cat.c
  projects/sendfile/bin/df/df.1
  projects/sendfile/bin/pax/tests/Makefile
  projects/sendfile/bin/sh/input.c
  projects/sendfile/bin/sh/tests/Makefile
  projects/sendfile/bin/sh/trap.c
  projects/sendfile/bin/sh/trap.h
  projects/sendfile/bin/test/tests/Makefile
  projects/sendfile/cddl/contrib/opensolaris/cmd/zdb/zdb.c
  projects/sendfile/cddl/contrib/opensolaris/cmd/zinject/zinject.c
  projects/sendfile/cddl/usr.bin/zinject/Makefile
  projects/sendfile/contrib/atf/FREEBSD-Xlist
  projects/sendfile/contrib/atf/atf-c++/detail/test_helpers.cpp
  projects/sendfile/contrib/bsnmp/lib/snmpagent.c
  projects/sendfile/contrib/gcc/config/arm/freebsd.h
  projects/sendfile/contrib/gcc/cp/ChangeLog.apple
  projects/sendfile/contrib/gcc/cp/parser.c
  projects/sendfile/contrib/ntp/ntpd/ntp_config.c
  projects/sendfile/etc/defaults/rc.conf
  projects/sendfile/etc/mtree/BSD.tests.dist
  projects/sendfile/gnu/lib/libgcc/Makefile
  projects/sendfile/gnu/usr.bin/gdb/kgdb/trgt.c
  projects/sendfile/lib/atf/Makefile.inc
  projects/sendfile/lib/atf/libatf-c++/Makefile
  projects/sendfile/lib/atf/libatf-c++/tests/Makefile
  projects/sendfile/lib/atf/libatf-c/Makefile
  projects/sendfile/lib/atf/libatf-c/tests/Makefile
  projects/sendfile/lib/libc/Makefile
  projects/sendfile/lib/libc/gen/fts.3
  projects/sendfile/lib/libc/gen/fts.c
  projects/sendfile/lib/libc/include/port_before.h
  projects/sendfile/lib/libc/resolv/res_send.c
  projects/sendfile/lib/libc/stdlib/getsubopt.c
  projects/sendfile/lib/libc/sys/accept.2
  projects/sendfile/lib/libc/sys/chflags.2
  projects/sendfile/lib/libc/sys/pipe.2
  projects/sendfile/lib/libcxxrt/Version.map
  projects/sendfile/lib/libfetch/common.c
  projects/sendfile/lib/libkvm/Makefile
  projects/sendfile/lib/libkvm/kvm_ia64.c
  projects/sendfile/lib/libmd/sha256.h
  projects/sendfile/lib/libmd/sha256c.c
  projects/sendfile/libexec/rtld-elf/Makefile
  projects/sendfile/release/Makefile
  projects/sendfile/release/doc/en_US.ISO8859-1/errata/article.xml
  projects/sendfile/release/doc/en_US.ISO8859-1/relnotes/article.xml
  projects/sendfile/release/doc/share/mk/doc.relnotes.mk
  projects/sendfile/release/doc/share/xml/catalog.xml
  projects/sendfile/release/scripts/pkg-stage.sh
  projects/sendfile/sbin/camcontrol/camcontrol.c
  projects/sendfile/sbin/casperd/casperd.c
  projects/sendfile/sbin/geom/class/part/geom_part.c   (contents, props changed)
  projects/sendfile/sbin/kldload/kldload.c
  projects/sendfile/sbin/route/keywords
  projects/sendfile/sbin/route/route.8
  projects/sendfile/sbin/route/route.c
  projects/sendfile/share/keys/pkg/trusted/pkg.freebsd.org.2013102301
  projects/sendfile/share/man/man4/Makefile
  projects/sendfile/share/man/man4/kld.4
  projects/sendfile/share/man/man9/Makefile
  projects/sendfile/share/man/man9/malloc.9
  projects/sendfile/share/man/man9/mbuf.9
  projects/sendfile/share/man/man9/sglist.9
  projects/sendfile/share/misc/committers-ports.dot
  projects/sendfile/share/mk/bsd.libnames.mk
  projects/sendfile/share/mk/bsd.test.mk
  projects/sendfile/share/mk/tap.test.mk
  projects/sendfile/sys/amd64/amd64/identcpu.c
  projects/sendfile/sys/amd64/conf/NOTES
  projects/sendfile/sys/amd64/include/vmm.h   (contents, props changed)
  projects/sendfile/sys/amd64/vmm/amd/amdv.c
  projects/sendfile/sys/amd64/vmm/intel/vmcs.c
  projects/sendfile/sys/amd64/vmm/intel/vmcs.h
  projects/sendfile/sys/amd64/vmm/intel/vmx.c
  projects/sendfile/sys/amd64/vmm/intel/vmx.h
  projects/sendfile/sys/amd64/vmm/intel/vmx_genassym.c
  projects/sendfile/sys/amd64/vmm/intel/vmx_support.S
  projects/sendfile/sys/amd64/vmm/io/vioapic.c
  projects/sendfile/sys/amd64/vmm/io/vlapic.c
  projects/sendfile/sys/amd64/vmm/io/vlapic.h
  projects/sendfile/sys/amd64/vmm/vmm.c
  projects/sendfile/sys/amd64/vmm/vmm_stat.c
  projects/sendfile/sys/amd64/vmm/vmm_stat.h
  projects/sendfile/sys/arm/arm/devmap.c
  projects/sendfile/sys/arm/arm/machdep.c
  projects/sendfile/sys/arm/at91/at91rm9200.c
  projects/sendfile/sys/arm/at91/at91sam9260.c
  projects/sendfile/sys/arm/at91/at91sam9g20.c
  projects/sendfile/sys/arm/at91/at91sam9g45.c
  projects/sendfile/sys/arm/at91/at91sam9x5.c
  projects/sendfile/sys/arm/at91/at91var.h
  projects/sendfile/sys/arm/at91/board_hl201.c
  projects/sendfile/sys/arm/at91/board_sam9260ek.c
  projects/sendfile/sys/arm/at91/files.at91
  projects/sendfile/sys/arm/at91/uart_dev_at91usart.c
  projects/sendfile/sys/arm/conf/ATMEL
  projects/sendfile/sys/arm/conf/HL201
  projects/sendfile/sys/arm/conf/SAM9260EK
  projects/sendfile/sys/arm/freescale/imx/imx51_ipuv3_fbd.c
  projects/sendfile/sys/arm/include/devmap.h
  projects/sendfile/sys/arm/s3c2xx0/uart_dev_s3c2410.c
  projects/sendfile/sys/arm/sa11x0/uart_dev_sa1110.c
  projects/sendfile/sys/arm/xilinx/uart_dev_cdnc.c
  projects/sendfile/sys/cam/cam_debug.h
  projects/sendfile/sys/cam/cam_periph.c
  projects/sendfile/sys/cam/cam_periph.h
  projects/sendfile/sys/cam/cam_xpt.c
  projects/sendfile/sys/cam/scsi/scsi_low.c
  projects/sendfile/sys/cam/scsi/scsi_xpt.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
  projects/sendfile/sys/compat/freebsd32/freebsd32_misc.c
  projects/sendfile/sys/conf/Makefile.arm
  projects/sendfile/sys/conf/files.amd64
  projects/sendfile/sys/conf/files.i386
  projects/sendfile/sys/contrib/ipfilter/netinet/ip_compat.h
  projects/sendfile/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c   (contents, props changed)
  projects/sendfile/sys/dev/aha/aha.c
  projects/sendfile/sys/dev/ahci/ahci.c
  projects/sendfile/sys/dev/altera/atse/if_atse.c
  projects/sendfile/sys/dev/bxe/bxe.c
  projects/sendfile/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  projects/sendfile/sys/dev/mfi/mfi_cam.c
  projects/sendfile/sys/dev/nand/nfc_at91.c
  projects/sendfile/sys/dev/netmap/netmap.c
  projects/sendfile/sys/dev/netmap/netmap_generic.c
  projects/sendfile/sys/dev/netmap/netmap_mem2.c
  projects/sendfile/sys/dev/netmap/netmap_vale.c
  projects/sendfile/sys/dev/qlxge/qls_os.c
  projects/sendfile/sys/dev/uart/uart_core.c
  projects/sendfile/sys/dev/uart/uart_cpu.h
  projects/sendfile/sys/dev/uart/uart_dev_imx.c
  projects/sendfile/sys/dev/uart/uart_dev_lpc.c
  projects/sendfile/sys/dev/uart/uart_dev_ns8250.c
  projects/sendfile/sys/dev/uart/uart_dev_ns8250.h
  projects/sendfile/sys/dev/uart/uart_dev_pl011.c
  projects/sendfile/sys/dev/uart/uart_dev_quicc.c
  projects/sendfile/sys/dev/uart/uart_dev_sab82532.c
  projects/sendfile/sys/dev/uart/uart_dev_z8530.c
  projects/sendfile/sys/dev/uart/uart_if.m
  projects/sendfile/sys/dev/usb/controller/ehci.c
  projects/sendfile/sys/dev/usb/controller/uhci.c
  projects/sendfile/sys/dev/usb/controller/xhci.c
  projects/sendfile/sys/dev/usb/input/ukbd.c
  projects/sendfile/sys/dev/usb/net/uhso.c
  projects/sendfile/sys/dev/usb/serial/u3g.c
  projects/sendfile/sys/dev/usb/serial/umcs.c
  projects/sendfile/sys/dev/usb/usb_dev.c
  projects/sendfile/sys/dev/usb/usb_device.c
  projects/sendfile/sys/dev/usb/usb_device.h
  projects/sendfile/sys/dev/usb/usb_hub.c
  projects/sendfile/sys/dev/usb/usb_hub.h
  projects/sendfile/sys/dev/usb/usb_request.c
  projects/sendfile/sys/dev/usb/usb_transfer.c
  projects/sendfile/sys/dev/usb/wlan/if_rsu.c
  projects/sendfile/sys/dev/usb/wlan/if_run.c
  projects/sendfile/sys/dev/virtio/block/virtio_blk.c
  projects/sendfile/sys/dev/virtio/scsi/virtio_scsi.c
  projects/sendfile/sys/dev/vt/hw/xboxfb/xboxfb.c
  projects/sendfile/sys/fs/ext2fs/ext2_inode_cnv.c
  projects/sendfile/sys/fs/nfs/nfs_var.h
  projects/sendfile/sys/fs/nfsserver/nfs_nfsdcache.c
  projects/sendfile/sys/fs/nfsserver/nfs_nfsdkrpc.c
  projects/sendfile/sys/geom/multipath/g_multipath.c
  projects/sendfile/sys/geom/uncompress/g_uncompress.c
  projects/sendfile/sys/i386/conf/NOTES
  projects/sendfile/sys/i386/i386/identcpu.c
  projects/sendfile/sys/ia64/conf/GENERIC
  projects/sendfile/sys/ia64/ia64/exception.S
  projects/sendfile/sys/kern/kern_event.c
  projects/sendfile/sys/kern/subr_sglist.c
  projects/sendfile/sys/kern/subr_witness.c
  projects/sendfile/sys/kern/uipc_mbuf.c
  projects/sendfile/sys/kern/uipc_sockbuf.c
  projects/sendfile/sys/kern/uipc_socket.c
  projects/sendfile/sys/kern/uipc_syscalls.c
  projects/sendfile/sys/mips/adm5120/uart_dev_adm5120.c
  projects/sendfile/sys/mips/atheros/uart_dev_ar933x.c
  projects/sendfile/sys/mips/cavium/ciu.c
  projects/sendfile/sys/mips/cavium/uart_dev_oct16550.c
  projects/sendfile/sys/mips/rt305x/uart_dev_rt305x.c
  projects/sendfile/sys/modules/geom/Makefile
  projects/sendfile/sys/modules/geom/geom_uncompress/Makefile
  projects/sendfile/sys/modules/iwnfw/Makefile
  projects/sendfile/sys/modules/sound/driver/ai2s/Makefile
  projects/sendfile/sys/modules/virtio/Makefile
  projects/sendfile/sys/net/ieee8023ad_lacp.c
  projects/sendfile/sys/net/if.c
  projects/sendfile/sys/net/if_arcsubr.c
  projects/sendfile/sys/net/if_dl.h
  projects/sendfile/sys/net/if_ethersubr.c
  projects/sendfile/sys/net/if_fddisubr.c
  projects/sendfile/sys/net/if_iso88025subr.c
  projects/sendfile/sys/net/if_lagg.c
  projects/sendfile/sys/net/netmap_user.h
  projects/sendfile/sys/net/route.c
  projects/sendfile/sys/net/route.h
  projects/sendfile/sys/net/rtsock.c
  projects/sendfile/sys/net80211/ieee80211_mesh.c
  projects/sendfile/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
  projects/sendfile/sys/netinet/in.c
  projects/sendfile/sys/netinet/in_mcast.c
  projects/sendfile/sys/netinet/ip_carp.c
  projects/sendfile/sys/netinet/ip_output.c
  projects/sendfile/sys/netinet/tcp_syncache.c
  projects/sendfile/sys/netinet6/in6.c
  projects/sendfile/sys/netinet6/in6_ifattach.c
  projects/sendfile/sys/netinet6/in6_mcast.c
  projects/sendfile/sys/netinet6/in6_var.h
  projects/sendfile/sys/netinet6/ip6_mroute.c
  projects/sendfile/sys/netinet6/ip6_mroute.h
  projects/sendfile/sys/netinet6/mld6.c
  projects/sendfile/sys/netinet6/nd6.c
  projects/sendfile/sys/netinet6/nd6.h
  projects/sendfile/sys/netinet6/nd6_rtr.c
  projects/sendfile/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
  projects/sendfile/sys/powerpc/include/atomic.h
  projects/sendfile/sys/powerpc/powermac/macgpio.c
  projects/sendfile/sys/powerpc/powermac/macgpiovar.h
  projects/sendfile/sys/powerpc/powermac/pmu.c
  projects/sendfile/sys/sys/mbuf.h
  projects/sendfile/sys/sys/random.h
  projects/sendfile/sys/sys/sf_base.h
  projects/sendfile/sys/sys/sf_sync.h
  projects/sendfile/sys/sys/sglist.h
  projects/sendfile/sys/sys/socket.h
  projects/sendfile/sys/vm/vm_pageout.c
  projects/sendfile/tools/build/mk/OptionalObsoleteFiles.inc
  projects/sendfile/tools/tools/mcgrab/mcgrab.cc
  projects/sendfile/tools/tools/netmap/Makefile
  projects/sendfile/tools/tools/netmap/bridge.c
  projects/sendfile/tools/tools/netmap/nm_util.c
  projects/sendfile/tools/tools/netmap/nm_util.h
  projects/sendfile/tools/tools/netmap/pcap.c
  projects/sendfile/tools/tools/netmap/pkt-gen.c
  projects/sendfile/tools/tools/netmap/vale-ctl.c
  projects/sendfile/tools/tools/usbtest/usb_msc_test.c
  projects/sendfile/tools/tools/usbtest/usb_msc_test.h
  projects/sendfile/usr.bin/atf/atf-sh/Makefile
  projects/sendfile/usr.bin/atf/atf-sh/tests/Makefile
  projects/sendfile/usr.bin/elfdump/elfdump.c
  projects/sendfile/usr.bin/find/function.c
  projects/sendfile/usr.bin/killall/killall.c
  projects/sendfile/usr.bin/ktrdump/ktrdump.c
  projects/sendfile/usr.bin/netstat/main.c
  projects/sendfile/usr.bin/netstat/netstat.1
  projects/sendfile/usr.bin/script/script.c
  projects/sendfile/usr.sbin/bhyvectl/bhyvectl.c
  projects/sendfile/usr.sbin/bsdconfig/share/strings.subr
  projects/sendfile/usr.sbin/bsdinstall/scripts/services
Directory Properties:
  projects/sendfile/   (props changed)
  projects/sendfile/cddl/   (props changed)
  projects/sendfile/cddl/contrib/opensolaris/   (props changed)
  projects/sendfile/contrib/atf/   (props changed)
  projects/sendfile/contrib/gcc/   (props changed)
  projects/sendfile/contrib/ntp/   (props changed)
  projects/sendfile/etc/   (props changed)
  projects/sendfile/gnu/lib/   (props changed)
  projects/sendfile/gnu/usr.bin/gdb/   (props changed)
  projects/sendfile/lib/libc/   (props changed)
  projects/sendfile/sbin/   (props changed)
  projects/sendfile/share/man/man4/   (props changed)
  projects/sendfile/sys/   (props changed)
  projects/sendfile/sys/amd64/vmm/   (props changed)
  projects/sendfile/sys/cddl/contrib/opensolaris/   (props changed)
  projects/sendfile/sys/conf/   (props changed)
  projects/sendfile/sys/contrib/ipfilter/   (props changed)
  projects/sendfile/sys/dev/hyperv/   (props changed)
  projects/sendfile/usr.sbin/bhyvectl/   (props changed)

Modified: projects/sendfile/UPDATING
==============================================================================
--- projects/sendfile/UPDATING	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/UPDATING	Mon Jan 20 12:11:47 2014	(r260905)
@@ -31,6 +31,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20140110:
+	If a Makefile in a tests/ directory was auto-generating a Kyuafile
+	instead of providing an explicit one, this would prevent such
+	Makefile from providing its own Kyuafile in the future during
+	NO_CLEAN builds.  This has been fixed in the Makefiles but manual
+	intervention is needed to clean an objdir if you use NO_CLEAN:
+	  # find /usr/obj -name Kyuafile | xargs rm -f
+
 20131213:
 	The behavior of gss_pseudo_random() for the krb5 mechanism
 	has changed, for applications requesting a longer random string

Modified: projects/sendfile/bin/cat/cat.c
==============================================================================
--- projects/sendfile/bin/cat/cat.c	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/bin/cat/cat.c	Mon Jan 20 12:11:47 2014	(r260905)
@@ -316,6 +316,7 @@ udom_open(const char *path, int flags)
 		sou.sun_family = AF_UNIX;
 		if ((len = strlcpy(sou.sun_path, path,
 		    sizeof(sou.sun_path))) >= sizeof(sou.sun_path)) {
+			close(fd);
 			errno = ENAMETOOLONG;
 			return (-1);
 		}

Modified: projects/sendfile/bin/df/df.1
==============================================================================
--- projects/sendfile/bin/df/df.1	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/bin/df/df.1	Mon Jan 20 12:11:47 2014	(r260905)
@@ -29,7 +29,7 @@
 .\"     @(#)df.1	8.3 (Berkeley) 5/8/95
 .\" $FreeBSD$
 .\"
-.Dd January 24, 2013
+.Dd January 16, 2014
 .Dt DF 1
 .Os
 .Sh NAME
@@ -83,13 +83,13 @@ Use 1073741824 byte (1 Gibibyte) blocks 
 This overrides any
 .Ev BLOCKSIZE
 specification from the environment.
-.It Fl H
+.It Fl h
 .Dq Human-readable
 output.
 Use unit suffixes: Byte, Kibibyte, Mebibyte, Gibibyte, Tebibyte and
 Pebibyte (based on powers of 1024) in order to reduce the number of
 digits to four or fewer.
-.It Fl h
+.It Fl H
 .Dq Human-readable
 output.
 Use unit suffixes: Byte, Kilobyte, Megabyte,

Modified: projects/sendfile/bin/pax/tests/Makefile
==============================================================================
--- projects/sendfile/bin/pax/tests/Makefile	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/bin/pax/tests/Makefile	Mon Jan 20 12:11:47 2014	(r260905)
@@ -4,6 +4,6 @@
 
 TESTSDIR=	${TESTSBASE}/bin/pax
 
-TAP_TESTS_SH=	legacy_test
+TAP_TESTS_PERL=	legacy_test
 
 .include <tap.test.mk>

Copied: projects/sendfile/bin/pax/tests/legacy_test.pl (from r260904, head/bin/pax/tests/legacy_test.pl)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/sendfile/bin/pax/tests/legacy_test.pl	Mon Jan 20 12:11:47 2014	(r260905, copy of r260904, head/bin/pax/tests/legacy_test.pl)
@@ -0,0 +1,89 @@
+# $FreeBSD$
+
+use strict;
+use warnings;
+
+use Test::More tests => 6;
+use File::Path qw(rmtree mkpath);
+use Cwd;
+
+my $n = 0;
+sub create_file {
+    my $fn = shift;
+
+    $n++;
+    (my $dir = $fn) =~ s,/[^/]+$,,;
+    mkpath $dir;
+    open my $fd, ">", $fn or die "$fn: $!";
+    print $fd "file $n\n";
+}
+
+
+ustar_pathnames: { SKIP: {
+    # Prove that pax breaks up ustar pathnames properly
+
+    my $top = getcwd . "/ustar-pathnames-1";
+    skip "Current path is too long", 6 if length $top > 92;
+    rmtree $top;
+    my $subdir = "x" . "x" x (92 - length $top);
+    my $work94 = "$top/$subdir";
+    mkpath $work94;		# $work is 94 characters long
+
+    my $x49 = "x" x 49;
+    my $x50 = "x" x 50;
+    my $x60 = "x" x 60;
+    my $x95 = "x" x 95;
+
+    my @paths = (
+	"$work94/x099",		# 99 chars
+	"$work94/xx100",		# 100 chars
+	"$work94/xxx101",		# 101 chars
+	"$work94/$x49/${x50}x199",	# 199 chars
+	"$work94/$x49/${x50}xx200",	# 200 chars
+	"$work94/$x49/${x50}xxx201",	# 201 chars
+	"$work94/$x60/${x95}254",	# 254 chars
+	"$work94/$x60/${x95}x255",	# 255 chars
+    );
+
+    my @l = map { length } @paths;
+
+    my $n = 0;
+    create_file $_ for @paths;
+    system "pax -wf ustar.ok $work94";
+    ok($? == 0, "Wrote 'ustar.ok' containing files with lengths @l");
+
+    (my $orig = $top) =~ s,1$,2,;
+    rmtree $orig;
+    rename $top, $orig;
+
+    system "pax -rf ustar.ok";
+    ok($? == 0, "Restored 'ustar.ok' containing files with lengths @l");
+
+    system "diff -ru $orig $top";
+    ok($? == 0, "Restored files are identical");
+
+    rmtree $top;
+    rename $orig, $top;
+
+    # 256 chars (with components < 100 chars) should not work
+    push @paths, "$work94/x$x60/${x95}x256";	# 256 chars
+    push @l, length $paths[-1];
+    create_file $paths[-1];
+    system "pax -wf ustar.fail1 $work94";
+    ok($?, "Failed to write 'ustar.fail1' containing files with lengths @l");
+
+    # Components with 100 chars shouldn't work
+    unlink $paths[-1];
+    $paths[-1] = "$work94/${x95}xc100";		# 100 char filename
+    $l[-1] = length $paths[-1];
+    create_file $paths[-1];
+    system "pax -wf ustar.fail2 $work94";
+    ok($?, "Failed to write 'ustar.fail2' with a 100 char filename");
+
+    unlink $paths[-1];
+    $paths[-1] = "$work94/${x95}xc100/x";	# 100 char component
+    $l[-1] = length $paths[-1];
+    create_file $paths[-1];
+    system "pax -wf ustar.fail3 $work94";
+    ok($?, "Failed to write 'ustar.fail3' with a 100 char component");
+}}

Modified: projects/sendfile/bin/sh/input.c
==============================================================================
--- projects/sendfile/bin/sh/input.c	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/bin/sh/input.c	Mon Jan 20 12:11:47 2014	(r260905)
@@ -162,20 +162,16 @@ preadfd(void)
 	int nr;
 	parsenextc = parsefile->buf;
 
-#ifndef NO_HISTORY
-	if (el != NULL && gotwinch) {
-		gotwinch = 0;
-		el_resize(el);
-	}
-#endif
 retry:
 #ifndef NO_HISTORY
 	if (parsefile->fd == 0 && el) {
 		static const char *rl_cp;
 		static int el_len;
 
-		if (rl_cp == NULL)
+		if (rl_cp == NULL) {
+			el_resize(el);
 			rl_cp = el_gets(el, &el_len);
+		}
 		if (rl_cp == NULL)
 			nr = el_len == 0 ? 0 : -1;
 		else {

Modified: projects/sendfile/bin/sh/tests/Makefile
==============================================================================
--- projects/sendfile/bin/sh/tests/Makefile	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/bin/sh/tests/Makefile	Mon Jan 20 12:11:47 2014	(r260905)
@@ -6,6 +6,12 @@ TESTSDIR=	${TESTSBASE}/bin/sh
 
 TAP_TESTS_SH=	legacy_test
 TAP_TESTS_SH_SED_legacy_test=	-e 's,__SH__,/bin/sh,g'
+# Some tests in here are silently not run when the tests are executed as
+# root.  Explicitly tell Kyua to drop privileges.
+#
+# TODO(jmmv): Kyua needs to do this by default, not only when explicitly
+# requested.  See https://code.google.com/p/kyua/issues/detail?id=6
+TEST_METADATA.legacy_test+= required_user="unprivileged"
 
 SUBDIR+=	builtins errors execution expansion parameters parser set-e
 

Modified: projects/sendfile/bin/sh/trap.c
==============================================================================
--- projects/sendfile/bin/sh/trap.c	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/bin/sh/trap.c	Mon Jan 20 12:11:47 2014	(r260905)
@@ -80,7 +80,6 @@ static char *volatile trap[NSIG];	/* tra
 static volatile sig_atomic_t gotsig[NSIG];
 				/* indicates specified signal received */
 static int ignore_sigchld;	/* Used while handling SIGCHLD traps. */
-volatile sig_atomic_t gotwinch;
 static int last_trapsig;
 
 static int exiting;		/* exitshell() has been called */
@@ -293,12 +292,6 @@ setsignal(int signo)
 				action = S_IGN;
 			break;
 #endif
-#ifndef NO_HISTORY
-		case SIGWINCH:
-			if (rootshell && iflag)
-				action = S_CATCH;
-			break;
-#endif
 		}
 	}
 
@@ -400,11 +393,6 @@ onsig(int signo)
 		gotsig[signo] = 1;
 		pendingsig = signo;
 	}
-
-#ifndef NO_HISTORY
-	if (signo == SIGWINCH)
-		gotwinch = 1;
-#endif
 }
 
 
@@ -490,9 +478,6 @@ setinteractive(int on)
 	setsignal(SIGINT);
 	setsignal(SIGQUIT);
 	setsignal(SIGTERM);
-#ifndef NO_HISTORY
-	setsignal(SIGWINCH);
-#endif
 	is_interactive = on;
 }
 

Modified: projects/sendfile/bin/sh/trap.h
==============================================================================
--- projects/sendfile/bin/sh/trap.h	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/bin/sh/trap.h	Mon Jan 20 12:11:47 2014	(r260905)
@@ -36,7 +36,6 @@
 extern volatile sig_atomic_t pendingsig;
 extern volatile sig_atomic_t pendingsig_waitcmd;
 extern int in_dotrap;
-extern volatile sig_atomic_t gotwinch;
 
 void clear_traps(void);
 int have_traps(void);

Modified: projects/sendfile/bin/test/tests/Makefile
==============================================================================
--- projects/sendfile/bin/test/tests/Makefile	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/bin/test/tests/Makefile	Mon Jan 20 12:11:47 2014	(r260905)
@@ -5,5 +5,11 @@
 TESTSDIR=	${TESTSBASE}/bin/test
 
 TAP_TESTS_SH=	legacy_test
+# Some tests in here are silently not run when the tests are executed as
+# root.  Explicitly tell Kyua to drop privileges.
+#
+# TODO(jmmv): Kyua needs to do this by default, not only when explicitly
+# requested.  See https://code.google.com/p/kyua/issues/detail?id=6
+TEST_METADATA.legacy_test+= required_user="unprivileged"
 
 .include <tap.test.mk>

Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Mon Jan 20 12:11:47 2014	(r260905)
@@ -3012,6 +3012,7 @@ zdb_read_block(char *thing, spa_t *spa)
 				free(dup);
 				return;
 			}
+			i += p - &flagstr[i + 1]; /* skip over the number */
 		}
 	}
 

Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/zinject/zinject.c
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/cmd/zinject/zinject.c	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/cddl/contrib/opensolaris/cmd/zinject/zinject.c	Mon Jan 20 12:11:47 2014	(r260905)
@@ -148,6 +148,7 @@
 #include <sys/mount.h>
 
 #include <libzfs.h>
+#include <libzfs_compat.h>
 
 #undef verify	/* both libzfs.h and zfs_context.h want to define this */
 

Modified: projects/sendfile/cddl/usr.bin/zinject/Makefile
==============================================================================
--- projects/sendfile/cddl/usr.bin/zinject/Makefile	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/cddl/usr.bin/zinject/Makefile	Mon Jan 20 12:11:47 2014	(r260905)
@@ -16,6 +16,7 @@ CFLAGS+= -I${.CURDIR}/../../contrib/open
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs/
 CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../lib/libumem
 

Modified: projects/sendfile/contrib/atf/FREEBSD-Xlist
==============================================================================
--- projects/sendfile/contrib/atf/FREEBSD-Xlist	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/contrib/atf/FREEBSD-Xlist	Mon Jan 20 12:11:47 2014	(r260905)
@@ -8,7 +8,6 @@ Makefile*
 aclocal.m4
 admin/
 atf-*/atf-*.m4
-atf-*/atf-*.pc.in
 atf-config/
 atf-report/
 atf-run/

Copied: projects/sendfile/contrib/atf/atf-c++/atf-c++.pc.in (from r260904, head/contrib/atf/atf-c++/atf-c++.pc.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/sendfile/contrib/atf/atf-c++/atf-c++.pc.in	Mon Jan 20 12:11:47 2014	(r260905, copy of r260904, head/contrib/atf/atf-c++/atf-c++.pc.in)
@@ -0,0 +1,11 @@
+# ATF pkg-config file
+
+cxx=__CXX__
+includedir=__INCLUDEDIR__
+libdir=__LIBDIR__
+
+Name: atf-c++
+Description: Automated Testing Framework (C++ binding)
+Version: __ATF_VERSION__
+Cflags: -I${includedir}
+Libs: -L${libdir} -latf-c++ -latf-c

Modified: projects/sendfile/contrib/atf/atf-c++/detail/test_helpers.cpp
==============================================================================
--- projects/sendfile/contrib/atf/atf-c++/detail/test_helpers.cpp	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/contrib/atf/atf-c++/detail/test_helpers.cpp	Mon Jan 20 12:11:47 2014	(r260905)
@@ -40,6 +40,18 @@
 #include "process.hpp"
 #include "test_helpers.hpp"
 
+// Path to the directory containing the libatf-c tests, used to locate the
+// process_helpers program.  If NULL (the default), the code will use a
+// relative path.  Otherwise, the provided path will be used; this is so
+// that we can locate the helpers binary if the installation uses a
+// different layout than the one we provide (as is the case in FreeBSD).
+#if defined(ATF_C_TESTS_BASE)
+static const char* atf_c_tests_base = ATF_C_TESTS_BASE;
+#else
+static const char* atf_c_tests_base = NULL;
+#endif
+#undef ATF_C_TESTS_BASE
+
 void
 build_check_cxx_o_aux(const atf::fs::path& sfile, const char* failmsg,
                       const bool expect_pass)
@@ -67,25 +79,30 @@ build_check_cxx_o(const atf::tests::tc& 
 void
 header_check(const char *hdrname)
 {
-    std::ofstream srcfile("test.c");
+    std::ofstream srcfile("test.cpp");
     ATF_REQUIRE(srcfile);
     srcfile << "#include <" << hdrname << ">\n";
     srcfile.close();
 
     const std::string failmsg = std::string("Header check failed; ") +
         hdrname + " is not self-contained";
-    build_check_cxx_o_aux(atf::fs::path("test.c"), failmsg.c_str(), true);
+    build_check_cxx_o_aux(atf::fs::path("test.cpp"), failmsg.c_str(), true);
 }
 
 atf::fs::path
 get_process_helpers_path(const atf::tests::tc& tc, bool is_detail)
 {
-    if (is_detail)
-        return atf::fs::path(tc.get_config_var("srcdir")) /
-               ".." / ".." / "atf-c" / "detail" / "process_helpers";
-    else
-        return atf::fs::path(tc.get_config_var("srcdir")) /
-               ".." / "atf-c" / "detail" / "process_helpers";
+    const char* helper = "detail/process_helpers";
+    if (atf_c_tests_base == NULL) {
+        if (is_detail)
+            return atf::fs::path(tc.get_config_var("srcdir")) /
+                   ".." / ".." / "atf-c" / helper;
+        else
+            return atf::fs::path(tc.get_config_var("srcdir")) /
+                   ".." / "atf-c" / helper;
+    } else {
+        return atf::fs::path(atf_c_tests_base) / helper;
+    }
 }
 
 void

Copied: projects/sendfile/contrib/atf/atf-c/atf-c.pc.in (from r260904, head/contrib/atf/atf-c/atf-c.pc.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/sendfile/contrib/atf/atf-c/atf-c.pc.in	Mon Jan 20 12:11:47 2014	(r260905, copy of r260904, head/contrib/atf/atf-c/atf-c.pc.in)
@@ -0,0 +1,11 @@
+# ATF pkg-config file
+
+cc=__CC__
+includedir=__INCLUDEDIR__
+libdir=__LIBDIR__
+
+Name: atf-c
+Description: Automated Testing Framework (C binding)
+Version: __ATF_VERSION__
+Cflags: -I${includedir}
+Libs: -L${libdir} -latf-c

Copied: projects/sendfile/contrib/atf/atf-sh/atf-sh.pc.in (from r260904, head/contrib/atf/atf-sh/atf-sh.pc.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/sendfile/contrib/atf/atf-sh/atf-sh.pc.in	Mon Jan 20 12:11:47 2014	(r260905, copy of r260904, head/contrib/atf/atf-sh/atf-sh.pc.in)
@@ -0,0 +1,8 @@
+# ATF pkg-config file
+
+exec_prefix=__EXEC_PREFIX__
+interpreter=${exec_prefix}/bin/atf-sh
+
+Name: atf-sh
+Description: Automated Testing Framework (POSIX shell binding)
+Version: __ATF_VERSION__

Modified: projects/sendfile/contrib/bsnmp/lib/snmpagent.c
==============================================================================
--- projects/sendfile/contrib/bsnmp/lib/snmpagent.c	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/contrib/bsnmp/lib/snmpagent.c	Mon Jan 20 12:11:47 2014	(r260905)
@@ -510,6 +510,11 @@ snmp_getbulk(struct snmp_pdu *pdu, struc
 	for (cnt = 0; cnt < pdu->error_index; cnt++) {
 		eomib = 1;
 		for (i = non_rep; i < pdu->nbindings; i++) {
+
+			if (resp->nbindings == SNMP_MAX_BINDINGS)
+				/* PDU is full */
+				goto done;
+
 			if (cnt == 0) 
 				result = do_getnext(&context, &pdu->bindings[i],
 				    &resp->bindings[resp->nbindings], pdu);

Modified: projects/sendfile/contrib/gcc/config/arm/freebsd.h
==============================================================================
--- projects/sendfile/contrib/gcc/config/arm/freebsd.h	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/contrib/gcc/config/arm/freebsd.h	Mon Jan 20 12:11:47 2014	(r260905)
@@ -72,6 +72,9 @@
 #undef TARGET_DEFAULT_FLOAT_ABI
 #define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_SOFT
 
+#undef TARGET_DEFAULT
+#define TARGET_DEFAULT (MASK_INTERWORK | TARGET_ENDIAN_DEFAULT)
+
 #undef ARM_DEFAULT_ABI
 #define ARM_DEFAULT_ABI ARM_ABI_AAPCS_LINUX
 

Modified: projects/sendfile/contrib/gcc/cp/ChangeLog.apple
==============================================================================
--- projects/sendfile/contrib/gcc/cp/ChangeLog.apple	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/contrib/gcc/cp/ChangeLog.apple	Mon Jan 20 12:11:47 2014	(r260905)
@@ -302,15 +302,6 @@
 	(cp_parser_objc_declaration): Parses attribute list and passes it down 
 	to cp_parser_objc_class_interface/cp_parser_objc_protocol_declaration.
 	
-2007-07-24  Fariborz Jahanian <fjahanian at apple.com>
-
-	 Radar 5355344
-	* cp-tree.h (cp_objc_protocol_id_list): New declaration
-	* cp-lang.c (cp_objc_protocol_id_list): New stub
-	* parser.c (cp_parser_type_name): Added code to disambiguate
-	conditional from a protocol type.
-	(cp_parser_objc_tentative_protocol_refs_opt): New
-
 2007-07-13  Fariborz Jahanian <fjahanian at apple.com>
 
 	 Radar 5277239

Modified: projects/sendfile/contrib/gcc/cp/parser.c
==============================================================================
--- projects/sendfile/contrib/gcc/cp/parser.c	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/contrib/gcc/cp/parser.c	Mon Jan 20 12:11:47 2014	(r260905)
@@ -1827,10 +1827,6 @@ static tree cp_parser_objc_identifier_li
 /* APPLE LOCAL end radar 3803157 - objc attribute */
 static tree cp_parser_objc_protocol_refs_opt
   (cp_parser *);
-/* APPLE LOCAL begin radar 5355344 */
-static bool cp_parser_objc_tentative_protocol_refs_opt
-  (cp_parser *, tree *);
-/* APPLE LOCAL end radar 5355344 */
 static void cp_parser_objc_declaration
   (cp_parser *);
 static tree cp_parser_objc_statement
@@ -17873,32 +17869,6 @@ cp_parser_objc_protocol_refs_opt (cp_par
   return protorefs;
 }
 
-/* APPLE LOCAL begin radar 5355344 */
-/* This routine also parses a list of Objective-C protocol references; except that
- if list is not valid, it returns FALSE and back-tracks parsing. */
-
-static bool
-cp_parser_objc_tentative_protocol_refs_opt (cp_parser* parser, tree *protorefs)
-{
-  *protorefs = NULL_TREE;
-  if(cp_lexer_next_token_is (parser->lexer, CPP_LESS))
-    {
-      cp_parser_parse_tentatively (parser);
-      cp_lexer_consume_token (parser->lexer);  /* Eat '<'.  */
-      *protorefs = cp_parser_objc_identifier_list (parser);
-      if (!cp_objc_protocol_id_list (*protorefs))
-	 {
-	cp_parser_abort_tentative_parse (parser);
-	return false;
-	 }
-      if (cp_parser_parse_definitely (parser))
-	cp_parser_require (parser, CPP_GREATER, "`>'");
-    }
-
-  return true;
-}
-/* APPLE LOCAL end radar 5355344 */
-
 /* Parse a Objective-C visibility specification.  */
 
 static void

Modified: projects/sendfile/contrib/ntp/ntpd/ntp_config.c
==============================================================================
--- projects/sendfile/contrib/ntp/ntpd/ntp_config.c	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/contrib/ntp/ntpd/ntp_config.c	Mon Jan 20 12:11:47 2014	(r260905)
@@ -597,6 +597,8 @@ getconfig(
 #endif /* not SYS_WINNT */
 	}
 
+	proto_config(PROTO_MONITOR, 0, 0., NULL);
+
 	for (;;) {
 		if (tok == CONFIG_END) 
 			break;

Modified: projects/sendfile/etc/defaults/rc.conf
==============================================================================
--- projects/sendfile/etc/defaults/rc.conf	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/etc/defaults/rc.conf	Mon Jan 20 12:11:47 2014	(r260905)
@@ -311,7 +311,7 @@ nfs_client_enable="NO"		# This host is a
 nfs_access_cache="60"		# Client cache timeout in seconds
 nfs_server_enable="NO"		# This host is an NFS server (or NO).
 oldnfs_server_enable="NO"	# Run the old NFS server (YES/NO).
-nfs_server_flags="-u -t -n 4"	# Flags to nfsd (if enabled).
+nfs_server_flags="-u -t"	# Flags to nfsd (if enabled).
 mountd_enable="NO"		# Run mountd (or NO).
 mountd_flags="-r"		# Flags to mountd (if NFS server enabled).
 weak_mountd_authentication="NO"	# Allow non-root mount requests to be served.

Modified: projects/sendfile/etc/mtree/BSD.tests.dist
==============================================================================
--- projects/sendfile/etc/mtree/BSD.tests.dist	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/etc/mtree/BSD.tests.dist	Mon Jan 20 12:11:47 2014	(r260905)
@@ -49,8 +49,12 @@
         lib
             atf
                 libatf-c
+                    detail
+                    ..
                 ..
                 libatf-c++
+                    detail
+                    ..
                 ..
                 test-programs
                 ..

Modified: projects/sendfile/gnu/lib/libgcc/Makefile
==============================================================================
--- projects/sendfile/gnu/lib/libgcc/Makefile	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/gnu/lib/libgcc/Makefile	Mon Jan 20 12:11:47 2014	(r260905)
@@ -34,9 +34,9 @@ OBJS=		# added to below in various ways 
 
 #---------------------------------------------------------------------------
 #
-# When upgrading GCC, get the following defintions straight from Makefile.in
-#
 # Library members defined in libgcc2.c.
+# When upgrading GCC, obtain the following list from mklibgcc.in
+#
 LIB2FUNCS= _muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3 \
 	_cmpdi2 _ucmpdi2 \
 	_enable_execute_stack _trampoline __main _absvsi2 _absvdi2 _addvsi3 \
@@ -44,7 +44,7 @@ LIB2FUNCS= _muldi3 _negdi2 _lshrdi3 _ash
 	_ffssi2 _ffsdi2 _clz _clzsi2 _clzdi2 _ctzsi2 _ctzdi2 _popcount_tab \
 	_popcountsi2 _popcountdi2 _paritysi2 _paritydi2 _powisf2 _powidf2 \
 	_powixf2 _powitf2 _mulsc3 _muldc3 _mulxc3 _multc3 _divsc3 _divdc3 \
-	_divxc3 _divtc3
+	_divxc3 _divtc3 _bswapsi2 _bswapdi2
 .if ${COMPILER_TYPE} != "clang" || ${TARGET_CPUARCH} != "arm"
 LIB2FUNCS+= _clear_cache
 .endif
@@ -119,8 +119,8 @@ LIB1ASMFUNCS =  _dvmd_tls _bb_init_func
 .if ${MK_ARM_EABI} != "no"
 LIB2ADDEH =	unwind-arm.c libunwind.S pr-support.c unwind-c.c
 # Some compilers generate __aeabi_ functions libgcc_s is missing
-DPADD+=		${LIBGCC}
-LDADD+=		-lgcc
+DPADD+=		${LIBCOMPILER_RT}
+LDADD+=		-lcompiler_rt
 .else
 LIB2FUNCS_EXTRA = floatunsidf.c floatunsisf.c
 .endif

Modified: projects/sendfile/gnu/usr.bin/gdb/kgdb/trgt.c
==============================================================================
--- projects/sendfile/gnu/usr.bin/gdb/kgdb/trgt.c	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/gnu/usr.bin/gdb/kgdb/trgt.c	Mon Jan 20 12:11:47 2014	(r260905)
@@ -53,6 +53,18 @@ __FBSDID("$FreeBSD$");
 
 #include "kgdb.h"
 
+#ifdef CROSS_DEBUGGER
+/*
+ * We suppress the call to add_target() of core_ops in corelow.c because if
+ * there are multiple core_stratum targets, the find_core_target() function
+ * won't know which one to return and returns none. We need it to return
+ * our target. We only have to do that when we're building a cross-debugger
+ * because fbsd-threads.c is part of a native debugger and it too defines
+ * coreops_suppress_target with 1 as the initializer.
+ */
+int coreops_suppress_target = 1;
+#endif
+
 static CORE_ADDR stoppcbs;
 
 static void	kgdb_core_cleanup(void *);

Modified: projects/sendfile/lib/atf/Makefile.inc
==============================================================================
--- projects/sendfile/lib/atf/Makefile.inc	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/lib/atf/Makefile.inc	Mon Jan 20 12:11:47 2014	(r260905)
@@ -38,6 +38,7 @@ CFLAGS+=	-DATF_BUILD_CPPFLAGS='"${_CPPFL
 CFLAGS+=	-DATF_BUILD_CXX='"${CXX}"'
 CFLAGS+=	-DATF_BUILD_CXXFLAGS='"${_CXXFLAGS}"'
 CFLAGS+=	-DATF_CONFDIR='"${CONFDIR}/atf"'
+CFLAGS+=	-DATF_C_TESTS_BASE='"${TESTSBASE}/lib/atf/libatf-c"'
 CFLAGS+=	-DATF_INCLUDEDIR='"${INCLUDEDIR}"'
 CFLAGS+=	-DATF_LIBDIR='"${LIBDIR}"'
 CFLAGS+=	-DATF_LIBEXECDIR='"${LIBEXECDIR}"'

Copied: projects/sendfile/lib/atf/common.mk (from r260904, head/lib/atf/common.mk)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/sendfile/lib/atf/common.mk	Mon Jan 20 12:11:47 2014	(r260905, copy of r260904, head/lib/atf/common.mk)
@@ -0,0 +1,19 @@
+# $FreeBSD$
+#
+# Common Makefile code for all components of ATF.
+#
+
+.if !defined(ATF)
+.error "ATF must be defined and point to the contrib/atf directory"
+.endif
+
+# Depend on the atf-version target to generate a file that contains the
+# version number of the currently imported ATF release and that only
+# changes on new imports.
+atf-version: atf-version-real
+	@cmp -s atf-version atf-version-real \
+	    || cp atf-version-real atf-version
+atf-version-real: .PHONY
+	@grep 'define VERSION' ${ATF}/bconfig.h \
+	    | cut -d '"' -f 2 >atf-version-real
+CLEANFILES+= atf-version atf-version-real

Modified: projects/sendfile/lib/atf/libatf-c++/Makefile
==============================================================================
--- projects/sendfile/lib/atf/libatf-c++/Makefile	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/lib/atf/libatf-c++/Makefile	Mon Jan 20 12:11:47 2014	(r260905)
@@ -76,8 +76,21 @@ INCSDIR_atf-c++.hpp= ${INCLUDEDIR}
 
 MAN=		atf-c++-api.3
 
+all: atf-c++.pc
+atf-c++.pc: atf-c++.pc.in atf-version
+	sed -e 's,__CXX__,${CXX},g' \
+	    -e 's,__INCLUDEDIR__,${INCLUDEDIR},g' \
+	    -e 's,__LIBDIR__,${LIBDIR},g' \
+	    -e "s,__ATF_VERSION__,$$(cat atf-version),g" \
+	    <${ATF}/atf-c++/atf-c++.pc.in >atf-c++.pc
+
+beforeinstall:
+	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+		atf-c++.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
+
 .if ${MK_TESTS} != "no"
 SUBDIR=		tests
 .endif
 
+.include "../common.mk"
 .include <bsd.lib.mk>

Modified: projects/sendfile/lib/atf/libatf-c++/tests/Makefile
==============================================================================
--- projects/sendfile/lib/atf/libatf-c++/tests/Makefile	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/lib/atf/libatf-c++/tests/Makefile	Mon Jan 20 12:11:47 2014	(r260905)
@@ -3,6 +3,7 @@
 .include <bsd.init.mk>
 
 TESTSDIR=	${TESTSBASE}/lib/atf/libatf-c++
+TESTS_SUBDIRS=	detail
 
 ATF=		${.CURDIR:H:H:H:H}/contrib/atf
 .PATH:		${ATF}/atf-c++
@@ -14,7 +15,6 @@ FILESDIR=	${TESTSDIR}
 FILES=		macros_hpp_test.cpp
 FILES+=		unused_test.cpp
 
-# Tests in atf-c++.
 .for _T in	atf_c++_test \
 		build_test \
 		check_test \
@@ -28,20 +28,4 @@ SRCS.${_T}=	${_T}.cpp test_helpers.cpp
 
 ATF_TESTS_SH=	pkg_config_test
 
-# Tests in atf-c++/detail.
-
-.for _T in	application_test \
-		env_test \
-		exceptions_test \
-		expand_test \
-		fs_test \
-		parser_test \
-		process_test \
-		sanity_test \
-		text_test \
-		ui_test
-ATF_TESTS_CXX+=	${_T}
-SRCS.${_T}=	${_T}.cpp test_helpers.cpp
-.endfor
-
 .include <atf.test.mk>

Copied: projects/sendfile/lib/atf/libatf-c++/tests/Makefile.inc (from r260904, head/lib/atf/libatf-c++/tests/Makefile.inc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/sendfile/lib/atf/libatf-c++/tests/Makefile.inc	Mon Jan 20 12:11:47 2014	(r260905, copy of r260904, head/lib/atf/libatf-c++/tests/Makefile.inc)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"

Modified: projects/sendfile/lib/atf/libatf-c/Makefile
==============================================================================
--- projects/sendfile/lib/atf/libatf-c/Makefile	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/lib/atf/libatf-c/Makefile	Mon Jan 20 12:11:47 2014	(r260905)
@@ -74,8 +74,21 @@ INCSDIR_atf-c.h= ${INCLUDEDIR}
 
 MAN=		atf-c-api.3
 
+all: atf-c.pc
+atf-c.pc: atf-c.pc.in atf-version
+	sed -e 's,__CC__,${CC},g' \
+	    -e 's,__INCLUDEDIR__,${INCLUDEDIR},g' \
+	    -e 's,__LIBDIR__,${LIBDIR},g' \
+	    -e "s,__ATF_VERSION__,$$(cat atf-version),g" \
+	    <${ATF}/atf-c/atf-c.pc.in >atf-c.pc
+
+beforeinstall:
+	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+		atf-c.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
+
 .if ${MK_TESTS} != "no"
 SUBDIR=		tests
 .endif
 
+.include "../common.mk"
 .include <bsd.lib.mk>

Modified: projects/sendfile/lib/atf/libatf-c/tests/Makefile
==============================================================================
--- projects/sendfile/lib/atf/libatf-c/tests/Makefile	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/lib/atf/libatf-c/tests/Makefile	Mon Jan 20 12:11:47 2014	(r260905)
@@ -3,6 +3,7 @@
 .include <bsd.init.mk>
 
 TESTSDIR=	${TESTSBASE}/lib/atf/libatf-c
+TESTS_SUBDIRS=	detail
 
 ATF=		${.CURDIR:H:H:H:H}/contrib/atf
 .PATH:		${ATF}/atf-c
@@ -19,8 +20,6 @@ FILESDIR=	${TESTSDIR}
 FILES=		macros_h_test.c
 FILES+=		unused_test.c
 
-# Tests in atf-c.
-
 .for _T in	atf_c_test \
 		build_test \
 		check_test \
@@ -36,24 +35,4 @@ SRCS.${_T}=	${_T}.c test_helpers.c
 
 ATF_TESTS_SH=	pkg_config_test
 
-# Tests in atf-c/detail.
-
-.for _T in	dynstr_test \
-		env_test \
-		fs_test \
-		list_test \
-		map_test \
-		process_test \
-		sanity_test \
-		text_test \
-		user_test
-ATF_TESTS_C+=	${_T}
-SRCS.${_T}=	${_T}.c test_helpers.c
-.endfor
-
-PROGS+=		process_helpers
-SRCS.process_helpers=	process_helpers.c
-MAN.process_helpers=	# defined
-BINDIR.process_helpers=	${TESTSDIR}
-
 .include <atf.test.mk>

Copied: projects/sendfile/lib/atf/libatf-c/tests/Makefile.inc (from r260904, head/lib/atf/libatf-c/tests/Makefile.inc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/sendfile/lib/atf/libatf-c/tests/Makefile.inc	Mon Jan 20 12:11:47 2014	(r260905, copy of r260904, head/lib/atf/libatf-c/tests/Makefile.inc)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"

Modified: projects/sendfile/lib/libc/Makefile
==============================================================================
--- projects/sendfile/lib/libc/Makefile	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/lib/libc/Makefile	Mon Jan 20 12:11:47 2014	(r260905)
@@ -40,11 +40,11 @@ CFLAGS+=${CANCELPOINTS_CFLAGS}
 .endif
 
 #
-# Only link with static libgcc.a (no libgcc_eh.a).
+# Link with static libcompiler_rt.a.
 #
-DPADD+=	${LIBGCC}
+DPADD+=	${LIBCOMPILER_RT}
 LDFLAGS+= -nodefaultlibs
-LDADD+= -lgcc
+LDADD+= -lcompiler_rt
 
 .if ${MK_SSP} != "no"
 LDADD+= -lssp_nonshared

Modified: projects/sendfile/lib/libc/gen/fts.3
==============================================================================
--- projects/sendfile/lib/libc/gen/fts.3	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/lib/libc/gen/fts.3	Mon Jan 20 12:11:47 2014	(r260905)
@@ -28,7 +28,7 @@
 .\"     @(#)fts.3	8.5 (Berkeley) 4/16/94
 .\" $FreeBSD$
 .\"
-.Dd May 21, 2013
+.Dd January 12, 2014
 .Dt FTS 3
 .Os
 .Sh NAME
@@ -304,7 +304,6 @@ file is a member.
 A parent structure for the initial entry point is provided as well,
 however, only the
 .Fa fts_level ,
-.Fa fts_bignum ,
 .Fa fts_number
 and
 .Fa fts_pointer
@@ -366,13 +365,6 @@ The
 .Fa fts_name
 field is always
 .Dv NUL Ns -terminated .
-.Pp
-Note that the use of
-.Fa fts_bignum
-is mutually exclusive with the use of
-.Fa fts_number
-or
-.Fa fts_pointer .
 .Sh FTS_OPEN
 The
 .Fn fts_open

Modified: projects/sendfile/lib/libc/gen/fts.c
==============================================================================
--- projects/sendfile/lib/libc/gen/fts.c	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/lib/libc/gen/fts.c	Mon Jan 20 12:11:47 2014	(r260905)
@@ -62,7 +62,7 @@ static size_t	 fts_maxarglen(char * cons
 static void	 fts_padjust(FTS *, FTSENT *);
 static int	 fts_palloc(FTS *, size_t);
 static FTSENT	*fts_sort(FTS *, FTSENT *, size_t);
-static int	 fts_stat(FTS *, FTSENT *, int);
+static int	 fts_stat(FTS *, FTSENT *, int, int);
 static int	 fts_safe_changedir(FTS *, FTSENT *, int, char *);
 static int	 fts_ufslinks(FTS *, const FTSENT *);
 
@@ -171,7 +171,7 @@ fts_open(argv, options, compar)
 		p->fts_level = FTS_ROOTLEVEL;
 		p->fts_parent = parent;
 		p->fts_accpath = p->fts_name;
-		p->fts_info = fts_stat(sp, p, ISSET(FTS_COMFOLLOW));
+		p->fts_info = fts_stat(sp, p, ISSET(FTS_COMFOLLOW), -1);
 
 		/* Command-line "." and ".." are real directories. */
 		if (p->fts_info == FTS_DOT)
@@ -326,7 +326,7 @@ fts_read(FTS *sp)
 
 	/* Any type of file may be re-visited; re-stat and re-turn. */
 	if (instr == FTS_AGAIN) {
-		p->fts_info = fts_stat(sp, p, 0);
+		p->fts_info = fts_stat(sp, p, 0, -1);
 		return (p);
 	}
 
@@ -338,7 +338,7 @@ fts_read(FTS *sp)
 	 */
 	if (instr == FTS_FOLLOW &&
 	    (p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE)) {
-		p->fts_info = fts_stat(sp, p, 1);
+		p->fts_info = fts_stat(sp, p, 1, -1);
 		if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) {
 			if ((p->fts_symfd = _open(".", O_RDONLY | O_CLOEXEC,
 			    0)) < 0) {
@@ -429,7 +429,7 @@ next:	tmp = p;
 		if (p->fts_instr == FTS_SKIP)
 			goto next;
 		if (p->fts_instr == FTS_FOLLOW) {
-			p->fts_info = fts_stat(sp, p, 1);
+			p->fts_info = fts_stat(sp, p, 1, -1);
 			if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) {
 				if ((p->fts_symfd =
 				    _open(".", O_RDONLY | O_CLOEXEC, 0)) < 0) {
@@ -800,10 +800,11 @@ mem1:				saved_errno = errno;
 			if (ISSET(FTS_NOCHDIR)) {
 				p->fts_accpath = p->fts_path;
 				memmove(cp, p->fts_name, p->fts_namelen + 1);
-			} else
+				p->fts_info = fts_stat(sp, p, 0, _dirfd(dirp));
+			} else {
 				p->fts_accpath = p->fts_name;
-			/* Stat it. */
-			p->fts_info = fts_stat(sp, p, 0);
+				p->fts_info = fts_stat(sp, p, 0, -1);
+			}
 
 			/* Decrement link count if applicable. */
 			if (nlinks > 0 && (p->fts_info == FTS_D ||
@@ -868,13 +869,19 @@ mem1:				saved_errno = errno;
 }
 
 static int
-fts_stat(FTS *sp, FTSENT *p, int follow)
+fts_stat(FTS *sp, FTSENT *p, int follow, int dfd)
 {
 	FTSENT *t;
 	dev_t dev;
 	ino_t ino;
 	struct stat *sbp, sb;
 	int saved_errno;
+	const char *path;
+
+	if (dfd == -1)
+		path = p->fts_accpath, dfd = AT_FDCWD;
+	else
+		path = p->fts_name;
 
 	/* If user needs stat info, stat buffer already allocated. */
 	sbp = ISSET(FTS_NOSTAT) ? &sb : p->fts_statp;
@@ -896,16 +903,16 @@ fts_stat(FTS *sp, FTSENT *p, int follow)
 	 * fail, set the errno from the stat call.
 	 */
 	if (ISSET(FTS_LOGICAL) || follow) {
-		if (stat(p->fts_accpath, sbp)) {
+		if (fstatat(dfd, path, sbp, 0)) {
 			saved_errno = errno;
-			if (!lstat(p->fts_accpath, sbp)) {
+			if (!fstatat(dfd, path, sbp, AT_SYMLINK_NOFOLLOW)) {
 				errno = 0;
 				return (FTS_SLNONE);
 			}
 			p->fts_errno = saved_errno;
 			goto err;
 		}
-	} else if (lstat(p->fts_accpath, sbp)) {
+	} else if (fstatat(dfd, path, sbp, AT_SYMLINK_NOFOLLOW)) {
 		p->fts_errno = errno;
 err:		memset(sbp, 0, sizeof(struct stat));
 		return (FTS_NS);

Modified: projects/sendfile/lib/libc/include/port_before.h
==============================================================================
--- projects/sendfile/lib/libc/include/port_before.h	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/lib/libc/include/port_before.h	Mon Jan 20 12:11:47 2014	(r260905)
@@ -5,7 +5,7 @@
 
 #define _LIBC		1
 #define DO_PTHREADS	1
-#define USE_KQUEUE	1
+#define USE_POLL	1
 
 #define ISC_SOCKLEN_T	socklen_t
 #define ISC_FORMAT_PRINTF(fmt, args) \

Modified: projects/sendfile/lib/libc/resolv/res_send.c
==============================================================================
--- projects/sendfile/lib/libc/resolv/res_send.c	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/lib/libc/resolv/res_send.c	Mon Jan 20 12:11:47 2014	(r260905)
@@ -77,7 +77,7 @@ __FBSDID("$FreeBSD$");
  */
 
 #include "port_before.h"
-#ifndef USE_KQUEUE
+#if !defined(USE_KQUEUE) && !defined(USE_POLL)
 #include "fd_setsize.h"
 #endif
 
@@ -963,7 +963,7 @@ send_dg(res_state statp,
 		timeout.tv_nsec/1000000;
 	pollfd.fd = s;
 	pollfd.events = POLLRDNORM;
-	n = poll(&pollfd, 1, polltimeout);
+	n = _poll(&pollfd, 1, polltimeout);
 #endif /* USE_POLL */
 
 	if (n == 0) {

Modified: projects/sendfile/lib/libc/stdlib/getsubopt.c
==============================================================================
--- projects/sendfile/lib/libc/stdlib/getsubopt.c	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/lib/libc/stdlib/getsubopt.c	Mon Jan 20 12:11:47 2014	(r260905)
@@ -45,9 +45,7 @@ __FBSDID("$FreeBSD$");
 char *suboptarg;
 
 int
-getsubopt(optionp, tokens, valuep)
-	char **optionp, **valuep;
-	char * const *tokens;
+getsubopt(char **optionp, char * const *tokens, char **valuep)
 {
 	int cnt;
 	char *p;

Modified: projects/sendfile/lib/libc/sys/accept.2
==============================================================================
--- projects/sendfile/lib/libc/sys/accept.2	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/lib/libc/sys/accept.2	Mon Jan 20 12:11:47 2014	(r260905)
@@ -32,7 +32,8 @@
 .Dt ACCEPT 2
 .Os
 .Sh NAME
-.Nm accept
+.Nm accept ,
+.Nm accept4
 .Nd accept a connection on a socket
 .Sh LIBRARY
 .Lb libc

Modified: projects/sendfile/lib/libc/sys/chflags.2
==============================================================================
--- projects/sendfile/lib/libc/sys/chflags.2	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/lib/libc/sys/chflags.2	Mon Jan 20 12:11:47 2014	(r260905)
@@ -34,7 +34,8 @@
 .Sh NAME
 .Nm chflags ,
 .Nm lchflags ,
-.Nm fchflags
+.Nm fchflags ,
+.Nm chflagsat
 .Nd set file flags
 .Sh LIBRARY
 .Lb libc

Modified: projects/sendfile/lib/libc/sys/pipe.2
==============================================================================
--- projects/sendfile/lib/libc/sys/pipe.2	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/lib/libc/sys/pipe.2	Mon Jan 20 12:11:47 2014	(r260905)
@@ -32,7 +32,8 @@
 .Dt PIPE 2
 .Os
 .Sh NAME
-.Nm pipe
+.Nm pipe ,
+.Nm pipe2
 .Nd create descriptor pair for interprocess communication
 .Sh LIBRARY
 .Lb libc

Modified: projects/sendfile/lib/libcxxrt/Version.map
==============================================================================
--- projects/sendfile/lib/libcxxrt/Version.map	Mon Jan 20 11:13:05 2014	(r260904)
+++ projects/sendfile/lib/libcxxrt/Version.map	Mon Jan 20 12:11:47 2014	(r260905)
@@ -111,6 +111,19 @@ CXXABI_1.3 {
         "typeinfo for void";
         "typeinfo for wchar_t const*";

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

More information about the svn-src-projects mailing list