Date: Tue, 14 Sep 2010 14:56:34 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r212612 - in projects/sv: . bin bin/expr bin/sh bin/test cddl/contrib/opensolaris/lib/libdtrace/common contrib/libf2c contrib/top etc etc/defaults etc/mtree etc/rc.d gnu/lib/libstdc++ l... Message-ID: <201009141456.o8EEuY1X084507@svn.freebsd.org>
index | next in thread | raw e-mail
Author: attilio Date: Tue Sep 14 14:56:34 2010 New Revision: 212612 URL: http://svn.freebsd.org/changeset/base/212612 Log: MFC. Added: projects/sv/lib/libc/sys/sigwait.c - copied unchanged from r212611, head/lib/libc/sys/sigwait.c projects/sv/sbin/Makefile.amd64 - copied unchanged from r212611, head/sbin/Makefile.amd64 projects/sv/sbin/Makefile.arm - copied unchanged from r212611, head/sbin/Makefile.arm projects/sv/sbin/Makefile.i386 - copied unchanged from r212611, head/sbin/Makefile.i386 projects/sv/sbin/Makefile.ia64 - copied unchanged from r212611, head/sbin/Makefile.ia64 projects/sv/sbin/Makefile.mips - copied unchanged from r212611, head/sbin/Makefile.mips projects/sv/sbin/Makefile.pc98 - copied unchanged from r212611, head/sbin/Makefile.pc98 projects/sv/sbin/Makefile.sparc64 - copied unchanged from r212611, head/sbin/Makefile.sparc64 projects/sv/share/man/man4/aesni.4 - copied unchanged from r212611, head/share/man/man4/aesni.4 projects/sv/share/mk/bsd.dtrace.mk - copied unchanged from r212611, head/share/mk/bsd.dtrace.mk projects/sv/sys/arm/conf/DOCKSTAR - copied unchanged from r212611, head/sys/arm/conf/DOCKSTAR projects/sv/sys/boot/fdt/dts/dockstar.dts - copied unchanged from r212611, head/sys/boot/fdt/dts/dockstar.dts projects/sv/sys/dev/mps/ - copied from r212611, head/sys/dev/mps/ projects/sv/sys/modules/mps/ - copied from r212611, head/sys/modules/mps/ projects/sv/tools/regression/bin/sh/builtins/read3.0 - copied unchanged from r212611, head/tools/regression/bin/sh/builtins/read3.0 projects/sv/tools/regression/bin/sh/builtins/read3.0.stdout - copied unchanged from r212611, head/tools/regression/bin/sh/builtins/read3.0.stdout projects/sv/tools/regression/bin/sh/builtins/read4.0 - copied unchanged from r212611, head/tools/regression/bin/sh/builtins/read4.0 projects/sv/tools/regression/bin/sh/builtins/read4.0.stdout - copied unchanged from r212611, head/tools/regression/bin/sh/builtins/read4.0.stdout projects/sv/tools/regression/bin/sh/builtins/return6.4 - copied unchanged from r212611, head/tools/regression/bin/sh/builtins/return6.4 projects/sv/tools/regression/bin/sh/builtins/return7.4 - copied unchanged from r212611, head/tools/regression/bin/sh/builtins/return7.4 projects/sv/tools/regression/bin/sh/execution/var-assign1.0 - copied unchanged from r212611, head/tools/regression/bin/sh/execution/var-assign1.0 projects/sv/usr.bin/Makefile.amd64 - copied unchanged from r212611, head/usr.bin/Makefile.amd64 projects/sv/usr.bin/Makefile.arm - copied unchanged from r212611, head/usr.bin/Makefile.arm projects/sv/usr.bin/Makefile.i386 - copied unchanged from r212611, head/usr.bin/Makefile.i386 projects/sv/usr.bin/Makefile.ia64 - copied unchanged from r212611, head/usr.bin/Makefile.ia64 projects/sv/usr.bin/Makefile.powerpc - copied unchanged from r212611, head/usr.bin/Makefile.powerpc projects/sv/usr.bin/Makefile.sparc64 - copied unchanged from r212611, head/usr.bin/Makefile.sparc64 projects/sv/usr.sbin/Makefile.amd64 - copied unchanged from r212611, head/usr.sbin/Makefile.amd64 projects/sv/usr.sbin/Makefile.arm - copied unchanged from r212611, head/usr.sbin/Makefile.arm projects/sv/usr.sbin/Makefile.i386 - copied unchanged from r212611, head/usr.sbin/Makefile.i386 projects/sv/usr.sbin/Makefile.ia64 - copied unchanged from r212611, head/usr.sbin/Makefile.ia64 projects/sv/usr.sbin/Makefile.mips - copied unchanged from r212611, head/usr.sbin/Makefile.mips projects/sv/usr.sbin/Makefile.powerpc - copied unchanged from r212611, head/usr.sbin/Makefile.powerpc projects/sv/usr.sbin/Makefile.sparc64 - copied unchanged from r212611, head/usr.sbin/Makefile.sparc64 projects/sv/usr.sbin/pc-sysinstall/backend/installimage.sh - copied unchanged from r212611, head/usr.sbin/pc-sysinstall/backend/installimage.sh Deleted: projects/sv/contrib/libf2c/ projects/sv/sys/mips/mips/psraccess.S Modified: projects/sv/Makefile.inc1 projects/sv/ObsoleteFiles.inc projects/sv/UPDATING projects/sv/bin/Makefile projects/sv/bin/expr/expr.1 projects/sv/bin/sh/eval.c projects/sv/bin/sh/miscbltin.c projects/sv/bin/sh/parser.c projects/sv/bin/sh/sh.1 projects/sv/bin/sh/var.c projects/sv/bin/test/test.1 projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c projects/sv/etc/defaults/rc.conf projects/sv/etc/mtree/BSD.var.dist projects/sv/etc/network.subr projects/sv/etc/rc.d/ip6addrctl projects/sv/etc/rc.d/netif projects/sv/gnu/lib/libstdc++/Makefile projects/sv/gnu/lib/libstdc++/config.h projects/sv/lib/libc/db/man/dbopen.3 projects/sv/lib/libc/net/sctp_send.3 projects/sv/lib/libc/net/sctp_sendmsg.3 projects/sv/lib/libc/posix1e/acl_strip.c projects/sv/lib/libc/stdio/printf.3 projects/sv/lib/libc/stdlib/Makefile.inc projects/sv/lib/libc/stdlib/malloc.3 projects/sv/lib/libc/sys/Makefile.inc projects/sv/lib/libc/sys/Symbol.map projects/sv/lib/libc/sys/connect.2 projects/sv/lib/libc/sys/cpuset_getaffinity.2 projects/sv/lib/libelf/elf_update.c projects/sv/lib/libthr/Makefile projects/sv/lib/libthr/arch/amd64/Makefile.inc projects/sv/lib/libthr/arch/arm/Makefile.inc projects/sv/lib/libthr/arch/i386/Makefile.inc projects/sv/lib/libthr/arch/ia64/Makefile.inc projects/sv/lib/libthr/arch/mips/Makefile.inc projects/sv/lib/libthr/arch/powerpc/Makefile.inc projects/sv/lib/libthr/arch/sparc64/Makefile.inc projects/sv/lib/libthr/pthread.map projects/sv/lib/libthr/support/Makefile.inc projects/sv/lib/libthr/thread/thr_affinity.c projects/sv/lib/libthr/thread/thr_attr.c projects/sv/lib/libthr/thread/thr_cancel.c projects/sv/lib/libthr/thread/thr_create.c projects/sv/lib/libthr/thread/thr_detach.c projects/sv/lib/libthr/thread/thr_exit.c projects/sv/lib/libthr/thread/thr_fork.c projects/sv/lib/libthr/thread/thr_init.c projects/sv/lib/libthr/thread/thr_join.c projects/sv/lib/libthr/thread/thr_kill.c projects/sv/lib/libthr/thread/thr_list.c projects/sv/lib/libthr/thread/thr_private.h projects/sv/lib/libthr/thread/thr_resume_np.c projects/sv/lib/libthr/thread/thr_sig.c projects/sv/lib/libthr/thread/thr_stack.c projects/sv/lib/libthr/thread/thr_suspend_np.c projects/sv/lib/libz/minigzip.c projects/sv/lib/msun/Makefile projects/sv/libexec/rtld-elf/powerpc64/reloc.c projects/sv/libexec/rtld-elf/rtld.c projects/sv/libexec/rtld-elf/rtld.h projects/sv/sbin/Makefile projects/sv/sbin/geom/class/cache/geom_cache.c projects/sv/sbin/geom/class/concat/geom_concat.c projects/sv/sbin/geom/class/eli/geom_eli.c projects/sv/sbin/geom/class/journal/geom_journal.c projects/sv/sbin/geom/class/label/geom_label.c projects/sv/sbin/geom/class/mirror/geom_mirror.c projects/sv/sbin/geom/class/mountver/geom_mountver.c projects/sv/sbin/geom/class/multipath/geom_multipath.c projects/sv/sbin/geom/class/nop/geom_nop.c projects/sv/sbin/geom/class/part/geom_part.c projects/sv/sbin/geom/class/raid3/geom_raid3.c projects/sv/sbin/geom/class/sched/geom_sched.c projects/sv/sbin/geom/class/shsec/geom_shsec.c projects/sv/sbin/geom/class/stripe/geom_stripe.c projects/sv/sbin/geom/class/virstor/geom_virstor.c projects/sv/sbin/geom/core/geom.c projects/sv/sbin/geom/core/geom.h projects/sv/sbin/newfs/newfs.8 projects/sv/secure/lib/libcrypto/man/BIO_s_bio.3 projects/sv/share/man/man3/Makefile projects/sv/share/man/man3/siginfo.3 projects/sv/share/man/man4/Makefile projects/sv/share/man/man4/ata.4 projects/sv/share/man/man4/axe.4 projects/sv/share/man/man4/bwn.4 projects/sv/share/man/man4/crypto.4 projects/sv/share/man/man4/ng_hci.4 projects/sv/share/man/man5/rc.conf.5 projects/sv/share/man/man9/Makefile projects/sv/share/man/man9/devclass_get_maxunit.9 projects/sv/share/man/man9/sbuf.9 projects/sv/share/misc/committers-src.dot projects/sv/share/mk/Makefile projects/sv/share/mk/bsd.cpu.mk projects/sv/share/mk/bsd.lib.mk projects/sv/share/mk/bsd.prog.mk projects/sv/share/mk/sys.mk projects/sv/sys/amd64/amd64/legacy.c projects/sv/sys/amd64/amd64/machdep.c projects/sv/sys/amd64/amd64/mp_machdep.c projects/sv/sys/amd64/amd64/nexus.c projects/sv/sys/amd64/conf/GENERIC projects/sv/sys/amd64/include/apicvar.h projects/sv/sys/arm/arm/nexus.c projects/sv/sys/arm/arm/pmap.c projects/sv/sys/arm/xscale/ixp425/ixp425.c projects/sv/sys/boot/forth/beastie.4th projects/sv/sys/boot/zfs/zfsimpl.c projects/sv/sys/cddl/boot/zfs/zfsimpl.h projects/sv/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/sv/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c projects/sv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c projects/sv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c projects/sv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/sv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/sv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/sv/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h projects/sv/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c projects/sv/sys/compat/linux/linux_ioctl.c projects/sv/sys/conf/Makefile.mips projects/sv/sys/conf/files projects/sv/sys/conf/files.mips projects/sv/sys/conf/files.powerpc projects/sv/sys/conf/kern.mk projects/sv/sys/conf/kern.pre.mk projects/sv/sys/conf/kmod.mk projects/sv/sys/contrib/pf/net/pf.c projects/sv/sys/dev/aac/aac.c projects/sv/sys/dev/acpi_support/acpi_hp.c projects/sv/sys/dev/acpi_support/acpi_wmi.c projects/sv/sys/dev/acpica/acpi.c projects/sv/sys/dev/acpica/acpi_cpu.c projects/sv/sys/dev/acpica/acpi_hpet.c projects/sv/sys/dev/ata/ata-all.h projects/sv/sys/dev/ata/ata-lowlevel.c projects/sv/sys/dev/ata/chipsets/ata-serverworks.c projects/sv/sys/dev/atkbdc/atkbdc_isa.c projects/sv/sys/dev/atkbdc/psm.c projects/sv/sys/dev/bge/if_bge.c projects/sv/sys/dev/cxgb/cxgb_sge.c projects/sv/sys/dev/e1000/if_em.c projects/sv/sys/dev/e1000/if_em.h projects/sv/sys/dev/fb/vesa.c projects/sv/sys/dev/firewire/firewire.c projects/sv/sys/dev/firewire/fwohci_pci.c projects/sv/sys/dev/iicbus/iicbus.c projects/sv/sys/dev/led/led.c projects/sv/sys/dev/malo/if_malo_pci.c projects/sv/sys/dev/mii/brgphy.c projects/sv/sys/dev/mii/brgphyreg.h projects/sv/sys/dev/msk/if_msk.c projects/sv/sys/dev/mwl/if_mwl_pci.c projects/sv/sys/dev/ofw/ofw_fdt.c projects/sv/sys/dev/ofw/ofw_if.m projects/sv/sys/dev/ofw/ofw_iicbus.c projects/sv/sys/dev/ofw/ofw_standard.c projects/sv/sys/dev/ofw/openfirm.c projects/sv/sys/dev/pci/pcireg.h projects/sv/sys/dev/ppbus/ppbconf.c projects/sv/sys/dev/siba/siba.c projects/sv/sys/dev/spibus/spibus.c projects/sv/sys/fs/nfs/nfsdport.h projects/sv/sys/fs/nfsclient/nfs_clrpcops.c projects/sv/sys/fs/nfsclient/nfs_clvnops.c projects/sv/sys/fs/nfsclient/nfsnode.h projects/sv/sys/fs/nfsserver/nfs_nfsdstate.c projects/sv/sys/fs/tmpfs/tmpfs_vnops.c projects/sv/sys/geom/eli/g_eli_ctl.c projects/sv/sys/geom/mirror/g_mirror_ctl.c projects/sv/sys/geom/part/g_part.c projects/sv/sys/i386/i386/legacy.c projects/sv/sys/i386/i386/machdep.c projects/sv/sys/i386/i386/mp_machdep.c projects/sv/sys/i386/i386/nexus.c projects/sv/sys/i386/include/apicvar.h projects/sv/sys/ia64/ia64/nexus.c projects/sv/sys/isa/isa_common.c projects/sv/sys/kern/bus_if.m projects/sv/sys/kern/kern_clock.c projects/sv/sys/kern/kern_clocksource.c projects/sv/sys/kern/kern_et.c projects/sv/sys/kern/kern_fork.c projects/sv/sys/kern/kern_jail.c projects/sv/sys/kern/kern_sig.c projects/sv/sys/kern/kern_tc.c projects/sv/sys/kern/kern_timeout.c projects/sv/sys/kern/sched_4bsd.c projects/sv/sys/kern/sched_ule.c projects/sv/sys/kern/subr_bus.c projects/sv/sys/kern/subr_lock.c projects/sv/sys/kern/subr_sbuf.c projects/sv/sys/kern/subr_sleepqueue.c projects/sv/sys/kern/subr_witness.c projects/sv/sys/kern/vfs_mount.c projects/sv/sys/kern/vfs_subr.c projects/sv/sys/mips/adm5120/obio.c projects/sv/sys/mips/alchemy/obio.c projects/sv/sys/mips/atheros/apb.c projects/sv/sys/mips/conf/MALTA64 projects/sv/sys/mips/conf/OCTEON1 projects/sv/sys/mips/idt/obio.c projects/sv/sys/mips/include/cpufunc.h projects/sv/sys/mips/include/md_var.h projects/sv/sys/mips/include/smp.h projects/sv/sys/mips/mips/busdma_machdep.c projects/sv/sys/mips/mips/mainbus.c projects/sv/sys/mips/mips/mp_machdep.c projects/sv/sys/mips/mips/nexus.c projects/sv/sys/mips/mips/pmap.c projects/sv/sys/mips/rmi/dev/nlge/if_nlge.c projects/sv/sys/mips/rmi/dev/xlr/rge.c projects/sv/sys/mips/rmi/fmn.c projects/sv/sys/mips/rmi/iodi.c projects/sv/sys/mips/rmi/msgring.h projects/sv/sys/mips/rmi/rmi_mips_exts.h projects/sv/sys/mips/rmi/xlr_machdep.c projects/sv/sys/mips/rmi/xlr_pci.c projects/sv/sys/mips/sibyte/sb_zbbus.c projects/sv/sys/modules/Makefile projects/sv/sys/modules/crypto/Makefile projects/sv/sys/modules/opensolaris/Makefile projects/sv/sys/modules/scc/Makefile projects/sv/sys/modules/sound/sound/Makefile projects/sv/sys/modules/zfs/Makefile projects/sv/sys/net/if.c projects/sv/sys/netinet/ip_carp.c projects/sv/sys/netinet/raw_ip.c projects/sv/sys/netinet/sctp_output.c projects/sv/sys/nfsclient/nfs.h projects/sv/sys/nfsclient/nfs_nfsiod.c projects/sv/sys/nfsclient/nfs_subs.c projects/sv/sys/nfsclient/nfs_vnops.c projects/sv/sys/nfsclient/nfsnode.h projects/sv/sys/pc98/pc98/canbus.c projects/sv/sys/pc98/pc98/machdep.c projects/sv/sys/powerpc/aim/clock.c projects/sv/sys/powerpc/aim/interrupt.c projects/sv/sys/powerpc/aim/machdep.c projects/sv/sys/powerpc/aim/mmu_oea.c projects/sv/sys/powerpc/aim/mmu_oea64.c projects/sv/sys/powerpc/aim/nexus.c projects/sv/sys/powerpc/booke/clock.c projects/sv/sys/powerpc/booke/interrupt.c projects/sv/sys/powerpc/booke/machdep.c projects/sv/sys/powerpc/booke/platform_bare.c projects/sv/sys/powerpc/include/intr_machdep.h projects/sv/sys/powerpc/include/md_var.h projects/sv/sys/powerpc/include/smp.h projects/sv/sys/powerpc/ofw/ofw_real.c projects/sv/sys/powerpc/powermac/ata_kauai.c projects/sv/sys/powerpc/powerpc/exec_machdep.c projects/sv/sys/powerpc/powerpc/intr_machdep.c projects/sv/sys/powerpc/powerpc/mp_machdep.c projects/sv/sys/security/audit/audit_bsm_klib.c projects/sv/sys/sparc64/include/intr_machdep.h projects/sv/sys/sparc64/include/smp.h projects/sv/sys/sparc64/pci/schizo.c projects/sv/sys/sparc64/sparc64/intr_machdep.c projects/sv/sys/sparc64/sparc64/machdep.c projects/sv/sys/sparc64/sparc64/mp_machdep.c projects/sv/sys/sparc64/sparc64/nexus.c projects/sv/sys/sun4v/include/intr_machdep.h projects/sv/sys/sun4v/include/smp.h projects/sv/sys/sun4v/sun4v/intr_machdep.c projects/sv/sys/sun4v/sun4v/mp_machdep.c projects/sv/sys/sun4v/sun4v/nexus.c projects/sv/sys/sun4v/sun4v/vnex.c projects/sv/sys/sys/bus.h projects/sv/sys/sys/callout.h projects/sv/sys/sys/elf_common.h projects/sv/sys/sys/lock.h projects/sv/sys/sys/mount.h projects/sv/sys/sys/param.h projects/sv/sys/sys/sbuf.h projects/sv/sys/sys/sched.h projects/sv/sys/sys/systm.h projects/sv/sys/sys/time.h projects/sv/sys/sys/timeet.h projects/sv/sys/sys/timetc.h projects/sv/sys/vm/vm_mmap.c projects/sv/sys/vm/vm_pageout.c projects/sv/sys/x86/pci/qpi.c projects/sv/sys/x86/x86/local_apic.c projects/sv/usr.bin/Makefile projects/sv/usr.bin/calendar/calendars/calendar.freebsd projects/sv/usr.bin/calendar/parsedata.c projects/sv/usr.bin/cpio/bsdcpio.1 projects/sv/usr.bin/printf/printf.1 projects/sv/usr.bin/systat/vmstat.c projects/sv/usr.bin/xlint/Makefile.inc projects/sv/usr.bin/xlint/arch/powerpc/targparam.h projects/sv/usr.sbin/Makefile projects/sv/usr.sbin/bluetooth/bthidcontrol/sdp.c projects/sv/usr.sbin/bluetooth/bthidd/hid.c projects/sv/usr.sbin/config/config.y projects/sv/usr.sbin/freebsd-update/freebsd-update.8 projects/sv/usr.sbin/freebsd-update/freebsd-update.sh projects/sv/usr.sbin/pc-sysinstall/backend-query/disk-list.sh projects/sv/usr.sbin/pc-sysinstall/backend/Makefile projects/sv/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh projects/sv/usr.sbin/pc-sysinstall/backend/functions-disk.sh projects/sv/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh projects/sv/usr.sbin/pc-sysinstall/backend/functions-installcomponents.sh projects/sv/usr.sbin/pc-sysinstall/backend/functions-packages.sh projects/sv/usr.sbin/pc-sysinstall/backend/functions-parse.sh projects/sv/usr.sbin/pc-sysinstall/backend/functions.sh projects/sv/usr.sbin/pc-sysinstall/backend/parseconfig.sh projects/sv/usr.sbin/pc-sysinstall/doc/help-index projects/sv/usr.sbin/pc-sysinstall/examples/README projects/sv/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.sh projects/sv/usr.sbin/pciconf/cap.c projects/sv/usr.sbin/pciconf/pciconf.8 projects/sv/usr.sbin/pciconf/pciconf.c Directory Properties: projects/sv/ (props changed) projects/sv/cddl/contrib/opensolaris/ (props changed) projects/sv/contrib/bind9/ (props changed) projects/sv/contrib/ee/ (props changed) projects/sv/contrib/expat/ (props changed) projects/sv/contrib/file/ (props changed) projects/sv/contrib/gdb/ (props changed) projects/sv/contrib/gdtoa/ (props changed) projects/sv/contrib/gnu-sort/ (props changed) projects/sv/contrib/groff/ (props changed) projects/sv/contrib/less/ (props changed) projects/sv/contrib/libpcap/ (props changed) projects/sv/contrib/llvm/ (props changed) projects/sv/contrib/llvm/tools/clang/ (props changed) projects/sv/contrib/ncurses/ (props changed) projects/sv/contrib/netcat/ (props changed) projects/sv/contrib/ntp/ (props changed) projects/sv/contrib/one-true-awk/ (props changed) projects/sv/contrib/openbsm/ (props changed) projects/sv/contrib/openpam/ (props changed) projects/sv/contrib/pf/ (props changed) projects/sv/contrib/sendmail/ (props changed) projects/sv/contrib/tcpdump/ (props changed) projects/sv/contrib/tcsh/ (props changed) projects/sv/contrib/top/ (props changed) projects/sv/contrib/top/install-sh (props changed) projects/sv/contrib/tzcode/stdtime/ (props changed) projects/sv/contrib/tzcode/zic/ (props changed) projects/sv/contrib/tzdata/ (props changed) projects/sv/contrib/wpa/ (props changed) projects/sv/crypto/openssh/ (props changed) projects/sv/crypto/openssl/ (props changed) projects/sv/lib/libc/ (props changed) projects/sv/lib/libc/stdtime/ (props changed) projects/sv/lib/libutil/ (props changed) projects/sv/lib/libz/ (props changed) projects/sv/sbin/ (props changed) projects/sv/sbin/ipfw/ (props changed) projects/sv/share/mk/bsd.arch.inc.mk (props changed) projects/sv/share/zoneinfo/ (props changed) projects/sv/sys/ (props changed) projects/sv/sys/amd64/include/xen/ (props changed) projects/sv/sys/cddl/contrib/opensolaris/ (props changed) projects/sv/sys/contrib/dev/acpica/ (props changed) projects/sv/sys/contrib/pf/ (props changed) projects/sv/sys/contrib/x86emu/ (props changed) projects/sv/sys/dev/xen/xenpci/ (props changed) projects/sv/usr.bin/calendar/ (props changed) projects/sv/usr.bin/csup/ (props changed) projects/sv/usr.bin/procstat/ (props changed) projects/sv/usr.sbin/zic/ (props changed) Modified: projects/sv/Makefile.inc1 ============================================================================== --- projects/sv/Makefile.inc1 Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/Makefile.inc1 Tue Sep 14 14:56:34 2010 (r212612) @@ -161,7 +161,7 @@ BUILD_ARCH!= uname -p .error To cross-build, set TARGET_ARCH. .endif .endif -.if ${MACHINE} == ${TARGET} && !defined(CROSS_BUILD_TESTING) +.if ${MACHINE} == ${TARGET} && ${MACHINE_ARCH} == ${TARGET_ARCH} && !defined(CROSS_BUILD_TESTING) OBJTREE= ${MAKEOBJDIRPREFIX} .else OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH} Modified: projects/sv/ObsoleteFiles.inc ============================================================================== --- projects/sv/ObsoleteFiles.inc Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/ObsoleteFiles.inc Tue Sep 14 14:56:34 2010 (r212612) @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20100910: renamed sbuf_overflowed to sbuf_error +OLD_FILES+=usr/share/man/man9/sbuf_overflowed.9.gz # 20100815: retired last traces of chooseproc(9) OLD_FILES+=usr/share/man/man9/chooseproc.9.gz # 20100806: removal of unused libcompat routines Modified: projects/sv/UPDATING ============================================================================== --- projects/sv/UPDATING Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/UPDATING Tue Sep 14 14:56:34 2010 (r212612) @@ -22,6 +22,35 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9. machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20100913: + The $ipv6_prefer variable in rc.conf(5) has been split into + $ip6addrctl_policy and $ipv6_activate_all_interfaces. + + The $ip6addrctl_policy is a variable to choose a pre-defined + address selection policy set by ip6addrctl(8). A value + "ipv4_prefer", "ipv6_prefer" or "AUTO" can be specified. The + default is "AUTO". + + The $ipv6_activate_all_interfaces specifies whether IFDISABLED + flag (see an entry of 20090926) is set on an interface with no + corresponding $ifconfig_IF_ipv6 line. The default is "NO" for + security reason. If you want IPv6 link-local address on all + interfaces by default, set this to "YES". + + The old ipv6_prefer="YES" is equivalent to + ipv6_activate_all_interfaces="YES" and + ip6addrctl_policy="ipv6_prefer". + +20100913: + DTrace has grown support for userland tracing. Due to this, DTrace is + now i386 and amd64 only. + dtruss(1) is now installed by default on those systems and a new + kernel module is needed for userland tracing: fasttrap. + No changes to your kernel config file are necessary to enable + userland tracing, but you might consider adding 'STRIP=' and + 'CFLAGS+=-fno-omit-frame-pointer' to your make.conf if you want + to have informative userland stack traces in DTrace (ustack). + 20100725: The acpi_aiboost(4) driver has been removed in favor of the new aibs(4) driver. You should update your kernel configuration file. Modified: projects/sv/bin/Makefile ============================================================================== --- projects/sv/bin/Makefile Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/bin/Makefile Tue Sep 14 14:56:34 2010 (r212612) @@ -8,7 +8,6 @@ SUBDIR= cat \ chio \ chmod \ cp \ - ${_csh} \ date \ dd \ df \ @@ -29,10 +28,8 @@ SUBDIR= cat \ ps \ pwait \ pwd \ - ${_rcp} \ realpath \ rm \ - ${_rmail} \ rmdir \ setfacl \ sh \ @@ -43,15 +40,19 @@ SUBDIR= cat \ uuidgen .if ${MK_RCMDS} != "no" -_rcp= rcp +SUBDIR+= rcp .endif .if ${MK_SENDMAIL} != "no" -_rmail= rmail +SUBDIR+= rmail .endif .if ${MK_TCSH} != "no" -_csh= csh +SUBDIR+= csh .endif +.include <bsd.arch.inc.mk> + +SUBDIR:= ${SUBDIR:O} + .include <bsd.subdir.mk> Modified: projects/sv/bin/expr/expr.1 ============================================================================== --- projects/sv/bin/expr/expr.1 Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/bin/expr/expr.1 Tue Sep 14 14:56:34 2010 (r212612) @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 12, 2004 +.Dd September 9, 2010 .Dt EXPR 1 .Os .Sh NAME @@ -217,6 +217,9 @@ command, one might rearrange the express More generally, parenthesize possibly-negative values: .Dl "a=$(expr \e( $a \e) + 1)" .It +With shell arithmetic, no escaping is required: +.Dl "a=$((a + 1))" +.It This example prints the filename portion of a pathname stored in variable .Va a . @@ -229,6 +232,12 @@ The .Li // characters resolve this ambiguity. .Dl "expr \*q//$a\*q \&: '.*/\e(.*\e)'" +.It +With modern +.Xr sh 1 +syntax, +.Dl "\*q${a##*/}\*q" +expands to the same value. .El .Pp The following examples output the number of characters in variable @@ -237,19 +246,21 @@ Again, if .Va a might begin with a hyphen, it is necessary to prevent it from being interpreted as an option to -.Nm . +.Nm , +and +.Va a +might be interpreted as an operator. .Bl -bullet .It -If the -.Nm -command conforms to -.St -p1003.1-2001 , -this is simple: -.Dl "expr -- \*q$a\*q \&: \*q.*\*q" -.It -For portability to older systems, however, a more complicated command +To deal with all of this, a complicated command is required: .Dl "expr \e( \*qX$a\*q \&: \*q.*\*q \e) - 1" +.It +With modern +.Xr sh 1 +syntax, this can be done much more easily: +.Dl "${#a}" +expands to the required number. .El .Sh SEE ALSO .Xr sh 1 , Modified: projects/sv/bin/sh/eval.c ============================================================================== --- projects/sv/bin/sh/eval.c Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/bin/sh/eval.c Tue Sep 14 14:56:34 2010 (r212612) @@ -305,6 +305,8 @@ skipping: if (evalskip == SKIPCONT && } if (evalskip == SKIPBREAK && --skipcount <= 0) evalskip = 0; + if (evalskip == SKIPFUNC || evalskip == SKIPFILE) + status = exitstatus; break; } if (n->type == NWHILE) { Modified: projects/sv/bin/sh/miscbltin.c ============================================================================== --- projects/sv/bin/sh/miscbltin.c Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/bin/sh/miscbltin.c Tue Sep 14 14:56:34 2010 (r212612) @@ -174,6 +174,7 @@ readcmd(int argc __unused, char **argv _ continue; if (backslash) { backslash = 0; + startword = 0; if (c != '\n') STPUTC(c, p); continue; Modified: projects/sv/bin/sh/parser.c ============================================================================== --- projects/sv/bin/sh/parser.c Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/bin/sh/parser.c Tue Sep 14 14:56:34 2010 (r212612) @@ -118,8 +118,8 @@ STATIC int readtoken(void); STATIC int xxreadtoken(void); STATIC int readtoken1(int, char const *, char *, int); STATIC int noexpand(char *); -STATIC void synexpect(int); -STATIC void synerror(const char *); +STATIC void synexpect(int) __dead2; +STATIC void synerror(const char *) __dead2; STATIC void setprompt(int); Modified: projects/sv/bin/sh/sh.1 ============================================================================== --- projects/sv/bin/sh/sh.1 Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/bin/sh/sh.1 Tue Sep 14 14:56:34 2010 (r212612) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd August 22, 2010 +.Dd September 10, 2010 .Dt SH 1 .Os .Sh NAME @@ -2455,8 +2455,6 @@ will return the argument. .Xr echo 1 , .Xr ed 1 , .Xr emacs 1 , -.Xr expr 1 , -.Xr getopt 1 , .Xr pwd 1 , .Xr test 1 , .Xr vi 1 , Modified: projects/sv/bin/sh/var.c ============================================================================== --- projects/sv/bin/sh/var.c Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/bin/sh/var.c Tue Sep 14 14:56:34 2010 (r212612) @@ -431,11 +431,15 @@ bltinlookup(const char *name, int doall) { struct strlist *sp; struct var *v; + char *result; + result = NULL; for (sp = cmdenviron ; sp ; sp = sp->next) { if (varequal(sp->text, name)) - return strchr(sp->text, '=') + 1; + result = strchr(sp->text, '=') + 1; } + if (result != NULL) + return result; for (v = *hashvar(name) ; v ; v = v->next) { if (varequal(v->text, name)) { if ((v->flags & VUNSET) Modified: projects/sv/bin/test/test.1 ============================================================================== --- projects/sv/bin/test/test.1 Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/bin/test/test.1 Tue Sep 14 14:56:34 2010 (r212612) @@ -32,7 +32,7 @@ .\" @(#)test.1 8.1 (Berkeley) 5/31/93 .\" $FreeBSD$ .\" -.Dd July 31, 2006 +.Dd September 10, 2010 .Dt TEST 1 .Os .Sh NAME @@ -282,7 +282,7 @@ True if either or .Ar expression2 are true. -.It Cm \&( Ns Ar expression Ns Cm \&) +.It Cm \&( Ar expression Cm \&) True if expression is true. .El .Pp @@ -302,7 +302,7 @@ manual page. The .Nm grammar is inherently ambiguous. -In order to ensure a degree of consistency, +In order to assure a degree of consistency, the cases described in the .St -p1003.2 , section D11.2/4.62.4, standard @@ -310,6 +310,14 @@ are evaluated consistently according to standards document. All other cases are subject to the ambiguity in the command semantics. +.Pp +In particular, only expressions containing +.Fl a , +.Fl o , +.Cm \&( +or +.Cm \&) +can be ambiguous. .Sh EXIT STATUS The .Nm @@ -338,12 +346,11 @@ specification. Both sides are always evaluated in .Fl a and -.Fl o , -unlike in the logical operators of -.Xr sh 1 . +.Fl o . For instance, the writable status of .Pa file will be tested by the following command even though the former expression indicated false, which results in a gratuitous access to the file system: -.Pp .Dl "[ -z abc -a -w file ]" +To avoid this, write +.Dl "[ -z abc ] && [ -w file ]" Modified: projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c ============================================================================== --- projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Tue Sep 14 14:56:34 2010 (r212612) @@ -64,7 +64,7 @@ static int gen; /* DOF helper generati #if defined(sun) extern dof_hdr_t __SUNW_dof; /* DOF defined in the .SUNW_dof section */ #endif -static boolean_t dof_init_debug = B_TRUE; /* From DTRACE_DOF_INIT_DEBUG */ +static boolean_t dof_init_debug = B_FALSE; /* From DTRACE_DOF_INIT_DEBUG */ static void dprintf(int debug, const char *fmt, ...) Modified: projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c ============================================================================== --- projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Tue Sep 14 14:56:34 2010 (r212612) @@ -1616,6 +1616,18 @@ dtrace_program_link(dtrace_hdl_t *dtp, d int eprobes = 0, ret = 0; #if !defined(sun) + if (access(file, R_OK) == 0) { + fprintf(stderr, "dtrace: target object (%s) already exists. " + "Please remove the target\ndtrace: object and rebuild all " + "the source objects if you wish to run the DTrace\n" + "dtrace: linking process again\n", file); + /* + * Several build infrastructures run DTrace twice (e.g. + * postgres) and we don't want the build to fail. Return + * 0 here since this isn't really a fatal error. + */ + return (0); + } /* XXX Should get a temp file name here. */ snprintf(tfile, sizeof(tfile), "%s.tmp", file); #endif Modified: projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c ============================================================================== --- projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Tue Sep 14 14:56:34 2010 (r212612) @@ -1103,7 +1103,7 @@ alloc: #if defined(sun) dtp->dt_prcmode = DT_PROC_STOP_PREINIT; #else - dtp->dt_prcmode = DT_PROC_STOP_POSTINIT; + dtp->dt_prcmode = DT_PROC_STOP_MAIN; #endif dtp->dt_linkmode = DT_LINK_KERNEL; dtp->dt_linktype = DT_LTYP_ELF; Modified: projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c ============================================================================== --- projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c Tue Sep 14 14:56:34 2010 (r212612) @@ -641,7 +641,6 @@ dt_pid_create_usdt_probes(dtrace_probede assert(DT_MUTEX_HELD(&dpr->dpr_lock)); #if defined(sun) (void) Pupdate_maps(P); -#endif if (Pobject_iter(P, dt_pid_usdt_mapping, P) != 0) { ret = -1; (void) dt_pid_error(dtp, pcb, dpr, NULL, D_PROC_USDT, @@ -652,6 +651,9 @@ dt_pid_create_usdt_probes(dtrace_probede (int)proc_getpid(P), strerror(errno)); #endif } +#else + ret = 0; +#endif /* * Put the module name in its canonical form. Modified: projects/sv/etc/defaults/rc.conf ============================================================================== --- projects/sv/etc/defaults/rc.conf Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/etc/defaults/rc.conf Tue Sep 14 14:56:34 2010 (r212612) @@ -210,8 +210,6 @@ cloned_interfaces="" # List of cloned n ifconfig_lo0="inet 127.0.0.1" # default loopback device configuration. #ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias entry. #ifconfig_ed0_ipx="ipx 0x00010010" # Sample IPX address family entry. -#ifconfig_ed0_ipv6="RTADV" # Sample IPv6 entry for RA/rtsol(8) -#ifconfig_ed0_ipv6="inet6 auto_linklocal" # To configure only link-local #ifconfig_ed0_ipv6="inet6 2001:db8:1::1 prefixlen 64" # Sample IPv6 addr entry #ifconfig_ed0_alias0="inet6 2001:db8:2::1 prefixlen 64" # Sample IPv6 alias #ifconfig_fxp0_name="net0" # Change interface name from fxp0 to net0. @@ -446,9 +444,12 @@ ubthidhci_enable="NO" # Switch an USB B icmp_bmcastecho="NO" # respond to broadcast ping packets ### IPv6 options: ### -ipv6_network_interfaces="AUTO" # List of IPv6 network interfaces -ipv6_prefer="YES" # Use IPv6 when both IPv4 and IPv6 can be used -ipv6_privacy="NO" # Use privacy addresses with RTADV (RFC 4193) +ipv6_network_interfaces="auto" # List of IPv6 network interfaces + # (or "auto" or "none"). +ipv6_activate_all_interfaces="NO" # If NO, interfaces which have no + # corresponding $ifconfig_IF_ipv6 is + # marked as IFDISABLED for security + # reason. ipv6_defaultrouter="NO" # Set to IPv6 default gateway (or NO). #ipv6_defaultrouter="2002:c058:6301::" # Use this for 6to4 (RFC 3068) ipv6_static_routes="" # Set to static route list (or leave empty). @@ -456,6 +457,8 @@ ipv6_static_routes="" # Set to static r # route toward loopback interface. #ipv6_route_xxx="fec0:0000:0000:0006:: -prefixlen 64 ::1" ipv6_gateway_enable="NO" # Set to YES if this host will be a gateway. +ipv6_privacy="NO" # Use privacy address on RA-receiving IFs + # (RFC 4193) route6d_enable="NO" # Set to YES to enable an IPv6 routing daemon. route6d_program="/usr/sbin/route6d" # Name of IPv6 routing daemon. @@ -507,6 +510,8 @@ ipv6_ipfilter_rules="/etc/ipf6.rules" # # for examples ip6addrctl_enable="YES" # Set to YES to enable default address selection ip6addrctl_verbose="NO" # Set to YES to enable verbose configuration messages +ip6addrctl_policy="AUTO" # A pre-defined address selection policy + # (ipv4_prefer, ipv6_prefer, or AUTO) ############################################################## ### System console options ################################# Modified: projects/sv/etc/mtree/BSD.var.dist ============================================================================== --- projects/sv/etc/mtree/BSD.var.dist Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/etc/mtree/BSD.var.dist Tue Sep 14 14:56:34 2010 (r212612) @@ -64,6 +64,8 @@ .. ppp gname=network mode=0770 .. + wpa_supplicant + .. .. rwho gname=daemon mode=0775 .. Modified: projects/sv/etc/network.subr ============================================================================== --- projects/sv/etc/network.subr Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/etc/network.subr Tue Sep 14 14:56:34 2010 (r212612) @@ -96,32 +96,44 @@ ifconfig_up() # inet6 specific if afexists inet6; then if ipv6if $1; then - # Implicitly handles ipv6_gateway_enable - _ipv6_opts='-ifdisabled -accept_rtadv' - - if ipv6_autoconfif $1; then - _ipv6_opts='-ifdisabled accept_rtadv' - fi - - ifconfig $1 inet6 $_ipv6_opts - - # ifconfig_IF_ipv6 - ifconfig_args=`ifconfig_getargs $1 ipv6` - - if [ -n "$ifconfig_args" ]; then - ifconfig $1 $ifconfig_args - _cfg=0 + if checkyesno ipv6_gateway_enable; then + _ipv6_opts="-accept_rtadv" fi else - # Remove in FreeBSD 10.x - # Explicit test is necessary here to avoid nonexistence error - case "$ipv6_enable" in + if checkyesno ipv6_activate_all_interfaces; then + _ipv6_opts="-ifdisabled" + else + _ipv6_opts="ifdisabled" + fi + + # backward compatibility: $ipv6_enable + case $ipv6_enable in [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) - warn "Interface $1 will NOT be configured for IPv6" + _ipv6_opts="${_ipv6_opts} accept_rtadv" ;; esac + fi - ifconfig $1 inet6 ifdisabled + if [ -n "${_ipv6_opts}" ]; then + ifconfig $1 inet6 ${_ipv6_opts} + fi + + # ifconfig_IF_ipv6 + ifconfig_args=`ifconfig_getargs $1 ipv6` + if [ -n "${ifconfig_args}" ]; then + ifconfig $1 inet6 -ifdisabled + ifconfig $1 ${ifconfig_args} + _cfg=0 + fi + + # backward compatiblity: $ipv6_ifconfig_IF + ifconfig_args=`get_if_var $1 ipv6_ifconfig_IF` + if [ -n "${ifconfig_args}" ]; then + warn "\$ipv6_ifconfig_$1 is obsolete." \ + " Use ifconfig_$1_ipv6 instead." + ifconfig $1 inet6 -ifdisabled + ifconfig $1 inet6 ${ifconfig_args} + _cfg=0 fi fi @@ -207,7 +219,7 @@ get_if_var() # outside this file. _ifconfig_getargs() { - local _ifn _af value + local _ifn _af _ifn=$1 _af=${2+_$2} @@ -215,18 +227,7 @@ _ifconfig_getargs() return 1 fi - value=`get_if_var $_ifn ifconfig_IF$_af "$ifconfig_DEFAULT"` - - # Remove in FreeBSD 10.x - if [ "$_af" = _ipv6 -a -z "$value" ]; then - value=`get_if_var $_ifn ipv6_ifconfig_IF "$ifconfig_DEFAULT"` - if [ -n "$value" ]; then - warn "\$ipv6_ifconfig_$1 is obsolete." \ - " Use ifconfig_$1_ipv6 instead." - fi - fi - - echo $value + get_if_var $_ifn ifconfig_IF$_af "$ifconfig_DEFAULT" } # ifconfig_getargs if [af] @@ -248,8 +249,6 @@ ifconfig_getargs() [Nn][Oo][Ss][Yy][Nn][Cc][Dd][Hh][Cc][Pp]) ;; [Ss][Yy][Nn][Cc][Dd][Hh][Cc][Pp]) ;; [Ww][Pp][Aa]) ;; - [Rr][Tt][Aa][Dd][Vv]) ;; - [Nn][Oo][Rr][Tt][Aa][Dd][Vv]) ;; *) _args="$_args $_arg" ;; @@ -373,48 +372,68 @@ afexists() esac } +# noafif if +# Returns 0 if the interface has no af configuration and 1 otherwise. +noafif() +{ + local _if + _if=$1 + + case $_if in + pflog[0-9]*|\ + pfsync[0-9]*|\ + an[0-9]*|\ + ath[0-9]*|\ + ipw[0-9]*|\ + ipfw[0-9]*|\ + iwi[0-9]*|\ + iwn[0-9]*|\ + ral[0-9]*|\ + wi[0-9]*|\ + wl[0-9]*|\ + wpi[0-9]*) + return 0 + ;; + esac + + return 1 +} + # ipv6if if # Returns 0 if the interface should be configured for IPv6 and # 1 otherwise. ipv6if() { + local _if _tmpargs i + _if=$1 + if ! afexists inet6; then return 1 fi # lo0 is always IPv6-enabled - case $1 in + case $_if in lo0) return 0 ;; esac - local _if _tmpargs i - _if=$1 - - case "$ipv6_network_interfaces" in - ''|[Nn][Oo][Nn][Ee]) - return 1 - ;; + case "${ipv6_network_interfaces}" in $_if|"$_if "*|*" $_if"|*" $_if "*|[Aa][Uu][Tt][Oo]) # True if $ifconfig_IF_ipv6 is defined. _tmpargs=`_ifconfig_getargs $_if ipv6` - # Also true if ipv6_prefix_IF is defined - [ -n "$_tmpargs" ] || _tmpargs=`get_if_var $_if ipv6_prefix_IF` + if [ -n "${_tmpargs}" ]; then + return 0 + fi + + # backward compatibility: True if $ipv6_ifconfig_IF is defined. + _tmpargs=`get_if_var $_if ipv6_ifconfig_IF` + if [ -n "${_tmpargs}" ]; then + return 0 + fi ;; esac - if [ -n "$_tmpargs" ]; then - # Remove in FreeBSD 10.x - # Explicit test is necessary here to avoid nonexistence error - case "$ipv6_enable" in - [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0) - ;; - *) return 0 - ;; - esac - fi - return 1 } @@ -423,21 +442,21 @@ ipv6if() # Stateless Address Configuration, 1 otherwise. ipv6_autoconfif() { - case $1 in + local _if _tmpargs _arg + _if=$1 + + case $_if in lo0|\ stf[0-9]*|\ faith[0-9]*|\ lp[0-9]*|\ - sl[0-9]*|\ - pflog[0-9]*|\ - pfsync[0-9]*) + sl[0-9]*) return 1 ;; esac - - local _if _tmpargs _arg - _if=$1 - + if noafif $_if; then + return 1 + fi if ! ipv6if $_if; then return 1 fi @@ -448,23 +467,31 @@ ipv6_autoconfif() if [ -n "${_tmpargs}" ]; then return 1 fi - if ! is_wired_interface $_if; then - case $_if in - wlan[0-9]*) ;; # Allow test to continue - *) return 1 + # backward compatibility: $ipv6_enable + case $ipv6_enable in + [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) + return 0 + ;; + esac + + _tmpargs=`_ifconfig_getargs $_if ipv6` + for _arg in $_tmpargs; do + case $_arg in + accept_rtadv) + return 0 ;; esac - fi + done - _tmpargs=`_ifconfig_getargs $_if ipv6` - case "$_tmpargs" in - *inet6\ *|*[Nn][Oo][Rr][Tt][Aa][Dd][Vv]*|*-accept_rtadv*) - return 1 - ;; - *[Rr][Tt][Aa][Dd][Vv]*|*accept_rtadv*) - return 0 - ;; - esac + # backward compatibility: $ipv6_ifconfig_IF + _tmpargs=`get_if_var $_if ipv6_ifconfig_IF` + for _arg in $_tmpargs; do + case $_arg in + accept_rtadv) + return 0 + ;; + esac + done return 1 } Modified: projects/sv/etc/rc.d/ip6addrctl ============================================================================== --- projects/sv/etc/rc.d/ip6addrctl Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/etc/rc.d/ip6addrctl Tue Sep 14 14:56:34 2010 (r212612) @@ -19,6 +19,10 @@ extra_commands="status prefer_ipv6 prefe status_cmd="ip6addrctl" prefer_ipv6_cmd="ip6addrctl_prefer_ipv6" prefer_ipv4_cmd="ip6addrctl_prefer_ipv4" +config_file="/etc/ip6addrctl.conf" + +set_rcvar_obsolete ipv6_enable ipv6_activate_all_interfaces +set_rcvar_obsolete ipv6_prefer ip6addrctl_policy ip6addrctl_prefer_ipv6() { @@ -51,17 +55,40 @@ ip6addrctl_start() afexists inet6 || return 0 # install the policy of the address selection algorithm. - if [ -f /etc/ip6addrctl.conf ]; then - ip6addrctl flush >/dev/null 2>&1 - ip6addrctl install /etc/ip6addrctl.conf - checkyesno ip6addrctl_verbose && ip6addrctl - else - if checkyesno ipv6_prefer; then - ip6addrctl_prefer_ipv6 + case "${ip6addrctl_policy}" in + [Aa][Uu][Tt][Oo]) + if [ -r "${config_file}" -a -s "${config_file}" ]; then + ip6addrctl flush >/dev/null 2>&1 + ip6addrctl install "${config_file}" + checkyesno ip6addrctl_verbose && ip6addrctl else - ip6addrctl_prefer_ipv4 + if checkyesno ipv6_activate_all_interfaces; then + ip6addrctl_prefer_ipv6 + else + ip6addrctl_prefer_ipv4 + fi fi - fi + ;; + ipv4_prefer) + ip6addrctl_prefer_ipv4 + ;; + ipv6_prefer) + ip6addrctl_prefer_ipv6 + ;; + [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) + # Backward compatibility when ipv6_prefer=YES + ip6addrctl_prefer_ipv6 + ;; + [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0) + # Backward compatibility when ipv6_prefer=NO + ip6addrctl_prefer_ipv4 + ;; + *) + warn "\$ip6addrctl_policy is invalid: ${ip6addrctl_policy}. " \ + " \"ipv4_prefer\" is used instead." + ip6addrctl_prefer_ipv4 + ;; + esac } ip6addrctl_stop() Modified: projects/sv/etc/rc.d/netif ============================================================================== --- projects/sv/etc/rc.d/netif Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/etc/rc.d/netif Tue Sep 14 14:56:34 2010 (r212612) @@ -34,7 +34,6 @@ . /etc/network.subr name="network" -start_precmd="network_prestart" start_cmd="network_start" stop_cmd="network_stop" cloneup_cmd="clone_up" @@ -42,13 +41,8 @@ clonedown_cmd="clone_down" extra_commands="cloneup clonedown" cmdifn= -network_prestart() -{ - if [ -n "$ipv6_enable" ]; then - warn 'The ipv6_enable option is deprecated.' - warn 'See rc.conf(5) for information on disabling IPv6.' - fi -} +set_rcvar_obsolete ipv6_enable ipv6_activate_all_interfaces +set_rcvar_obsolete ipv6_prefer network_start() { Modified: projects/sv/gnu/lib/libstdc++/Makefile ============================================================================== --- projects/sv/gnu/lib/libstdc++/Makefile Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/gnu/lib/libstdc++/Makefile Tue Sep 14 14:56:34 2010 (r212612) @@ -83,7 +83,7 @@ ATOMICITY_H= ${SRCDIR}/config/cpu/${MARC ATOMICITY_H= ${SRCDIR}/config/cpu/generic/atomicity_mutex/atomicity.h .endif -.if ${MACHINE_CPUARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" .if exists(${SRCDIR}/config/cpu/generic/atomicity_builtins/atomicity.h) ATOMICITY_H= ${SRCDIR}/config/cpu/generic/atomicity_builtins/atomicity.h .endif Modified: projects/sv/gnu/lib/libstdc++/config.h ============================================================================== --- projects/sv/gnu/lib/libstdc++/config.h Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/gnu/lib/libstdc++/config.h Tue Sep 14 14:56:34 2010 (r212612) @@ -671,7 +671,7 @@ /* #undef VERSION */ /* Define if builtin atomic operations are supported on this host. */ -#if defined(__amd64__) +#if defined(__amd64__) || defined(__i386__) #define _GLIBCXX_ATOMIC_BUILTINS 1 #endif Modified: projects/sv/lib/libc/db/man/dbopen.3 ============================================================================== --- projects/sv/lib/libc/db/man/dbopen.3 Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/lib/libc/db/man/dbopen.3 Tue Sep 14 14:56:34 2010 (r212612) @@ -28,7 +28,7 @@ .\" @(#)dbopen.3 8.5 (Berkeley) 1/2/94 .\" $FreeBSD$ .\" -.Dd January 2, 1994 +.Dd September 10, 2010 .Dt DBOPEN 3 .Os .Sh NAME @@ -78,8 +78,8 @@ arguments are as specified to the .Xr open 2 routine, however, only the -.Dv O_CREAT , O_EXCL , O_EXLOCK , O_NONBLOCK , -.Dv O_RDONLY , O_RDWR , O_SHLOCK +.Dv O_CREAT , O_EXCL , O_EXLOCK , O_NOFOLLOW , O_NONBLOCK , +.Dv O_RDONLY , O_RDWR , O_SHLOCK , O_SYNC and .Dv O_TRUNC flags are meaningful. Modified: projects/sv/lib/libc/net/sctp_send.3 ============================================================================== --- projects/sv/lib/libc/net/sctp_send.3 Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/lib/libc/net/sctp_send.3 Tue Sep 14 14:56:34 2010 (r212612) @@ -191,7 +191,7 @@ If that many milliseconds elapse and the peer has not acknowledged the data, the data will be skipped and no longer transmitted. Note that this policy does -not even ensure that the data will ever be sent. +not even assure that the data will ever be sent. In times of a congestion with large amounts of data being queued, the .Fa sinfo->sinfo_timetolive @@ -218,7 +218,7 @@ policy transforms the .Fa sinfo->sinfo_timetolive into a number of retransmissions to allow. This policy -always ensures that at a minimum one send attempt is +always assures that at a minimum one send attempt is made of the data. After which no more than .Fa sinfo->sinfo_timetolive Modified: projects/sv/lib/libc/net/sctp_sendmsg.3 ============================================================================== --- projects/sv/lib/libc/net/sctp_sendmsg.3 Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/lib/libc/net/sctp_sendmsg.3 Tue Sep 14 14:56:34 2010 (r212612) @@ -203,7 +203,7 @@ If that many milliseconds elapse and the peer has not acknowledged the data, the data will be skipped and no longer transmitted. Note that this policy does -not even ensure that the data will ever be sent. +not even assure that the data will ever be sent. In times of a congestion with large amounts of data being queued, the .Fa timetolive @@ -230,7 +230,7 @@ policy transforms the .Fa timetolive into a number of retransmissions to allow. This policy -always ensures that at a minimum one send attempt is +always assures that at a minimum one send attempt is made of the data. After which no more than .Fa timetolive Modified: projects/sv/lib/libc/posix1e/acl_strip.c ============================================================================== --- projects/sv/lib/libc/posix1e/acl_strip.c Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/lib/libc/posix1e/acl_strip.c Tue Sep 14 14:56:34 2010 (r212612) @@ -176,6 +176,15 @@ acl_is_trivial_np(const acl_t aclp, int case ACL_BRAND_NFS4: /* + * If the ACL has more than canonical six entries, + * it's non trivial by definition. + */ + if (aclp->ats_acl.acl_cnt > 6) { + *trivialp = 0; + return (0); + } + + /* * Calculate trivial ACL - using acl_strip_np - and compare * with the original. */ Modified: projects/sv/lib/libc/stdio/printf.3 ============================================================================== --- projects/sv/lib/libc/stdio/printf.3 Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/lib/libc/stdio/printf.3 Tue Sep 14 14:56:34 2010 (r212612) @@ -849,7 +849,7 @@ and .Fn vsprintf assume an infinitely long string, callers must be careful not to overflow the actual space; -this is often hard to ensure. +this is often hard to assure. For safety, programmers should use the .Fn snprintf interface instead. Modified: projects/sv/lib/libc/stdlib/Makefile.inc ============================================================================== --- projects/sv/lib/libc/stdlib/Makefile.inc Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/lib/libc/stdlib/Makefile.inc Tue Sep 14 14:56:34 2010 (r212612) @@ -9,7 +9,7 @@ MISRCS+=_Exit.c a64l.c abort.c abs.c ate getsubopt.c hcreate.c heapsort.c imaxabs.c imaxdiv.c \ insque.c l64a.c labs.c ldiv.c llabs.c lldiv.c lsearch.c malloc.c \ merge.c ptsname.c qsort.c qsort_r.c radixsort.c rand.c random.c \ - reallocf.c realpath.c remque.c strfmon.c strtoimax.c \ + reallocf.c realpath.c remque.c sigwait.c strfmon.c strtoimax.c \ strtol.c strtoll.c strtoq.c strtoul.c strtonum.c strtoull.c \ strtoumax.c strtouq.c system.c tdelete.c tfind.c tsearch.c twalk.c Modified: projects/sv/lib/libc/stdlib/malloc.3 ============================================================================== --- projects/sv/lib/libc/stdlib/malloc.3 Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/lib/libc/stdlib/malloc.3 Tue Sep 14 14:56:34 2010 (r212612) @@ -266,7 +266,7 @@ options are enabled, the allocator prefe but allocation only fails if memory cannot be acquired via either method. If neither option is enabled, then the .Dq M -option is implicitly enabled in order to ensure that there is a method for +option is implicitly enabled in order to assure that there is a method for acquiring memory. .It N Double/halve the number of arenas. @@ -437,7 +437,7 @@ rounded up to the nearest multiple of th .Pp Allocations are packed tightly together, which can be an issue for multi-threaded applications. -If you need to ensure that allocations do not suffer from cacheline sharing, +If you need to assure that allocations do not suffer from cacheline sharing, round your allocation requests up to the nearest multiple of the cacheline size. .Sh DEBUGGING MALLOC PROBLEMS Modified: projects/sv/lib/libc/sys/Makefile.inc ============================================================================== --- projects/sv/lib/libc/sys/Makefile.inc Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/lib/libc/sys/Makefile.inc Tue Sep 14 14:56:34 2010 (r212612) @@ -21,6 +21,9 @@ SRCS+= stack_protector.c stack_protector SRCS+= fcntl.c ftruncate.c lseek.c mmap.c pread.c pwrite.c truncate.c PSEUDO+= _fcntl.o .endif +SRCS+= sigwait.c +NOASM+= sigwait.o +PSEUDO+= _sigwait.o # Add machine dependent asm sources: SRCS+=${MDASM} Modified: projects/sv/lib/libc/sys/Symbol.map ============================================================================== --- projects/sv/lib/libc/sys/Symbol.map Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/lib/libc/sys/Symbol.map Tue Sep 14 14:56:34 2010 (r212612) @@ -919,6 +919,7 @@ FBSDprivate_1.0 { _sigtimedwait; __sys_sigtimedwait; _sigwait; + __sigwait; __sys_sigwait; _sigwaitinfo; __sys_sigwaitinfo; Modified: projects/sv/lib/libc/sys/connect.2 ============================================================================== --- projects/sv/lib/libc/sys/connect.2 Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/lib/libc/sys/connect.2 Tue Sep 14 14:56:34 2010 (r212612) @@ -28,7 +28,7 @@ .\" @(#)connect.2 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd August 16, 2006 +.Dd September 5, 2010 .Dt CONNECT 2 .Os .Sh NAME @@ -95,6 +95,8 @@ The socket is already connected. Connection establishment timed out without establishing a connection. .It Bq Er ECONNREFUSED The attempt to connect was forcefully rejected. +.It Bq Er ECONNRESET +The connection was reset by the remote host. .It Bq Er ENETUNREACH The network is not reachable from this host. .It Bq Er EHOSTUNREACH Modified: projects/sv/lib/libc/sys/cpuset_getaffinity.2 ============================================================================== --- projects/sv/lib/libc/sys/cpuset_getaffinity.2 Tue Sep 14 12:12:18 2010 (r212611) +++ projects/sv/lib/libc/sys/cpuset_getaffinity.2 Tue Sep 14 14:56:34 2010 (r212612) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 8, 2010 +.Dd September 10, 2010 .Dt CPUSET 2 .Os .Sh NAME @@ -121,6 +121,12 @@ The or .Fa which argument was not a valid value. +.It Bq Er EINVAL +The +.Fa mask +argument specified when calling +.Fn cpuset_setaffinity +was not a valid value. .It Bq Er EDEADLK The .Fn cpuset_setaffinity Copied: projects/sv/lib/libc/sys/sigwait.c (from r212611, head/lib/libc/sys/sigwait.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sv/lib/libc/sys/sigwait.c Tue Sep 14 14:56:34 2010 (r212612, copy of r212611, head/lib/libc/sys/sigwait.c) @@ -0,0 +1,46 @@ +/*- + * Copyright (c) 2010 davidxu@freebsd.org + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201009141456.o8EEuY1X084507>