svn commit: r259442 - in projects/altix2: . bin bin/date bin/date/tests bin/mv bin/mv/tests bin/pax bin/pax/tests bin/sh bin/sh/tests bin/test bin/test/tests bin/tests cddl/contrib/opensolaris/cmd/...

Marcel Moolenaar marcel at FreeBSD.org
Mon Dec 16 00:59:13 UTC 2013 

Author: marcel
Date: Mon Dec 16 00:59:05 2013
New Revision: 259442
URL: http://svnweb.freebsd.org/changeset/base/259442

Log:
  Merge ^/head at 259441

Added:
  projects/altix2/bin/date/tests/
     - copied from r259441, head/bin/date/tests/
  projects/altix2/bin/mv/tests/
     - copied from r259441, head/bin/mv/tests/
  projects/altix2/bin/pax/tests/
     - copied from r259441, head/bin/pax/tests/
  projects/altix2/bin/sh/tests/
     - copied from r259441, head/bin/sh/tests/
  projects/altix2/bin/test/tests/
     - copied from r259441, head/bin/test/tests/
  projects/altix2/bin/tests/
     - copied from r259441, head/bin/tests/
  projects/altix2/release/scripts/FreeBSD_install_cdrom.conf
     - copied unchanged from r259441, head/release/scripts/FreeBSD_install_cdrom.conf
  projects/altix2/share/mk/tap.test.mk
     - copied unchanged from r259441, head/share/mk/tap.test.mk
  projects/altix2/sys/boot/fdt/dts/beri-netfpga.dts
     - copied unchanged from r259441, head/sys/boot/fdt/dts/beri-netfpga.dts
  projects/altix2/sys/dev/netmap/netmap_freebsd.c
     - copied unchanged from r259441, head/sys/dev/netmap/netmap_freebsd.c
  projects/altix2/sys/dev/netmap/netmap_generic.c
     - copied unchanged from r259441, head/sys/dev/netmap/netmap_generic.c
  projects/altix2/sys/dev/netmap/netmap_mbq.c
     - copied unchanged from r259441, head/sys/dev/netmap/netmap_mbq.c
  projects/altix2/sys/dev/netmap/netmap_mbq.h
     - copied unchanged from r259441, head/sys/dev/netmap/netmap_mbq.h
  projects/altix2/sys/dev/netmap/netmap_vale.c
     - copied unchanged from r259441, head/sys/dev/netmap/netmap_vale.c
  projects/altix2/sys/mips/conf/BERI_NETFPGA_MDROOT
     - copied unchanged from r259441, head/sys/mips/conf/BERI_NETFPGA_MDROOT
  projects/altix2/sys/opencrypto/cryptodeflate.c
     - copied unchanged from r259441, head/sys/opencrypto/cryptodeflate.c
  projects/altix2/sys/powerpc/cpufreq/pmufreq.c
     - copied unchanged from r259441, head/sys/powerpc/cpufreq/pmufreq.c
  projects/altix2/tools/regression/usr.bin/sed/regress.icase4.out
     - copied unchanged from r259441, head/tools/regression/usr.bin/sed/regress.icase4.out
  projects/altix2/tools/regression/usr.sbin/etcupdate/tzsetup.sh
     - copied unchanged from r259441, head/tools/regression/usr.sbin/etcupdate/tzsetup.sh
  projects/altix2/usr.sbin/bhyve/bhyve.8
     - copied unchanged from r259441, head/usr.sbin/bhyve/bhyve.8
Deleted:
  projects/altix2/sys/opencrypto/deflate.c
  projects/altix2/tools/regression/bin/
