From owner-svn-src-projects@FreeBSD.ORG Thu Jun 30 17:37:43 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5D673106564A; Thu, 30 Jun 2011 17:37:43 +0000 (UTC) (envelope-from grehan@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 49DF58FC18; Thu, 30 Jun 2011 17:37:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5UHbhYM053363; Thu, 30 Jun 2011 17:37:43 GMT (envelope-from grehan@svn.freebsd.org) Received: (from grehan@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5UHbg6T053344; Thu, 30 Jun 2011 17:37:42 GMT (envelope-from grehan@svn.freebsd.org) Message-Id: <201106301737.p5UHbg6T053344@svn.freebsd.org> From: Peter Grehan Date: Thu, 30 Jun 2011 17:37:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r223698 - in projects/bhyve: . bin/rcp bin/realpath bin/sh cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/lib/libzfs/common contrib/binutils/gas/config contrib/libpcap/bpf/ne... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jun 2011 17:37:43 -0000 Author: grehan Date: Thu Jun 30 17:37:42 2011 New Revision: 223698 URL: http://svn.freebsd.org/changeset/base/223698 Log: IFC @ r223696 to pick up dfr's userboot Added: projects/bhyve/etc/devd/usb.conf - copied unchanged from r223696, head/etc/devd/usb.conf projects/bhyve/lib/libusb/libusb01.c - copied unchanged from r223696, head/lib/libusb/libusb01.c projects/bhyve/sys/boot/common/disk.c - copied unchanged from r223696, head/sys/boot/common/disk.c projects/bhyve/sys/boot/common/disk.h - copied unchanged from r223696, head/sys/boot/common/disk.h projects/bhyve/sys/boot/ficl/amd64/ - copied from r223696, head/sys/boot/ficl/amd64/ projects/bhyve/sys/boot/userboot/ - copied from r223696, head/sys/boot/userboot/ projects/bhyve/sys/contrib/pf/net/if_pflow.h - copied unchanged from r223696, head/sys/contrib/pf/net/if_pflow.h projects/bhyve/sys/contrib/pf/net/pf_lb.c - copied unchanged from r223696, head/sys/contrib/pf/net/pf_lb.c projects/bhyve/sys/dev/pci/pci_subr.c - copied unchanged from r223696, head/sys/dev/pci/pci_subr.c projects/bhyve/sys/dev/usb/template/usb_template_audio.c - copied unchanged from r223696, head/sys/dev/usb/template/usb_template_audio.c projects/bhyve/sys/dev/usb/template/usb_template_kbd.c - copied unchanged from r223696, head/sys/dev/usb/template/usb_template_kbd.c projects/bhyve/sys/dev/usb/template/usb_template_modem.c - copied unchanged from r223696, head/sys/dev/usb/template/usb_template_modem.c projects/bhyve/sys/dev/usb/template/usb_template_mouse.c - copied unchanged from r223696, head/sys/dev/usb/template/usb_template_mouse.c projects/bhyve/sys/modules/pfsync/ - copied from r223696, head/sys/modules/pfsync/ projects/bhyve/sys/x86/include/pci_cfgreg.h - copied unchanged from r223696, head/sys/x86/include/pci_cfgreg.h projects/bhyve/sys/x86/pci/pci_bus.c - copied unchanged from r223696, head/sys/x86/pci/pci_bus.c projects/bhyve/tools/regression/bin/sh/builtins/case10.0 - copied unchanged from r223696, head/tools/regression/bin/sh/builtins/case10.0 projects/bhyve/tools/tools/bus_autoconf/ - copied from r223696, head/tools/tools/bus_autoconf/ Deleted: projects/bhyve/lib/libusb/libusb20_compat01.c projects/bhyve/sys/amd64/pci/pci_bus.c projects/bhyve/sys/contrib/pf/net/pf_subr.c projects/bhyve/sys/i386/pci/pci_bus.c projects/bhyve/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk Modified: projects/bhyve/UPDATING projects/bhyve/bin/rcp/rcp.c projects/bhyve/bin/realpath/realpath.1 projects/bhyve/bin/realpath/realpath.c projects/bhyve/bin/sh/arith_yacc.c projects/bhyve/bin/sh/mkinit.c projects/bhyve/bin/sh/sh.1 projects/bhyve/cddl/contrib/opensolaris/cmd/zfs/zfs.8 projects/bhyve/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/bhyve/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c projects/bhyve/contrib/binutils/gas/config/tc-arm.c projects/bhyve/contrib/libpcap/bpf/net/bpf_filter.c projects/bhyve/contrib/ntp/ntpd/ntp_config.c projects/bhyve/contrib/ntp/ntpd/ntp_intres.c projects/bhyve/contrib/ntp/ntpd/ntp_io.c projects/bhyve/contrib/pf/authpf/authpf.8 projects/bhyve/contrib/pf/authpf/authpf.c projects/bhyve/contrib/pf/authpf/pathnames.h projects/bhyve/contrib/pf/ftp-proxy/filter.c projects/bhyve/contrib/pf/ftp-proxy/filter.h projects/bhyve/contrib/pf/ftp-proxy/ftp-proxy.8 projects/bhyve/contrib/pf/ftp-proxy/ftp-proxy.c projects/bhyve/contrib/pf/man/pf.4 projects/bhyve/contrib/pf/man/pf.conf.5 projects/bhyve/contrib/pf/man/pf.os.5 projects/bhyve/contrib/pf/man/pflog.4 projects/bhyve/contrib/pf/man/pfsync.4 projects/bhyve/contrib/pf/pfctl/parse.y projects/bhyve/contrib/pf/pfctl/pf_print_state.c projects/bhyve/contrib/pf/pfctl/pfctl.8 projects/bhyve/contrib/pf/pfctl/pfctl.c projects/bhyve/contrib/pf/pfctl/pfctl.h projects/bhyve/contrib/pf/pfctl/pfctl_altq.c projects/bhyve/contrib/pf/pfctl/pfctl_optimize.c projects/bhyve/contrib/pf/pfctl/pfctl_osfp.c projects/bhyve/contrib/pf/pfctl/pfctl_parser.c projects/bhyve/contrib/pf/pfctl/pfctl_parser.h projects/bhyve/contrib/pf/pfctl/pfctl_qstats.c projects/bhyve/contrib/pf/pfctl/pfctl_radix.c projects/bhyve/contrib/pf/pfctl/pfctl_table.c projects/bhyve/contrib/pf/pflogd/pflogd.8 projects/bhyve/contrib/pf/pflogd/pflogd.c projects/bhyve/contrib/pf/pflogd/privsep.c projects/bhyve/contrib/pf/pflogd/privsep_fdpass.c projects/bhyve/contrib/traceroute/traceroute.c projects/bhyve/contrib/tzdata/antarctica projects/bhyve/contrib/tzdata/asia projects/bhyve/contrib/tzdata/europe projects/bhyve/contrib/tzdata/southamerica projects/bhyve/contrib/tzdata/zone.tab projects/bhyve/etc/devd/Makefile projects/bhyve/etc/devd/uath.conf projects/bhyve/etc/network.subr projects/bhyve/etc/rc.d/netwait projects/bhyve/etc/rc.d/quota projects/bhyve/etc/regdomain.xml projects/bhyve/kerberos5/Makefile projects/bhyve/lib/csu/powerpc64/Makefile projects/bhyve/lib/libc/gen/getutxent.3 projects/bhyve/lib/libc/gen/posix_spawn.3 projects/bhyve/lib/libc/gen/posix_spawn.c projects/bhyve/lib/libc/gen/pututxline.c projects/bhyve/lib/libc/stdlib/malloc.c projects/bhyve/lib/libc/stdlib/ptsname.c projects/bhyve/lib/libmd/sha256.3 projects/bhyve/lib/libmd/sha512.3 projects/bhyve/lib/libprocstat/Makefile projects/bhyve/lib/libstand/tftp.c projects/bhyve/lib/libusb/Makefile projects/bhyve/lib/libusb/libusb10.c projects/bhyve/lib/libusb/libusb20.3 projects/bhyve/lib/libusb/libusb20.c projects/bhyve/lib/libusb/libusb20.h projects/bhyve/lib/libusb/libusb20_int.h projects/bhyve/lib/libusb/libusb20_ugen20.c projects/bhyve/libexec/ftpd/ftpd.c projects/bhyve/libexec/tftpd/tftp-file.c projects/bhyve/libexec/tftpd/tftpd.8 projects/bhyve/libexec/ulog-helper/Makefile projects/bhyve/libexec/ulog-helper/ulog-helper.c projects/bhyve/release/doc/en_US.ISO8859-1/readme/article.sgml projects/bhyve/release/doc/share/sgml/release.ent projects/bhyve/sbin/fsck_ffs/suj.c projects/bhyve/sbin/geom/class/part/geom_part.c projects/bhyve/sbin/growfs/growfs.8 projects/bhyve/sbin/growfs/growfs.c projects/bhyve/sbin/hastctl/Makefile projects/bhyve/sbin/hastd/Makefile projects/bhyve/sbin/hastd/activemap.c projects/bhyve/sbin/hastd/primary.c projects/bhyve/sbin/hastd/subr.c projects/bhyve/sbin/ipfw/ipfw.8 projects/bhyve/sbin/ipfw/ipfw2.c projects/bhyve/sbin/ipfw/ipfw2.h projects/bhyve/sbin/ipfw/main.c projects/bhyve/sbin/ipfw/nat.c projects/bhyve/sbin/newfs/newfs.8 projects/bhyve/sbin/pflogd/Makefile projects/bhyve/sbin/savecore/savecore.c projects/bhyve/sbin/tunefs/tunefs.8 projects/bhyve/share/man/man4/jme.4 projects/bhyve/share/man/man4/ng_ether.4 projects/bhyve/share/misc/iso3166 projects/bhyve/share/mk/bsd.own.mk projects/bhyve/sys/amd64/amd64/pmap.c projects/bhyve/sys/amd64/amd64/sys_machdep.c projects/bhyve/sys/amd64/include/pci_cfgreg.h projects/bhyve/sys/arm/arm/pmap.c projects/bhyve/sys/arm/arm/sys_machdep.c projects/bhyve/sys/arm/at91/at91_machdep.c projects/bhyve/sys/arm/conf/CAMBRIA projects/bhyve/sys/arm/mv/common.c projects/bhyve/sys/arm/sa11x0/assabet_machdep.c projects/bhyve/sys/arm/sa11x0/sa11x0.c projects/bhyve/sys/boot/Makefile projects/bhyve/sys/boot/Makefile.amd64 projects/bhyve/sys/boot/Makefile.arm projects/bhyve/sys/boot/Makefile.powerpc projects/bhyve/sys/boot/common/Makefile.inc projects/bhyve/sys/boot/common/load_elf.c projects/bhyve/sys/boot/common/reloc_elf.c projects/bhyve/sys/boot/i386/libi386/bioscd.c projects/bhyve/sys/boot/i386/zfsboot/zfsldr.S projects/bhyve/sys/cam/ata/ata_xpt.c projects/bhyve/sys/cam/cam_xpt.c projects/bhyve/sys/cam/scsi/scsi_cd.c projects/bhyve/sys/cam/scsi/scsi_xpt.c projects/bhyve/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h projects/bhyve/sys/conf/NOTES projects/bhyve/sys/conf/files projects/bhyve/sys/conf/files.amd64 projects/bhyve/sys/conf/files.i386 projects/bhyve/sys/conf/files.ia64 projects/bhyve/sys/conf/files.pc98 projects/bhyve/sys/conf/options projects/bhyve/sys/contrib/altq/altq/altq_red.c projects/bhyve/sys/contrib/pf/net/if_pflog.c projects/bhyve/sys/contrib/pf/net/if_pflog.h projects/bhyve/sys/contrib/pf/net/if_pfsync.c projects/bhyve/sys/contrib/pf/net/if_pfsync.h projects/bhyve/sys/contrib/pf/net/pf.c projects/bhyve/sys/contrib/pf/net/pf_if.c projects/bhyve/sys/contrib/pf/net/pf_ioctl.c projects/bhyve/sys/contrib/pf/net/pf_mtag.h projects/bhyve/sys/contrib/pf/net/pf_norm.c projects/bhyve/sys/contrib/pf/net/pf_osfp.c projects/bhyve/sys/contrib/pf/net/pf_ruleset.c projects/bhyve/sys/contrib/pf/net/pf_table.c projects/bhyve/sys/contrib/pf/net/pfvar.h projects/bhyve/sys/dev/acpica/acpi.c projects/bhyve/sys/dev/acpica/acpi_cpu.c projects/bhyve/sys/dev/acpica/acpi_pcib_acpi.c projects/bhyve/sys/dev/acpica/acpi_resource.c projects/bhyve/sys/dev/acpica/acpi_thermal.c projects/bhyve/sys/dev/acpica/acpivar.h projects/bhyve/sys/dev/an/if_an.c projects/bhyve/sys/dev/ath/ah_osdep.c projects/bhyve/sys/dev/ath/ath_hal/ah.h projects/bhyve/sys/dev/ath/ath_hal/ah_eeprom_9287.h projects/bhyve/sys/dev/ath/ath_hal/ah_internal.h projects/bhyve/sys/dev/ath/ath_hal/ah_regdomain.c projects/bhyve/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c projects/bhyve/sys/dev/ath/ath_hal/ar5210/ar5210_beacon.c projects/bhyve/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c projects/bhyve/sys/dev/ath/ath_hal/ar5211/ar5211_beacon.c projects/bhyve/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c projects/bhyve/sys/dev/ath/ath_hal/ar5212/ar5112.c projects/bhyve/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c projects/bhyve/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c projects/bhyve/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c projects/bhyve/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c projects/bhyve/sys/dev/ath/ath_hal/ar5416/ar2133.c projects/bhyve/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c projects/bhyve/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c projects/bhyve/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c projects/bhyve/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c projects/bhyve/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c projects/bhyve/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c projects/bhyve/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c projects/bhyve/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c projects/bhyve/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c projects/bhyve/sys/dev/ath/if_ath.c projects/bhyve/sys/dev/ath/if_ath_sysctl.c projects/bhyve/sys/dev/ath/if_ath_sysctl.h projects/bhyve/sys/dev/cardbus/cardbus_cis.c projects/bhyve/sys/dev/dc/dcphy.c projects/bhyve/sys/dev/dc/if_dc.c projects/bhyve/sys/dev/dc/pnphy.c projects/bhyve/sys/dev/e1000/if_em.c projects/bhyve/sys/dev/e1000/if_igb.c projects/bhyve/sys/dev/e1000/if_igb.h projects/bhyve/sys/dev/en/if_en_pci.c projects/bhyve/sys/dev/et/if_et.c projects/bhyve/sys/dev/fdc/fdc_pccard.c projects/bhyve/sys/dev/firewire/fwohci.c projects/bhyve/sys/dev/fxp/if_fxp.c projects/bhyve/sys/dev/gem/if_gem.c projects/bhyve/sys/dev/gem/if_gemvar.h projects/bhyve/sys/dev/iicbus/if_ic.c projects/bhyve/sys/dev/mfi/mfi_cam.c projects/bhyve/sys/dev/mii/e1000phy.c projects/bhyve/sys/dev/mii/miidevs projects/bhyve/sys/dev/my/if_my.c projects/bhyve/sys/dev/pccbb/pccbb_pci.c projects/bhyve/sys/dev/pci/pci.c projects/bhyve/sys/dev/pci/pci_pci.c projects/bhyve/sys/dev/pty/pty.c projects/bhyve/sys/dev/sis/if_sis.c projects/bhyve/sys/dev/snp/snp.c projects/bhyve/sys/dev/sound/macio/i2s.c projects/bhyve/sys/dev/sound/usb/uaudio.c projects/bhyve/sys/dev/syscons/scterm-teken.c projects/bhyve/sys/dev/tdfx/tdfx_pci.c projects/bhyve/sys/dev/uart/uart_bus_pci.c projects/bhyve/sys/dev/usb/input/atp.c projects/bhyve/sys/dev/usb/input/uep.c projects/bhyve/sys/dev/usb/input/uhid.c projects/bhyve/sys/dev/usb/input/ukbd.c projects/bhyve/sys/dev/usb/input/ums.c projects/bhyve/sys/dev/usb/misc/udbp.c projects/bhyve/sys/dev/usb/misc/ufm.c projects/bhyve/sys/dev/usb/net/if_aue.c projects/bhyve/sys/dev/usb/net/if_axe.c projects/bhyve/sys/dev/usb/net/if_cdce.c projects/bhyve/sys/dev/usb/net/if_cue.c projects/bhyve/sys/dev/usb/net/if_ipheth.c projects/bhyve/sys/dev/usb/net/if_kue.c projects/bhyve/sys/dev/usb/net/if_mos.c projects/bhyve/sys/dev/usb/net/if_rue.c projects/bhyve/sys/dev/usb/net/if_udav.c projects/bhyve/sys/dev/usb/net/uhso.c projects/bhyve/sys/dev/usb/serial/u3g.c projects/bhyve/sys/dev/usb/serial/uark.c projects/bhyve/sys/dev/usb/serial/ubsa.c projects/bhyve/sys/dev/usb/serial/uchcom.c projects/bhyve/sys/dev/usb/serial/ucycom.c projects/bhyve/sys/dev/usb/serial/ufoma.c projects/bhyve/sys/dev/usb/serial/uftdi.c projects/bhyve/sys/dev/usb/serial/ugensa.c projects/bhyve/sys/dev/usb/serial/uipaq.c projects/bhyve/sys/dev/usb/serial/ulpt.c projects/bhyve/sys/dev/usb/serial/umcs.c projects/bhyve/sys/dev/usb/serial/umct.c projects/bhyve/sys/dev/usb/serial/umodem.c projects/bhyve/sys/dev/usb/serial/umoscom.c projects/bhyve/sys/dev/usb/serial/uplcom.c projects/bhyve/sys/dev/usb/serial/uslcom.c projects/bhyve/sys/dev/usb/serial/uvisor.c projects/bhyve/sys/dev/usb/serial/uvscom.c projects/bhyve/sys/dev/usb/storage/umass.c projects/bhyve/sys/dev/usb/storage/urio.c projects/bhyve/sys/dev/usb/template/usb_template.c projects/bhyve/sys/dev/usb/template/usb_template.h projects/bhyve/sys/dev/usb/template/usb_template_cdce.c projects/bhyve/sys/dev/usb/template/usb_template_msc.c projects/bhyve/sys/dev/usb/template/usb_template_mtp.c projects/bhyve/sys/dev/usb/usb_device.c projects/bhyve/sys/dev/usb/usb_hub.c projects/bhyve/sys/dev/usb/usb_ioctl.h projects/bhyve/sys/dev/usb/usb_lookup.c projects/bhyve/sys/dev/usb/usb_msctest.c projects/bhyve/sys/dev/usb/usbdi.h projects/bhyve/sys/dev/usb/wlan/if_rum.c projects/bhyve/sys/dev/usb/wlan/if_run.c projects/bhyve/sys/dev/usb/wlan/if_uath.c projects/bhyve/sys/dev/usb/wlan/if_upgt.c projects/bhyve/sys/dev/usb/wlan/if_ural.c projects/bhyve/sys/dev/usb/wlan/if_urtw.c projects/bhyve/sys/dev/usb/wlan/if_zyd.c projects/bhyve/sys/dev/vr/if_vr.c projects/bhyve/sys/dev/vr/if_vrreg.h projects/bhyve/sys/dev/xl/if_xl.c projects/bhyve/sys/fs/nfs/nfs_commonkrpc.c projects/bhyve/sys/fs/nfs/nfsproto.h projects/bhyve/sys/fs/nfsclient/nfs_clport.c projects/bhyve/sys/fs/nfsclient/nfs_clrpcops.c projects/bhyve/sys/fs/nfsserver/nfs_nfsdserv.c projects/bhyve/sys/fs/tmpfs/tmpfs_subr.c projects/bhyve/sys/geom/part/g_part_ebr.c projects/bhyve/sys/geom/part/g_part_gpt.c projects/bhyve/sys/geom/part/g_part_mbr.c projects/bhyve/sys/i386/i386/pmap.c projects/bhyve/sys/i386/i386/sys_machdep.c projects/bhyve/sys/i386/include/param.h projects/bhyve/sys/i386/include/pci_cfgreg.h projects/bhyve/sys/i386/xen/pmap.c projects/bhyve/sys/ia64/conf/NOTES projects/bhyve/sys/ia64/ia64/clock.c projects/bhyve/sys/ia64/ia64/db_machdep.c projects/bhyve/sys/ia64/ia64/interrupt.c projects/bhyve/sys/ia64/ia64/machdep.c projects/bhyve/sys/ia64/ia64/mp_machdep.c projects/bhyve/sys/ia64/ia64/pmap.c projects/bhyve/sys/ia64/include/pcpu.h projects/bhyve/sys/ia64/include/smp.h projects/bhyve/sys/kern/imgact_elf.c projects/bhyve/sys/kern/kern_clocksource.c projects/bhyve/sys/kern/kern_descrip.c projects/bhyve/sys/kern/kern_exec.c projects/bhyve/sys/kern/subr_kdb.c projects/bhyve/sys/kern/subr_smp.c projects/bhyve/sys/kern/subr_trap.c projects/bhyve/sys/kern/sys_capability.c projects/bhyve/sys/kern/tty.c projects/bhyve/sys/kern/tty_inq.c projects/bhyve/sys/kern/tty_outq.c projects/bhyve/sys/kern/tty_pts.c projects/bhyve/sys/kern/tty_ttydisc.c projects/bhyve/sys/kern/uipc_shm.c projects/bhyve/sys/kern/uipc_syscalls.c projects/bhyve/sys/kern/vfs_subr.c projects/bhyve/sys/mips/atheros/ar71xx_chip.c projects/bhyve/sys/mips/atheros/ar71xx_machdep.c projects/bhyve/sys/mips/atheros/ar71xx_ohci.c projects/bhyve/sys/mips/atheros/ar71xx_setup.c projects/bhyve/sys/mips/atheros/ar724x_chip.c projects/bhyve/sys/mips/atheros/ar91xx_chip.c projects/bhyve/sys/mips/mips/genassym.c projects/bhyve/sys/mips/mips/pmap.c projects/bhyve/sys/mips/mips/trap.c projects/bhyve/sys/mips/rmi/dev/xlr/rge.c projects/bhyve/sys/mips/rmi/fmn.c projects/bhyve/sys/mips/rmi/iodi.c projects/bhyve/sys/mips/sentry5/s5_machdep.c projects/bhyve/sys/mips/sibyte/sb_machdep.c projects/bhyve/sys/modules/Makefile projects/bhyve/sys/modules/cxgbe/if_cxgbe/Makefile projects/bhyve/sys/modules/ipdivert/Makefile projects/bhyve/sys/modules/nfscl/Makefile projects/bhyve/sys/modules/nfscommon/Makefile projects/bhyve/sys/modules/pf/Makefile projects/bhyve/sys/modules/pflog/Makefile projects/bhyve/sys/modules/usb/template/Makefile projects/bhyve/sys/net/if.c projects/bhyve/sys/net/route.c projects/bhyve/sys/net/route.h projects/bhyve/sys/net80211/ieee80211_dfs.c projects/bhyve/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c projects/bhyve/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c projects/bhyve/sys/netgraph/ng_ether.c projects/bhyve/sys/netinet/in_gif.c projects/bhyve/sys/netinet/ip_divert.c projects/bhyve/sys/netinet/ip_fw.h projects/bhyve/sys/netinet/ip_icmp.c projects/bhyve/sys/netinet/ip_var.h projects/bhyve/sys/netinet/ipfw/ip_dn_io.c projects/bhyve/sys/netinet/ipfw/ip_fw2.c projects/bhyve/sys/netinet/ipfw/ip_fw_log.c projects/bhyve/sys/netinet/ipfw/ip_fw_pfil.c projects/bhyve/sys/netinet/ipfw/ip_fw_sockopt.c projects/bhyve/sys/netinet/libalias/alias_db.c projects/bhyve/sys/netinet/libalias/alias_ftp.c projects/bhyve/sys/netinet/libalias/alias_local.h projects/bhyve/sys/netinet/libalias/libalias.3 projects/bhyve/sys/netinet/raw_ip.c projects/bhyve/sys/netinet/sctp_uio.h projects/bhyve/sys/netinet6/icmp6.c projects/bhyve/sys/netinet6/in6_gif.c projects/bhyve/sys/netipsec/ipsec_input.c projects/bhyve/sys/netipsec/ipsec_output.c projects/bhyve/sys/netipsec/xform_ipip.c projects/bhyve/sys/nfs/bootp_subr.c projects/bhyve/sys/powerpc/aim/copyinout.c projects/bhyve/sys/powerpc/aim/locore32.S projects/bhyve/sys/powerpc/aim/locore64.S projects/bhyve/sys/powerpc/aim/machdep.c projects/bhyve/sys/powerpc/aim/mmu_oea64.c projects/bhyve/sys/powerpc/aim/mp_cpudep.c projects/bhyve/sys/powerpc/aim/swtch32.S projects/bhyve/sys/powerpc/aim/swtch64.S projects/bhyve/sys/powerpc/aim/trap.c projects/bhyve/sys/powerpc/aim/trap_subr32.S projects/bhyve/sys/powerpc/aim/trap_subr64.S projects/bhyve/sys/powerpc/booke/copyinout.c projects/bhyve/sys/powerpc/booke/interrupt.c projects/bhyve/sys/powerpc/booke/trap.c projects/bhyve/sys/powerpc/include/pcpu.h projects/bhyve/sys/powerpc/ofw/ofwcall32.S projects/bhyve/sys/powerpc/ofw/rtas.c projects/bhyve/sys/powerpc/powermac/fcu.c projects/bhyve/sys/powerpc/powerpc/db_trace.c projects/bhyve/sys/powerpc/powerpc/mp_machdep.c projects/bhyve/sys/powerpc/ps3/ps3-hvcall.h projects/bhyve/sys/powerpc/ps3/ps3-hvcall.master projects/bhyve/sys/powerpc/ps3/ps3bus.c projects/bhyve/sys/powerpc/ps3/ps3disk.c projects/bhyve/sys/powerpc/ps3/ps3pic.c projects/bhyve/sys/sparc64/include/tsb.h projects/bhyve/sys/sparc64/include/vmparam.h projects/bhyve/sys/sparc64/sparc64/pmap.c projects/bhyve/sys/sparc64/sparc64/sys_machdep.c projects/bhyve/sys/sys/diskmbr.h projects/bhyve/sys/sys/filedesc.h projects/bhyve/sys/sys/mbuf.h projects/bhyve/sys/sys/param.h projects/bhyve/sys/sys/soundcard.h projects/bhyve/sys/sys/systm.h projects/bhyve/sys/teken/demo/teken_demo.c projects/bhyve/sys/teken/gensequences projects/bhyve/sys/teken/libteken/teken.3 projects/bhyve/sys/teken/teken.c projects/bhyve/sys/teken/teken_subr.h projects/bhyve/sys/ufs/ffs/ffs_inode.c projects/bhyve/sys/ufs/ffs/ffs_softdep.c projects/bhyve/sys/vm/vm_fault.c projects/bhyve/sys/vm/vm_map.c projects/bhyve/sys/vm/vm_object.c projects/bhyve/sys/vm/vm_object.h projects/bhyve/sys/vm/vm_page.c projects/bhyve/sys/vm/vnode_pager.c projects/bhyve/sys/x86/x86/tsc.c projects/bhyve/usr.bin/calendar/calendars/calendar.freebsd projects/bhyve/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all projects/bhyve/usr.bin/cmp/regular.c projects/bhyve/usr.bin/cmp/special.c projects/bhyve/usr.bin/finger/net.c projects/bhyve/usr.bin/ktrace/ktrace.c projects/bhyve/usr.bin/lastcomm/lastcomm.c projects/bhyve/usr.bin/lastcomm/readrec.c projects/bhyve/usr.bin/ncplogin/ncplogin.c projects/bhyve/usr.bin/quota/quota.c projects/bhyve/usr.bin/systat/netstat.c projects/bhyve/usr.bin/tar/util.c projects/bhyve/usr.bin/tar/write.c projects/bhyve/usr.bin/tftp/main.c projects/bhyve/usr.bin/tftp/tftp.1 projects/bhyve/usr.bin/vmstat/vmstat.c projects/bhyve/usr.sbin/ancontrol/ancontrol.c projects/bhyve/usr.sbin/ftp-proxy/ftp-proxy/Makefile projects/bhyve/usr.sbin/ifmcstat/ifmcstat.c projects/bhyve/usr.sbin/mtest/mtest.c projects/bhyve/usr.sbin/nfsd/nfsd.c projects/bhyve/usr.sbin/nfsuserd/nfsuserd.c projects/bhyve/usr.sbin/pmcstat/pmcpl_calltree.c projects/bhyve/usr.sbin/ppp/nat_cmd.c projects/bhyve/usr.sbin/rpc.yppasswdd/yppasswdd_main.c projects/bhyve/usr.sbin/rpc.ypupdated/update.c projects/bhyve/usr.sbin/rpc.ypupdated/ypupdated_main.c projects/bhyve/usr.sbin/rpc.ypupdated/ypupdated_server.c projects/bhyve/usr.sbin/sysinstall/modules.c projects/bhyve/usr.sbin/wpa/ndis_events/ndis_events.c projects/bhyve/usr.sbin/wpa/wpa_supplicant/Packet32.c Directory Properties: projects/bhyve/ (props changed) projects/bhyve/cddl/contrib/opensolaris/ (props changed) projects/bhyve/contrib/bind9/ (props changed) projects/bhyve/contrib/binutils/ (props changed) projects/bhyve/contrib/bzip2/ (props changed) projects/bhyve/contrib/compiler-rt/ (props changed) projects/bhyve/contrib/dialog/ (props changed) projects/bhyve/contrib/ee/ (props changed) projects/bhyve/contrib/expat/ (props changed) projects/bhyve/contrib/file/ (props changed) projects/bhyve/contrib/gcc/ (props changed) projects/bhyve/contrib/gdb/ (props changed) projects/bhyve/contrib/gdtoa/ (props changed) projects/bhyve/contrib/gnu-sort/ (props changed) projects/bhyve/contrib/groff/ (props changed) projects/bhyve/contrib/less/ (props changed) projects/bhyve/contrib/libpcap/ (props changed) projects/bhyve/contrib/libstdc++/ (props changed) projects/bhyve/contrib/llvm/ (props changed) projects/bhyve/contrib/llvm/tools/clang/ (props changed) projects/bhyve/contrib/ncurses/ (props changed) projects/bhyve/contrib/netcat/ (props changed) projects/bhyve/contrib/ntp/ (props changed) projects/bhyve/contrib/one-true-awk/ (props changed) projects/bhyve/contrib/openbsm/ (props changed) projects/bhyve/contrib/openpam/ (props changed) projects/bhyve/contrib/pf/ (props changed) projects/bhyve/contrib/sendmail/ (props changed) projects/bhyve/contrib/tcpdump/ (props changed) projects/bhyve/contrib/tcsh/ (props changed) projects/bhyve/contrib/tnftp/ (props changed) projects/bhyve/contrib/top/ (props changed) projects/bhyve/contrib/top/install-sh (props changed) projects/bhyve/contrib/tzcode/stdtime/ (props changed) projects/bhyve/contrib/tzcode/zic/ (props changed) projects/bhyve/contrib/tzdata/ (props changed) projects/bhyve/contrib/wpa/ (props changed) projects/bhyve/contrib/xz/ (props changed) projects/bhyve/crypto/openssh/ (props changed) projects/bhyve/crypto/openssl/ (props changed) projects/bhyve/gnu/lib/ (props changed) projects/bhyve/gnu/usr.bin/binutils/ (props changed) projects/bhyve/gnu/usr.bin/cc/cc_tools/ (props changed) projects/bhyve/gnu/usr.bin/gdb/ (props changed) projects/bhyve/lib/libc/ (props changed) projects/bhyve/lib/libc/stdtime/ (props changed) projects/bhyve/lib/libutil/ (props changed) projects/bhyve/lib/libz/ (props changed) projects/bhyve/sbin/ (props changed) projects/bhyve/sbin/ipfw/ (props changed) projects/bhyve/share/mk/bsd.arch.inc.mk (props changed) projects/bhyve/share/zoneinfo/ (props changed) projects/bhyve/sys/ (props changed) projects/bhyve/sys/amd64/include/xen/ (props changed) projects/bhyve/sys/boot/ (props changed) projects/bhyve/sys/boot/i386/efi/ (props changed) projects/bhyve/sys/boot/ia64/efi/ (props changed) projects/bhyve/sys/boot/ia64/ski/ (props changed) projects/bhyve/sys/boot/powerpc/boot1.chrp/ (props changed) projects/bhyve/sys/boot/powerpc/ofw/ (props changed) projects/bhyve/sys/cddl/contrib/opensolaris/ (props changed) projects/bhyve/sys/conf/ (props changed) projects/bhyve/sys/contrib/dev/acpica/ (props changed) projects/bhyve/sys/contrib/octeon-sdk/ (props changed) projects/bhyve/sys/contrib/pf/ (props changed) projects/bhyve/sys/contrib/x86emu/ (props changed) projects/bhyve/usr.bin/calendar/ (props changed) projects/bhyve/usr.bin/csup/ (props changed) projects/bhyve/usr.bin/procstat/ (props changed) projects/bhyve/usr.sbin/ndiscvt/ (props changed) projects/bhyve/usr.sbin/zic/ (props changed) Modified: projects/bhyve/UPDATING ============================================================================== --- projects/bhyve/UPDATING Thu Jun 30 16:56:55 2011 (r223697) +++ projects/bhyve/UPDATING Thu Jun 30 17:37:42 2011 (r223698) @@ -22,6 +22,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9. machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20110628: + The packet filter (pf) code has been updated to OpenBSD 4.5. + You need to update userland tools to be in sync with kernel. + This update breaks backward compatibility with earlier pfsync(4) + versions. Care must be taken when updating redundant firewall setups. + 20110608: The following sysctls and tunables are retired on x86 platforms: machdep.hlt_cpus Modified: projects/bhyve/bin/rcp/rcp.c ============================================================================== --- projects/bhyve/bin/rcp/rcp.c Thu Jun 30 16:56:55 2011 (r223697) +++ projects/bhyve/bin/rcp/rcp.c Thu Jun 30 17:37:42 2011 (r223698) @@ -71,7 +71,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include "extern.h" Modified: projects/bhyve/bin/realpath/realpath.1 ============================================================================== --- projects/bhyve/bin/realpath/realpath.1 Thu Jun 30 16:56:55 2011 (r223697) +++ projects/bhyve/bin/realpath/realpath.1 Thu Jun 30 17:37:42 2011 (r223698) @@ -33,7 +33,7 @@ .\" From: src/bin/pwd/pwd.1,v 1.11 2000/11/20 11:39:39 ru Exp .\" $FreeBSD$ .\" -.Dd November 24, 2000 +.Dd June 21, 2011 .Dt REALPATH 1 .Os .Sh NAME @@ -42,8 +42,7 @@ .Sh SYNOPSIS .Nm .Op Fl q -.Ar path -.Op Ar ... +.Op Ar path ... .Sh DESCRIPTION The .Nm @@ -57,6 +56,11 @@ and .Pa /../ in .Ar path . +If +.Ar path +is absent, the current working directory +.Pq Sq Pa .\& +is assumed. .Pp If .Fl q Modified: projects/bhyve/bin/realpath/realpath.c ============================================================================== --- projects/bhyve/bin/realpath/realpath.c Thu Jun 30 16:56:55 2011 (r223697) +++ projects/bhyve/bin/realpath/realpath.c Thu Jun 30 17:37:42 2011 (r223698) @@ -44,7 +44,8 @@ main(int argc, char *argv[]) { char buf[PATH_MAX]; char *p; - int ch, i, qflag, rval; + const char *path; + int ch, qflag, rval; qflag = 0; while ((ch = getopt(argc, argv, "q")) != -1) { @@ -59,17 +60,16 @@ main(int argc, char *argv[]) } argc -= optind; argv += optind; - if (argc < 1) - usage(); + path = *argv != NULL ? *argv++ : "."; rval = 0; - for (i = 0; i < argc; i++) { - if ((p = realpath(argv[i], buf)) == NULL) { + do { + if ((p = realpath(path, buf)) == NULL) { if (!qflag) - warn("%s", argv[i]); + warn("%s", path); rval = 1; } else (void)printf("%s\n", p); - } + } while ((path = *argv++) != NULL); exit(rval); } @@ -77,6 +77,6 @@ static void usage(void) { - (void)fprintf(stderr, "usage: realpath [-q] path [...]\n"); + (void)fprintf(stderr, "usage: realpath [-q] [path ...]\n"); exit(1); } Modified: projects/bhyve/bin/sh/arith_yacc.c ============================================================================== --- projects/bhyve/bin/sh/arith_yacc.c Thu Jun 30 16:56:55 2011 (r223697) +++ projects/bhyve/bin/sh/arith_yacc.c Thu Jun 30 17:37:42 2011 (r223698) @@ -35,7 +35,7 @@ #include __FBSDID("$FreeBSD$"); -#include +#include #include #include #include Modified: projects/bhyve/bin/sh/mkinit.c ============================================================================== --- projects/bhyve/bin/sh/mkinit.c Thu Jun 30 16:56:55 2011 (r223697) +++ projects/bhyve/bin/sh/mkinit.c Thu Jun 30 17:37:42 2011 (r223698) @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); */ -#include #include #include #include Modified: projects/bhyve/bin/sh/sh.1 ============================================================================== --- projects/bhyve/bin/sh/sh.1 Thu Jun 30 16:56:55 2011 (r223697) +++ projects/bhyve/bin/sh/sh.1 Thu Jun 30 17:37:42 2011 (r223698) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd June 18, 2011 +.Dd June 24, 2011 .Dt SH 1 .Os .Sh NAME @@ -994,11 +994,22 @@ described later), separated by .Ql \&| characters. +Tilde expansion, parameter expansion, command substitution, +arithmetic expansion and quote removal are applied to the word. +Then, each pattern is expanded in turn using tilde expansion, +parameter expansion, command substitution and arithmetic expansion and +the expanded form of the word is checked against it. +If a match is found, the corresponding list is executed. If the selected list is terminated by the control operator .Ql ;& instead of .Ql ;; , -execution continues with the next list. +execution continues with the next list, +continuing until a list terminated with +.Ql ;; +or the end of the +.Ic case +command. The exit code of the .Ic case command is the exit code of the last command executed in the list or @@ -1618,15 +1629,15 @@ There are two restrictions on this: firs a string containing a slash, and second, a pattern cannot match a string starting with a period unless the first character of the pattern is a period. -The next section describes the patterns used for both -Pathname Expansion and the +The next section describes the patterns used for +Pathname Expansion, +the four varieties of parameter expansion for substring processing and the .Ic case command. .Ss Shell Patterns A pattern consists of normal characters, which match themselves, and meta-characters. The meta-characters are -.Ql \&! , .Ql * , .Ql \&? , and @@ -1656,7 +1667,7 @@ matches a .Ql \&[ rather than introducing a character class. A character class matches any of the characters between the square brackets. -A range of characters may be specified using a minus sign. +A locale-dependent range of characters may be specified using a minus sign. A named class of characters (see .Xr wctype 3 ) may be specified by surrounding the name with @@ -1669,12 +1680,17 @@ is a shell pattern that matches a single The character class may be complemented by making an exclamation point .Pq Ql !\& the first character of the character class. +A caret +.Pq Ql ^ +has the same effect but is non-standard. .Pp To include a .Ql \&] in a character class, make it the first character listed (after the -.Ql \&! , +.Ql \&! +or +.Ql ^ , if any). To include a .Ql - , Modified: projects/bhyve/cddl/contrib/opensolaris/cmd/zfs/zfs.8 ============================================================================== --- projects/bhyve/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Thu Jun 30 16:56:55 2011 (r223697) +++ projects/bhyve/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Thu Jun 30 17:37:42 2011 (r223698) @@ -6,6 +6,7 @@ .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. .\" See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner] +.\" Copyright 2011 by Delphix. All rights reserved. .TH zfs 1M "24 Sep 2009" "SunOS 5.11" "System Administration Commands" .SH NAME zfs \- configures ZFS file systems @@ -389,7 +390,7 @@ This property can also be referred to by .ad .sp .6 .RS 4n -The compression ratio achieved for this dataset, expressed as a multiplier. Compression can be turned on by running: \fBzfs set compression=on \fIdataset\fR\fR. The default value is \fBoff\fR. +For non-snapshots, the compression ratio achieved for the \fBused\fR space of this dataset, expressed as a multiplier. The \fBused\fR property includes descendant datasets, and, for clones, does not include the space shared with the origin snapshot. For snapshots, the \fBcompressratio\fR is the same as the \fBrefcompressratio\fR property. Compression can be turned on by running: \fBzfs set compression=on \fIdataset\fR\fR. The default value is \fBoff\fR. .RE .sp @@ -453,6 +454,17 @@ This property can also be referred to by .ne 2 .mk .na +\fB\fBrefcompressratio\fR\fR +.ad +.sp .6 +.RS 4n +The compression ratio achieved for the \fBreferenced\fR space of this dataset, expressed as a multiplier. See also the \fBcompressratio\fR property. +.RE + +.sp +.ne 2 +.mk +.na \fB\fBtype\fR\fR .ad .sp .6 @@ -1278,7 +1290,7 @@ Recursively destroy all dependents, incl Force an unmount of any file systems using the \fBunmount -f\fR command. This option has no effect on non-file systems or unmounted file systems. .RE -Extreme care should be taken when applying either the \fB-r\fR or the \fB-f\fR options, as they can destroy large portions of a pool and cause unexpected behavior for mounted file systems in use. +Extreme care should be taken when applying either the \fB-r\fR or the \fB-R\fR options, as they can destroy large portions of a pool and cause unexpected behavior for mounted file systems in use. .RE .sp Modified: projects/bhyve/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- projects/bhyve/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Thu Jun 30 16:56:55 2011 (r223697) +++ projects/bhyve/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Thu Jun 30 17:37:42 2011 (r223698) @@ -21,7 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2010 Nexenta Systems, Inc. All rights reserved. + * Copyright 2011 Nexenta Systems, Inc. All rights reserved. */ #include @@ -1292,7 +1292,7 @@ static int zfs_do_get(int argc, char **argv) { zprop_get_cbdata_t cb = { 0 }; - int i, c, flags = 0; + int i, c, flags = ZFS_ITER_ARGS_CAN_BE_PATHS; char *value, *fields; int ret; int limit = 0; Modified: projects/bhyve/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c ============================================================================== --- projects/bhyve/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Thu Jun 30 16:56:55 2011 (r223697) +++ projects/bhyve/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Thu Jun 30 17:37:42 2011 (r223698) @@ -22,6 +22,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2010 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2011 by Delphix. All rights reserved. */ #include @@ -2038,6 +2039,7 @@ zfs_prop_get(zfs_handle_t *zhp, zfs_prop } break; + case ZFS_PROP_REFRATIO: case ZFS_PROP_COMPRESSRATIO: if (get_numeric_property(zhp, prop, src, &source, &val) != 0) return (-1); Modified: projects/bhyve/contrib/binutils/gas/config/tc-arm.c ============================================================================== --- projects/bhyve/contrib/binutils/gas/config/tc-arm.c Thu Jun 30 16:56:55 2011 (r223697) +++ projects/bhyve/contrib/binutils/gas/config/tc-arm.c Thu Jun 30 17:37:42 2011 (r223698) @@ -9974,6 +9974,13 @@ do_t_rbit (void) } static void +do_t_rd_rm (void) +{ + inst.instruction |= inst.operands[0].reg << 8; + inst.instruction |= inst.operands[1].reg; +} + +static void do_t_rev (void) { if (inst.operands[0].reg <= 7 && inst.operands[1].reg <= 7 @@ -14901,6 +14908,9 @@ static const struct asm_opcode insns[] = TCE(rsb, 0600000, ebc00000, 3, (RR, oRR, SH), arit, t_rsb), TC3(rsbs, 0700000, ebd00000, 3, (RR, oRR, SH), arit, t_rsb), + TCE(rrx, 1a00060, ea4f0030, 2, (RR, RR), rd_rm, t_rd_rm), + TCE(rrxs, 1b00060, ea5f0030, 2, (RR, RR), rd_rm, t_rd_rm), + #undef THUMB_VARIANT #define THUMB_VARIANT &arm_ext_v6 TCE(cpy, 1a00000, 4600, 2, (RR, RR), rd_rm, t_cpy), Modified: projects/bhyve/contrib/libpcap/bpf/net/bpf_filter.c ============================================================================== --- projects/bhyve/contrib/libpcap/bpf/net/bpf_filter.c Thu Jun 30 16:56:55 2011 (r223697) +++ projects/bhyve/contrib/libpcap/bpf/net/bpf_filter.c Thu Jun 30 17:37:42 2011 (r223698) @@ -405,7 +405,18 @@ bpf_filter(pc, p, wirelen, buflen) continue; case BPF_JMP|BPF_JA: +#if defined(KERNEL) || defined(_KERNEL) + /* + * No backward jumps allowed. + */ pc += pc->k; +#else + /* + * XXX - we currently implement "ip6 protochain" + * with backward jumps, so sign-extend pc->k. + */ + pc += (bpf_int32)pc->k; +#endif continue; case BPF_JMP|BPF_JGT|BPF_K: Modified: projects/bhyve/contrib/ntp/ntpd/ntp_config.c ============================================================================== --- projects/bhyve/contrib/ntp/ntpd/ntp_config.c Thu Jun 30 16:56:55 2011 (r223697) +++ projects/bhyve/contrib/ntp/ntpd/ntp_config.c Thu Jun 30 17:37:42 2011 (r223698) @@ -414,7 +414,7 @@ enum gnn_type { static int getnetnum P((const char *, struct sockaddr_storage *, int, enum gnn_type)); static void save_resolve P((char *, int, int, int, int, u_int, int, - keyid_t, u_char *)); + keyid_t, u_char *, u_char)); static void do_resolve_internal P((void)); static void abort_resolve P((void)); #if !defined(VMS) && !defined(SYS_WINNT) @@ -870,9 +870,9 @@ getconfig( stoa(&peeraddr)); } } else if (errflg == -1) { - save_resolve(tokens[1], hmode, peerversion, + save_resolve(tokens[istart - 1], hmode, peerversion, minpoll, maxpoll, peerflags, ttl, - peerkey, peerkeystr); + peerkey, peerkeystr, peeraddr.ss_family); } break; @@ -2325,7 +2325,8 @@ save_resolve( u_int flags, int ttl, keyid_t keyid, - u_char *keystr + u_char *keystr, + u_char peeraf ) { #ifndef SYS_VXWORKS @@ -2365,11 +2366,11 @@ save_resolve( } #endif - (void)fprintf(res_fp, "%s %d %d %d %d %d %d %u %s\n", name, + (void)fprintf(res_fp, "%s %u %d %d %d %d %d %d %u %s\n", name, peeraf, mode, version, minpoll, maxpoll, flags, ttl, keyid, keystr); #ifdef DEBUG if (debug > 1) - printf("config: %s %d %d %d %d %x %d %u %s\n", name, mode, + printf("config: %s %u %d %d %d %d %x %d %u %s\n", name, peeraf, mode, version, minpoll, maxpoll, flags, ttl, keyid, keystr); #endif Modified: projects/bhyve/contrib/ntp/ntpd/ntp_intres.c ============================================================================== --- projects/bhyve/contrib/ntp/ntpd/ntp_intres.c Thu Jun 30 16:56:55 2011 (r223697) +++ projects/bhyve/contrib/ntp/ntpd/ntp_intres.c Thu Jun 30 17:37:42 2011 (r223698) @@ -29,6 +29,7 @@ #include #include +#include #include /**/ @@ -111,15 +112,16 @@ static int resolve_value; /* next value * is supposed to consist of entries in the following order */ #define TOK_HOSTNAME 0 -#define TOK_HMODE 1 -#define TOK_VERSION 2 -#define TOK_MINPOLL 3 -#define TOK_MAXPOLL 4 -#define TOK_FLAGS 5 -#define TOK_TTL 6 -#define TOK_KEYID 7 -#define TOK_KEYSTR 8 -#define NUMTOK 9 +#define TOK_PEERAF 1 +#define TOK_HMODE 2 +#define TOK_VERSION 3 +#define TOK_MINPOLL 4 +#define TOK_MAXPOLL 5 +#define TOK_FLAGS 6 +#define TOK_TTL 7 +#define TOK_KEYID 8 +#define TOK_KEYSTR 9 +#define NUMTOK 10 #define MAXLINESIZE 512 @@ -140,7 +142,7 @@ char *req_file; /* name of the file wit static void checkparent P((void)); static void removeentry P((struct conf_entry *)); static void addentry P((char *, int, int, int, int, u_int, - int, keyid_t, char *)); + int, keyid_t, char *, u_char)); static int findhostaddr P((struct conf_entry *)); static void openntp P((void)); static int request P((struct conf_peer *)); @@ -397,7 +399,8 @@ addentry( u_int flags, int ttl, keyid_t keyid, - char *keystr + char *keystr, + u_char peeraf ) { register char *cp; @@ -407,7 +410,7 @@ addentry( #ifdef DEBUG if (debug > 1) msyslog(LOG_INFO, - "intres: <%s> %d %d %d %d %x %d %x %s\n", name, + "intres: <%s> %u %d %d %d %d %x %d %x %s\n", name, peeraf, mode, version, minpoll, maxpoll, flags, ttl, keyid, keystr); #endif @@ -422,6 +425,7 @@ addentry( ce->ce_peeraddr6 = in6addr_any; #endif ANYSOCK(&ce->peer_store); + ce->peer_store.ss_family = peeraf; /* Save AF for getaddrinfo hints. */ ce->ce_hmode = (u_char)mode; ce->ce_version = (u_char)version; ce->ce_minpoll = (u_char)minpoll; @@ -482,7 +486,8 @@ findhostaddr( entry->ce_name)); memset(&hints, 0, sizeof(hints)); - hints.ai_family = AF_UNSPEC; + hints.ai_family = entry->peer_store.ss_family; + hints.ai_socktype = SOCK_DGRAM; /* * If the IPv6 stack is not available look only for IPv4 addresses */ @@ -1051,6 +1056,13 @@ readconf( } } + if (intval[TOK_PEERAF] != AF_UNSPEC && intval[TOK_PEERAF] != + AF_INET && intval[TOK_PEERAF] != AF_INET6) { + msyslog(LOG_ERR, "invalid peer address family (%u) in " + "file %s", intval[TOK_PEERAF], name); + exit(1); + } + if (intval[TOK_HMODE] != MODE_ACTIVE && intval[TOK_HMODE] != MODE_CLIENT && intval[TOK_HMODE] != MODE_BROADCAST) { @@ -1107,7 +1119,7 @@ readconf( addentry(token[TOK_HOSTNAME], (int)intval[TOK_HMODE], (int)intval[TOK_VERSION], (int)intval[TOK_MINPOLL], (int)intval[TOK_MAXPOLL], flags, (int)intval[TOK_TTL], - intval[TOK_KEYID], token[TOK_KEYSTR]); + intval[TOK_KEYID], token[TOK_KEYSTR], (u_char)intval[TOK_PEERAF]); } } @@ -1129,6 +1141,9 @@ doconfigure( dores ? "with" : "without" ); #endif + if (dores) /* Reload /etc/resolv.conf - bug 1226 */ + res_init(); + ce = confentries; while (ce != NULL) { #ifdef DEBUG Modified: projects/bhyve/contrib/ntp/ntpd/ntp_io.c ============================================================================== --- projects/bhyve/contrib/ntp/ntpd/ntp_io.c Thu Jun 30 16:56:55 2011 (r223697) +++ projects/bhyve/contrib/ntp/ntpd/ntp_io.c Thu Jun 30 17:37:42 2011 (r223698) @@ -2716,14 +2716,14 @@ sendpkt( for (slot = ERRORCACHESIZE; --slot >= 0; ) if(dest->ss_family == AF_INET) { - if (badaddrs[slot].port == ((struct sockaddr_in*)dest)->sin_port && + if (badaddrs[slot].port == SRCPORT(dest) && badaddrs[slot].addr.s_addr == ((struct sockaddr_in*)dest)->sin_addr.s_addr) break; } #ifdef INCLUDE_IPV6_SUPPORT else if (dest->ss_family == AF_INET6) { - if (badaddrs6[slot].port == ((struct sockaddr_in6*)dest)->sin6_port && - badaddrs6[slot].addr.s6_addr == ((struct sockaddr_in6*)dest)->sin6_addr.s6_addr) + if (badaddrs6[slot].port == SRCPORT(dest) && + !memcmp(&badaddrs6[slot].addr, &((struct sockaddr_in6*)dest)->sin6_addr, sizeof(struct in6_addr))) break; } #endif /* INCLUDE_IPV6_SUPPORT */ Modified: projects/bhyve/contrib/pf/authpf/authpf.8 ============================================================================== --- projects/bhyve/contrib/pf/authpf/authpf.8 Thu Jun 30 16:56:55 2011 (r223697) +++ projects/bhyve/contrib/pf/authpf/authpf.8 Thu Jun 30 17:37:42 2011 (r223698) @@ -1,5 +1,5 @@ .\" $FreeBSD$ -.\" $OpenBSD: authpf.8,v 1.43 2007/02/24 17:21:04 beck Exp $ +.\" $OpenBSD: authpf.8,v 1.47 2009/01/06 03:11:50 mcbride Exp $ .\" .\" Copyright (c) 1998-2007 Bob Beck (beck@openbsd.org>. All rights reserved. .\" @@ -15,14 +15,16 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd March 28, 2006 +.Dd January 6 2009 .Dt AUTHPF 8 .Os .Sh NAME -.Nm authpf +.Nm authpf , +.Nm authpf-noip .Nd authenticating gateway user shell .Sh SYNOPSIS .Nm authpf +.Nm authpf-noip .Sh DESCRIPTION .Nm is a user shell for authenticating gateways. @@ -31,47 +33,63 @@ It is used to change rules when a user authenticates and starts a session with .Xr sshd 8 and to undo these changes when the user's session exits. -It is designed for changing filter and translation rules for an individual -source IP address as long as a user maintains an active -.Xr ssh 1 -session. Typical use would be for a gateway that authenticates users before allowing them Internet use, or a gateway that allows different users into different places. +Combined with properly set up filter rules and secure switches, .Nm -logs the successful start and end of a session to -.Xr syslogd 8 . -This, combined with properly set up filter rules and secure switches, can be used to ensure users are held accountable for their network traffic. -.Pp -.Nm -can add filter and translation rules using the syntax described in -.Xr pf.conf 5 . -.Nm -requires that the +It is meant to be used with users who can connect via +.Xr ssh 1 +only, and requires the .Xr pf 4 -system be enabled and a -.Xr fdescfs 5 -file system be mounted at -.Pa /dev/fd -before use. +subsystem to be enabled. +.Pp +.Nm authpf-noip +is a user shell +which allows multiple connections to take +place from the same IP address. +It is useful primarily in cases where connections are tunneled via +the gateway system, and can be directly associated with the user name. +It cannot ensure accountability when +classifying connections by IP address; +in this case the client's IP address +is not provided to the packet filter via the +.Ar client_ip +macro or the +.Ar authpf_users +table. +Additionally, states associated with the client IP address +are not purged when the session is ended. +.Pp +To use either .Nm -can also maintain the list of IP address of connected users -in the "authpf_users" -.Pa table . +or +.Nm authpf-noip , +the user's shell needs to be set to +.Pa /usr/sbin/authpf +or +.Pa /usr/sbin/authpf-noip . .Pp .Nm -is meant to be used with users who can connect via +uses the +.Xr pf.conf 5 +syntax to change filter and translation rules for an individual +user or client IP address as long as a user maintains an active .Xr ssh 1 -only. -On startup, +session, and logs the successful start and end of a session to +.Xr syslogd 8 . .Nm retrieves the client's connecting IP address via the .Ev SSH_CLIENT environment variable and, after performing additional access checks, reads a template file to determine what filter and translation rules -(if any) to add. -On session exit the same rules that were added at startup are removed. +(if any) to add, and +maintains the list of IP addresses of connected users in the +.Ar authpf_users +table. +On session exit the same rules and table entries that were added at startup +are removed, and all states associated with the client's IP address are purged. .Pp Each .Nm @@ -185,6 +203,9 @@ It is also possible to configure to only allow specific users access. This is done by listing their login names, one per line, in .Pa /etc/authpf/authpf.allow . +A group of users can also be indicated by prepending "%" to the group name, +and all members of a login class can be indicated by prepending "@" to the +login class name. If "*" is found on a line, then all usernames match. If .Nm @@ -297,7 +318,8 @@ They have a wireless network which they would like to protect from unauthorized use. To accomplish this, they create the file .Pa /etc/authpf/authpf.allow -which lists their login ids, one per line. +which lists their login ids, group prepended with "%", or login class +prepended with "@", one per line. At this point, even if eve could authenticate to .Xr sshd 8 , she would not be allowed to use the gateway. @@ -501,6 +523,31 @@ table persist anchor "authpf/*" from rdr-anchor "authpf/*" from .Ed +.Pp +.Sy Tunneled users +\- normally +.Nm +allows only one session per client IP address. +However in some cases, such as when connections are tunneled via +.Xr ssh 1 +or +.Xr ipsec 4 , +the connections can be authorized based on the userid of the user instead of +the client IP address. +In this case it is appropriate to use +.Nm authpf-noip +to allow multiple users behind a NAT gateway to connect. +In the +.Pa /etc/authpf/authpf.rules +example below, the remote user could tunnel a remote desktop session to their +workstation: +.Bd -literal +internal_if="bge0" +workstation_ip="10.2.3.4" + +pass out on $internal_if from (self) to $workstation_ip port 3389 \e + user $user_id +.Ed .Sh FILES .Bl -tag -width "/etc/authpf/authpf.conf" -compact .It Pa /etc/authpf/authpf.conf @@ -512,7 +559,6 @@ rdr-anchor "authpf/*" from __FBSDID("$FreeBSD$"); -#include +#include #include #include #include @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #endif #include #include +#include #include #include #include @@ -48,10 +49,11 @@ __FBSDID("$FreeBSD$"); #include "pathnames.h" static int read_config(FILE *); -static void print_message(char *); -static int allowed_luser(char *); -static int check_luser(char *, char *); +static void print_message(const char *); +static int allowed_luser(struct passwd *); +static int check_luser(const char *, char *); static int remove_stale_rulesets(void); +static int recursive_ruleset_purge(char *, char *); static int change_filter(int, const char *, const char *); static int change_table(int, const char *); static void authpf_kill_states(void); @@ -60,8 +62,10 @@ int dev; /* pf device */ char anchorname[PF_ANCHOR_NAME_SIZE] = "authpf"; char rulesetname[MAXPATHLEN - PF_ANCHOR_NAME_SIZE - 2]; char tablename[PF_TABLE_NAME_SIZE] = "authpf_users"; +int user_ip = 1; /* controls whether $user_ip is set */ FILE *pidfp; +int pidfd = -1; char luser[MAXLOGNAME]; /* username */ char ipsrc[256]; /* ip as a string */ char pidfile[MAXPATHLEN]; /* we save pid in this file. */ @@ -75,6 +79,7 @@ static __dead2 void do_death(int); #else static __dead void do_death(int); #endif +extern char *__progname; /* program name */ /* * User shell for authenticating gateways. Sole purpose is to allow @@ -83,21 +88,24 @@ static __dead void do_death(int); * up. Meant to be used only from ssh(1) connections. */ int -main(int argc, char *argv[]) +main(void) { - int lockcnt = 0, n, pidfd; + int lockcnt = 0, n; FILE *config; struct in6_addr ina; struct passwd *pw; char *cp; gid_t gid; uid_t uid; - char *shell; + const char *shell; login_cap_t *lc; + if (strcmp(__progname, "-authpf-noip") == 0) + user_ip = 0; + config = fopen(PATH_CONFFILE, "r"); if (config == NULL) { - syslog(LOG_ERR, "can not open %s (%m)", PATH_CONFFILE); + syslog(LOG_ERR, "cannot open %s (%m)", PATH_CONFFILE); exit(1); } @@ -142,23 +150,34 @@ main(int argc, char *argv[]) } if ((lc = login_getclass(pw->pw_class)) != NULL) - shell = (char *)login_getcapstr(lc, "shell", pw->pw_shell, + shell = login_getcapstr(lc, "shell", pw->pw_shell, pw->pw_shell); else shell = pw->pw_shell; +#ifndef __FreeBSD__ login_close(lc); +#endif - if (strcmp(shell, PATH_AUTHPF_SHELL)) { + if (strcmp(shell, PATH_AUTHPF_SHELL) && + strcmp(shell, PATH_AUTHPF_SHELL_NOIP)) { syslog(LOG_ERR, "wrong shell for user %s, uid %u", pw->pw_name, pw->pw_uid); +#ifdef __FreeBSD__ + login_close(lc); +#else if (shell != pw->pw_shell) free(shell); +#endif goto die; } +#ifdef __FreeBSD__ + login_close(lc); +#else if (shell != pw->pw_shell) free(shell); +#endif /* * Paranoia, but this data _does_ come from outside authpf, and @@ -181,13 +200,22 @@ main(int argc, char *argv[]) } - /* Make our entry in /var/authpf as /var/authpf/ipaddr */ - n = snprintf(pidfile, sizeof(pidfile), "%s/%s", PATH_PIDFILE, ipsrc); + /* Make our entry in /var/authpf as ipaddr or username */ + n = snprintf(pidfile, sizeof(pidfile), "%s/%s", + PATH_PIDFILE, user_ip ? ipsrc : luser); if (n < 0 || (u_int)n >= sizeof(pidfile)) { syslog(LOG_ERR, "path to pidfile too long"); goto die; } + signal(SIGTERM, need_death); + signal(SIGINT, need_death); + signal(SIGALRM, need_death); + signal(SIGPIPE, need_death); + signal(SIGHUP, need_death); + signal(SIGQUIT, need_death); + signal(SIGTSTP, need_death); + /* * If someone else is already using this ip, then this person * wants to switch users - so kill the old process and exit @@ -241,15 +269,17 @@ main(int argc, char *argv[]) } /* - * we try to kill the previous process and acquire the lock + * We try to kill the previous process and acquire the lock * for 10 seconds, trying once a second. if we can't after - * 10 attempts we log an error and give up + * 10 attempts we log an error and give up. */ - if (++lockcnt > 10) { - syslog(LOG_ERR, "cannot kill previous authpf (pid %d)", - otherpid); + if (want_death || ++lockcnt > 10) { + if (!want_death) + syslog(LOG_ERR, "cannot kill previous authpf (pid %d)", + otherpid); fclose(pidfp); pidfp = NULL; + pidfd = -1; goto dogdeath; } sleep(1); @@ -260,6 +290,7 @@ main(int argc, char *argv[]) */ fclose(pidfp); pidfp = NULL; + pidfd = -1; } while (1); /* whack the group list */ @@ -277,7 +308,7 @@ main(int argc, char *argv[]) } openlog("authpf", LOG_PID | LOG_NDELAY, LOG_DAEMON); - if (!check_luser(PATH_BAN_DIR, luser) || !allowed_luser(luser)) { + if (!check_luser(PATH_BAN_DIR, luser) || !allowed_luser(pw)) { syslog(LOG_INFO, "user %s prohibited", luser); do_death(0); } @@ -302,19 +333,12 @@ main(int argc, char *argv[]) printf("Unable to modify filters\r\n"); do_death(0); } - if (change_table(1, ipsrc) == -1) { + if (user_ip && change_table(1, ipsrc) == -1) { printf("Unable to modify table\r\n"); change_filter(0, luser, ipsrc); do_death(0); } - signal(SIGTERM, need_death); - signal(SIGINT, need_death); - signal(SIGALRM, need_death); - signal(SIGPIPE, need_death); - signal(SIGHUP, need_death); - signal(SIGQUIT, need_death); - signal(SIGTSTP, need_death); while (1) { printf("\r\nHello %s. ", luser); printf("You are authenticated from host \"%s\"\r\n", ipsrc); @@ -337,8 +361,6 @@ dogdeath: sleep(180); /* them lusers read reaaaaal slow */ die: do_death(0); - - /* NOTREACHED */ } /* @@ -361,6 +383,8 @@ read_config(FILE *f) } i++; len = strlen(buf); + if (len == 0) + continue; if (buf[len - 1] != '\n' && !feof(f)) { syslog(LOG_ERR, "line %d too long in %s", i, PATH_CONFFILE); @@ -413,7 +437,7 @@ parse_error: * they've been bad or we're unavailable. */ static void -print_message(char *filename) +print_message(const char *filename) { char buf[1024]; FILE *f; @@ -436,6 +460,7 @@ print_message(char *filename) * allowed_luser checks to see if user "luser" is allowed to * use this gateway by virtue of being listed in an allowed * users file, namely /etc/authpf/authpf.allow . + * Users may be listed by , %, or @. * * If /etc/authpf/authpf.allow does not exist, then we assume that * all users who are allowed in by sshd(8) are permitted to @@ -444,9 +469,9 @@ print_message(char *filename) * the session terminates in the same manner as being banned. */ static int -allowed_luser(char *luser) +allowed_luser(struct passwd *pw) { - char *buf, *lbuf; + char *buf,*lbuf; int matched; size_t len; FILE *f; @@ -476,8 +501,14 @@ allowed_luser(char *luser) * "public" gateway, such as it is, so let * everyone use it. */ + int gl_init = 0, ngroups = NGROUPS + 1; + gid_t groups[NGROUPS + 1]; + lbuf = NULL; + matched = 0; + while ((buf = fgetln(f, &len))) { + if (buf[len - 1] == '\n') buf[len - 1] = '\0'; else { @@ -488,7 +519,40 @@ allowed_luser(char *luser) buf = lbuf; } - matched = strcmp(luser, buf) == 0 || strcmp("*", buf) == 0; + if (buf[0] == '@') { + /* check login class */ + if (strcmp(pw->pw_class, buf + 1) == 0) + matched++; + } else if (buf[0] == '%') { + /* check group membership */ + int cnt; + struct group *group; + + if ((group = getgrnam(buf + 1)) == NULL) { + syslog(LOG_ERR, + "invalid group '%s' in %s (%s)", + buf + 1, PATH_ALLOWFILE, + strerror(errno)); + return (0); + } + + if (!gl_init) { + (void) getgrouplist(pw->pw_name, + pw->pw_gid, groups, &ngroups); + gl_init++; + } + + for ( cnt = 0; cnt < ngroups; cnt++) { + if (group->gr_gid == groups[cnt]) { + matched++; + break; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***