Date: Tue, 17 Dec 2013 12:43:36 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r259504 - in projects/sendfile: . 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/cm... Message-ID: <201312171243.rBHChaXi062070@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Tue Dec 17 12:43:35 2013 New Revision: 259504 URL: http://svnweb.freebsd.org/changeset/base/259504 Log: Merge head up to r259503. Added: projects/sendfile/bin/date/tests/ - copied from r259503, head/bin/date/tests/ projects/sendfile/bin/mv/tests/ - copied from r259503, head/bin/mv/tests/ projects/sendfile/bin/pax/tests/ - copied from r259503, head/bin/pax/tests/ projects/sendfile/bin/sh/tests/ - copied from r259503, head/bin/sh/tests/ projects/sendfile/bin/test/tests/ - copied from r259503, head/bin/test/tests/ projects/sendfile/bin/tests/ - copied from r259503, head/bin/tests/ projects/sendfile/etc/rc.d/casperd - copied unchanged from r259503, head/etc/rc.d/casperd projects/sendfile/lib/clang/include/PPCGenAsmMatcher.inc - copied unchanged from r259503, head/lib/clang/include/PPCGenAsmMatcher.inc projects/sendfile/lib/clang/libllvmpowerpcasmparser/ - copied from r259503, head/lib/clang/libllvmpowerpcasmparser/ projects/sendfile/release/scripts/FreeBSD_install_cdrom.conf - copied unchanged from r259503, head/release/scripts/FreeBSD_install_cdrom.conf projects/sendfile/share/mk/tap.test.mk - copied unchanged from r259503, head/share/mk/tap.test.mk projects/sendfile/sys/boot/fdt/dts/beri-netfpga.dts - copied unchanged from r259503, head/sys/boot/fdt/dts/beri-netfpga.dts projects/sendfile/sys/dev/netmap/netmap_freebsd.c - copied unchanged from r259503, head/sys/dev/netmap/netmap_freebsd.c projects/sendfile/sys/dev/netmap/netmap_generic.c - copied unchanged from r259503, head/sys/dev/netmap/netmap_generic.c projects/sendfile/sys/dev/netmap/netmap_mbq.c - copied unchanged from r259503, head/sys/dev/netmap/netmap_mbq.c projects/sendfile/sys/dev/netmap/netmap_mbq.h - copied unchanged from r259503, head/sys/dev/netmap/netmap_mbq.h projects/sendfile/sys/dev/netmap/netmap_vale.c - copied unchanged from r259503, head/sys/dev/netmap/netmap_vale.c projects/sendfile/sys/mips/conf/BERI_NETFPGA_MDROOT - copied unchanged from r259503, head/sys/mips/conf/BERI_NETFPGA_MDROOT projects/sendfile/sys/opencrypto/cryptodeflate.c - copied unchanged from r259503, head/sys/opencrypto/cryptodeflate.c projects/sendfile/sys/powerpc/cpufreq/pmufreq.c - copied unchanged from r259503, head/sys/powerpc/cpufreq/pmufreq.c projects/sendfile/tools/regression/usr.bin/sed/regress.icase4.out - copied unchanged from r259503, head/tools/regression/usr.bin/sed/regress.icase4.out projects/sendfile/tools/regression/usr.sbin/etcupdate/tzsetup.sh - copied unchanged from r259503, head/tools/regression/usr.sbin/etcupdate/tzsetup.sh projects/sendfile/usr.sbin/bhyve/bhyve.8 - copied unchanged from r259503, head/usr.sbin/bhyve/bhyve.8 Deleted: projects/sendfile/sys/i386/i386/symbols.raw projects/sendfile/sys/opencrypto/deflate.c projects/sendfile/tools/regression/bin/ Modified: projects/sendfile/ObsoleteFiles.inc projects/sendfile/UPDATING projects/sendfile/bin/Makefile projects/sendfile/bin/date/Makefile projects/sendfile/bin/mv/Makefile projects/sendfile/bin/pax/Makefile projects/sendfile/bin/sh/Makefile projects/sendfile/bin/test/Makefile projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c projects/sendfile/contrib/gcc/config/i386/emmintrin.h projects/sendfile/contrib/llvm/tools/clang/lib/Headers/cpuid.h projects/sendfile/contrib/tcpdump/addrtoname.c projects/sendfile/contrib/tcpdump/tcpdump.c projects/sendfile/contrib/tzcode/stdtime/tzfile.5 projects/sendfile/crypto/heimdal/lib/gssapi/krb5/prf.c projects/sendfile/etc/defaults/rc.conf projects/sendfile/etc/mtree/BSD.tests.dist projects/sendfile/etc/rc.d/Makefile projects/sendfile/etc/syslog.conf projects/sendfile/games/fortune/datfiles/fortunes projects/sendfile/include/rpcsvc/bootparam_prot.x projects/sendfile/include/rpcsvc/key_prot.x projects/sendfile/include/rpcsvc/klm_prot.x projects/sendfile/include/rpcsvc/mount.x projects/sendfile/include/rpcsvc/nfs_prot.x projects/sendfile/include/rpcsvc/nis.x projects/sendfile/include/rpcsvc/nis_callback.x projects/sendfile/include/rpcsvc/nis_object.x projects/sendfile/include/rpcsvc/nis_tags.h projects/sendfile/include/rpcsvc/rex.x projects/sendfile/include/rpcsvc/rnusers.x projects/sendfile/include/rpcsvc/rstat.x projects/sendfile/include/rpcsvc/sm_inter.x projects/sendfile/include/rpcsvc/spray.x projects/sendfile/include/rpcsvc/yp.x projects/sendfile/include/rpcsvc/yppasswd.x projects/sendfile/lib/clang/Makefile projects/sendfile/lib/clang/include/llvm/Config/AsmParsers.def projects/sendfile/lib/libc/stdlib/getopt_long.3 projects/sendfile/lib/libc/xdr/xdr.c projects/sendfile/lib/libc/xdr/xdr_array.c projects/sendfile/lib/libc/xdr/xdr_float.c projects/sendfile/lib/libc/xdr/xdr_mem.c projects/sendfile/lib/libc/xdr/xdr_rec.c projects/sendfile/lib/libc/xdr/xdr_reference.c projects/sendfile/lib/libc/xdr/xdr_sizeof.c projects/sendfile/lib/libc/xdr/xdr_stdio.c projects/sendfile/lib/libcam/Makefile projects/sendfile/lib/libnv/msgio.c projects/sendfile/lib/libnv/msgio.h projects/sendfile/lib/libnv/nvlist.c projects/sendfile/lib/libvmmapi/vmmapi.c projects/sendfile/lib/libvmmapi/vmmapi.h projects/sendfile/release/Makefile projects/sendfile/release/doc/en_US.ISO8859-1/relnotes/article.xml projects/sendfile/release/picobsd/build/picobsd projects/sendfile/release/scripts/pkg-stage.sh projects/sendfile/sbin/casperd/casperd.8 projects/sendfile/sbin/casperd/zygote.c projects/sendfile/sbin/devd/devd.cc projects/sendfile/sbin/growfs/growfs.8 projects/sendfile/sbin/hastd/hastd.c projects/sendfile/sbin/hastd/nv.c projects/sendfile/sbin/hastd/primary.c projects/sendfile/sbin/hastd/proto.c projects/sendfile/sbin/hastd/secondary.c projects/sendfile/sbin/iscontrol/iscsi.conf.5 projects/sendfile/share/man/man4/netmap.4 projects/sendfile/share/misc/committers-ports.dot projects/sendfile/share/misc/committers-src.dot projects/sendfile/share/mk/Makefile projects/sendfile/share/mk/bsd.progs.mk projects/sendfile/sys/amd64/include/apicvar.h projects/sendfile/sys/amd64/include/vmm_dev.h (contents, props changed) projects/sendfile/sys/amd64/vmm/intel/vmx.c projects/sendfile/sys/amd64/vmm/io/ppt.c projects/sendfile/sys/amd64/vmm/io/ppt.h projects/sendfile/sys/amd64/vmm/io/vhpet.c 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_dev.c projects/sendfile/sys/amd64/vmm/vmm_lapic.c projects/sendfile/sys/amd64/vmm/vmm_lapic.h projects/sendfile/sys/amd64/vmm/vmm_msr.c projects/sendfile/sys/amd64/vmm/vmm_msr.h projects/sendfile/sys/arm/arm/bus_space-v6.c projects/sendfile/sys/arm/at91/if_ate.c projects/sendfile/sys/arm/broadcom/bcm2835/bcm2835_bsc.c projects/sendfile/sys/arm/freescale/imx/files.imx51 projects/sendfile/sys/arm/freescale/imx/files.imx53 projects/sendfile/sys/arm/freescale/imx/files.imx6 projects/sendfile/sys/arm/mv/mv_pci.c projects/sendfile/sys/arm/rockchip/rk30xx_gpio.c projects/sendfile/sys/arm/ti/am335x/am335x_scm_padconf.c projects/sendfile/sys/arm/ti/files.ti projects/sendfile/sys/arm/ti/ti_i2c.c projects/sendfile/sys/arm/versatile/bus_space.c projects/sendfile/sys/arm/xilinx/zy7_bus_space.c projects/sendfile/sys/boot/fdt/dts/rk3188.dtsi projects/sendfile/sys/cam/cam.h projects/sendfile/sys/cam/cam_ccb.h projects/sendfile/sys/cam/cam_compat.c projects/sendfile/sys/cam/cam_compat.h projects/sendfile/sys/cam/scsi/scsi_all.c projects/sendfile/sys/cam/scsi/scsi_xpt.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c projects/sendfile/sys/conf/files projects/sendfile/sys/conf/files.powerpc projects/sendfile/sys/conf/kern.mk projects/sendfile/sys/conf/options projects/sendfile/sys/dev/ahci/ahciem.c projects/sendfile/sys/dev/an/if_an.c projects/sendfile/sys/dev/an/if_an_pccard.c projects/sendfile/sys/dev/cxgbe/common/common.h projects/sendfile/sys/dev/cxgbe/offload.h projects/sendfile/sys/dev/cxgbe/t4_main.c projects/sendfile/sys/dev/cxgbe/t4_sge.c projects/sendfile/sys/dev/cxgbe/tom/t4_cpl_io.c projects/sendfile/sys/dev/drm2/drmP.h projects/sendfile/sys/dev/drm2/drm_fb_helper.c projects/sendfile/sys/dev/hwpmc/hwpmc_powerpc.c projects/sendfile/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/sendfile/sys/dev/iscsi/iscsi.c projects/sendfile/sys/dev/iwn/if_iwn.c projects/sendfile/sys/dev/iwn/if_iwn_chip_cfg.h projects/sendfile/sys/dev/iwn/if_iwnreg.h projects/sendfile/sys/dev/md/md.c projects/sendfile/sys/dev/netmap/if_em_netmap.h projects/sendfile/sys/dev/netmap/if_igb_netmap.h projects/sendfile/sys/dev/netmap/if_lem_netmap.h projects/sendfile/sys/dev/netmap/if_re_netmap.h projects/sendfile/sys/dev/netmap/ixgbe_netmap.h projects/sendfile/sys/dev/netmap/netmap.c projects/sendfile/sys/dev/netmap/netmap_kern.h projects/sendfile/sys/dev/netmap/netmap_mem2.c projects/sendfile/sys/dev/netmap/netmap_mem2.h projects/sendfile/sys/dev/ofw/ofw_console.c projects/sendfile/sys/dev/ofw/ofw_fdt.c projects/sendfile/sys/dev/usb/controller/at91dci.c projects/sendfile/sys/dev/usb/controller/atmegadci.c projects/sendfile/sys/dev/usb/controller/avr32dci.c projects/sendfile/sys/dev/usb/controller/dwc_otg.c projects/sendfile/sys/dev/usb/controller/ehci.c projects/sendfile/sys/dev/usb/controller/musb_otg.c projects/sendfile/sys/dev/usb/controller/ohci.c projects/sendfile/sys/dev/usb/controller/uhci.c projects/sendfile/sys/dev/usb/controller/uss820dci.c projects/sendfile/sys/dev/usb/controller/xhci.c projects/sendfile/sys/dev/usb/template/usb_template.c projects/sendfile/sys/dev/usb/usb_bus.h 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_transfer.c projects/sendfile/sys/dev/usb/usbdi.h projects/sendfile/sys/dev/vt/font/vt_mouse_cursor.c projects/sendfile/sys/dev/vt/vt.h projects/sendfile/sys/dev/vt/vt_buf.c projects/sendfile/sys/dev/vt/vt_core.c projects/sendfile/sys/dev/vt/vt_sysmouse.c projects/sendfile/sys/fs/devfs/devfs_devs.c projects/sendfile/sys/geom/eli/g_eli.c projects/sendfile/sys/geom/eli/g_eli_crypto.c projects/sendfile/sys/geom/geom_dev.c projects/sendfile/sys/i386/include/apicvar.h projects/sendfile/sys/ia64/ia64/pmap.c projects/sendfile/sys/kern/capabilities.conf projects/sendfile/sys/kern/init_sysent.c projects/sendfile/sys/kern/kern_clocksource.c projects/sendfile/sys/kern/kern_exit.c projects/sendfile/sys/kern/kern_resource.c projects/sendfile/sys/kern/makesyscalls.sh projects/sendfile/sys/kern/subr_vmem.c projects/sendfile/sys/kern/tty.c projects/sendfile/sys/kern/uipc_syscalls.c projects/sendfile/sys/kern/vfs_bio.c projects/sendfile/sys/mips/beri/beri_machdep.c projects/sendfile/sys/mips/cavium/octe/cavium-ethernet.h projects/sendfile/sys/mips/cavium/octe/ethernet-mv88e61xx.c projects/sendfile/sys/modules/crypto/Makefile projects/sendfile/sys/modules/drm2/drm2/Makefile projects/sendfile/sys/modules/drm2/i915kms/Makefile projects/sendfile/sys/modules/drm2/radeonkms/Makefile projects/sendfile/sys/modules/iwnfw/iwn6000g2b/Makefile projects/sendfile/sys/modules/netmap/Makefile projects/sendfile/sys/modules/usb/Makefile projects/sendfile/sys/net/netmap.h projects/sendfile/sys/net/netmap_user.h projects/sendfile/sys/netinet6/send.c projects/sendfile/sys/ofed/drivers/net/mlx4/en_netdev.c projects/sendfile/sys/ofed/drivers/net/mlx4/mlx4_en.h projects/sendfile/sys/powerpc/aim/mp_cpudep.c projects/sendfile/sys/powerpc/aim/trap.c projects/sendfile/sys/powerpc/aim/trap_subr32.S projects/sendfile/sys/powerpc/aim/trap_subr64.S projects/sendfile/sys/powerpc/include/cpu.h projects/sendfile/sys/powerpc/include/dbdma.h projects/sendfile/sys/powerpc/include/pcpu.h projects/sendfile/sys/powerpc/include/pmc_mdep.h projects/sendfile/sys/powerpc/include/spr.h projects/sendfile/sys/powerpc/powermac/platform_powermac.c projects/sendfile/sys/powerpc/powermac/pmu.c projects/sendfile/sys/powerpc/powermac/pmuvar.h projects/sendfile/sys/powerpc/powermac/uninorth.c projects/sendfile/sys/powerpc/powermac/uninorthvar.h projects/sendfile/sys/powerpc/powermac/viareg.h projects/sendfile/sys/powerpc/powerpc/mp_machdep.c projects/sendfile/sys/powerpc/pseries/phyp_vscsi.c projects/sendfile/sys/sys/param.h projects/sendfile/sys/vm/vm_page.c projects/sendfile/sys/vm/vm_radix.c projects/sendfile/sys/vm/vm_radix.h projects/sendfile/sys/x86/acpica/madt.c projects/sendfile/sys/x86/cpufreq/est.c projects/sendfile/sys/x86/include/apicreg.h projects/sendfile/sys/x86/include/mptable.h projects/sendfile/sys/x86/x86/local_apic.c projects/sendfile/sys/x86/x86/mptable.c projects/sendfile/tools/regression/usr.bin/sed/regress.sh projects/sendfile/tools/regression/usr.sbin/etcupdate/preworld.sh projects/sendfile/tools/regression/usr.sbin/etcupdate/tests.sh projects/sendfile/usr.bin/calendar/calcpp.c projects/sendfile/usr.bin/clang/clang/Makefile projects/sendfile/usr.bin/clang/llc/Makefile projects/sendfile/usr.bin/clang/lldb/Makefile projects/sendfile/usr.bin/clang/llvm-mc/Makefile projects/sendfile/usr.bin/clang/llvm-objdump/Makefile projects/sendfile/usr.bin/clang/llvm-rtdyld/Makefile projects/sendfile/usr.bin/clang/opt/Makefile projects/sendfile/usr.bin/dtc/fdt.cc projects/sendfile/usr.bin/kdump/Makefile projects/sendfile/usr.bin/kdump/kdump.c projects/sendfile/usr.bin/sed/compile.c projects/sendfile/usr.bin/sed/sed.1 projects/sendfile/usr.sbin/bhyve/Makefile projects/sendfile/usr.sbin/bhyve/pci_emul.c projects/sendfile/usr.sbin/bhyve/pci_emul.h projects/sendfile/usr.sbin/bhyve/pci_passthru.c projects/sendfile/usr.sbin/bhyvectl/bhyvectl.c projects/sendfile/usr.sbin/bsdconfig/share/common.subr projects/sendfile/usr.sbin/bsdconfig/share/packages/index.subr projects/sendfile/usr.sbin/bsdinstall/bsdinstall projects/sendfile/usr.sbin/bsdinstall/scripts/auto projects/sendfile/usr.sbin/bsdinstall/scripts/config projects/sendfile/usr.sbin/bsdinstall/scripts/services projects/sendfile/usr.sbin/bsdinstall/scripts/zfsboot projects/sendfile/usr.sbin/ctld/login.c projects/sendfile/usr.sbin/etcupdate/etcupdate.8 projects/sendfile/usr.sbin/etcupdate/etcupdate.sh projects/sendfile/usr.sbin/mptable/mptable.c projects/sendfile/usr.sbin/mtest/mtest.8 projects/sendfile/usr.sbin/ndp/ndp.c projects/sendfile/usr.sbin/pkg/config.c projects/sendfile/usr.sbin/pkg/config.h projects/sendfile/usr.sbin/pkg/pkg.7 projects/sendfile/usr.sbin/tcpdump/tcpdump/Makefile projects/sendfile/usr.sbin/ypbind/yp_ping.c Directory Properties: projects/sendfile/ (props changed) projects/sendfile/cddl/ (props changed) projects/sendfile/cddl/contrib/opensolaris/ (props changed) projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/sendfile/contrib/gcc/ (props changed) projects/sendfile/contrib/llvm/ (props changed) projects/sendfile/contrib/llvm/tools/clang/ (props changed) projects/sendfile/contrib/tcpdump/ (props changed) projects/sendfile/contrib/tzcode/stdtime/ (props changed) projects/sendfile/crypto/heimdal/ (props changed) projects/sendfile/etc/ (props changed) projects/sendfile/include/ (props changed) projects/sendfile/lib/libc/ (props changed) projects/sendfile/lib/libvmmapi/ (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/boot/ (props changed) projects/sendfile/sys/cddl/contrib/opensolaris/ (props changed) projects/sendfile/sys/conf/ (props changed) projects/sendfile/sys/dev/hyperv/ (props changed) projects/sendfile/usr.bin/calendar/ (props changed) projects/sendfile/usr.sbin/bhyve/ (props changed) projects/sendfile/usr.sbin/bhyvectl/ (props changed) Modified: projects/sendfile/ObsoleteFiles.inc ============================================================================== --- projects/sendfile/ObsoleteFiles.inc Tue Dec 17 10:53:17 2013 (r259503) +++ projects/sendfile/ObsoleteFiles.inc Tue Dec 17 12:43:35 2013 (r259504) @@ -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/sendfile/UPDATING ============================================================================== --- projects/sendfile/UPDATING Tue Dec 17 10:53:17 2013 (r259503) +++ projects/sendfile/UPDATING Tue Dec 17 12:43:35 2013 (r259504) @@ -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/sendfile/bin/Makefile ============================================================================== --- projects/sendfile/bin/Makefile Tue Dec 17 10:53:17 2013 (r259503) +++ projects/sendfile/bin/Makefile Tue Dec 17 12:43:35 2013 (r259504) @@ -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/sendfile/bin/date/Makefile ============================================================================== --- projects/sendfile/bin/date/Makefile Tue Dec 17 10:53:17 2013 (r259503) +++ projects/sendfile/bin/date/Makefile Tue Dec 17 12:43:35 2013 (r259504) @@ -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/sendfile/bin/mv/Makefile ============================================================================== --- projects/sendfile/bin/mv/Makefile Tue Dec 17 10:53:17 2013 (r259503) +++ projects/sendfile/bin/mv/Makefile Tue Dec 17 12:43:35 2013 (r259504) @@ -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/sendfile/bin/pax/Makefile ============================================================================== --- projects/sendfile/bin/pax/Makefile Tue Dec 17 10:53:17 2013 (r259503) +++ projects/sendfile/bin/pax/Makefile Tue Dec 17 12:43:35 2013 (r259504) @@ -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/sendfile/bin/sh/Makefile ============================================================================== --- projects/sendfile/bin/sh/Makefile Tue Dec 17 10:53:17 2013 (r259503) +++ projects/sendfile/bin/sh/Makefile Tue Dec 17 12:43:35 2013 (r259504) @@ -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/sendfile/bin/test/Makefile ============================================================================== --- projects/sendfile/bin/test/Makefile Tue Dec 17 10:53:17 2013 (r259503) +++ projects/sendfile/bin/test/Makefile Tue Dec 17 12:43:35 2013 (r259504) @@ -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/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Tue Dec 17 10:53:17 2013 (r259503) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Tue Dec 17 12:43:35 2013 (r259504) @@ -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/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c Tue Dec 17 10:53:17 2013 (r259503) +++ projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c Tue Dec 17 12:43:35 2013 (r259504) @@ -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/sendfile/contrib/gcc/config/i386/emmintrin.h ============================================================================== --- projects/sendfile/contrib/gcc/config/i386/emmintrin.h Tue Dec 17 10:53:17 2013 (r259503) +++ projects/sendfile/contrib/gcc/config/i386/emmintrin.h Tue Dec 17 12:43:35 2013 (r259504) @@ -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/sendfile/contrib/llvm/tools/clang/lib/Headers/cpuid.h ============================================================================== --- projects/sendfile/contrib/llvm/tools/clang/lib/Headers/cpuid.h Tue Dec 17 10:53:17 2013 (r259503) +++ projects/sendfile/contrib/llvm/tools/clang/lib/Headers/cpuid.h Tue Dec 17 12:43:35 2013 (r259504) @@ -79,6 +79,7 @@ #define bit_ACPI 0x00400000 #define bit_MMX 0x00800000 #define bit_FXSR 0x01000000 +#define bit_FXSAVE bit_FXSR /* for gcc compat */ #define bit_SSE 0x02000000 #define bit_SSE2 0x04000000 #define bit_SS 0x08000000 Modified: projects/sendfile/contrib/tcpdump/addrtoname.c ============================================================================== --- projects/sendfile/contrib/tcpdump/addrtoname.c Tue Dec 17 10:53:17 2013 (r259503) +++ projects/sendfile/contrib/tcpdump/addrtoname.c Tue Dec 17 12:43:35 2013 (r259504) @@ -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/sendfile/contrib/tcpdump/tcpdump.c ============================================================================== --- projects/sendfile/contrib/tcpdump/tcpdump.c Tue Dec 17 10:53:17 2013 (r259503) +++ projects/sendfile/contrib/tcpdump/tcpdump.c Tue Dec 17 12:43:35 2013 (r259504) @@ -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/sendfile/contrib/tzcode/stdtime/tzfile.5 ============================================================================== --- projects/sendfile/contrib/tzcode/stdtime/tzfile.5 Tue Dec 17 10:53:17 2013 (r259503) +++ projects/sendfile/contrib/tzcode/stdtime/tzfile.5 Tue Dec 17 12:43:35 2013 (r259504) @@ -6,7 +6,7 @@ .Nm tzfile .Nd timezone information .Sh SYNOPSIS -.Fd #include \&"/usr/src/lib/libc/stdtime/tzfile.h\&" +.Fd #include \&"/usr/src/contrib/tzcode/stdtime/tzfile.h\&" .Sh DESCRIPTION The time zone information files used by .Xr tzset 3 Modified: projects/sendfile/crypto/heimdal/lib/gssapi/krb5/prf.c ============================================================================== --- projects/sendfile/crypto/heimdal/lib/gssapi/krb5/prf.c Tue Dec 17 10:53:17 2013 (r259503) +++ projects/sendfile/crypto/heimdal/lib/gssapi/krb5/prf.c Tue Dec 17 12:43:35 2013 (r259504) @@ -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/sendfile/etc/defaults/rc.conf ============================================================================== --- projects/sendfile/etc/defaults/rc.conf Tue Dec 17 10:53:17 2013 (r259503) +++ projects/sendfile/etc/defaults/rc.conf Tue Dec 17 12:43:35 2013 (r259504) @@ -658,6 +658,7 @@ newsyslog_enable="YES" # Run newsyslog a newsyslog_flags="-CN" # Newsyslog flags to create marked files mixer_enable="YES" # Run the sound mixer. opensm_enable="NO" # Opensm(8) for infiniband devices defaults to off +casperd_enable="NO" # casperd(8) daemon ############################################################## ### Jail Configuration (see rc.conf(5) manual page) ########## Modified: projects/sendfile/etc/mtree/BSD.tests.dist ============================================================================== --- projects/sendfile/etc/mtree/BSD.tests.dist Tue Dec 17 10:53:17 2013 (r259503) +++ projects/sendfile/etc/mtree/BSD.tests.dist Tue Dec 17 12:43:35 2013 (r259504) @@ -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/sendfile/etc/rc.d/Makefile ============================================================================== --- projects/sendfile/etc/rc.d/Makefile Tue Dec 17 10:53:17 2013 (r259503) +++ projects/sendfile/etc/rc.d/Makefile Tue Dec 17 12:43:35 2013 (r259504) @@ -26,6 +26,7 @@ FILES= DAEMON \ bridge \ bsnmpd \ ${_bthidd} \ + casperd \ ccd \ cleanvar \ cleartmp \ Copied: projects/sendfile/etc/rc.d/casperd (from r259503, head/etc/rc.d/casperd) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sendfile/etc/rc.d/casperd Tue Dec 17 12:43:35 2013 (r259504, copy of r259503, head/etc/rc.d/casperd) @@ -0,0 +1,19 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: casperd +# REQUIRE: NETWORKING syslogd +# BEFORE: DAEMON +# KEYWORD: shutdown + +. /etc/rc.subr + +name="casperd" +rcvar="casperd_enable" +pidfile="/var/run/${name}.pid" +command="/sbin/${name}" + +load_rc_config $name +run_rc_command "$1" Modified: projects/sendfile/etc/syslog.conf ============================================================================== --- projects/sendfile/etc/syslog.conf Tue Dec 17 10:53:17 2013 (r259503) +++ projects/sendfile/etc/syslog.conf Tue Dec 17 12:43:35 2013 (r259504) @@ -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/sendfile/games/fortune/datfiles/fortunes ============================================================================== --- projects/sendfile/games/fortune/datfiles/fortunes Tue Dec 17 10:53:17 2013 (r259503) +++ projects/sendfile/games/fortune/datfiles/fortunes Tue Dec 17 12:43:35 2013 (r259504) @@ -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/sendfile/include/rpcsvc/bootparam_prot.x ============================================================================== --- projects/sendfile/include/rpcsvc/bootparam_prot.x Tue Dec 17 10:53:17 2013 (r259503) +++ projects/sendfile/include/rpcsvc/bootparam_prot.x Tue Dec 17 12:43:35 2013 (r259504) @@ -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/sendfile/include/rpcsvc/key_prot.x ============================================================================== --- projects/sendfile/include/rpcsvc/key_prot.x Tue Dec 17 10:53:17 2013 (r259503) +++ projects/sendfile/include/rpcsvc/key_prot.x Tue Dec 17 12:43:35 2013 (r259504) @@ -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/sendfile/include/rpcsvc/klm_prot.x ============================================================================== --- projects/sendfile/include/rpcsvc/klm_prot.x Tue Dec 17 10:53:17 2013 (r259503) +++ projects/sendfile/include/rpcsvc/klm_prot.x Tue Dec 17 12:43:35 2013 (r259504) @@ -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/sendfile/include/rpcsvc/mount.x ============================================================================== --- projects/sendfile/include/rpcsvc/mount.x Tue Dec 17 10:53:17 2013 (r259503) +++ projects/sendfile/include/rpcsvc/mount.x Tue Dec 17 12:43:35 2013 (r259504) @@ -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/sendfile/include/rpcsvc/nfs_prot.x ============================================================================== --- projects/sendfile/include/rpcsvc/nfs_prot.x Tue Dec 17 10:53:17 2013 (r259503) +++ projects/sendfile/include/rpcsvc/nfs_prot.x Tue Dec 17 12:43:35 2013 (r259504) @@ -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/sendfile/include/rpcsvc/nis.x ============================================================================== --- projects/sendfile/include/rpcsvc/nis.x Tue Dec 17 10:53:17 2013 (r259503) +++ projects/sendfile/include/rpcsvc/nis.x Tue Dec 17 12:43:35 2013 (r259504) @@ -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/sendfile/include/rpcsvc/nis_callback.x ============================================================================== --- projects/sendfile/include/rpcsvc/nis_callback.x Tue Dec 17 10:53:17 2013 (r259503) +++ projects/sendfile/include/rpcsvc/nis_callback.x Tue Dec 17 12:43:35 2013 (r259504) @@ -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. +% * * 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. % */ /* Modified: projects/sendfile/include/rpcsvc/nis_object.x ============================================================================== --- projects/sendfile/include/rpcsvc/nis_object.x Tue Dec 17 10:53:17 2013 (r259503) +++ projects/sendfile/include/rpcsvc/nis_object.x Tue Dec 17 12:43:35 2013 (r259504) @@ -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. +% * * 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. % */ /* @@ -35,6 +36,7 @@ * All Rights Reserved. */ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312171243.rBHChaXi062070>