Modified:
  projects/altix2/ObsoleteFiles.inc
  projects/altix2/UPDATING
  projects/altix2/bin/Makefile
  projects/altix2/bin/date/Makefile
  projects/altix2/bin/mv/Makefile
  projects/altix2/bin/pax/Makefile
  projects/altix2/bin/sh/Makefile
  projects/altix2/bin/test/Makefile
  projects/altix2/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  projects/altix2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
  projects/altix2/contrib/gcc/ChangeLog.gcc43
  projects/altix2/contrib/gcc/c.opt
  projects/altix2/contrib/gcc/config/i386/emmintrin.h
  projects/altix2/contrib/gcc/cp/ChangeLog.gcc43
  projects/altix2/contrib/gcc/cp/decl.c
  projects/altix2/contrib/gcc/cp/decl2.c
  projects/altix2/contrib/gcc/doc/invoke.texi
  projects/altix2/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp
  projects/altix2/contrib/tcpdump/addrtoname.c
  projects/altix2/contrib/tcpdump/tcpdump.c
  projects/altix2/crypto/heimdal/lib/gssapi/krb5/prf.c
  projects/altix2/etc/mtree/BSD.tests.dist
  projects/altix2/etc/rc.d/jail
  projects/altix2/etc/syslog.conf
  projects/altix2/games/fortune/datfiles/fortunes
  projects/altix2/include/rpcsvc/bootparam_prot.x
  projects/altix2/include/rpcsvc/key_prot.x
  projects/altix2/include/rpcsvc/klm_prot.x
  projects/altix2/include/rpcsvc/mount.x
  projects/altix2/include/rpcsvc/nfs_prot.x
  projects/altix2/include/rpcsvc/nis.x
  projects/altix2/include/rpcsvc/nis_callback.x
  projects/altix2/include/rpcsvc/nis_object.x
  projects/altix2/include/rpcsvc/nis_tags.h
  projects/altix2/include/rpcsvc/rex.x
  projects/altix2/include/rpcsvc/rnusers.x
  projects/altix2/include/rpcsvc/rstat.x
  projects/altix2/include/rpcsvc/sm_inter.x
  projects/altix2/include/rpcsvc/spray.x
  projects/altix2/include/rpcsvc/yp.x
  projects/altix2/include/rpcsvc/yppasswd.x
  projects/altix2/lib/libc/stdlib/getopt_long.3
  projects/altix2/lib/libc/xdr/xdr.c
  projects/altix2/lib/libc/xdr/xdr_array.c
  projects/altix2/lib/libc/xdr/xdr_float.c
  projects/altix2/lib/libc/xdr/xdr_mem.c
  projects/altix2/lib/libc/xdr/xdr_rec.c
  projects/altix2/lib/libc/xdr/xdr_reference.c
  projects/altix2/lib/libc/xdr/xdr_sizeof.c
  projects/altix2/lib/libc/xdr/xdr_stdio.c
  projects/altix2/lib/libcam/Makefile
  projects/altix2/lib/libnv/msgio.c
  projects/altix2/lib/libnv/msgio.h
  projects/altix2/lib/libnv/nvlist.c
  projects/altix2/release/Makefile
  projects/altix2/release/doc/en_US.ISO8859-1/relnotes/article.xml
  projects/altix2/release/picobsd/build/picobsd
  projects/altix2/release/scripts/pkg-stage.sh
  projects/altix2/sbin/casperd/casperd.8
  projects/altix2/sbin/casperd/zygote.c
  projects/altix2/sbin/devd/devd.cc
  projects/altix2/sbin/growfs/growfs.8
  projects/altix2/sbin/hastd/hastd.c
  projects/altix2/sbin/hastd/nv.c
  projects/altix2/sbin/hastd/primary.c
  projects/altix2/sbin/hastd/proto.c
  projects/altix2/sbin/hastd/secondary.c
  projects/altix2/share/man/man4/netmap.4
  projects/altix2/share/mk/Makefile
  projects/altix2/share/mk/bsd.progs.mk
  projects/altix2/sys/amd64/include/apicvar.h
  projects/altix2/sys/amd64/vmm/intel/vmx.c
  projects/altix2/sys/amd64/vmm/io/vlapic.c
  projects/altix2/sys/amd64/vmm/io/vlapic.h
  projects/altix2/sys/amd64/vmm/vmm.c
  projects/altix2/sys/amd64/vmm/vmm_lapic.c
  projects/altix2/sys/amd64/vmm/vmm_lapic.h
  projects/altix2/sys/amd64/vmm/vmm_msr.c
  projects/altix2/sys/amd64/vmm/vmm_msr.h
  projects/altix2/sys/arm/arm/bus_space-v6.c
  projects/altix2/sys/arm/at91/if_ate.c
  projects/altix2/sys/arm/broadcom/bcm2835/bcm2835_bsc.c
  projects/altix2/sys/arm/freescale/imx/files.imx51
  projects/altix2/sys/arm/freescale/imx/files.imx53
  projects/altix2/sys/arm/freescale/imx/files.imx6
  projects/altix2/sys/arm/rockchip/rk30xx_gpio.c
  projects/altix2/sys/arm/ti/am335x/am335x_dmtimer.c
  projects/altix2/sys/arm/ti/am335x/am335x_scm_padconf.c
  projects/altix2/sys/arm/ti/files.ti
  projects/altix2/sys/arm/ti/ti_i2c.c
  projects/altix2/sys/arm/versatile/bus_space.c
  projects/altix2/sys/arm/xilinx/zy7_bus_space.c
  projects/altix2/sys/boot/fdt/dts/rk3188.dtsi
  projects/altix2/sys/cam/cam.h
  projects/altix2/sys/cam/cam_ccb.h
  projects/altix2/sys/cam/cam_compat.c
  projects/altix2/sys/cam/cam_compat.h
  projects/altix2/sys/cam/scsi/scsi_all.c
  projects/altix2/sys/cam/scsi/scsi_xpt.c
  projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
  projects/altix2/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c
  projects/altix2/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c
  projects/altix2/sys/conf/files
  projects/altix2/sys/conf/files.powerpc
  projects/altix2/sys/conf/kern.mk
  projects/altix2/sys/conf/options
  projects/altix2/sys/dev/ahci/ahciem.c
  projects/altix2/sys/dev/an/if_an.c
  projects/altix2/sys/dev/an/if_an_pccard.c
  projects/altix2/sys/dev/cxgbe/adapter.h
  projects/altix2/sys/dev/cxgbe/common/common.h
  projects/altix2/sys/dev/cxgbe/offload.h
  projects/altix2/sys/dev/cxgbe/t4_main.c
  projects/altix2/sys/dev/cxgbe/t4_sge.c
  projects/altix2/sys/dev/cxgbe/tom/t4_cpl_io.c
  projects/altix2/sys/dev/drm2/drmP.h
  projects/altix2/sys/dev/drm2/drm_fb_helper.c
  projects/altix2/sys/dev/drm2/radeon/atombios_dp.c
  projects/altix2/sys/dev/drm2/radeon/radeon_agp.c
  projects/altix2/sys/dev/hwpmc/hwpmc_powerpc.c
  projects/altix2/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  projects/altix2/sys/dev/iscsi/iscsi.c
  projects/altix2/sys/dev/iwn/if_iwn.c
  projects/altix2/sys/dev/iwn/if_iwn_chip_cfg.h
  projects/altix2/sys/dev/iwn/if_iwnreg.h
  projects/altix2/sys/dev/md/md.c
  projects/altix2/sys/dev/netmap/if_em_netmap.h
  projects/altix2/sys/dev/netmap/if_igb_netmap.h
  projects/altix2/sys/dev/netmap/if_lem_netmap.h
  projects/altix2/sys/dev/netmap/if_re_netmap.h
  projects/altix2/sys/dev/netmap/ixgbe_netmap.h
  projects/altix2/sys/dev/netmap/netmap.c
  projects/altix2/sys/dev/netmap/netmap_kern.h
  projects/altix2/sys/dev/netmap/netmap_mem2.c
  projects/altix2/sys/dev/netmap/netmap_mem2.h
  projects/altix2/sys/dev/ofw/ofw_console.c
  projects/altix2/sys/dev/ofw/ofw_fdt.c
  projects/altix2/sys/dev/usb/controller/at91dci.c
  projects/altix2/sys/dev/usb/controller/atmegadci.c
  projects/altix2/sys/dev/usb/controller/avr32dci.c
  projects/altix2/sys/dev/usb/controller/dwc_otg.c
  projects/altix2/sys/dev/usb/controller/ehci.c
  projects/altix2/sys/dev/usb/controller/musb_otg.c
  projects/altix2/sys/dev/usb/controller/ohci.c
  projects/altix2/sys/dev/usb/controller/uhci.c
  projects/altix2/sys/dev/usb/controller/usb_controller.c
  projects/altix2/sys/dev/usb/controller/uss820dci.c
  projects/altix2/sys/dev/usb/controller/xhci.c
  projects/altix2/sys/dev/usb/template/usb_template.c
  projects/altix2/sys/dev/usb/usb_bus.h
  projects/altix2/sys/dev/usb/usb_device.c
  projects/altix2/sys/dev/usb/usb_device.h
  projects/altix2/sys/dev/usb/usb_hub.c
  projects/altix2/sys/dev/usb/usb_transfer.c
  projects/altix2/sys/dev/usb/usbdi.h
  projects/altix2/sys/dev/vt/font/vt_mouse_cursor.c
  projects/altix2/sys/dev/vt/vt.h
  projects/altix2/sys/dev/vt/vt_buf.c
  projects/altix2/sys/dev/vt/vt_core.c
  projects/altix2/sys/dev/vt/vt_sysmouse.c
  projects/altix2/sys/fs/devfs/devfs_devs.c
  projects/altix2/sys/geom/cache/g_cache.c
  projects/altix2/sys/geom/eli/g_eli.c
  projects/altix2/sys/geom/eli/g_eli_crypto.c
  projects/altix2/sys/geom/geom_dev.c
  projects/altix2/sys/geom/journal/g_journal.c
  projects/altix2/sys/i386/include/apicvar.h
  projects/altix2/sys/ia64/ia64/pmap.c
  projects/altix2/sys/kern/capabilities.conf
  projects/altix2/sys/kern/init_sysent.c
  projects/altix2/sys/kern/kern_exit.c
  projects/altix2/sys/kern/kern_resource.c
  projects/altix2/sys/kern/makesyscalls.sh
  projects/altix2/sys/kern/subr_vmem.c
  projects/altix2/sys/kern/tty.c
  projects/altix2/sys/kern/vfs_bio.c
  projects/altix2/sys/mips/beri/beri_machdep.c
  projects/altix2/sys/mips/cavium/octe/cavium-ethernet.h
  projects/altix2/sys/mips/cavium/octe/ethernet-mv88e61xx.c
  projects/altix2/sys/modules/crypto/Makefile
  projects/altix2/sys/modules/drm2/drm2/Makefile
  projects/altix2/sys/modules/drm2/i915kms/Makefile
  projects/altix2/sys/modules/drm2/radeonkms/Makefile
  projects/altix2/sys/modules/iwnfw/iwn6000g2b/Makefile
  projects/altix2/sys/modules/netmap/Makefile
  projects/altix2/sys/modules/usb/Makefile
  projects/altix2/sys/net/netmap.h
  projects/altix2/sys/net/netmap_user.h
  projects/altix2/sys/ofed/drivers/net/mlx4/en_netdev.c
  projects/altix2/sys/ofed/drivers/net/mlx4/mlx4_en.h
  projects/altix2/sys/powerpc/aim/mp_cpudep.c
  projects/altix2/sys/powerpc/aim/trap.c
  projects/altix2/sys/powerpc/aim/trap_subr32.S
  projects/altix2/sys/powerpc/aim/trap_subr64.S
  projects/altix2/sys/powerpc/include/cpu.h
  projects/altix2/sys/powerpc/include/dbdma.h
  projects/altix2/sys/powerpc/include/pcpu.h
  projects/altix2/sys/powerpc/include/pmc_mdep.h
  projects/altix2/sys/powerpc/include/spr.h
  projects/altix2/sys/powerpc/powermac/platform_powermac.c
  projects/altix2/sys/powerpc/powermac/pmu.c
  projects/altix2/sys/powerpc/powermac/pmuvar.h
  projects/altix2/sys/powerpc/powermac/uninorth.c
  projects/altix2/sys/powerpc/powermac/uninorthvar.h
  projects/altix2/sys/powerpc/powermac/viareg.h
  projects/altix2/sys/powerpc/powerpc/mp_machdep.c
  projects/altix2/sys/powerpc/pseries/phyp_vscsi.c
  projects/altix2/sys/sparc64/sparc64/machdep.c
  projects/altix2/sys/sys/param.h
  projects/altix2/sys/vm/vm_page.c
  projects/altix2/sys/vm/vm_radix.c
  projects/altix2/sys/vm/vm_radix.h
  projects/altix2/sys/x86/acpica/madt.c
  projects/altix2/sys/x86/cpufreq/est.c
  projects/altix2/sys/x86/include/apicreg.h
  projects/altix2/sys/x86/include/mptable.h
  projects/altix2/sys/x86/x86/local_apic.c
  projects/altix2/sys/x86/x86/mptable.c
  projects/altix2/tools/regression/usr.bin/sed/regress.sh
  projects/altix2/tools/regression/usr.sbin/etcupdate/preworld.sh
  projects/altix2/tools/regression/usr.sbin/etcupdate/tests.sh
  projects/altix2/usr.bin/calendar/calcpp.c
  projects/altix2/usr.bin/dtc/fdt.cc
  projects/altix2/usr.bin/kdump/Makefile
  projects/altix2/usr.bin/kdump/kdump.c
  projects/altix2/usr.bin/sed/compile.c
  projects/altix2/usr.bin/sed/sed.1
  projects/altix2/usr.sbin/bhyve/Makefile
  projects/altix2/usr.sbin/bhyvectl/bhyvectl.c
  projects/altix2/usr.sbin/bsdconfig/share/common.subr
  projects/altix2/usr.sbin/bsdconfig/share/packages/index.subr
  projects/altix2/usr.sbin/bsdinstall/bsdinstall
  projects/altix2/usr.sbin/bsdinstall/scripts/services
  projects/altix2/usr.sbin/bsdinstall/scripts/zfsboot
  projects/altix2/usr.sbin/ctld/login.c
  projects/altix2/usr.sbin/etcupdate/etcupdate.8
  projects/altix2/usr.sbin/etcupdate/etcupdate.sh
  projects/altix2/usr.sbin/mptable/mptable.c
  projects/altix2/usr.sbin/mtest/mtest.8
  projects/altix2/usr.sbin/ndp/ndp.c
  projects/altix2/usr.sbin/pkg/config.c
  projects/altix2/usr.sbin/pkg/config.h
  projects/altix2/usr.sbin/pkg/pkg.7
  projects/altix2/usr.sbin/tcpdump/tcpdump/Makefile
  projects/altix2/usr.sbin/ypbind/yp_ping.c
Directory Properties:
  projects/altix2/   (props changed)
  projects/altix2/cddl/   (props changed)
  projects/altix2/cddl/contrib/opensolaris/   (props changed)
  projects/altix2/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/altix2/contrib/gcc/   (props changed)
  projects/altix2/contrib/llvm/   (props changed)
  projects/altix2/contrib/llvm/tools/clang/   (props changed)
  projects/altix2/contrib/tcpdump/   (props changed)
  projects/altix2/crypto/heimdal/   (props changed)
  projects/altix2/etc/   (props changed)
  projects/altix2/include/   (props changed)
  projects/altix2/lib/libc/   (props changed)
  projects/altix2/sbin/   (props changed)
  projects/altix2/share/man/man4/   (props changed)
  projects/altix2/sys/   (props changed)
  projects/altix2/sys/amd64/vmm/   (props changed)
  projects/altix2/sys/boot/   (props changed)
  projects/altix2/sys/cddl/contrib/opensolaris/   (props changed)
  projects/altix2/sys/conf/   (props changed)
  projects/altix2/sys/dev/hyperv/   (props changed)
  projects/altix2/usr.bin/calendar/   (props changed)
  projects/altix2/usr.sbin/bhyve/   (props changed)
  projects/altix2/usr.sbin/bhyvectl/   (props changed)

Modified: projects/altix2/ObsoleteFiles.inc
==============================================================================
--- projects/altix2/ObsoleteFiles.inc	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/ObsoleteFiles.inc	Mon Dec 16 00:59:05 2013	(r259442)
@@ -38,6 +38,8 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20131215: libcam version bumped
+OLD_LIBS+=lib/libcam.so.6 usr/lib32/libcam.so.6
 # 20131202: libcapsicum and libcasper moved to /lib/
 OLD_LIBS+=usr/lib/libcapsicum.so.0
 OLD_LIBS+=usr/lib/libcasper.so.0

Modified: projects/altix2/UPDATING
==============================================================================
--- projects/altix2/UPDATING	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/UPDATING	Mon Dec 16 00:59:05 2013	(r259442)
@@ -31,6 +31,17 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20131213:
+	The behavior of gss_pseudo_random() for the krb5 mechanism
+	has changed, for applications requesting a longer random string
+	than produced by the underlying enctype's pseudo-random() function.
+	In particular, the random string produced from a session key of
+	enctype aes256-cts-hmac-sha1-96 or aes256-cts-hmac-sha1-96 will
+	be different at the 17th octet and later, after this change.
+	The counter used in the PRF+ construction is now encoded as a
+	big-endian integer in accordance with RFC 4402.
+	__FreeBSD_version is bumped to 1100004.
+
 20131108:
 	The WITHOUT_ATF build knob has been removed and its functionality
 	has been subsumed into the more generic WITHOUT_TESTS.  If you were

Modified: projects/altix2/bin/Makefile
==============================================================================
--- projects/altix2/bin/Makefile	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/bin/Makefile	Mon Dec 16 00:59:05 2013	(r259442)
@@ -52,6 +52,10 @@ SUBDIR+=	rmail
 SUBDIR+=	csh
 .endif
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.arch.inc.mk>
 
 SUBDIR:=	${SUBDIR:O}

Modified: projects/altix2/bin/date/Makefile
==============================================================================
--- projects/altix2/bin/date/Makefile	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/bin/date/Makefile	Mon Dec 16 00:59:05 2013	(r259442)
@@ -1,7 +1,13 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	date
 SRCS=	date.c netdate.c vary.c
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=    tests
+.endif
+
 .include <bsd.prog.mk>

Modified: projects/altix2/bin/mv/Makefile
==============================================================================
--- projects/altix2/bin/mv/Makefile	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/bin/mv/Makefile	Mon Dec 16 00:59:05 2013	(r259442)
@@ -1,6 +1,12 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/2/94
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	mv
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=    tests
+.endif
+
 .include <bsd.prog.mk>

Modified: projects/altix2/bin/pax/Makefile
==============================================================================
--- projects/altix2/bin/pax/Makefile	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/bin/pax/Makefile	Mon Dec 16 00:59:05 2013	(r259442)
@@ -1,6 +1,8 @@
 #       @(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 # To install on versions prior to BSD 4.4 the following may have to be
 # defined with CFLAGS +=
 #
@@ -30,4 +32,8 @@ SRCS=	ar_io.c ar_subs.c buf_subs.c cache
 	gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c \
 	tables.c tar.c tty_subs.c
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=    tests
+.endif
+
 .include <bsd.prog.mk>

Modified: projects/altix2/bin/sh/Makefile
==============================================================================
--- projects/altix2/bin/sh/Makefile	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/bin/sh/Makefile	Mon Dec 16 00:59:05 2013	(r259442)
@@ -1,6 +1,8 @@
 #	@(#)Makefile	8.4 (Berkeley) 5/5/95
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	sh
 INSTALLFLAGS= -S
 SHSRCS=	alias.c arith_yacc.c arith_yylex.c cd.c echo.c error.c eval.c \
@@ -59,7 +61,8 @@ syntax.c syntax.h: mksyntax
 token.h: mktokens
 	sh ${.CURDIR}/mktokens
 
-regress:
-	cd ${.CURDIR}/../../tools/regression/bin/sh && ${MAKE} SH=${.OBJDIR}/sh
+.if ${MK_TESTS} != "no"
+SUBDIR+=    tests
+.endif
 
 .include <bsd.prog.mk>

Modified: projects/altix2/bin/test/Makefile
==============================================================================
--- projects/altix2/bin/test/Makefile	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/bin/test/Makefile	Mon Dec 16 00:59:05 2013	(r259442)
@@ -1,8 +1,14 @@
 #        @(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	test
 LINKS=	${BINDIR}/test ${BINDIR}/[
 MLINKS=	test.1 [.1
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=    tests
+.endif
+
 .include <bsd.prog.mk>

Modified: projects/altix2/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- projects/altix2/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Mon Dec 16 00:59:05 2013	(r259442)
@@ -1702,6 +1702,12 @@ show_import(nvlist_t *config)
 		    "resilvered.\n"));
 		break;
 
+	case ZPOOL_STATUS_NON_NATIVE_ASHIFT:
+		(void) printf(gettext("status: One or more devices were "
+		    "configured to use a non-native block size.\n"
+		    "\tExpect reduced performance.\n"));
+		break;
+
 	default:
 		/*
 		 * No other status can be seen when importing pools.

Modified: projects/altix2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
==============================================================================
--- projects/altix2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c	Mon Dec 16 00:59:05 2013	(r259442)
@@ -995,10 +995,10 @@ nozpool_all_slices(avl_tree_t *r, const 
 #endif	/* sun */
 }
 
+#ifdef sun
 static void
 check_slices(avl_tree_t *r, int fd, const char *sname)
 {
-#ifdef sun
 	struct extvtoc vtoc;
 	struct dk_gpt *gpt;
 	char diskname[MAXNAMELEN];
@@ -1028,8 +1028,8 @@ check_slices(avl_tree_t *r, int fd, cons
 			check_one_slice(r, diskname, i, 0, 1);
 		efi_free(gpt);
 	}
-#endif	/* sun */
 }
+#endif	/* sun */
 
 static void
 zpool_open_func(void *arg)
@@ -1059,6 +1059,7 @@ zpool_open_func(void *arg)
 		return;
 	}
 	/* this file is too small to hold a zpool */
+#ifdef sun
 	if (S_ISREG(statbuf.st_mode) &&
 	    statbuf.st_size < SPA_MINDEVSIZE) {
 		(void) close(fd);
@@ -1070,6 +1071,12 @@ zpool_open_func(void *arg)
 		 */
 		check_slices(rn->rn_avl, fd, rn->rn_name);
 	}
+#else	/* !sun */
+	if (statbuf.st_size < SPA_MINDEVSIZE) {
+		(void) close(fd);
+		return;
+	}
+#endif	/* sun */
 
 	if ((zpool_read_label(fd, &config)) != 0) {
 		(void) close(fd);

Modified: projects/altix2/contrib/gcc/ChangeLog.gcc43
==============================================================================
--- projects/altix2/contrib/gcc/ChangeLog.gcc43	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/contrib/gcc/ChangeLog.gcc43	Mon Dec 16 00:59:05 2013	(r259442)
@@ -45,6 +45,12 @@
 	* flags.h (force_align_functions_log): Delete.
 	* toplev.c (force_align_functions_log): Delete.
 
+2007-06-28  Geoffrey Keating  <geoffk at apple.com> (r126088)
+
+	* doc/invoke.texi (C++ Dialect Options): Document
+	fvisibility-ms-compat.
+	* c.opt (fvisibility-ms-compat): New.
+
 2007-06-05  Joerg Wunsch  <j.gnu at uriah.heep.sax.de> (r125346)
 
 	PR preprocessor/23479

Modified: projects/altix2/contrib/gcc/c.opt
==============================================================================
--- projects/altix2/contrib/gcc/c.opt	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/contrib/gcc/c.opt	Mon Dec 16 00:59:05 2013	(r259442)
@@ -741,6 +741,10 @@ fvisibility-inlines-hidden
 C++ ObjC++
 Marks all inlined methods as having hidden visibility
 
+fvisibility-ms-compat
+C++ ObjC++ Var(flag_visibility_ms_compat)
+Changes visibility to match Microsoft Visual Studio by default
+
 fvtable-gc
 C++ ObjC++
 Discard unused virtual functions

Modified: projects/altix2/contrib/gcc/config/i386/emmintrin.h
==============================================================================
--- projects/altix2/contrib/gcc/config/i386/emmintrin.h	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/contrib/gcc/config/i386/emmintrin.h	Mon Dec 16 00:59:05 2013	(r259442)
@@ -1126,9 +1126,9 @@ _mm_slli_epi64 (__m128i __A, int __B)
 #define _mm_slli_epi16(__A, __B) \
   ((__m128i)__builtin_ia32_psllwi128 ((__v8hi)(__A), __B))
 #define _mm_slli_epi32(__A, __B) \
-  ((__m128i)__builtin_ia32_pslldi128 ((__v8hi)(__A), __B))
+  ((__m128i)__builtin_ia32_pslldi128 ((__v4si)(__A), __B))
 #define _mm_slli_epi64(__A, __B) \
-  ((__m128i)__builtin_ia32_psllqi128 ((__v8hi)(__A), __B))
+  ((__m128i)__builtin_ia32_psllqi128 ((__v2di)(__A), __B))
 #endif
 
 #if 0
@@ -1147,7 +1147,7 @@ _mm_srai_epi32 (__m128i __A, int __B)
 #define _mm_srai_epi16(__A, __B) \
   ((__m128i)__builtin_ia32_psrawi128 ((__v8hi)(__A), __B))
 #define _mm_srai_epi32(__A, __B) \
-  ((__m128i)__builtin_ia32_psradi128 ((__v8hi)(__A), __B))
+  ((__m128i)__builtin_ia32_psradi128 ((__v4si)(__A), __B))
 #endif
 
 #if 0

Modified: projects/altix2/contrib/gcc/cp/ChangeLog.gcc43
==============================================================================
--- projects/altix2/contrib/gcc/cp/ChangeLog.gcc43	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/contrib/gcc/cp/ChangeLog.gcc43	Mon Dec 16 00:59:05 2013	(r259442)
@@ -7,6 +7,13 @@
 	* typeck.c (cxx_alignof_expr): When alignof is used on a plain
 	FUNCTION_DECL, return its alignment.
 
+2007-06-28  Geoffrey Keating  <geoffk at apple.com> (r126088)
+
+	* decl2.c (determine_visibility): Implement
+	flag_visibility_ms_compat effect on type info.
+	* decl.c (cxx_init_decl_processing): Implement
+	global effect of flag_visibility_ms_compat.
+
 2007-06-28  Geoffrey Keating  <geoffk at apple.com> (r126080)
 
 	* decl2.c (start_objects): Mark constructor-runnning function

Modified: projects/altix2/contrib/gcc/cp/decl.c
==============================================================================
--- projects/altix2/contrib/gcc/cp/decl.c	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/contrib/gcc/cp/decl.c	Mon Dec 16 00:59:05 2013	(r259442)
@@ -3157,6 +3157,9 @@ cxx_init_decl_processing (void)
     }
   if (flag_inline_functions)
     flag_inline_trees = 2;
+  
+  if (flag_visibility_ms_compat)
+   default_visibility = VISIBILITY_HIDDEN;
 
   /* Initially, C.  */
   current_lang_name = lang_name_c;

Modified: projects/altix2/contrib/gcc/cp/decl2.c
==============================================================================
--- projects/altix2/contrib/gcc/cp/decl2.c	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/contrib/gcc/cp/decl2.c	Mon Dec 16 00:59:05 2013	(r259442)
@@ -1726,6 +1726,19 @@ determine_visibility (tree decl)
 	     but have no TEMPLATE_INFO, so don't try to check it.  */
 	  use_template = 0;
 	}
+      else if (TREE_CODE (decl) == VAR_DECL && DECL_TINFO_P (decl)
+	       && flag_visibility_ms_compat)
+	{
+	  /* Under -fvisibility-ms-compat, types are visible by default,
+	     even though their contents aren't.  */
+	  tree underlying_type = TREE_TYPE (DECL_NAME (decl));
+	  int underlying_vis = type_visibility (underlying_type);
+	  if (underlying_vis == VISIBILITY_ANON
+	      || CLASSTYPE_VISIBILITY_SPECIFIED (underlying_type))
+	    constrain_visibility (decl, underlying_vis);
+	  else
+	    DECL_VISIBILITY (decl) = VISIBILITY_DEFAULT;
+	}
       else if (TREE_CODE (decl) == VAR_DECL && DECL_TINFO_P (decl))
 	{
 	  /* tinfo visibility is based on the type it's for.  */

Modified: projects/altix2/contrib/gcc/doc/invoke.texi
==============================================================================
--- projects/altix2/contrib/gcc/doc/invoke.texi	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/contrib/gcc/doc/invoke.texi	Mon Dec 16 00:59:05 2013	(r259442)
@@ -186,6 +186,7 @@ in the following sections.
 -frepo  -fno-rtti  -fstats  -ftemplate-depth- at var{n} @gol
 -fno-threadsafe-statics -fuse-cxa-atexit  -fno-weak  -nostdinc++ @gol
 -fno-default-inline  -fvisibility-inlines-hidden @gol
+-fvisibility-ms-compat @gol
 -Wabi  -Wctor-dtor-privacy @gol
 -Wnon-virtual-dtor  -Wreorder @gol
 -Weffc++  -Wno-deprecated  -Wstrict-null-sentinel @gol
@@ -1626,6 +1627,40 @@ Explicitly instantiated inline methods a
 as their linkage might otherwise cross a shared library boundary.
 @xref{Template Instantiation}.
 
+ at item -fvisibility-ms-compat
+ at opindex fvisibility-ms-compat
+This flag attempts to use visibility settings to make GCC's C++
+linkage model compatible with that of Microsoft Visual Studio.
+
+The flag makes these changes to GCC's linkage model:
+
+ at enumerate
+ at item
+It sets the default visibility to @code{hidden}, like
+ at option{-fvisibility=hidden}.
+
+ at item
+Types, but not their members, are not hidden by default.
+
+ at item
+The One Definition Rule is relaxed for types without explicit
+visibility specifications which are defined in more than one different
+shared object: those declarations are permitted if they would have
+been permitted when this option was not used.
+ at end enumerate
+
+In new code it is better to use @option{-fvisibility=hidden} and
+export those classes which are intended to be externally visible.
+Unfortunately it is possible for code to rely, perhaps accidentally,
+on the Visual Studio behaviour.
+
+Among the consequences of these changes are that static data members
+of the same type with the same name but defined in different shared
+objects will be different, so changing one will not change the other;
+and that pointers to function members defined in different shared
+objects may not compare equal.  When this flag is given, it is a
+violation of the ODR to define types with the same name differently.
+
 @item -fno-weak
 @opindex fno-weak
 Do not use weak symbol support, even if it is provided by the linker.

Modified: projects/altix2/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp
==============================================================================
--- projects/altix2/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp	Mon Dec 16 00:59:05 2013	(r259442)
@@ -454,10 +454,9 @@ void CodeGenVTables::EmitThunk(GlobalDec
   } else {
     // Normal thunk body generation.
     CodeGenFunction(CGM).GenerateThunk(ThunkFn, FnInfo, GD, Thunk);
+    if (UseAvailableExternallyLinkage)
+      ThunkFn->setLinkage(llvm::GlobalValue::AvailableExternallyLinkage);
   }
-
-  if (UseAvailableExternallyLinkage)
-    ThunkFn->setLinkage(llvm::GlobalValue::AvailableExternallyLinkage);
 }
 
 void CodeGenVTables::MaybeEmitThunkAvailableExternally(GlobalDecl GD,

Modified: projects/altix2/contrib/tcpdump/addrtoname.c
==============================================================================
--- projects/altix2/contrib/tcpdump/addrtoname.c	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/contrib/tcpdump/addrtoname.c	Mon Dec 16 00:59:05 2013	(r259442)
@@ -32,6 +32,10 @@ static const char rcsid[] _U_ =
 #include "config.h"
 #endif
 
+#ifdef __FreeBSD__
+#include <libcapsicum.h>
+#include <libcapsicum_dns.h>
+#endif
 #include <tcpdump-stdinc.h>
 
 #ifdef USE_ETHER_NTOHOST
@@ -203,6 +207,9 @@ intoa(u_int32_t addr)
 
 static u_int32_t f_netmask;
 static u_int32_t f_localnet;
+#ifdef HAVE_LIBCAPSICUM
+extern cap_channel_t *capdns;
+#endif
 
 /*
  * Return a name for the IP address pointed to by ap.  This address
@@ -248,7 +255,13 @@ getname(const u_char *ap)
 	 */
 	if (!nflag &&
 	    (addr & f_netmask) == f_localnet) {
-		hp = gethostbyaddr((char *)&addr, 4, AF_INET);
+#ifdef HAVE_LIBCAPSICUM
+		if (capdns != NULL) {
+			hp = cap_gethostbyaddr(capdns, (char *)&addr, 4,
+			    AF_INET);
+		} else
+#endif
+			hp = gethostbyaddr((char *)&addr, 4, AF_INET);
 		if (hp) {
 			char *dotp;
 
@@ -293,7 +306,13 @@ getname6(const u_char *ap)
 	 * Do not print names if -n was given.
 	 */
 	if (!nflag) {
-		hp = gethostbyaddr((char *)&addr, sizeof(addr), AF_INET6);
+#ifdef HAVE_LIBCAPSICUM
+		if (capdns != NULL) {
+			hp = cap_gethostbyaddr(capdns, (char *)&addr,
+			    sizeof(addr), AF_INET6);
+		} else
+#endif
+			hp = gethostbyaddr((char *)&addr, sizeof(addr), AF_INET6);
 		if (hp) {
 			char *dotp;
 

Modified: projects/altix2/contrib/tcpdump/tcpdump.c
==============================================================================
--- projects/altix2/contrib/tcpdump/tcpdump.c	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/contrib/tcpdump/tcpdump.c	Mon Dec 16 00:59:05 2013	(r259442)
@@ -76,6 +76,12 @@ extern int SIZE_BUF;
 #include <net/bpf.h>
 #include <fcntl.h>
 #include <libgen.h>
+#ifdef HAVE_LIBCAPSICUM
+#include <libcapsicum.h>
+#include <libcapsicum_dns.h>
+#include <libcapsicum_service.h>
+#include <nv.h>
+#endif	/* HAVE_LIBCAPSICUM */
 #endif	/* __FreeBSD__ */
 #ifndef WIN32
 #include <sys/wait.h>
@@ -123,6 +129,10 @@ static int infoprint;
 
 char *program_name;
 
+#ifdef HAVE_LIBCAPSICUM
+cap_channel_t *capdns;
+#endif
+
 int32_t thiszone;		/* seconds offset from gmt to local time */
 
 /* Forwards */
@@ -684,6 +694,45 @@ get_next_file(FILE *VFile, char *ptr)
 	return ret;
 }
 
+#ifdef HAVE_LIBCAPSICUM
+static cap_channel_t *
+capdns_setup(void)
+{
+	cap_channel_t *capcas, *capdnsloc;
+	const char *types[1];
+	int families[2];
+
+	capcas = cap_init();
+	if (capcas == NULL) {
+		warning("unable to contact casperd");
+		return (NULL);
+	}
+	capdnsloc = cap_service_open(capcas, "system.dns");
+	/* Casper capability no longer needed. */
+	cap_close(capcas);
+	if (capdnsloc == NULL) {
+		warning("unable to open system.dns service");
+		return (NULL);
+	}
+	/* Limit system.dns to reverse DNS lookups. */
+	types[0] = "ADDR";
+	if (cap_dns_type_limit(capdnsloc, types, 1) < 0) {
+		warning("unable to limit access to system.dns service");
+		cap_close(capdnsloc);
+		return (NULL);
+	}
+	families[0] = AF_INET;
+	families[1] = AF_INET6;
+	if (cap_dns_family_limit(capdnsloc, families, 2) < 0) {
+		warning("unable to limit access to system.dns service");
+		cap_close(capdnsloc);
+		return (NULL);
+	}
+
+	return (capdnsloc);
+}
+#endif	/* HAVE_LIBCAPSICUM */
+
 int
 main(int argc, char **argv)
 {
@@ -1417,6 +1466,12 @@ main(int argc, char **argv)
 		free(cmdbuf);
 		exit(0);
 	}
+
+#ifdef HAVE_LIBCAPSICUM
+	if (!nflag)
+		capdns = capdns_setup();
+#endif	/* HAVE_LIBCAPSICUM */
+
 	init_addrtoname(localnet, netmask);
         init_checksum();
 
@@ -1615,7 +1670,12 @@ main(int argc, char **argv)
 #endif /* WIN32 */
 
 #ifdef __FreeBSD__
-	cansandbox = (nflag && VFileName == NULL && zflag == NULL);
+	cansandbox = (VFileName == NULL && zflag == NULL);
+#ifdef HAVE_LIBCAPSICUM
+	cansandbox = (cansandbox && (nflag || capdns != NULL));
+#else
+	cansandbox = (cansandbox && nflag);
+#endif
 	if (cansandbox && cap_enter() < 0 && errno != ENOSYS)
 		error("unable to enter the capability mode");
 	if (cap_sandboxed())

Modified: projects/altix2/crypto/heimdal/lib/gssapi/krb5/prf.c
==============================================================================
--- projects/altix2/crypto/heimdal/lib/gssapi/krb5/prf.c	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/crypto/heimdal/lib/gssapi/krb5/prf.c	Mon Dec 16 00:59:05 2013	(r259442)
@@ -119,7 +119,7 @@ _gsskrb5_pseudo_random(OM_uint32 *minor_
     while(dol > 0) {
 	size_t tsize;
 
-	_gsskrb5_encode_om_uint32(num, input.data);
+	_gsskrb5_encode_be_om_uint32(num, input.data);
 
 	ret = krb5_crypto_prf(context, crypto, &input, &output);
 	if (ret) {
@@ -133,7 +133,7 @@ _gsskrb5_pseudo_random(OM_uint32 *minor_
 
 	tsize = min(dol, output.length);
 	memcpy(p, output.data, tsize);
-	p += output.length;
+	p += tsize;
 	dol -= tsize;
 	krb5_data_free(&output);
 	num++;

Modified: projects/altix2/etc/mtree/BSD.tests.dist
==============================================================================
--- projects/altix2/etc/mtree/BSD.tests.dist	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/etc/mtree/BSD.tests.dist	Mon Dec 16 00:59:05 2013	(r259442)
@@ -20,6 +20,32 @@
         ..
     ..
     tests
+        bin
+            date
+            ..
+            mv
+            ..
+            pax
+            ..
+            sh
+                builtins
+                ..
+                errors
+                ..
+                execution
+                ..
+                expansion
+                ..
+                parameters
+                ..
+                parser
+                ..
+                set-e
+                ..
+            ..
+            test
+            ..
+        ..
         lib
             atf
                 libatf-c

Modified: projects/altix2/etc/rc.d/jail
==============================================================================
--- projects/altix2/etc/rc.d/jail	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/etc/rc.d/jail	Mon Dec 16 00:59:05 2013	(r259442)
@@ -319,8 +319,8 @@ jail_extract_address()
 		_mask=${_mask:-/32}
 
 	elif [ "${_type}" = "inet6" ]; then
-		# In case _maske is not set for IPv6, use /64.
-		_mask=${_mask:-/64}
+		# In case _maske is not set for IPv6, use /128.
+		_mask=${_mask:-/128}
 	fi
 }
 

Modified: projects/altix2/etc/syslog.conf
==============================================================================
--- projects/altix2/etc/syslog.conf	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/etc/syslog.conf	Mon Dec 16 00:59:05 2013	(r259442)
@@ -30,7 +30,7 @@ cron.*						/var/log/cron
 # news.notice					/var/log/news/news.notice
 # Uncomment this if you wish to see messages produced by devd
 # !devd
-# *.>=info                                       /var/log/devd.log
+# *.>=notice					/var/log/devd.log
 !ppp
 *.*						/var/log/ppp.log
 !*

Modified: projects/altix2/games/fortune/datfiles/fortunes
==============================================================================
--- projects/altix2/games/fortune/datfiles/fortunes	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/games/fortune/datfiles/fortunes	Mon Dec 16 00:59:05 2013	(r259442)
@@ -46677,7 +46677,7 @@ they had just discovered that he lived i
 taken another one of those damned Vermont winters!"
 %
 THE OLD POOL SHOOTER had won many a game in his life. But now it was time
-to hang up the cue. When he did, all the other cues came crashing go the
+to hang up the cue. When he did, all the other cues came crashing to the
 floor.
 
 "Sorry," he said with a smile.

Modified: projects/altix2/include/rpcsvc/bootparam_prot.x
==============================================================================
--- projects/altix2/include/rpcsvc/bootparam_prot.x	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/include/rpcsvc/bootparam_prot.x	Mon Dec 16 00:59:05 2013	(r259442)
@@ -1,30 +1,32 @@
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
+/*-
+ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
+ *
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /*

Modified: projects/altix2/include/rpcsvc/key_prot.x
==============================================================================
--- projects/altix2/include/rpcsvc/key_prot.x	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/include/rpcsvc/key_prot.x	Mon Dec 16 00:59:05 2013	(r259442)
@@ -1,30 +1,32 @@
-%/*
-% * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
-% * unrestricted use provided that this legend is included on all tape
-% * media and as a part of the software program in whole or part.  Users
-% * may copy or modify Sun RPC without charge, but are not authorized
-% * to license or distribute it to anyone else except as part of a product or
-% * program developed by the user.
+%/*-
+% * Copyright (c) 2010, Oracle America, Inc.
 % *
-% * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
-% * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
-% * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+% * Redistribution and use in source and binary forms, with or without
+% * modification, are permitted provided that the following conditions are
+% * met:
 % *
-% * Sun RPC is provided with no support and without any obligation on the
-% * part of Sun Microsystems, Inc. to assist in its use, correction,
-% * modification or enhancement.
+% *     * Redistributions of source code must retain the above copyright
+% *       notice, this list of conditions and the following disclaimer.
+% *     * Redistributions in binary form must reproduce the above
+% *       copyright notice, this list of conditions and the following
+% *       disclaimer in the documentation and/or other materials
+% *       provided with the distribution.
+% *     * Neither the name of the "Oracle America, Inc." nor the names of its
+% *       contributors may be used to endorse or promote products derived
+% *       from this software without specific prior written permission.
 % *
-% * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
-% * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
-% * OR ANY PART THEREOF.
-% *
-% * In no event will Sun Microsystems, Inc. be liable for any lost revenue
-% * or profits or other special, indirect and consequential damages, even if
-% * Sun has been advised of the possibility of such damages.
-% *
-% * Sun Microsystems, Inc.
-% * 2550 Garcia Avenue
-% * Mountain View, California  94043
+% *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+% *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+% *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+% *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+% *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+% *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+% *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+% *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+% *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+% *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+% *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+% *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 % */
 /*
  * Key server protocol definition

Modified: projects/altix2/include/rpcsvc/klm_prot.x
==============================================================================
--- projects/altix2/include/rpcsvc/klm_prot.x	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/include/rpcsvc/klm_prot.x	Mon Dec 16 00:59:05 2013	(r259442)
@@ -1,30 +1,32 @@
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
+/*-
+ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
+ *
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /*

Modified: projects/altix2/include/rpcsvc/mount.x
==============================================================================
--- projects/altix2/include/rpcsvc/mount.x	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/include/rpcsvc/mount.x	Mon Dec 16 00:59:05 2013	(r259442)
@@ -1,30 +1,32 @@
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
+/*-
+ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
+ *
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /*

Modified: projects/altix2/include/rpcsvc/nfs_prot.x
==============================================================================
--- projects/altix2/include/rpcsvc/nfs_prot.x	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/include/rpcsvc/nfs_prot.x	Mon Dec 16 00:59:05 2013	(r259442)
@@ -1,30 +1,32 @@
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
+/*-
+ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
+ *
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef RPC_HDR

Modified: projects/altix2/include/rpcsvc/nis.x
==============================================================================
--- projects/altix2/include/rpcsvc/nis.x	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/include/rpcsvc/nis.x	Mon Dec 16 00:59:05 2013	(r259442)
@@ -1,31 +1,32 @@
-%/*
-% * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
-% * unrestricted use provided that this legend is included on all tape
-% * media and as a part of the software program in whole or part.  Users
-% * may copy or modify Sun RPC without charge, but are not authorized
-% * to license or distribute it to anyone else except as part of a product or
-% * program developed by the user or with the express written consent of
-% * Sun Microsystems, Inc.
-% *
-% * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
-% * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
-% * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
-% *
-% * Sun RPC is provided with no support and without any obligation on the
-% * part of Sun Microsystems, Inc. to assist in its use, correction,
-% * modification or enhancement.
+%/*-
+% * Copyright (c) 2010, Oracle America, Inc.
 % *
-% * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
-% * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
-% * OR ANY PART THEREOF.
+% * Redistribution and use in source and binary forms, with or without
+% * modification, are permitted provided that the following conditions are
+% * met:
 % *
-% * In no event will Sun Microsystems, Inc. be liable for any lost revenue
-% * or profits or other special, indirect and consequential damages, even if
-% * Sun has been advised of the possibility of such damages.
+% *     * Redistributions of source code must retain the above copyright
+% *       notice, this list of conditions and the following disclaimer.
+% *     * Redistributions in binary form must reproduce the above
+% *       copyright notice, this list of conditions and the following
+% *       disclaimer in the documentation and/or other materials
+% *       provided with the distribution.
+% *     * Neither the name of the "Oracle America, Inc." nor the names of its
+% *       contributors may be used to endorse or promote products derived
+% *       from this software without specific prior written permission.
 % *
-% * Sun Microsystems, Inc.
-% * 2550 Garcia Avenue
-% * Mountain View, California  94043
+% *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+% *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+% *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+% *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+% *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+% *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+% *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+% *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+% *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+% *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+% *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+% *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 % */
 
 #ifndef RPC_HDR

Modified: projects/altix2/include/rpcsvc/nis_callback.x
==============================================================================
--- projects/altix2/include/rpcsvc/nis_callback.x	Mon Dec 16 00:50:14 2013	(r259441)
+++ projects/altix2/include/rpcsvc/nis_callback.x	Mon Dec 16 00:59:05 2013	(r259442)
@@ -1,31 +1,32 @@
-%/*
-% * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
-% * unrestricted use provided that this legend is included on all tape
-% * media and as a part of the software program in whole or part.  Users
-% * may copy or modify Sun RPC without charge, but are not authorized
-% * to license or distribute it to anyone else except as part of a product or
-% * program developed by the user or with the express written consent of
-% * Sun Microsystems, Inc.
+%/*-
+% * Copyright (c) 2010, Oracle America, Inc.
 % *
-% * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
-% * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
-% * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+% * Redistribution and use in source and binary forms, with or without
+% * modification, are permitted provided that the following conditions are
+% * met:
 % *
-% * Sun RPC is provided with no support and without any obligation on the
-% * part of Sun Microsystems, Inc. to assist in its use, correction,
-% * modification or enhancement.
+% *     * Redistributions of source code must retain the above copyright
+% *       notice, this list of conditions and the following disclaimer.
+% *     * Redistributions in binary form must reproduce the above
+% *       copyright notice, this list of conditions and the following
+% *       disclaimer in the documentation and/or other materials
+% *       provided with the distribution.

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

More information about the svn-src-projects mailing list