From owner-p4-projects@FreeBSD.ORG Sun Apr 8 00:58:55 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F259E16A403; Sun, 8 Apr 2007 00:58:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C0B4116A402 for ; Sun, 8 Apr 2007 00:58:54 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B1C3113C46E for ; Sun, 8 Apr 2007 00:58:54 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l380wscD086145 for ; Sun, 8 Apr 2007 00:58:54 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l380wsUB086142 for perforce@freebsd.org; Sun, 8 Apr 2007 00:58:54 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 8 Apr 2007 00:58:54 GMT Message-Id: <200704080058.l380wsUB086142@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 117614 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Apr 2007 00:58:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=117614 Change 117614 by mjacob@mjexp on 2007/04/08 00:57:52 Remove the msi_enable hint- now that all and sundry have started filtering out motherboards with broken MSI implementations it's time to let the default actions of trying to acquire MSI type interrupts works as designed. MFP4 after: 1 day Affected files ... .. //depot/projects/mjexp/sys/dev/mpt/mpt.h#9 edit .. //depot/projects/mjexp/sys/dev/mpt/mpt_pci.c#8 edit Differences ... ==== //depot/projects/mjexp/sys/dev/mpt/mpt.h#9 (text+ko) ==== @@ -527,7 +527,7 @@ unit : 8, ready : 1, fw_uploaded : 1, - msi_enable : 1, + : 1, twildcard : 1, tenabled : 1, do_cfg_role : 1, ==== //depot/projects/mjexp/sys/dev/mpt/mpt_pci.c#8 (text+ko) ==== @@ -334,7 +334,6 @@ } mpt->do_cfg_role = 1; } - mpt->msi_enable = 0; } #else static void @@ -361,11 +360,6 @@ } tval = 0; - mpt->msi_enable = 0; - if (resource_int_value(device_get_name(mpt->dev), - device_get_unit(mpt->dev), "msi_enable", &tval) == 0 && tval == 1) { - mpt->msi_enable = 1; - } } #endif @@ -528,26 +522,24 @@ /* Get a handle to the interrupt */ iqd = 0; - if (mpt->msi_enable) { - /* - * First try to alloc an MSI-X message. If that - * fails, then try to alloc an MSI message instead. - */ - if (pci_msix_count(dev) == 1) { - mpt->pci_msi_count = 1; - if (pci_alloc_msix(dev, &mpt->pci_msi_count) == 0) { - iqd = 1; - } else { - mpt->pci_msi_count = 0; - } + /* + * First try to alloc an MSI-X message. If that + * fails, then try to alloc an MSI message instead. + */ + if (pci_msix_count(dev) == 1) { + mpt->pci_msi_count = 1; + if (pci_alloc_msix(dev, &mpt->pci_msi_count) == 0) { + iqd = 1; + } else { + mpt->pci_msi_count = 0; } - if (iqd == 0 && pci_msi_count(dev) == 1) { - mpt->pci_msi_count = 1; - if (pci_alloc_msi(dev, &mpt->pci_msi_count) == 0) { - iqd = 1; - } else { - mpt->pci_msi_count = 0; - } + } + if (iqd == 0 && pci_msi_count(dev) == 1) { + mpt->pci_msi_count = 1; + if (pci_alloc_msi(dev, &mpt->pci_msi_count) == 0) { + iqd = 1; + } else { + mpt->pci_msi_count = 0; } } mpt->pci_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &iqd, From owner-p4-projects@FreeBSD.ORG Sun Apr 8 09:28:48 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFE1A16A405; Sun, 8 Apr 2007 09:28:47 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 475FA16A403 for ; Sun, 8 Apr 2007 09:28:47 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 357EB13C459 for ; Sun, 8 Apr 2007 09:28:47 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l389SlOp001197 for ; Sun, 8 Apr 2007 09:28:47 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l389SksY001193 for perforce@freebsd.org; Sun, 8 Apr 2007 09:28:46 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 8 Apr 2007 09:28:46 GMT Message-Id: <200704080928.l389SksY001193@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 117634 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Apr 2007 09:28:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=117634 Change 117634 by rdivacky@rdivacky_witten on 2007/04/08 09:28:39 IFC + small whitespace fixes + removal of my sg attempt now when we have sg in src. Affected files ... .. //depot/projects/linuxolator/src/sys/boot/pc98/boot0.5/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/boot/pc98/boot0.5/boot0.5.s#3 integrate .. //depot/projects/linuxolator/src/sys/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot0.5/selector.s#2 integrate .. //depot/projects/linuxolator/src/sys/boot/pc98/boot0.5/start.s#2 integrate .. //depot/projects/linuxolator/src/sys/boot/pc98/boot2/boot.c#4 integrate .. //depot/projects/linuxolator/src/sys/compat/linprocfs/linprocfs.c#16 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_ioctl.c#3 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_ioctl.h#3 integrate .. //depot/projects/linuxolator/src/sys/conf/NOTES#23 integrate .. //depot/projects/linuxolator/src/sys/conf/files#26 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/arch/amd64/atomic.S#2 delete .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/arch/i386/atomic.S#2 delete .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/os/taskq.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-chipset.c#13 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt_cam.c#14 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/cmi.c#5 integrate .. //depot/projects/linuxolator/src/sys/geom/uzip/g_uzip.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/identcpu.c#6 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/pmap.c#11 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/trap.c#6 integrate .. //depot/projects/linuxolator/src/sys/i386/include/pmap.h#5 integrate .. //depot/projects/linuxolator/src/sys/i386/include/specialreg.h#5 integrate .. //depot/projects/linuxolator/src/sys/i386/include/vmparam.h#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_jail.c#10 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_syscalls.c#9 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_lookup.c#11 edit .. //depot/projects/linuxolator/src/sys/modules/Makefile#13 integrate .. //depot/projects/linuxolator/src/sys/modules/cam/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/zfs/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/libalias/alias_db.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/libalias/alias_skinny.c#3 integrate .. //depot/projects/linuxolator/src/sys/sys/unistd.h#6 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/boot/pc98/boot0.5/Makefile#2 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/sys/boot/pc98/boot0.5/Makefile,v 1.4 2004/12/21 08:47:16 ru Exp $ +# $FreeBSD: src/sys/boot/pc98/boot0.5/Makefile,v 1.6 2007/04/07 13:37:45 nyan Exp $ PROG= ${BOOT}.out INTERNALPROG= FILES= ${BOOT} NO_MAN= -SRCS= start.s boot.s boot0.5.s disk.s selector.s support.s syscons.s +SRCS= start.s boot.s boot0.5.s disk.s selector.s support.s syscons.s \ + putssjis.s CLEANFILES= ${BOOT} ${BOOT}.bin BOOT= boot0.5 @@ -13,7 +14,7 @@ # unless you are glutton for punishment. BOOT_BOOT0_ORG?= 0x0000 -LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG} +LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG} -Wl,-T,${.CURDIR}/ldscript # The size of boot0.5 must be 7168 bytes ${BOOT}: ${BOOT}.bin ==== //depot/projects/linuxolator/src/sys/boot/pc98/boot0.5/boot0.5.s#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# Copyright (c) KATO Takenori, 1999, 2000. +# Copyright (c) KATO Takenori, 1999, 2000, 2007. # # All rights reserved. Unpublished rights reserved under the copyright # laws of Japan. @@ -25,7 +25,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/sys/boot/pc98/boot0.5/boot0.5.s,v 1.3 2007/03/17 05:30:03 kato Exp $ +# $FreeBSD: src/sys/boot/pc98/boot0.5/boot0.5.s,v 1.4 2007/04/07 08:37:04 kato Exp $ # .global main .code16 @@ -261,8 +261,8 @@ .global ishireso ishireso: .byte 0 -title: .asciz "PC98 Boot Selector Version 1.1" -copyright: .ascii "(C)Copyright 1999, 2000 KATO Takenori. " +title: .asciz "PC98 Boot Selector Version 1.2" +copyright: .ascii "(C)Copyright 1999-2007 KATO Takenori. " .asciz "All rights reserved." msg_device: .asciz "Device" msg_sasi: .asciz "SASI/IDE unit " ==== //depot/projects/linuxolator/src/sys/boot/pc98/boot0.5/selector.s#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# Copyright (c) KATO Takenori, 1999, 2000. +# Copyright (c) KATO Takenori, 1999, 2000, 2007. # # All rights reserved. Unpublished rights reserved under the copyright # laws of Japan. @@ -25,7 +25,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/sys/boot/pc98/boot0.5/selector.s,v 1.2 2000/08/06 14:35:37 kato Exp $ +# $FreeBSD: src/sys/boot/pc98/boot0.5/selector.s,v 1.3 2007/04/07 08:37:04 kato Exp $ # .code16 @@ -299,6 +299,11 @@ jne dev_right movw $3, mode # N88-BASIC ret + + # XXX + .space 5, 0x90 + ret # Dummy ret @0x9ab + dev_up: cmpw $0, curdevice je devmode_loop ==== //depot/projects/linuxolator/src/sys/boot/pc98/boot0.5/start.s#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# Copyright (c) KATO Takenori, 1999, 2000. +# Copyright (c) KATO Takenori, 1999, 2000, 2007. # # All rights reserved. Unpublished rights reserved under the copyright # laws of Japan. @@ -25,7 +25,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/sys/boot/pc98/boot0.5/start.s,v 1.2 2003/05/02 09:33:12 kato Exp $ +# $FreeBSD: src/sys/boot/pc98/boot0.5/start.s,v 1.3 2007/04/07 08:37:04 kato Exp $ # .global start .code16 @@ -34,8 +34,19 @@ start: jmp start1 + # Magic + .org 0x053, 0x20 + .byte 0x4e, 0x45, 0x43 + + .org 0x8f + .byte 0x32, 0x2e, 0x37, 0x30 + .org 0x2d4 start1: + # The instruction 'call 0x9ab' can be here. See also selector.s. + nop + nop + nop cli movw %cs, %ax movw %ax, %ds ==== //depot/projects/linuxolator/src/sys/boot/pc98/boot2/boot.c#4 (text+ko) ==== @@ -49,7 +49,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/boot.c,v 1.16 2006/11/02 17:28:38 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/boot.c,v 1.17 2007/04/06 20:50:24 kan Exp $"); #include "boot.h" #include @@ -70,7 +70,7 @@ static char kernel_config_namebuf[NAMEBUF_LEN + sizeof "config"]; static char linebuf[NAMEBUF_LEN]; static char namebuf[NAMEBUF_LEN]; -static struct bootinfo bootinfo; +struct bootinfo bootinfo; int loadflags; static void getbootdev(char *ptr, int *howto); ==== //depot/projects/linuxolator/src/sys/compat/linprocfs/linprocfs.c#16 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.108 2007/03/30 17:56:44 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.109 2007/04/06 18:15:56 jkim Exp $"); #include #include @@ -1252,3 +1252,5 @@ PSEUDOFS(linprocfs, 1); MODULE_DEPEND(linprocfs, linux, 1, 1, 1); MODULE_DEPEND(linprocfs, procfs, 1, 1, 1); +MODULE_DEPEND(linprocfs, sysvmsg, 1, 1, 1); +MODULE_DEPEND(linprocfs, sysvsem, 1, 1, 1); ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_ioctl.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.137 2006/07/06 21:42:36 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.138 2007/04/07 19:40:58 scottl Exp $"); #include #include @@ -94,8 +94,8 @@ static linux_ioctl_function_t linux_ioctl_termio; static linux_ioctl_function_t linux_ioctl_private; static linux_ioctl_function_t linux_ioctl_drm; +static linux_ioctl_function_t linux_ioctl_sg; static linux_ioctl_function_t linux_ioctl_special; -static linux_ioctl_function_t linux_ioctl_sg; static struct linux_ioctl_handler cdrom_handler = { linux_ioctl_cdrom, LINUX_IOCTL_CDROM_MIN, LINUX_IOCTL_CDROM_MAX }; @@ -1595,6 +1595,11 @@ break; } + case LINUX_SCSI_GET_BUS_NUMBER: + case LINUX_SCSI_GET_IDLUN: + error = linux_ioctl_sg(td, args); + break; + /* LINUX_CDROM_SEND_PACKET */ /* LINUX_CDROM_NEXT_WRITABLE */ /* LINUX_CDROM_LAST_WRITTEN */ @@ -2534,6 +2539,24 @@ return ioctl(td, (struct ioctl_args *)args); } +static int +linux_ioctl_sg(struct thread *td, struct linux_ioctl_args *args) +{ + struct file *fp; + u_long cmd; + int error; + + if ((error = fget(td, args->fd, &fp)) != 0) { + printf("sg_linux_ioctl: fget returned %d\n", error); + return (error); + } + cmd = args->cmd; + + error = (fo_ioctl(fp, cmd, (caddr_t)args->arg, td->td_ucred, td)); + fdrop(fp, td); + return (error); +} + /* * Special ioctl handler */ @@ -2562,254 +2585,6 @@ return (error); } -int linux_sg_version = 30125; - -#ifdef LINUX_SG_DEBUG -#define DPRINTF(a) do { \ - if (ldebug(ioctl)) \ - printf(a); \ -} while (0) -#else -#define DPRINTF(a) -#endif - -#ifdef LINUX_SG_DEBUG -static void dump_sg_io(struct linux_sg_io_hdr *); -static void dump_scsireq(struct scsireq *); -#endif - -//static int bsd_to_linux_host_status(int); -//static int bsd_to_linux_driver_status(int); - -/* - * Sg ioctl handler - */ -static int -linux_ioctl_sg(struct thread *td, struct linux_ioctl_args *args) -{ - struct file *fp; - u_long com = args->cmd; - int error = 0; - //struct linux_sg_io_hdr lreq; - //union ccb req; - - if ((error = fget(td, args->fd, &fp)) != 0) - return (error); - - td->td_retval[0] = 0; - DPRINTF(("Command = %lx\n", com)); - switch (com) { - case LINUX_SG_GET_VERSION_NUM: - error = copyout(&version, (void *)args->arg, sizeof(linux_sg_version)); - break; -#if 0 - case LINUX_SG_IO: - error = copyin((void *)args->arg, &lreq, sizeof(lreq)); - if (error) { - DPRINTF(("failed to copy in request data %d\n", error)); - break; - } - -#ifdef LINUX_SG_DEBUG - dump_sg_io(&lreq); -#endif - (void)memset(&req, 0, sizeof(req)); - switch (lreq.dxfer_direction) { - case SG_DXFER_TO_DEV: - req.flags = SCCMD_WRITE; - break; - case SG_DXFER_FROM_DEV: - req.flags = SCCMD_READ; - break; - default: - DPRINTF(("unknown direction %d\n", - lreq.dxfer_direction)); - error = EINVAL; - goto done; - } - if (lreq.iovec_count != 0) { - /* XXX: Not yet */ - error = EOPNOTSUPP; - DPRINTF(("scatter/gather not supported\n")); - break; - } - - if (lreq.cmd_len > sizeof(req.cmd)) { - DPRINTF(("invalid command length %d\n", lreq.cmd_len)); - error = EINVAL; - break; - } - - error = copyin(lreq.cmdp, req.cmd, lreq.cmd_len); - if (error) { - DPRINTF(("failed to copy in cmd data %d\n", error)); - break; - } - - req.timeout = lreq.timeout; - req.cmdlen = lreq.cmd_len; - req.datalen = lreq.dxfer_len; - req.databuf = lreq.dxferp; - - error = fo_ioctl(fp, CAMIOCOMMAND, (void *)&req, td->td_ucred, td); - if (error) { - DPRINTF(("SCIOCCOMMAND failed %d\n", error)); - break; - } -#ifdef LINUX_SG_DEBUG - dump_scsireq(&req); -#endif - if (req.senselen_used) { - if (req.senselen > lreq.mx_sb_len) - req.senselen = lreq.mx_sb_len; - lreq.sb_len_wr = req.senselen; - error = copyout(req.sense, lreq.sbp, req.senselen); - if (error) { - DPRINTF(("sense copyout failed %d\n", error)); - break; - } - } else { - lreq.sb_len_wr = 0; - } - - lreq.status = req.status; - lreq.masked_status = 0; /* XXX */ - lreq.host_status = bsd_to_linux_host_status(req.retsts); - lreq.sb_len_wr = req.datalen_used; - lreq.driver_status = bsd_to_linux_driver_status(req.error); - lreq.resid = req.datalen - req.datalen_used; - lreq.duration = req.timeout; /* XXX */ - lreq.info = 0; /* XXX */ - error = copyout(&lreq, args->data, sizeof(lreq)); - if (error) { - DPRINTF(("failed to copy out req data %d\n", error)); - } - break; -#endif - case LINUX_SG_EMULATED_HOST: - case LINUX_SG_SET_TRANSFORM: - case LINUX_SG_GET_TRANSFORM: - case LINUX_SG_GET_NUM_WAITING: - case LINUX_SG_SCSI_RESET: - case LINUX_SG_GET_REQUEST_TABLE: - case LINUX_SG_SET_KEEP_ORPHAN: - case LINUX_SG_GET_KEEP_ORPHAN: - case LINUX_SG_GET_ACCESS_COUNT: - case LINUX_SG_SET_FORCE_LOW_DMA: - case LINUX_SG_GET_LOW_DMA: - case LINUX_SG_GET_SG_TABLESIZE: - case LINUX_SG_GET_SCSI_ID: - case LINUX_SG_SET_FORCE_PACK_ID: - case LINUX_SG_GET_PACK_ID: - case LINUX_SG_SET_RESERVED_SIZE: - case LINUX_SG_GET_RESERVED_SIZE: - error = ENODEV; - break; - - /* version 2 interfaces */ - case LINUX_SG_SET_TIMEOUT: - break; - case LINUX_SG_GET_TIMEOUT: - /* ioctl returns value..., grr. */ - td->td_retval[0] = 60; - break; - case LINUX_SG_GET_COMMAND_Q: - case LINUX_SG_SET_COMMAND_Q: - case LINUX_SG_SET_DEBUG: - case LINUX_SG_NEXT_CMD_LEN: - error = ENODEV; - break; - } - -//done: - fdrop(fp, td); - - DPRINTF(("Return=%d\n", error)); - return error; -} - -#if 0 -static int -bsd_to_linux_driver_status(int bs) -{ - switch (bs) { - default: - case XS_NOERROR: - return 0; - case XS_SENSE: - case XS_SHORTSENSE: - return LINUX_DRIVER_SENSE; - case XS_RESOURCE_SHORTAGE: - return LINUX_DRIVER_SOFT; - case XS_DRIVER_STUFFUP: - return LINUX_DRIVER_ERROR; - case XS_SELTIMEOUT: - case XS_TIMEOUT: - return LINUX_DRIVER_TIMEOUT; - case XS_BUSY: - return LINUX_DRIVER_BUSY; - case XS_RESET: - return LINUX_SUGGEST_ABORT; - case XS_REQUEUE: - return LINUX_SUGGEST_RETRY; - } -} - -static int -bsd_to_linux_host_status(int bs) -{ - switch (bs) { - case SCCMD_OK: - case SCCMD_SENSE: - return LINUX_DID_OK; - case SCCMD_TIMEOUT: - return LINUX_DID_TIME_OUT; - case SCCMD_BUSY: - return LINUX_DID_BUS_BUSY; - case SCCMD_UNKNOWN: - default: - return LINUX_DID_ERROR; - } -} -#endif - -#ifdef LINUX_SG_DEBUG -static void -dump_sg_io(struct linux_sg_io_hdr *lr) -{ - printf("linuxreq [interface_id=%x, dxfer_direction=%d, cmd_len=%d, " - "mx_sb_len=%d, iovec_count=%d, dxfer_len=%d, dxferp=%p, " - "cmdp=%p, sbp=%p, timeout=%u, flags=%d, pack_id=%d, " - "usr_ptr=%p, status=%u, masked_status=%u, sb_len_wr=%u, " - "host_status=%u, driver_status=%u, resid=%d, duration=%u, " - "info=%u]\n", - lr->interface_id, lr->dxfer_direction, lr->cmd_len, - lr->mx_sb_len, lr->iovec_count, lr->dxfer_len, lr->dxferp, - lr->cmdp, lr->sbp, lr->timeout, lr->flags, lr->pack_id, - lr->usr_ptr, lr->status, lr->masked_status, lr->sb_len_wr, - lr->host_status, lr->driver_status, lr->resid, lr->duration, - lr->info); -} - -static void -dump_scsireq(struct scsireq *br) -{ - int i; - printf("bsdreq [flags=%lx, timeout=%lu, cmd=[ ", - br->flags, br->timeout); - for (i = 0; i < sizeof(br->cmd) / sizeof(br->cmd[0]); i++) - printf("%.2u ", br->cmd[i]); - printf("], cmdlen=%u, databuf=%p, datalen=%lu, datalen_used=%lu, " - "sense=[ ", - br->cmdlen, br->databuf, br->datalen, br->datalen_used); - for (i = 0; i < sizeof(br->sense) / sizeof(br->sense[0]); i++) - printf("%.2u ", br->sense[i]); - printf("], senselen=%u, senselen_used=%u, status=%u, retsts=%u, " - "error=%d]\n", - br->senselen, br->senselen_used, br->status, br->retsts, br->error); -} -#endif - /* * main ioctl syscall function */ ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_ioctl.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_ioctl.h,v 1.24 2006/05/10 20:38:16 netchild Exp $ + * $FreeBSD: src/sys/compat/linux/linux_ioctl.h,v 1.25 2007/04/07 19:40:58 scottl Exp $ */ #ifndef _LINUX_IOCTL_H_ @@ -51,70 +51,6 @@ #define LINUX_IOCTL_DISK_MAX LINUX_BLKSSZGET /* - * sg - */ -#define LINUX_SG_SET_TIMEOUT 0x2201 -#define LINUX_SG_GET_TIMEOUT 0x2202 -#define LINUX_SG_EMULATED_HOST 0x2203 -#define LINUX_SG_SET_TRANSFORM 0x2204 -#define LINUX_SG_GET_TRANSFORM 0x2205 -#define LINUX_SG_GET_COMMAND_Q 0x2270 -#define LINUX_SG_SET_COMMAND_Q 0x2271 -#define LINUX_SG_SET_RESERVED_SIZE 0x2275 -#define LINUX_SG_GET_RESERVED_SIZE 0x2272 -#define LINUX_SG_GET_SCSI_ID 0x2276 -#define LINUX_SG_SET_FORCE_LOW_DMA 0x2279 -#define LINUX_SG_GET_LOW_DMA 0x227a -#define LINUX_SG_SET_FORCE_PACK_ID 0x227b -#define LINUX_SG_GET_PACK_ID 0x227c -#define LINUX_SG_GET_NUM_WAITING 0x227d -#define LINUX_SG_SET_DEBUG 0x227e -#define LINUX_SG_GET_SG_TABLESIZE 0x227f -#define LINUX_SG_GET_VERSION_NUM 0x2282 -#define LINUX_SG_NEXT_CMD_LEN 0x2283 -#define LINUX_SG_SCSI_RESET 0x2284 -#define LINUX_SG_IO 0x2285 -#define LINUX_SG_GET_REQUEST_TABLE 0x2286 -#define LINUX_SG_SET_KEEP_ORPHAN 0x2287 -#define LINUX_SG_GET_KEEP_ORPHAN 0x2288 -#define LINUX_SG_GET_ACCESS_COUNT 0x2289 - -#define LINUX_IOCTL_SG_MIN LINUX_SG_GET_TIMEOUT -#define LINUX_IOCTL_SG_MAX LINUX_SG_GET_ACCESS_COUNT - -struct linux_sg_io_hdr { - int interface_id; -#define SG_DXFER_NONE -1 -#define SG_DXFER_TO_DEV -2 -#define SG_DXFER_FROM_DEV -3 -#define SG_DXFER_TO_FROM_DEV -4 -#define SG_DXFER_UNKNOWN -5 - int dxfer_direction; - unsigned char cmd_len; - unsigned char mx_sb_len; - unsigned short iovec_count; - unsigned int dxfer_len; - void *dxferp; - unsigned char *cmdp; - unsigned char *sbp; - unsigned int timeout; - unsigned int flags; - int pack_id; - void *usr_ptr; - unsigned char status; - unsigned char masked_status; - unsigned char msg_status; - unsigned char sb_len_wr; - unsigned short host_status; - unsigned short driver_status; - int resid; - unsigned int duration; - unsigned int info; -}; - -#define SG_MAX_SENSE 16 - -/* * Host codes */ #define LINUX_DID_OK 0x00 /* OK */ @@ -208,6 +144,8 @@ #define LINUX_CDROM_DEBUG 0x5330 #define LINUX_CDROM_GET_CAPABILITY 0x5331 #define LINUX_CDROMAUDIOBUFSIZ 0x5382 +#define LINUX_SCSI_GET_IDLUN 0x5382 +#define LINUX_SCSI_GET_BUS_NUMBER 0x5386 #define LINUX_DVD_READ_STRUCT 0x5390 #define LINUX_DVD_WRITE_STRUCT 0x5391 #define LINUX_DVD_AUTH 0x5392 @@ -235,6 +173,38 @@ #define LINUX_DVD_HOST_SEND_RPC_STATE 11 /* + * SG + */ +#define LINUX_SG_SET_TIMEOUT 0x2201 +#define LINUX_SG_GET_TIMEOUT 0x2202 +#define LINUX_SG_EMULATED_HOST 0x2203 +#define LINUX_SG_SET_TRANSFORM 0x2204 +#define LINUX_SG_GET_TRANSFORM 0x2205 +#define LINUX_SG_GET_COMMAND_Q 0x2270 +#define LINUX_SG_SET_COMMAND_Q 0x2271 +#define LINUX_SG_SET_RESERVED_SIZE 0x2275 +#define LINUX_SG_GET_RESERVED_SIZE 0x2272 +#define LINUX_SG_GET_SCSI_ID 0x2276 +#define LINUX_SG_SET_FORCE_LOW_DMA 0x2279 +#define LINUX_SG_GET_LOW_DMA 0x227a +#define LINUX_SG_SET_FORCE_PACK_ID 0x227b +#define LINUX_SG_GET_PACK_ID 0x227c +#define LINUX_SG_GET_NUM_WAITING 0x227d +#define LINUX_SG_SET_DEBUG 0x227e +#define LINUX_SG_GET_SG_TABLESIZE 0x227f +#define LINUX_SG_GET_VERSION_NUM 0x2282 +#define LINUX_SG_NEXT_CMD_LEN 0x2283 +#define LINUX_SG_SCSI_RESET 0x2284 +#define LINUX_SG_IO 0x2285 +#define LINUX_SG_GET_REQUEST_TABLE 0x2286 +#define LINUX_SG_SET_KEEP_ORPHAN 0x2287 +#define LINUX_SG_GET_KEEP_ORPHAN 0x2288 +#define LINUX_SG_GET_ACCESS_COUNT 0x2289 + +#define LINUX_IOCTL_SG_MIN 0x2200 +#define LINUX_IOCTL_SG_MAX 0x22ff + +/* * VFAT */ #define LINUX_VFAT_READDIR_BOTH 0x7201 ==== //depot/projects/linuxolator/src/sys/conf/NOTES#23 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1418 2007/04/02 01:04:20 mjacob Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1419 2007/04/07 19:40:57 scottl Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1215,6 +1215,10 @@ # # The pt driver drives SCSI Processor devices. # +# The sg driver provides a passthrough API that is compatible with the +# Linux SG driver. It will work in conjunction with the COMPAT_LINUX +# option to run linux SG apps. It can also stand on its own and provide +# source level API compatiblity for porting apps to FreeBSD. # # Target Mode support is provided here but also requires that a SIM # (SCSI Host Adapter Driver) provide support as well. @@ -1241,6 +1245,7 @@ device targ #SCSI Target Mode Code device targbh #SCSI Target Mode Blackhole Device device pass #CAM passthrough driver +device sg #Linux SCSI passthrough # CAM OPTIONS: # debugging options: ==== //depot/projects/linuxolator/src/sys/conf/files#26 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1190 2007/04/06 04:51:50 kan Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1191 2007/04/07 19:40:57 scottl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -100,6 +100,7 @@ cam/scsi/scsi_pt.c optional pt cam/scsi/scsi_sa.c optional sa cam/scsi/scsi_ses.c optional ses +cam/scsi/scsi_sg.c optional sg cam/scsi/scsi_targ_bh.c optional targbh cam/scsi/scsi_target.c optional targ coda/coda_fbsd.c optional vcoda ==== //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 (text+ko) ==== @@ -152,8 +152,17 @@ /* * These tunables are for performance analysis. */ -uint64_t zfs_arc_max; -uint64_t zfs_arc_min; +u_long zfs_arc_max; +u_long zfs_arc_min; +#ifdef _KERNEL +TUNABLE_ULONG("vfs.zfs.arc_max", &zfs_arc_max); +TUNABLE_ULONG("vfs.zfs.arc_min", &zfs_arc_min); +SYSCTL_DECL(_vfs_zfs); +SYSCTL_ULONG(_vfs_zfs, OID_AUTO, arc_max, CTLFLAG_RD, &zfs_arc_max, 0, + "Maximum ARC size"); +SYSCTL_ULONG(_vfs_zfs, OID_AUTO, arc_min, CTLFLAG_RD, &zfs_arc_min, 0, + "Minimum ARC size"); +#endif /* * Note that buffers can be on one of 5 states: @@ -2402,6 +2411,7 @@ nhdr->b_flags = 0; nhdr->b_datacnt = 1; nhdr->b_freeze_cksum = NULL; + mutex_init(&nhdr->b_freeze_lock, NULL, MUTEX_DEFAULT, NULL); (void) refcount_add(&nhdr->b_refcnt, tag); buf->b_hdr = nhdr; atomic_add_64(&arc_anon->arcs_size, blksz); @@ -2719,12 +2729,12 @@ else arc_c_max = arc_c_min; arc_c_max = MAX(arc_c * 6, arc_c_max); -#ifdef notyet +#ifdef _KERNEL /* * Allow the tunables to override our calculations if they are * reasonable (ie. over 64MB) */ - if (zfs_arc_max > 64<<20 && zfs_arc_max < physmem * PAGESIZE) + if (zfs_arc_max > 64<<20 && zfs_arc_max < vm_kmem_size) arc_c_max = zfs_arc_max; if (zfs_arc_min > 64<<20 && zfs_arc_min <= arc_c_max) arc_c_min = zfs_arc_min; @@ -2738,6 +2748,9 @@ if (arc_c < arc_c_min) arc_c = arc_c_min; + zfs_arc_min = arc_c_min; + zfs_arc_max = arc_c_max; + arc_anon = &ARC_anon; arc_mru = &ARC_mru; arc_mru_ghost = &ARC_mru_ghost; ==== //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 (text+ko) ==== @@ -201,7 +201,7 @@ * data (cmd == _FIO_SEEK_DATA). "off" is an in/out parameter. */ static int -zfs_holey(vnode_t *vp, int cmd, offset_t *off) +zfs_holey(vnode_t *vp, unsigned long cmd, offset_t *off) { znode_t *zp = VTOZ(vp); uint64_t noff = (uint64_t)*off; /* new offset */ @@ -3065,11 +3065,11 @@ struct vop_pathconf_args /* { struct vnode *a_vp; int a_name; - int *a_retval; + register_t *a_retval; } */ *ap; { int cmd = ap->a_name; - int *valp = ap->a_retval; + register_t *valp = ap->a_retval; #if 0 vnode_t *vp = ap->a_vp; znode_t *zp, *xzp; ==== //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/os/taskq.c#2 (text+ko) ==== @@ -393,7 +393,7 @@ * Maxmimum number of entries in global system taskq is * system_taskq_size * max_ncpus */ -#define SYSTEM_TASKQ_SIZE 64 +#define SYSTEM_TASKQ_SIZE 1 int system_taskq_size = SYSTEM_TASKQ_SIZE; /* ==== //depot/projects/linuxolator/src/sys/dev/ata/ata-chipset.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.194 2007/04/06 16:21:34 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.195 2007/04/06 17:36:35 sos Exp $"); #include "opt_ata.h" #include @@ -4816,6 +4816,8 @@ if (ch->dma) { /* note start and stop are not used here */ ch->dma->setprd = ata_siiprb_dmasetprd; + + ch->dma->flags |= ATA_DMA_64BIT; } } ==== //depot/projects/linuxolator/src/sys/dev/mpt/mpt_cam.c#14 (text+ko) ==== @@ -94,7 +94,7 @@ * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.52 2007/03/11 01:54:59 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.53 2007/04/07 18:15:52 mjacob Exp $"); #include #include @@ -2963,8 +2963,13 @@ break; } case XPT_RESET_DEV: - xpt_print(ccb->ccb_h.path, "reset %s\n", - ccb->ccb_h.func_code == XPT_RESET_BUS? "bus" : "device"); + if (ccb->ccb_h.func_code == XPT_RESET_BUS) { + if (bootverbose) { + xpt_print(ccb->ccb_h.path, "reset bus\n"); + } + } else { + xpt_print(ccb->ccb_h.path, "reset device\n"); + } CAMLOCK_2_MPTLOCK(mpt); (void) mpt_bus_reset(mpt, tgt, lun, FALSE); MPTLOCK_2_CAMLOCK(mpt); ==== //depot/projects/linuxolator/src/sys/dev/sound/pci/cmi.c#5 (text+ko) ==== @@ -53,7 +53,7 @@ #include "mixer_if.h" #include "mpufoi_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/cmi.c,v 1.40 2007/03/15 16:41:26 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/cmi.c,v 1.41 2007/04/08 07:52:27 ariff Exp $"); /* Supported chip ID's */ #define CMI8338A_PCI_ID 0x010013f6 @@ -946,7 +946,8 @@ sc->st = rman_get_bustag(sc->reg); sc->sh = rman_get_bushandle(sc->reg); - cmi_midiattach(sc); + if (0) + cmi_midiattach(sc); sc->irqid = 0; sc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->irqid, ==== //depot/projects/linuxolator/src/sys/geom/uzip/g_uzip.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/uzip/g_uzip.c,v 1.10 2006/01/22 15:35:14 fjoe Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/uzip/g_uzip.c,v 1.11 2007/04/07 02:52:13 simokawa Exp $"); #include #include @@ -453,7 +453,7 @@ g_topology_lock(); pp2 = g_new_providerf(gp, "%s", gp->name); pp2->sectorsize = 512; - pp2->mediasize = sc->nblocks * sc->blksz; + pp2->mediasize = (off_t)sc->nblocks * sc->blksz; pp2->flags = pp->flags & G_PF_CANDELETE; if (pp->stripesize > 0) { pp2->stripesize = pp->stripesize; ==== //depot/projects/linuxolator/src/sys/i386/i386/identcpu.c#6 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/identcpu.c,v 1.175 2007/03/26 18:03:29 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/identcpu.c,v 1.176 2007/04/06 18:15:02 ru Exp $"); #include "opt_cpu.h" @@ -188,20 +188,6 @@ } } - /* Detect AMD features (PTE no-execute bit, 3dnow, 64 bit mode etc) */ - if (strcmp(cpu_vendor, "GenuineIntel") == 0 || - strcmp(cpu_vendor, "AuthenticAMD") == 0) { - if (cpu_exthigh >= 0x80000001) { - do_cpuid(0x80000001, regs); - amd_feature = regs[3] & ~(cpu_feature & 0x0183f3ff); - amd_feature2 = regs[2]; - } - if (cpu_exthigh >= 0x80000008) { - do_cpuid(0x80000008, regs); - cpu_procinfo2 = regs[2]; - } - } - if (strcmp(cpu_vendor, "GenuineIntel") == 0) { if ((cpu_id & 0xf00) > 0x300) { u_int brand_index; @@ -1104,7 +1090,20 @@ u_char ccr3; u_int regs[4]; - if (strcmp(cpu_vendor, "CyrixInstead") == 0) { + /* Detect AMD features (PTE no-execute bit, 3dnow, 64 bit mode etc) */ + if (strcmp(cpu_vendor, "GenuineIntel") == 0 || + strcmp(cpu_vendor, "AuthenticAMD") == 0) { + init_exthigh(); + if (cpu_exthigh >= 0x80000001) { + do_cpuid(0x80000001, regs); + amd_feature = regs[3] & ~(cpu_feature & 0x0183f3ff); + amd_feature2 = regs[2]; + } + if (cpu_exthigh >= 0x80000008) { + do_cpuid(0x80000008, regs); + cpu_procinfo2 = regs[2]; + } + } else if (strcmp(cpu_vendor, "CyrixInstead") == 0) { if (cpu == CPU_486) { /* * These conditions are equivalent to: ==== //depot/projects/linuxolator/src/sys/i386/i386/initcpu.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/initcpu.c,v 1.55 2006/07/12 19:46:08 mr Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/initcpu.c,v 1.56 2007/04/06 18:15:02 ru Exp $"); #include "opt_cpu.h" @@ -41,6 +41,9 @@ #include #include +#include +#include + #if !defined(CPU_DISABLE_SSE) && defined(I686_CPU) #define CPU_ENABLE_SSE #endif @@ -686,6 +689,15 @@ break; } } +#ifdef PAE + if ((amd_feature & AMDID_NX) != 0) { + uint64_t msr; + + msr = rdmsr(MSR_EFER) | EFER_NXE; + wrmsr(MSR_EFER, msr); + pg_nx = PG_NX; + } +#endif break; #endif default: ==== //depot/projects/linuxolator/src/sys/i386/i386/minidump_machdep.c#2 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/minidump_machdep.c,v 1.2 2006/06/05 18:21:29 emaste Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/minidump_machdep.c,v 1.3 2007/04/06 18:15:02 ru Exp $"); #include #include @@ -211,7 +211,7 @@ j = va >> PDRSHIFT; if ((pd[j] & (PG_PS | PG_V)) == (PG_PS | PG_V)) { /* This is an entire 2M page. */ - pa = pd[j] & PG_FRAME & ~PDRMASK; + pa = pd[j] & PG_PS_FRAME; for (k = 0; k < NPTEPG; k++) { if (is_dumpable(pa)) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 8 10:08:05 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D75A16A407; Sun, 8 Apr 2007 10:08:05 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 35C4C16A400 for ; Sun, 8 Apr 2007 10:08:05 +0000 (UTC) (envelope-from rdivacky@vlk.vlakno.cz) Received: from vlakno.cz (vlk.vlakno.cz [62.168.28.247]) by mx1.freebsd.org (Postfix) with ESMTP id E665013C468 for ; Sun, 8 Apr 2007 10:08:04 +0000 (UTC) (envelope-from rdivacky@vlk.vlakno.cz) Received: from localhost (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id 36E848BCF8D for ; Sun, 8 Apr 2007 11:43:44 +0200 (CEST) X-Virus-Scanned: amavisd-new at vlakno.cz Received: from vlakno.cz ([127.0.0.1]) by localhost (vlk.vlakno.cz [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6oD9Ge-9VXEC for ; Sun, 8 Apr 2007 11:43:43 +0200 (CEST) Received: from vlk.vlakno.cz (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id 618E58BCF39 for ; Sun, 8 Apr 2007 11:43:43 +0200 (CEST) Received: (from rdivacky@localhost) by vlk.vlakno.cz (8.13.8/8.13.8/Submit) id l389hhPr065436 for perforce@FreeBSD.org; Sun, 8 Apr 2007 11:43:43 +0200 (CEST) (envelope-from rdivacky) Date: Sun, 8 Apr 2007 11:43:43 +0200 From: Roman Divacky To: Perforce Change Reviews Message-ID: <20070408094343.GA65419@freebsd.org> References: <200704080928.l389SksY001193@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200704080928.l389SksY001193@repoman.freebsd.org> User-Agent: Mutt/1.4.2.2i Cc: Subject: Re: PERFORCE change 117634 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Apr 2007 10:08:05 -0000 On Sun, Apr 08, 2007 at 09:28:46AM +0000, Roman Divacky wrote: > http://perforce.freebsd.org/chv.cgi?CH=117634 > > Change 117634 by rdivacky@rdivacky_witten on 2007/04/08 09:28:39 > > IFC + small whitespace fixes + removal of my sg attempt now when we have > sg in src. I have commited OLD version of scsi_sg.* which is different from what we have in src and contains bugs... but I dont know how to fix this. can someone help? thnx and sorry for the inconvinience roman From owner-p4-projects@FreeBSD.ORG Sun Apr 8 10:47:39 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAFD816A404; Sun, 8 Apr 2007 10:47:38 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 77CC516A401 for ; Sun, 8 Apr 2007 10:47:38 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 67C8D13C43E for ; Sun, 8 Apr 2007 10:47:38 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l38AlchF019520 for ; Sun, 8 Apr 2007 10:47:38 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l38AlcGV019517 for perforce@freebsd.org; Sun, 8 Apr 2007 10:47:38 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 8 Apr 2007 10:47:38 GMT Message-Id: <200704081047.l38AlcGV019517@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 117642 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Apr 2007 10:47:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=117642 Change 117642 by rdivacky@rdivacky_witten on 2007/04/08 10:47:21 In the case of illegal values just set msg.msg_control to NULL. it lets ping work too. Suggested by: rwatson Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#14 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#14 (text+ko) ==== @@ -1034,7 +1034,7 @@ * checking but now it lets ping work. */ if (msg.msg_control && msg.msg_controllen == 0) - msg.msg_controllen = sizeof(struct cmsghdr); + msg.msg_control = NULL; if (error) return (error); From owner-p4-projects@FreeBSD.ORG Sun Apr 8 13:21:49 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3214616A404; Sun, 8 Apr 2007 13:21:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DEA3716A401 for ; Sun, 8 Apr 2007 13:21:48 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CBDCD13C45A for ; Sun, 8 Apr 2007 13:21:48 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l38DLmma059084 for ; Sun, 8 Apr 2007 13:21:48 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l38DLmqW059081 for perforce@freebsd.org; Sun, 8 Apr 2007 13:21:48 GMT (envelope-from gabor@freebsd.org) Date: Sun, 8 Apr 2007 13:21:48 GMT Message-Id: <200704081321.l38DLmqW059081@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 117645 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Apr 2007 13:21:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=117645 Change 117645 by gabor@gabor_server on 2007/04/08 13:21:40 Roll back current DESTDIR implementation, step 4. Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#10 edit .. //depot/projects/soc2006/gabor_destdir/Tools/scripts/security-check.awk#3 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#10 (text+ko) ==== @@ -490,7 +490,7 @@ # If this is set to a list of files, these files will be # automatically added to ${SUB_FILES}, some %%VAR%%'s will # automatically be expanded, they will be installed in -# ${TARGETDIR}/etc/rc.d and added to the packing list. +# ${PREFIX}/etc/rc.d and added to the packing list. # USE_RCORDER - List of rc.d startup scripts to be called early in the boot # process. This acts exactly like USE_RC_SUBR except that # scripts are installed in /etc/rc.d. @@ -516,46 +516,23 @@ # Various directory definitions and variables to control them. # You rarely need to redefine any of these except WRKSRC and NO_WRKSUBDIR. # -# TARGETDIR - The fully qualified path, where everything is installed. -# See the other variables below. -# Default: ${DESTDIR}${PREFIX} -# -# DESTDIR - The path to the environment we are installing to. Define -# this if you want to install packages into a jail -# or into an another FreeBSD environment mounted -# elsewhere than /. ${PREFIX} is relative to -# ${DESTDIR}. E.g. setting DESTDIR=/bla PREFIX=/opt will -# result packages installed under /bla/opt and registered -# under /bla/var/db/pkg. -# Default: not set (means /) -# # X11BASE - Where X11 ports install things. -# Default: ${DESTDIR}/usr/X11R6 -# X11BASE_REL - Same as X11BASE, but relative to DESTDIR # Default: /usr/X11R6 # LOCALBASE - Where non-X11 ports install things. -# Default: ${DESTDIR}/usr/local -# LOCALBASE_REL - Same as LOCALBASE, but relative to DESTDIR # Default: /usr/local # LINUXBASE - Where Linux ports install things. -# Default: ${DESTDIR}/compat/linux -# LINUXBASE_REL - Same as LINUXBASE, but relative to DESTDIR # Default: /compat/linux # PREFIX - Where *this* port installs its files. -# Default: ${X11BASE_REL} if USE_X_PREFIX is set, -# ${LINUXBASE_REL} if USE_LINUX_PREFIX is set, -# otherwise ${LOCALBASE_REL} +# Default: ${X11BASE} if USE_X_PREFIX is set, +# ${LINUXBASE} if USE_LINUX_PREFIX is set, +# otherwise ${LOCALBASE} # # IGNORE_PATH_CHECKS -# - There are some sanity checks against PREFIX and DESTDIR. +# - There are some sanity checks against PREFIX. # You can disable these checks with defining # this variable, but this is not recommended! # Only do this if you really know what you are # doing. These sanity checks are the following: -# - DESTDIR can't be /. Just leave it undefined -# if you want to install to /. -# - DESTDIR has to be an absolute path. -# - DESTDIR can't have a trailing slash. # - PREFIX has to be an absolute path. # - PREFIX can't have a trailing slash. # @@ -636,7 +613,7 @@ # installs its own manpage links so they will show up # correctly in ${PLIST}.) # MANPREFIX - The directory prefix for ${MAN} and ${MLINKS}. -# Default: ${TARGETDIR} +# Default: ${PREFIX} # MANPREFIX # - If manual pages of some sections install in different # locations than others, use these. @@ -927,7 +904,7 @@ # rest of PLIST, so ${PLIST_SUB} substitutions also # apply here. It is recommended that you use # %%PREFIX%% for ${PREFIX}, %%LOCALBASE%% for -# ${LOCALBASE_REL} and %%X11BASE%% for ${X11BASE_REL}. +# ${LOCALBASE} and %%X11BASE%% for ${X11BASE}. # Default: %%PREFIX%%/lib # USE_LDCONFIG - If set to "yes", this subsumes the function of the # deprecated variable INSTALLS_SHLIB and adds ${PREFIX}/lib @@ -950,22 +927,22 @@ # internal to bsd.port.mk and must not be set in your Makefile. # # DOCSDIR - Name of the directory to install the packages docs in. -# Default: ${TARGETDIR}/share/doc/${PORTNAME} -# DOCSDIR_REL - The DOCSDIR relative to ${TARGETDIR} +# Default: ${PREFIX}/share/doc/${PORTNAME} +# DOCSDIR_REL - The DOCSDIR relative to ${PREFIX} # EXAMPLESDIR - Name of the directory to install the packages examples in. -# Default: ${TARGETDIR}/share/examples/${PORTNAME} +# Default: ${PREFIX}/share/examples/${PORTNAME} # EXAMPLESDIR_REL -# - The EXAMPLESDIR relative to ${TARGETDIR} +# - The EXAMPLESDIR relative to ${PREFIX} # DATADIR - Name of the directory to install the packages shared data in. -# Default: ${TARGETDIR}/share/${PORTNAME} -# DATADIR_REL - The DATADIR relative to ${TARGETDIR} +# Default: ${PREFIX}/share/${PORTNAME} +# DATADIR_REL - The DATADIR relative to ${PREFIX} # # WWWDIR - Name of the directory to install the packages www data in. -# Default: ${TARGETDIR}/www/${PORTNAME} -# WWWDIR_REL - The WWWDIR relative to ${TARGETDIR} +# Default: ${PREFIX}/www/${PORTNAME} +# WWWDIR_REL - The WWWDIR relative to ${PREFIX} # # DESKTOPDIR - Name of the directory to install ${DESKTOP_ENTRIES} in. -# Default: ${TARGETDIR}/share/applications +# Default: ${PREFIX}/share/applications # DESKTOP_ENTRIES # - List of desktop entry files to generate and install in # ${DESKTOPDIR}. The format is @@ -1034,9 +1011,9 @@ # it attempts to apply them. # PKG_DBDIR - Where package installation is recorded; this directory # must not contain anything else. -# Default: ${DESTDIR}/var/db/pkg +# Default: /var/db/pkg # PORT_DBDIR - Where port configuration options are recorded. -# Default: ${DESTDIR}/var/db/ports +# Default: /var/db/ports # NO_PKG_REGISTER # - Don't register a port installation as a package. # FORCE_PKG_REGISTER @@ -1526,7 +1503,6 @@ .include "${PORTSDIR}/Mk/bsd.xfce.mk" .endif -# These do some path checks if DESTDIR is set correctly. # You can force skipping these test by defining IGNORE_PATH_CHECKS .if !defined(IGNORE_PATH_CHECKS) .if (${PREFIX:C,(^.).*,\1,} != "/") @@ -1535,28 +1511,7 @@ @${ECHO_MSG} "is invoked in the work area PREFIX points to the right place." @${FALSE} .endif -.if defined(DESTDIR) -.if (${DESTDIR:C,(^.).*,\1,} != "/") -.if ${DESTDIR} == "/" -.BEGIN: - @${ECHO_MSG} "You can't set DESTDIR to /. Please re-run make with" - @${ECHO_MSG} "DESTDIR unset." - @${FALSE} -.else -.BEGIN: - @${ECHO_MSG} "DESTDIR must be defined as an absolute path so that when 'make'" - @${ECHO_MSG} "is invoked in the work area DESTDIR points to the right place." - @${FALSE} -.endif .endif -.if (${DESTDIR:C,^.*(/)$$,\1,} == "/") -.BEGIN: - @${ECHO_MSG} "DESTDIR can't have a trailing slash. Please remove the trailing" - @${ECHO_MSG} "slash and re-run 'make'" - @${FALSE} -.endif -.endif -.endif X_WINDOW_SYSTEM ?= xorg @@ -2775,7 +2730,7 @@ .if defined(PERL_CONFIGURE) CONFIGURE_ARGS+= CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \ - INSTALLPRIVLIB="${TARGETDIR}/lib" INSTALLARCHLIB="${PREFIX}/lib" + INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib" CONFIGURE_SCRIPT?= Makefile.PL MAN3PREFIX?= ${PREFIX}/lib/perl5/${PERL_VERSION} .undef HAS_CONFIGURE @@ -3872,7 +3827,7 @@ | ${XARGS} -0 -J % ${FIND} % -prune ! -type l -type f -print0 2> /dev/null \ | ${XARGS} -0 -n 1 ${OBJDUMP} -R 2> /dev/null > ${WRKDIR}/.PLIST.objdump; \ if \ - ! ${AWK} -v audit="$${PORTS_AUDIT}" -v destdir="${DESTDIR}" -f ${PORTSDIR}/Tools/scripts/security-check.awk \ + ! ${AWK} -v audit="$${PORTS_AUDIT}" -f ${PORTSDIR}/Tools/scripts/security-check.awk \ ${WRKDIR}/.PLIST.flattened ${WRKDIR}/.PLIST.objdump ${WRKDIR}/.PLIST.setuid ${WRKDIR}/.PLIST.writable; \ then \ www_site=$$(cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} www-site); \ ==== //depot/projects/soc2006/gabor_destdir/Tools/scripts/security-check.awk#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Apr 8 13:32:02 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABE1C16A405; Sun, 8 Apr 2007 13:32:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 65E3A16A400 for ; Sun, 8 Apr 2007 13:32:02 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 544F513C457 for ; Sun, 8 Apr 2007 13:32:02 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l38DW2HT060748 for ; Sun, 8 Apr 2007 13:32:02 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l38DW15O060744 for perforce@freebsd.org; Sun, 8 Apr 2007 13:32:01 GMT (envelope-from gabor@freebsd.org) Date: Sun, 8 Apr 2007 13:32:01 GMT Message-Id: <200704081332.l38DW15O060744@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 117646 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Apr 2007 13:32:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=117646 Change 117646 by gabor@gabor_server on 2007/04/08 13:31:36 IFC Affected files ... .. //depot/projects/soc2006/gabor_ports/CHANGES#9 integrate .. //depot/projects/soc2006/gabor_ports/COPYRIGHT#2 integrate .. //depot/projects/soc2006/gabor_ports/GIDs#6 integrate .. //depot/projects/soc2006/gabor_ports/KNOBS#6 integrate .. //depot/projects/soc2006/gabor_ports/LEGAL#8 integrate .. //depot/projects/soc2006/gabor_ports/MOVED#16 integrate .. //depot/projects/soc2006/gabor_ports/Makefile#2 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.autotools.mk#3 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.database.mk#5 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.efl.mk#1 branch .. //depot/projects/soc2006/gabor_ports/Mk/bsd.emacs.mk#6 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.gcc.mk#4 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.gnome.mk#9 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.gnustep.mk#6 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.gstreamer.mk#5 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.java.mk#4 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.kde.mk#4 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.local.mk#2 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.lua.mk#4 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.ocaml.mk#1 branch .. //depot/projects/soc2006/gabor_ports/Mk/bsd.php.mk#7 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#86 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.subdir.mk#4 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.python.mk#8 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.ruby.mk#6 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.sites.mk#13 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.tcl.mk#3 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.wx.mk#3 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.xfce.mk#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/buildenv#2 integrate .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/buildscript#3 integrate .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/clean-chroot#3 integrate .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/cleanup-chroots#2 integrate .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/dopackages#3 integrate .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/dopackagestats#6 integrate .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/dosetupnode#2 integrate .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/flushsquid#2 integrate .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/makeduds#2 integrate .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/pdispatch#3 integrate .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/portbuild#3 integrate .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/processlogs#3 integrate .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/processonelog#6 integrate .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/reportload#2 integrate .. //depot/projects/soc2006/gabor_ports/Tools/scripts/chkversion.pl#3 integrate .. //depot/projects/soc2006/gabor_ports/Tools/scripts/rmport#6 integrate .. //depot/projects/soc2006/gabor_ports/Tools/scripts/tindex#5 integrate .. //depot/projects/soc2006/gabor_ports/UIDs#6 integrate .. //depot/projects/soc2006/gabor_ports/UPDATING#18 integrate Differences ... ==== //depot/projects/soc2006/gabor_ports/CHANGES#9 (text+ko) ==== @@ -10,6 +10,99 @@ All ports committers are allowed to commit to this file. +20070403: +AUTHOR: portmgr@FreeBSD.org +The following changes were made to the ports infrastructure: + + * The default dependency of USE_GHOSTSCRIPT has been changed from + ghostscript-gnu to ghostscript-gpl. The WITH_GHOSTSCRIPT_GPL variable is + now no-op. New WITH_GHOSTSCRIPT_GNU variable was added. + + * bsd.tcl.mk was overhauled. Most importantly, the semantics of USE_TCL* and + USE_TK* variables was changed. USE_TCL and USE_TK now implies both build + and run dependencies, USE_TCL_RUN and USE_TK_BUILD variables were + introduced. Existing ports in the tree were modified. + + * Unused category tcl81 was removed, and new categories tcl and tk were + added. + +20070324: +AUTHOR: portmgr@FreeBSD.org +The following changes were made to the ports infrastructure: + + * Default LIBTOOLFILES value was changed from literal `configure' + to ${CONFIGURE_SCRIPT}. + + * bsd.efl.mk was moved to ports/Mk. USE_EFL family of macros is now + generally available to all ports. + + * New macros COPYTREE_BIN and COPYTREE_SHARE were added, to allow + for easy installation of a tree hierarchy, either with executable (bin) + or read-only (share) permissions on files. + + * A new variable WWWDIR was added, with default value of + ${PREFIX}/www/${PORTNAME}. + + * Variables DOCSDIR_REL, DATADIR_REL, EXAMPLESDIR_REL and WWWDIR_REL were + added for porter's convenience. They contain the values of their + respective non-REL variables, except relative to installation PREFIX. + +20070306: +AUTHOR: portmgr@FreeBSD.org +The following changes were made to the ports infrastructure: + + * The remainging vestiges of FreeBSD 4.X support were removed. Any + remaining users of 4.X should have stayed with the RELENG_4_EOL tag. + + * It is now possible to include USE_PHP after bsd.port.pre.mk. + + * 'make search' should now work with non-default ${PORTSDIR}. + +20070130: +AUTHOR: portmgr@FreeBSD.org +The following changes were made to the ports infrastructure: + + * DEPENDS variable was removed, please use other *_DEPENDS variables instead. + + * A new pkg-plist keyword is available, @stopdaemon. It will call forcestop + on all rc.subr scripts installed by the port on deinstall, efectively + stopping services on deinstall/upgrade. + + * rc.subr script suffix is now available in Makefile as RC_SUBR_SUFFIX. + + * New variable USE_CDRTOOLS was introduced. It replaced direct dependencies + on sysutils/cdrtools port. It now automatically support switching to + cdrtools-cjk port when user specified WITH_CJK. All ports were converted. + + * USE_DOS2UNIX, infrastructure for converting DOS to UNIX line feeds, was + enhanced by a new variable DOS2UNIX_REGEX. It allows to specify a find + -iregex parameter to limit touched files by file extensions. + + * Support for partially translated manpages was added. For examples of + usage, please refer to Porter's Handbook. + + * USE_TCL/USE_TK variables were changed to provide runtime dependency. New + variables USE_TCL_BUILD and USE_TK_BUILD were added. All unintuitive + quirks of these variables were fixed. + + * USE_LDCONFIG was fixed to work properly for ports, that specify @cwd in the + pkg-plists. + + * Old bsd.java.mk version 1.0 macros were removed. + + * New category: ports-mgmt + + * New virtual category: gnustep + + * Unused picobsd category was removed. + +20070118: +AUTHOR: maho@FreeBSD.org +We'd like to ask all ports maintainers, who are using Fortran77 (f77 in base), +to switch to Fortran90/95 (gfortran42, lang/gcc42). Please refer to +http://people.freebsd.org/~maho/gfortran/gfortran.html +for details. + 20061014: AUTHOR: gnome@FreeBSD.org The following changes have been introduced to the GNOME porting process @@ -1203,7 +1296,7 @@ Copyright information: -Copyright 2004 FreeBSD Foundation All Rights Reserved. +Copyright 2004-2007 FreeBSD Foundation All Rights Reserved. Redistribution, publication, translation and use, with or without modification, in full or in part, in any form or format of this @@ -1227,4 +1320,4 @@ Contact Erwin Lansing if you have any questions about your use of this document. -$FreeBSD: ports/CHANGES,v 1.62 2006/10/14 09:31:38 marcus Exp $ +$FreeBSD: ports/CHANGES,v 1.68 2007/04/02 23:14:45 pav Exp $ ==== //depot/projects/soc2006/gabor_ports/COPYRIGHT#2 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: ports/COPYRIGHT,v 1.2 2006/01/15 22:11:50 erwin Exp $ +# $FreeBSD: ports/COPYRIGHT,v 1.3 2007/01/01 00:53:56 erwin Exp $ # @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94 The compilation of software known as the FreeBSD Ports Collection is distributed under the following terms: -Copyright (C) 1994-2006 The FreeBSD Project. All rights reserved. +Copyright (C) 1994-2007 The FreeBSD Project. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions ==== //depot/projects/soc2006/gabor_ports/GIDs#6 (text+ko) ==== @@ -1,5 +1,6 @@ -$FreeBSD: ports/GIDs,v 1.18 2006/11/16 08:58:31 alexbl Exp $ +$FreeBSD: ports/GIDs,v 1.34 2007/03/31 12:53:57 laszlof Exp $ # Please keep this file sorted by GID! +smmsp:*:25: bind:*:53: rdfdb:*:55: spamd:*:58: @@ -11,14 +12,16 @@ dialer:*:68: network:*:69: pgsql:*:70: +ircd:*:72: simscan:*:74: +hybserv:*:76: audit:*:77: virtuoso:*:79: www:*:80: qnofiles:*:81: qmail:*:82: mysql:*:88: -vpopmail:*:89: +vchkpw:*:89: firebird:*:90: mailman:*:91: gdm:*:92: @@ -47,20 +50,28 @@ _symon:*:115: smokeping:*:117: ircproxyd:*:118: +mythtv:*:119: +pdns:*:120 fetchmail:*:124 postfix:*:125: maildrop:*:126: +nav:*:127: vchat:*:128: _bgpd:*:130: _ospfd:*:131: +_spamd:*:132: +dovecot:*:143: rbldns:*:153: sfs:*:171: agk:*:172: polipo:*:173: +nagios:*:181: moinmoin:*:192: +cups:*:193: sympa:*:200: dspam:*:202: bs:*:220: +fcron:*:247: _tor:*:256: _dns-proxy-tor:*:257: _trans-proxy-tor:*:258: @@ -71,6 +82,7 @@ smx:*:264: haclient:*:275: mrtg:*:279: +_sphinx:*:312: dkfilter:*:325: wildfire:*:340: ldap:*:389: @@ -87,8 +99,10 @@ avahi:*:558: tacacs:*:559: distcc:*:561: +polkit:*:562: _xsi:*:600: bnetd:*:700: bopm:*:717: openxpki:*:777: +netdisco:*:840: bacula:*:910: ==== //depot/projects/soc2006/gabor_ports/KNOBS#6 (text+ko) ==== @@ -1,7 +1,7 @@ # # KNOBS - A list of popular knobs and descriptions # -# $FreeBSD: ports/KNOBS,v 1.19 2006/10/09 18:51:50 alepulver Exp $ +# $FreeBSD: ports/KNOBS,v 1.20 2006/12/01 01:03:01 pav Exp $ # # Rules to adding knobs: # @@ -102,6 +102,7 @@ TREMOR Tremor (integer-only Vorbis) audio support UNIXODBC Use UNIXODBC as the ODBC driver VORBIS OGG/Vorbis audio support +WX wxWindows support X11 Support for X11 X264 H.264/AVC (MPEG4 part 10) multimedia codec XINE XINE multimedia support ==== //depot/projects/soc2006/gabor_ports/LEGAL#8 (text+ko) ==== @@ -1,5 +1,5 @@ # Creator: Jordan Hubbard -# $FreeBSD: ports/LEGAL,v 1.509 2006/11/09 08:55:13 vd Exp $ +# $FreeBSD: ports/LEGAL,v 1.531 2007/03/31 03:41:14 alepulver Exp $ ********************************************************************** *** NOTE TO COMMITTERS *** @@ -49,7 +49,10 @@ author aestats-* games/aestats Commercial use is prohibited AGSatellite0520* net-p2p/linux-agsatellite Unsure of licensing issues -infinity.* games/alephone-data Bungie/Microsoft do not +alephone/M1A1.zip games/alephone-data Bungie/Microsoft do not + allow charging for Marathon + data files +alephone/Marathon*.zip games/alephone-data Bungie/Microsoft do not allow charging for Marathon data files ads-java-novm-* databases/adstudio Free for personal or educational @@ -148,7 +151,6 @@ with fee diablo-latte-freebsd*-*-* java/diablo-jre15 License does not allow distribution with fee -dist10.tar.gz audio/mp3encode Condition is not clear divx4linux-*.tgz multimedia/linux-divx4linux4 Unsure of licensing issues divx4linux-*.tar.gz multimedia/linux-divx4linux Unsure of licensing issues djbdns* dns/djbdns No license -- see @@ -187,6 +189,8 @@ ezmlm-* mail/ezmlm-idx No license -- see http://cr.yp.to/softwarelaw.html f-prot-sig* security/f-prot-sig Free for personal use only +f-protd security/f-protd 60 days free of trial for + everybody f6kuzzzz.taz databases/libudbc Downloading and redistribution terms are unclear faac* audio/faac Restrictive copyright (do not @@ -236,8 +240,8 @@ before downloading freqship/* sysutils/freqsdwn License agreement is required to download -fretsonfire/FretsOnFire-*-linux* games/fretsonfire-data Only Unreal Voodoo - site is allowed to +fretsonfire/FretsOnFire-*-linux* games/fretsonfire-data Only Unreal Voodoo + site is allowed to distribute the music ftree-* misc/ftree Cannot distribute commercially fwtk/* security/fwtk No redistribution allowed @@ -264,6 +268,8 @@ goPod-* misc/*gopod Unclear legal status in EU countries grande-KXL-*.tar.gz games/grande Possible copyright infringement graphviz-* graphics/graphviz Needs license before fetching + +groupoffice-com-* www/groupoffice Free for personal use only GTL-* misc/gtl Non-commercial use only, license forbids redistribution hcfmdm/* comms/hcfmdm No redistribution allowed @@ -278,10 +284,6 @@ httprint_freebsd_*.zip security/httprint No cost for personal, education and non-commercial use HyperSpec-*.tar.gz devel/clisp-hyperspec Commercial redistribution prohibited -IBMJava2-SDK-131.tgz java/linux-ibm-jdk13 Redistribution of repackaged - binaries not permitted -IBMJava2-SDK-* java/linux-ibm-jdk14 Redistribution of repackaged - binaries not permitted ICON-AquaFusion.* x11-themes/gnome-icons-aqua-fusion Author rights unclear ICON-CoolGorilla.* x11-themes/gnome-icons-cool-gorilla Author rights unclear CrystalSVGforGnomeIcons* x11-themes/gnome-icons-crystal Author rights unclear @@ -357,7 +359,8 @@ jmf-*-alljava.zip java/jmf Redistribution of pre-compiled binaries is not permitted john-* security/john Crypto; export-controlled -jpgraph-* graphics/jpgraph Not for commercial use +jpgraph-1.* graphics/jpgraph Not for commercial use +jpgraph-2.* graphics/jpgraph2 Not for commercial use jre*i_ELF.*.tar.gz java/jre License does not allow distribution with fee jre118_v3-glibc-* java/linux-blackdown-jre11 License does not allow @@ -376,9 +379,9 @@ libdvdcss-*.tar.bz2 multimedia/libdvdcss CSS code may violate the DMCA libidea-* security/libidea Crypto; export-controlled libots-*.alpha.rpm lang/compaq-cc Distribution not allowed -libSDLx11.so.tar.gz multimedia/mtv No redistribution LimeWireOther.zip net-p2p/limewire No redistribution allowed Linux-ACU-Driver-v* sysutils/linux-acu Redistribution not allowed +Linux_MegaCli_* sysutils/linux-megacli Redistribution not allowed rpm/i386/fedora/4/gtk2-* x11-toolkits/linux-gtk2 LGPL binary, no source linuxq3ademo-* games/linux-quake3-demo Restrictive license by Loki Software l0phtcrack/* security/l0phtcrack Parts are under GPL, so @@ -392,12 +395,6 @@ l_fc_p*_*.*.*.tar lang/ifc7 No redistribution allowed l_fc_p*_*.*.*.tar.gz lang/ifc No redistribution allowed macopix-*.tar.gz games/macopix Contains commercial character data -MarathonEvil-*.tar.gz games/marathon-evil Bungie/Microsoft do not - allow charging for Marathon data - files -marathon2.zip games/marathon2-data Bungie/Microsoft do not - allow charging for Marathon data - files. mathfonts-4.1/* x11-fonts/mathfonts No redistribution allowed MB339-PAN.zip games/flightgear-mb339-pan Redistribution prohibited mbrola-freebsd/* audio/mbrola No commercial, military use @@ -424,17 +421,17 @@ MPlayer* multimedia/mplayer Restricted binary distribution msql-* databases/msql Not free for commercial organizations MT-* www/MT No redistribution -mtv-*.tar.gz multimedia/mtv No redistribution mupad/* math/mupad Unsure of selling for profit mypaedia-* japanese/mypaedia-fpw The original dictionary is not free mysqlman.tar.gz databases/mysqlman Not redistributable, license agreement required ncftpd-* ftp/ncftpd 30 day evaluation license -netbeans-* java/netbeans Restrictive copyright +netbeans3-* java/netbeans3 Restrictive copyright +netbeans4-* java/netbeans4 Restrictive copyright +netbeans5-* java/netbeans5 Restrictive copyright NetComponents-* java/netcomponents No redistribution except as part of a substantially different product netshow_linux.gz multimedia/netshow Commercial software -nfbtr* textproc/nfbtrans Unclear copyright status nntpcache-* news/nntpcache Commercial or government use requires license nsc2ke.* math/nsc2ke No resale, contact author for @@ -498,7 +495,7 @@ RealPlayer-*.rpm multimedia/linux-realplayer Redistribution not allowed ruby/ruby_cast_256.zip security/ruby-cast_256 Crypto; export-controlled runrev/linux.tgz devel/linux-runrev Do not sell for profit -savage/savage* games/linux-savage Savage is freeware, but i am +savage/savage* games/linux-savage Savage is freeware, but i am not sure of its license sdr-* mbone/sdr Crypto; export-controlled serialmail-* mail/serialmail No license -- see @@ -551,12 +548,13 @@ not permitted susv3.tar.bz2 misc/susv3 Redistribution of the documents is not permitted -svm_light.tar.gz science/svmlight The software must not be further - distributed without prior permission +svm_light.tar.gz science/svmlight The software must not be further + distributed without prior permission of the author swing1_1_1* java/jfc Do not distribute without value-added application systemc-2*.tgz cad/systemc License agreement required. +scv-1.0p2-sysc* cad/scv License agreement required. tcetest_* games/linux-enemyterritory-tce Redistribution limited texcm-ttf-20010117/* x11-fonts/texcm-ttf Cannot be sold or distributed with any commercial product @@ -566,8 +564,6 @@ tolkien-ttf-* x11-fonts/tolkien-ttf Shareware. Commercial usage or redistribution requires license. -tools-for-freebsd-* emulators/vmware-tools2 Not sure if we can - redistribute this tracker-*.tgz audio/tracker Non-redistributable beta triangle-*/* math/triangle No commercial use without prior arrangement with the author @@ -582,7 +578,8 @@ Japan, user must have Japanese version of Windows and EPSON printer specified - by EULA + by EULA +tonicpoint-* graphics/tonicpoint-viewer Free for non-profit tuc-* converters/tuc Author does not allow CD-ROM distribution tutorial.zip java/java-tutorial This software is under license @@ -607,7 +604,6 @@ Commodore Business Machines vwnc7.3.1/* lang/visualworks Do not redistribute vje30/* japanese/vje30 Commercial software -VMware-*.tar.gz emulators/vmware2 Not sure if we can redistribute this vmware-freebsd-tools.* emulators/vmware-guestd3 Not sure if we can redistribute this vmware-freebsd-tools.* emulators/vmware-guestd4 Not sure if we can redistribute this [RESTRICTED] @@ -631,6 +627,8 @@ codecs is unknown xchada01.lzh games/xchadance Contains commercial character data +xds-[0-9]* lang/xds Redistribution is forbidden +xds-c-* lang/xds-c Redistribution is forbidden xephem-* astro/xephem Personal use only xev*.tar.gz games/xbat Possible copyright infringement XFrisk-*.tar.gz games/xfrisk Possible trademark infringement @@ -675,3 +673,5 @@ tw_cli-* sysutils/tw_cli Redistribution forbidden by license. lha-1.14i-ac* archivers/lha-ac No Redistribution +GotoBLAS* math/gotoblas No Redistribution +gamess.*/gamess* science/gamess No Redistribution ==== //depot/projects/soc2006/gabor_ports/MOVED#16 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1188 2006/11/23 13:55:02 pav Exp $ +# $FreeBSD: ports/MOVED,v 1.1339 2007/04/06 21:48:08 gerald Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -151,7 +151,6 @@ math/xmgr||2003-01-19|removed, obsoleted, successor is grace x11/libhelp||2003-01-19|removed, didn't compile on current motif, only used by xmgr devel/gnustep-devel|devel/gnustep|2003-01-20|merged -devel/gnustep-devel|devel/gnustep|2003-01-20|merged x11-toolkits/gnustep-gui-devel|x11-toolkits/gnustep-gui|2003-01-20|merged x11-toolkits/gnustep-xgps|x11-toolkits/gnustep-back|2003-01-20|full substitute devel/ruby-unit|devel/ruby-testunit|2003-01-23|succeeded @@ -773,7 +772,6 @@ deskutils/loserjabber|deskutils/logjam2|2004-02-07|Renamed to Logjam x11/wmbsdbatt|sysutils/wmbsdbatt|2004-02-09|Moved to more appropriate category converters/ktnef|deskutils/kdepim3|2004-02-09|ktnef is now included in kdepim -lang/g95|lang/gfortran|2004-02-11|change to appropreate name www/mozilla-firebird|www/firefox|2004-02-11|Project changed names x11-wm/mosfet-liquid||2004-02-13|obsolete mail/mozilla-thunderbird|mail/thunderbird|2004-02-14|Name change to fit the project @@ -937,7 +935,6 @@ x11-toolkits/qt32|x11-toolkits/qt33|2004-03-09|qt32 replaced by qt33 mail/ksig|misc/ksig|2004-03-09|ksig is now a part of the kdeaddons ports mail/exim-old|mail/exim|2004-03-09|No security maintenance from author, successor is exim -sysutils/xwatch||2004-03-09|obsolete-distfile deleted by author textproc/dico|french/dico|2004-03-14|better category x11-fonts/Xft|x11-fonts/libXft|2004-03-16|port renamed devel/ulex|devel/ocaml-ulex|2004-03-19|port renamed @@ -1942,7 +1939,6 @@ devel/php4-pear||2005-12-09|Obsoleted by devel/pear port devel/php5-pear||2005-12-09|Obsoleted by devel/pear port archivers/pear-Archive_Tar||2005-12-09|Obsoleted by devel/pear port -devel/pear-Console_Getopt||2005-12-09|Obsoleted by devel/pear port devel/pear-XML_RPC||2005-12-09|Obsoleted by devel/pear port devel/pear-PEAR|devel/pear|2005-12-09|New pear bootstrap code databases/php5-dbx||2005-12-09|Unsupported in PHP 5.1 @@ -2017,7 +2013,6 @@ biology/flip||2006-01-14|Mastersite disappeared chinese/MT||2006-01-14|Does not work with MT 3 chinese/chinput2||2006-01-14|Mastersite disappeared -chinese/wangttf||2006-01-14|Mastersite disappeared comms/vpb2||2006-01-14|Mastersite disappeared deskutils/journal||2006-01-14|Mastersite disappeared devel/decompyle||2006-01-14|Mastersite disappeared @@ -2222,7 +2217,7 @@ mail/ruby-mime-types||2006-04-07|Has expired: mastersite disappeared, no longer maintained by author devel/wftk||2006-04-07|master site disappeared www/linux-flashplugin||2006-04-08|Removed due to license problem -net/nic||2006-04-08|Deprecated for a long time +net/nic|net-mgmt/horde-nic|2006-04-08|Moved to more appropriate category, updated to H3 www/flashpluginwrapper||2006-04-08|Removed as it depends on linux-flashplugin mail/mew-mule||2006-04-10|Has expired: Does not work on the current emacs port net/smbfs||2006-04-14|Incorporated into base system long ago @@ -2231,7 +2226,6 @@ security/nessus-libnasl-devel||2006-04-17|Has expired: Development version of nessus is no longer available in sources security/nessus-libraries-devel||2006-04-17|Has expired: Development version of nessus is no longer available in sources security/nessus-plugins-devel||2006-04-17|Has expired: Development version of nessus is no longer available in sources -audio/gstreamer-plugins-polypaudio|audio/gstreamer-plugins-polyp80|2006-04-21|The port name has been changed to match its correct name devel/cvspadm||2006-04-24|Development ceased, please use devel/cvsdadm editors/jed-devel||2006-04-24|No more development version for a while, please, use editors/jed sysutils/gdesklets-multitail||2006-04-24|Project is too long dead @@ -2239,26 +2233,22 @@ java/diablo-jre13||2006-04-24|Removed due to security problems and no longer being distributed audio/gstreamer-plugins-artsd|audio/gstreamer-plugins-artsd80|2006-04-29|Not part of gstreamer 0.10 yet audio/gstreamer-plugins-audiofile|audio/gstreamer-plugins-audiofile80|2006-04-29|Not part of gstreamer 0.10 yet -audio/gstreamer-plugins-cdaudio|audio/gstreamer-plugins-cdaudio80|2006-04-29|Not part of gstreamer 0.10 yet sysutils/gstreamer-plugins-cdio|sysutils/gstreamer-plugins-cdio80|2006-04-29|Not part of gstreamer 0.10 yet multimedia/gstreamer-plugins-dirac|multimedia/gstreamer-plugins-dirac80|2006-04-29|Not part of gstreamer 0.10 yet graphics/gstreamer-plugins-gdkpixbuf|graphics/gstreamer-plugins-gdkpixbuf80|2006-04-29|Not part of gstreamer 0.10 yet graphics/gstreamer-plugins-hermes|graphics/gstreamer-plugins-hermes80|2006-04-29|Not part of gstreamer 0.10 yet -audio/gstreamer-plugins-jack|audio/gstreamer-plugins-jack80|2006-04-29|Not part of gstreamer 0.10 yet multimedia/gstreamer-plugins-libfame|multimedia/gstreamer-plugins-libfame80|2006-04-29|Not part of gstreamer 0.10 yet graphics/gstreamer-plugins-libmng|graphics/gstreamer-plugins-libmng80|2006-04-29|Not part of gstreamer 0.10 yet audio/gstreamer-plugins-mikmod|audio/gstreamer-plugins-mikmod80|2006-04-29|Not part of gstreamer 0.10 yet -multimedia/gstreamer-plugins-mpeg2enc|multimedia/gstreamer-plugins-mpeg2enc80|2006-04-29|Not part of gstreamer 0.10 yet multimedia/gstreamer-plugins-mplex|multimedia/gstreamer-plugins-mplex80|2006-04-29|Not part of gstreamer 0.10 yet audio/gstreamer-plugins-nas|audio/gstreamer-plugins-nas80|2006-04-29|Not part of gstreamer 0.10 yet -audio/gstreamer-plugins-polypaudio|audio/gstreamer-plugins-polypaudio80|2006-04-29|Not part of gstreamer 0.10 yet -audio/gstreamer-plugins-shout|audio/gstreamer-plugins-shout80|2006-04-29|Not part of gstreamer 0.10 yet +audio/gstreamer-plugins-polypaudio|audio/gstreamer-plugins-pulse|2006-04-29|Project renamed +audio/gstreamer-plugins-shout|audio/gstreamer-plugins-shout2|2006-04-29|Not part of gstreamer 0.10 yet audio/gstreamer-plugins-smoothwave|audio/gstreamer-plugins-smoothwave80|2006-04-29|Not part of gstreamer 0.10 yet audio/gstreamer-plugins-sndfile|audio/gstreamer-plugins-sndfile80|2006-04-29|Not part of gstreamer 0.10 yet -graphics/gstreamer-plugins-swfdec|graphics/gstreamer-plugins-swfdec80|2006-04-29|Not part of gstreamer 0.10 yet multimedia/gstreamer-plugins-x264|multimedia/gstreamer-plugins-x26480|2006-04-29|Not part of gstreamer 0.10 yet graphics/gstreamer-plugins-jpeg-mmx|graphics/gstreamer-plugins-jpeg-mmx80|2006-04-29|Not part of gstreamer 0.10 yet -audio/gstreamer-plugins-polyp|audio/gstreamer-plugins-polyp80|2006-04-29|Not part of gstreamer 0.10 yet +audio/gstreamer-plugins-polyp|audio/gstreamer-plugins-pulse|2006-04-29|Project renamed www/evolution-caldav||2006-04-29|Now included in evolution-data-server and evolution graphics/mrsidviewer||2006-04-30|Removed (distribution no longer available from vendor) graphics/kimdaba|graphics/kphotoalbum|2006-04-30|renamed @@ -2511,13 +2501,11 @@ x11-themes/e17-theme-mclaren||2006-11-01|Has expired: doesn't work with recent e17 x11-themes/e17-theme-grey||2006-11-01|Has expired: doesn't work with recent e17 devel/ac-archive|devel/autoconf-archive|2006-11-01|Replace broken ac-archive with working autoconf-archive -www/firefox-devel|www/firefox|2006-11-01|Firefox 2.0 is now stable graphics/php4-imlib2|graphics/pecl-imlib2|2006-11-01|Follow PECL ports naming conversion graphics/php5-imlib2|graphics/pecl-imlib2|2006-11-01|Follow PECL ports naming conversion chinese/xcin25|chinese/xcin|2006-11-05|Reflect its real portname mail/nail|mail/heirloom-mailx|2006-11-05|Project name changed databases/php5-filepro||2006-11-06|Removed in 5.2 branch -databases/php5-pdo||2006-11-08|Removed deskutils/offix-trash||2006-11-09|Has expired: development ceased in 1996 devel/mingw||2006-11-09|Has expired: use mingw32-* ports instead devel/mingw-binutils||2006-11-09|Has expired: use mingw32-* ports instead @@ -2547,3 +2535,366 @@ devel/p5-IO-Stty||2006-11-21|Has expired: project no longer exists print/pecl-panda||2006-11-22|Has expired: Project is dead and does not work mail/dbmail-devel|mail/dbmail21|2006-11-23|Renamed +net/ripetools|net/ripe-whois|2006-11-24|Has expired: project no longer exists +devel/sge||2006-11-26|Removed +mail/pantomime-ssl|mail/pantomime|2006-12-01|Removed +x11-toolkits/p5-Gtk2-PodViewer|x11-toolkits/p5-Gtk2-Ex-PodViewer|2006-12-03|CPAN module renamed +audio/xmms-rateplug||2006-12-04|Has expired: Project disappeared from the internet +chinese/iiimf-le-chewing||2006-12-04|Has expired: fails to install (dependency problem) +deskutils/mhc-xemacs21-mule||2006-12-04|Has expired: hangs during build +devel/alleyoop||2006-12-04|Has expired: Does not compile +devel/hs-crypto||2006-12-04|Has expired: is incompatible with current GHC, needs updating +editors/gedit-autocomplete-plugin||2006-12-04|Has expired: Not compatible with gedit versions >= 2.14 +emulators/vmware2||2006-12-04|Has expired: Unfetchable +finance/ccard||2006-12-04|Has expired: Project disappeared from the internet +devel/autoconf26|devel/autoconf261|2006-12-07|Move to correct location +www/mozilla-bonobo||2006-12-12|Has expired: "Does not build with new Mozilla" +www/p5-ldap-abook||2006-12-12|Has expired: Arbitrary command execution vulnerability in CGI script +x11-wm/tpager||2006-12-12|Has expired: Unmaintained and disappears from MASTER_SITE on a regular basis +x11/XFree86-aoutlibs||2006-12-12|Has expired: Requires a.out ld.so and support libraries +x11/linux-XFree86-libs||2006-12-12|Has expired: superseeded by linux-xorg-libs port +www/mod_v2h||2006-12-12|Has expired: No longer available for download, the website is gone +www/mod_injection||2006-12-12|Has expired: No longer available for download, the website is gone +www/nspostgres||2006-12-12|Has expired: Use www/aolserver with WITH_NSPOSTGRES=1 instead. +www/fxhtml||2006-12-12|Has expired: crusty old a.out binary, not useful any more +www/jakarta-tomcat3||2006-12-12|Has expired: Please use www/tomcat55 instead +shells/mudsh||2006-12-12|Has expired: Project disappeared from the internet +print/py-freetype||2006-12-12|Has expired: Project has disappeared and is no longer fetchable +palm/syncal||2006-12-12|Has expired: Does not build with new pilot-link +net/tn3270||2006-12-12|Has expired: dumps core. Please use net/c3270 instead +multimedia/dvdwizard||2006-12-12|Has expired: has an incomplete dependency list +print/latex-bibtopic||2006-12-12|Has expired: is already included in the teTeX distribution +print/latex-bibunits||2006-12-12|Has expired: is already included in the teTeX distribution +print/latex-booktabs||2006-12-12|Has expired: is already included in the teTeX distribution +print/latex-index||2006-12-12|Has expired: is already included in the teTeX distribution +print/latex-layouts||2006-12-12|Has expired: is already included in the teTeX distribution +print/latex-subfig||2006-12-12|Has expired: is already included in the teTeX distribution +print/latex-xcolor||2006-12-12|Has expired: is already included in the teTeX distribution +print/latex-lineno||2006-12-12|Has expired: is already included in the teTeX distribution +print/latex-pict2e||2006-12-12|Has expired: is already included in the teTeX distribution +multimedia/gstreamer-plugins-mpeg2enc80||2006-12-12|Has expired: Obsolete version, use gstreamer 0.10 instead +lang/gcc30||2006-12-12|Has expired: "This port is no longer in use by anything in the ports collection and will be removed in the future. Use a later release instead." +lang/egcs||2006-12-12|Has expired: "This port is no longer in use by anything in the ports collection and will be removed in the future. Use a later release of gcc instead" +graphics/php4-ming||2006-12-12|Has expired: doesn't work with new version of ming library +graphics/dvipng||2006-12-12|Has expired: is already included in the teTeX distribution +audio/gdesklets-xmms||2006-12-12|Has expired: Disappeared from the internet +games/flightgear-l410||2006-12-12|Has expired: is incompatible with the latest FlightGear release +www/frontpage||2006-12-12|Has expired: Microsoft Frontpage Extensions have reached their End-of-Life +portuguese/frontpage-pt_BR||2006-12-12|Removed: Microsoft Frontpage Extensions have reached their End-of-Life +www/frontpage-ar||2006-12-12|Removed: Microsoft Frontpage Extensions have reached their End-of-Life +www/frontpage-de||2006-12-12|Removed: Microsoft Frontpage Extensions have reached their End-of-Life +www/frontpage-es||2006-12-12|Removed: Microsoft Frontpage Extensions have reached their End-of-Life +www/frontpage-fr||2006-12-12|Removed: Microsoft Frontpage Extensions have reached their End-of-Life +www/frontpage-he||2006-12-12|Removed: Microsoft Frontpage Extensions have reached their End-of-Life +www/frontpage-it||2006-12-12|Removed: Microsoft Frontpage Extensions have reached their End-of-Life +www/frontpage-ja||2006-12-12|Removed: Microsoft Frontpage Extensions have reached their End-of-Life +www/frontpage-ko||2006-12-12|Removed: Microsoft Frontpage Extensions have reached their End-of-Life +www/frontpage-nl||2006-12-12|Removed: Microsoft Frontpage Extensions have reached their End-of-Life +www/frontpage-sv||2006-12-12|Removed: Microsoft Frontpage Extensions have reached their End-of-Life +www/frontpage-th||2006-12-12|Removed: Microsoft Frontpage Extensions have reached their End-of-Life +www/frontpage-zh||2006-12-12|Removed: Microsoft Frontpage Extensions have reached their End-of-Life +www/mod_frontpage||2006-12-12|Removed: Depends on dead www/frontpage +www/mod_frontpage-rtr||2006-12-12|Removed: Microsoft Frontpage Extensions have reached their End-of-Life +www/mod_frontpage2-rtr||2006-12-12|Removed: Microsoft Frontpage Extensions have reached their End-of-Life +net/wais||2006-12-12|Has expired: Imported 12 years ago; never completed +www/w3c-httpd||2006-12-12|Has expired: Does not compile +multimedia/gstreamer-plugins-dirac80||2006-12-13|Has expired: Obsolete version, use gstreamer 0.10 instead +devel/ruby-pcsc-lite||2006-12-14|Has expired: Does not compile with new pcsc-lite. Port is broken since 2005/04/20. +audio/alsaplayer||2006-12-14|Has expired: Remote code execution: http://vuxml.FreeBSD.org/9855ac8e-2aec-11db-a6e2-000e0c2e438a.html. Last version 0.99.76 is more than 3 years old. +sysutils/kdar||2006-12-14|Has expired: Does not compile with dar-2.3.0 +net-im/ymessenger||2006-12-14|Has expired: is a dynamically linked binary linked to old version of gtkhtml no longer in ports +audio/ac3dec||2006-12-14|Dead outside FreeBSD and replaced by liba52 +net-p2p/mldonkey-sancho||2006-12-14|Removed due to developer's request +net/gmdns||2006-12-14|Dead, unmaintain and nothing use it +devel/stlport-icc||2006-12-20|Has expired: does not work with stlport 4.6.2 +security/gnupg-devel|security/gnupg|2006-12-21|gnupg-devel has been released as Gnupg 2.0 +devel/javasvn|devel/svnkit|2006-12-23|JavaSVN has been renamed to SVNKit +deskutils/etoile|deskutils/etoile-dictionaryreader|2006-12-25|renamed to etoile-dictionaryreader +devel/p5-Inline-C2XS|devel/p5-InlineX-C2XS|2006-12-26|Project rename the module into the InlineX namespace +www/etoile-grr|www/etoile-mollusk|2006-12-29|Project moved +deskutils/etoile-etoileextensionskit|www/etoile-ui|2006-12-29|Project splitted in new modules +deskutils/etoile-preferenceskit|www/etoile-panekit|2006-12-29|Project splitted in new modules +deskutils/etoile-workspaceswitcher||2006-12-29|Project dopped +mail/sylpheed-claws-att_remover|mail/claws-mail-att_remover|2006-12-31|Project renamed upstream +mail/sylpheed-claws-cachesaver|mail/claws-mail-cachesaver|2006-12-31|Project renamed upstream +mail/sylpheed-claws-etpan_privacy|mail/claws-mail-etpan_privacy|2006-12-31|Project renamed upstream +mail/sylpheed-claws-fetchinfo|mail/claws-mail-fetchinfo|2006-12-31|Project renamed upstream +mail/sylpheed-claws-gtkhtml2_viewer|mail/claws-mail-gtkhtml2_viewer|2006-12-31|Project renamed upstream +mail/sylpheed-claws-maildir|mail/claws-mail-maildir|2006-12-31|Project renamed upstream +mail/sylpheed-claws-mailmbox|mail/claws-mail-mailmbox|2006-12-31|Project renamed upstream +mail/sylpheed-claws-newmail|mail/claws-mail-newmail|2006-12-31|Project renamed upstream +mail/sylpheed-claws-notification|mail/claws-mail-notification|2006-12-31|Project renamed upstream +mail/sylpheed-claws-perl|mail/claws-mail-perl|2006-12-31|Project renamed upstream +mail/sylpheed-claws-rssyl|mail/claws-mail-rssyl|2006-12-31|Project renamed upstream +mail/sylpheed-claws-smime|mail/claws-mail-smime|2006-12-31|Project renamed upstream +mail/sylpheed-claws-synce|mail/claws-mail-synce|2006-12-31|Project renamed upstream +mail/sylpheed-claws-vcalendar|mail/claws-mail-vcalendar|2006-12-31|Project renamed upstream +mail/sylpheed-claws|mail/claws-mail|2006-12-31|Removed: renamed to claws-mail +devel/pear-Console_Getopt||2007-01-01|Obsoleted by devel/pear port +databases/ruby-libgda||2007-01-01|No longer include in the tarball +multimedia/ruby-gst||2007-01-01|No longer include in the tarball +audio/autools||2007-01-05|Has expired: is unfetchable and the project homepage disappeared +www/mediawiki13||2007-01-05|Removed: No longer supported, please upgrade your wiki installation +www/mediawiki15||2007-01-05|Removed: No longer supported, please upgrade your wiki installation +ftp/gwget||2007-01-05|Has expired: fails to install +multimedia/bsdav||2007-01-05|Has expired: does not work. We need to import bktv patches from OpenBSD to make it work +multimedia/pitivi||2007-01-05|Has expired: Installs files during "make all" +misc/gnomesword||2007-01-05|Has expired: Configure fails +graphics/opendx-samples||2007-01-05|Has expired: Changes permissions on installed file usr/local/dx/java/server/nets +graphics/panorama||2007-01-05|Has expired: segfaults on startup (GUI only, render binary still works) +graphics/qtutils||2007-01-05|Has expired: Does not build +net-p2p/gnome-btdownload||2007-01-05|Has expired: does not run with BitTorrent 4.x yet +print/ec-fonts-mftraced||2007-01-05|Has expired: Installs files before 'make install' +print/yatex-xemacs-mule||2007-01-05|Has expired: hangs during build +security/gnu-crypto||2007-01-05|Has expired: Does not compile +www/linux-beonex||2007-01-05|Has expired: Security issues. From http://www.beonex.com/ 'The currently available Beonex Communicator 0.8 builds have several known security bugs' +misc/instant-workstation||2007-01-05|Has expired: Incomplete pkg-plist +lang/yap||2007-01-05|Has expired: Does not compile +lang/tensile||2007-01-05|Has expired: "Coredump during build on FreeBSD >= 6.x" +japanese/gauche-kakasi||2007-01-05|Has expired: deinstalls file not installed by this port +japanese/migemo-xemacs21-mule||2007-01-05|Has expired: Incomplete pkg-plist +www/rt3-elixus||2007-01-05|Has expired: Broken due the new mod_perl2 API +comms/vpb-driver||2007-01-05|Has expired: leaves files behind on deinstall +irc/xchat-ecl-plugin||2007-01-05|Has expired: Does not build +french/gnome-verbiste||2007-01-05|Has expired: does not install +devel/kasm||2007-01-05|Has expired: Buggy and unmaintained, use devel/hptools instead +devel/py-getargs||2007-01-05|Has expired: distfile and homepage disappeared +devel/pyumlgraph||2007-01-05|Has expired: distfile and homepage disappeared +editors/beaver||2007-01-05|Has expired: distfile disappeared from homepage +editors/dte||2007-01-05|Has expired: distfile and homepage disappeared +graphics/teddy||2007-01-05|Has expired: No new releases in the past 4 years +net/arla||2007-01-05|Has expired: "does not compile" +sysutils/lsmlib||2007-01-05|Has expired: distfile and homepage disappeared +security/ifd-gpr400||2007-01-05|Has expired: distfile and homepage disappeared +science/mmtk||2007-01-05|Has expired: distfile and homepage disappeared +print/xtem||2007-01-05|Has expired: distfile and homepage disappeared +net/mrt||2007-01-05|Has expired: distfile and homepage disappeared +net/tund||2007-01-05|Has expired: distfile disappeared and has no homepage +net/xbms||2007-01-05|Has expired: distfile and homepage disappeared +print/bibcard||2007-01-05|Has expired: distfile and homepage disappeared +misc/afbackup||2007-01-05|Has expired: Uses unregistered uid that conflicts with other ports +misc/afbackup-client||2007-01-05|Has expired: Uses unregistered uid that conflicts with other ports +misc/afbackup-server||2007-01-05|Has expired: Uses unregistered uid that conflicts with other ports +lang/forth||2007-01-05|Has expired: obsoleted by lang/pfe; use of this port is pretty much senseless +ftp/jmirror||2007-01-05|Has expired: distfile disappeared and has no homepage +devel/libformat||2007-01-05|Has expired: distfile and homepage disappeared +editors/ooodict-all||2007-01-05|Has expired: Size mismatch +mail/distribute||2007-01-05|Has expired: Does not install +net-im/gaim-rss-reader||2007-01-05|Has expired: Requires update to work with Gaim 0.82.1 +sysutils/slay||2007-01-05|Has expired: Author doesn't see it as needed anymore +www/emp||2007-01-05|Has expired: project is shutting down +textproc/nfbtrans||2007-01-05|Has expired: Unfetchable +comms/ecu||2007-01-05|Has expired: is unfetchable and project homepage disappeared +net/citadel||2007-01-05|Has expired: http://www.FreeBSD.org/ports/portaudit/4c005a5e-2541-4d95-80a0-00c76919aa66.html +multimedia/mtv||2007-01-05|Has expired: No new releases in the past 5 years +mail/py-email2||2007-01-08|Has expired: Only usable python versions schedualed to expire +net/ruby-radius||2007-01-08|Has expired: distfile disappeared from homepage +devel/versuch|net/versuch|2007-01-12|Removed duplicate port +german/tvbrowser|misc/tvbrowser|2007-01-13|move to misc/tvbrowser +chinese/xcin||2007-01-17|Has expired: dead project, see http://lists.linux.org.tw/pipermail/xcin/2005-November/004300.html +x11-wm/wmi||2007-01-17|Has expired: This port is unsupported by the author. Please use x11-wm/wmii instead. +www/abcache||2007-01-17|Has expired: "is a dead project and the distfile disappeared" +devel/rubygem-event-loop||2007-01-17|Has expired: replaced by devel/ruby-event-loop which gets around issues caused by the rubygems system +games/hlserver-opera||2007-01-17|Has expired: distfile and homepage disappeared +games/mythserver||2007-01-17|Has expired: distfile disappeared +games/nwnusers||2007-01-17|Has expired: Does not make any sense any more. (NWN 2 is out there) +games/urban-sounds||2007-01-17|Has expired: distfile and homepage disappeared +games/urban||2007-01-17|Has expired: distfile and homepage disappeared +games/x3eyes||2007-01-17|Has expired: distfile disappeared and has no homepage +games/xeji||2007-01-17|Has expired: distfile disappeared and has no homepage +games/xemeraldia||2007-01-17|Has expired: distfile disappeared and has no homepage +games/xlifegame||2007-01-17|Has expired: distfile disappeared and has no homepage +games/xpilotmon||2007-01-17|Has expired: distfile disappeared and has no homepage +games/xsok||2007-01-17|Has expired: distfile disappeared and has no homepage +database/grass-i18n|database/grass|2007-01-18|Deprecated because i18n extension has been merged +net-mgmt/apan||2007-01-19|Has expired: Does not install +ftp/vcheck||2007-01-19|Has expired: distfile disappeared and has no homepage +deskutils/xfce4-calendar|deskutils/orage|2007-01-22|got obsolete by xfce 4.4 update +deskutils/xfce4-taskbar-plugin||2007-01-22|got obsolete by xfce 4.4 update +deskutils/xfce4-windowlist-plugin||2007-01-22|got obsolete by xfce 4.4 update +games/xfce4-toys||2007-01-22|got obsolete by xfce 4.4 update +misc/xfce4-iconbox||2007-01-22|got obsolete by xfce 4.4 update +sysutils/xfce4-showdesktop-plugin|deskutils/orage|2007-01-22|got obsolete by xfce 4.4 update +x11/xfce4-trigger-launcher||2007-01-22|got obsolete by xfce 4.4 update +x11-fm/xfce4-fm||2007-01-22|got obsolete by xfce 4.4 update +x11-wm/xfce4-systray||2007-01-22|got obsolete by xfce 4.4 update +russian/rispell||2007-01-23|Has expired: does not work with current textproc/ispell, use rus-ispell port istead +audio/mp3encode||2007-01-25|Has expired: is unfetchable and has no homepage +biology/coalesce||2007-01-25|Has expired: Not supported by the authors. Last version is from 1995. Use biology/fluctuate instead. +devel/leoarg||2007-01-25|Has expired: distfile and homepage disappeared +misc/dirtree||2007-01-25|distfile and homepage disappeared +misc/argparse||2007-01-25|distfile and homepage disappeared +audio/gstreamer-plugins-wavpack80||2007-01-25|does not build with current wavpack and got obsolete by 0.10.x version +net-mgmt/pfpro||2007-01-26|Has expired: Does not compile +emulators/vx68k||2007-01-26|Has expired: distfile disappeared from homepage +emulators/libvm68k||2007-01-26|Has expired: distfile disappeared from homepage +textproc/ruby-text-format||2007-01-26|Has expired: distfile and homepage disappeared +www/flashplugin||2007-01-27|Obsolete, broken +lang/python21||2007-01-26|Has expired: Version branch long since retired +lang/python22||2007-01-26|Has expired: Version branch long since retired +audio/lopster|net-p2p/lopster|2007-01-28|Moved to better category +net/p5-Spread||2007-01-29|Has expired: Spread comes with its own Perl library +lang/glade-gpl||2007-01-31|Removed +graphics/linux_glx||2007-02-02|Removed as part of obsolete XFree86 3.X +graphics/mesagl||2007-02-02|Removed as part of obsolete XFree86 3.X +graphics/xpm||2007-02-02|Removed as part of obsolete XFree86 3.X +x11/XFree86||2007-02-02|Removed this obsolete old version of XFree86 +x11/XFree86-contrib||2007-02-02|Removed this obsolete old version of XFree86 +sysutils/unidesc|sysutils/uniutils|2007-02-04|Renamed by the author +devel/portcheckout|ports-mgmt/portcheckout|2007-02-05|Moved to a new category +devel/portlint|ports-mgmt/portlint|2007-02-05|Moved to a new category +devel/portmk|ports-mgmt/portmk|2007-02-05|Moved to a new category +devel/porttools|ports-mgmt/porttools|2007-02-05|Moved to a new category +misc/instant-tinderbox|ports-mgmt/instant-tinderbox|2007-02-05|Moved to a new category +misc/porteasy|ports-mgmt/porteasy|2007-02-05|Moved to a new category +misc/portell|ports-mgmt/portell|2007-02-05|Moved to a new category +misc/portless|ports-mgmt/portless|2007-02-05|Moved to a new category +misc/tinderbox|ports-mgmt/tinderbox|2007-02-05|Moved to a new category +security/jailaudit|ports-mgmt/jailaudit|2007-02-05|Moved to a new category +security/portaudit|ports-mgmt/portaudit|2007-02-05|Moved to a new category +security/portaudit-db|ports-mgmt/portaudit-db|2007-02-05|Moved to a new category +security/vulnerability-test-port|ports-mgmt/vulnerability-test-port|2007-02-05|Moved to a new category +sysutils/barry|ports-mgmt/barry|2007-02-05|Moved to a new category +sysutils/bpm|ports-mgmt/bpm|2007-02-05|Moved to a new category +sysutils/kports|ports-mgmt/kports|2007-02-05|Moved to a new category +sysutils/managepkg|ports-mgmt/managepkg|2007-02-05|Moved to a new category +sysutils/newportsversioncheck|ports-mgmt/newportsversioncheck|2007-02-05|Moved to a new category +sysutils/pib|ports-mgmt/pib|2007-02-05|Moved to a new category +sysutils/pkgfe|ports-mgmt/pkgfe|2007-02-05|Moved to a new category +sysutils/pkg-orphan|ports-mgmt/pkg-orphan|2007-02-05|Moved to a new category +sysutils/pkg_cutleaves|ports-mgmt/pkg_cutleaves|2007-02-05|Moved to a new category +sysutils/pkg_install|ports-mgmt/pkg_install|2007-02-05|Moved to a new category +sysutils/pkg_install-devel|ports-mgmt/pkg_install-devel|2007-02-05|Moved to a new category +sysutils/pkg_remove|ports-mgmt/pkg_remove|2007-02-05|Moved to a new category +sysutils/pkg_rmleaves|ports-mgmt/pkg_rmleaves|2007-02-05|Moved to a new category +sysutils/pkg_trackinst|ports-mgmt/pkg_trackinst|2007-02-05|Moved to a new category +sysutils/pkg_tree|ports-mgmt/pkg_tree|2007-02-05|Moved to a new category +sysutils/portbrowser|ports-mgmt/portbrowser|2007-02-05|Moved to a new category +sysutils/portconf|ports-mgmt/portconf|2007-02-05|Moved to a new category +sysutils/portdowngrade|ports-mgmt/portdowngrade|2007-02-05|Moved to a new category +sysutils/portcheck|ports-mgmt/portcheck|2007-02-05|Moved to a new category +sysutils/portmanager|ports-mgmt/portmanager|2007-02-05|Moved to a new category +sysutils/portmaster|ports-mgmt/portmaster|2007-02-05|Moved to a new category +sysutils/portscout|ports-mgmt/portscout|2007-02-05|Moved to a new category +sysutils/portsearch|ports-mgmt/portsearch|2007-02-05|Moved to a new category +sysutils/portsman|ports-mgmt/portsman|2007-02-05|Moved to a new category +sysutils/portsnap|ports-mgmt/portsnap|2007-02-05|Moved to a new category +sysutils/portsopt|ports-mgmt/portsopt|2007-02-05|Moved to a new category +sysutils/portupgrade|ports-mgmt/portupgrade|2007-02-05|Moved to a new category +sysutils/portupgrade-devel|ports-mgmt/portupgrade-devel|2007-02-05|Moved to a new category +sysutils/port-authoring-tools|ports-mgmt/port-authoring-tools|2007-02-05|Moved to a new category +sysutils/port-maintenance-tools|ports-mgmt/port-maintenance-tools|2007-02-05|Moved to a new category +sysutils/psearch|ports-mgmt/psearch|2007-02-05|Moved to a new category +sysutils/p5-FreeBSD-Portindex|ports-mgmt/p5-FreeBSD-Portindex|2007-02-05|Moved to a new category +sysutils/qtpkg|ports-mgmt/qtpkg|2007-02-05|Moved to a new category +textproc/p5-FreeBSD-Ports|ports-mgmt/p5-FreeBSD-Ports|2007-02-05|Moved to a new category +sysutils/pkg_replace|ports-mgmt/pkg_replace|2007-02-05|Moved to a new category +archivers/py-bzip2||2007-02-05|Included with all current python versions in ports tree +devel/py-logging||2007-02-05|Included with all current python versions in ports tree +misc/qt4-codecs-tw|chinese/qt4-codecs-tw|2007-02-06|Accidentally added to wrong category +www/squid26|www/squid|2007-02-07|Squid 2.6 is now mainstream version +irc/xchat-systray-plugin||2007-02-07|Has expired: Functionality is now included in xchat +net/nicmond||2007-02-07|Has expired: Disappeared from the internet +www/caudium10||2007-02-07|Has expired: Please use www/caudium12 +net/openldap22-client||2007-02-07|Removed: OpenLDAP 2.2.x is no longer supported by developers +net/openldap22-sasl-client||2007-02-07|Removed: OpenLDAP 2.2.x is no longer supported by developers +net/openldap22-sasl-server||2007-02-07|Removed: OpenLDAP 2.2.x is no longer supported by developers +net/openldap22-server||2007-02-07|Removed: OpenLDAP 2.2.x is no longer supported by developers +databases/ruby-sqlite3|databases/rubygem-sqlite3|2007-02-08|Moved to rubygem version +databases/pecl-PDO|databases/php5-pdo|2007-02-09|PHP5 bundled version is newer +databases/pecl-PDO_DBLIB|databases/php5-pdo_dblib|2007-02-09|PHP5 bundled version is newer +databases/pecl-PDO_MYSQL|databases/php5-pdo_mysql|2007-02-09|PHP5 bundled version is newer +databases/pecl-PDO_OCI|databases/php5-pdo_oci|2007-02-09|PHP5 bundled version is newer +databases/pecl-PDO_ODBC|databases/php5-pdo_odbc|2007-02-09|PHP5 bundled version is newer +databases/pecl-PDO_PGSQL|databases/php5-pdo_pgsql|2007-02-09|PHP5 bundled version is newer +databases/pecl-PDO_SQLITE|databases/php5-pdo_sqlite|2007-02-09|PHP5 bundled version is newer +math/pear-Structures_Graph|devel/pear|2007-02-09|Included in base pear installation +lang/cli||2007-02-10|Port was broken with no sign of a fix +misc/moviedb||2007-02-10|Port was broken with no sign of a fix +devel/cl-asdf-cmucl||2007-02-10|Port was broken with no sign of a fix +graphics/libdjvu++||2007-02-10|Port was broken with no sign of a fix +graphics/dri-devel||2007-02-10|Expired port +devel/cl-infix-cmucl||2007-02-10|Depended on removed port devel/cl-asdf-cmucl +devel/cl-split-sequence-cmucl||2007-02-10|Depended on removed port devel/cl-asdf-cmucl +devel/cl-uffi-cmucl||2007-02-10|Depended on removed port devel/cl-asdf-cmucl +textproc/cl-meta-cmucl||2007-02-10|Depended on removed port devel/cl-asdf-cmucl +textproc/cl-ppcre-cmucl||2007-02-10|Depended on removed port devel/cl-asdf-cmucl +www/cl-lml-cmucl||2007-02-10|Depended on removed port devel/cl-asdf-cmucl +emulators/vmware-tools2||2007-02-12|Has expired: Unfetchable +lang/ruby16||2007-02-13|Port passed expiry date and was removed. +lang/ruby16-shim-ruby18||2007-02-13|Port passed expiry date and was removed. +lang/ruby16_static||2007-02-13|Port passed expiry date and was removed. +lang/ruby18_static||2007-02-13|Port passed expiry date and was removed. +devel/Subversive|devel/subversive|2007-02-16|Normalize port name +www/ruby-mnogosearch||2007-02-17|Has expired: distfile and homepage disappeared +textproc/p5-Pod-LaTeX||2007-02-18|Has expired: Incorrect pkg-plist +editors/emacs20-mule-devel||2007-02-18|Has expired: homepage and patchfiles disappeared +irc/sircd||2007-02-18|Has expired: No upgrade since 02-02-2002. Developer unavailable. Website gone. +math/vtk43-headers||2007-02-18|Has expired: Please use vtk 4.4 or 5.x. +math/vtk43||2007-02-18|Has expired: Please use vtk 4.4 or 5.x. +textproc/ruby-htmlcompact||2007-02-18|Has expired: distfile and homepage disappeared +textproc/ruby-rwv2||2007-02-18|Has expired: distfile disappeared and has no homepage +net/happystats||2007-02-18|Has expired: Disappeared from the internet +www/drupal-pubcookie||2007-02-19|Has expired: No maintainer +lang/tcc||2007-02-19|Has expired: is unusable; tcc -run works, but little else +www/p5-HTML||2007-02-23|Has expired: project no longer exists +audio/speex-devel|audio/speex|2007-02-23|Merged into audio/speex +www/horde|www/horde-base|2007-02-24|Port renamed for consistency +www/phpip|net-mgmt/phpip|2007-02-26|move to net-mgmt/phpip +www/aolserver-openacs-pg||2007-02-28|Not longer needed. +devel/boost-gcc3|devel/boost|2007-03-07|Removed support for FreeBSD 4. +graphics/jpeg-mmx|graphics/jpeg|2007-03-08|Has expired: no longer needed. +graphics/gstreamer-plugins-jpeg-mmx80|graphics/gstreamer-plugins-jpeg80|2007-03-08|graphics/jpeg-mmx was removed +java/linux-ibm-jdk13||2007-03-09|Has expired: Vulnerabilities in the browser plugin +java/linux-ibm-jdk14||2007-03-09|Has expired: Vulnerabilities in the browser plugin +japanese/emacs20-dl-canna||2007-03-09|Has expired: has deprecated dependency +japanese/emacs20-dl-wnn6||2007-03-09|Has expired: has deprecated dependency +misc/pbs||2007-03-11|Has expired: failed to build +devel/pcre-utf8||2007-03-11|UTF8 support is now enabled in devel/pcre +www/ruby-webunit||2007-03-13|Has expired: has deprecated dependencies +emulators/grustibus||2007-03-13|Has expired: Project was abandoned 6 years ago and expects an old version of xmame (0.37b4), please use other frontends instead (like gxmame) +graphics/drm-kmod||2007-03-13|Has expired: Broken on all supported versions of FreeBSD +java/janosvm||2007-03-13|Has expired: Broken on all supported versions of FreeBSD +korean/gau||2007-03-13|Has expired: Broken on all supported versions of FreeBSD +lang/cyclone||2007-03-13|Has expired: Broken on all supported versions of FreeBSD +lang/pike70||2007-03-13|Has expired: Please use pike72 +misc/lile||2007-03-13|Has expired: Broken on all supported versions of FreeBSD +misc/muuz||2007-03-13|Has expired: Broken on all supported versions of FreeBSD +misc/xdf||2007-03-13|Has expired: Broken on all supported versions of FreeBSD +net/telnetx||2007-03-13|Has expired: Broken on all supported versions of FreeBSD +sysutils/diskmark||2007-03-13|Has expired: Makes no sense on FreeBSD > 4.x. Use glabel(8) instead +sysutils/diskusage||2007-03-13|Has expired: Unmainntaied, MASTER_SITES disappeared, WWW disappeared. +sysutils/xperfmon3||2007-03-13|Has expired: Broken on all supported versions of FreeBSD +comms/mwavem||2007-03-13|Has expired: Broken on all supported versions of FreeBSD +chinese/big5fs||2007-03-14|Has expired: Use mount_cd9660(8), mount_msdosfs(8), or mount_ntfs(8) instead +chinese/gbfs||2007-03-14|Has expired: Use mount_cd9660(8), mount_msdosfs(8), or mount_ntfs(8) instead +audio/anthem||2007-03-16|Has expired: this software is not developed any more +www/jakarta-tomcat41|www/tomcat41|2007-03-17|Renamed (no longer a Jakarta project) +multimedia/totem-gstreamer|multimedia/totem|2007-03-19|multimedia/totem now uses gstreamer by default +x11-wm/fluxbox-devel|x11-wm/fluxbox|2007-03-19|Merged into x11-wm/fluxbox +lang/xotcl-thread||2007-03-21|Not longer needed +graphics/gnome-colorscheme|graphics/agave|2007-03-21|Project renamed +databases/zodb||2007-03-22|Has expired: outdated software, databases/zodb3 should be used +finance/gnomepm||2007-03-22|Has expired: is unfetchable and has no homepage +games/frabs||2007-03-22|Has expired: is unfetchable and homepage disappeared +www/drupal|www/drupal4|2007-03-25|rename for drupal5 +www/drupal-attachment|www/drupal4-attachment|2007-03-25|rename for drupal5 +www/drupal-filemanager|www/drupal4-filemanager|2007-03-25|rename for drupal5 +www/drupal-gsitemap|www/drupal4-gsitemap|2007-03-25|rename for drupal5 +www/drupal-i18n|www/drupal4-i18n|2007-03-25|rename for drupal5 +www/drupal-nice_menus|www/drupal4-nice_menus|2007-03-25|rename for drupal5 +www/drupal-taxonomy_access|www/drupal4-taxonomy_access|2007-03-25|rename for drupal5 +www/drupal-textile|www/drupal4-textile|2007-03-25|rename for drupal5 +security/drupal-ldap_integration|security/drupal4-ldap_integration|2007-03-25|rename for drupal5 +devel/xdg-user-dirs-gtk||2007-03-25|Not all dependencies are in ports yet +net/pcs|net/py-pcs|2007-03-26|Renamed to fit python module naming convention +japanese/gal||2007-03-28|Has expired: Broken on all supported versions of FreeBSD +japanese/gnome||2007-03-28|Has expired: Broken on all supported versions of FreeBSD +japanese/gnomelibs||2007-03-28|Has expired: Broken on all supported versions of FreeBSD +x11-toolkits/ruby-fox|x11-toolkits/ruby-fox10|2007-03-29|rename for supporting multiple fox version +x11-toolkits/ruby-fox-devel|x11-toolkits/ruby-fox12|2007-03-29|rename for supporting multiple fox version +lang/tcl81-thread||2007-03-29|Remove an ancient, unused tcl version +editors/emacs20-dl||2007-04-02|Has expired: unfetchable, obsolete +editors/flim113-emacs20||2007-04-02|Has expired: unfetchable, obsolete +editors/semi113-emacs20||2007-04-02|Has expired: unfetchable, obsolete +lang/gfortran|lang/gcc42|2007-04-06|Superseded by and equivalent to gcc42 ==== //depot/projects/soc2006/gabor_ports/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: ports/Makefile,v 1.96 2006/02/11 02:26:30 kris Exp $ +# $FreeBSD: ports/Makefile,v 1.99 2007/02/26 08:54:07 ru Exp $ # SUBDIR += accessibility @@ -43,6 +43,7 @@ SUBDIR += news SUBDIR += palm SUBDIR += polish +SUBDIR += ports-mgmt SUBDIR += portuguese SUBDIR += print SUBDIR += russian @@ -71,11 +72,11 @@ @rm -f ${INDEXDIR}/${INDEXFILE} @cd ${.CURDIR} && make ${INDEXDIR}/${INDEXFILE} -fetchindex: ${INDEXDIR}/{INDEXFILE}.bz2 +fetchindex: ${INDEXDIR}/${INDEXFILE}.bz2 @bunzip2 < ${INDEXDIR}/${INDEXFILE}.bz2 > ${INDEXDIR}/${INDEXFILE} && \ chmod a+r ${INDEXDIR}/${INDEXFILE} -${INDEXDIR}/{INDEXFILE}.bz2: .PHONY +${INDEXDIR}/${INDEXFILE}.bz2: .PHONY @${FETCHINDEX} ${INDEXDIR}/${INDEXFILE}.bz2 ${MASTER_SITE_INDEX}${INDEXFILE}.bz2 MASTER_SITE_INDEX?= http://www.FreeBSD.org/ports/ @@ -139,7 +140,11 @@ @awk -F\| '{ printf("Port:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nB-deps:\t%s\nR-deps:\t%s\nE-deps:\t%s\nP-deps:\t%s\nF-deps:\t%s\nWWW:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9, $$11, $$12, $$13, $$10); }' < ${INDEXDIR}/${INDEXFILE} CVS?= cvs +.if ${OSVERSION} >= 601101 +SUP?= csup +.else SUP?= cvsup +.endif PORTSNAP?= portsnap >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 8 13:42:04 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1564B16A404; Sun, 8 Apr 2007 13:42:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BCE4416A401 for ; Sun, 8 Apr 2007 13:42:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A9DB313C45A for ; Sun, 8 Apr 2007 13:42:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l38Dg3nj064333 for ; Sun, 8 Apr 2007 13:42:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l38DeHlK061652 for perforce@freebsd.org; Sun, 8 Apr 2007 13:40:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 8 Apr 2007 13:40:17 GMT Message-Id: <200704081340.l38DeHlK061652@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 117647 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Apr 2007 13:42:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=117647 Change 117647 by rwatson@rwatson_zoo on 2007/04/08 13:38:53 - zfs - ipw, iwi firmware in tree - tcsh 6.15 - binutils 1.0.4 - bzip2 1.0.4 - openssl 0.9.8e - BIOCSDIRECTION, BIOCFEEDBACK - more libarchive magic - more sctp magic - more jasone malloc - ncurses update - dump/restore dump/restore extended attributes - cxgb(4) - mtx_sleep, sx_sleep, ... - sx(9) optimization - Adaptive sx, rwlock support - interrupt filters - cpufreq change notifications - linux futex support and more linux 2.6isms than you can shake a stick at - linux sg support - filedesc locked using sx - geom multipath - edsc (ethernet discard device) - acl kernel files resorted (kern_acl -> vfs_acl, subr_acl_posix1e) - extended attribute code moved from vfs_syscalls.c to vfs_extattr.c - sctp flight logging - fine-grained locking in UNIX domain sockets - prison services - acpica 20070320 - priv(9) for System V IPC, priv(9) renumbering - uipc_sockbuf.c move finished - multicast address referencing/locking fixes - tcp_input restructured - quite a bit of MAC cleanup - mpsafe quotas - usual host of device driver updates, bug fixes, enhancements, etc -- things - that I appreciate in an abstract sense. Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#45 integrate .. //depot/projects/trustedbsd/base/Makefile#50 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#83 integrate .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#20 integrate .. //depot/projects/trustedbsd/base/UPDATING#77 integrate .. //depot/projects/trustedbsd/base/bin/csh/config.h#7 integrate .. //depot/projects/trustedbsd/base/bin/csh/config_p.h#3 integrate .. //depot/projects/trustedbsd/base/bin/df/df.1#10 integrate .. //depot/projects/trustedbsd/base/bin/df/df.c#25 integrate .. //depot/projects/trustedbsd/base/bin/expr/expr.1#9 integrate .. //depot/projects/trustedbsd/base/bin/kill/kill.1#7 integrate .. //depot/projects/trustedbsd/base/bin/rcp/rcp.1#8 integrate .. //depot/projects/trustedbsd/base/bin/setfacl/setfacl.c#9 integrate .. //depot/projects/trustedbsd/base/cddl/Makefile#1 branch .. //depot/projects/trustedbsd/base/cddl/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/cddl/lib/Makefile#1 branch .. //depot/projects/trustedbsd/base/cddl/lib/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/cddl/lib/libavl/Makefile#1 branch .. //depot/projects/trustedbsd/base/cddl/lib/libnvpair/Makefile#1 branch .. //depot/projects/trustedbsd/base/cddl/lib/libumem/Makefile#1 branch .. //depot/projects/trustedbsd/base/cddl/lib/libuutil/Makefile#1 branch .. //depot/projects/trustedbsd/base/cddl/lib/libzfs/Makefile#1 branch .. //depot/projects/trustedbsd/base/cddl/lib/libzpool/Makefile#1 branch .. //depot/projects/trustedbsd/base/cddl/sbin/Makefile#1 branch .. //depot/projects/trustedbsd/base/cddl/sbin/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/cddl/sbin/zfs/Makefile#1 branch .. //depot/projects/trustedbsd/base/cddl/sbin/zpool/Makefile#1 branch .. //depot/projects/trustedbsd/base/cddl/usr.bin/Makefile#1 branch .. //depot/projects/trustedbsd/base/cddl/usr.bin/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/cddl/usr.bin/ztest/Makefile#1 branch .. //depot/projects/trustedbsd/base/cddl/usr.sbin/Makefile#1 branch .. //depot/projects/trustedbsd/base/cddl/usr.sbin/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/cddl/usr.sbin/zdb/Makefile#1 branch .. //depot/projects/trustedbsd/base/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/trustedbsd/base/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/trustedbsd/base/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/trustedbsd/base/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/trustedbsd/base/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/trustedbsd/base/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/trustedbsd/base/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/trustedbsd/base/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/trustedbsd/base/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/trustedbsd/base/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/trustedbsd/base/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/trustedbsd/base/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/trustedbsd/base/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/trustedbsd/base/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/hlfsd/hlfsd.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/as.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/tc.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/CHANGES#4 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/LICENSE#4 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/Makefile#4 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/Makefile-libbz2_so#4 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/README#4 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/README.COMPILATION.PROBLEMS#4 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/Y2K_INFO#2 delete .. //depot/projects/trustedbsd/base/contrib/bzip2/blocksort.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/bzip2.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/bzip2.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/bzip2recover.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/bzlib.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/bzlib.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/bzlib_private.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/compress.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/crctable.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/decompress.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/dlltest.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/huffman.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/manual.texi#3 delete .. //depot/projects/trustedbsd/base/contrib/bzip2/randtable.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/sample1.bz2.uu#4 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/sample1.ref.gz.uu#4 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/sample2.bz2.uu#4 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/sample2.ref.gz.uu#3 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/sample3.bz2.uu#4 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/sample3.ref.gz.uu#3 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/spewG.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/unzcrash.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/words0#2 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/words2#2 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/words3#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-bpf.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/netcat/nc.1#5 integrate .. //depot/projects/trustedbsd/base/contrib/netcat/netcat.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/netcat/socks.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_readline.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/opensolaris/cmd/zdb/zdb.8#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/cmd/zdb/zdb.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/cmd/zfs/zfs.8#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/cmd/zpool/zpool.8#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/cmd/ztest/ztest.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/head/assert.h#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/head/atomic.h#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/head/libintl.h#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/head/stdio_ext.h#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/head/synch.h#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/head/thread.h#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzpool/common/util.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-stp.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/FREEBSD-Xlist#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/Fixes#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/Imakefile#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/MAKEDIFFS#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/MAKESHAR#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/Makefile.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/Makefile.std#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/Makefile.vms#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/README#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/complete.tcsh#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/config.h.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/config/bsd4.4#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/config_f.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/configure#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/configure.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.chared.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.decls.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.defns.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.init.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.inputl.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.refresh.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.screen.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.term.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.term.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.xmap.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/eight-bit.me#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/gethost.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/glob.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/glob.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/host.defs#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/imake.config#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ma.setp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/mi.termios.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/mi.varargs.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set1#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set10#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set11#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set12#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set13#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set14#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set15#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set16#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set17#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set18#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set19#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set2#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set20#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set21#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set22#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set23#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set24#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set25#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set26#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set27#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set29#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set3#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set30#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set31#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set4#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set5#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set6#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set7#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set8#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set9#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/Makefile#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/set1#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/set10#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/set11#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/set12#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/set13#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/set14#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/set15#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/set16#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/set17#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/set18#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/set19#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/set2#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/set20#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/set21#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/set22#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/set23#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/set24#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/set25#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/set26#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/set27#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/set29#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/set3#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/set30#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/set31#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/set4#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/set5#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/set6#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/set7#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/set8#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/set9#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set1#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set10#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set11#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set12#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set13#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set14#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set15#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set16#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set17#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set18#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set19#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set2#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set20#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set21#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set22#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set23#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set24#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set25#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set26#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set27#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set29#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set3#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set30#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set31#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set4#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set5#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set6#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set7#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set8#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set9#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/set1#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/set10#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/set11#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/set12#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/set13#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/set14#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/set15#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/set16#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/set17#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/set18#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/set19#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/set2#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/set20#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/set21#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/set22#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/set23#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/set24#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/set25#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/set26#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/set27#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/set29#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/set3#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/set30#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/set31#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/set4#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/set5#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/set6#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/set7#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/set8#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/set9#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/set1#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/set10#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/set11#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/set12#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/set13#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/set14#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/set15#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/set16#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/set17#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/set18#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/set19#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/set2#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/set20#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/set21#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/set22#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/set23#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/set24#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/set25#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/set26#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/set27#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/set29#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/set3#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/set30#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/set31#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/set4#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/set5#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/set6#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/set7#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/set8#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/set9#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/set1#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/set10#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/set11#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/set12#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/set13#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/set14#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/set15#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/set16#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/set17#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/set18#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/set19#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/set2#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/set20#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/set21#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/set22#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/set23#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/set24#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/set25#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/set26#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/set27#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/set29#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/set3#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/set30#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/set31#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/set4#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/set5#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/set6#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/set7#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/set8#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/set9#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/set1#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/set10#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/set11#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/set12#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/set13#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/set14#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/set15#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/set16#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/set17#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/set18#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/set19#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/set2#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/set20#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/set21#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/set22#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/set23#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/set24#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/set25#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/set26#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/set27#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/set29#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/set3#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/set30#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/set31#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/set4#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/set5#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/set6#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/set7#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/set8#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/set9#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ja/set1#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ja/set10#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ja/set11#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ja/set12#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ja/set13#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ja/set15#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ja/set16#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ja/set17#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ja/set18#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ja/set2#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ja/set21#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ja/set24#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ja/set29#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ja/set3#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ja/set30#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ja/set4#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ja/set5#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ja/set6#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ja/set7#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ja/set8#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set1#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set10#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set11#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set12#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set13#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set14#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set15#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set16#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set17#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set18#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set19#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set2#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set20#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set21#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set22#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set23#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set24#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set25#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set26#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set27#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set29#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set3#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set30#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set31#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set4#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set5#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set6#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set7#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set8#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set9#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set1#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set10#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set11#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set12#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set13#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set14#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set15#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set16#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set17#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set18#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set19#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set2#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set20#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set21#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set22#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set23#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set24#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set25#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set26#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set27#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set29#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set3#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set30#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set31#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set4#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set5#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set6#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set7#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set8#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set9#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/set1#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/set10#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/set11#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/set12#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/set13#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/set14#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/set15#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/set16#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/set17#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/set18#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/set19#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/set2#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/set20#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/set21#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/set22#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/set23#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/set24#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/set25#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/set26#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/set27#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/set29#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/set3#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/set30#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/set31#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/set4#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/set5#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/set6#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/set7#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/set8#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/set9#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set1#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set10#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set11#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set12#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set13#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set14#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set15#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set16#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set17#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set18#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set19#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set2#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set20#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set21#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set22#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set23#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set24#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set25#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set26#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set27#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set29#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set3#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set30#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set31#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set4#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set5#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set6#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set7#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set8#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set9#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/patchlevel.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/pathnames.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.char.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.char.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.decls.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.dir.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.dir.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.dol.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.err.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.exec.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.exp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.file.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.func.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.glob.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.hist.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.init.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.lex.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.misc.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.parse.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.print.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.proc.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.proc.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.sem.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.set.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.time.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.types.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/snames.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.alloc.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.bind.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.const.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.decls.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.disc.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.func.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.nls.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.nls.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.os.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.os.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.printf.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.prompt.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.sched.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.sig.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.sig.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.str.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.vers.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.wait.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.who.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tcsh.man#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tcsh.man2html#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/termcap.vms#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tw.color.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tw.comp.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tw.decls.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tw.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tw.help.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tw.init.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tw.parse.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tw.spell.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/vms.termcap.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/CHANGES#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Configure#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/FAQ#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/INSTALL#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/LICENSE#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Makefile#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/NEWS#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/README#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/CA.pl#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/Makefile#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/ca.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/dgst.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/ec.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/enc.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/ocsp.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/pkcs12.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/s_client.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/s_server.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/certs/aol1.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/aol2.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/aoltw1.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/aoltw2.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/config#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/Makefile#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes_misc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_strex.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1_err.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1_lib.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1t.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/t_x509.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/tasn_dec.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_x509.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bf/bf_ecb.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bio.h#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bio_err.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bio_lib.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_err.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_lib.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_print.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/buffer/buf_err.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/camellia/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/camellia/camellia.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/camellia/cmll_cbc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/camellia/cmll_locl.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/camellia/cmll_misc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cast/c_ecb.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/comp/c_zlib.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/comp/comp_err.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf_def.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf_err.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf_lib.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cpt_err.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cryptlib.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/INSTALL#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/des_ver.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/ecb_enc.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh_err.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh_lib.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_err.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_lib.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dso/dso_err.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec_asn1.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec_err.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdh/ech_err.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdh/ech_lib.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdsa/ecdsa.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdsa/ecs_err.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdsa/ecs_lib.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdsa/ecs_ossl.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_all.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_padlock.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/tb_ecdh.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/tb_ecdsa.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/err_all.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/bio_md.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp.h#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_enc.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_err.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_lib.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_locl.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/idea/i_ecb.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/idea/idea_lcl.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/lhash/lhash.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md2/md2.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md2/md2_dgst.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md4/md4.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md4/md4_dgst.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md5/md5.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md5/md5_dgst.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/obj_dat.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/obj_err.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/obj_mac.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/obj_mac.num#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/objects.txt#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ocsp/ocsp_asn.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ocsp/ocsp_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ocsp/ocsp_vfy.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/opensslconf.h#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/opensslv.h#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem_err.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem_lib.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem_pkey.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/pk12err.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/pk7_doit.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/pk7_lib.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/pk7_smime.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/pkcs7err.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/md_rand.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/rand_err.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc2/rc2_ecb.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc4/rc4_skey.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ripemd/ripemd.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ripemd/rmd_dgst.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_err.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_lib.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/sha.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/sha1dgst.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/sha256.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/sha512.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/sha_dgst.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/stack/safestack.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/stack/stack.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/store/str_err.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/txt_db/txt_db.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ui/ui_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/by_dir.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509.h#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_err.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_req.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_txt.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_vfy.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_vfy.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/Makefile#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/ext_dat.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/pcy_tree.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_addr.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_akey.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_alt.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_asid.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_bcons.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_bitst.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_cpols.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_crld.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_enum.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_extku.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_ia5.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_info.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_int.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_ncons.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_ocsp.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_pci.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_pcons.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_pku.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_pmaps.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_purp.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_skey.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_sxnet.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_utl.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3err.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/x509v3.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/ciphers.pod#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/s_client.pod#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/x509.pod#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/ASN1_STRING_print_ex.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/BIO_set_callback.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/CONF_modules_free.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/RAND_egd.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/RSA_get_ex_new_index.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/md5.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/mdc2.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/ripemd.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/sha.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CTX_set_tmp_rsa_callback.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_SESSION_get_time.pod#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/openssl.spec#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/d1_lib.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/d1_pkt.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/kssl.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s23_clnt.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s23_srvr.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s2_enc.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s2_lib.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_clnt.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_enc.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_lib.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_pkt.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_srvr.c#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl.h#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_ciph.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_err.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_lib.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_sess.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/t1_enc.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/t1_lib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/test/Makefile#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/tools/c_rehash#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/libeay.num#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/mk1mf.pl#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/mkdef.pl#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/mkerr.pl#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/ssleay.num#5 integrate .. //depot/projects/trustedbsd/base/etc/defaults/periodic.conf#22 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#66 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#40 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.root.dist#14 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.usr.dist#46 integrate .. //depot/projects/trustedbsd/base/etc/network.subr#17 integrate .. //depot/projects/trustedbsd/base/etc/periodic/daily/404.status-zfs#1 branch .. //depot/projects/trustedbsd/base/etc/periodic/daily/Makefile#7 integrate .. //depot/projects/trustedbsd/base/etc/periodic/security/800.loginfail#8 integrate .. //depot/projects/trustedbsd/base/etc/periodic/weekly/310.locate#2 integrate .. //depot/projects/trustedbsd/base/etc/rc#30 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/FILESYSTEMS#1 branch .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#45 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/addswap#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/adjkerntz#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/bgfsck#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/bootconf.sh#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/cleanvar#11 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/dhclient#18 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/geli2#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/hostname#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ip6addrctl#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ip6fw#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ipfilter#18 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ipfw#15 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ipmon#12 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ipsec#11 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/isdnd#13 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/kldxref#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/mountcritremote#13 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/mountd#11 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/netif#17 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/nfslocking#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/pf#13 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/pflog#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/pfsync#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/power_profile#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ppp#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/random#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/syscons#14 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/var#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/zfs#1 branch .. //depot/projects/trustedbsd/base/etc/rc.firewall#10 integrate .. //depot/projects/trustedbsd/base/etc/rc.subr#32 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#60 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes-o.real#10 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/Makefile.fe#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/Makefile.inc#7 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/c++filt/Makefile#9 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_int/Makefile#17 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/f77/Makefile#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/kgdb.h#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/kthr.c#7 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/trgt_i386.c#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#10 integrate .. //depot/projects/trustedbsd/base/include/protocols/dumprestore.h#5 integrate .. //depot/projects/trustedbsd/base/include/stdio.h#16 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/Makefile#24 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/README#5 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive.h.in#15 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_check_magic.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.3#9 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.c#19 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.h#13 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_private.h#17 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read.3#14 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read.c#16 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_data_into_buffer.c#7 delete .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_data_into_fd.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_extract.c#18 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_open_memory.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_private.h#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_bzip2.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_compress.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_gzip.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_none.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_all.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_ar.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_cpio.c#15 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_empty.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_iso9660.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_tar.c#20 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_zip.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_util.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_util.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_virtual.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write.3#12 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write.c#14 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_disk.3#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_disk.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_disk_private.h#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_disk_set_standard_lookup.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_private.h#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_compression_bzip2.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_compression_gzip.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_compression_none.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_ar.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_cpio.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_pax.c#20 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_shar.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_ustar.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/libarchive-formats.5#10 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/Makefile#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/README#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/main.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test.h#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_acl_basic.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_acl_pax.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_archive_api_feature.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_bad_fd.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_data_large.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_extract.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_format_ar.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_format_cpio_bin.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_format_cpio_bin_Z.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_format_cpio_bin_gz.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_format_cpio_odc.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_format_empty.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_format_gtar_gz.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_format_iso_gz.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_format_isorr_bz2.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_format_pax_bz2.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_format_tar.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_format_tbz.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_format_tgz.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_format_tz.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_format_zip.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_large.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_position.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_truncated.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_disk.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_disk_perms.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_disk_secure.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_format_ar.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_format_cpio_empty.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_format_shar_empty.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_format_tar.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_format_tar_empty.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_open_memory.c#1 branch .. //depot/projects/trustedbsd/base/lib/libatm/cache_key.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/Makefile#25 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/stdlib/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/lib/libc/amd64/stdlib/div.S#1 branch .. //depot/projects/trustedbsd/base/lib/libc/amd64/stdlib/ldiv.S#1 branch .. //depot/projects/trustedbsd/base/lib/libc/amd64/stdlib/lldiv.S#1 branch .. //depot/projects/trustedbsd/base/lib/libc/gen/Symbol.map#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/dlfcn.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getvfsbyname.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/tls.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/valloc.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/Makefile.inc#18 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/Symbol.map#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/addr2ascii.3#7 delete .. //depot/projects/trustedbsd/base/lib/libc/net/addr2ascii.c#3 delete .. //depot/projects/trustedbsd/base/lib/libc/net/ascii2addr.c#3 delete .. //depot/projects/trustedbsd/base/lib/libc/net/getnameinfo.3#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getnameinfo.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/inet.3#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/linkaddr.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/sctp_bindx.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/net/sctp_connectx.3#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 8 15:40:20 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 856F716A403; Sun, 8 Apr 2007 15:40:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 54B3116A413 for ; Sun, 8 Apr 2007 15:40:20 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 147B913C448 for ; Sun, 8 Apr 2007 15:40:20 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l38FeJLj005554 for ; Sun, 8 Apr 2007 15:40:19 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l38FdW2p005477 for perforce@freebsd.org; Sun, 8 Apr 2007 15:39:32 GMT (envelope-from piso@freebsd.org) Date: Sun, 8 Apr 2007 15:39:32 GMT Message-Id: <200704081539.l38FdW2p005477@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 117656 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Apr 2007 15:40:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=117656 Change 117656 by piso@piso_newluxor on 2007/04/08 15:38:44 IFC@117643 Affected files ... .. //depot/projects/soc2005/libalias/MAINTAINERS#6 integrate .. //depot/projects/soc2005/libalias/Makefile#11 integrate .. //depot/projects/soc2005/libalias/Makefile.inc1#11 integrate .. //depot/projects/soc2005/libalias/ObsoleteFiles.inc#19 integrate .. //depot/projects/soc2005/libalias/UPDATING#17 integrate .. //depot/projects/soc2005/libalias/bin/csh/config.h#2 integrate .. //depot/projects/soc2005/libalias/bin/csh/config_p.h#2 integrate .. //depot/projects/soc2005/libalias/bin/df/df.1#2 integrate .. //depot/projects/soc2005/libalias/bin/df/df.c#4 integrate .. //depot/projects/soc2005/libalias/bin/expr/expr.1#2 integrate .. //depot/projects/soc2005/libalias/bin/kill/kill.1#2 integrate .. //depot/projects/soc2005/libalias/bin/rcp/rcp.1#2 integrate .. //depot/projects/soc2005/libalias/bin/setfacl/setfacl.c#2 integrate .. //depot/projects/soc2005/libalias/cddl/Makefile#1 branch .. //depot/projects/soc2005/libalias/cddl/Makefile.inc#1 branch .. //depot/projects/soc2005/libalias/cddl/lib/Makefile#1 branch .. //depot/projects/soc2005/libalias/cddl/lib/Makefile.inc#1 branch .. //depot/projects/soc2005/libalias/cddl/lib/libavl/Makefile#1 branch .. //depot/projects/soc2005/libalias/cddl/lib/libnvpair/Makefile#1 branch .. //depot/projects/soc2005/libalias/cddl/lib/libumem/Makefile#1 branch .. //depot/projects/soc2005/libalias/cddl/lib/libuutil/Makefile#1 branch .. //depot/projects/soc2005/libalias/cddl/lib/libzfs/Makefile#1 branch .. //depot/projects/soc2005/libalias/cddl/lib/libzpool/Makefile#1 branch .. //depot/projects/soc2005/libalias/cddl/sbin/Makefile#1 branch .. //depot/projects/soc2005/libalias/cddl/sbin/Makefile.inc#1 branch .. //depot/projects/soc2005/libalias/cddl/sbin/zfs/Makefile#1 branch .. //depot/projects/soc2005/libalias/cddl/sbin/zpool/Makefile#1 branch .. //depot/projects/soc2005/libalias/cddl/usr.bin/Makefile#1 branch .. //depot/projects/soc2005/libalias/cddl/usr.bin/Makefile.inc#1 branch .. //depot/projects/soc2005/libalias/cddl/usr.bin/ztest/Makefile#1 branch .. //depot/projects/soc2005/libalias/cddl/usr.sbin/Makefile#1 branch .. //depot/projects/soc2005/libalias/cddl/usr.sbin/Makefile.inc#1 branch .. //depot/projects/soc2005/libalias/cddl/usr.sbin/zdb/Makefile#1 branch .. //depot/projects/soc2005/libalias/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/soc2005/libalias/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/soc2005/libalias/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/soc2005/libalias/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/soc2005/libalias/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/soc2005/libalias/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/soc2005/libalias/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/soc2005/libalias/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/soc2005/libalias/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/soc2005/libalias/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/soc2005/libalias/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/soc2005/libalias/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/soc2005/libalias/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/soc2005/libalias/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/hlfsd/hlfsd.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/binutils/gas/as.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/binutils/gas/tc.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/CHANGES#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/FREEBSD-upgrade#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/LICENSE#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/Makefile#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/Makefile-libbz2_so#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/README#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/README.COMPILATION.PROBLEMS#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/Y2K_INFO#2 delete .. //depot/projects/soc2005/libalias/contrib/bzip2/blocksort.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/bzip2.1#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/bzip2.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/bzip2recover.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/bzlib.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/bzlib.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/bzlib_private.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/compress.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/crctable.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/decompress.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/dlltest.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/huffman.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/manual.texi#2 delete .. //depot/projects/soc2005/libalias/contrib/bzip2/randtable.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/sample1.bz2.uu#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/sample1.ref.gz.uu#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/sample2.bz2.uu#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/sample2.ref.gz.uu#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/sample3.bz2.uu#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/sample3.ref.gz.uu#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/spewG.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/unzcrash.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/words0#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/words2#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/words3#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-bpf.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/netcat/nc.1#2 integrate .. //depot/projects/soc2005/libalias/contrib/netcat/netcat.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/netcat/socks.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/lib/openpam_readline.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zdb/zdb.8#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zdb/zdb.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zfs/zfs.8#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zpool/zpool.8#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/ztest/ztest.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/head/assert.h#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/head/atomic.h#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/head/libintl.h#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/head/stdio_ext.h#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/head/synch.h#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/head/thread.h#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzpool/common/util.c#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-stp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/FREEBSD-Xlist#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/FREEBSD-upgrade#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/Fixes#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/Imakefile#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/MAKEDIFFS#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/MAKESHAR#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/Makefile.std#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/Makefile.vms#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/README#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/complete.tcsh#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/config.h.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/config/bsd4.4#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/config_f.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/configure#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/configure.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/ed.chared.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/ed.decls.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/ed.defns.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/ed.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/ed.init.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/ed.inputl.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/ed.refresh.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/ed.screen.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/ed.term.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/ed.term.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/ed.xmap.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/eight-bit.me#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/gethost.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/glob.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/glob.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/host.defs#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/imake.config#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/ma.setp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/mi.termios.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/mi.varargs.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/C/set1#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/C/set10#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/C/set11#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/C/set12#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/C/set13#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/C/set14#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/C/set15#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/C/set16#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/C/set17#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/C/set18#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/C/set19#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/C/set2#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/C/set20#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/C/set21#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/C/set22#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/C/set23#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/C/set24#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/C/set25#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/C/set26#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/C/set27#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/C/set29#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/C/set3#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/C/set30#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/C/set31#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/C/set4#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/C/set5#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/C/set6#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/C/set7#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/C/set8#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/C/set9#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/Makefile#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/et/set1#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/et/set10#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/et/set11#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/et/set12#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/et/set13#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/et/set14#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/et/set15#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/et/set16#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/et/set17#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/et/set18#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/et/set19#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/et/set2#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/et/set20#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/et/set21#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/et/set22#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/et/set23#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/et/set24#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/et/set25#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/et/set26#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/et/set27#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/et/set29#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/et/set3#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/et/set30#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/et/set31#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/et/set4#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/et/set5#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/et/set6#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/et/set7#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/et/set8#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/et/set9#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/finnish/set1#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/finnish/set10#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/finnish/set11#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/finnish/set12#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/finnish/set13#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/finnish/set14#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/finnish/set15#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/finnish/set16#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/finnish/set17#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/finnish/set18#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/finnish/set19#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/finnish/set2#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/finnish/set20#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/finnish/set21#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/finnish/set22#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/finnish/set23#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/finnish/set24#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/finnish/set25#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/finnish/set26#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/finnish/set27#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/finnish/set29#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/finnish/set3#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/finnish/set30#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/finnish/set31#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/finnish/set4#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/finnish/set5#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/finnish/set6#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/finnish/set7#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/finnish/set8#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/finnish/set9#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/french/set1#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/french/set10#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/french/set11#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/french/set12#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/french/set13#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/french/set14#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/french/set15#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/french/set16#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/french/set17#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/french/set18#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/french/set19#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/french/set2#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/french/set20#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/french/set21#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/french/set22#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/french/set23#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/french/set24#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/french/set25#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/french/set26#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/french/set27#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/french/set29#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/french/set3#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/french/set30#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/french/set31#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/french/set4#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/french/set5#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/french/set6#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/french/set7#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/french/set8#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/french/set9#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/german/set1#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/german/set10#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/german/set11#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/german/set12#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/german/set13#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/german/set14#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/german/set15#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/german/set16#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/german/set17#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/german/set18#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/german/set19#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/german/set2#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/german/set20#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/german/set21#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/german/set22#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/german/set23#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/german/set24#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/german/set25#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/german/set26#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/german/set27#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/german/set29#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/german/set3#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/german/set30#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/german/set31#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/german/set4#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/german/set5#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/german/set6#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/german/set7#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/german/set8#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/german/set9#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/greek/set1#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/greek/set10#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/greek/set11#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/greek/set12#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/greek/set13#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/greek/set14#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/greek/set15#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/greek/set16#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/greek/set17#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/greek/set18#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/greek/set19#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/greek/set2#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/greek/set20#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/greek/set21#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/greek/set22#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/greek/set23#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/greek/set24#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/greek/set25#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/greek/set26#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/greek/set27#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/greek/set29#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/greek/set3#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/greek/set30#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/greek/set31#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/greek/set4#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/greek/set5#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/greek/set6#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/greek/set7#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/greek/set8#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/greek/set9#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/italian/set1#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/italian/set10#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/italian/set11#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/italian/set12#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/italian/set13#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/italian/set14#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/italian/set15#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/italian/set16#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/italian/set17#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/italian/set18#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/italian/set19#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/italian/set2#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/italian/set20#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/italian/set21#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/italian/set22#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/italian/set23#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/italian/set24#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/italian/set25#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/italian/set26#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/italian/set27#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/italian/set29#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/italian/set3#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/italian/set30#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/italian/set31#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/italian/set4#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/italian/set5#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/italian/set6#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/italian/set7#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/italian/set8#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/italian/set9#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ja/set1#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ja/set10#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ja/set11#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ja/set12#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ja/set13#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ja/set15#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ja/set16#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ja/set17#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ja/set18#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ja/set2#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ja/set21#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ja/set24#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ja/set29#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ja/set3#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ja/set30#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ja/set4#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ja/set5#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ja/set6#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ja/set7#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ja/set8#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/pl/set1#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/pl/set10#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/pl/set11#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/pl/set12#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/pl/set13#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/pl/set14#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/pl/set15#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/pl/set16#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/pl/set17#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/pl/set18#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/pl/set19#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/pl/set2#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/pl/set20#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/pl/set21#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/pl/set22#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/pl/set23#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/pl/set24#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/pl/set25#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/pl/set26#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/pl/set27#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/pl/set29#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/pl/set3#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/pl/set30#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/pl/set31#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/pl/set4#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/pl/set5#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/pl/set6#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/pl/set7#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/pl/set8#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/pl/set9#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/russian/set1#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/russian/set10#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/russian/set11#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/russian/set12#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/russian/set13#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/russian/set14#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/russian/set15#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/russian/set16#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/russian/set17#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/russian/set18#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/russian/set19#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/russian/set2#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/russian/set20#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/russian/set21#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/russian/set22#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/russian/set23#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/russian/set24#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/russian/set25#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/russian/set26#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/russian/set27#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/russian/set29#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/russian/set3#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/russian/set30#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/russian/set31#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/russian/set4#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/russian/set5#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/russian/set6#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/russian/set7#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/russian/set8#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/russian/set9#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/spanish/set1#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/spanish/set10#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/spanish/set11#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/spanish/set12#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/spanish/set13#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/spanish/set14#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/spanish/set15#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/spanish/set16#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/spanish/set17#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/spanish/set18#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/spanish/set19#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/spanish/set2#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/spanish/set20#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/spanish/set21#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/spanish/set22#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/spanish/set23#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/spanish/set24#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/spanish/set25#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/spanish/set26#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/spanish/set27#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/spanish/set29#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/spanish/set3#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/spanish/set30#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/spanish/set31#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/spanish/set4#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/spanish/set5#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/spanish/set6#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/spanish/set7#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/spanish/set8#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/spanish/set9#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ukrainian/set1#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ukrainian/set10#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ukrainian/set11#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ukrainian/set12#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ukrainian/set13#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ukrainian/set14#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ukrainian/set15#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ukrainian/set16#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ukrainian/set17#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ukrainian/set18#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ukrainian/set19#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ukrainian/set2#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ukrainian/set20#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ukrainian/set21#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ukrainian/set22#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ukrainian/set23#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ukrainian/set24#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ukrainian/set25#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ukrainian/set26#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ukrainian/set27#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ukrainian/set29#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ukrainian/set3#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ukrainian/set30#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ukrainian/set31#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ukrainian/set4#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ukrainian/set5#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ukrainian/set6#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ukrainian/set7#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ukrainian/set8#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/nls/ukrainian/set9#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/patchlevel.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/pathnames.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/sh.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/sh.char.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/sh.char.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/sh.decls.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/sh.dir.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/sh.dir.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/sh.dol.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/sh.err.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/sh.exec.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/sh.exp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/sh.file.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/sh.func.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/sh.glob.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/sh.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/sh.hist.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/sh.init.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/sh.lex.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/sh.misc.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/sh.parse.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/sh.print.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/sh.proc.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/sh.proc.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/sh.sem.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/sh.set.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/sh.time.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/sh.types.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/snames.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tc.alloc.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tc.bind.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tc.const.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tc.decls.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tc.disc.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tc.func.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tc.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tc.nls.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tc.nls.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tc.os.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tc.os.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tc.printf.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tc.prompt.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tc.sched.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tc.sig.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tc.sig.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tc.str.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tc.vers.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tc.wait.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tc.who.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tcsh.man#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tcsh.man2html#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/termcap.vms#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tw.color.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tw.comp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tw.decls.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tw.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tw.help.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tw.init.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tw.parse.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/tw.spell.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcsh/vms.termcap.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/CHANGES#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/Configure#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/FAQ#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/FREEBSD-upgrade#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/INSTALL#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/LICENSE#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/Makefile#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/NEWS#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/README#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/CA.pl#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/Makefile#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/ca.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/dgst.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/ec.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/enc.c#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/ocsp.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/pkcs12.c#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/s_client.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/s_server.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/certs/aol1.pem#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/certs/aol2.pem#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/certs/aoltw1.pem#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/certs/aoltw2.pem#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/config#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/aes/Makefile#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/aes/aes_misc.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/a_strex.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/asn1_err.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/asn1_lib.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/asn1t.h#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/t_x509.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/tasn_dec.c#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/x_x509.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bf/bf_ecb.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bio/bio.h#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bio/bio_err.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bio/bio_lib.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_err.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_lib.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_print.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/buffer/buf_err.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/camellia/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/camellia/camellia.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/camellia/cmll_cbc.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/camellia/cmll_locl.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/camellia/cmll_misc.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/cast/c_ecb.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/comp/c_zlib.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/comp/comp_err.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/conf/conf_def.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/conf/conf_err.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/conf/conf_lib.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/cpt_err.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/cryptlib.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/des/INSTALL#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/des/des_ver.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/des/ecb_enc.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dh/dh_err.c#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dh/dh_lib.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dsa/dsa_err.c#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dsa/dsa_lib.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dso/dso_err.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ec/ec_asn1.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ec/ec_err.c#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ecdh/ech_err.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ecdh/ech_lib.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ecdsa/ecdsa.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ecdsa/ecs_err.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ecdsa/ecs_lib.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ecdsa/ecs_ossl.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/eng_all.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/eng_err.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/eng_padlock.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/tb_ecdh.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/tb_ecdsa.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/err/err_all.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/bio_md.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/evp.h#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/evp_enc.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/evp_err.c#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/evp_lib.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/evp_locl.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/idea/i_ecb.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/idea/idea_lcl.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/lhash/lhash.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/md2/md2.h#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/md2/md2_dgst.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/md4/md4.h#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/md4/md4_dgst.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/md5/md5.h#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/md5/md5_dgst.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/objects/obj_dat.h#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/objects/obj_err.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/objects/obj_mac.h#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/objects/obj_mac.num#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/objects/objects.txt#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ocsp/ocsp_asn.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ocsp/ocsp_err.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ocsp/ocsp_vfy.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/opensslconf.h#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/opensslv.h#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pem/pem.h#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pem/pem_err.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pem/pem_lib.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pem/pem_pkey.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pkcs12/pk12err.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pkcs7/pk7_doit.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pkcs7/pk7_lib.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pkcs7/pk7_smime.c#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pkcs7/pkcs7err.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rand/md_rand.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rand/rand_err.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rc2/rc2_ecb.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rc4/rc4_skey.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ripemd/ripemd.h#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ripemd/rmd_dgst.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rsa/rsa_err.c#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rsa/rsa_lib.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/sha/sha.h#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/sha/sha1dgst.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/sha/sha256.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/sha/sha512.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/sha/sha_dgst.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/stack/safestack.h#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/stack/stack.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/store/str_err.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/txt_db/txt_db.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ui/ui_err.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509/by_dir.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509/x509.h#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509/x509_err.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509/x509_req.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509/x509_txt.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509/x509_vfy.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509/x509_vfy.h#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/Makefile#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/ext_dat.h#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/pcy_tree.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_addr.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_akey.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_alt.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_asid.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_bcons.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_bitst.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_cpols.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_crld.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_enum.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_extku.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_ia5.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_info.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_int.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_ncons.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_ocsp.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_pci.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_pcons.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_pku.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_pmaps.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_purp.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_skey.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_sxnet.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_utl.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3err.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/x509v3.h#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/apps/ciphers.pod#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/apps/s_client.pod#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/apps/x509.pod#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/ASN1_STRING_print_ex.pod#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/BIO_set_callback.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/CONF_modules_free.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/RAND_egd.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/RSA_get_ex_new_index.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/md5.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/mdc2.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/ripemd.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/sha.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/SSL_CTX_set_tmp_rsa_callback.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/SSL_SESSION_get_time.pod#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/openssl.spec#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/d1_lib.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/d1_pkt.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/kssl.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/s23_clnt.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/s23_srvr.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/s2_enc.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/s2_lib.c#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/s3_clnt.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/s3_enc.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/s3_lib.c#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/s3_pkt.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/s3_srvr.c#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/ssl.h#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/ssl_ciph.c#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/ssl_err.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/ssl_lib.c#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/ssl_sess.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/t1_enc.c#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/t1_lib.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/test/Makefile#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/tools/c_rehash#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/util/libeay.num#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/util/mk1mf.pl#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/util/mkdef.pl#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/util/mkerr.pl#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/util/ssleay.num#3 integrate .. //depot/projects/soc2005/libalias/etc/defaults/periodic.conf#4 integrate .. //depot/projects/soc2005/libalias/etc/defaults/rc.conf#13 integrate .. //depot/projects/soc2005/libalias/etc/mtree/BSD.include.dist#6 integrate .. //depot/projects/soc2005/libalias/etc/mtree/BSD.root.dist#2 integrate .. //depot/projects/soc2005/libalias/etc/mtree/BSD.usr.dist#8 integrate .. //depot/projects/soc2005/libalias/etc/network.subr#8 integrate .. //depot/projects/soc2005/libalias/etc/periodic/daily/404.status-zfs#1 branch .. //depot/projects/soc2005/libalias/etc/periodic/daily/Makefile#2 integrate .. //depot/projects/soc2005/libalias/etc/periodic/security/800.loginfail#3 integrate .. //depot/projects/soc2005/libalias/etc/periodic/weekly/310.locate#2 integrate .. //depot/projects/soc2005/libalias/etc/rc#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/FILESYSTEMS#1 branch .. //depot/projects/soc2005/libalias/etc/rc.d/Makefile#7 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/addswap#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/adjkerntz#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/bgfsck#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/bootconf.sh#3 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/cleanvar#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/dhclient#6 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/geli2#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/hostname#3 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/ip6addrctl#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/ip6fw#3 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/ipfilter#4 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/ipfw#4 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/ipmon#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/ipsec#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/isdnd#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/kldxref#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/mountcritremote#3 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/mountd#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/netif#4 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/nfslocking#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/pf#3 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/pflog#3 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/pfsync#3 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/power_profile#3 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/ppp#3 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/random#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/syscons#4 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/var#3 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/zfs#1 branch .. //depot/projects/soc2005/libalias/etc/rc.firewall#6 integrate .. //depot/projects/soc2005/libalias/etc/rc.subr#8 integrate .. //depot/projects/soc2005/libalias/games/fortune/datfiles/fortunes#12 integrate .. //depot/projects/soc2005/libalias/games/fortune/datfiles/fortunes-o.real#3 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/cc/Makefile.fe#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/cc/Makefile.inc#3 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/cc/c++filt/Makefile#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/cc/cc_int/Makefile#4 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/cc/f77/Makefile#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/gdb/kgdb/kgdb.h#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/gdb/kgdb/kthr.c#5 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 integrate .. //depot/projects/soc2005/libalias/include/protocols/dumprestore.h#2 integrate .. //depot/projects/soc2005/libalias/include/stdio.h#2 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/Makefile#5 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/README#2 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive.h.in#8 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_check_magic.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_entry.3#3 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_entry.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_entry.h#3 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_private.h#7 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read.3#6 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read.c#9 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_data_into_buffer.c#4 delete .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_data_into_fd.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_extract.c#6 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_open_memory.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_private.h#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_support_compression_bzip2.c#6 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_support_compression_compress.c#5 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_support_compression_gzip.c#5 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_support_compression_none.c#8 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_support_format_all.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_support_format_ar.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_support_format_cpio.c#6 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_support_format_empty.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_support_format_iso9660.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_support_format_tar.c#7 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_support_format_zip.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_util.3#3 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_util.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_virtual.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write.3#5 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write.c#6 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write_disk.3#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write_disk.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write_disk_private.h#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write_disk_set_standard_lookup.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write_private.h#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write_set_compression_bzip2.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write_set_compression_gzip.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write_set_compression_none.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write_set_format_ar.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write_set_format_cpio.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write_set_format_pax.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write_set_format_shar.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write_set_format_ustar.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/libarchive-formats.5#4 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/test/Makefile#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/README#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/main.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test.h#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_acl_basic.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_acl_pax.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_archive_api_feature.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_bad_fd.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_read_data_large.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_read_extract.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_read_format_ar.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_read_format_cpio_bin.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_read_format_cpio_bin_Z.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_read_format_cpio_bin_gz.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_read_format_cpio_odc.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_read_format_empty.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_read_format_gtar_gz.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_read_format_iso_gz.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_read_format_isorr_bz2.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_read_format_pax_bz2.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_read_format_tar.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_read_format_tbz.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_read_format_tgz.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_read_format_tz.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_read_format_zip.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_read_large.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_read_position.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_read_truncated.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_write_disk.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_write_disk_perms.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_write_disk_secure.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_write_format_ar.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_write_format_cpio_empty.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_write_format_shar_empty.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_write_format_tar.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_write_format_tar_empty.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_write_open_memory.c#1 branch .. //depot/projects/soc2005/libalias/lib/libatm/cache_key.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/Makefile#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/amd64/stdlib/Makefile.inc#1 branch .. //depot/projects/soc2005/libalias/lib/libc/amd64/stdlib/div.S#1 branch .. //depot/projects/soc2005/libalias/lib/libc/amd64/stdlib/ldiv.S#1 branch .. //depot/projects/soc2005/libalias/lib/libc/amd64/stdlib/lldiv.S#1 branch .. //depot/projects/soc2005/libalias/lib/libc/gen/Symbol.map#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/dlfcn.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/getvfsbyname.3#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/tls.c#5 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/valloc.3#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/net/Makefile.inc#5 integrate .. //depot/projects/soc2005/libalias/lib/libc/net/Symbol.map#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/net/addr2ascii.3#2 delete .. //depot/projects/soc2005/libalias/lib/libc/net/addr2ascii.c#2 delete .. //depot/projects/soc2005/libalias/lib/libc/net/ascii2addr.c#2 delete .. //depot/projects/soc2005/libalias/lib/libc/net/getnameinfo.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/net/getnameinfo.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/net/inet.3#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/net/linkaddr.3#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/net/sctp_bindx.3#1 branch .. //depot/projects/soc2005/libalias/lib/libc/net/sctp_connectx.3#1 branch .. //depot/projects/soc2005/libalias/lib/libc/net/sctp_freepaddrs.3#1 branch .. //depot/projects/soc2005/libalias/lib/libc/net/sctp_getaddrlen.3#1 branch .. //depot/projects/soc2005/libalias/lib/libc/net/sctp_getassocid.3#1 branch .. //depot/projects/soc2005/libalias/lib/libc/net/sctp_getpaddrs.3#1 branch .. //depot/projects/soc2005/libalias/lib/libc/net/sctp_opt_info.3#1 branch .. //depot/projects/soc2005/libalias/lib/libc/net/sctp_recvmsg.3#1 branch .. //depot/projects/soc2005/libalias/lib/libc/net/sctp_send.3#1 branch .. //depot/projects/soc2005/libalias/lib/libc/net/sctp_sendmsg.3#1 branch .. //depot/projects/soc2005/libalias/lib/libc/net/sctp_sys_calls.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/posix1e/acl_from_text.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/posix1e/acl_support.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/posix1e/acl_support.h#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/regex/engine.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/regex/grot/tests#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/resolv/Symbol.map#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/resolv/res_debug.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/resolv/res_send.c#6 integrate .. //depot/projects/soc2005/libalias/lib/libc/rpc/clnt_dg.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/tmpnam.3#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdlib/malloc.3#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdlib/malloc.c#10 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdlib/posix_memalign.3#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/Makefile.inc#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/getsockopt.2#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/lseek.2#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/pathconf.2#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/ptrace.2#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/sctp_generic_recvmsg.2#1 branch .. //depot/projects/soc2005/libalias/lib/libc/sys/sctp_generic_sendmsg.2#1 branch .. //depot/projects/soc2005/libalias/lib/libc/sys/sctp_peeloff.2#1 branch .. //depot/projects/soc2005/libalias/lib/libc/sys/shutdown.2#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/uuid/uuid_compare.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/yp/yplib.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libcrypt/crypt.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libedit/chared.h#2 integrate .. //depot/projects/soc2005/libalias/lib/libedit/common.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libedit/editline.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libedit/editrc.5#2 integrate .. //depot/projects/soc2005/libalias/lib/libedit/emacs.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 8 17:21:42 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A88FE16A407; Sun, 8 Apr 2007 17:21:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4475016A401 for ; Sun, 8 Apr 2007 17:21:41 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3313113C469 for ; Sun, 8 Apr 2007 17:21:41 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l38HLfZ7036174 for ; Sun, 8 Apr 2007 17:21:41 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l38HLZdZ036142 for perforce@freebsd.org; Sun, 8 Apr 2007 17:21:35 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 8 Apr 2007 17:21:35 GMT Message-Id: <200704081721.l38HLZdZ036142@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 117668 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Apr 2007 17:21:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=117668 Change 117668 by mjacob@mjexp on 2007/04/08 17:20:36 IFC Affected files ... .. //depot/projects/mjexp/cddl/lib/Makefile#2 integrate .. //depot/projects/mjexp/cddl/lib/libzpool/Makefile#2 integrate .. //depot/projects/mjexp/cddl/usr.bin/Makefile#2 integrate .. //depot/projects/mjexp/cddl/usr.sbin/Makefile#2 integrate .. //depot/projects/mjexp/contrib/openpam/lib/openpam_readline.c#2 integrate .. //depot/projects/mjexp/contrib/opensolaris/cmd/zpool/zpool_main.c#2 integrate .. //depot/projects/mjexp/contrib/opensolaris/cmd/ztest/ztest.c#2 integrate .. //depot/projects/mjexp/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 integrate .. //depot/projects/mjexp/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 integrate .. //depot/projects/mjexp/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 integrate .. //depot/projects/mjexp/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 integrate .. //depot/projects/mjexp/contrib/opensolaris/lib/libzpool/common/kernel.c#2 integrate .. //depot/projects/mjexp/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate .. //depot/projects/mjexp/etc/devd.conf#4 integrate .. //depot/projects/mjexp/include/stdio.h#3 integrate .. //depot/projects/mjexp/lib/libarchive/Makefile#7 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read.3#8 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_extract.c#7 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_format_all.c#4 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_disk.c#4 integrate .. //depot/projects/mjexp/lib/libarchive/test/Makefile#3 integrate .. //depot/projects/mjexp/lib/libc/sys/ptrace.2#3 integrate .. //depot/projects/mjexp/libexec/rtld-elf/i386/Symbol.map#2 integrate .. //depot/projects/mjexp/libexec/rtld-elf/rtld.c#4 integrate .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/article.sgml#10 integrate .. //depot/projects/mjexp/share/man/man4/mpt.4#2 integrate .. //depot/projects/mjexp/share/man/man4/pci.4#2 integrate .. //depot/projects/mjexp/share/misc/committers-ports.dot#3 integrate .. //depot/projects/mjexp/sys/boot/pc98/boot0.5/Makefile#2 integrate .. //depot/projects/mjexp/sys/boot/pc98/boot0.5/boot0.5.s#3 integrate .. //depot/projects/mjexp/sys/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/mjexp/sys/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/mjexp/sys/boot/pc98/boot0.5/selector.s#2 integrate .. //depot/projects/mjexp/sys/boot/pc98/boot0.5/start.s#2 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_sg.c#1 branch .. //depot/projects/mjexp/sys/cam/scsi/scsi_sg.h#1 branch .. //depot/projects/mjexp/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/mjexp/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/mjexp/sys/conf/NOTES#17 integrate .. //depot/projects/mjexp/sys/conf/files#18 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/arch/amd64/atomic.S#2 delete .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/arch/i386/atomic.S#2 delete .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/os/taskq.c#2 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-dma.c#4 integrate .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_lro.c#2 integrate .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/mjexp/sys/dev/cxgb/sys/mvec.h#1 branch .. //depot/projects/mjexp/sys/dev/cxgb/sys/uipc_mvec.c#1 branch .. //depot/projects/mjexp/sys/dev/mpt/mpt_cam.c#15 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/cmi.c#5 integrate .. //depot/projects/mjexp/sys/kern/kern_jail.c#9 integrate .. //depot/projects/mjexp/sys/modules/Makefile#9 integrate .. //depot/projects/mjexp/sys/modules/cam/Makefile#2 integrate .. //depot/projects/mjexp/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/mjexp/sys/modules/zfs/Makefile#2 integrate .. //depot/projects/mjexp/sys/netinet/libalias/alias_db.c#3 integrate .. //depot/projects/mjexp/sys/netinet/libalias/alias_skinny.c#2 integrate .. //depot/projects/mjexp/sys/sys/unistd.h#3 integrate .. //depot/projects/mjexp/tools/regression/netinet/ipblock/Makefile#1 branch .. //depot/projects/mjexp/tools/regression/netinet/ipblock/ipblock.c#1 branch .. //depot/projects/mjexp/usr.bin/tar/read.c#4 integrate .. //depot/projects/mjexp/usr.sbin/sa/pdb.c#2 integrate Differences ... ==== //depot/projects/mjexp/cddl/lib/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/lib/Makefile,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/lib/Makefile,v 1.2 2007/04/07 19:12:09 des Exp $ .include @@ -11,10 +11,8 @@ SUBDIR+=${_libzpool} .endif -.if ${MACHINE_ARCH} == "i386" -.if ${MACHINE} == "i386" +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" _libzpool= libzpool .endif -.endif .include ==== //depot/projects/mjexp/cddl/lib/libzpool/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.2 2007/04/07 23:54:53 pjd Exp $ .include "${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/Makefile.files" @@ -11,7 +11,7 @@ # LIST_SRCS .PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/os # ATOMIC_SRCS -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/arch/${MACHINE_ARCH} +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/atomic/${MACHINE_ARCH} LIB= zpool SHLIB_MAJOR?=1 ==== //depot/projects/mjexp/cddl/usr.bin/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.1 2007/04/06 01:08:58 pjd Exp $ +# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.2 2007/04/07 19:12:09 des Exp $ .include @@ -6,10 +6,8 @@ SUBDIR= ${_ztest} .endif -.if ${MACHINE_ARCH} == "i386" -.if ${MACHINE} == "i386" +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" _ztest= ztest .endif -.endif .include ==== //depot/projects/mjexp/cddl/usr.sbin/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.1 2007/04/06 01:08:58 pjd Exp $ +# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.2 2007/04/07 19:12:09 des Exp $ .include @@ -7,10 +7,8 @@ SUBDIR+=${_zdb} .endif -.if ${MACHINE_ARCH} == "i386" -.if ${MACHINE} == "i386" +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" _zdb= zdb .endif -.endif .include ==== //depot/projects/mjexp/contrib/openpam/lib/openpam_readline.c#2 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_readline.c#3 $ + * $Id: openpam_readline.c 380 2006-03-14 14:42:09Z des $ */ #include @@ -52,7 +52,7 @@ char * openpam_readline(FILE *f, int *lineno, size_t *lenp) { - unsigned char *line; + char *line; size_t len, size; int ch; @@ -63,7 +63,7 @@ #define line_putch(ch) do { \ if (len >= size - 1) { \ - unsigned char *tmp = realloc(line, size *= 2); \ + char *tmp = realloc(line, size *= 2); \ if (tmp == NULL) \ goto fail; \ line = tmp; \ @@ -83,7 +83,7 @@ /* eof */ if (ch == EOF) { /* remove trailing whitespace */ - while (len > 0 && isspace(line[len - 1])) + while (len > 0 && isspace((int)line[len - 1])) --len; line[len] = '\0'; if (len == 0) @@ -96,7 +96,7 @@ ++*lineno; /* remove trailing whitespace */ - while (len > 0 && isspace(line[len - 1])) + while (len > 0 && isspace((int)line[len - 1])) --len; line[len] = '\0'; /* skip blank lines */ ==== //depot/projects/mjexp/contrib/opensolaris/cmd/zpool/zpool_main.c#2 (text+ko) ==== @@ -1082,6 +1082,10 @@ "incompatible version.\n")); break; + case ZPOOL_STATUS_HOSTID_MISMATCH: + (void) printf(gettext("status: The pool was last accessed by " + "another system.\n")); + break; default: /* * No other status can be seen when importing pools. @@ -1098,6 +1102,10 @@ "imported using its name or numeric identifier, " "though\n\tsome features will not be available " "without an explicit 'zpool upgrade'.\n")); + else if (reason == ZPOOL_STATUS_HOSTID_MISMATCH) + (void) printf(gettext("action: The pool can be " + "imported using its name or numeric " + "identifier and\n\tthe '-f' flag.\n")); else (void) printf(gettext("action: The pool can be " "imported using its name or numeric " @@ -1187,10 +1195,37 @@ "is formatted using a newer ZFS version\n"), name); return (1); } else if (state != POOL_STATE_EXPORTED && !force) { - (void) fprintf(stderr, gettext("cannot import '%s': pool " - "may be in use from other system\n"), name); - (void) fprintf(stderr, gettext("use '-f' to import anyway\n")); - return (1); + uint64_t hostid; + + if (nvlist_lookup_uint64(config, ZPOOL_CONFIG_HOSTID, + &hostid) == 0) { + if ((unsigned long)hostid != gethostid()) { + char *hostname; + uint64_t timestamp; + time_t t; + + verify(nvlist_lookup_string(config, + ZPOOL_CONFIG_HOSTNAME, &hostname) == 0); + verify(nvlist_lookup_uint64(config, + ZPOOL_CONFIG_TIMESTAMP, ×tamp) == 0); + t = timestamp; + (void) fprintf(stderr, gettext("cannot import " + "'%s': pool may be in use from other " + "system, it was last accessed by %s " + "(hostid: 0x%lx) on %s"), name, hostname, + (unsigned long)hostid, + asctime(localtime(&t))); + (void) fprintf(stderr, gettext("use '-f' to " + "import anyway\n")); + return (1); + } + } else { + (void) fprintf(stderr, gettext("cannot import '%s': " + "pool may be in use from other system\n"), name); + (void) fprintf(stderr, gettext("use '-f' to import " + "anyway\n")); + return (1); + } } if (zpool_import(g_zfs, config, newname, altroot) != 0) ==== //depot/projects/mjexp/contrib/opensolaris/cmd/ztest/ztest.c#2 (text+ko) ==== @@ -246,6 +246,8 @@ #define ZTEST_DIROBJ_BLOCKSIZE (1 << 10) #define ZTEST_DIRSIZE 256 +static void usage(boolean_t); + /* * These libumem hooks provide a reasonable set of defaults for the allocator's * debugging facilities. @@ -303,13 +305,17 @@ if (toupper(buf[0]) == ends[i]) break; } - if (i == strlen(ends)) - fatal(0, "invalid bytes suffix: %s", buf); + if (i == strlen(ends)) { + (void) fprintf(stderr, "ztest: invalid bytes suffix: %s\n", + buf); + usage(B_FALSE); + } if (buf[1] == '\0' || (toupper(buf[1]) == 'B' && buf[2] == '\0')) { return (10*i); } - fatal(0, "invalid bytes suffix: %s", buf); - return (-1); + (void) fprintf(stderr, "ztest: invalid bytes suffix: %s\n", buf); + usage(B_FALSE); + /* NOTREACHED */ } static uint64_t @@ -320,32 +326,40 @@ val = strtoull(buf, &end, 0); if (end == buf) { - fatal(0, "bad numeric value: %s", buf); + (void) fprintf(stderr, "ztest: bad numeric value: %s\n", buf); + usage(B_FALSE); } else if (end[0] == '.') { double fval = strtod(buf, &end); fval *= pow(2, str2shift(end)); - if (fval > UINT64_MAX) - fatal(0, "value too large: %s", buf); + if (fval > UINT64_MAX) { + (void) fprintf(stderr, "ztest: value too large: %s\n", + buf); + usage(B_FALSE); + } val = (uint64_t)fval; } else { int shift = str2shift(end); - if (shift >= 64 || (val << shift) >> shift != val) - fatal(0, "value too large: %s", buf); + if (shift >= 64 || (val << shift) >> shift != val) { + (void) fprintf(stderr, "ztest: value too large: %s\n", + buf); + usage(B_FALSE); + } val <<= shift; } return (val); } static void -usage(void) +usage(boolean_t requested) { char nice_vdev_size[10]; char nice_gang_bang[10]; + FILE *fp = requested ? stdout : stderr; nicenum(zopt_vdev_size, nice_vdev_size); nicenum(zio_gang_bang, nice_gang_bang); - (void) printf("Usage: %s\n" + (void) fprintf(fp, "Usage: %s\n" "\t[-v vdevs (default: %llu)]\n" "\t[-s size_of_each_vdev (default: %s)]\n" "\t[-a alignment_shift (default: %d) (use 0 for random)]\n" @@ -364,6 +378,7 @@ "\t[-T time] total run time (default: %llu sec)\n" "\t[-P passtime] time per pass (default: %llu sec)\n" "\t[-z zil failure rate (default: fail every 2^%llu allocs)]\n" + "\t[-h] (print help)\n" "", cmdname, (u_longlong_t)zopt_vdevs, /* -v */ @@ -382,7 +397,7 @@ (u_longlong_t)zopt_time, /* -T */ (u_longlong_t)zopt_passtime, /* -P */ (u_longlong_t)zio_zil_fail_shift); /* -z */ - exit(1); + exit(requested ? 0 : 1); } static uint64_t @@ -422,7 +437,7 @@ zio_zil_fail_shift = 5; while ((opt = getopt(argc, argv, - "v:s:a:m:r:R:d:t:g:i:k:p:f:VET:P:z:")) != EOF) { + "v:s:a:m:r:R:d:t:g:i:k:p:f:VET:P:z:h")) != EOF) { value = 0; switch (opt) { case 'v': @@ -496,9 +511,12 @@ case 'z': zio_zil_fail_shift = MIN(value, 16); break; + case 'h': + usage(B_TRUE); + break; case '?': default: - usage(); + usage(B_FALSE); break; } } ==== //depot/projects/mjexp/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 (text+ko) ==== @@ -98,6 +98,7 @@ EZFS_POOLPROPS, /* couldn't retrieve pool props */ EZFS_POOL_NOTSUP, /* ops not supported for this type of pool */ EZFS_POOL_INVALARG, /* invalid argument for this pool operation */ + EZFS_NAMETOOLONG, /* dataset name is too long */ EZFS_UNKNOWN }; @@ -192,6 +193,7 @@ ZPOOL_STATUS_CORRUPT_DATA, /* data errors in user (meta)data */ ZPOOL_STATUS_FAILING_DEV, /* device experiencing errors */ ZPOOL_STATUS_VERSION_NEWER, /* newer on-disk version */ + ZPOOL_STATUS_HOSTID_MISMATCH, /* last accessed by another system */ /* * The following are not faults per se, but still an error possibly ==== //depot/projects/mjexp/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 (text+ko) ==== @@ -379,7 +379,7 @@ uint_t i, nspares; boolean_t config_seen; uint64_t best_txg; - char *name; + char *name, *hostname; zfs_cmd_t zc = { 0 }; uint64_t version, guid; size_t len; @@ -388,6 +388,7 @@ nvlist_t **child = NULL; uint_t c; boolean_t isactive; + uint64_t hostid; if (nvlist_alloc(&ret, 0, 0) != 0) goto nomem; @@ -430,6 +431,8 @@ * pool guid * name * pool state + * hostid (if available) + * hostname (if available) */ uint64_t state; @@ -453,6 +456,20 @@ if (nvlist_add_uint64(config, ZPOOL_CONFIG_POOL_STATE, state) != 0) goto nomem; + hostid = 0; + if (nvlist_lookup_uint64(tmp, + ZPOOL_CONFIG_HOSTID, &hostid) == 0) { + if (nvlist_add_uint64(config, + ZPOOL_CONFIG_HOSTID, hostid) != 0) + goto nomem; + verify(nvlist_lookup_string(tmp, + ZPOOL_CONFIG_HOSTNAME, + &hostname) == 0); + if (nvlist_add_string(config, + ZPOOL_CONFIG_HOSTNAME, + hostname) != 0) + goto nomem; + } config_seen = B_TRUE; } @@ -622,6 +639,20 @@ } /* + * Restore the original information read from the actual label. + */ + (void) nvlist_remove(config, ZPOOL_CONFIG_HOSTID, + DATA_TYPE_UINT64); + (void) nvlist_remove(config, ZPOOL_CONFIG_HOSTNAME, + DATA_TYPE_STRING); + if (hostid != 0) { + verify(nvlist_add_uint64(config, ZPOOL_CONFIG_HOSTID, + hostid) == 0); + verify(nvlist_add_string(config, ZPOOL_CONFIG_HOSTNAME, + hostname) == 0); + } + + /* * Add this pool to the list of configs. */ verify(nvlist_lookup_string(config, ZPOOL_CONFIG_POOL_NAME, ==== //depot/projects/mjexp/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 (text+ko) ==== @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -43,6 +43,7 @@ #include #include +#include #include "libzfs_impl.h" /* @@ -50,7 +51,7 @@ * in libzfs.h. Note that there are some status results which go past the end * of this table, and hence have no associated message ID. */ -static char *msgid_table[] = { +static char *zfs_msgid_table[] = { "ZFS-8000-14", "ZFS-8000-2Q", "ZFS-8000-3C", @@ -60,7 +61,8 @@ "ZFS-8000-72", "ZFS-8000-8A", "ZFS-8000-9P", - "ZFS-8000-A5" + "ZFS-8000-A5", + "ZFS-8000-EY" }; /* @@ -69,7 +71,7 @@ * and the article referred to by 'zpool status' must match that indicated by * the syslog error message. We override missing data as well as corrupt pool. */ -static char *msgid_table_active[] = { +static char *zfs_msgid_table_active[] = { "ZFS-8000-14", "ZFS-8000-D3", /* overridden */ "ZFS-8000-D3", /* overridden */ @@ -82,7 +84,7 @@ "ZFS-8000-CS", /* overridden */ }; -#define NMSGID (sizeof (msgid_table) / sizeof (msgid_table[0])) +#define NMSGID (sizeof (zfs_msgid_table) / sizeof (zfs_msgid_table[0])) /* ARGSUSED */ static int @@ -178,6 +180,8 @@ uint_t vsc; uint64_t nerr; uint64_t version; + uint64_t stateval; + uint64_t hostid = 0; verify(nvlist_lookup_uint64(config, ZPOOL_CONFIG_VERSION, &version) == 0); @@ -185,6 +189,16 @@ &nvroot) == 0); verify(nvlist_lookup_uint64_array(nvroot, ZPOOL_CONFIG_STATS, (uint64_t **)&vs, &vsc) == 0); + verify(nvlist_lookup_uint64(config, ZPOOL_CONFIG_POOL_STATE, + &stateval) == 0); + (void) nvlist_lookup_uint64(config, ZPOOL_CONFIG_HOSTID, &hostid); + + /* + * Pool last accessed by another system. + */ + if (hostid != 0 && (unsigned long)hostid != gethostid() && + stateval == POOL_STATE_ACTIVE) + return (ZPOOL_STATUS_HOSTID_MISMATCH); /* * Newer on-disk version. @@ -270,7 +284,7 @@ if (ret >= NMSGID) *msgid = NULL; else - *msgid = msgid_table_active[ret]; + *msgid = zfs_msgid_table_active[ret]; return (ret); } @@ -283,7 +297,7 @@ if (ret >= NMSGID) *msgid = NULL; else - *msgid = msgid_table[ret]; + *msgid = zfs_msgid_table[ret]; return (ret); } ==== //depot/projects/mjexp/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 (text+ko) ==== @@ -167,6 +167,8 @@ case EZFS_POOL_INVALARG: return (dgettext(TEXT_DOMAIN, "invalid argument for " "this pool operation")); + case EZFS_NAMETOOLONG: + return (dgettext(TEXT_DOMAIN, "dataset name is too long")); case EZFS_UNKNOWN: return (dgettext(TEXT_DOMAIN, "unknown error")); default: @@ -306,6 +308,11 @@ "dataset is busy")); zfs_verror(hdl, EZFS_BUSY, fmt, ap); break; + + case ENAMETOOLONG: + zfs_verror(hdl, EZFS_NAMETOOLONG, fmt, ap); + break; + default: zfs_error_aux(hdl, strerror(errno)); zfs_verror(hdl, EZFS_UNKNOWN, fmt, ap); @@ -490,6 +497,21 @@ hdl->libzfs_printerr = printerr; } +static int +libzfs_load(void) +{ + int error; + + if (modfind("zfs") < 0) { + /* Not present in kernel, try loading it. */ + if (kldload("zfs") < 0 || modfind("zfs") < 0) { + if (errno != EEXIST) + return (error); + } + } + return (0); +} + libzfs_handle_t * libzfs_init(void) { @@ -500,8 +522,12 @@ } if ((hdl->libzfs_fd = open(ZFS_DEV, O_RDWR)) < 0) { - free(hdl); - return (NULL); + if (libzfs_load() == 0) + hdl->libzfs_fd = open(ZFS_DEV, O_RDWR); + if (hdl->libzfs_fd < 0) { + free(hdl); + return (NULL); + } } if ((hdl->libzfs_mnttab = fopen(MNTTAB, "r")) == NULL) { ==== //depot/projects/mjexp/contrib/opensolaris/lib/libzpool/common/kernel.c#2 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include #include +#include /* * Emulation of kernel services in userland. @@ -45,6 +46,11 @@ int hz = 119; /* frequency when using gethrtime() >> 23 for lbolt */ uint64_t physmem; vnode_t *rootdir = (vnode_t *)0xabcd1234; +char hw_serial[11]; + +struct utsname utsname = { + "userland", "libzpool", "1", "1", "na" +}; /* * ========================================================================= @@ -770,6 +776,17 @@ return (random_get_bytes_common(ptr, len, "/dev/urandom")); } +int +ddi_strtoul(const char *hw_serial, char **nptr, int base, unsigned long *result) +{ + char *end; + + *result = strtoul(hw_serial, &end, base); + if (*result == 0) + return (errno); + return (0); +} + /* * ========================================================================= * kernel emulation setup & teardown @@ -795,6 +812,8 @@ dprintf("physmem = %llu pages (%.2f GB)\n", physmem, (double)physmem * sysconf(_SC_PAGE_SIZE) / (1ULL << 30)); + snprintf(hw_serial, sizeof (hw_serial), "%ld", gethostid()); + spa_init(mode); } ==== //depot/projects/mjexp/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 (text+ko) ==== @@ -436,6 +436,14 @@ #define zone_dataset_visible(x, y) (1) #define INGLOBALZONE(z) (1) +/* + * Hostname information + */ +extern struct utsname utsname; +extern char hw_serial[]; +extern int ddi_strtoul(const char *str, char **nptr, int base, + unsigned long *result); + #ifdef __cplusplus } #endif ==== //depot/projects/mjexp/etc/devd.conf#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.35 2007/02/15 16:38:10 imp Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.37 2007/04/08 16:05:23 pjd Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -208,6 +208,37 @@ action "logger -p kern.emerg 'WARNING: system temperature too high, shutting down soon!'"; }; +# Sample ZFS problem reports handling. +notify 10 { + match "system" "ZFS"; + match "type" "zpool"; + action "logger -p kern.err 'ZFS: failed to load zpool $pool'"; +}; + +notify 10 { + match "system" "ZFS"; + match "type" "vdev"; + action "logger -p kern.err 'ZFS: vdev failure, zpool=$pool type=$type'"; +}; + +notify 10 { + match "system" "ZFS"; + match "type" "data"; + action "logger -p kern.warn 'ZFS: zpool I/O failure, zpool=$pool error=$zio_err'"; +}; + +notify 10 { + match "system" "ZFS"; + match "type" "io"; + action "logger -p kern.warn 'ZFS: vdev I/O failure, zpool=$pool path=$vdev_path offset=$zio_offset size=$zio_size error=$zio_err'"; +}; + +notify 10 { + match "system" "ZFS"; + match "type" "checksum"; + action "logger -p kern.warn 'ZFS: checksum mismatch, zpool=$pool path=$vdev_path offset=$zio_offset size=$zio_size'"; +}; + /* EXAMPLES TO END OF FILE # The following might be an example of something that a vendor might ==== //depot/projects/mjexp/include/stdio.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)stdio.h 8.5 (Berkeley) 4/29/95 - * $FreeBSD: src/include/stdio.h,v 1.59 2007/04/05 21:10:53 pjd Exp $ + * $FreeBSD: src/include/stdio.h,v 1.60 2007/04/07 16:02:30 pjd Exp $ */ #ifndef _STDIO_H_ @@ -200,12 +200,6 @@ #ifndef SEEK_END #define SEEK_END 2 /* set file offset to EOF plus offset */ #endif -#ifndef SEEK_DATA -#define SEEK_DATA 3 /* set file offset to next data past offset */ -#endif -#ifndef SEEK_HOLE -#define SEEK_HOLE 4 /* set file offset to next hole past offset */ -#endif #define stdin __stdinp #define stdout __stdoutp ==== //depot/projects/mjexp/lib/libarchive/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.63 2007/04/05 15:51:19 cperciva Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.64 2007/04/07 05:54:23 kientzle Exp $ LIB= archive DPADD= ${LIBBZ2} ${LIBZ} @@ -9,7 +9,7 @@ # Major: Bumped ONLY when API/ABI breakage happens (see SHLIB_MAJOR) # Minor: Bumped when significant new features are added # Revision: Bumped on any notable change -VERSION= 2.0.25 +VERSION= 2.0.27 ARCHIVE_API_MAJOR!= echo ${VERSION} | sed -e 's/[^0-9]/./g' -e 's/\..*//' ARCHIVE_API_MINOR!= echo ${VERSION} | sed -e 's/[^0-9]/./g' -e 's/[0-9]*\.//' -e 's/\..*//' @@ -58,6 +58,7 @@ archive_read_support_compression_gzip.c \ archive_read_support_compression_none.c \ archive_read_support_format_all.c \ + archive_read_support_format_ar.c \ archive_read_support_format_cpio.c \ archive_read_support_format_empty.c \ archive_read_support_format_iso9660.c \ @@ -78,6 +79,7 @@ archive_write_set_compression_gzip.c \ archive_write_set_compression_none.c \ archive_write_set_format.c \ + archive_write_set_format_ar.c \ archive_write_set_format_by_name.c \ archive_write_set_format_cpio.c \ archive_write_set_format_pax.c \ ==== //depot/projects/mjexp/lib/libarchive/archive_read.3#8 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.32 2007/04/05 15:51:19 cperciva Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.33 2007/04/07 05:53:11 kientzle Exp $ .\" .Dd August 19, 2006 .Dt archive_read 3 @@ -230,7 +230,10 @@ to skip all of the data for this archive entry. .\" #if ARCHIVE_API_VERSION < 3 .It Fn archive_read_data_into_buffer -This function is deprecated and should not be used. +This function is deprecated and will be removed. +Use +.Fn archive_read_data +instead. .\" #endif .It Fn archive_read_data_into_fd A convenience function that repeatedly calls ==== //depot/projects/mjexp/lib/libarchive/archive_read_extract.c#7 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.54 2007/03/11 10:29:52 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.55 2007/04/07 03:37:59 cperciva Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -98,10 +98,6 @@ if (r == ARCHIVE_OK) /* If there's an FD, pour data into it. */ r = copy_data(_a, a->extract->ad); - if (r != ARCHIVE_OK) - archive_set_error(&a->archive, - archive_errno(extract->ad), - "%s", archive_error_string(extract->ad)); r2 = archive_write_finish_entry(a->extract->ad); /* Use the first message. */ if (r2 != ARCHIVE_OK && r == ARCHIVE_OK) @@ -141,8 +137,11 @@ if (r != ARCHIVE_OK) return (r); r = archive_write_data_block(aw, buff, size, offset); - if (r != ARCHIVE_OK) + if (r != ARCHIVE_OK) { + archive_set_error(ar, archive_errno(aw), + "%s", archive_error_string(aw)); return (r); + } } } ==== //depot/projects/mjexp/lib/libarchive/archive_read_support_format_all.c#4 (text+ko) ==== @@ -24,13 +24,14 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_all.c,v 1.8 2007/02/01 06:18:16 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_all.c,v 1.9 2007/04/07 05:54:23 kientzle Exp $"); #include "archive.h" int archive_read_support_format_all(struct archive *a) { + archive_read_support_format_ar(a); archive_read_support_format_cpio(a); archive_read_support_format_empty(a); archive_read_support_format_iso9660(a); ==== //depot/projects/mjexp/lib/libarchive/archive_write_disk.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.5 2007/04/02 00:32:03 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.6 2007/04/07 19:35:02 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -1721,7 +1721,7 @@ set_fflags_platform(struct archive_write_disk *a, int fd, const char *name, mode_t mode, unsigned long set, unsigned long clear) { - (void)ad; /* UNUSED */ + (void)a; /* UNUSED */ (void)fd; /* UNUSED */ (void)name; /* UNUSED */ (void)mode; /* UNUSED */ ==== //depot/projects/mjexp/lib/libarchive/test/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.2 2007/03/08 06:09:27 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.3 2007/04/07 05:54:23 kientzle Exp $ TESTS= \ test_acl_basic.c \ @@ -7,6 +7,7 @@ test_bad_fd.c \ test_read_data_large.c \ test_read_extract.c \ + test_read_format_ar.c \ test_read_format_cpio_bin.c \ test_read_format_cpio_bin_Z.c \ test_read_format_cpio_bin_bz2.c \ @@ -30,6 +31,7 @@ test_write_disk.c \ test_write_disk_perms.c \ test_write_disk_secure.c \ + test_write_format_ar.c \ test_write_format_cpio_empty.c \ test_write_format_shar_empty.c \ test_write_format_tar.c \ @@ -66,4 +68,4 @@ -chmod -R +w /tmp/libarchive_test.* rm -rf /tmp/libarchive_test.* -.include +.include ==== //depot/projects/mjexp/lib/libc/sys/ptrace.2#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/lib/libc/sys/ptrace.2,v 1.38 2006/11/09 11:27:18 trhodes Exp $ +.\" $FreeBSD: src/lib/libc/sys/ptrace.2,v 1.39 2007/04/07 03:16:23 emaste Exp $ .\" $NetBSD: ptrace.2,v 1.2 1995/02/27 12:35:37 cgd Exp $ .\" .\" This file is in the public domain. @@ -299,6 +299,15 @@ This allows the structure to grow without affecting older programs. .It PT_GETLWPLIST This request can be used to get the current thread list. +A pointer to an array of type +.Vt lwpid_t +should be passed in +.Fa addr , +with the array size specified by +.Fa data . +The return value from +.Fn ptrace +is the count of array entries filled in. .El .Pp Additionally, machine-specific requests can exist. ==== //depot/projects/mjexp/libexec/rtld-elf/i386/Symbol.map#2 (text+ko) ==== @@ -1,12 +1,5 @@ -# $FreeBSD: src/libexec/rtld-elf/i386/Symbol.map,v 1.1 2007/04/03 19:01:06 kan Exp $ +# $FreeBSD: src/libexec/rtld-elf/i386/Symbol.map,v 1.2 2007/04/07 23:23:10 kan Exp $ FBSD_1.0 { ___tls_get_addr; }; - -# This is our private namespace. Any global interfaces that are -# strictly for use only by other FreeBSD applications and libraries >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 8 19:24:17 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DFDF16A403; Sun, 8 Apr 2007 19:24:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6A5C316A402 for ; Sun, 8 Apr 2007 19:24:17 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5B56113C43E for ; Sun, 8 Apr 2007 19:24:17 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l38JOH0A007771 for ; Sun, 8 Apr 2007 19:24:17 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l38JOGGG007765 for perforce@freebsd.org; Sun, 8 Apr 2007 19:24:16 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 8 Apr 2007 19:24:16 GMT Message-Id: <200704081924.l38JOGGG007765@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 117682 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Apr 2007 19:24:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=117682 Change 117682 by mjacob@mjexp on 2007/04/08 19:23:41 IFC Affected files ... .. //depot/projects/mjexp/sys/dev/ata/ata-all.h#6 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-chipset.c#12 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-dma.c#5 integrate .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_lro.c#3 integrate Differences ... ==== //depot/projects/mjexp/sys/dev/ata/ata-all.h#6 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.122 2007/04/06 16:18:59 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.123 2007/04/08 19:18:51 sos Exp $ */ /* ATA register defines */ @@ -441,11 +441,11 @@ u_int32_t segsize; /* DMA SG list segment size */ u_int32_t max_iosize; /* DMA data max IO size */ u_int32_t cur_iosize; /* DMA data current IO size */ + u_int64_t max_address; /* highest DMA'able address */ int flags; #define ATA_DMA_READ 0x01 /* transaction is a read */ #define ATA_DMA_LOADED 0x02 /* DMA tables etc loaded */ #define ATA_DMA_ACTIVE 0x04 /* DMA transfer in progress */ -#define ATA_DMA_64BIT 0x10 /* supports 64bit addressing */ void (*alloc)(device_t dev); void (*free)(device_t dev); ==== //depot/projects/mjexp/sys/dev/ata/ata-chipset.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.195 2007/04/06 17:36:35 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.196 2007/04/08 19:18:51 sos Exp $"); #include "opt_ata.h" #include @@ -776,7 +776,7 @@ ch->dma->setprd = ata_ahci_dmasetprd; ch->dma->max_iosize = 8192 * DEV_BSIZE; if (ATA_INL(ctlr->r_res2, ATA_AHCI_CAP) & ATA_AHCI_CAP_64BIT) - ch->dma->flags |= ATA_DMA_64BIT; + ch->dma->max_address = BUS_SPACE_MAXADDR; } } @@ -2734,7 +2734,7 @@ ch->dma->setprd = ata_marvell_edma_dmasetprd; if (ATA_INL(ctlr->r_res1, 0x00d00) & 0x00000004) - ch->dma->flags |= ATA_DMA_64BIT; + ch->dma->max_address = BUS_SPACE_MAXADDR; } } @@ -4816,8 +4816,7 @@ if (ch->dma) { /* note start and stop are not used here */ ch->dma->setprd = ata_siiprb_dmasetprd; - - ch->dma->flags |= ATA_DMA_64BIT; + ch->dma->max_address = BUS_SPACE_MAXADDR; } } ==== //depot/projects/mjexp/sys/dev/ata/ata-dma.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.145 2007/04/08 15:31:39 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.146 2007/04/08 19:18:51 sos Exp $"); #include #include @@ -78,6 +78,7 @@ ch->dma->boundary = 128 * DEV_BSIZE; ch->dma->segsize = 128 * DEV_BSIZE; ch->dma->max_iosize = 128 * DEV_BSIZE; + ch->dma->max_address = BUS_SPACE_MAXADDR_32BIT; } } @@ -95,24 +96,22 @@ { struct ata_channel *ch = device_get_softc(dev); struct ata_dc_cb_args ccba; - int maxaddr = (ch->dma->flags & ATA_DMA_64BIT ? - BUS_SPACE_MAXADDR : BUS_SPACE_MAXADDR_32BIT); if (bus_dma_tag_create(bus_get_dma_tag(dev), ch->dma->alignment, 0, - maxaddr, BUS_SPACE_MAXADDR, + ch->dma->max_address, BUS_SPACE_MAXADDR, NULL, NULL, ch->dma->max_iosize, ATA_DMA_ENTRIES, ch->dma->segsize, 0, NULL, NULL, &ch->dma->dmatag)) goto error; if (bus_dma_tag_create(ch->dma->dmatag, PAGE_SIZE, PAGE_SIZE, - maxaddr, BUS_SPACE_MAXADDR, + ch->dma->max_address, BUS_SPACE_MAXADDR, NULL, NULL, MAXTABSZ, 1, MAXTABSZ, 0, NULL, NULL, &ch->dma->sg_tag)) goto error; if (bus_dma_tag_create(ch->dma->dmatag,ch->dma->alignment,ch->dma->boundary, - maxaddr, BUS_SPACE_MAXADDR, + ch->dma->max_address, BUS_SPACE_MAXADDR, NULL, NULL, ch->dma->max_iosize, ATA_DMA_ENTRIES, ch->dma->segsize, 0, NULL, NULL, &ch->dma->data_tag)) @@ -133,7 +132,7 @@ goto error; if (bus_dma_tag_create(ch->dma->dmatag, PAGE_SIZE, 64 * 1024, - maxaddr, BUS_SPACE_MAXADDR, + ch->dma->max_address, BUS_SPACE_MAXADDR, NULL, NULL, MAXWSPCSZ, 1, MAXWSPCSZ, 0, NULL, NULL, &ch->dma->work_tag)) goto error; ==== //depot/projects/mjexp/sys/dev/cxgb/cxgb_lro.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_lro.c,v 1.2 2007/04/08 15:04:19 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_lro.c,v 1.3 2007/04/08 18:02:37 kmacy Exp $"); #include @@ -210,7 +210,7 @@ ih->ip_sum = 0; ih->ip_sum = in_cksum_hdr(ih); - MBUF_HEADER_CHECK(smh); + MBUF_HEADER_CHECK(sm); sm->m_flags |= M_LRO; t3_rx_eth(qs->port, &qs->rspq, sm, 2); @@ -282,7 +282,7 @@ return -1; } - MBUF_HEADER_CHECK(smh); + MBUF_HEADER_CHECK(sm); th = (struct tcphdr *)(sm->m_data + IPH_OFFSET + sizeof (struct ip)); if (olen) { From owner-p4-projects@FreeBSD.ORG Sun Apr 8 23:25:36 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 966D716A405; Sun, 8 Apr 2007 23:25:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5E78816A407 for ; Sun, 8 Apr 2007 23:25:36 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4F5A113C469 for ; Sun, 8 Apr 2007 23:25:36 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l38NPaMT014955 for ; Sun, 8 Apr 2007 23:25:36 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l38NPZin014932 for perforce@freebsd.org; Sun, 8 Apr 2007 23:25:35 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 8 Apr 2007 23:25:35 GMT Message-Id: <200704082325.l38NPZin014932@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 117694 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Apr 2007 23:25:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=117694 Change 117694 by mjacob@mjexp on 2007/04/08 23:24:34 More IFC. Affected files ... .. //depot/projects/mjexp/sys/dev/ata/ata-dma.c#6 integrate .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_lro.c#4 integrate .. //depot/projects/mjexp/sys/sys/param.h#14 integrate Differences ... ==== //depot/projects/mjexp/sys/dev/ata/ata-dma.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.146 2007/04/08 19:18:51 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.147 2007/04/08 21:53:52 sos Exp $"); #include #include @@ -258,8 +258,7 @@ dir ? BUS_DMASYNC_PREREAD : BUS_DMASYNC_PREWRITE); ch->dma->cur_iosize = count; - ch->dma->flags &= ATA_DMA_READ; - ch->dma->flags |= dir ? (ATA_DMA_LOADED | ATA_DMA_READ) : ATA_DMA_LOADED; + ch->dma->flags = dir ? (ATA_DMA_LOADED | ATA_DMA_READ) : ATA_DMA_LOADED; return 0; } ==== //depot/projects/mjexp/sys/dev/cxgb/cxgb_lro.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_lro.c,v 1.3 2007/04/08 18:02:37 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_lro.c,v 1.4 2007/04/08 22:56:18 kmacy Exp $"); #include @@ -66,14 +66,14 @@ #ifdef DEBUG #define MBUF_HEADER_CHECK(m) do { \ - if (m->m_len == 0 || m->m_pkthdr.len == 0 \ - || (m->m_flags & M_PKTHDR) == 0) \ + if ((m->m_len == 0) || (m->m_pkthdr.len == 0) \ + || ((m->m_flags & M_PKTHDR) == 0)) \ panic("lro_flush_session - mbuf len=%d pktlen=%d flags=0x%x\n", \ m->m_len, m->m_pkthdr.len, m->m_flags); \ - if (m->m_flags & M_PKTHDR) == 0) \ + if ((m->m_flags & M_PKTHDR) == 0) \ panic("first mbuf is not packet header - flags=0x%x\n", \ m->m_flags); \ - if (m->m_len < ETHER_HDR_LEN || m->m_pkthdr.len < ETHER_HDR_LEN) \ + if ((m->m_len < ETHER_HDR_LEN) || (m->m_pkthdr.len < ETHER_HDR_LEN)) \ panic("packet too small len=%d pktlen=%d\n", \ m->m_len, m->m_pkthdr.len);\ } while (0) ==== //depot/projects/mjexp/sys/sys/param.h#14 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.3 (Berkeley) 4/4/95 - * $FreeBSD: src/sys/sys/param.h,v 1.290 2007/04/06 02:33:43 pjd Exp $ + * $FreeBSD: src/sys/sys/param.h,v 1.291 2007/04/08 22:45:20 delphij Exp $ */ #ifndef _SYS_PARAM_H_ @@ -57,7 +57,7 @@ * is created, otherwise 1. */ #undef __FreeBSD_version -#define __FreeBSD_version 700036 /* Master, propagated to newvers */ +#define __FreeBSD_version 700037 /* Master, propagated to newvers */ #ifndef LOCORE #include From owner-p4-projects@FreeBSD.ORG Mon Apr 9 03:55:32 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 297C316A406; Mon, 9 Apr 2007 03:55:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F40FC16A401 for ; Mon, 9 Apr 2007 03:55:31 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CC19713C480 for ; Mon, 9 Apr 2007 03:55:31 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l393tVbQ054485 for ; Mon, 9 Apr 2007 03:55:31 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l393tV6m054479 for perforce@freebsd.org; Mon, 9 Apr 2007 03:55:31 GMT (envelope-from sam@freebsd.org) Date: Mon, 9 Apr 2007 03:55:31 GMT Message-Id: <200704090355.l393tV6m054479@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117711 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2007 03:55:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=117711 Change 117711 by sam@sam_ebb on 2007/04/09 03:55:27 use correct malloc bucket for accounting challenge text Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#99 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#99 (text+ko) ==== @@ -975,7 +975,7 @@ * open auth is attempted. */ if (ni->ni_challenge != NULL) { - FREE(ni->ni_challenge, M_DEVBUF); + FREE(ni->ni_challenge, M_80211_NODE); ni->ni_challenge = NULL; } /* XXX hack to workaround calling convention */ From owner-p4-projects@FreeBSD.ORG Mon Apr 9 04:02:44 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A25F16A404; Mon, 9 Apr 2007 04:02:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2D00916A401 for ; Mon, 9 Apr 2007 04:02:44 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1D60A13C469 for ; Mon, 9 Apr 2007 04:02:44 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3942hP9060499 for ; Mon, 9 Apr 2007 04:02:43 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3942h45060493 for perforce@freebsd.org; Mon, 9 Apr 2007 04:02:43 GMT (envelope-from sam@freebsd.org) Date: Mon, 9 Apr 2007 04:02:43 GMT Message-Id: <200704090402.l3942h45060493@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117712 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2007 04:02:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=117712 Change 117712 by sam@sam_ebb on 2007/04/09 04:01:43 return ENOENT when no sta entry is present for the mac address supplied to a get wpa ie ioctl; may want to do this for all similar ioctls--it helps identify faulty params which otherwise all result in EINVAL Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#72 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#72 (text+ko) ==== @@ -182,7 +182,7 @@ return error; ni = ieee80211_find_node(&ic->ic_sta, wpaie.wpa_macaddr); if (ni == NULL) - return EINVAL; /* XXX */ + return ENOENT; /* XXX */ memset(wpaie.wpa_ie, 0, sizeof(wpaie.wpa_ie)); if (ni->ni_wpa_ie != NULL) { int ielen = ni->ni_wpa_ie[1] + 2; From owner-p4-projects@FreeBSD.ORG Mon Apr 9 04:10:56 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D61F16A403; Mon, 9 Apr 2007 04:10:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BC7A916A401 for ; Mon, 9 Apr 2007 04:10:55 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id AC5CA13C46A for ; Mon, 9 Apr 2007 04:10:55 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l394AtUh065918 for ; Mon, 9 Apr 2007 04:10:55 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l394Atik065904 for perforce@freebsd.org; Mon, 9 Apr 2007 04:10:55 GMT (envelope-from sam@freebsd.org) Date: Mon, 9 Apr 2007 04:10:55 GMT Message-Id: <200704090410.l394Atik065904@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117714 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2007 04:10:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=117714 Change 117714 by sam@sam_ebb on 2007/04/09 04:10:05 move idiom for copying an information element into a function Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#73 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#73 (text+ko) ==== @@ -241,6 +241,16 @@ return error; } +static __inline u_int8_t * +copyie(u_int8_t *cp, const u_int8_t *ie) +{ + if (ie != NULL) { + memcpy(cp, ie, 2+ie[1]); + cp += 2+ie[1]; + } + return cp; +} + #ifdef COMPAT_FREEBSD6 #define IEEE80211_IOC_SCAN_RESULTS_OLD 24 @@ -331,14 +341,8 @@ memcpy(cp, se->se_ssid+2, sr->isr_ssid_len); cp += sr->isr_ssid_len; if (sr->isr_ie_len) { - if (se->se_wpa_ie != NULL) { - memcpy(cp, se->se_wpa_ie, 2+se->se_wpa_ie[1]); - cp += 2+se->se_wpa_ie[1]; - } - if (se->se_wme_ie != NULL) { - memcpy(cp, se->se_wme_ie, 2+se->se_wme_ie[1]); - cp += 2+se->se_wme_ie[1]; - } + cp = copyie(cp, se->se_wpa_ie); + cp = copyie(cp, se->se_wme_ie); } req->space -= len; @@ -453,22 +457,10 @@ memcpy(cp, se->se_ssid+2, sr->isr_ssid_len); cp += sr->isr_ssid_len; if (sr->isr_ie_len) { - if (se->se_wpa_ie != NULL) { - memcpy(cp, se->se_wpa_ie, 2+se->se_wpa_ie[1]); - cp += 2+se->se_wpa_ie[1]; - } - if (se->se_rsn_ie != NULL) { - memcpy(cp, se->se_rsn_ie, 2+se->se_rsn_ie[1]); - cp += 2+se->se_rsn_ie[1]; - } - if (se->se_wme_ie != NULL) { - memcpy(cp, se->se_wme_ie, 2+se->se_wme_ie[1]); - cp += 2+se->se_wme_ie[1]; - } - if (se->se_ath_ie != NULL) { - memcpy(cp, se->se_ath_ie, 2+se->se_ath_ie[1]); - cp += 2+se->se_ath_ie[1]; - } + cp = copyie(cp, se->se_wpa_ie); + cp = copyie(cp, se->se_rsn_ie); + cp = copyie(cp, se->se_wme_ie); + cp = copyie(cp, se->se_ath_ie); } req->space -= len; @@ -599,22 +591,10 @@ si->isi_inact = (si->isi_inact - ni->ni_inact) * IEEE80211_INACT_WAIT; cp = (u_int8_t *)(si+1); - if (ni->ni_wpa_ie != NULL) { - memcpy(cp, ni->ni_wpa_ie, 2+ni->ni_wpa_ie[1]); - cp += 2+ni->ni_wpa_ie[1]; - } - if (ni->ni_rsn_ie != NULL) { - memcpy(cp, ni->ni_rsn_ie, 2+ni->ni_rsn_ie[1]); - cp += 2+ni->ni_rsn_ie[1]; - } - if (ni->ni_wme_ie != NULL) { - memcpy(cp, ni->ni_wme_ie, 2+ni->ni_wme_ie[1]); - cp += 2+ni->ni_wme_ie[1]; - } - if (ni->ni_ath_ie != NULL) { - memcpy(cp, ni->ni_ath_ie, 2+ni->ni_ath_ie[1]); - cp += 2+ni->ni_ath_ie[1]; - } + cp = copyie(cp, ni->ni_wpa_ie); + cp = copyie(cp, ni->ni_rsn_ie); + cp = copyie(cp, ni->ni_wme_ie); + cp = copyie(cp, ni->ni_ath_ie); req->si = (struct ieee80211req_sta_info *)(((u_int8_t *)si) + len); req->space -= len; From owner-p4-projects@FreeBSD.ORG Mon Apr 9 04:16:04 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A80616A403; Mon, 9 Apr 2007 04:16:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C11EF16A401 for ; Mon, 9 Apr 2007 04:16:03 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B10C613C44C for ; Mon, 9 Apr 2007 04:16:03 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l394G31R071096 for ; Mon, 9 Apr 2007 04:16:03 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l394G3x2071090 for perforce@freebsd.org; Mon, 9 Apr 2007 04:16:03 GMT (envelope-from sam@freebsd.org) Date: Mon, 9 Apr 2007 04:16:03 GMT Message-Id: <200704090416.l394G3x2071090@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117716 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2007 04:16:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=117716 Change 117716 by sam@sam_ebb on 2007/04/09 04:15:50 use common code to set the current channel; also bring in fix to set the current channel displayed by ifconfig et al when interface is not up+running Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#74 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#74 (text+ko) ==== @@ -1635,6 +1635,11 @@ return NULL; } +/* + * Check the specified against any desired mode (aka netband). + * This is only used (presently) when operating in hostap mode + * to enforce consistency. + */ static int check_mode_consistency(const struct ieee80211_channel *c, int mode) { @@ -1654,20 +1659,69 @@ } +/* + * Common code to set the current channel. If the device + * is up and running this may result in an immediate channel + * change or a kick of the state machine. + */ +static int +setcurchan(struct ieee80211com *ic, struct ieee80211_channel *c) +{ + int error; + + if (c != IEEE80211_CHAN_ANYC) { + if (ic->ic_opmode == IEEE80211_M_HOSTAP && + !check_mode_consistency(c, ic->ic_des_mode)) + return EINVAL; + if (ic->ic_state == IEEE80211_S_RUN && c == ic->ic_bsschan) + return 0; /* NB: nothing to do */ + } + ic->ic_des_chan = c; + + error = 0; + if ((ic->ic_opmode == IEEE80211_M_MONITOR || + ic->ic_opmode == IEEE80211_M_WDS) && + ic->ic_des_chan != IEEE80211_CHAN_ANYC) { + /* + * Monitor and wds modes can switch directly. + */ + ic->ic_curchan = ic->ic_des_chan; + if (ic->ic_state == IEEE80211_S_RUN) + ic->ic_set_channel(ic); + } else { + /* + * Need to go through the state machine in case we + * need to reassociate or the like. The state machine + * will pickup the desired channel and avoid scanning. + */ + if (IS_UP_AUTO(ic)) + error = ieee80211_init(ic, RESCAN); + else if (ic->ic_des_chan != IEEE80211_CHAN_ANYC) { + /* + * When not up+running and a real channel has + * been specified fix the current channel so + * there is immediate feedback; e.g. via ifconfig. + */ + ic->ic_curchan = ic->ic_des_chan; + } + } + return error; +} + static int ieee80211_ioctl_setchannel(struct ieee80211com *ic, const struct ieee80211req *ireq) { - int error; + struct ieee80211_channel *c; /* XXX 0xffff overflows 16-bit signed */ if (ireq->i_val == 0 || ireq->i_val == (int16_t) IEEE80211_CHAN_ANY) { - ic->ic_des_chan = IEEE80211_CHAN_ANYC; + c = IEEE80211_CHAN_ANYC; } else if ((u_int) ireq->i_val > IEEE80211_CHAN_MAX) { return EINVAL; } else { - struct ieee80211_channel *c, *c2; + struct ieee80211_channel *c2; c = findchannel(ic, ireq->i_val, ic->ic_des_mode); if (c == NULL) { @@ -1712,33 +1766,14 @@ if (ic->ic_state == IEEE80211_S_RUN && c == ic->ic_bsschan) return 0; /* NB: nothing to do */ } - error = 0; - if ((ic->ic_opmode == IEEE80211_M_MONITOR || - ic->ic_opmode == IEEE80211_M_WDS) && - ic->ic_des_chan != IEEE80211_CHAN_ANYC) { - /* - * Monitor and wds modes can switch directly. - */ - ic->ic_curchan = ic->ic_des_chan; - if (ic->ic_state == IEEE80211_S_RUN) - ic->ic_set_channel(ic); - } else { - /* - * Need to go through the state machine in case we - * need to reassociate or the like. The state machine - * will pickup the desired channel and avoid scanning. - */ - if (IS_UP_AUTO(ic)) - error = ieee80211_init(ic, RESCAN); - } - return error; + return setcurchan(ic, c); } static int ieee80211_ioctl_setcurchan(struct ieee80211com *ic, const struct ieee80211req *ireq) { - struct ieee80211_channel chan; + struct ieee80211_channel chan, *c; int error; if (ireq->i_len != sizeof(chan)) @@ -1748,49 +1783,13 @@ return error; /* XXX 0xffff overflows 16-bit signed */ if (chan.ic_freq == 0 || chan.ic_freq == IEEE80211_CHAN_ANY) { - ic->ic_des_chan = IEEE80211_CHAN_ANYC; + c = IEEE80211_CHAN_ANYC; } else { - struct ieee80211_channel *c; - c = ieee80211_find_channel(ic, chan.ic_freq, chan.ic_flags); if (c == NULL) return EINVAL; - /* XXX? */ - if (ic->ic_opmode == IEEE80211_M_HOSTAP && - !check_mode_consistency(c, ic->ic_des_mode)) - return EINVAL; - ic->ic_des_chan = c; - if (ic->ic_state == IEEE80211_S_RUN && c == ic->ic_bsschan) - return 0; /* NB: nothing to do */ } - error = 0; - if ((ic->ic_opmode == IEEE80211_M_MONITOR || - ic->ic_opmode == IEEE80211_M_WDS) && - ic->ic_des_chan != IEEE80211_CHAN_ANYC) { - /* - * Monitor and wds modes can switch directly. - */ - ic->ic_curchan = ic->ic_des_chan; - if (ic->ic_state == IEEE80211_S_RUN) - ic->ic_set_channel(ic); - } else { - /* - * Need to go through the state machine in case we - * need to reassociate or the like. The state machine - * will pickup the desired channel and avoid scanning. - */ - if (IS_UP_AUTO(ic)) - error = ieee80211_init(ic, RESCAN); - else if (ic->ic_des_chan != IEEE80211_CHAN_ANYC) { - /* - * When not up+running and a real channel has - * been specified fix the current channel so - * there is immediate feedback; e.g. via ifconfig. - */ - ic->ic_curchan = ic->ic_des_chan; - } - } - return error; + return setcurchan(ic, c); } static int From owner-p4-projects@FreeBSD.ORG Mon Apr 9 04:16:34 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1DF1916A406; Mon, 9 Apr 2007 04:16:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D615F16A401 for ; Mon, 9 Apr 2007 04:16:33 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C3F5513C44C for ; Mon, 9 Apr 2007 04:16:33 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l394GX2j071403 for ; Mon, 9 Apr 2007 04:16:33 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l394G3Wb071102 for perforce@freebsd.org; Mon, 9 Apr 2007 04:16:03 GMT (envelope-from imp@freebsd.org) Date: Mon, 9 Apr 2007 04:16:03 GMT Message-Id: <200704090416.l394G3Wb071102@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 117717 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2007 04:16:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=117717 Change 117717 by imp@imp_paco-paco on 2007/04/09 04:15:54 IFC @117700 Affected files ... .. //depot/projects/arm/src/MAINTAINERS#5 integrate .. //depot/projects/arm/src/Makefile#10 integrate .. //depot/projects/arm/src/Makefile.inc1#24 integrate .. //depot/projects/arm/src/UPDATING#12 integrate .. //depot/projects/arm/src/bin/df/df.c#5 integrate .. //depot/projects/arm/src/cddl/Makefile#1 branch .. //depot/projects/arm/src/cddl/Makefile.inc#1 branch .. //depot/projects/arm/src/cddl/lib/Makefile#1 branch .. //depot/projects/arm/src/cddl/lib/Makefile.inc#1 branch .. //depot/projects/arm/src/cddl/lib/libavl/Makefile#1 branch .. //depot/projects/arm/src/cddl/lib/libnvpair/Makefile#1 branch .. //depot/projects/arm/src/cddl/lib/libumem/Makefile#1 branch .. //depot/projects/arm/src/cddl/lib/libuutil/Makefile#1 branch .. //depot/projects/arm/src/cddl/lib/libzfs/Makefile#1 branch .. //depot/projects/arm/src/cddl/lib/libzpool/Makefile#1 branch .. //depot/projects/arm/src/cddl/sbin/Makefile#1 branch .. //depot/projects/arm/src/cddl/sbin/Makefile.inc#1 branch .. //depot/projects/arm/src/cddl/sbin/zfs/Makefile#1 branch .. //depot/projects/arm/src/cddl/sbin/zpool/Makefile#1 branch .. //depot/projects/arm/src/cddl/usr.bin/Makefile#1 branch .. //depot/projects/arm/src/cddl/usr.bin/Makefile.inc#1 branch .. //depot/projects/arm/src/cddl/usr.bin/ztest/Makefile#1 branch .. //depot/projects/arm/src/cddl/usr.sbin/Makefile#1 branch .. //depot/projects/arm/src/cddl/usr.sbin/Makefile.inc#1 branch .. //depot/projects/arm/src/cddl/usr.sbin/zdb/Makefile#1 branch .. //depot/projects/arm/src/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/arm/src/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/arm/src/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/arm/src/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/arm/src/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/arm/src/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/arm/src/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/arm/src/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/arm/src/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/arm/src/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/arm/src/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/arm/src/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/arm/src/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/arm/src/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/arm/src/contrib/amd/hlfsd/hlfsd.h#2 integrate .. //depot/projects/arm/src/contrib/binutils/gas/as.h#2 integrate .. //depot/projects/arm/src/contrib/binutils/gas/tc.h#2 integrate .. //depot/projects/arm/src/contrib/openpam/lib/openpam_readline.c#2 integrate .. //depot/projects/arm/src/contrib/opensolaris/cmd/zdb/zdb.8#1 branch .. //depot/projects/arm/src/contrib/opensolaris/cmd/zdb/zdb.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/cmd/zfs/zfs.8#1 branch .. //depot/projects/arm/src/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch .. //depot/projects/arm/src/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch .. //depot/projects/arm/src/contrib/opensolaris/cmd/zpool/zpool.8#1 branch .. //depot/projects/arm/src/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch .. //depot/projects/arm/src/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/cmd/ztest/ztest.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/head/assert.h#1 branch .. //depot/projects/arm/src/contrib/opensolaris/head/atomic.h#1 branch .. //depot/projects/arm/src/contrib/opensolaris/head/libintl.h#1 branch .. //depot/projects/arm/src/contrib/opensolaris/head/stdio_ext.h#1 branch .. //depot/projects/arm/src/contrib/opensolaris/head/synch.h#1 branch .. //depot/projects/arm/src/contrib/opensolaris/head/thread.h#1 branch .. //depot/projects/arm/src/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch .. //depot/projects/arm/src/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch .. //depot/projects/arm/src/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch .. //depot/projects/arm/src/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch .. //depot/projects/arm/src/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch .. //depot/projects/arm/src/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch .. //depot/projects/arm/src/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch .. //depot/projects/arm/src/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch .. //depot/projects/arm/src/contrib/opensolaris/lib/libzpool/common/util.c#1 branch .. //depot/projects/arm/src/contrib/tcpdump/print-stp.c#2 integrate .. //depot/projects/arm/src/contrib/tcsh/sh.lex.c#3 integrate .. //depot/projects/arm/src/etc/defaults/periodic.conf#3 integrate .. //depot/projects/arm/src/etc/defaults/rc.conf#13 integrate .. //depot/projects/arm/src/etc/devd.conf#5 integrate .. //depot/projects/arm/src/etc/mtree/BSD.root.dist#2 integrate .. //depot/projects/arm/src/etc/periodic/daily/404.status-zfs#1 branch .. //depot/projects/arm/src/etc/periodic/daily/Makefile#2 integrate .. //depot/projects/arm/src/etc/rc#2 integrate .. //depot/projects/arm/src/etc/rc.d/FILESYSTEMS#1 branch .. //depot/projects/arm/src/etc/rc.d/Makefile#6 integrate .. //depot/projects/arm/src/etc/rc.d/addswap#2 integrate .. //depot/projects/arm/src/etc/rc.d/adjkerntz#2 integrate .. //depot/projects/arm/src/etc/rc.d/bootconf.sh#3 integrate .. //depot/projects/arm/src/etc/rc.d/cleanvar#2 integrate .. //depot/projects/arm/src/etc/rc.d/geli2#2 integrate .. //depot/projects/arm/src/etc/rc.d/hostname#3 integrate .. //depot/projects/arm/src/etc/rc.d/ip6addrctl#2 integrate .. //depot/projects/arm/src/etc/rc.d/ip6fw#3 integrate .. //depot/projects/arm/src/etc/rc.d/ipfilter#4 integrate .. //depot/projects/arm/src/etc/rc.d/ipfw#4 integrate .. //depot/projects/arm/src/etc/rc.d/ipmon#2 integrate .. //depot/projects/arm/src/etc/rc.d/ipsec#2 integrate .. //depot/projects/arm/src/etc/rc.d/isdnd#3 integrate .. //depot/projects/arm/src/etc/rc.d/kldxref#2 integrate .. //depot/projects/arm/src/etc/rc.d/mountcritremote#3 integrate .. //depot/projects/arm/src/etc/rc.d/mountd#2 integrate .. //depot/projects/arm/src/etc/rc.d/netif#4 integrate .. //depot/projects/arm/src/etc/rc.d/nfslocking#3 integrate .. //depot/projects/arm/src/etc/rc.d/pf#3 integrate .. //depot/projects/arm/src/etc/rc.d/pflog#3 integrate .. //depot/projects/arm/src/etc/rc.d/pfsync#3 integrate .. //depot/projects/arm/src/etc/rc.d/power_profile#3 integrate .. //depot/projects/arm/src/etc/rc.d/ppp#3 integrate .. //depot/projects/arm/src/etc/rc.d/var#3 integrate .. //depot/projects/arm/src/etc/rc.d/zfs#1 branch .. //depot/projects/arm/src/etc/rc.firewall#4 integrate .. //depot/projects/arm/src/include/stdio.h#2 integrate .. //depot/projects/arm/src/lib/libarchive/Makefile#10 integrate .. //depot/projects/arm/src/lib/libarchive/archive.h.in#11 integrate .. //depot/projects/arm/src/lib/libarchive/archive_check_magic.c#4 integrate .. //depot/projects/arm/src/lib/libarchive/archive_entry.c#6 integrate .. //depot/projects/arm/src/lib/libarchive/archive_private.h#8 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read.3#9 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read.c#10 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_data_into_buffer.c#4 delete .. //depot/projects/arm/src/lib/libarchive/archive_read_data_into_fd.c#5 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_extract.c#8 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_open_memory.c#4 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_private.h#2 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_compression_bzip2.c#8 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_compression_compress.c#6 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_compression_gzip.c#6 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_compression_none.c#9 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_format_all.c#4 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_format_ar.c#1 branch .. //depot/projects/arm/src/lib/libarchive/archive_read_support_format_iso9660.c#7 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_format_tar.c#8 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_disk.c#4 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_set_format_ar.c#1 branch .. //depot/projects/arm/src/lib/libarchive/archive_write_set_format_ustar.c#7 integrate .. //depot/projects/arm/src/lib/libarchive/libarchive-formats.5#4 integrate .. //depot/projects/arm/src/lib/libarchive/test/Makefile#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_format_ar.c#1 branch .. //depot/projects/arm/src/lib/libarchive/test/test_write_format_ar.c#1 branch .. //depot/projects/arm/src/lib/libatm/cache_key.c#2 integrate .. //depot/projects/arm/src/lib/libc/amd64/stdlib/Makefile.inc#1 branch .. //depot/projects/arm/src/lib/libc/amd64/stdlib/div.S#1 branch .. //depot/projects/arm/src/lib/libc/amd64/stdlib/ldiv.S#1 branch .. //depot/projects/arm/src/lib/libc/amd64/stdlib/lldiv.S#1 branch .. //depot/projects/arm/src/lib/libc/gen/Symbol.map#3 integrate .. //depot/projects/arm/src/lib/libc/gen/dlfcn.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getvfsbyname.3#3 integrate .. //depot/projects/arm/src/lib/libc/resolv/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/libc/resolv/res_debug.c#3 integrate .. //depot/projects/arm/src/lib/libc/sys/lseek.2#3 integrate .. //depot/projects/arm/src/lib/libc/sys/pathconf.2#3 integrate .. //depot/projects/arm/src/lib/libc/sys/ptrace.2#3 integrate .. //depot/projects/arm/src/lib/libc/uuid/uuid_compare.c#3 integrate .. //depot/projects/arm/src/lib/libcrypt/crypt.3#2 integrate .. //depot/projects/arm/src/lib/libgssapi/gss_accept_sec_context.c#2 integrate .. //depot/projects/arm/src/lib/libgssapi/gss_add_cred.c#2 integrate .. //depot/projects/arm/src/lib/libgssapi/gss_add_oid_set_member.c#2 integrate .. //depot/projects/arm/src/lib/libgssapi/gss_canonicalize_name.c#2 integrate .. //depot/projects/arm/src/lib/libgssapi/gss_display_name.c#2 integrate .. //depot/projects/arm/src/lib/libgssapi/gss_duplicate_name.c#2 integrate .. //depot/projects/arm/src/lib/libgssapi/gss_export_sec_context.c#2 integrate .. //depot/projects/arm/src/lib/libgssapi/gss_import_name.c#2 integrate .. //depot/projects/arm/src/lib/libgssapi/gss_init_sec_context.c#2 integrate .. //depot/projects/arm/src/lib/libgssapi/gss_inquire_cred.c#2 integrate .. //depot/projects/arm/src/lib/libgssapi/gss_names.c#2 integrate .. //depot/projects/arm/src/lib/libgssapi/gss_utils.c#2 integrate .. //depot/projects/arm/src/lib/libradius/radlib.c#2 integrate .. //depot/projects/arm/src/lib/libstand/environment.c#2 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_info.c#3 integrate .. //depot/projects/arm/src/libexec/rtld-elf/Makefile#2 integrate .. //depot/projects/arm/src/libexec/rtld-elf/Symbol.map#1 branch .. //depot/projects/arm/src/libexec/rtld-elf/Versions.def#1 branch .. //depot/projects/arm/src/libexec/rtld-elf/i386/Symbol.map#1 branch .. //depot/projects/arm/src/libexec/rtld-elf/map_object.c#2 integrate .. //depot/projects/arm/src/libexec/rtld-elf/rtld.c#7 integrate .. //depot/projects/arm/src/libexec/rtld-elf/rtld.h#2 integrate .. //depot/projects/arm/src/libexec/rtld-elf/rtld_lock.c#2 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#7 integrate .. //depot/projects/arm/src/sbin/dump/traverse.c#3 integrate .. //depot/projects/arm/src/sbin/gbde/test.sh#2 integrate .. //depot/projects/arm/src/sbin/geom/class/journal/geom_journal.c#2 integrate .. //depot/projects/arm/src/sbin/ggate/ggatec/Makefile#2 integrate .. //depot/projects/arm/src/sbin/ggate/shared/ggate.c#4 integrate .. //depot/projects/arm/src/share/man/man4/if_bridge.4#8 integrate .. //depot/projects/arm/src/share/man/man4/man4.i386/Makefile#2 integrate .. //depot/projects/arm/src/share/man/man4/man4.i386/acpi_aiboost.4#1 branch .. //depot/projects/arm/src/share/man/man4/mpt.4#3 integrate .. //depot/projects/arm/src/share/man/man4/nfe.4#3 integrate .. //depot/projects/arm/src/share/man/man4/pci.4#2 integrate .. //depot/projects/arm/src/share/man/man4/polling.4#3 integrate .. //depot/projects/arm/src/share/man/man4/tcp.4#5 integrate .. //depot/projects/arm/src/share/man/man5/rc.conf.5#10 integrate .. //depot/projects/arm/src/share/man/man5/src.conf.5#6 integrate .. //depot/projects/arm/src/share/man/man7/hier.7#7 integrate .. //depot/projects/arm/src/share/man/man9/Makefile#11 integrate .. //depot/projects/arm/src/share/man/man9/VFS_SET.9#2 integrate .. //depot/projects/arm/src/share/man/man9/sx.9#4 integrate .. //depot/projects/arm/src/share/man/man9/vhold.9#2 integrate .. //depot/projects/arm/src/share/misc/Makefile#3 integrate .. //depot/projects/arm/src/share/misc/committers-doc.dot#2 integrate .. //depot/projects/arm/src/share/misc/committers-ports.dot#2 integrate .. //depot/projects/arm/src/share/misc/committers-src.dot#2 integrate .. //depot/projects/arm/src/share/mk/Makefile#2 integrate .. //depot/projects/arm/src/share/mk/bsd.lib.mk#6 integrate .. //depot/projects/arm/src/share/mk/bsd.libnames.mk#5 integrate .. //depot/projects/arm/src/share/mk/bsd.own.mk#10 integrate .. //depot/projects/arm/src/share/mk/bsd.symver.mk#1 branch .. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysvec.c#14 integrate .. //depot/projects/arm/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#10 integrate .. //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#41 integrate .. //depot/projects/arm/src/sys/arm/sa11x0/uart_cpu_sa1110.c#5 integrate .. //depot/projects/arm/src/sys/arm/sa11x0/uart_dev_sa1110.c#8 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/uart_cpu_i80321.c#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#6 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#33 integrate .. //depot/projects/arm/src/sys/boot/forth/loader.conf#13 integrate .. //depot/projects/arm/src/sys/boot/pc98/boot0.5/Makefile#2 integrate .. //depot/projects/arm/src/sys/boot/pc98/boot0.5/boot0.5.s#3 integrate .. //depot/projects/arm/src/sys/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/arm/src/sys/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/arm/src/sys/boot/pc98/boot0.5/selector.s#2 integrate .. //depot/projects/arm/src/sys/boot/pc98/boot0.5/start.s#2 integrate .. //depot/projects/arm/src/sys/boot/pc98/boot2/boot.c#4 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_sg.c#1 branch .. //depot/projects/arm/src/sys/cam/scsi/scsi_sg.h#1 branch .. //depot/projects/arm/src/sys/compat/linprocfs/linprocfs.c#17 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_emul.c#12 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_emul.h#6 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_file.c#11 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_ioctl.c#8 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_ioctl.h#4 integrate .. //depot/projects/arm/src/sys/compat/ndis/kern_ndis.c#7 integrate .. //depot/projects/arm/src/sys/compat/ndis/ndis_var.h#4 integrate .. //depot/projects/arm/src/sys/compat/ndis/subr_ndis.c#7 integrate .. //depot/projects/arm/src/sys/compat/ndis/subr_pe.c#4 integrate .. //depot/projects/arm/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/arm/src/sys/compat/svr4/svr4_filio.c#2 integrate .. //depot/projects/arm/src/sys/conf/NOTES#45 integrate .. //depot/projects/arm/src/sys/conf/files#66 integrate .. //depot/projects/arm/src/sys/conf/files.amd64#22 integrate .. //depot/projects/arm/src/sys/conf/files.i386#24 integrate .. //depot/projects/arm/src/sys/conf/files.pc98#15 integrate .. //depot/projects/arm/src/sys/conf/files.powerpc#15 integrate .. //depot/projects/arm/src/sys/conf/options#42 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/dnlc.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/atomic.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/dnlc.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/vfs.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/arm/src/sys/dev/acpica/acpi_ec.c#8 integrate .. //depot/projects/arm/src/sys/dev/ahb/ahb.c#7 integrate .. //depot/projects/arm/src/sys/dev/arcmsr/arcmsr.c#10 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-all.h#15 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#35 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-dma.c#7 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-lowlevel.c#11 integrate .. //depot/projects/arm/src/sys/dev/ata/ata_if.m#3 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bge.c#31 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_lro.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_osdep.h#3 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/arm/src/sys/dev/cxgb/sys/mvec.h#1 branch .. //depot/projects/arm/src/sys/dev/cxgb/sys/uipc_mvec.c#1 branch .. //depot/projects/arm/src/sys/dev/ed/if_ed_pccard.c#6 integrate .. //depot/projects/arm/src/sys/dev/if_ndis/if_ndis_pccard.c#4 integrate .. //depot/projects/arm/src/sys/dev/ipmi/ipmi_pci.c#3 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.c#24 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.h#19 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_library.c#11 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_library.h#8 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_pci.c#24 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_sbus.c#16 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#35 integrate .. //depot/projects/arm/src/sys/dev/msk/if_msk.c#4 integrate .. //depot/projects/arm/src/sys/dev/mxge/if_mxge.c#13 integrate .. //depot/projects/arm/src/sys/dev/pci/pci.c#24 integrate .. //depot/projects/arm/src/sys/dev/pci/pci_pci.c#10 integrate .. //depot/projects/arm/src/sys/dev/pci/pcireg.h#10 integrate .. //depot/projects/arm/src/sys/dev/sk/if_sk.c#12 integrate .. //depot/projects/arm/src/sys/dev/sk/if_skreg.h#6 integrate .. //depot/projects/arm/src/sys/dev/sound/midi/midi.c#7 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/cmi.c#11 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/channel.c#9 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/mixer.c#7 integrate .. //depot/projects/arm/src/sys/dev/sound/usb/uaudio.c#12 integrate .. //depot/projects/arm/src/sys/dev/streams/streams.c#3 integrate .. //depot/projects/arm/src/sys/dev/uart/uart.h#3 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_bus.h#7 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_bus_pci.c#6 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_core.c#12 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_cpu.h#5 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_cpu_amd64.c#4 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_cpu_i386.c#4 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_cpu_ia64.c#4 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_cpu_pc98.c#4 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_cpu_powerpc.c#3 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_cpu_sparc64.c#5 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_dev_ns8250.c#8 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_dev_sab82532.c#5 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_dev_z8530.c#8 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_kbd_sun.c#7 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_subr.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/if_aue.c#12 integrate .. //depot/projects/arm/src/sys/dev/usb/if_axe.c#9 integrate .. //depot/projects/arm/src/sys/dev/usb/if_ural.c#18 integrate .. //depot/projects/arm/src/sys/dev/usb/ubser.c#4 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs_vnops.c#15 integrate .. //depot/projects/arm/src/sys/fs/fdescfs/fdesc_vfsops.c#4 integrate .. //depot/projects/arm/src/sys/fs/fdescfs/fdesc_vnops.c#7 integrate .. //depot/projects/arm/src/sys/fs/fifofs/fifo_vnops.c#6 integrate .. //depot/projects/arm/src/sys/fs/pseudofs/pseudofs.c#6 integrate .. //depot/projects/arm/src/sys/fs/pseudofs/pseudofs.h#5 integrate .. //depot/projects/arm/src/sys/fs/unionfs/union_subr.c#7 integrate .. //depot/projects/arm/src/sys/geom/eli/g_eli.c#18 integrate .. //depot/projects/arm/src/sys/geom/journal/g_journal.c#4 integrate .. //depot/projects/arm/src/sys/geom/uzip/g_uzip.c#5 integrate .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/support/mrlock.c#2 integrate .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/support/mrlock.h#2 integrate .. //depot/projects/arm/src/sys/i386/acpica/acpi_machdep.c#7 integrate .. //depot/projects/arm/src/sys/i386/i386/identcpu.c#21 integrate .. //depot/projects/arm/src/sys/i386/i386/initcpu.c#5 integrate .. //depot/projects/arm/src/sys/i386/i386/minidump_machdep.c#3 integrate .. //depot/projects/arm/src/sys/i386/i386/pmap.c#30 integrate .. //depot/projects/arm/src/sys/i386/i386/trap.c#14 integrate .. //depot/projects/arm/src/sys/i386/include/pmap.h#9 integrate .. //depot/projects/arm/src/sys/i386/include/specialreg.h#9 integrate .. //depot/projects/arm/src/sys/i386/include/vmparam.h#2 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_sysvec.c#11 integrate .. //depot/projects/arm/src/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#3 integrate .. //depot/projects/arm/src/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#3 integrate .. //depot/projects/arm/src/sys/i4b/layer1/isic/i4b_avm_a1.c#3 integrate .. //depot/projects/arm/src/sys/i4b/layer1/isic/i4b_isic_pnp.c#3 integrate .. //depot/projects/arm/src/sys/i4b/layer1/isic/i4b_itk_ix1.c#3 integrate .. //depot/projects/arm/src/sys/i4b/layer1/isic/i4b_tel_s016.c#3 integrate .. //depot/projects/arm/src/sys/i4b/layer1/isic/i4b_tel_s0163.c#3 integrate .. //depot/projects/arm/src/sys/kern/kern_descrip.c#19 integrate .. //depot/projects/arm/src/sys/kern/kern_event.c#12 integrate .. //depot/projects/arm/src/sys/kern/kern_fork.c#17 integrate .. //depot/projects/arm/src/sys/kern/kern_jail.c#8 integrate .. //depot/projects/arm/src/sys/kern/kern_mbuf.c#14 integrate .. //depot/projects/arm/src/sys/kern/kern_mutex.c#15 integrate .. //depot/projects/arm/src/sys/kern/kern_sx.c#10 integrate .. //depot/projects/arm/src/sys/kern/subr_lock.c#6 integrate .. //depot/projects/arm/src/sys/kern/subr_witness.c#17 integrate .. //depot/projects/arm/src/sys/kern/sys_generic.c#9 integrate .. //depot/projects/arm/src/sys/kern/uipc_mqueue.c#12 integrate .. //depot/projects/arm/src/sys/kern/uipc_syscalls.c#21 integrate .. //depot/projects/arm/src/sys/kern/uipc_usrreq.c#24 integrate .. //depot/projects/arm/src/sys/kern/vfs_cache.c#7 integrate .. //depot/projects/arm/src/sys/kern/vfs_lookup.c#15 integrate .. //depot/projects/arm/src/sys/kern/vfs_mount.c#26 integrate .. //depot/projects/arm/src/sys/kern/vfs_subr.c#32 integrate .. //depot/projects/arm/src/sys/kern/vfs_syscalls.c#27 integrate .. //depot/projects/arm/src/sys/libkern/memset.c#1 branch .. //depot/projects/arm/src/sys/modules/Makefile#39 integrate .. //depot/projects/arm/src/sys/modules/cam/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/cryptodev/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/cxgb/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/zfs/Makefile#1 branch .. //depot/projects/arm/src/sys/netatm/atm_if.c#3 integrate .. //depot/projects/arm/src/sys/netgraph/ng_base.c#10 integrate .. //depot/projects/arm/src/sys/netinet/in_pcb.h#9 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw2.c#28 integrate .. //depot/projects/arm/src/sys/netinet/ip_var.h#6 integrate .. //depot/projects/arm/src/sys/netinet/libalias/alias_db.c#4 integrate .. //depot/projects/arm/src/sys/netinet/libalias/alias_ftp.c#3 integrate .. //depot/projects/arm/src/sys/netinet/libalias/alias_irc.c#3 integrate .. //depot/projects/arm/src/sys/netinet/libalias/alias_proxy.c#4 integrate .. //depot/projects/arm/src/sys/netinet/libalias/alias_skinny.c#3 integrate .. //depot/projects/arm/src/sys/netinet/sctp_asconf.c#7 integrate .. //depot/projects/arm/src/sys/netinet/sctp_auth.c#6 integrate .. //depot/projects/arm/src/sys/netinet/sctp_bsd_addr.h#4 integrate .. //depot/projects/arm/src/sys/netinet/sctp_constants.h#7 integrate .. //depot/projects/arm/src/sys/netinet/sctp_indata.c#9 integrate .. //depot/projects/arm/src/sys/netinet/sctp_input.c#9 integrate .. //depot/projects/arm/src/sys/netinet/sctp_os_bsd.h#7 integrate .. //depot/projects/arm/src/sys/netinet/sctp_output.c#9 integrate .. //depot/projects/arm/src/sys/netinet/sctp_output.h#4 integrate .. //depot/projects/arm/src/sys/netinet/sctp_pcb.c#9 integrate .. //depot/projects/arm/src/sys/netinet/sctp_pcb.h#5 integrate .. //depot/projects/arm/src/sys/netinet/sctp_structs.h#9 integrate .. //depot/projects/arm/src/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/arm/src/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/arm/src/sys/netinet/sctp_timer.c#7 integrate .. //depot/projects/arm/src/sys/netinet/sctp_uio.h#8 integrate .. //depot/projects/arm/src/sys/netinet/sctp_usrreq.c#9 integrate .. //depot/projects/arm/src/sys/netinet/sctputil.c#9 integrate .. //depot/projects/arm/src/sys/netinet/tcp_input.c#25 integrate .. //depot/projects/arm/src/sys/netinet/tcp_output.c#13 integrate .. //depot/projects/arm/src/sys/netinet/tcp_sack.c#11 integrate .. //depot/projects/arm/src/sys/netinet/tcp_subr.c#20 integrate .. //depot/projects/arm/src/sys/netinet/tcp_syncache.c#17 integrate .. //depot/projects/arm/src/sys/netinet/tcp_timer.c#12 integrate .. //depot/projects/arm/src/sys/netinet6/in6_src.c#8 integrate .. //depot/projects/arm/src/sys/netinet6/sctp6_usrreq.c#8 integrate .. //depot/projects/arm/src/sys/netsmb/smb_dev.c#5 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_srvsubs.c#11 integrate .. //depot/projects/arm/src/sys/opencrypto/cryptodev.c#8 integrate .. //depot/projects/arm/src/sys/powerpc/conf/GENERIC#14 integrate .. //depot/projects/arm/src/sys/powerpc/conf/NOTES#7 integrate .. //depot/projects/arm/src/sys/powerpc/powermac/uninorth.c#4 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/extintr.c#2 delete .. //depot/projects/arm/src/sys/security/audit/audit_bsm_klib.c#6 integrate .. //depot/projects/arm/src/sys/sun4v/include/smp.h#5 integrate .. //depot/projects/arm/src/sys/sys/_sx.h#1 branch .. //depot/projects/arm/src/sys/sys/elf_common.h#6 integrate .. //depot/projects/arm/src/sys/sys/filedesc.h#4 integrate .. //depot/projects/arm/src/sys/sys/filio.h#3 integrate .. //depot/projects/arm/src/sys/sys/jail.h#4 integrate .. //depot/projects/arm/src/sys/sys/kernel.h#6 integrate .. //depot/projects/arm/src/sys/sys/link_elf.h#2 integrate .. //depot/projects/arm/src/sys/sys/lock.h#13 integrate .. //depot/projects/arm/src/sys/sys/lock_profile.h#4 integrate .. //depot/projects/arm/src/sys/sys/mbuf.h#20 integrate .. //depot/projects/arm/src/sys/sys/mount.h#18 integrate .. //depot/projects/arm/src/sys/sys/mutex.h#12 integrate .. //depot/projects/arm/src/sys/sys/param.h#27 integrate .. //depot/projects/arm/src/sys/sys/priv.h#3 integrate .. //depot/projects/arm/src/sys/sys/sleepqueue.h#7 integrate .. //depot/projects/arm/src/sys/sys/sx.h#9 integrate .. //depot/projects/arm/src/sys/sys/sysent.h#8 integrate .. //depot/projects/arm/src/sys/sys/systm.h#22 integrate .. //depot/projects/arm/src/sys/sys/unistd.h#4 integrate .. //depot/projects/arm/src/sys/sys/vnode.h#17 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_snapshot.c#17 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_softdep.c#16 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_vfsops.c#24 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_vnops.c#10 integrate .. //depot/projects/arm/src/sys/vm/vm_fault.c#18 integrate .. //depot/projects/arm/src/sys/vm/vm_kern.c#6 integrate .. //depot/projects/arm/src/tools/build/mk/OptionalObsoleteFiles.inc#7 integrate .. //depot/projects/arm/src/tools/build/options/WITHOUT_ZFS#1 branch .. //depot/projects/arm/src/tools/regression/netinet/ipblock/Makefile#1 branch .. //depot/projects/arm/src/tools/regression/netinet/ipblock/ipblock.c#1 branch .. //depot/projects/arm/src/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c#2 integrate .. //depot/projects/arm/src/tools/regression/sockets/socketpair/socketpair.c#2 integrate .. //depot/projects/arm/src/tools/regression/usr.bin/sed/multitest.t#2 integrate .. //depot/projects/arm/src/tools/regression/usr.bin/sed/regress.b2a.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/sed/regress.c0.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/sed/regress.c1.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/sed/regress.c2.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/sed/regress.c3.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/sed/regress.multitest.out/54_5.3#2 integrate .. //depot/projects/arm/src/tools/regression/usr.bin/sed/regress.sh#3 integrate .. //depot/projects/arm/src/usr.bin/calendar/calendars/calendar.freebsd#11 integrate .. //depot/projects/arm/src/usr.bin/lastcomm/lastcomm.1#2 integrate .. //depot/projects/arm/src/usr.bin/lastcomm/lastcomm.c#2 integrate .. //depot/projects/arm/src/usr.bin/lsvfs/lsvfs.c#2 integrate .. //depot/projects/arm/src/usr.bin/passwd/passwd.1#2 integrate .. //depot/projects/arm/src/usr.bin/sed/POSIX#2 integrate .. //depot/projects/arm/src/usr.bin/sed/process.c#2 integrate .. //depot/projects/arm/src/usr.bin/tar/read.c#5 integrate .. //depot/projects/arm/src/usr.bin/tar/test/test-basic.sh#2 integrate .. //depot/projects/arm/src/usr.bin/tar/write.c#7 integrate .. //depot/projects/arm/src/usr.sbin/jail/jail.8#4 integrate .. //depot/projects/arm/src/usr.sbin/ntp/doc/ntpd.8#3 integrate .. //depot/projects/arm/src/usr.sbin/pstat/pstat.8#2 integrate .. //depot/projects/arm/src/usr.sbin/pstat/pstat.c#3 integrate .. //depot/projects/arm/src/usr.sbin/rpc.lockd/lockd.c#3 integrate .. //depot/projects/arm/src/usr.sbin/rpc.lockd/rpc.lockd.8#2 integrate .. //depot/projects/arm/src/usr.sbin/rpc.statd/procs.c#4 integrate .. //depot/projects/arm/src/usr.sbin/rpc.statd/rpc.statd.8#2 integrate .. //depot/projects/arm/src/usr.sbin/rpc.statd/statd.c#3 integrate .. //depot/projects/arm/src/usr.sbin/sa/pdb.c#2 integrate .. //depot/projects/arm/src/usr.sbin/sysinstall/config.c#6 integrate .. //depot/projects/arm/src/usr.sbin/sysinstall/index.c#6 integrate Differences ... ==== //depot/projects/arm/src/MAINTAINERS#5 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.142 2006/11/11 22:24:10 kris Exp $ +$FreeBSD: src/MAINTAINERS,v 1.143 2007/04/06 10:57:15 pjd Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -108,6 +108,7 @@ geom_stripe pjd Pre-commit review preferred. geom_zero pjd Pre-commit review preferred. sbin/geom pjd Pre-commit review preferred. +zfs pjd Pre-commit review preferred. nfs alfred Will be happy to review code, but not mandatory. rpc.lockd alfred Will be happy to review code, but not mandatory. truss alfred Will be happy to review code, but not mandatory. ==== //depot/projects/arm/src/Makefile#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.339 2006/11/28 01:03:29 ru Exp $ +# $FreeBSD: src/Makefile,v 1.340 2007/04/02 21:32:44 marcel Exp $ # # The user-driven targets are: # @@ -263,12 +263,14 @@ # existing system is. # .if make(universe) +TARGETS?=amd64 arm i386 ia64 pc98 powerpc sparc64 sun4v + universe: universe_prologue universe_prologue: @echo "--------------------------------------------------------------" @echo ">>> make universe started on ${STARTTIME}" @echo "--------------------------------------------------------------" -.for target in amd64 arm i386 ia64 pc98 powerpc sparc64 sun4v +.for target in ${TARGETS} KERNCONFS!= cd ${.CURDIR}/sys/${target}/conf && \ find [A-Z]*[A-Z] -type f -maxdepth 0 \ ! -name DEFAULTS ! -name LINT ==== //depot/projects/arm/src/Makefile.inc1#24 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.570 2007/03/09 12:11:56 rafan Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.571 2007/04/06 02:13:29 pjd Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -40,6 +40,9 @@ .if ${MK_GAMES} != "no" SUBDIR+=games .endif +.if ${MK_CDDL} != "no" +SUBDIR+=cddl +.endif SUBDIR+=gnu include .if ${MK_KERBEROS} != "no" SUBDIR+=kerberos5 @@ -430,6 +433,9 @@ .for _t in obj includes cd ${.CURDIR}/include; ${LIB32WMAKE} ${_t} cd ${.CURDIR}/lib; ${LIB32WMAKE} ${_t} +.if ${MK_CDDL} != "no" + cd ${.CURDIR}/cddl/lib; ${LIB32WMAKE} ${_t} +.endif cd ${.CURDIR}/gnu/lib; ${LIB32WMAKE} ${_t} .if ${MK_CRYPT} != "no" cd ${.CURDIR}/secure/lib; ${LIB32WMAKE} ${_t} @@ -1014,12 +1020,16 @@ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ - ${_secure_lib_libssl} + ${_secure_lib_libssl} lib/libthr -_generic_libs= gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib +_generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib lib/libopie__L lib/libtacplus__L: lib/libmd__L +.if ${MK_CDDL} != "no" +_cddl_lib= cddl/lib +.endif + .if ${MK_CRYPT} != "no" .if ${MK_OPENSSL} != "no" _secure_lib_libcrypto= secure/lib/libcrypto ==== //depot/projects/arm/src/UPDATING#12 (text+ko) ==== @@ -24,8 +24,9 @@ 20070302: Firmwares for ipw(4) and iwi(4) are now included in the base tree. In order to use them one must agree to the respective LICENSE in - share/doc/legal and define legal..license_ack=1 via - loader.conf(5) or kenv(1). + share/doc/legal and define legal.intel_.license_ack=1 via + loader.conf(5) or kenv(1). Make sure to deinstall the now + deprecated modules from the respective firmware ports. 20070228: The name resolution/mapping functions addr2ascii(3) and ascii2addr(3) @@ -757,4 +758,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.482 2007/03/02 14:56:15 flz Exp $ +$FreeBSD: src/UPDATING,v 1.484 2007/04/03 10:04:54 brueffer Exp $ ==== //depot/projects/arm/src/bin/df/df.c#5 (text+ko) ==== @@ -44,7 +44,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.67 2007/03/08 06:10:17 will Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.68 2007/04/06 15:36:43 kan Exp $"); #include #include @@ -384,7 +384,7 @@ static void prtstat(struct statfs *sfsp, struct maxwidths *mwp) { - static u_long blocksize; + static long blocksize; static int headerlen, timesthrough = 0; static const char *header; int64_t used, availblks, inodes; @@ -461,7 +461,7 @@ static void update_maxwidths(struct maxwidths *mwp, const struct statfs *sfsp) { - static u_long blocksize = 0; + static long blocksize = 0; int dummy; if (blocksize == 0) ==== //depot/projects/arm/src/contrib/amd/hlfsd/hlfsd.h#2 (text+ko) ==== @@ -39,7 +39,7 @@ * %W% (Berkeley) %G% * * $Id: hlfsd.h,v 1.4.2.7 2004/01/06 03:15:23 ezk Exp $ - * $FreeBSD: src/contrib/amd/hlfsd/hlfsd.h,v 1.4 2004/07/06 13:16:46 mbr Exp $ + * $FreeBSD: src/contrib/amd/hlfsd/hlfsd.h,v 1.5 2007/04/06 15:51:35 kan Exp $ * * HLFSD was written at Columbia University Computer Science Department, by * Erez Zadok and Alexander Dupuy @@ -143,7 +143,6 @@ extern char *mailbox(int, char *); extern char *passwdfile; extern char *slinkname; -extern char mboxfile[]; extern gid_t hlfs_gid; extern int cache_interval; extern int noverify; ==== //depot/projects/arm/src/contrib/binutils/gas/as.h#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* as.h - global header file Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003 + 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -397,6 +397,22 @@ /* Enough bits for address, but still an integer type. Could be a problem, cross-assembling for 64-bit machines. */ typedef addressT relax_addressT; + +struct relax_type +{ + /* Forward reach. Signed number. > 0. */ + offsetT rlx_forward; + /* Backward reach. Signed number. < 0. */ + offsetT rlx_backward; + + /* Bytes length of this address. */ + unsigned char rlx_length; + + /* Next longer relax-state. 0 means there is no 'next' relax-state. */ + relax_substateT rlx_more; +}; + +typedef struct relax_type relax_typeS; /* main program "as.c" (command arguments etc) */ ==== //depot/projects/arm/src/contrib/binutils/gas/tc.h#2 (text+ko) ==== @@ -24,25 +24,6 @@ extern const pseudo_typeS md_pseudo_table[]; -/* JF moved this here from as.h under the theory that nobody except MACHINE.c - and write.c care about it anyway. */ - -struct relax_type -{ - /* Forward reach. Signed number. > 0. */ - long rlx_forward; - /* Backward reach. Signed number. < 0. */ - long rlx_backward; - - /* Bytes length of this address. */ - unsigned char rlx_length; - - /* Next longer relax-state. 0 means there is no 'next' relax-state. */ - relax_substateT rlx_more; -}; - -typedef struct relax_type relax_typeS; - extern const int md_reloc_size; /* Size of a relocation record */ char *md_atof (int what_statement_type, char *literalP, int *sizeP); ==== //depot/projects/arm/src/contrib/openpam/lib/openpam_readline.c#2 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_readline.c#3 $ + * $Id: openpam_readline.c 380 2006-03-14 14:42:09Z des $ */ #include @@ -52,7 +52,7 @@ char * openpam_readline(FILE *f, int *lineno, size_t *lenp) { - unsigned char *line; + char *line; size_t len, size; int ch; @@ -63,7 +63,7 @@ #define line_putch(ch) do { \ if (len >= size - 1) { \ - unsigned char *tmp = realloc(line, size *= 2); \ + char *tmp = realloc(line, size *= 2); \ if (tmp == NULL) \ goto fail; \ line = tmp; \ @@ -83,7 +83,7 @@ /* eof */ if (ch == EOF) { /* remove trailing whitespace */ - while (len > 0 && isspace(line[len - 1])) + while (len > 0 && isspace((int)line[len - 1])) --len; line[len] = '\0'; if (len == 0) @@ -96,7 +96,7 @@ ++*lineno; /* remove trailing whitespace */ - while (len > 0 && isspace(line[len - 1])) + while (len > 0 && isspace((int)line[len - 1])) --len; line[len] = '\0'; /* skip blank lines */ ==== //depot/projects/arm/src/contrib/tcpdump/print-stp.c#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 9 08:27:45 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62EFF16A407; Mon, 9 Apr 2007 08:27:45 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 158E116A405 for ; Mon, 9 Apr 2007 08:27:45 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 049FE13C44C for ; Mon, 9 Apr 2007 08:27:45 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l398RiQt085691 for ; Mon, 9 Apr 2007 08:27:44 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l398Riml085685 for perforce@freebsd.org; Mon, 9 Apr 2007 08:27:44 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 9 Apr 2007 08:27:44 GMT Message-Id: <200704090827.l398Riml085685@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 117725 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2007 08:27:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=117725 Change 117725 by rdivacky@rdivacky_witten on 2007/04/09 08:26:57 Linux_statfs64 takes additional parameter. Submitted by: David Taylor Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#24 edit .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#24 edit .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#23 edit .. //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#24 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_stats.c#11 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_proto.h#23 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_syscall.h#22 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_sysent.c#22 edit .. //depot/projects/linuxolator/src/sys/i386/linux/syscalls.master#22 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#24 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.31 2007/03/30 00:08:21 jkim Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp */ @@ -831,6 +831,7 @@ }; struct linux_statfs64_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char sz_l_[PADL_(size_t)]; size_t sz; char sz_r_[PADR_(size_t)]; char buf_l_[PADL_(struct l_statfs64_buf *)]; struct l_statfs64_buf * buf; char buf_r_[PADR_(struct l_statfs64_buf *)]; }; struct linux_fstatfs64_args { ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#24 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.31 2007/03/30 00:08:21 jkim Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp */ ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#23 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.31 2007/03/30 00:08:21 jkim Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp */ ==== //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#24 (text+ko) ==== @@ -437,7 +437,7 @@ 266 AUE_NULL STD { int linux_clock_getres(clockid_t which, struct l_timespec *tp); } 267 AUE_NULL STD { int linux_clock_nanosleep(clockid_t which, int flags, \ struct l_timespec *rqtp, struct l_timespec *rmtp); } -268 AUE_STATFS STD { int linux_statfs64(char *path, struct l_statfs64_buf *buf); } +268 AUE_STATFS STD { int linux_statfs64(char *path, size_t sz, struct l_statfs64_buf *buf); } 269 AUE_FSTATFS STD { int linux_fstatfs64(void); } 270 AUE_NULL STD { int linux_tgkill(int tgid, int pid, int sig); } 271 AUE_UTIMES STD { int linux_utimes(char *fname, \ ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_stats.c#11 (text+ko) ==== @@ -385,7 +385,7 @@ #ifdef DEBUG if (ldebug(statfs)) - printf(ARGS(statfs, "%s, *"), path); + printf(ARGS(statfs, "%s, *"), path, args->sz); #endif error = kern_statfs(td, path, UIO_SYSSPACE, &bsd_statfs); LFREEPATH(path); @@ -419,11 +419,14 @@ char *path; int error; + if (args->sz != sizeof(struct l_statfs64)) + return (EINVAL); + LCONVPATHEXIST(td, args->path, &path); #ifdef DEBUG if (ldebug(statfs64)) - printf(ARGS(statfs64, "%s, *"), path); + printf(ARGS(statfs64, "%s, %d, *"), path, args->sz); #endif error = kern_statfs(td, path, UIO_SYSSPACE, &bsd_statfs); LFREEPATH(path); ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_proto.h#23 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_proto.h,v 1.92 2007/03/29 02:11:46 julian Exp $ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.86 2007/02/15 00:54:40 jkim Exp + * $FreeBSD$ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.87 2007/03/29 02:11:46 julian Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -836,6 +836,7 @@ }; struct linux_statfs64_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char sz_l_[PADL_(size_t)]; size_t sz; char sz_r_[PADR_(size_t)]; char buf_l_[PADL_(struct l_statfs64_buf *)]; struct l_statfs64_buf * buf; char buf_r_[PADR_(struct l_statfs64_buf *)]; }; struct linux_fstatfs64_args { ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_syscall.h#22 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_syscall.h,v 1.85 2007/03/29 02:11:46 julian Exp $ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.86 2007/02/15 00:54:40 jkim Exp + * $FreeBSD$ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.87 2007/03/29 02:11:46 julian Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_sysent.c#22 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_sysent.c,v 1.92 2007/03/29 02:11:46 julian Exp $ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.86 2007/02/15 00:54:40 jkim Exp + * $FreeBSD$ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.87 2007/03/29 02:11:46 julian Exp */ #include ==== //depot/projects/linuxolator/src/sys/i386/linux/syscalls.master#22 (text+ko) ==== @@ -441,7 +441,7 @@ 266 AUE_NULL STD { int linux_clock_getres(clockid_t which, struct l_timespec *tp); } 267 AUE_NULL STD { int linux_clock_nanosleep(clockid_t which, int flags, \ struct l_timespec *rqtp, struct l_timespec *rmtp); } -268 AUE_STATFS STD { int linux_statfs64(char *path, struct l_statfs64_buf *buf); } +268 AUE_STATFS STD { int linux_statfs64(char *path, size_t sz, struct l_statfs64_buf *buf); } 269 AUE_FSTATFS STD { int linux_fstatfs64(void); } 270 AUE_NULL STD { int linux_tgkill(int tgid, int pid, int sig); } 271 AUE_UTIMES STD { int linux_utimes(char *fname, \ From owner-p4-projects@FreeBSD.ORG Mon Apr 9 11:09:07 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 516D216A407; Mon, 9 Apr 2007 11:09:07 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 17AE816A402 for ; Mon, 9 Apr 2007 11:09:07 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 08D7D13C4BA for ; Mon, 9 Apr 2007 11:09:07 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l39B962j024870 for ; Mon, 9 Apr 2007 11:09:06 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l39B96q6024867 for perforce@freebsd.org; Mon, 9 Apr 2007 11:09:06 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 9 Apr 2007 11:09:06 GMT Message-Id: <200704091109.l39B96q6024867@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 117735 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2007 11:09:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=117735 Change 117735 by rdivacky@rdivacky_witten on 2007/04/09 11:08:54 Linux faccessat implementation. This changes kern_access() prototype so I changed all the consumers. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#24 edit .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_fcntl.c#5 edit .. //depot/projects/linuxolator/src/sys/i386/ibcs2/ibcs2_fcntl.c#3 edit .. //depot/projects/linuxolator/src/sys/kern/vfs_syscalls.c#15 edit .. //depot/projects/linuxolator/src/sys/sys/syscallsubr.h#5 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#24 (text+ko) ==== @@ -567,7 +567,7 @@ if (ldebug(access)) printf(ARGS(access, "%s, %d"), path, args->flags); #endif - error = kern_access(td, path, UIO_SYSSPACE, args->flags); + error = kern_access(td, path, UIO_SYSSPACE, args->flags, -1); LFREEPATH(path); return (error); @@ -576,7 +576,29 @@ int linux_faccessat(struct thread *td, struct linux_faccessat_args *args) { - return (ENOSYS); + char *path; + int error, dfd; + + /* linux convention */ + if (args->mode & ~(F_OK | X_OK | W_OK | R_OK)) + return (EINVAL); + + LCONVPATHEXIST(td, args->filename, &path); + +#ifdef DEBUG + if (ldebug(access)) + printf(ARGS(access, "%s, %d"), path, args->mode); +#endif + + if (args->dfd == LINUX_AT_FDCWD) + dfd = -1; + else + dfd = args->dfd; + + error = kern_access(td, path, UIO_SYSSPACE, args->mode, dfd); + LFREEPATH(path); + + return (error); } int ==== //depot/projects/linuxolator/src/sys/compat/svr4/svr4_fcntl.c#5 (text+ko) ==== @@ -478,7 +478,7 @@ int error; CHECKALTEXIST(td, uap->path, &newpath); - error = kern_access(td, newpath, UIO_SYSSPACE, uap->flags); + error = kern_access(td, newpath, UIO_SYSSPACE, uap->flags, -1); free(newpath, M_TEMP); return (error); } ==== //depot/projects/linuxolator/src/sys/i386/ibcs2/ibcs2_fcntl.c#3 (text+ko) ==== @@ -241,7 +241,7 @@ int error; CHECKALTEXIST(td, uap->path, &path); - error = kern_access(td, path, UIO_SYSSPACE, uap->flags); + error = kern_access(td, path, UIO_SYSSPACE, uap->flags, -1); free(path, M_TEMP); return (error); } ==== //depot/projects/linuxolator/src/sys/kern/vfs_syscalls.c#15 (text+ko) ==== @@ -1849,11 +1849,11 @@ } */ *uap; { - return (kern_access(td, uap->path, UIO_USERSPACE, uap->flags)); + return kern_access(td, uap->path, UIO_USERSPACE, uap->flags, -1); } int -kern_access(struct thread *td, char *path, enum uio_seg pathseg, int flags) +kern_access(struct thread *td, char *path, enum uio_seg pathseg, int flags, int dirfd) { struct ucred *cred, *tmpcred; register struct vnode *vp; @@ -1873,7 +1873,7 @@ td->td_ucred = tmpcred; NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td); - if ((error = namei(&nd)) != 0) + if ((error = namei1(&nd, dirfd)) != 0) goto out1; vfslocked = NDHASGIANT(&nd); vp = nd.ni_vp; ==== //depot/projects/linuxolator/src/sys/sys/syscallsubr.h#5 (text+ko) ==== @@ -54,7 +54,7 @@ int kern_accept(struct thread *td, int s, struct sockaddr **name, socklen_t *namelen, struct file **fp); int kern_access(struct thread *td, char *path, enum uio_seg pathseg, - int flags); + int flags, int dirfd); int kern_adjtime(struct thread *td, struct timeval *delta, struct timeval *olddelta); int kern_alternate_path(struct thread *td, const char *prefix, char *path, From owner-p4-projects@FreeBSD.ORG Mon Apr 9 13:45:20 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D283D16A404; Mon, 9 Apr 2007 13:45:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9B99116A401 for ; Mon, 9 Apr 2007 13:45:19 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8D15B13C44B for ; Mon, 9 Apr 2007 13:45:19 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l39DjJZ3061115 for ; Mon, 9 Apr 2007 13:45:19 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l39DjIsH061094 for perforce@freebsd.org; Mon, 9 Apr 2007 13:45:18 GMT (envelope-from piso@freebsd.org) Date: Mon, 9 Apr 2007 13:45:18 GMT Message-Id: <200704091345.l39DjIsH061094@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 117738 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2007 13:45:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=117738 Change 117738 by piso@piso_newluxor on 2007/04/09 13:45:01 IFC@117737 Affected files ... .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zpool/zpool_main.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/ztest/ztest.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzpool/common/kernel.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate .. //depot/projects/soc2005/libalias/etc/devd.conf#3 integrate .. //depot/projects/soc2005/libalias/sys/boot/forth/loader.conf#9 integrate .. //depot/projects/soc2005/libalias/sys/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/kobj.h#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/soc2005/libalias/sys/conf/files#25 integrate .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-all.h#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-chipset.c#14 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-dma.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/cxgb/cxgb_lro.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/cxgb/sys/mvec.h#1 branch .. //depot/projects/soc2005/libalias/sys/dev/cxgb/sys/uipc_mvec.c#1 branch .. //depot/projects/soc2005/libalias/sys/geom/eli/g_eli.c#9 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_mount.c#12 integrate .. //depot/projects/soc2005/libalias/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/zfs/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/param.h#15 integrate .. //depot/projects/soc2005/libalias/sys/sys/systm.h#12 integrate Differences ... ==== //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zpool/zpool_main.c#2 (text+ko) ==== @@ -1082,6 +1082,10 @@ "incompatible version.\n")); break; + case ZPOOL_STATUS_HOSTID_MISMATCH: + (void) printf(gettext("status: The pool was last accessed by " + "another system.\n")); + break; default: /* * No other status can be seen when importing pools. @@ -1098,6 +1102,10 @@ "imported using its name or numeric identifier, " "though\n\tsome features will not be available " "without an explicit 'zpool upgrade'.\n")); + else if (reason == ZPOOL_STATUS_HOSTID_MISMATCH) + (void) printf(gettext("action: The pool can be " + "imported using its name or numeric " + "identifier and\n\tthe '-f' flag.\n")); else (void) printf(gettext("action: The pool can be " "imported using its name or numeric " @@ -1187,10 +1195,37 @@ "is formatted using a newer ZFS version\n"), name); return (1); } else if (state != POOL_STATE_EXPORTED && !force) { - (void) fprintf(stderr, gettext("cannot import '%s': pool " - "may be in use from other system\n"), name); - (void) fprintf(stderr, gettext("use '-f' to import anyway\n")); - return (1); + uint64_t hostid; + + if (nvlist_lookup_uint64(config, ZPOOL_CONFIG_HOSTID, + &hostid) == 0) { + if ((unsigned long)hostid != gethostid()) { + char *hostname; + uint64_t timestamp; + time_t t; + + verify(nvlist_lookup_string(config, + ZPOOL_CONFIG_HOSTNAME, &hostname) == 0); + verify(nvlist_lookup_uint64(config, + ZPOOL_CONFIG_TIMESTAMP, ×tamp) == 0); + t = timestamp; + (void) fprintf(stderr, gettext("cannot import " + "'%s': pool may be in use from other " + "system, it was last accessed by %s " + "(hostid: 0x%lx) on %s"), name, hostname, + (unsigned long)hostid, + asctime(localtime(&t))); + (void) fprintf(stderr, gettext("use '-f' to " + "import anyway\n")); + return (1); + } + } else { + (void) fprintf(stderr, gettext("cannot import '%s': " + "pool may be in use from other system\n"), name); + (void) fprintf(stderr, gettext("use '-f' to import " + "anyway\n")); + return (1); + } } if (zpool_import(g_zfs, config, newname, altroot) != 0) ==== //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/ztest/ztest.c#2 (text+ko) ==== @@ -246,6 +246,8 @@ #define ZTEST_DIROBJ_BLOCKSIZE (1 << 10) #define ZTEST_DIRSIZE 256 +static void usage(boolean_t); + /* * These libumem hooks provide a reasonable set of defaults for the allocator's * debugging facilities. @@ -303,13 +305,17 @@ if (toupper(buf[0]) == ends[i]) break; } - if (i == strlen(ends)) - fatal(0, "invalid bytes suffix: %s", buf); + if (i == strlen(ends)) { + (void) fprintf(stderr, "ztest: invalid bytes suffix: %s\n", + buf); + usage(B_FALSE); + } if (buf[1] == '\0' || (toupper(buf[1]) == 'B' && buf[2] == '\0')) { return (10*i); } - fatal(0, "invalid bytes suffix: %s", buf); - return (-1); + (void) fprintf(stderr, "ztest: invalid bytes suffix: %s\n", buf); + usage(B_FALSE); + /* NOTREACHED */ } static uint64_t @@ -320,32 +326,40 @@ val = strtoull(buf, &end, 0); if (end == buf) { - fatal(0, "bad numeric value: %s", buf); + (void) fprintf(stderr, "ztest: bad numeric value: %s\n", buf); + usage(B_FALSE); } else if (end[0] == '.') { double fval = strtod(buf, &end); fval *= pow(2, str2shift(end)); - if (fval > UINT64_MAX) - fatal(0, "value too large: %s", buf); + if (fval > UINT64_MAX) { + (void) fprintf(stderr, "ztest: value too large: %s\n", + buf); + usage(B_FALSE); + } val = (uint64_t)fval; } else { int shift = str2shift(end); - if (shift >= 64 || (val << shift) >> shift != val) - fatal(0, "value too large: %s", buf); + if (shift >= 64 || (val << shift) >> shift != val) { + (void) fprintf(stderr, "ztest: value too large: %s\n", + buf); + usage(B_FALSE); + } val <<= shift; } return (val); } static void -usage(void) +usage(boolean_t requested) { char nice_vdev_size[10]; char nice_gang_bang[10]; + FILE *fp = requested ? stdout : stderr; nicenum(zopt_vdev_size, nice_vdev_size); nicenum(zio_gang_bang, nice_gang_bang); - (void) printf("Usage: %s\n" + (void) fprintf(fp, "Usage: %s\n" "\t[-v vdevs (default: %llu)]\n" "\t[-s size_of_each_vdev (default: %s)]\n" "\t[-a alignment_shift (default: %d) (use 0 for random)]\n" @@ -364,6 +378,7 @@ "\t[-T time] total run time (default: %llu sec)\n" "\t[-P passtime] time per pass (default: %llu sec)\n" "\t[-z zil failure rate (default: fail every 2^%llu allocs)]\n" + "\t[-h] (print help)\n" "", cmdname, (u_longlong_t)zopt_vdevs, /* -v */ @@ -382,7 +397,7 @@ (u_longlong_t)zopt_time, /* -T */ (u_longlong_t)zopt_passtime, /* -P */ (u_longlong_t)zio_zil_fail_shift); /* -z */ - exit(1); + exit(requested ? 0 : 1); } static uint64_t @@ -422,7 +437,7 @@ zio_zil_fail_shift = 5; while ((opt = getopt(argc, argv, - "v:s:a:m:r:R:d:t:g:i:k:p:f:VET:P:z:")) != EOF) { + "v:s:a:m:r:R:d:t:g:i:k:p:f:VET:P:z:h")) != EOF) { value = 0; switch (opt) { case 'v': @@ -496,9 +511,12 @@ case 'z': zio_zil_fail_shift = MIN(value, 16); break; + case 'h': + usage(B_TRUE); + break; case '?': default: - usage(); + usage(B_FALSE); break; } } ==== //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 (text+ko) ==== @@ -98,6 +98,7 @@ EZFS_POOLPROPS, /* couldn't retrieve pool props */ EZFS_POOL_NOTSUP, /* ops not supported for this type of pool */ EZFS_POOL_INVALARG, /* invalid argument for this pool operation */ + EZFS_NAMETOOLONG, /* dataset name is too long */ EZFS_UNKNOWN }; @@ -192,6 +193,7 @@ ZPOOL_STATUS_CORRUPT_DATA, /* data errors in user (meta)data */ ZPOOL_STATUS_FAILING_DEV, /* device experiencing errors */ ZPOOL_STATUS_VERSION_NEWER, /* newer on-disk version */ + ZPOOL_STATUS_HOSTID_MISMATCH, /* last accessed by another system */ /* * The following are not faults per se, but still an error possibly ==== //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 (text+ko) ==== @@ -379,7 +379,7 @@ uint_t i, nspares; boolean_t config_seen; uint64_t best_txg; - char *name; + char *name, *hostname; zfs_cmd_t zc = { 0 }; uint64_t version, guid; size_t len; @@ -388,6 +388,7 @@ nvlist_t **child = NULL; uint_t c; boolean_t isactive; + uint64_t hostid; if (nvlist_alloc(&ret, 0, 0) != 0) goto nomem; @@ -430,6 +431,8 @@ * pool guid * name * pool state + * hostid (if available) + * hostname (if available) */ uint64_t state; @@ -453,6 +456,20 @@ if (nvlist_add_uint64(config, ZPOOL_CONFIG_POOL_STATE, state) != 0) goto nomem; + hostid = 0; + if (nvlist_lookup_uint64(tmp, + ZPOOL_CONFIG_HOSTID, &hostid) == 0) { + if (nvlist_add_uint64(config, + ZPOOL_CONFIG_HOSTID, hostid) != 0) + goto nomem; + verify(nvlist_lookup_string(tmp, + ZPOOL_CONFIG_HOSTNAME, + &hostname) == 0); + if (nvlist_add_string(config, + ZPOOL_CONFIG_HOSTNAME, + hostname) != 0) + goto nomem; + } config_seen = B_TRUE; } @@ -622,6 +639,20 @@ } /* + * Restore the original information read from the actual label. + */ + (void) nvlist_remove(config, ZPOOL_CONFIG_HOSTID, + DATA_TYPE_UINT64); + (void) nvlist_remove(config, ZPOOL_CONFIG_HOSTNAME, + DATA_TYPE_STRING); + if (hostid != 0) { + verify(nvlist_add_uint64(config, ZPOOL_CONFIG_HOSTID, + hostid) == 0); + verify(nvlist_add_string(config, ZPOOL_CONFIG_HOSTNAME, + hostname) == 0); + } + + /* * Add this pool to the list of configs. */ verify(nvlist_lookup_string(config, ZPOOL_CONFIG_POOL_NAME, ==== //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 (text+ko) ==== @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -43,6 +43,7 @@ #include #include +#include #include "libzfs_impl.h" /* @@ -50,7 +51,7 @@ * in libzfs.h. Note that there are some status results which go past the end * of this table, and hence have no associated message ID. */ -static char *msgid_table[] = { +static char *zfs_msgid_table[] = { "ZFS-8000-14", "ZFS-8000-2Q", "ZFS-8000-3C", @@ -60,7 +61,8 @@ "ZFS-8000-72", "ZFS-8000-8A", "ZFS-8000-9P", - "ZFS-8000-A5" + "ZFS-8000-A5", + "ZFS-8000-EY" }; /* @@ -69,7 +71,7 @@ * and the article referred to by 'zpool status' must match that indicated by * the syslog error message. We override missing data as well as corrupt pool. */ -static char *msgid_table_active[] = { +static char *zfs_msgid_table_active[] = { "ZFS-8000-14", "ZFS-8000-D3", /* overridden */ "ZFS-8000-D3", /* overridden */ @@ -82,7 +84,7 @@ "ZFS-8000-CS", /* overridden */ }; -#define NMSGID (sizeof (msgid_table) / sizeof (msgid_table[0])) +#define NMSGID (sizeof (zfs_msgid_table) / sizeof (zfs_msgid_table[0])) /* ARGSUSED */ static int @@ -178,6 +180,8 @@ uint_t vsc; uint64_t nerr; uint64_t version; + uint64_t stateval; + uint64_t hostid = 0; verify(nvlist_lookup_uint64(config, ZPOOL_CONFIG_VERSION, &version) == 0); @@ -185,6 +189,16 @@ &nvroot) == 0); verify(nvlist_lookup_uint64_array(nvroot, ZPOOL_CONFIG_STATS, (uint64_t **)&vs, &vsc) == 0); + verify(nvlist_lookup_uint64(config, ZPOOL_CONFIG_POOL_STATE, + &stateval) == 0); + (void) nvlist_lookup_uint64(config, ZPOOL_CONFIG_HOSTID, &hostid); + + /* + * Pool last accessed by another system. + */ + if (hostid != 0 && (unsigned long)hostid != gethostid() && + stateval == POOL_STATE_ACTIVE) + return (ZPOOL_STATUS_HOSTID_MISMATCH); /* * Newer on-disk version. @@ -270,7 +284,7 @@ if (ret >= NMSGID) *msgid = NULL; else - *msgid = msgid_table_active[ret]; + *msgid = zfs_msgid_table_active[ret]; return (ret); } @@ -283,7 +297,7 @@ if (ret >= NMSGID) *msgid = NULL; else - *msgid = msgid_table[ret]; + *msgid = zfs_msgid_table[ret]; return (ret); } ==== //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 (text+ko) ==== @@ -167,6 +167,8 @@ case EZFS_POOL_INVALARG: return (dgettext(TEXT_DOMAIN, "invalid argument for " "this pool operation")); + case EZFS_NAMETOOLONG: + return (dgettext(TEXT_DOMAIN, "dataset name is too long")); case EZFS_UNKNOWN: return (dgettext(TEXT_DOMAIN, "unknown error")); default: @@ -306,6 +308,11 @@ "dataset is busy")); zfs_verror(hdl, EZFS_BUSY, fmt, ap); break; + + case ENAMETOOLONG: + zfs_verror(hdl, EZFS_NAMETOOLONG, fmt, ap); + break; + default: zfs_error_aux(hdl, strerror(errno)); zfs_verror(hdl, EZFS_UNKNOWN, fmt, ap); ==== //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzpool/common/kernel.c#2 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include #include +#include /* * Emulation of kernel services in userland. @@ -45,6 +46,11 @@ int hz = 119; /* frequency when using gethrtime() >> 23 for lbolt */ uint64_t physmem; vnode_t *rootdir = (vnode_t *)0xabcd1234; +char hw_serial[11]; + +struct utsname utsname = { + "userland", "libzpool", "1", "1", "na" +}; /* * ========================================================================= @@ -770,6 +776,17 @@ return (random_get_bytes_common(ptr, len, "/dev/urandom")); } +int +ddi_strtoul(const char *hw_serial, char **nptr, int base, unsigned long *result) +{ + char *end; + + *result = strtoul(hw_serial, &end, base); + if (*result == 0) + return (errno); + return (0); +} + /* * ========================================================================= * kernel emulation setup & teardown @@ -795,6 +812,8 @@ dprintf("physmem = %llu pages (%.2f GB)\n", physmem, (double)physmem * sysconf(_SC_PAGE_SIZE) / (1ULL << 30)); + snprintf(hw_serial, sizeof (hw_serial), "%ld", gethostid()); + spa_init(mode); } ==== //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 (text+ko) ==== @@ -436,6 +436,14 @@ #define zone_dataset_visible(x, y) (1) #define INGLOBALZONE(z) (1) +/* + * Hostname information + */ +extern struct utsname utsname; +extern char hw_serial[]; +extern int ddi_strtoul(const char *str, char **nptr, int base, + unsigned long *result); + #ifdef __cplusplus } #endif ==== //depot/projects/soc2005/libalias/etc/devd.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.35 2007/02/15 16:38:10 imp Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.37 2007/04/08 16:05:23 pjd Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -208,6 +208,37 @@ action "logger -p kern.emerg 'WARNING: system temperature too high, shutting down soon!'"; }; +# Sample ZFS problem reports handling. +notify 10 { + match "system" "ZFS"; + match "type" "zpool"; + action "logger -p kern.err 'ZFS: failed to load zpool $pool'"; +}; + +notify 10 { + match "system" "ZFS"; + match "type" "vdev"; + action "logger -p kern.err 'ZFS: vdev failure, zpool=$pool type=$type'"; +}; + +notify 10 { + match "system" "ZFS"; + match "type" "data"; + action "logger -p kern.warn 'ZFS: zpool I/O failure, zpool=$pool error=$zio_err'"; +}; + +notify 10 { + match "system" "ZFS"; + match "type" "io"; + action "logger -p kern.warn 'ZFS: vdev I/O failure, zpool=$pool path=$vdev_path offset=$zio_offset size=$zio_size error=$zio_err'"; +}; + +notify 10 { + match "system" "ZFS"; + match "type" "checksum"; + action "logger -p kern.warn 'ZFS: checksum mismatch, zpool=$pool path=$vdev_path offset=$zio_offset size=$zio_size'"; +}; + /* EXAMPLES TO END OF FILE # The following might be an example of something that a vendor might ==== //depot/projects/soc2005/libalias/sys/boot/forth/loader.conf#9 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.118 2007/02/04 06:35:10 imp Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.119 2007/04/09 00:04:54 pjd Exp $ ############################################################## ### Basic configuration options ############################ @@ -418,3 +418,10 @@ #module_after="cmd" # executes "cmd" after loading the module #module_error="cmd" # executes "cmd" if load fails +############################################################## +### Always try to load ZFS pool cache file ################# +############################################################## + +zpool_cache_load="YES" +zpool_cache_type="/boot/zfs/zpool.cache" +zpool_cache_name="/boot/zfs/zpool.cache" ==== //depot/projects/soc2005/libalias/sys/cam/scsi/scsi_sg.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.1 2007/04/07 19:40:57 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.3 2007/04/09 05:47:32 scottl Exp $"); #include #include @@ -71,8 +71,8 @@ } sg_state; typedef enum { + SG_RDWR_FREE, SG_RDWR_INPROG, - SG_RDWR_WAITING, SG_RDWR_DONE } sg_rdwr_state; @@ -289,13 +289,12 @@ return (CAM_REQ_CMP_ERR); } - softc = (struct sg_softc *)malloc(sizeof(*softc), M_DEVBUF, M_NOWAIT); + softc = malloc(sizeof(*softc), M_DEVBUF, M_ZERO | M_NOWAIT); if (softc == NULL) { printf("sgregister: Unable to allocate softc\n"); return (CAM_REQ_CMP_ERR); } - bzero(softc, sizeof(*softc)); softc->state = SG_STATE_NORMAL; softc->pd_type = SID_TYPE(&cgd->inq_data); TAILQ_INIT(&softc->rdwr_done); @@ -388,8 +387,7 @@ rdwr = done_ccb->ccb_h.ccb_rdwr; state = rdwr->state; rdwr->state = SG_RDWR_DONE; - if (state == SG_RDWR_WAITING) - wakeup(rdwr); + wakeup(rdwr); break; } default: @@ -507,6 +505,7 @@ * The linuxolator seems to have a hard time with this, * so just return 0 and hope that apps can cope. */ + td->td_retval[0] = 60*hz; error = 0; break; case SG_IO: @@ -679,7 +678,7 @@ periph = dev->si_drv1; sc = periph->softc; - rdwr = malloc(sizeof(*rdwr), M_DEVBUF, M_WAITOK); + rdwr = malloc(sizeof(*rdwr), M_DEVBUF, M_WAITOK | M_ZERO); hdr = &rdwr->hdr.hdr; /* Copy in the header block and sanity check it */ @@ -728,13 +727,13 @@ */ buf_len = uio->uio_resid; if (buf_len != 0) { - buf = malloc(buf_len, M_DEVBUF, M_WAITOK); + buf = malloc(buf_len, M_DEVBUF, M_WAITOK | M_ZERO); error = uiomove(buf, buf_len, uio); if (error) goto out_buf; dir = CAM_DIR_OUT; } else if (hdr->reply_len != 0) { - buf = malloc(hdr->reply_len, M_DEVBUF, M_WAITOK); + buf = malloc(hdr->reply_len, M_DEVBUF, M_WAITOK | M_ZERO); buf_len = hdr->reply_len; dir = CAM_DIR_IN; } else { @@ -809,7 +808,6 @@ break; } if ((rdwr == NULL) || (rdwr->state != SG_RDWR_DONE)) { - rdwr->state = SG_RDWR_WAITING; if (tsleep(rdwr, PCATCH, "sgread", 0) == ERESTART) return (EAGAIN); goto search; ==== //depot/projects/soc2005/libalias/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 (text+ko) ==== @@ -25,17 +25,18 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_kobj.c,v 1.1 2007/04/06 01:09:06 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_kobj.c,v 1.2 2007/04/08 23:57:08 pjd Exp $"); #include #include #include +#include #include #include #include #include -#include #include +#include #include void @@ -62,8 +63,8 @@ return (p); } -struct _buf * -kobj_open_file(const char *file) +static void * +kobj_open_file_vnode(const char *file) { struct thread *td = curthread; struct nameidata nd; @@ -79,16 +80,45 @@ error = vn_open_cred(&nd, &flags, 0, td->td_ucred, -1); NDFREE(&nd, NDF_ONLY_PNBUF); if (error != 0) - return ((struct _buf *)-1); + return (NULL); /* We just unlock so we hold a reference. */ VOP_UNLOCK(nd.ni_vp, 0, td); - return ((struct _buf *)nd.ni_vp); + return (nd.ni_vp); +} + +static void * +kobj_open_file_loader(const char *file) +{ + + return (preload_search_by_name(file)); +} + +struct _buf * +kobj_open_file(const char *file) +{ + struct _buf *out; + + out = kmem_alloc(sizeof(*out), KM_SLEEP); + out->mounted = root_mounted(); + /* + * If root is already mounted we read file using file system, + * if not, we use loader. + */ + if (out->mounted) + out->ptr = kobj_open_file_vnode(file); + else + out->ptr = kobj_open_file_loader(file); + if (out->ptr == NULL) { + kmem_free(out, sizeof(*out)); + return ((struct _buf *)-1); + } + return (out); } -int -kobj_get_filesize(struct _buf *file, uint64_t *size) +static int +kobj_get_filesize_vnode(struct _buf *file, uint64_t *size) { - struct vnode *vp = (struct vnode *)file; + struct vnode *vp = file->ptr; struct thread *td = curthread; struct vattr va; int error; @@ -101,10 +131,32 @@ return (error); } +static int +kobj_get_filesize_loader(struct _buf *file, uint64_t *size) +{ + void *ptr; + + ptr = preload_search_info(file->ptr, MODINFO_SIZE); + if (ptr == NULL) + return (ENOENT); + *size = (uint64_t)*(size_t *)ptr; + return (0); +} + +int +kobj_get_filesize(struct _buf *file, uint64_t *size) +{ + + if (file->mounted) + return (kobj_get_filesize_vnode(file, size)); + else + return (kobj_get_filesize_loader(file, size)); +} + int -kobj_read_file(struct _buf *file, char *buf, unsigned size, unsigned off) +kobj_read_file_vnode(struct _buf *file, char *buf, unsigned size, unsigned off) { - struct vnode *vp = (struct vnode *)file; + struct vnode *vp = file->ptr; struct thread *td = curthread; struct uio auio; struct iovec aiov; @@ -130,13 +182,39 @@ return (error != 0 ? -1 : size - auio.uio_resid); } +int +kobj_read_file_loader(struct _buf *file, char *buf, unsigned size, unsigned off) +{ + char *ptr; + + ptr = preload_search_info(file->ptr, MODINFO_ADDR); + if (ptr == NULL) + return (ENOENT); + ptr = *(void **)ptr; + bcopy(ptr + off, buf, size); + return (0); +} + +int +kobj_read_file(struct _buf *file, char *buf, unsigned size, unsigned off) +{ + + if (file->mounted) + return (kobj_read_file_vnode(file, buf, size, off)); + else + return (kobj_read_file_loader(file, buf, size, off)); +} + void kobj_close_file(struct _buf *file) { - struct vnode *vp = (struct vnode *)file; - struct thread *td = curthread; - int flags; + + if (file->mounted) { + struct vnode *vp = file->ptr; + struct thread *td = curthread; + int flags = FREAD; - flags = FREAD; - vn_close(vp, flags, td->td_ucred, td); + vn_close(vp, flags, td->td_ucred, td); + } + kmem_free(file, sizeof(*file)); } ==== //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/kobj.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/opensolaris/sys/kobj.h,v 1.1 2007/04/06 01:09:06 pjd Exp $ + * $FreeBSD: src/sys/compat/opensolaris/sys/kobj.h,v 1.2 2007/04/08 23:57:08 pjd Exp $ */ #ifndef _OPENSOLARIS_SYS_KOBJ_H_ @@ -31,6 +31,13 @@ #include #include +#include_next +#ifdef AT_UID +#undef AT_UID +#endif +#ifdef AT_GID +#undef AT_GID +#endif #include #define KM_NOWAIT 0x01 @@ -41,7 +48,8 @@ void *kobj_zalloc(size_t size, int flag); struct _buf { - void *dummy; + void *ptr; + int mounted; }; struct _buf *kobj_open_file(const char *path); ==== //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/mutex.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/opensolaris/sys/mutex.h,v 1.1 2007/04/06 01:09:06 pjd Exp $ + * $FreeBSD: src/sys/compat/opensolaris/sys/mutex.h,v 1.2 2007/04/09 01:05:31 pjd Exp $ */ #ifndef _OPENSOLARIS_SYS_MUTEX_H_ @@ -48,6 +48,9 @@ #define mutex_init(lock, desc, type, arg) do { \ ASSERT((type) == MUTEX_DEFAULT); \ + KASSERT(((lock)->lock_object.lo_flags & LO_ALLMASK) != \ + LO_EXPECTED, ("lock %s already initialized", #lock)); \ + bzero((lock), sizeof(struct sx)); \ sx_init_flags((lock), "zfs:" #lock, SX_DUPOK); \ } while (0) #define mutex_destroy(lock) sx_destroy(lock) ==== //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/rwlock.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/opensolaris/sys/rwlock.h,v 1.1 2007/04/06 01:09:06 pjd Exp $ + * $FreeBSD: src/sys/compat/opensolaris/sys/rwlock.h,v 1.2 2007/04/09 01:05:31 pjd Exp $ */ #ifndef _OPENSOLARIS_SYS_RWLOCK_H_ @@ -53,8 +53,12 @@ #define RW_LOCK_HELD(x) (rw_lock_held((x))) #define RW_ISWRITER(x) (rw_iswriter(x)) -#define rw_init(lock, desc, type, arg) \ - sx_init_flags((lock), "zfs:" #lock, SX_DUPOK) +#define rw_init(lock, desc, type, arg) do { \ + KASSERT(((lock)->lock_object.lo_flags & LO_ALLMASK) != \ + LO_EXPECTED, ("lock %s already initialized", #lock)); \ + bzero((lock), sizeof(struct sx)); \ + sx_init_flags((lock), "zfs:" #lock, SX_DUPOK); \ +} while (0) #define rw_destroy(lock) sx_destroy(lock) #define rw_enter(lock, how) do { \ if ((how) == RW_READER) \ ==== //depot/projects/soc2005/libalias/sys/conf/files#25 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1191 2007/04/07 19:40:57 scottl Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1193 2007/04/09 12:51:29 andre Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -520,6 +520,7 @@ dev/cxgb/common/cxgb_mv88e1xxx.c optional cxgb pci dev/cxgb/common/cxgb_xgmac.c optional cxgb pci dev/cxgb/common/cxgb_t3_hw.c optional cxgb pci +dev/cxgb/sys/uipc_mvec.c optional cxgb pci dev/cy/cy.c optional cy dev/cy/cy_isa.c optional cy isa dev/cy/cy_pci.c optional cy pci @@ -1774,19 +1775,19 @@ netinet/ip_options.c optional inet netinet/ip_output.c optional inet netinet/raw_ip.c optional inet -netinet/sctp_usrreq.c optional inet inet6 sctp -netinet/sctp_pcb.c optional inet inet6 sctp -netinet/sctputil.c optional inet inet6 sctp +netinet/sctp_asconf.c optional inet inet6 sctp +netinet/sctp_auth.c optional inet inet6 sctp netinet/sctp_bsd_addr.c optional inet inet6 sctp -netinet/sctp_timer.c optional inet inet6 sctp +netinet/sctp_crc32.c optional inet inet6 sctp +netinet/sctp_indata.c optional inet inet6 sctp netinet/sctp_input.c optional inet inet6 sctp netinet/sctp_output.c optional inet inet6 sctp -netinet/sctp_indata.c optional inet inet6 sctp -netinet/sctp_asconf.c optional inet inet6 sctp +netinet/sctp_pcb.c optional inet inet6 sctp netinet/sctp_peeloff.c optional inet inet6 sctp -netinet/sctp_crc32.c optional inet inet6 sctp -netinet/sctp_auth.c optional inet inet6 sctp netinet/sctp_sysctl.c optional inet inet6 sctp +netinet/sctp_timer.c optional inet inet6 sctp +netinet/sctp_usrreq.c optional inet inet6 sctp +netinet/sctputil.c optional inet inet6 sctp netinet/tcp_debug.c optional tcpdebug netinet/tcp_hostcache.c optional inet netinet/tcp_input.c optional inet ==== //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 (text+ko) ==== @@ -948,7 +948,7 @@ objset_t *os; uint64_t snapobj; zap_cursor_t zc; - zap_attribute_t attr; + zap_attribute_t *attr; char *child; int do_self, err; @@ -958,6 +958,7 @@ /* NB: the $MOS dir doesn't have a head dataset */ do_self = (dd->dd_phys->dd_head_dataset_obj != 0); + attr = kmem_alloc(sizeof (zap_attribute_t), KM_SLEEP); /* * Iterate over all children. @@ -965,10 +966,10 @@ if (flags & DS_FIND_CHILDREN) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 9 15:13:22 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0021916A408; Mon, 9 Apr 2007 15:13:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B532A16A400 for ; Mon, 9 Apr 2007 15:13:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A484213C480 for ; Mon, 9 Apr 2007 15:13:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l39FDLT5034139 for ; Mon, 9 Apr 2007 15:13:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l39FC5qm033115 for perforce@freebsd.org; Mon, 9 Apr 2007 15:12:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 9 Apr 2007 15:12:05 GMT Message-Id: <200704091512.l39FC5qm033115@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 117741 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2007 15:13:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=117741 Change 117741 by rwatson@rwatson_zoo on 2007/04/09 15:11:38 Integrate trustedbsd_priv branch. Affected files ... .. //depot/projects/trustedbsd/priv/sys/Makefile#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/busdma_machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/cpu_switch.S#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/genassym.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/intr_machdep.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/io_apic.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/legacy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/local_apic.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/machdep.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/mptable.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/nexus.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/prof_machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/support.S#4 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/tsc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/acpica_machdep.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/apicvar.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/intr_machdep.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/pcb.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/pcpu.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/segments.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/smp.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/isa/clock.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/isa/isa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux.h#7 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_dummy.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_locore.s#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_machdep.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_proto.h#7 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_syscall.h#7 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_sysent.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_sysvec.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/syscalls.master#7 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/cpufunc_asm_arm9.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/db_interface.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/intr.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/locore.S#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/nexus.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/support.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/trap.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/at91.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/at91_mci.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/at91_pio.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/at91_rtc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/at91_spi.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/at91_ssc.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/at91_st.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/at91_twi.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/at91_twireg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/if_ate.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/kb920x_machdep.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/ohci_atmelarm.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/uart_dev_at91usart.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/arm/conf/AVILA#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/conf/KB920X#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/conf/KB920X.hints#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/include/bootconfig.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/include/cpufunc.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/include/intr.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/include/pcpu.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/include/undefined.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/sa11x0/sa11x0.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/sa11x0/sa11x0_ost.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/sa11x0/uart_cpu_sa1110.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/sa11x0/uart_dev_sa1110.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/i80321/i80321_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/i80321/i80321_wdog.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/i80321/iq80321.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/i80321/uart_cpu_i80321.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/avila_ata.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425_npe.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425_pci.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425_timer.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425_wdog.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425reg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/boot2/boot2.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/bootspi/loader_prompt.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/libat91/Makefile#4 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/libat91/emac.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/libat91/getc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/libat91/memcmp.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/libat91/sd-card.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/libat91/spi_flash.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/libat91/strlen.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ficl/ficl.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ficl/float.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ficl/softwords/fileaccess.fr#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ficl/softwords/jhlocal.fr#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ficl/softwords/oo.fr#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ficl/softwords/prefix.fr#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ficl/softwords/softcore.awk#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ficl/tools.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ficl/unix.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ficl/vm.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ficl/words.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/i386/boot0/boot0.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ia64/ski/acpi_stub.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/pc98/boot0.5/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/pc98/boot0.5/boot.s#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/pc98/boot0.5/boot0.5.s#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/pc98/boot0.5/disk.s#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/trustedbsd/priv/sys/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/trustedbsd/priv/sys/boot/pc98/boot0.5/selector.s#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/pc98/boot0.5/start.s#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/pc98/boot2/boot.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/boot/pc98/cdboot/cdboot.s#2 integrate .. //depot/projects/trustedbsd/priv/sys/cam/cam_xpt.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/cam/cam_xpt.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_da.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_sg.c#1 branch .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_sg.h#1 branch .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_target.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/coda/coda_vnops.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linprocfs/linprocfs.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linsysfs/linsysfs.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_emul.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_emul.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_file.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_futex.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_futex.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_misc.c#12 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_stats.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_uid16.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_util.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_util.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/svr4/svr4_filio.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/conf/NOTES#10 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files#12 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files.amd64#8 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files.i386#7 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files.pc98#6 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files.powerpc#5 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files.sparc64#6 integrate .. //depot/projects/trustedbsd/priv/sys/conf/kern.post.mk#5 integrate .. //depot/projects/trustedbsd/priv/sys/conf/kmod.mk#5 integrate .. //depot/projects/trustedbsd/priv/sys/conf/options#8 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/altq/altq/altq_subr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/CHANGES.txt#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/acapps.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/acconfig.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/acdebug.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/acdisasm.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/acdispat.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/acefi.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/acenv.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/acevents.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/acexcep.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/acfreebsd.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/acgcc.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/acglobal.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/achware.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/acinterp.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/aclocal.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/acmacros.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/acnames.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/acnamesp.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/acobject.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/acopcode.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/acoutput.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/acparser.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/acpi.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/acpiosxf.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/acpixf.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/acresrc.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/acstruct.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/actables.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/actbl.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/actbl1.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/actbl2.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/actypes.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/acutils.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/aecommon.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/aeexec.c#2 delete .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/amlcode.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/amlresrc.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/common/adfile.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/common/adwalk.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/common/dmrestag.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/common/dmtable.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/common/dmtbdump.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/common/dmtbinfo.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/common/getopt.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/compiler/aslcodegen.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/compiler/aslcompiler.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/compiler/aslcompiler.l#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/compiler/asldefine.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/compiler/aslerror.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/compiler/aslfiles.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/compiler/aslfold.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/compiler/aslglobal.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/compiler/asllength.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/compiler/asllisting.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/compiler/aslload.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/compiler/asllookup.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/compiler/aslmain.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/compiler/aslmap.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/compiler/aslopcodes.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/compiler/asloperands.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/compiler/aslopt.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/compiler/aslresource.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/compiler/aslrestype1.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/compiler/aslrestype2.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/compiler/aslstubs.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/compiler/asltransform.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/compiler/asltree.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/dbcmds.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/dbdisply.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/dbexec.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/dbfileio.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/dbhistry.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/dbinput.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/dbstats.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/dbutils.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/dbxface.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/dmbuffer.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/dmnames.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/dmobject.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/dmopcode.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/dmresrc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/dmresrcl.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/dmresrcs.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/dmutils.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/dmwalk.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/dsfield.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/dsinit.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/dsmethod.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/dsmthdat.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/dsobject.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/dsopcode.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/dsutils.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/dswexec.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/dswload.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/dswscope.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/dswstate.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/evevent.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/evgpeblk.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/evmisc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/evregion.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/evrgnini.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/evsci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/evxface.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/evxfevnt.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/evxfregn.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/exconfig.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/exconvrt.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/excreate.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/exdump.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/exfield.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/exfldio.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/exmisc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/exmutex.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/exnames.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/exoparg1.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/exoparg2.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/exoparg3.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/exoparg6.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/exprep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/exregion.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/exresnte.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/exresolv.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/exresop.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/exstore.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/exstoren.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/exstorob.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/exsystem.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/exutils.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/hwacpi.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/hwgpe.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/hwregs.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/hwsleep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/hwtimer.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/nsaccess.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/nsalloc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/nsdump.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/nsdumpdv.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/nseval.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/nsinit.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/nsload.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/nsnames.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/nsobject.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/nsparse.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/nssearch.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/nsutils.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/nswalk.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/nsxfeval.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/nsxfname.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/nsxfobj.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/osunixxf.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/psargs.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/psloop.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/psopcode.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/psparse.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/psscope.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/pstree.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/psutils.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/pswalk.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/psxface.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/rsaddr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/rscalc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/rscreate.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/rsdump.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/rsinfo.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/rsio.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/rsirq.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/rslist.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/rsmemory.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/rsmisc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/rsutils.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/rsxface.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/tbconvrt.c#2 delete .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/tbfadt.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/tbfind.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/tbget.c#2 delete .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/tbgetall.c#2 delete .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/tbinstal.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/tbrsdt.c#2 delete .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/tbutils.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/tbxface.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/tbxfroot.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/utalloc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/utcache.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/utclib.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/utcopy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/utdebug.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/utdelete.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/uteval.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/utglobal.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/utinit.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/utmath.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/utmisc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/utmutex.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/utobject.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/utresrc.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/utstate.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/uttrack.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/utxface.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ipw/LICENSE#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ipw/ipw2100-1.3-i.fw.uu#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ipw/ipw2100-1.3-p.fw.uu#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ipw/ipw2100-1.3.fw.uu#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/dev/iwi/LICENSE#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/dev/iwi/ipw2200-bss.fw.uu#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/dev/iwi/ipw2200-ibss.fw.uu#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/dev/iwi/ipw2200-sniffer.fw.uu#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/dev/oltr/if_oltr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/dnlc.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/atomic.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/dnlc.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/vfs.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/pf/net/if_pfsync.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/pf/net/if_pfsync.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/crypto/via/padlock.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aac/aac.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpi_support/acpi_fujitsu.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/Osd/OsdDebug.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/Osd/OsdInterrupt.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/Osd/OsdMemory.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/Osd/OsdSynch.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/Osd/OsdTable.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_acad.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_button.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_cmbat.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_lid.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_pci_link.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_perf.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_quirk.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_resource.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_thermal.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_throttle.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_timer.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/adlink/adlink.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/advansys/adv_eisa.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/advansys/adv_isa.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/advansys/adv_pci.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/advansys/adwcam.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aha/aha_isa.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aha/aha_mca.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ahb/ahb.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aic/aic_cbus.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aic/aic_isa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aic/aic_pccard.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/aic79xx_osm.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/aic7xxx_osm.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/amd/amd.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/amr/amr_pci.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/an/if_an_isa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/an/if_an_pccard.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/an/if_an_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ar/if_ar.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/arcmsr/arcmsr.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/arcmsr/arcmsr.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/arl/if_arl_isa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/asr/asr.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-all.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-card.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-cbus.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-disk.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-disk.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-isa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-pci.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-pci.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-queue.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-raid.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-raid.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-usb.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata_if.m#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/atapi-cam.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/atapi-cd.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/atapi-fd.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/atapi-tape.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/if_ath.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/if_ath_pci.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/if_athvar.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/atkbdc/atkbd_atkbdc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/atkbdc/psm.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/awi/if_awi_pccard.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bce/if_bce.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bfe/if_bfe.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bge/if_bge.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bge/if_bgereg.h#8 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/buslogic/bt.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ce/if_ce.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ciss/ciss.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cm/if_cm_isa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cnw/if_cnw.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cp/if_cp.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cs/if_cs_isa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cs/if_cs_pccard.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ct/ct_isa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ctau/if_ct.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cx/if_cx.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_ael1002.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_common.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_firmware_exports.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_mc5.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_regs.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_sge_defs.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_t3_cpl.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_t3_hw.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_tcb.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_version.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_vsc8211.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_xgmac.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_adapter.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_config.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_ioctl.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_lro.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_main.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_osdep.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_sge.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/t3fw-3.2.bin.gz.uu#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cy/cy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cy/cy_isa.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cy/cy_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cy/cyvar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/dc/if_dc.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/de/if_de.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/dpt/dpt_eisa.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/dpt/dpt_pci.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/drm/drm_irq.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ed/if_ed_cbus.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ed/if_ed_isa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ed/if_ed_pccard.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ed/if_ed_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/em/if_em.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/dev/en/if_en_pci.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ep/if_ep_eisa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ep/if_ep_isa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ep/if_ep_mca.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ep/if_ep_pccard.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/esp/esp_sbus.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ex/if_ex_isa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ex/if_ex_pccard.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/exca/exca.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/fatm/if_fatm.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/fb/creator.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/fdc/fdc.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/fe/if_fe.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/firewirereg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/fwdev.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/fwmem.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/fwohci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/fwohci_pci.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/fwohcivar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/if_fwip.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/sbp.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/sbp_targ.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/fxp/if_fxp.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/gem/if_gem_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/hatm/if_hatm.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/hfa/hfa_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/hifn/hifn7751.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/hifn/hifn7751reg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/hifn/hifn7751var.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/hme/if_hme_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/hme/if_hme_sbus.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/hptmv/entry.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/hptmv/ioctl.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/hwpmc/hwpmc_mod.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ichsmb/ichsmb.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ida/ida_eisa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ida/ida_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/idt/idt_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ie/if_ie_isa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ieee488/pcii.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ieee488/tnt4882.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/if_ndis/if_ndis_pccard.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/iicbus/icee.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/iicbus/iic.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/iicbus/iicbb.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/iicbus/iicbus.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/iicbus/iicbus.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/iicbus/iiconf.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/iir/iir_pci.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ipmi/ipmi.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ipmi/ipmi_pci.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ipmi/ipmi_ssif.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ips/ips_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_freebsd.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_freebsd.h#8 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_ioctl.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_library.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_library.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_pci.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_sbus.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_stds.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_target.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_target.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_tpublic.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/ispmbox.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/ispreg.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/ispvar.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/iwi/if_iwi.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/iwi/if_iwireg.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/iwi/if_iwivar.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ixgb/if_ixgb.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/le/if_le_cbus.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/le/if_le_isa.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/le/if_le_lebuffer.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/le/if_le_ledma.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/le/if_le_pci.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/lge/if_lge.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/lmc/if_lmc.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mfi/mfi.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/brgphy.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/miidevs#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/rlphy.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mk48txx/mk48txx.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mlx/mlx.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mly/mly.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt_cam.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt_cam.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt_pci.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mse/mse.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/msk/if_msk.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mxge/eth_z8e.dat.gz.uu#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mxge/ethp_z8e.dat.gz.uu#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mxge/if_mxge.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mxge/if_mxge_var.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/my/if_my.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ncv/ncr53c500_pccard.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/nfe/if_nfe.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/nge/if_nge.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/nsp/nsp_pccard.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/nve/if_nve.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/patm/if_patm_attach.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pccard/pccard.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pccard/pccard_cis.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pccard/pccardvarp.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pccbb/pccbb.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pccbb/pccbb_pci.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pccbb/pccbbvar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pcf/envctrl.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pcf/pcf_ebus.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pcf/pcf_isa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pci.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pci_pci.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pcireg.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pcivar.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pdq/if_fea.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pdq/if_fpa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ppbus/if_plip.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ppbus/lpt.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ppbus/ppbconf.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ppbus/ppi.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ppbus/pps.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ppc/ppc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ppc/ppcvar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pst/pst-iop.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/puc/puc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/puc/puc_bfe.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ral/if_ral_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ral/rt2560.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ral/rt2661.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ray/if_ray.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/rc/rc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/re/if_re.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/rr232x/osm_bsd.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/safe/safe.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sbni/if_sbni_isa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sbni/if_sbni_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sbsh/if_sbsh.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/scc/scc_bfe.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/scc/scc_bfe_ebus.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/scc/scc_bfe_macio.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/scc/scc_bfe_sbus.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/scc/scc_core.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/scc/scc_if.m#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/scd/scd.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/si/si_eisa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/si/si_isa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/si/si_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sio/sio.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sio/sio_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sk/if_sk.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sk/if_skreg.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sn/if_sn.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/snc/if_snc_cbus.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/snc/if_snc_pccard.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/snp/snp.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/isa/ad1816.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/isa/ess.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/isa/gusc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/isa/mss.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/isa/sb16.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/isa/sb8.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/isa/sbc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/midi.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/midi.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/midiq.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/mpu401.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/mpu401.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/mpu_if.m#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/mpufoi_if.m#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/sequencer.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/sequencer.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/synth_if.m#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/als4000.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/atiixp.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/au88x0.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/aureal.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/cmi.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/cs4281.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/csa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/csapcm.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/ds1.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/emu10kx-pcm.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/emu10kx.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/envy24.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/envy24ht.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/es137x.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/fm801.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/hda/hdac.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/hda/hdac_private.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/ich.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/maestro.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/maestro3.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/t4dwave.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/via8233.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/via82c686.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/vibes.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/ac97.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/buffer.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/channel.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/channel_if.m#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/dsp.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/fake.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/feeder.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/feeder.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/feeder_fmt.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/feeder_rate.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/feeder_volume.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/mixer.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/sndstat.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/sound.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/sound.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/vchan.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/sbus/cs4231.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/usb/uaudio.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/usb/uaudio.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/usb/uaudio_pcm.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sr/if_sr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/stg/tmc18c30_isa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/stg/tmc18c30_pccard.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/stg/tmc18c30_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/stge/if_stge.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/streams/streams.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sym/sym_hipd.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/syscons/fire/fire_saver.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/syscons/logo/logo_saver.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/syscons/rain/rain_saver.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/syscons/warp/warp_saver.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ti/if_ti.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/trm/trm.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/twa/tw_osl_freebsd.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/twe/twe_freebsd.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/tx/if_tx.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/txp/if_txp.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/uart/uart.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/uart/uart_bus.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/uart/uart_bus_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/uart/uart_core.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/uart/uart_cpu.h#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 9 15:56:16 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6BE7D16A403; Mon, 9 Apr 2007 15:56:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2EFDC16A401 for ; Mon, 9 Apr 2007 15:56:16 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2014313C43E for ; Mon, 9 Apr 2007 15:56:16 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l39FuFHg069295 for ; Mon, 9 Apr 2007 15:56:16 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l39FuD4U069271 for perforce@freebsd.org; Mon, 9 Apr 2007 15:56:13 GMT (envelope-from sam@freebsd.org) Date: Mon, 9 Apr 2007 15:56:13 GMT Message-Id: <200704091556.l39FuD4U069271@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117742 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2007 15:56:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=117742 Change 117742 by sam@sam_ebb on 2007/04/09 15:55:23 IFC @ 117741 Affected files ... .. //depot/projects/wifi/MAINTAINERS#14 integrate .. //depot/projects/wifi/Makefile.inc1#32 integrate .. //depot/projects/wifi/bin/df/df.c#5 integrate .. //depot/projects/wifi/cddl/Makefile#1 branch .. //depot/projects/wifi/cddl/Makefile.inc#1 branch .. //depot/projects/wifi/cddl/lib/Makefile#1 branch .. //depot/projects/wifi/cddl/lib/Makefile.inc#1 branch .. //depot/projects/wifi/cddl/lib/libavl/Makefile#1 branch .. //depot/projects/wifi/cddl/lib/libnvpair/Makefile#1 branch .. //depot/projects/wifi/cddl/lib/libumem/Makefile#1 branch .. //depot/projects/wifi/cddl/lib/libuutil/Makefile#1 branch .. //depot/projects/wifi/cddl/lib/libzfs/Makefile#1 branch .. //depot/projects/wifi/cddl/lib/libzpool/Makefile#1 branch .. //depot/projects/wifi/cddl/sbin/Makefile#1 branch .. //depot/projects/wifi/cddl/sbin/Makefile.inc#1 branch .. //depot/projects/wifi/cddl/sbin/zfs/Makefile#1 branch .. //depot/projects/wifi/cddl/sbin/zpool/Makefile#1 branch .. //depot/projects/wifi/cddl/usr.bin/Makefile#1 branch .. //depot/projects/wifi/cddl/usr.bin/Makefile.inc#1 branch .. //depot/projects/wifi/cddl/usr.bin/ztest/Makefile#1 branch .. //depot/projects/wifi/cddl/usr.sbin/Makefile#1 branch .. //depot/projects/wifi/cddl/usr.sbin/Makefile.inc#1 branch .. //depot/projects/wifi/cddl/usr.sbin/zdb/Makefile#1 branch .. //depot/projects/wifi/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/wifi/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/wifi/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/wifi/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/wifi/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/wifi/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/wifi/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/wifi/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/wifi/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/wifi/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/wifi/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/wifi/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/wifi/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/wifi/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/wifi/contrib/amd/hlfsd/hlfsd.h#2 integrate .. //depot/projects/wifi/contrib/binutils/gas/as.h#2 integrate .. //depot/projects/wifi/contrib/binutils/gas/tc.h#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/openpam_readline.c#3 integrate .. //depot/projects/wifi/contrib/opensolaris/cmd/zdb/zdb.8#1 branch .. //depot/projects/wifi/contrib/opensolaris/cmd/zdb/zdb.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/cmd/zfs/zfs.8#1 branch .. //depot/projects/wifi/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch .. //depot/projects/wifi/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch .. //depot/projects/wifi/contrib/opensolaris/cmd/zpool/zpool.8#1 branch .. //depot/projects/wifi/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch .. //depot/projects/wifi/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/cmd/ztest/ztest.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/head/assert.h#1 branch .. //depot/projects/wifi/contrib/opensolaris/head/atomic.h#1 branch .. //depot/projects/wifi/contrib/opensolaris/head/libintl.h#1 branch .. //depot/projects/wifi/contrib/opensolaris/head/stdio_ext.h#1 branch .. //depot/projects/wifi/contrib/opensolaris/head/synch.h#1 branch .. //depot/projects/wifi/contrib/opensolaris/head/thread.h#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libzpool/common/util.c#1 branch .. //depot/projects/wifi/contrib/tcpdump/print-stp.c#3 integrate .. //depot/projects/wifi/etc/defaults/periodic.conf#8 integrate .. //depot/projects/wifi/etc/defaults/rc.conf#28 integrate .. //depot/projects/wifi/etc/devd.conf#16 integrate .. //depot/projects/wifi/etc/mtree/BSD.root.dist#5 integrate .. //depot/projects/wifi/etc/periodic/daily/404.status-zfs#1 branch .. //depot/projects/wifi/etc/periodic/daily/Makefile#4 integrate .. //depot/projects/wifi/etc/rc.d/Makefile#18 integrate .. //depot/projects/wifi/etc/rc.d/mountd#3 integrate .. //depot/projects/wifi/etc/rc.d/zfs#1 branch .. //depot/projects/wifi/etc/rc.firewall#6 integrate .. //depot/projects/wifi/include/stdio.h#4 integrate .. //depot/projects/wifi/lib/libarchive/Makefile#22 integrate .. //depot/projects/wifi/lib/libarchive/archive_entry.c#14 integrate .. //depot/projects/wifi/lib/libarchive/archive_read.3#14 integrate .. //depot/projects/wifi/lib/libarchive/archive_read.c#13 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_data_into_buffer.c#4 delete .. //depot/projects/wifi/lib/libarchive/archive_read_extract.c#14 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_compression_bzip2.c#8 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_compression_compress.c#6 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_compression_gzip.c#7 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_compression_none.c#6 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_all.c#6 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_disk.c#3 integrate .. //depot/projects/wifi/lib/libarchive/libarchive-formats.5#12 integrate .. //depot/projects/wifi/lib/libarchive/test/Makefile#3 integrate .. //depot/projects/wifi/lib/libc/gen/getvfsbyname.3#3 integrate .. //depot/projects/wifi/lib/libc/resolv/Symbol.map#2 integrate .. //depot/projects/wifi/lib/libc/resolv/res_debug.c#3 integrate .. //depot/projects/wifi/lib/libc/sys/lseek.2#4 integrate .. //depot/projects/wifi/lib/libc/sys/pathconf.2#4 integrate .. //depot/projects/wifi/lib/libc/sys/ptrace.2#4 integrate .. //depot/projects/wifi/lib/libc/uuid/uuid_compare.c#4 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_info.c#6 integrate .. //depot/projects/wifi/libexec/rtld-elf/i386/Symbol.map#2 integrate .. //depot/projects/wifi/libexec/rtld-elf/rtld.c#13 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/relnotes/article.sgml#5 integrate .. //depot/projects/wifi/sbin/dump/traverse.c#5 integrate .. //depot/projects/wifi/sbin/gbde/test.sh#2 integrate .. //depot/projects/wifi/sbin/ggate/ggatec/Makefile#3 integrate .. //depot/projects/wifi/sbin/ggate/shared/ggate.c#4 integrate .. //depot/projects/wifi/share/man/man4/mpt.4#7 integrate .. //depot/projects/wifi/share/man/man4/nfe.4#3 integrate .. //depot/projects/wifi/share/man/man4/pci.4#4 integrate .. //depot/projects/wifi/share/man/man4/polling.4#10 integrate .. //depot/projects/wifi/share/man/man5/rc.conf.5#28 integrate .. //depot/projects/wifi/share/man/man5/src.conf.5#4 integrate .. //depot/projects/wifi/share/man/man9/VFS_SET.9#4 integrate .. //depot/projects/wifi/share/misc/committers-ports.dot#2 integrate .. //depot/projects/wifi/share/misc/committers-src.dot#2 integrate .. //depot/projects/wifi/share/mk/bsd.libnames.mk#11 integrate .. //depot/projects/wifi/share/mk/bsd.own.mk#7 integrate .. //depot/projects/wifi/sys/boot/forth/loader.conf#15 integrate .. //depot/projects/wifi/sys/boot/pc98/boot0.5/Makefile#3 integrate .. //depot/projects/wifi/sys/boot/pc98/boot0.5/boot0.5.s#3 integrate .. //depot/projects/wifi/sys/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/wifi/sys/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/wifi/sys/boot/pc98/boot0.5/selector.s#2 integrate .. //depot/projects/wifi/sys/boot/pc98/boot0.5/start.s#2 integrate .. //depot/projects/wifi/sys/boot/pc98/boot2/boot.c#6 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_sg.c#1 branch .. //depot/projects/wifi/sys/cam/scsi/scsi_sg.h#1 branch .. //depot/projects/wifi/sys/compat/linprocfs/linprocfs.c#14 integrate .. //depot/projects/wifi/sys/compat/linux/linux_ioctl.c#11 integrate .. //depot/projects/wifi/sys/compat/linux/linux_ioctl.h#5 integrate .. //depot/projects/wifi/sys/compat/ndis/kern_ndis.c#20 integrate .. //depot/projects/wifi/sys/compat/ndis/ndis_var.h#14 integrate .. //depot/projects/wifi/sys/compat/ndis/subr_ndis.c#20 integrate .. //depot/projects/wifi/sys/compat/ndis/subr_pe.c#6 integrate .. //depot/projects/wifi/sys/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/wifi/sys/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/wifi/sys/conf/NOTES#35 integrate .. //depot/projects/wifi/sys/conf/files#43 integrate .. //depot/projects/wifi/sys/conf/files.amd64#22 integrate .. //depot/projects/wifi/sys/conf/files.i386#26 integrate .. //depot/projects/wifi/sys/conf/files.ia64#10 integrate .. //depot/projects/wifi/sys/conf/files.pc98#17 integrate .. //depot/projects/wifi/sys/conf/files.powerpc#9 integrate .. //depot/projects/wifi/sys/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/dnlc.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/atomic.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/dnlc.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/vfs.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/wifi/sys/dev/ata/ata-all.h#17 integrate .. //depot/projects/wifi/sys/dev/ata/ata-chipset.c#26 integrate .. //depot/projects/wifi/sys/dev/ata/ata-dma.c#13 integrate .. //depot/projects/wifi/sys/dev/ata/ata-lowlevel.c#20 integrate .. //depot/projects/wifi/sys/dev/ata/ata_if.m#5 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_lro.c#2 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/wifi/sys/dev/cxgb/sys/mvec.h#1 branch .. //depot/projects/wifi/sys/dev/cxgb/sys/uipc_mvec.c#1 branch .. //depot/projects/wifi/sys/dev/if_ndis/if_ndis_pccard.c#7 integrate .. //depot/projects/wifi/sys/dev/mpt/mpt_cam.c#10 integrate .. //depot/projects/wifi/sys/dev/msk/if_msk.c#4 integrate .. //depot/projects/wifi/sys/dev/sound/pci/cmi.c#11 integrate .. //depot/projects/wifi/sys/dev/uart/uart_bus_pci.c#5 integrate .. //depot/projects/wifi/sys/fs/pseudofs/pseudofs.c#6 integrate .. //depot/projects/wifi/sys/fs/pseudofs/pseudofs.h#5 integrate .. //depot/projects/wifi/sys/geom/eli/g_eli.c#9 integrate .. //depot/projects/wifi/sys/geom/journal/g_journal.c#3 integrate .. //depot/projects/wifi/sys/geom/uzip/g_uzip.c#6 integrate .. //depot/projects/wifi/sys/i386/i386/identcpu.c#13 integrate .. //depot/projects/wifi/sys/i386/i386/initcpu.c#6 integrate .. //depot/projects/wifi/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/wifi/sys/i386/i386/pmap.c#20 integrate .. //depot/projects/wifi/sys/i386/i386/trap.c#13 integrate .. //depot/projects/wifi/sys/i386/include/pmap.h#8 integrate .. //depot/projects/wifi/sys/i386/include/specialreg.h#6 integrate .. //depot/projects/wifi/sys/i386/include/vmparam.h#2 integrate .. //depot/projects/wifi/sys/kern/kern_jail.c#11 integrate .. //depot/projects/wifi/sys/kern/kern_mbuf.c#13 integrate .. //depot/projects/wifi/sys/kern/subr_witness.c#25 integrate .. //depot/projects/wifi/sys/kern/uipc_syscalls.c#21 integrate .. //depot/projects/wifi/sys/kern/vfs_mount.c#29 integrate .. //depot/projects/wifi/sys/kern/vfs_syscalls.c#21 integrate .. //depot/projects/wifi/sys/libkern/memset.c#1 branch .. //depot/projects/wifi/sys/modules/Makefile#36 integrate .. //depot/projects/wifi/sys/modules/cam/Makefile#4 integrate .. //depot/projects/wifi/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/zfs/Makefile#1 branch .. //depot/projects/wifi/sys/netinet/libalias/alias_db.c#5 integrate .. //depot/projects/wifi/sys/netinet/libalias/alias_skinny.c#5 integrate .. //depot/projects/wifi/sys/sun4v/include/smp.h#3 integrate .. //depot/projects/wifi/sys/sys/filio.h#3 integrate .. //depot/projects/wifi/sys/sys/jail.h#8 integrate .. //depot/projects/wifi/sys/sys/kernel.h#11 integrate .. //depot/projects/wifi/sys/sys/mount.h#19 integrate .. //depot/projects/wifi/sys/sys/param.h#25 integrate .. //depot/projects/wifi/sys/sys/priv.h#3 integrate .. //depot/projects/wifi/sys/sys/systm.h#21 integrate .. //depot/projects/wifi/sys/sys/unistd.h#5 integrate .. //depot/projects/wifi/sys/vm/vm_fault.c#15 integrate .. //depot/projects/wifi/sys/vm/vm_kern.c#7 integrate .. //depot/projects/wifi/tools/build/mk/OptionalObsoleteFiles.inc#5 integrate .. //depot/projects/wifi/tools/build/options/WITHOUT_ZFS#1 branch .. //depot/projects/wifi/tools/regression/netinet/ipblock/Makefile#1 branch .. //depot/projects/wifi/tools/regression/netinet/ipblock/ipblock.c#1 branch .. //depot/projects/wifi/usr.bin/lsvfs/lsvfs.c#2 integrate .. //depot/projects/wifi/usr.bin/sed/POSIX#2 integrate .. //depot/projects/wifi/usr.bin/tar/read.c#8 integrate .. //depot/projects/wifi/usr.sbin/jail/jail.8#16 integrate .. //depot/projects/wifi/usr.sbin/sa/pdb.c#3 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/config.c#11 integrate Differences ... ==== //depot/projects/wifi/MAINTAINERS#14 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.142 2006/11/11 22:24:10 kris Exp $ +$FreeBSD: src/MAINTAINERS,v 1.143 2007/04/06 10:57:15 pjd Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -108,6 +108,7 @@ geom_stripe pjd Pre-commit review preferred. geom_zero pjd Pre-commit review preferred. sbin/geom pjd Pre-commit review preferred. +zfs pjd Pre-commit review preferred. nfs alfred Will be happy to review code, but not mandatory. rpc.lockd alfred Will be happy to review code, but not mandatory. truss alfred Will be happy to review code, but not mandatory. ==== //depot/projects/wifi/Makefile.inc1#32 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.570 2007/03/09 12:11:56 rafan Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.571 2007/04/06 02:13:29 pjd Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -40,6 +40,9 @@ .if ${MK_GAMES} != "no" SUBDIR+=games .endif +.if ${MK_CDDL} != "no" +SUBDIR+=cddl +.endif SUBDIR+=gnu include .if ${MK_KERBEROS} != "no" SUBDIR+=kerberos5 @@ -430,6 +433,9 @@ .for _t in obj includes cd ${.CURDIR}/include; ${LIB32WMAKE} ${_t} cd ${.CURDIR}/lib; ${LIB32WMAKE} ${_t} +.if ${MK_CDDL} != "no" + cd ${.CURDIR}/cddl/lib; ${LIB32WMAKE} ${_t} +.endif cd ${.CURDIR}/gnu/lib; ${LIB32WMAKE} ${_t} .if ${MK_CRYPT} != "no" cd ${.CURDIR}/secure/lib; ${LIB32WMAKE} ${_t} @@ -1014,12 +1020,16 @@ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ - ${_secure_lib_libssl} + ${_secure_lib_libssl} lib/libthr -_generic_libs= gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib +_generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib lib/libopie__L lib/libtacplus__L: lib/libmd__L +.if ${MK_CDDL} != "no" +_cddl_lib= cddl/lib +.endif + .if ${MK_CRYPT} != "no" .if ${MK_OPENSSL} != "no" _secure_lib_libcrypto= secure/lib/libcrypto ==== //depot/projects/wifi/bin/df/df.c#5 (text+ko) ==== @@ -44,7 +44,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.67 2007/03/08 06:10:17 will Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.68 2007/04/06 15:36:43 kan Exp $"); #include #include @@ -384,7 +384,7 @@ static void prtstat(struct statfs *sfsp, struct maxwidths *mwp) { - static u_long blocksize; + static long blocksize; static int headerlen, timesthrough = 0; static const char *header; int64_t used, availblks, inodes; @@ -461,7 +461,7 @@ static void update_maxwidths(struct maxwidths *mwp, const struct statfs *sfsp) { - static u_long blocksize = 0; + static long blocksize = 0; int dummy; if (blocksize == 0) ==== //depot/projects/wifi/contrib/amd/hlfsd/hlfsd.h#2 (text+ko) ==== @@ -39,7 +39,7 @@ * %W% (Berkeley) %G% * * $Id: hlfsd.h,v 1.4.2.7 2004/01/06 03:15:23 ezk Exp $ - * $FreeBSD: src/contrib/amd/hlfsd/hlfsd.h,v 1.4 2004/07/06 13:16:46 mbr Exp $ + * $FreeBSD: src/contrib/amd/hlfsd/hlfsd.h,v 1.5 2007/04/06 15:51:35 kan Exp $ * * HLFSD was written at Columbia University Computer Science Department, by * Erez Zadok and Alexander Dupuy @@ -143,7 +143,6 @@ extern char *mailbox(int, char *); extern char *passwdfile; extern char *slinkname; -extern char mboxfile[]; extern gid_t hlfs_gid; extern int cache_interval; extern int noverify; ==== //depot/projects/wifi/contrib/binutils/gas/as.h#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* as.h - global header file Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003 + 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -397,6 +397,22 @@ /* Enough bits for address, but still an integer type. Could be a problem, cross-assembling for 64-bit machines. */ typedef addressT relax_addressT; + +struct relax_type +{ + /* Forward reach. Signed number. > 0. */ + offsetT rlx_forward; + /* Backward reach. Signed number. < 0. */ + offsetT rlx_backward; + + /* Bytes length of this address. */ + unsigned char rlx_length; + + /* Next longer relax-state. 0 means there is no 'next' relax-state. */ + relax_substateT rlx_more; +}; + +typedef struct relax_type relax_typeS; /* main program "as.c" (command arguments etc) */ ==== //depot/projects/wifi/contrib/binutils/gas/tc.h#2 (text+ko) ==== @@ -24,25 +24,6 @@ extern const pseudo_typeS md_pseudo_table[]; -/* JF moved this here from as.h under the theory that nobody except MACHINE.c - and write.c care about it anyway. */ - -struct relax_type -{ - /* Forward reach. Signed number. > 0. */ - long rlx_forward; - /* Backward reach. Signed number. < 0. */ - long rlx_backward; - - /* Bytes length of this address. */ - unsigned char rlx_length; - - /* Next longer relax-state. 0 means there is no 'next' relax-state. */ - relax_substateT rlx_more; -}; - -typedef struct relax_type relax_typeS; - extern const int md_reloc_size; /* Size of a relocation record */ char *md_atof (int what_statement_type, char *literalP, int *sizeP); ==== //depot/projects/wifi/contrib/openpam/lib/openpam_readline.c#3 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_readline.c#3 $ + * $Id: openpam_readline.c 380 2006-03-14 14:42:09Z des $ */ #include @@ -52,7 +52,7 @@ char * openpam_readline(FILE *f, int *lineno, size_t *lenp) { - unsigned char *line; + char *line; size_t len, size; int ch; @@ -63,7 +63,7 @@ #define line_putch(ch) do { \ if (len >= size - 1) { \ - unsigned char *tmp = realloc(line, size *= 2); \ + char *tmp = realloc(line, size *= 2); \ if (tmp == NULL) \ goto fail; \ line = tmp; \ @@ -83,7 +83,7 @@ /* eof */ if (ch == EOF) { /* remove trailing whitespace */ - while (len > 0 && isspace(line[len - 1])) + while (len > 0 && isspace((int)line[len - 1])) --len; line[len] = '\0'; if (len == 0) @@ -96,7 +96,7 @@ ++*lineno; /* remove trailing whitespace */ - while (len > 0 && isspace(line[len - 1])) + while (len > 0 && isspace((int)line[len - 1])) --len; line[len] = '\0'; /* skip blank lines */ ==== //depot/projects/wifi/contrib/tcpdump/print-stp.c#3 (text+ko) ==== @@ -11,7 +11,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-stp.c,v 1.13.2.1 2005/04/26 07:27:17 guy Exp $"; +"@(#) $Header: /tcpdump/master/tcpdump/print-stp.c,v 1.13.2.7 2007/03/18 17:12:36 hannes Exp $"; #endif #ifdef HAVE_CONFIG_H @@ -28,75 +28,338 @@ #include "addrtoname.h" #include "extract.h" -static void +#define RSTP_EXTRACT_PORT_ROLE(x) (((x)&0x0C)>>2) +/* STP timers are expressed in multiples of 1/256th second */ +#define STP_TIME_BASE 256 +#define STP_BPDU_MSTP_MIN_LEN 102 + +struct stp_bpdu_ { + u_int8_t protocol_id[2]; + u_int8_t protocol_version; + u_int8_t bpdu_type; + u_int8_t flags; + u_int8_t root_id[8]; + u_int8_t root_path_cost[4]; + u_int8_t bridge_id[8]; + u_int8_t port_id[2]; + u_int8_t message_age[2]; + u_int8_t max_age[2]; + u_int8_t hello_time[2]; + u_int8_t forward_delay[2]; + u_int8_t v1_length; +}; + +#define STP_PROTO_REGULAR 0x00 +#define STP_PROTO_RAPID 0x02 +#define STP_PROTO_MSTP 0x03 + +struct tok stp_proto_values[] = { + { STP_PROTO_REGULAR, "802.1d" }, + { STP_PROTO_RAPID, "802.1w" }, + { STP_PROTO_MSTP, "802.1s" }, + { 0, NULL} +}; + +#define STP_BPDU_TYPE_CONFIG 0x00 +#define STP_BPDU_TYPE_RSTP 0x02 +#define STP_BPDU_TYPE_TOPO_CHANGE 0x80 + +struct tok stp_bpdu_flag_values[] = { + { 0x01, "Topology change" }, + { 0x02, "Proposal" }, + { 0x10, "Learn" }, + { 0x20, "Forward" }, + { 0x40, "Agreement" }, + { 0x80, "Topology change ACK" }, + { 0, NULL} +}; + +struct tok stp_bpdu_type_values[] = { + { STP_BPDU_TYPE_CONFIG, "Config" }, + { STP_BPDU_TYPE_RSTP, "Rapid STP" }, + { STP_BPDU_TYPE_TOPO_CHANGE, "Topology Change" }, + { 0, NULL} +}; + +struct tok rstp_obj_port_role_values[] = { + { 0x00, "Unknown" }, + { 0x01, "Alternate" }, + { 0x02, "Root" }, + { 0x03, "Designated" }, + { 0, NULL} +}; + +static char * stp_print_bridge_id(const u_char *p) { - printf("%.2x%.2x.%.2x:%.2x:%.2x:%.2x:%.2x:%.2x", - p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]); + static char bridge_id_str[sizeof("pppp.aa:bb:cc:dd:ee:ff")]; + + snprintf(bridge_id_str, sizeof(bridge_id_str), + "%.2x%.2x.%.2x:%.2x:%.2x:%.2x:%.2x:%.2x", + p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]); + + return bridge_id_str; } static void -stp_print_config_bpdu(const u_char *p) +stp_print_config_bpdu(const struct stp_bpdu_ *stp_bpdu, u_int length) { - printf("config "); - if (p[4] & 1) - printf("TOP_CHANGE "); - if (p[4] & 0x80) - printf("TOP_CHANGE_ACK "); + printf(", Flags [%s]", + bittok2str(stp_bpdu_flag_values, "none", stp_bpdu->flags)); + + printf(", bridge-id %s.%04x, length %u", + stp_print_bridge_id((const u_char *)&stp_bpdu->bridge_id), + EXTRACT_16BITS(&stp_bpdu->port_id), length); - stp_print_bridge_id(p+17); - printf(".%.2x%.2x ", p[25], p[26]); + /* in non-verbose mode just print the bridge-id */ + if (!vflag) { + return; + } - printf("root "); - stp_print_bridge_id(p+5); + printf("\n\tmessage-age %.2fs, max-age %.2fs" + ", hello-time %.2fs, forwarding-delay %.2fs", + (float)EXTRACT_16BITS(&stp_bpdu->message_age) / STP_TIME_BASE, + (float)EXTRACT_16BITS(&stp_bpdu->max_age) / STP_TIME_BASE, + (float)EXTRACT_16BITS(&stp_bpdu->hello_time) / STP_TIME_BASE, + (float)EXTRACT_16BITS(&stp_bpdu->forward_delay) / STP_TIME_BASE); - printf(" pathcost %i ", (p[13] << 24) | (p[14] << 16) | (p[15] << 8) | p[16]); + printf("\n\troot-id %s, root-pathcost %u", + stp_print_bridge_id((const u_char *)&stp_bpdu->root_id), + EXTRACT_32BITS(&stp_bpdu->root_path_cost)); - printf("age %i ", p[27]); - printf("max %i ", p[29]); - printf("hello %i ", p[31]); - printf("fdelay %i ", p[33]); + /* Port role is only valid for 802.1w */ + if (stp_bpdu->protocol_version == STP_PROTO_RAPID) { + printf(", port-role %s", + tok2str(rstp_obj_port_role_values, "Unknown", + RSTP_EXTRACT_PORT_ROLE(stp_bpdu->flags))); + } } +/* + * MSTP packet format + * Ref. IEEE 802.1Q 2003 Ed. Section 14 + * + * MSTP BPDU + * + * 2 - bytes Protocol Id + * 1 - byte Protocol Ver. + * 1 - byte BPDU tye + * 1 - byte Flags + * 8 - bytes CIST Root Identifier + * 4 - bytes CIST External Path Cost + * 8 - bytes CIST Regional Root Identifier + * 2 - bytes CIST Port Identifier + * 2 - bytes Message Age + * 2 - bytes Max age + * 2 - bytes Hello Time + * 2 - bytes Forward delay + * 1 - byte Version 1 length. Must be 0 + * 2 - bytes Version 3 length + * 1 - byte Config Identifier + * 32 - bytes Config Name + * 2 - bytes Revision level + * 16 - bytes Config Digest [MD5] + * 4 - bytes CIST Internal Root Path Cost + * 8 - bytes CIST Bridge Identifier + * 1 - byte CIST Remaining Hops + * 16 - bytes MSTI information [Max 64 MSTI, each 16 bytes] + * + * MSTI Payload + * + * 1 - byte MSTI flag + * 8 - bytes MSTI Regional Root Identifier + * 4 - bytes MSTI Regional Path Cost + * 1 - byte MSTI Bridge Priority + * 1 - byte MSTI Port Priority + * 1 - byte MSTI Remaining Hops + */ + +#define MST_BPDU_MSTI_LENGTH 16 +#define MST_BPDU_CONFIG_INFO_LENGTH 64 + +/* Offsets of fields from the begginning for the packet */ +#define MST_BPDU_VER3_LEN_OFFSET 36 +#define MST_BPDU_CONFIG_NAME_OFFSET 39 +#define MST_BPDU_CONFIG_DIGEST_OFFSET 73 +#define MST_BPDU_CIST_INT_PATH_COST_OFFSET 89 +#define MST_BPDU_CIST_BRIDGE_ID_OFFSET 93 +#define MST_BPDU_CIST_REMAIN_HOPS_OFFSET 101 +#define MST_BPDU_MSTI_OFFSET 102 +/* Offsets within an MSTI */ +#define MST_BPDU_MSTI_ROOT_PRIO_OFFSET 1 +#define MST_BPDU_MSTI_ROOT_PATH_COST_OFFSET 9 +#define MST_BPDU_MSTI_BRIDGE_PRIO_OFFSET 13 +#define MST_BPDU_MSTI_PORT_PRIO_OFFSET 14 +#define MST_BPDU_MSTI_REMAIN_HOPS_OFFSET 15 + static void -stp_print_tcn_bpdu(void) +stp_print_mstp_bpdu(const struct stp_bpdu_ *stp_bpdu, u_int length) { - printf("tcn"); + const u_char *ptr; + u_int16_t v3len; + u_int16_t len; + u_int16_t msti; + u_int16_t offset; + + ptr = (const u_char *)stp_bpdu; + printf(", CIST Flags [%s]", + bittok2str(stp_bpdu_flag_values, "none", stp_bpdu->flags)); + + /* + * in non-verbose mode just print the flags. We dont read that much + * of the packet (DEFAULT_SNAPLEN) to print out cist bridge-id + */ + if (!vflag) { + return; + } + + printf(", CIST bridge-id %s.%04x, length %u", + stp_print_bridge_id(ptr + MST_BPDU_CIST_BRIDGE_ID_OFFSET), + EXTRACT_16BITS(&stp_bpdu->port_id), length); + + + printf("\n\tmessage-age %.2fs, max-age %.2fs" + ", hello-time %.2fs, forwarding-delay %.2fs", + (float)EXTRACT_16BITS(&stp_bpdu->message_age) / STP_TIME_BASE, + (float)EXTRACT_16BITS(&stp_bpdu->max_age) / STP_TIME_BASE, + (float)EXTRACT_16BITS(&stp_bpdu->hello_time) / STP_TIME_BASE, + (float)EXTRACT_16BITS(&stp_bpdu->forward_delay) / STP_TIME_BASE); + + printf("\n\tCIST root-id %s, ext-pathcost %u int-pathcost %u", + stp_print_bridge_id((const u_char *)&stp_bpdu->root_id), + EXTRACT_32BITS(&stp_bpdu->root_path_cost), + EXTRACT_32BITS(ptr + MST_BPDU_CIST_INT_PATH_COST_OFFSET)); + + printf(", port-role %s", + tok2str(rstp_obj_port_role_values, "Unknown", + RSTP_EXTRACT_PORT_ROLE(stp_bpdu->flags))); + + printf("\n\tCIST regional-root-id %s", + stp_print_bridge_id((const u_char *)&stp_bpdu->bridge_id)); + + printf("\n\tMSTP Configuration Name %s, revision %u, digest %08x%08x%08x%08x", + ptr + MST_BPDU_CONFIG_NAME_OFFSET, + EXTRACT_16BITS(ptr + MST_BPDU_CONFIG_NAME_OFFSET + 32), + EXTRACT_32BITS(ptr + MST_BPDU_CONFIG_DIGEST_OFFSET), + EXTRACT_32BITS(ptr + MST_BPDU_CONFIG_DIGEST_OFFSET + 4), + EXTRACT_32BITS(ptr + MST_BPDU_CONFIG_DIGEST_OFFSET + 8), + EXTRACT_32BITS(ptr + MST_BPDU_CONFIG_DIGEST_OFFSET + 12)); + + printf("\n\tCIST remaining-hops %d", ptr[MST_BPDU_CIST_REMAIN_HOPS_OFFSET]); + + /* Dump all MSTI's */ + v3len = EXTRACT_16BITS(ptr + MST_BPDU_VER3_LEN_OFFSET); + if (v3len > MST_BPDU_CONFIG_INFO_LENGTH) { + len = v3len - MST_BPDU_CONFIG_INFO_LENGTH; + offset = MST_BPDU_MSTI_OFFSET; + while (len >= MST_BPDU_MSTI_LENGTH) { + msti = EXTRACT_16BITS(ptr + offset + + MST_BPDU_MSTI_ROOT_PRIO_OFFSET); + msti = msti & 0x0FFF; + + printf("\n\tMSTI %d, Flags [%s], port-role %s", + msti, bittok2str(stp_bpdu_flag_values, "none", ptr[offset]), + tok2str(rstp_obj_port_role_values, "Unknown", + RSTP_EXTRACT_PORT_ROLE(ptr[offset]))); + printf("\n\t\tMSTI regional-root-id %s, pathcost %u", + stp_print_bridge_id(ptr + offset + + MST_BPDU_MSTI_ROOT_PRIO_OFFSET), + EXTRACT_32BITS(ptr + offset + + MST_BPDU_MSTI_ROOT_PATH_COST_OFFSET)); + printf("\n\t\tMSTI bridge-prio %d, port-prio %d, hops %d", + ptr[offset + MST_BPDU_MSTI_BRIDGE_PRIO_OFFSET] >> 4, + ptr[offset + MST_BPDU_MSTI_PORT_PRIO_OFFSET] >> 4, + ptr[offset + MST_BPDU_MSTI_REMAIN_HOPS_OFFSET]); + + len -= MST_BPDU_MSTI_LENGTH; + offset += MST_BPDU_MSTI_LENGTH; + } + } } /* - * Print 802.1d packets. + * Print 802.1d / 802.1w / 802.1q (mstp) packets. */ void stp_print(const u_char *p, u_int length) { - if (length < 4) - goto trunc; + const struct stp_bpdu_ *stp_bpdu; + u_int16_t mstp_len; + + stp_bpdu = (struct stp_bpdu_*)p; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 9 16:19:51 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 068E816A40E; Mon, 9 Apr 2007 16:19:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C930D16A401 for ; Mon, 9 Apr 2007 16:19:50 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5ECF113C4EC for ; Mon, 9 Apr 2007 16:19:50 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l39GJo6X088591 for ; Mon, 9 Apr 2007 16:19:50 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l39GJjqU088513 for perforce@freebsd.org; Mon, 9 Apr 2007 16:19:45 GMT (envelope-from sam@freebsd.org) Date: Mon, 9 Apr 2007 16:19:45 GMT Message-Id: <200704091619.l39GJjqU088513@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117744 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2007 16:19:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=117744 Change 117744 by sam@sam_ebb on 2007/04/09 16:19:27 version 0.5.7 stripped to remove unused files but otherwise unchanged Affected files ... .. //depot/projects/wifi/contrib/wpa_supplicant/COPYING#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/ChangeLog#4 edit .. //depot/projects/wifi/contrib/wpa_supplicant/FREEBSD-Xlist#4 edit .. //depot/projects/wifi/contrib/wpa_supplicant/FREEBSD-upgrade#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/Makefile#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/README#4 edit .. //depot/projects/wifi/contrib/wpa_supplicant/aes.c#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/aes_wrap.c#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/aes_wrap.h#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/base64.c#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/base64.h#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/common.c#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/common.h#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/config.c#4 edit .. //depot/projects/wifi/contrib/wpa_supplicant/config.h#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/config_file.c#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/config_ssid.h#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/config_types.h#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/crypto.c#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/crypto.h#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/crypto_gnutls.c#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/ctrl_iface.c#4 edit .. //depot/projects/wifi/contrib/wpa_supplicant/ctrl_iface.h#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/defconfig#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/defs.h#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/doc/code_structure.doxygen#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/Makefile#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_background.8#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_background.sgml#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.sgml#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/doc/doxygen.fast#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/doc/doxygen.full#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/doc/driver_wrapper.doxygen#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/doc/eap.doxygen#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/doc/kerneldoc2doxygen.pl#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/doc/mainpage.doxygen#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/doc/porting.doxygen#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/doc/testing_tools.doxygen#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/doc/wpa_supplicant.fig#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/driver.h#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/driver_hostap.h#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/driver_ndis.c#4 edit .. //depot/projects/wifi/contrib/wpa_supplicant/driver_ndis.h#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/driver_ndis_.c#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/driver_wired.c#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/drivers.c#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eap.c#4 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eap.h#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eap_aka.c#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eap_defs.h#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eap_fast.c#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eap_gtc.c#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eap_i.h#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eap_leap.c#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eap_md5.c#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eap_mschapv2.c#4 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eap_otp.c#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eap_pax.c#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eap_pax_common.c#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eap_pax_common.h#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eap_peap.c#4 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eap_psk.c#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eap_psk_common.c#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eap_psk_common.h#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eap_sim.c#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eap_sim_common.c#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eap_sim_common.h#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eap_testing.txt#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eap_tls.c#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eap_tls_common.c#4 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eap_tls_common.h#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eap_tlv.c#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eap_tlv.h#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eap_ttls.c#4 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eap_ttls.h#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eapol_sm.c#4 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eapol_sm.h#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eapol_test.c#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eloop.c#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/eloop.h#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/events.c#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/examples/ieee8021x.conf#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/examples/plaintext.conf#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/examples/wep.conf#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/examples/wpa-psk-tkip.conf#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/examples/wpa2-eap-ccmp.conf#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/hostapd.h#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/l2_packet.h#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/main.c#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/md5.c#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/md5.h#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/ms_funcs.c#4 edit .. //depot/projects/wifi/contrib/wpa_supplicant/ms_funcs.h#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/openssl-tls-extensions.patch#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/pcsc_funcs.c#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/pcsc_funcs.h#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/preauth.c#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/preauth.h#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/preauth_test.c#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/radius.c#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/radius.h#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/radius_client.c#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/radius_client.h#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/rc4.c#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/rc4.h#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/sha1.c#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/sha1.h#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/tls.h#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/tls_gnutls.c#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/tls_none.c#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/tls_openssl.c#4 edit .. //depot/projects/wifi/contrib/wpa_supplicant/tls_schannel.c#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/todo.txt#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/version.h#4 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa.c#4 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa.h#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_cli.c#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_ctrl.c#4 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_ctrl.h#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui.h#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/main.cpp#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui.h#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui.h#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/setup-mingw-cross-compiling#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui.h#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui.h#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/wpamsg.h#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/eventhistory.ui#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/eventhistory.ui.h#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/main.cpp#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/networkconfig.ui#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/scanresults.ui#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/scanresults.ui.h#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui.h#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/wpa_gui.pro#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/wpagui.ui#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/wpamsg.h#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_i.h#2 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_passphrase.c#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_supplicant.c#5 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_supplicant.conf#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_supplicant.h#3 edit .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_supplicant_i.h#4 edit Differences ... ==== //depot/projects/wifi/contrib/wpa_supplicant/COPYING#2 (text+ko) ==== @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -305,7 +305,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. ==== //depot/projects/wifi/contrib/wpa_supplicant/ChangeLog#4 (text+ko) ==== @@ -1,32 +1,323 @@ ChangeLog for wpa_supplicant -2006-02-08 - v0.4.8 +2006-12-31 - v0.5.7 + * updated EAP-SAKE to RFC 4763 and the IANA-allocated EAP type 48 + * updated EAP-PSK to use the IANA-allocated EAP type 47 + * fixed EAP-PAX key derivation + * fixed EAP-PSK bit ordering of the Flags field + * fixed EAP-PEAP/TTLS/FAST to use the correct EAP identifier in + tunnelled identity request (previously, the identifier from the outer + method was used, not the tunnelled identifier which could be + different) + * fixed EAP-TTLS AVP parser processing for too short AVP lengths + * added support for EAP-FAST authentication with inner methods that + generate MSK (e.g., EAP-MSCHAPv2 that was previously only supported + for PAC provisioning) + * fixed dbus ctrl_iface to validate message interface before + dispatching to avoid a possible segfault [Bug 190] + * fixed PeerKey key derivation to use the correct PRF label + * updated Windows binary build to link against OpenSSL 0.9.8d and + added support for EAP-FAST + +2006-11-24 - v0.5.6 + * added experimental, integrated TLSv1 client implementation with the + needed X.509/ASN.1/RSA/bignum processing (this can be enabled by + setting CONFIG_TLS=internal and CONFIG_INTERNAL_LIBTOMMATH=y in + .config); this can be useful, e.g., if the target system does not + have a suitable TLS library and a minimal code size is required + (total size of this internal TLS/crypto code is bit under 50 kB on + x86 and the crypto code is shared by rest of the supplicant so some + of it was already required; TLSv1/X.509/ASN.1/RSA added about 25 kB) + * removed STAKey handshake since PeerKey handshake has replaced it in + IEEE 802.11ma and there are no known deployments of STAKey + * updated EAP Generalized Pre-Shared Key (EAP-GPSK) to use the latest + draft (draft-ietf-emu-eap-gpsk-01.txt) + * added preliminary implementation of IEEE 802.11w/D1.0 (management + frame protection) + (Note: this requires driver support to work properly.) + (Note2: IEEE 802.11w is an unapproved draft and subject to change.) + * fixed Windows named pipes ctrl_iface to not stop listening for + commands if client program opens a named pipe and closes it + immediately without sending a command + * fixed USIM PIN status determination for the case that PIN is not + needed (this allows EAP-AKA to be used with USIM cards that do not + use PIN) + * added support for reading 3G USIM AID from EF_DIR to allow EAP-AKA to + be used with cards that do not support file selection based on + partial AID + * added support for matching the subjectAltName of the authentication + server certificate against multiple name components (e.g., + altsubject_match="DNS:server.example.com;DNS:server2.example.com") + * fixed EAP-SIM/AKA key derivation for re-authentication case (only + affects IEEE 802.1X with dynamic WEP keys) + * changed ctrl_iface network configuration 'get' operations to not + return password/key material; if these fields are requested, "*" + will be returned if the password/key is set, but the value of the + parameter is not exposed + +2006-08-27 - v0.5.5 + * added support for building Windows version with UNICODE defined + (wide-char functions) + * driver_ndis: fixed static WEP configuration to avoid race condition + issues with some NDIS drivers between association and setting WEP + keys + * driver_ndis: added validation for IELength value in scan results to + avoid crashes when using buggy NDIS drivers [Bug 165] + * fixed Release|Win32 target in the Visual Studio project files + (previously, only Debug|Win32 target was set properly) + * changed control interface API call wpa_ctrl_pending() to allow it to + return -1 on error (e.g., connection lost); control interface clients + will need to make sure that they verify that the value is indeed >0 + when determining whether there are pending messages + * added an alternative control interface backend for Windows targets: + Named Pipe (CONFIG_CTRL_IFACE=named_pipe); this is now the default + control interface mechanism for Windows builds (previously, UDP to + localhost was used) + * changed ctrl_interface configuration for UNIX domain sockets: + - deprecated ctrl_interface_group variable (it may be removed in + future versions) + - allow both directory and group be configured with ctrl_interface + in following format: DIR=/var/run/wpa_supplicant GROUP=wheel + - ctrl_interface=/var/run/wpa_supplicant is still supported for the + case when group is not changed + * added support for controlling more than one interface per process in + Windows version + * added a workaround for a case where the AP is using unknown address + (e.g., MAC address of the wired interface) as the source address for + EAPOL-Key frames; previously, that source address was used as the + destination for EAPOL-Key frames and in key derivation; now, BSSID is + used even if the source address does not match with it + (this resolves an interoperability issue with Thomson SpeedTouch 580) + * added a workaround for UDP-based control interface (which was used in + Windows builds before this release) to prevent packets with forged + addresses from being accepted as local control requests + * removed ndis_events.cpp and possibility of using external + ndis_events.exe; C version (ndis_events.c) is fully functional and + there is no desire to maintain two separate versions of this + implementation + * ndis_events: Changed NDIS event notification design to use WMI to + learn the adapter description through Win32_PnPEntity class; this + should fix some cases where the adapter name was not recognized + correctly (e.g., with some USB WLAN adapters, e.g., Ralink RT2500 + USB) [Bug 113] + * fixed selection of the first network in ap_scan=2 mode; previously, + wpa_supplicant could get stuck in SCANNING state when only the first + network for enabled (e.g., after 'wpa_cli select_network 0') + * winsvc: added support for configuring ctrl_interface parameters in + registry (ctrl_interface string value in + HKLM\SOFTWARE\wpa_supplicant\interfaces\0000 key); this new value is + required to enable control interface (previously, this was hardcoded + to be enabled) + * allow wpa_gui subdirectory to be built with both Qt3 and Qt4 + * converted wpa_gui-qt4 subdirectory to use Qt4 specific project format + +2006-06-20 - v0.5.4 + * fixed build with CONFIG_STAKEY=y [Bug 143] + * added support for doing MLME (IEEE 802.11 management frame + processing) in wpa_supplicant when using Devicescape IEEE 802.11 + stack (wireless-dev.git tree) + * added a new network block configuration option, fragment_size, to + configure the maximum EAP fragment size + * driver_ndis: Disable WZC automatically for the selected interface to + avoid conflicts with two programs trying to control the radio; WZC + will be re-enabled (if it was enabled originally) when wpa_supplicant + is terminated + * added an experimental TLSv1 client implementation + (CONFIG_TLS=internal) that can be used instead of an external TLS + library, e.g., to reduce total size requirement on systems that do + not include any TLS library by default (this is not yet complete; + basic functionality is there, but certificate validation is not yet + included) + * added PeerKey handshake implementation for IEEE 802.11e + direct link setup (DLS) to replace STAKey handshake + * fixed WPA PSK update through ctrl_iface for the case where the old + PSK was derived from an ASCII passphrase and the new PSK is set as + a raw PSK (hex string) + * added new configuration option for identifying which network block + was used (id_str in wpa_supplicant.conf; included on + WPA_EVENT_CONNECT monitor event and as WPA_ID_STR environmental + variable in wpa_cli action scripts; in addition WPA_ID variable is + set to the current unique identifier that wpa_supplicant assigned + automatically for the network and that can be used with + GET_NETWORK/SET_NETWORK ctrl_iface commands) + * wpa_cli action script is now called only when the connect/disconnect + status changes or when associating with a different network + * fixed configuration parser not to remove CCMP from group cipher list + if WPA-None (adhoc) is used (pairwise=NONE in that case) + * fixed integrated NDIS events processing not to hang the process due + to a missed change in eloop_win.c API in v0.5.3 [Bug 155] + * added support for EAP Generalized Pre-Shared Key (EAP-GPSK, + draft-clancy-emu-eap-shared-secret-00.txt) + * added Microsoft Visual Studio 2005 solution and project files for + build wpa_supplicant for Windows (see vs2005 subdirectory) + * eloop_win: fixed unregistration of Windows events + * l2_packet_winpcap: fixed a deadlock in deinitializing l2_packet + at the end of RSN pre-authentication and added unregistration of + a Windows event to avoid getting eloop_win stuck with an invalid + handle + * driver_ndis: added support for selecting AP based on BSSID + * added new environmental variable for wpa_cli action scripts: + WPA_CTRL_DIR is the current control interface directory + * driver_ndis: added support for using NDISUIO instead of WinPcap for + OID set/query operations (CONFIG_USE_NDISUIO=y in .config); with new + l2_packet_ndis (CONFIG_L2_PACKET=ndis), this can be used to build + wpa_supplicant without requiring WinPcap; note that using NDISUIO + requires that WZC is disabled (net stop wzcsvc) since NDISUIO allows + only one application to open the device + * changed NDIS driver naming to only include device GUID, e.g., + {7EE3EFE5-C165-472F-986D-F6FBEDFE8C8D}, instead of including WinPcap + specific \Device\NPF_ prefix before the GUID; the prefix is still + allowed for backwards compatibility, but it is not required anymore + when specifying the interface + * driver_ndis: re-initialize driver interface is the adapter is removed + and re-inserted [Bug 159] + * driver_madwifi: fixed TKIP and CCMP sequence number configuration on + big endian hosts [Bug 146] + +2006-04-27 - v0.5.3 + * fixed EAP-GTC response to include correct user identity when run as + phase 2 method of EAP-FAST (i.e., EAP-FAST did not work in v0.5.2) + * driver_ndis: Fixed encryption mode configuration for unencrypted + networks (some NDIS drivers ignored this, but others, e.g., Broadcom, + refused to associate with open networks) [Bug 106] + * driver_ndis: use BSSID OID polling to detect when IBSS network is + formed even when ndis_events code is included since some NDIS drivers + do not generate media connect events in IBSS mode + * config_winreg: allow global ctrl_interface parameter to be configured + in Windows registry + * config_winreg: added support for saving configuration data into + Windows registry + * added support for controlling network device operational state + (dormant/up) for Linux 2.6.17 to improve DHCP processing (see + http://www.flamewarmaster.de/software/dhcpclient/ for a DHCP client + that can use this information) + * driver_wext: added support for WE-21 change to SSID configuration + * driver_wext: fixed privacy configuration for static WEP keys mode + [Bug 140] + * added an optional driver_ops callback for MLME-SETPROTECTION.request + primitive + * added support for EAP-SAKE (no EAP method number allocated yet, so + this is using the same experimental type 255 as EAP-PSK) + * added support for dynamically loading EAP methods (.so files) instead + of requiring them to be statically linked in; this is disabled by + default (see CONFIG_DYNAMIC_EAP_METHODS in defconfig for information + on how to use this) + +2006-03-19 - v0.5.2 + * do not try to use USIM APDUs when initializing PC/SC for SIM card + access for a network that has not enabled EAP-AKA + * fixed EAP phase 2 Nak for EAP-{PEAP,TTLS,FAST} (this was broken in + v0.5.1 due to the new support for expanded EAP types) + * added support for generating EAP Expanded Nak + * try to fetch scan results once before requesting new scan when + starting up in ap_scan=1 mode (this can speed up initial association + a lot with, e.g., madwifi-ng driver) + * added support for receiving EAPOL frames from a Linux bridge + interface (-bbr0 on command line) + * fixed EAPOL re-authentication for sessions that used PMKSA caching + * changed EAP method registration to use a dynamic list of methods + instead of a static list generated at build time + * fixed PMKSA cache deinitialization not to use freed memory when + removing PMKSA entries + * fixed a memory leak in EAP-TTLS re-authentication + * reject WPA/WPA2 message 3/4 if it does not include any valid + WPA/RSN IE + * driver_wext: added fallback to use SIOCSIWENCODE for setting auth_alg + if the driver does not support SIOCSIWAUTH + +2006-01-29 - v0.5.1 + * driver_test: added better support for multiple APs and STAs by using + a directory with sockets that include MAC address for each device in + the name (driver_param=test_dir=/tmp/test) + * added support for EAP expanded type (vendor specific EAP methods) + * added AP_SCAN command into ctrl_iface so that ap_scan configuration + option can be changed if needed + * wpa_cli/wpa_gui: skip non-socket files in control directory when + using UNIX domain sockets; this avoids selecting an incorrect + interface (e.g., a PID file could be in this directory, even though + use of this directory for something else than socket files is not + recommended) + * fixed TLS library deinitialization after RSN pre-authentication not + to disable TLS library for normal authentication + * driver_wext: Remove null-termination from SSID length if the driver + used it; some Linux drivers do this and they were causing problems in + wpa_supplicant not finding matching configuration block. This change + would break a case where the SSID actually ends in '\0', but that is + not likely to happen in real use. + * fixed PMKSA cache processing not to trigger deauthentication if the + current PMKSA cache entry is replaced with a valid new entry + * fixed PC/SC initialization for ap_scan != 1 modes (this fixes + EAP-SIM and EAP-AKA with real SIM/USIM card when using ap_scan=0 or + ap_scan=2) + +2005-12-18 - v0.5.0 (beginning of 0.5.x development releases) + * added experimental STAKey handshake implementation for IEEE 802.11e + direct link setup (DLS); note: this is disabled by default in both + build and runtime configuration (can be enabled with CONFIG_STAKEY=y + and stakey=1) + * fixed EAP-SIM and EAP-AKA pseudonym and fast re-authentication to + decrypt AT_ENCR_DATA attributes correctly + * fixed EAP-AKA to allow resynchronization within the same session + * made code closer to ANSI C89 standard to make it easier to port to + other C libraries and compilers + * started moving operating system or C library specific functions into + wrapper functions defined in os.h and implemented in os_*.c to make + code more portable + * wpa_supplicant can now be built with Microsoft Visual C++ + (e.g., with the freely available Toolkit 2003 version or Visual + C++ 2005 Express Edition and Platform SDK); see nmake.mak for an + example makefile for nmake + * added support for using Windows registry for command line parameters + (CONFIG_MAIN=main_winsvc) and configuration data + (CONFIG_BACKEND=winreg); see win_example.reg for an example registry + contents; this version can be run both as a Windows service and as a + normal application; 'wpasvc.exe app' to start as applicant, + 'wpasvc.exe reg ' to register a service, + 'net start wpasvc' to start the service, 'wpasvc.exe unreg' to + unregister a service + * made it possible to link ndis_events.exe functionality into + wpa_supplicant.exe by defining CONFIG_NDIS_EVENTS_INTEGRATED + * added better support for multiple control interface backends + (CONFIG_CTRL_IFACE option); currently, 'unix' and 'udp' are supported * fixed PC/SC code to use correct length for GSM AUTH command buffer and to not use pioRecvPci with SCardTransmit() calls; these were not causing visible problems with pcsc-lite, but Windows Winscard.dll refused the previously used parameters; this fixes EAP-SIM and EAP-AKA authentication using SIM/USIM card under Windows + * added new event loop implementation for Windows using + WaitForMultipleObject() instead of select() in order to allow waiting + for non-socket objects; this can be selected with + CONFIG_ELOOP=eloop_win in .config + * added support for selecting l2_packet implementation in .config + (CONFIG_L2_PACKET; following options are available now: linux, pcap, + winpcap, freebsd, none) + * added new l2_packet implementation for WinPcap + (CONFIG_L2_PACKET=winpcap) that uses a separate receive thread to + reduce latency in EAPOL receive processing from about 100 ms to about + 3 ms * added support for EAP-FAST key derivation using other ciphers than RC4-128-SHA for authentication and AES128-SHA for provisioning - * fixed EAP-SIM and EAP-AKA pseudonym and fast re-authentication to - decrypt AT_ENCR_DATA attributes correctly * added support for configuring CA certificate as DER file and as a configuration blob * fixed private key configuration as configuration blob and added support for using PKCS#12 as a blob - * fixed cygwin build + * tls_gnutls: added support for using PKCS#12 files; added support for + session resumption * added support for loading trusted CA certificates from Windows certificate store: ca_cert="cert_store://", where is likely CA (Intermediate CA certificates) or ROOT (root certificates) - * fixed TLS library deinitialization after RSN pre-authentication not - to disable TLS library for normal authentication - * fixed PMKSA cache processing not to trigger deauthentication if the - current PMKSA cache entry is replaced with a valid new entry - * fixed PC/SC initialization for ap_scan != 1 modes (this fixes - EAP-SIM and EAP-AKA with real SIM/USIM card when using ap_scan=0 or - ap_scan=2) - * do not try to use USIM APDUs when initializing PC/SC for SIM card - access for a network that has not enabled EAP-AKA + * added C version of ndis_events.cpp and made it possible to build this + with MinGW so that CONFIG_NDIS_EVENTS_INTEGRATED can be used more + easily on cross-compilation builds + * added wpasvc.exe into Windows binary release; this is an alternative + version of wpa_supplicant.exe with configuration backend using + Windows registry and with the entry point designed to run as a + Windows service + * integrated ndis_events.exe functionality into wpa_supplicant.exe and + wpasvc.exe and removed this additional tool from the Windows binary + release since it is not needed anymore + * load winscard.dll functions dynamically when building with MinGW + since MinGW does not yet include winscard library 2005-11-20 - v0.4.7 (beginning of 0.4.x stable releases) * l2_packet_pcap: fixed wired IEEE 802.1X authentication with libpcap ==== //depot/projects/wifi/contrib/wpa_supplicant/FREEBSD-Xlist#4 (text+ko) ==== @@ -14,8 +14,19 @@ driver_wext.h l2_packet_freebsd.c l2_packet_linux.c +l2_packet_ndis.c +l2_packet_none.c l2_packet_pcap.c +l2_packet_winpcap.c +main_none.c +main_winmain.c +main_winsvc.c ndis_events.cpp +os_internal.c +os_none.c +os_win32.c priv_netlink.h +vs2005 win_if_list.c +win_example.reg wireless_copy.h ==== //depot/projects/wifi/contrib/wpa_supplicant/FREEBSD-upgrade#2 (text+ko) ==== ==== //depot/projects/wifi/contrib/wpa_supplicant/Makefile#3 (text+ko) ==== @@ -9,7 +9,7 @@ # Include directories for CVS version CFLAGS += -I. -I../utils -I../hostapd -ALL=wpa_supplicant wpa_passphrase wpa_cli +ALL=wpa_supplicant wpa_passphrase wpa_cli dynamic_eap_methods all: verify_config $(ALL) @@ -36,13 +36,36 @@ for i in $(ALL); do cp $$i $(DESTDIR)/usr/local/sbin/$$i; done OBJS = config.o \ - eloop.o common.o md5.o \ - rc4.o sha1.o -OBJS_p = wpa_passphrase.o sha1.o md5.o + common.o md5.o md4.o \ + rc4.o sha1.o des.o +OBJS_p = wpa_passphrase.o sha1.o md5.o md4.o \ + common.o des.o OBJS_c = wpa_cli.o wpa_ctrl.o -include .config +ifndef CONFIG_OS +ifdef CONFIG_NATIVE_WINDOWS +CONFIG_OS=win32 +else +CONFIG_OS=unix +endif +endif + +ifeq ($(CONFIG_OS), internal) +CFLAGS += -DOS_NO_C_LIB_DEFINES +endif + +OBJS += os_$(CONFIG_OS).o +OBJS_p += os_$(CONFIG_OS).o +OBJS_c += os_$(CONFIG_OS).o + +ifndef CONFIG_ELOOP +CONFIG_ELOOP=eloop +endif +OBJS += $(CONFIG_ELOOP).o + + ifdef CONFIG_EAPOL_TEST CFLAGS += -Werror -DEAPOL_TEST endif @@ -56,6 +79,14 @@ CFLAGS += -DCONFIG_BACKEND_FILE endif +ifeq ($(CONFIG_BACKEND), winreg) +OBJS += config_winreg.o +endif + +ifeq ($(CONFIG_BACKEND), none) +OBJS += config_none.o +endif + ifdef CONFIG_DRIVER_HOSTAP CFLAGS += -DCONFIG_DRIVER_HOSTAP OBJS_d += driver_hostap.o @@ -111,16 +142,22 @@ ifdef CONFIG_DRIVER_BSD CFLAGS += -DCONFIG_DRIVER_BSD OBJS_d += driver_bsd.o -CONFIG_DNET_PCAP=y -CONFIG_L2_FREEBSD=y +ifndef CONFIG_L2_PACKET +CONFIG_L2_PACKET=freebsd +endif endif ifdef CONFIG_DRIVER_NDIS CFLAGS += -DCONFIG_DRIVER_NDIS OBJS_d += driver_ndis.o driver_ndis_.o -CONFIG_DNET_PCAP=y +ifndef CONFIG_L2_PACKET +CONFIG_L2_PACKET=pcap +endif CONFIG_WINPCAP=y +ifdef CONFIG_USE_NDISUIO +CFLAGS += -DCONFIG_USE_NDISUIO endif +endif ifdef CONFIG_DRIVER_WIRED CFLAGS += -DCONFIG_DRIVER_WIRED @@ -132,116 +169,176 @@ OBJS_d += driver_test.o endif -ifdef CONFIG_DNET_PCAP -CFLAGS += -DUSE_DNET_PCAP +ifndef CONFIG_L2_PACKET +CONFIG_L2_PACKET=linux +endif + +OBJS += l2_packet_$(CONFIG_L2_PACKET).o + +ifeq ($(CONFIG_L2_PACKET), pcap) ifdef CONFIG_WINPCAP -OBJS += l2_packet_pcap.o CFLAGS += -DCONFIG_WINPCAP LIBS += -lwpcap -lpacket LIBS_w += -lwpcap else -ifdef CONFIG_L2_FREEBSD -OBJS += l2_packet_freebsd.o -LIBS += -lpcap -else -OBJS += l2_packet_pcap.o LIBS += -ldnet -lpcap endif endif -else -OBJS += l2_packet_linux.o + +ifeq ($(CONFIG_L2_PACKET), winpcap) +LIBS += -lwpcap -lpacket +LIBS_w += -lwpcap +endif + +ifeq ($(CONFIG_L2_PACKET), freebsd) +LIBS += -lpcap endif ifdef CONFIG_EAP_TLS # EAP-TLS +ifeq ($(CONFIG_EAP_TLS), dyn) +CFLAGS += -DEAP_TLS_DYNAMIC +EAPDYN += eap_tls.so +else CFLAGS += -DEAP_TLS OBJS += eap_tls.o +endif TLS_FUNCS=y CONFIG_IEEE8021X_EAPOL=y endif ifdef CONFIG_EAP_PEAP # EAP-PEAP +ifeq ($(CONFIG_EAP_PEAP), dyn) +CFLAGS += -DEAP_PEAP_DYNAMIC +EAPDYN += eap_peap.so +else CFLAGS += -DEAP_PEAP OBJS += eap_peap.o +endif TLS_FUNCS=y -CONFIG_EAP_MSCHAPV2=y CONFIG_IEEE8021X_EAPOL=y CONFIG_EAP_TLV=y endif ifdef CONFIG_EAP_TTLS # EAP-TTLS +ifeq ($(CONFIG_EAP_TTLS), dyn) +CFLAGS += -DEAP_TTLS_DYNAMIC +EAPDYN += eap_ttls.so +else CFLAGS += -DEAP_TTLS OBJS += eap_ttls.o +endif MS_FUNCS=y TLS_FUNCS=y -CONFIG_EAP_MD5=y CONFIG_IEEE8021X_EAPOL=y endif ifdef CONFIG_EAP_MD5 -# EAP-MD5 (also used by EAP-TTLS) +# EAP-MD5 +ifeq ($(CONFIG_EAP_MD5), dyn) +CFLAGS += -DEAP_MD5_DYNAMIC +EAPDYN += eap_md5.so +else CFLAGS += -DEAP_MD5 OBJS += eap_md5.o +endif CONFIG_IEEE8021X_EAPOL=y endif # backwards compatibility for old spelling ifdef CONFIG_MSCHAPV2 +ifndef CONFIG_EAP_MSCHAPV2 CONFIG_EAP_MSCHAPV2=y endif +endif ifdef CONFIG_EAP_MSCHAPV2 -# EAP-MSCHAPv2 (also used by EAP-PEAP) +# EAP-MSCHAPv2 +ifeq ($(CONFIG_EAP_MSCHAPV2), dyn) +CFLAGS += -DEAP_MSCHAPv2_DYNAMIC +EAPDYN += eap_mschapv2.so +else CFLAGS += -DEAP_MSCHAPv2 OBJS += eap_mschapv2.o +endif MS_FUNCS=y CONFIG_IEEE8021X_EAPOL=y endif ifdef CONFIG_EAP_GTC -# EAP-GTC (also used by EAP-PEAP) +# EAP-GTC +ifeq ($(CONFIG_EAP_GTC), dyn) +CFLAGS += -DEAP_GTC_DYNAMIC +EAPDYN += eap_gtc.so +else CFLAGS += -DEAP_GTC OBJS += eap_gtc.o +endif CONFIG_IEEE8021X_EAPOL=y endif ifdef CONFIG_EAP_OTP # EAP-OTP +ifeq ($(CONFIG_EAP_OTP), dyn) +CFLAGS += -DEAP_OTP_DYNAMIC +EAPDYN += eap_otp.so +else CFLAGS += -DEAP_OTP OBJS += eap_otp.o +endif CONFIG_IEEE8021X_EAPOL=y endif ifdef CONFIG_EAP_SIM # EAP-SIM +ifeq ($(CONFIG_EAP_SIM), dyn) +CFLAGS += -DEAP_SIM_DYNAMIC +EAPDYN += eap_sim.so +else CFLAGS += -DEAP_SIM OBJS += eap_sim.o +endif CONFIG_IEEE8021X_EAPOL=y CONFIG_EAP_SIM_COMMON=y endif ifdef CONFIG_EAP_LEAP # EAP-LEAP +ifeq ($(CONFIG_EAP_LEAP), dyn) +CFLAGS += -DEAP_LEAP_DYNAMIC +EAPDYN += eap_leap.so +else CFLAGS += -DEAP_LEAP OBJS += eap_leap.o +endif MS_FUNCS=y CONFIG_IEEE8021X_EAPOL=y endif ifdef CONFIG_EAP_PSK # EAP-PSK +ifeq ($(CONFIG_EAP_PSK), dyn) +CFLAGS += -DEAP_PSK_DYNAMIC +EAPDYN += eap_psk.so +else CFLAGS += -DEAP_PSK OBJS += eap_psk.o eap_psk_common.o +endif CONFIG_IEEE8021X_EAPOL=y NEED_AES=y endif ifdef CONFIG_EAP_AKA # EAP-AKA +ifeq ($(CONFIG_EAP_AKA), dyn) +CFLAGS += -DEAP_AKA_DYNAMIC +EAPDYN += eap_aka.so +else CFLAGS += -DEAP_AKA OBJS += eap_aka.o +endif CONFIG_IEEE8021X_EAPOL=y CONFIG_EAP_SIM_COMMON=y endif @@ -259,22 +356,75 @@ ifdef CONFIG_EAP_FAST # EAP-FAST +ifeq ($(CONFIG_EAP_FAST), dyn) +CFLAGS += -DEAP_FAST_DYNAMIC +EAPDYN += eap_fast.so +else CFLAGS += -DEAP_FAST OBJS += eap_fast.o +endif TLS_FUNCS=y endif ifdef CONFIG_EAP_PAX # EAP-PAX +ifeq ($(CONFIG_EAP_PAX), dyn) +CFLAGS += -DEAP_PAX_DYNAMIC +EAPDYN += eap_pax.so +else CFLAGS += -DEAP_PAX OBJS += eap_pax.o eap_pax_common.o +endif +CONFIG_IEEE8021X_EAPOL=y +endif + +ifdef CONFIG_EAP_SAKE +# EAP-SAKE +ifeq ($(CONFIG_EAP_SAKE), dyn) +CFLAGS += -DEAP_SAKE_DYNAMIC +EAPDYN += eap_sake.so +else +CFLAGS += -DEAP_SAKE +OBJS += eap_sake.o eap_sake_common.o +endif +CONFIG_IEEE8021X_EAPOL=y +endif + +ifdef CONFIG_EAP_GPSK +# EAP-GPSK +ifeq ($(CONFIG_EAP_GPSK), dyn) +CFLAGS += -DEAP_GPSK_DYNAMIC +EAPDYN += eap_gpsk.so +else +CFLAGS += -DEAP_GPSK +OBJS += eap_gpsk.o eap_gpsk_common.o +endif CONFIG_IEEE8021X_EAPOL=y +ifdef CONFIG_EAP_GPSK_SHA256 +CFLAGS += -DEAP_GPSK_SHA256 +NEED_SHA256=y +endif endif +ifdef CONFIG_EAP_VENDOR_TEST +ifeq ($(CONFIG_EAP_VENDOR_TEST), dyn) +CFLAGS += -DEAP_VENDOR_TEST_DYNAMIC +EAPDYN += eap_vendor_test.so +else +CFLAGS += -DEAP_VENDOR_TEST +OBJS += eap_vendor_test.o +endif +CONFIG_IEEE8021X_EAPOL=y +endif + ifdef CONFIG_IEEE8021X_EAPOL # IEEE 802.1X/EAPOL state machines (e.g., for RADIUS authentication) CFLAGS += -DIEEE8021X_EAPOL -OBJS += eapol_sm.o eap.o +OBJS += eapol_sm.o eap.o eap_methods.o +ifdef CONFIG_DYNAMIC_EAP_METHODS +CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS +LIBS += -ldl -rdynamic +endif endif ifdef CONFIG_PCSC @@ -282,18 +432,38 @@ CFLAGS += -DPCSC_FUNCS -I/usr/include/PCSC OBJS += pcsc_funcs.o # -lpthread may not be needed depending on how pcsc-lite was configured +ifdef CONFIG_NATIVE_WINDOWS +#Once MinGW gets support for WinScard, -lwinscard could be used instead of the +#dynamic symbol loading that is now used in pcsc_funcs.c +#LIBS += -lwinscard +else LIBS += -lpcsclite -lpthread endif +endif ifndef CONFIG_TLS CONFIG_TLS=openssl endif +ifeq ($(CONFIG_TLS), internal) +ifndef CONFIG_CRYPTO +CONFIG_CRYPTO=internal +endif +endif +ifeq ($(CONFIG_CRYPTO), libtomcrypt) +CFLAGS += -DCONFIG_INTERNAL_X509 +endif +ifeq ($(CONFIG_CRYPTO), internal) +CFLAGS += -DCONFIG_INTERNAL_X509 +endif + + ifdef TLS_FUNCS # Shared TLS functions (needed for EAP_TLS, EAP_PEAP, EAP_TTLS, and EAP_FAST) CFLAGS += -DEAP_TLS_FUNCS OBJS += eap_tls_common.o ifeq ($(CONFIG_TLS), openssl) +CFLAGS += -DEAP_TLS_OPENSSL OBJS += tls_openssl.o LIBS += -lssl -lcrypto LIBS_p += -lcrypto @@ -302,16 +472,45 @@ OBJS += tls_gnutls.o LIBS += -lgnutls -lgcrypt -lgpg-error LIBS_p += -lgcrypt +ifdef CONFIG_GNUTLS_EXTRA +CFLAGS += -DCONFIG_GNUTLS_EXTRA +LIBS += -lgnutls-extra +endif endif ifeq ($(CONFIG_TLS), schannel) OBJS += tls_schannel.o -# Using OpenSSL for crypto at the moment; to be replaced -LIBS += -lcrypto -LIBS_p += -lcrypto +endif +ifeq ($(CONFIG_TLS), internal) +OBJS += tls_internal.o tlsv1_common.o tlsv1_client.o asn1.o x509v3.o +OBJS_p += asn1.o rc4.o aes_wrap.o +ifneq ($(CONFIG_BACKEND), file) +OBJS += base64.o +endif +CFLAGS += -DCONFIG_TLS_INTERNAL +ifeq ($(CONFIG_CRYPTO), internal) +ifdef CONFIG_INTERNAL_LIBTOMMATH +CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH +else +LIBS += -ltommath +LIBS_p += -ltommath +endif +endif +ifeq ($(CONFIG_CRYPTO), libtomcrypt) +LIBS += -ltomcrypt -ltfm +LIBS_p += -ltomcrypt -ltfm +endif +endif +ifeq ($(CONFIG_TLS), none) +OBJS += tls_none.o +CFLAGS += -DEAP_TLS_NONE +CONFIG_INTERNAL_AES=y +CONFIG_INTERNAL_SHA1=y +CONFIG_INTERNAL_MD5=y +CONFIG_INTERNAL_SHA256=y endif ifdef CONFIG_SMARTCARD >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 9 16:22:55 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D4CC16A402; Mon, 9 Apr 2007 16:22:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B622516A404 for ; Mon, 9 Apr 2007 16:22:54 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A9AC813C45A for ; Mon, 9 Apr 2007 16:22:54 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l39GMsuE091664 for ; Mon, 9 Apr 2007 16:22:54 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l39GMslk091653 for perforce@freebsd.org; Mon, 9 Apr 2007 16:22:54 GMT (envelope-from sam@freebsd.org) Date: Mon, 9 Apr 2007 16:22:54 GMT Message-Id: <200704091622.l39GMslk091653@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117745 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2007 16:22:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=117745 Change 117745 by sam@sam_ebb on 2007/04/09 16:22:07 merge local change to terminate on last network interface going away; this has been passed upstream to Jouni who said he'd integrate it into his code base Affected files ... .. //depot/projects/wifi/contrib/wpa_supplicant/events.c#3 edit Differences ... ==== //depot/projects/wifi/contrib/wpa_supplicant/events.c#3 (text) ==== @@ -753,6 +753,17 @@ wpa_s->last_michael_mic_error = t.sec; } +#ifdef CONFIG_TERMINATE_ONLASTIF +static int any_interfaces(struct wpa_supplicant *head) +{ + struct wpa_supplicant *wpa_s; + + for (wpa_s = head; wpa_s != NULL; wpa_s = wpa_s->next) + if (!wpa_s->interface_removed) + return 1; + return 0; +} +#endif /* CONFIG_TERMINATE_ONLASTIF */ static void wpa_supplicant_event_interface_status(struct wpa_supplicant *wpa_s, @@ -778,6 +789,11 @@ wpa_supplicant_mark_disassoc(wpa_s); l2_packet_deinit(wpa_s->l2); wpa_s->l2 = NULL; +#ifdef CONFIG_TERMINATE_ONLASTIF + /* check if last interface */ + if (!any_interfaces(wpa_s->global->ifaces)) + eloop_terminate(); +#endif /* CONFIG_TERMINATE_ONLASTIF */ break; } } From owner-p4-projects@FreeBSD.ORG Mon Apr 9 16:22:55 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A0D5616A51B; Mon, 9 Apr 2007 16:22:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2B71516A421 for ; Mon, 9 Apr 2007 16:22:55 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 10E3313C45B for ; Mon, 9 Apr 2007 16:22:55 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l39GMsf5091681 for ; Mon, 9 Apr 2007 16:22:54 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l39GMsPm091673 for perforce@freebsd.org; Mon, 9 Apr 2007 16:22:54 GMT (envelope-from sam@freebsd.org) Date: Mon, 9 Apr 2007 16:22:54 GMT Message-Id: <200704091622.l39GMsPm091673@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117746 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2007 16:22:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=117746 Change 117746 by sam@sam_ebb on 2007/04/09 16:22:53 correct compilation problems; the code was writen for building only on Windows; I've passed these to Jouni who says he'll incorporate them Affected files ... .. //depot/projects/wifi/contrib/wpa_supplicant/driver_ndis.c#5 edit .. //depot/projects/wifi/contrib/wpa_supplicant/driver_ndis.h#4 edit .. //depot/projects/wifi/contrib/wpa_supplicant/driver_ndis_.c#3 edit Differences ... ==== //depot/projects/wifi/contrib/wpa_supplicant/driver_ndis.c#5 (text+ko) ==== @@ -42,7 +42,9 @@ #include "driver_ndis.h" int wpa_driver_register_event_cb(struct wpa_driver_ndis_data *drv); +#ifdef CONFIG_NDIS_EVENTS_INTEGRATED void wpa_driver_ndis_event_pipe_cb(void *eloop_data, void *user_data); +#endif static void wpa_driver_ndis_deinit(void *priv); static void wpa_driver_ndis_poll(void *drv); @@ -1522,7 +1524,7 @@ wpa_driver_ndis_adapter_open(drv) < 0) { wpa_printf(MSG_DEBUG, "NDIS: Driver re-initialization " "(%d) failed", i); - Sleep(1000); + os_sleep(0, 1000*1000); } else { wpa_printf(MSG_DEBUG, "NDIS: Driver re-initialized"); break; @@ -2175,6 +2177,7 @@ } +#ifdef CONFIG_SUPPORT_WZC #ifndef _WIN32_WCE /* * These structures are undocumented for WinXP; only WinCE version is @@ -2538,6 +2541,7 @@ return ret; #endif /* _WIN32_WCE */ } +#endif /* CONFIG_SUPPORT_WZC */ #ifdef CONFIG_USE_NDISUIO @@ -2688,9 +2692,9 @@ os_free(drv); return NULL; } - +#ifdef CONFIG_SUPPORT_WCZ wpa_driver_ndis_set_wzc(drv, 0); - +#endif if (wpa_driver_ndis_adapter_open(drv) < 0) { wpa_driver_ndis_adapter_close(drv); os_free(drv); @@ -2780,9 +2784,10 @@ wpa_driver_ndis_adapter_close(drv); +#ifdef CONFIG_SUPPORT_WCZ if (drv->wzc_disabled) wpa_driver_ndis_set_wzc(drv, 1); - +#endif #ifdef _WIN32_WCE os_free(drv->adapter_name); #endif /* _WIN32_WCE */ ==== //depot/projects/wifi/contrib/wpa_supplicant/driver_ndis.h#4 (text+ko) ==== @@ -15,11 +15,13 @@ #ifndef DRIVER_NDIS_H #define DRIVER_NDIS_H +#ifdef CONFIG_NDIS_EVENTS_INTEGRATED struct ndis_events_data; struct ndis_events_data * ndis_events_init(HANDLE *read_pipe, HANDLE *event, const char *ifname, const char *desc); void ndis_events_deinit(struct ndis_events_data *events); +#endif struct ndis_pmkid_entry { struct ndis_pmkid_entry *next; @@ -53,8 +55,10 @@ int mode; int wzc_disabled; int oid_bssid_set; +#ifdef CONFIG_NDIS_EVENTS_INTEGRATED HANDLE events_pipe, event_avail; struct ndis_events_data *events; +#endif }; #endif /* DRIVER_NDIS_H */ ==== //depot/projects/wifi/contrib/wpa_supplicant/driver_ndis_.c#3 (text+ko) ==== @@ -92,6 +92,7 @@ } +#ifdef CONFIG_NDIS_EVENTS_INTEGRATED void wpa_driver_ndis_event_pipe_cb(void *eloop_data, void *user_data) { struct wpa_driver_ndis_data *drv = eloop_data; @@ -106,3 +107,4 @@ (int) GetLastError()); } } +#endif /* CONFIG_NDIS_EVENTS_INTEGRATED */ From owner-p4-projects@FreeBSD.ORG Mon Apr 9 16:31:05 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C14C316A403; Mon, 9 Apr 2007 16:31:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9761B16A401 for ; Mon, 9 Apr 2007 16:31:05 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8AFD913C4BB for ; Mon, 9 Apr 2007 16:31:05 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l39GV52j099057 for ; Mon, 9 Apr 2007 16:31:05 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l39GV5hq099048 for perforce@freebsd.org; Mon, 9 Apr 2007 16:31:05 GMT (envelope-from sam@freebsd.org) Date: Mon, 9 Apr 2007 16:31:05 GMT Message-Id: <200704091631.l39GV5hq099048@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117747 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2007 16:31:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=117747 Change 117747 by sam@sam_ebb on 2007/04/09 16:30:22 change bpf program to filter frames w/ our src address and to accept frames from the multicast address; this enables use of wpa_supplicant on wired networks Submitted by: "Jouke Witteveen" Affected files ... .. //depot/projects/wifi/usr.sbin/wpa/l2_packet.c#4 edit Differences ... ==== //depot/projects/wifi/usr.sbin/wpa/l2_packet.c#4 (text+ko) ==== @@ -38,6 +38,9 @@ #include "eloop.h" #include "l2_packet.h" +static const u8 pae_group_addr[ETH_ALEN] = + { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x03 }; + struct l2_packet_data { pcap_t *pcap; char ifname[100]; @@ -149,7 +152,7 @@ l2_packet_init_libpcap(struct l2_packet_data *l2, unsigned short protocol) { bpf_u_int32 pcap_maskp, pcap_netp; - char pcap_filter[100], pcap_err[PCAP_ERRBUF_SIZE]; + char pcap_filter[200], pcap_err[PCAP_ERRBUF_SIZE]; struct bpf_program pcap_fp; pcap_lookupnet(l2->ifname, &pcap_netp, &pcap_maskp, pcap_err); @@ -161,13 +164,17 @@ } if (pcap_datalink(l2->pcap) != DLT_EN10MB && pcap_set_datalink(l2->pcap, DLT_EN10MB) < 0) { - fprintf(stderr, "pcap_set_datalinke(DLT_EN10MB): %s\n", + fprintf(stderr, "pcap_set_datalink(DLT_EN10MB): %s\n", pcap_geterr(l2->pcap)); return -1; } snprintf(pcap_filter, sizeof(pcap_filter), - "ether dst " MACSTR " and ether proto 0x%x", - MAC2STR(l2->own_addr), protocol); + "not ether src " MACSTR " and " + "( ether dst " MACSTR " or ether dst " MACSTR " ) and " + "ether proto 0x%x", + MAC2STR(l2->own_addr), /* do not receive own packets */ + MAC2STR(l2->own_addr), MAC2STR(pae_group_addr), + protocol); if (pcap_compile(l2->pcap, &pcap_fp, pcap_filter, 1, pcap_netp) < 0) { fprintf(stderr, "pcap_compile: %s\n", pcap_geterr(l2->pcap)); return -1; From owner-p4-projects@FreeBSD.ORG Mon Apr 9 16:32:08 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA91816A405; Mon, 9 Apr 2007 16:32:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A09D316A403 for ; Mon, 9 Apr 2007 16:32:07 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9403713C46E for ; Mon, 9 Apr 2007 16:32:07 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l39GW7Bi000152 for ; Mon, 9 Apr 2007 16:32:07 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l39GW7vM000143 for perforce@freebsd.org; Mon, 9 Apr 2007 16:32:07 GMT (envelope-from sam@freebsd.org) Date: Mon, 9 Apr 2007 16:32:07 GMT Message-Id: <200704091632.l39GW7vM000143@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117748 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2007 16:32:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=117748 Change 117748 by sam@sam_ebb on 2007/04/09 16:31:05 update for v0.5.7; note that ndis support is dropped because it does not even compile Affected files ... .. //depot/projects/wifi/usr.sbin/wpa/wpa_supplicant/Makefile#5 edit Differences ... ==== //depot/projects/wifi/usr.sbin/wpa/wpa_supplicant/Makefile#5 (text+ko) ==== @@ -7,9 +7,11 @@ PROG= wpa_supplicant SRCS= config.c eloop.c common.c md5.c rc4.c sha1.c aes_wrap.c \ - wpa_supplicant.c events.c wpa.c preauth.c \ - ctrl_iface.c l2_packet.c main.c drivers.c driver_freebsd.c \ - driver_ndis.c driver_ndis_.c Packet32.c + wpa_supplicant.c events.c wpa.c preauth.c pmksa_cache.c \ + ctrl_iface.c ctrl_iface_unix.c l2_packet.c main.c drivers.c \ + driver_ndis.c driver_ndis_.c Packet32.c \ + driver_freebsd.c os_unix.c + MAN= wpa_supplicant.8 wpa_supplicant.conf.5 @@ -17,6 +19,8 @@ CFLAGS+= -DCONFIG_DRIVER_BSD CFLAGS+= -DCONFIG_DRIVER_NDIS CFLAGS+= -DCONFIG_CTRL_IFACE +CFLAGS+= -DCONFIG_CTRL_IFACE_UNIX +CFLAGS+= -DCONFIG_TERMINATE_ONLASTIF CFLAGS+= -g DPADD+= ${LIBPCAP} LDADD+= -lpcap @@ -26,7 +30,7 @@ CFLAGS+=-DCONFIG_BACKEND_FILE .if ${MK_WPA_SUPPLICANT_EAPOL} != "no" -SRCS+= eapol_sm.c eap.c +SRCS+= eapol_sm.c eap.c eap_methods.c CFLAGS+= -DIEEE8021X_EAPOL .if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH) From owner-p4-projects@FreeBSD.ORG Mon Apr 9 16:32:08 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4208016A521; Mon, 9 Apr 2007 16:32:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 16AD916A504 for ; Mon, 9 Apr 2007 16:32:08 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0782A13C468 for ; Mon, 9 Apr 2007 16:32:08 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l39GW7CD000163 for ; Mon, 9 Apr 2007 16:32:07 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l39GW74a000155 for perforce@freebsd.org; Mon, 9 Apr 2007 16:32:07 GMT (envelope-from sam@freebsd.org) Date: Mon, 9 Apr 2007 16:32:07 GMT Message-Id: <200704091632.l39GW74a000155@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117749 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2007 16:32:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=117749 Change 117749 by sam@sam_ebb on 2007/04/09 16:31:15 update for v0.5.7 Affected files ... .. //depot/projects/wifi/usr.sbin/wpa/wpa_cli/Makefile#3 edit .. //depot/projects/wifi/usr.sbin/wpa/wpa_passphrase/Makefile#2 edit Differences ... ==== //depot/projects/wifi/usr.sbin/wpa/wpa_cli/Makefile#3 (text+ko) ==== @@ -4,8 +4,11 @@ .PATH: ${WPA_SUPPLICANT_DISTDIR} PROG= wpa_cli -SRCS= wpa_cli.c wpa_ctrl.c +SRCS= wpa_cli.c wpa_ctrl.c os_unix.c MAN= wpa_cli.8 +CFLAGS+= -DCONFIG_CTRL_IFACE +CFLAGS+= -DCONFIG_CTRL_IFACE_UNIX + .include ==== //depot/projects/wifi/usr.sbin/wpa/wpa_passphrase/Makefile#2 (text+ko) ==== @@ -6,6 +6,9 @@ PROG= wpa_passphrase SRCS= wpa_passphrase.c sha1.c md5.c +CFLAGS+= -DINTERNAL_SHA1 +CFLAGS+= -DINTERNAL_MD5 + MAN= wpa_passphrase.8 .include From owner-p4-projects@FreeBSD.ORG Mon Apr 9 16:44:27 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D2FF316A405; Mon, 9 Apr 2007 16:44:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8AF5716A401 for ; Mon, 9 Apr 2007 16:44:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7CA5813C468 for ; Mon, 9 Apr 2007 16:44:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l39GiQWe008440 for ; Mon, 9 Apr 2007 16:44:26 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l39GiNNv008395 for perforce@freebsd.org; Mon, 9 Apr 2007 16:44:23 GMT (envelope-from sam@freebsd.org) Date: Mon, 9 Apr 2007 16:44:23 GMT Message-Id: <200704091644.l39GiNNv008395@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117751 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2007 16:44:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=117751 Change 117751 by sam@sam_ebb on 2007/04/09 16:43:52 version 0.5.7 Affected files ... .. //depot/projects/wifi/contrib/hostapd/COPYING#2 edit .. //depot/projects/wifi/contrib/hostapd/ChangeLog#4 edit .. //depot/projects/wifi/contrib/hostapd/FREEBSD-Xlist#3 edit .. //depot/projects/wifi/contrib/hostapd/FREEBSD-upgrade#3 edit .. //depot/projects/wifi/contrib/hostapd/Makefile#4 edit .. //depot/projects/wifi/contrib/hostapd/README#3 edit .. //depot/projects/wifi/contrib/hostapd/accounting.c#3 edit .. //depot/projects/wifi/contrib/hostapd/accounting.h#2 edit .. //depot/projects/wifi/contrib/hostapd/aes.c#3 edit .. //depot/projects/wifi/contrib/hostapd/aes_wrap.c#3 edit .. //depot/projects/wifi/contrib/hostapd/aes_wrap.h#3 edit .. //depot/projects/wifi/contrib/hostapd/ap.h#2 edit .. //depot/projects/wifi/contrib/hostapd/common.c#3 edit .. //depot/projects/wifi/contrib/hostapd/common.h#4 edit .. //depot/projects/wifi/contrib/hostapd/config.c#4 edit .. //depot/projects/wifi/contrib/hostapd/config.h#3 edit .. //depot/projects/wifi/contrib/hostapd/config_types.h#2 edit .. //depot/projects/wifi/contrib/hostapd/crypto.c#3 edit .. //depot/projects/wifi/contrib/hostapd/crypto.h#3 edit .. //depot/projects/wifi/contrib/hostapd/ctrl_iface.c#4 edit .. //depot/projects/wifi/contrib/hostapd/ctrl_iface.h#2 edit .. //depot/projects/wifi/contrib/hostapd/defconfig#3 edit .. //depot/projects/wifi/contrib/hostapd/defs.h#3 edit .. //depot/projects/wifi/contrib/hostapd/developer.txt#2 edit .. //depot/projects/wifi/contrib/hostapd/driver.h#3 edit .. //depot/projects/wifi/contrib/hostapd/driver_test.c#3 edit .. //depot/projects/wifi/contrib/hostapd/driver_wired.c#3 edit .. //depot/projects/wifi/contrib/hostapd/eap.c#3 edit .. //depot/projects/wifi/contrib/hostapd/eap.h#3 edit .. //depot/projects/wifi/contrib/hostapd/eap_defs.h#3 edit .. //depot/projects/wifi/contrib/hostapd/eap_gtc.c#2 edit .. //depot/projects/wifi/contrib/hostapd/eap_i.h#3 edit .. //depot/projects/wifi/contrib/hostapd/eap_identity.c#3 edit .. //depot/projects/wifi/contrib/hostapd/eap_md5.c#3 edit .. //depot/projects/wifi/contrib/hostapd/eap_mschapv2.c#2 edit .. //depot/projects/wifi/contrib/hostapd/eap_pax.c#2 edit .. //depot/projects/wifi/contrib/hostapd/eap_pax_common.c#2 edit .. //depot/projects/wifi/contrib/hostapd/eap_pax_common.h#2 edit .. //depot/projects/wifi/contrib/hostapd/eap_peap.c#3 edit .. //depot/projects/wifi/contrib/hostapd/eap_psk.c#2 edit .. //depot/projects/wifi/contrib/hostapd/eap_psk_common.c#2 edit .. //depot/projects/wifi/contrib/hostapd/eap_psk_common.h#2 edit .. //depot/projects/wifi/contrib/hostapd/eap_sim.c#3 edit .. //depot/projects/wifi/contrib/hostapd/eap_sim_common.c#3 edit .. //depot/projects/wifi/contrib/hostapd/eap_sim_common.h#3 edit .. //depot/projects/wifi/contrib/hostapd/eap_sim_db.c#3 edit .. //depot/projects/wifi/contrib/hostapd/eap_sim_db.h#2 edit .. //depot/projects/wifi/contrib/hostapd/eap_tls.c#3 edit .. //depot/projects/wifi/contrib/hostapd/eap_tls_common.c#3 edit .. //depot/projects/wifi/contrib/hostapd/eap_tls_common.h#2 edit .. //depot/projects/wifi/contrib/hostapd/eap_tlv.c#2 edit .. //depot/projects/wifi/contrib/hostapd/eap_ttls.c#3 edit .. //depot/projects/wifi/contrib/hostapd/eap_ttls.h#3 edit .. //depot/projects/wifi/contrib/hostapd/eapol_sm.c#4 edit .. //depot/projects/wifi/contrib/hostapd/eapol_sm.h#4 edit .. //depot/projects/wifi/contrib/hostapd/eloop.c#3 edit .. //depot/projects/wifi/contrib/hostapd/eloop.h#3 edit .. //depot/projects/wifi/contrib/hostapd/hostap_common.h#3 edit .. //depot/projects/wifi/contrib/hostapd/hostapd.8#2 edit .. //depot/projects/wifi/contrib/hostapd/hostapd.accept#2 edit .. //depot/projects/wifi/contrib/hostapd/hostapd.c#3 edit .. //depot/projects/wifi/contrib/hostapd/hostapd.conf#3 edit .. //depot/projects/wifi/contrib/hostapd/hostapd.deny#2 edit .. //depot/projects/wifi/contrib/hostapd/hostapd.eap_user#3 edit .. //depot/projects/wifi/contrib/hostapd/hostapd.h#3 edit .. //depot/projects/wifi/contrib/hostapd/hostapd.radius_clients#2 edit .. //depot/projects/wifi/contrib/hostapd/hostapd.sim_db#2 edit .. //depot/projects/wifi/contrib/hostapd/hostapd.wpa_psk#2 edit .. //depot/projects/wifi/contrib/hostapd/hostapd_cli.1#2 edit .. //depot/projects/wifi/contrib/hostapd/hostapd_cli.c#3 edit .. //depot/projects/wifi/contrib/hostapd/iapp.c#3 edit .. //depot/projects/wifi/contrib/hostapd/iapp.h#2 edit .. //depot/projects/wifi/contrib/hostapd/ieee802_11.c#3 edit .. //depot/projects/wifi/contrib/hostapd/ieee802_11.h#2 edit .. //depot/projects/wifi/contrib/hostapd/ieee802_11_auth.c#3 edit .. //depot/projects/wifi/contrib/hostapd/ieee802_11_auth.h#2 edit .. //depot/projects/wifi/contrib/hostapd/ieee802_1x.c#4 edit .. //depot/projects/wifi/contrib/hostapd/ieee802_1x.h#3 edit .. //depot/projects/wifi/contrib/hostapd/l2_packet.h#3 edit .. //depot/projects/wifi/contrib/hostapd/logwatch/README#2 edit .. //depot/projects/wifi/contrib/hostapd/logwatch/hostapd#2 edit .. //depot/projects/wifi/contrib/hostapd/logwatch/hostapd.conf#2 edit .. //depot/projects/wifi/contrib/hostapd/md5.c#3 edit .. //depot/projects/wifi/contrib/hostapd/md5.h#3 edit .. //depot/projects/wifi/contrib/hostapd/ms_funcs.c#4 edit .. //depot/projects/wifi/contrib/hostapd/ms_funcs.h#3 edit .. //depot/projects/wifi/contrib/hostapd/radius.c#3 edit .. //depot/projects/wifi/contrib/hostapd/radius.h#3 edit .. //depot/projects/wifi/contrib/hostapd/radius_client.c#4 edit .. //depot/projects/wifi/contrib/hostapd/radius_client.h#3 edit .. //depot/projects/wifi/contrib/hostapd/radius_server.c#4 edit .. //depot/projects/wifi/contrib/hostapd/radius_server.h#3 edit .. //depot/projects/wifi/contrib/hostapd/rc4.c#3 edit .. //depot/projects/wifi/contrib/hostapd/rc4.h#3 edit .. //depot/projects/wifi/contrib/hostapd/sha1.c#3 edit .. //depot/projects/wifi/contrib/hostapd/sha1.h#3 edit .. //depot/projects/wifi/contrib/hostapd/sta_info.c#3 edit .. //depot/projects/wifi/contrib/hostapd/sta_info.h#3 edit .. //depot/projects/wifi/contrib/hostapd/tls.h#3 edit .. //depot/projects/wifi/contrib/hostapd/tls_none.c#3 edit .. //depot/projects/wifi/contrib/hostapd/tls_openssl.c#4 edit .. //depot/projects/wifi/contrib/hostapd/version.h#4 edit .. //depot/projects/wifi/contrib/hostapd/wired.conf#3 edit .. //depot/projects/wifi/contrib/hostapd/wpa.c#4 edit .. //depot/projects/wifi/contrib/hostapd/wpa.h#3 edit .. //depot/projects/wifi/contrib/hostapd/wpa_ctrl.c#2 edit .. //depot/projects/wifi/contrib/hostapd/wpa_ctrl.h#2 edit Differences ... ==== //depot/projects/wifi/contrib/hostapd/COPYING#2 (text+ko) ==== @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -305,7 +305,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. ==== //depot/projects/wifi/contrib/hostapd/ChangeLog#4 (text+ko) ==== @@ -1,9 +1,124 @@ ChangeLog for hostapd -2006-02-08 - v0.4.8 +2006-12-31 - v0.5.7 + * updated EAP-SAKE to RFC 4763 and the IANA-allocated EAP type 48 + * updated EAP-PSK to use the IANA-allocated EAP type 47 + * fixed EAP-PSK bit ordering of the Flags field + * fixed configuration reloading (SIGHUP) to re-initialize WPA PSKs + by reading wpa_psk_file [Bug 181] + * fixed EAP-TTLS AVP parser processing for too short AVP lengths + * fixed IPv6 connection to RADIUS accounting server + +2006-11-24 - v0.5.6 + * added support for configuring and controlling multiple BSSes per + radio interface (bss= in hostapd.conf); this is only + available with Devicescape and test driver interfaces + * fixed PMKSA cache update in the end of successful RSN + pre-authentication + * added support for dynamic VLAN configuration (i.e., selecting VLAN-ID + for each STA based on RADIUS Access-Accept attributes); this requires + VLAN support from the kernel driver/802.11 stack and this is + currently only available with Devicescape and test driver interfaces + * driver_madwifi: fixed configuration of unencrypted modes (plaintext + and IEEE 802.1X without WEP) + * removed STAKey handshake since PeerKey handshake has replaced it in + IEEE 802.11ma and there are no known deployments of STAKey + * updated EAP Generalized Pre-Shared Key (EAP-GPSK) to use the latest + draft (draft-ietf-emu-eap-gpsk-01.txt) + * added preliminary implementation of IEEE 802.11w/D1.0 (management + frame protection) + (Note: this requires driver support to work properly.) + (Note2: IEEE 802.11w is an unapproved draft and subject to change.) + * hlr_auc_gw: added support for GSM-Milenage (for EAP-SIM) + * hlr_auc_gw: added support for reading per-IMSI Milenage keys and + parameters from a text file to make it possible to implement proper + GSM/UMTS authentication server for multiple SIM/USIM cards using + EAP-SIM/EAP-AKA + * fixed session timeout processing with drivers that do not use + ieee802_11.c (e.g., madwifi) + +2006-08-27 - v0.5.5 + * added 'hostapd_cli new_sta ' command for adding a new STA into + hostapd (e.g., to initialize wired network authentication based on an + external signal) + * fixed hostapd to add PMKID KDE into 4-Way Handshake Message 1 when + using WPA2 even if PMKSA caching is not used + * added -P argument for hostapd to write the current process + id into a file + * added support for RADIUS Authentication Server MIB (RFC 2619) + +2006-06-20 - v0.5.4 + * fixed nt_password_hash build [Bug 144] + * added PeerKey handshake implementation for IEEE 802.11e + direct link setup (DLS) to replace STAKey handshake + * added support for EAP Generalized Pre-Shared Key (EAP-GPSK, + draft-clancy-emu-eap-shared-secret-00.txt) + * fixed a segmentation fault when RSN pre-authentication was completed + successfully [Bug 152] + +2006-04-27 - v0.5.3 + * do not build nt_password_hash and hlr_auc_gw by default to avoid + requiring a TLS library for a successful build; these programs can be + build with 'make nt_password_hash' and 'make hlr_auc_gw' + * added a new configuration option, eapol_version, that can be used to + set EAPOL version to 1 (default is 2) to work around broken client + implementations that drop EAPOL frames which use version number 2 + [Bug 89] + * added support for EAP-SAKE (no EAP method number allocated yet, so + this is using the same experimental type 255 as EAP-PSK) + * fixed EAP-MSCHAPv2 message length validation + +2006-03-19 - v0.5.2 * fixed stdarg use in hostapd_logger(): if both stdout and syslog logging was enabled, hostapd could trigger a segmentation fault in vsyslog on some CPU -- C library combinations + * moved HLR/AuC gateway implementation for EAP-SIM/AKA into an external + program to make it easier to use for implementing real SS7 gateway; + eap_sim_db is not anymore used as a file name for GSM authentication + triplets; instead, it is path to UNIX domain socket that will be used + to communicate with the external gateway program (e.g., hlr_auc_gw) + * added example HLR/AuC gateway implementation, hlr_auc_gw, that uses + local information (GSM authentication triplets from a text file and + hardcoded AKA authentication data); this can be used to test EAP-SIM + and EAP-AKA + * added Milenage algorithm (example 3GPP AKA algorithm) to hlr_auc_gw + to make it possible to test EAP-AKA with real USIM cards (this is + disabled by default; define AKA_USE_MILENAGE when building hlr_auc_gw + to enable this) + * driver_madwifi: added support for getting station RSN IE from + madwifi-ng svn r1453 and newer; this fixes RSN that was apparently + broken with earlier change (r1357) in the driver + * changed EAP method registration to use a dynamic list of methods + instead of a static list generated at build time + * fixed WPA message 3/4 not to encrypt Key Data field (WPA IE) + [Bug 125] + * added ap_max_inactivity configuration parameter + +2006-01-29 - v0.5.1 + * driver_test: added better support for multiple APs and STAs by using + a directory with sockets that include MAC address for each device in + the name (test_socket=DIR:/tmp/test) + * added support for EAP expanded type (vendor specific EAP methods) + +2005-12-18 - v0.5.0 (beginning of 0.5.x development releases) + * added experimental STAKey handshake implementation for IEEE 802.11e + direct link setup (DLS); note: this is disabled by default in both + build and runtime configuration (can be enabled with CONFIG_STAKEY=y + and stakey=1) + * added support for EAP methods to use callbacks to external programs + by buffering a pending request and processing it after the EAP method + is ready to continue + * improved EAP-SIM database interface to allow external request to GSM + HLR/AuC without blocking hostapd process + * added support for using EAP-SIM pseudonyms and fast re-authentication + * added support for EAP-AKA in the integrated EAP authenticator + * added support for matching EAP identity prefixes (e.g., "1"*) in EAP + user database to allow EAP-SIM/AKA selection without extra roundtrip + for EAP-Nak negotiation + * added support for storing EAP user password as NtPasswordHash instead + of plaintext password when using MSCHAP or MSCHAPv2 for + authentication (hash:<16-octet hex value>); added nt_password_hash + tool for hashing password to generate NtPasswordHash 2005-11-20 - v0.4.7 (beginning of 0.4.x stable releases) * driver_wired: fixed EAPOL sending to optionally use PAE group address ==== //depot/projects/wifi/contrib/hostapd/FREEBSD-Xlist#3 (text+ko) ==== @@ -4,9 +4,14 @@ driver_bsd.c driver_madwifi.c driver_prism54.c +driver_devicescape.c l2_packet_freebsd.c l2_packet_linux.c l2_packet_pcap.c +madwifi.conf +os_internal.c +os_none.c +os_win32.c prism54.h priv_netlink.h wireless_copy.h ==== //depot/projects/wifi/contrib/hostapd/FREEBSD-upgrade#3 (text+ko) ==== ==== //depot/projects/wifi/contrib/hostapd/Makefile#4 (text+ko) ==== @@ -1,6 +1,5 @@ CC=gcc DIR_WPA_SUPPLICANT=. -DIR_HOSTAP=. ifndef CFLAGS CFLAGS = -MMD -O2 -Wall -g @@ -11,18 +10,41 @@ CFLAGS += -DHOSTAPD_DUMP_STATE # Include directories for CVS version -CFLAGS += -I. -I$(DIR_HOSTAP) -I../utils -I$(DIR_WPA_SUPPLICANT) +CFLAGS += -I. -I../utils -I$(DIR_WPA_SUPPLICANT) # Uncomment following line and set the path to your kernel tree include # directory if your C library does not include all header files. # CFLAGS += -DUSE_KERNEL_HEADERS -I/usr/src/linux/include -OBJS = hostapd.o eloop.o ieee802_1x.o eapol_sm.o radius.o md5.o rc4.o \ +-include .config + +ifndef CONFIG_OS +ifdef CONFIG_NATIVE_WINDOWS +CONFIG_OS=win32 +else +CONFIG_OS=unix +endif +endif + +ifeq ($(CONFIG_OS), internal) +CFLAGS += -DOS_NO_C_LIB_DEFINES +endif + +ifdef CONFIG_NATIVE_WINDOWS +CFLAGS += -DCONFIG_NATIVE_WINDOWS +LIBS += -lws2_32 +endif + +OBJS = hostapd.o eloop.o ieee802_1x.o eapol_sm.o radius.o md5.o rc4.o md4.o \ common.o ieee802_11.o config.o ieee802_11_auth.o accounting.o \ sta_info.o radius_client.o sha1.o wpa.o aes_wrap.o ctrl_iface.o \ - driver_conf.o + driver_conf.o os_$(CONFIG_OS).o preauth.o pmksa_cache.o beacon.o \ + hw_features.o wme.o ap_list.o reconfig.o \ + mlme.o vlan_init.o ieee802_11h.o + +HOBJS=hlr_auc_gw.o common.o os_$(CONFIG_OS).o milenage.o aes_wrap.o --include .config +CFLAGS += -DCONFIG_CTRL_IFACE -DCONFIG_CTRL_IFACE_UNIX ifdef CONFIG_IAPP CFLAGS += -DCONFIG_IAPP @@ -34,6 +56,15 @@ CONFIG_L2_PACKET=y endif +ifdef CONFIG_PEERKEY +CFLAGS += -DCONFIG_PEERKEY +endif + +ifdef CONFIG_IEEE80211W +CFLAGS += -DCONFIG_IEEE80211W +NEED_SHA256=y +endif + ifdef CONFIG_DRIVER_HOSTAP CFLAGS += -DCONFIG_DRIVER_HOSTAP OBJS += driver.o @@ -55,6 +86,11 @@ OBJS += driver_prism54.o endif +ifdef CONFIG_DRIVER_DEVICESCAPE +CFLAGS += -DCONFIG_DRIVER_DEVICESCAPE +OBJS += driver_devicescape.o +endif + ifdef CONFIG_DRIVER_BSD CFLAGS += -DCONFIG_DRIVER_BSD OBJS += driver_bsd.o @@ -70,7 +106,6 @@ ifdef CONFIG_L2_PACKET ifdef CONFIG_DNET_PCAP -CFLAGS += -DUSE_DNET_PCAP ifdef CONFIG_L2_FREEBSD LIBS += -lpcap OBJS += $(DIR_WPA_SUPPLICANT)/l2_packet_freebsd.o @@ -122,9 +157,21 @@ ifdef CONFIG_EAP_SIM CFLAGS += -DEAP_SIM -OBJS += eap_sim.o $(DIR_WPA_SUPPLICANT)/eap_sim_common.o -# Example EAP-SIM interface for GSM authentication. This can be replaced with -# another file implementating the interface specified in eap_sim_db.h. +OBJS += eap_sim.o +CONFIG_EAP_SIM_COMMON=y +endif + +ifdef CONFIG_EAP_AKA +CFLAGS += -DEAP_AKA +OBJS += eap_aka.o +CONFIG_EAP_SIM_COMMON=y +endif + +ifdef CONFIG_EAP_SIM_COMMON +OBJS += $(DIR_WPA_SUPPLICANT)/eap_sim_common.o +# Example EAP-SIM/AKA interface for GSM/UMTS authentication. This can be +# replaced with another file implementating the interface specified in +# eap_sim_db.h. OBJS += eap_sim_db.o endif @@ -138,6 +185,25 @@ OBJS += eap_psk.o $(DIR_WPA_SUPPLICANT)/eap_psk_common.o endif +ifdef CONFIG_EAP_SAKE +CFLAGS += -DEAP_SAKE +OBJS += eap_sake.o $(DIR_WPA_SUPPLICANT)/eap_sake_common.o +endif + +ifdef CONFIG_EAP_GPSK +CFLAGS += -DEAP_GPSK +OBJS += eap_gpsk.o $(DIR_WPA_SUPPLICANT)/eap_gpsk_common.o +ifdef CONFIG_EAP_GPSK_SHA256 +CFLAGS += -DEAP_GPSK_SHA256 +NEED_SHA256=y +endif +endif + +ifdef CONFIG_EAP_VENDOR_TEST +CFLAGS += -DEAP_VENDOR_TEST +OBJS += eap_vendor_test.o +endif + ifdef CONFIG_EAP_TLV CFLAGS += -DEAP_TLV OBJS += eap_tlv.o @@ -145,15 +211,34 @@ ifdef CONFIG_EAP CFLAGS += -DEAP_SERVER -OBJS += eap.o eap_identity.o +OBJS += eap.o eap_methods.o eap_identity.o +endif + +ifndef CONFIG_TLS +CONFIG_TLS=openssl endif ifdef TLS_FUNCS # Shared TLS functions (needed for EAP_TLS, EAP_PEAP, and EAP_TTLS) CFLAGS += -DEAP_TLS_FUNCS -OBJS += eap_tls_common.o $(DIR_WPA_SUPPLICANT)/tls_openssl.o +OBJS += eap_tls_common.o +ifeq ($(CONFIG_TLS), openssl) +OBJS += $(DIR_WPA_SUPPLICANT)/tls_openssl.o LIBS += -lssl -lcrypto LIBS_p += -lcrypto +LIBS_h += -lcrypto +endif +ifeq ($(CONFIG_TLS), gnutls) +OBJS += $(DIR_WPA_SUPPLICANT)/tls_gnutls.o +LIBS += -lgnutls -lgcrypt -lgpg-error +LIBS_p += -lgcrypt +LIBS_h += -lgcrypt +endif +ifdef CONFIG_GNUTLS_EXTRA +CFLAGS += -DCONFIG_GNUTLS_EXTRA +LIBS += -lgnutls-extra +endif +NEED_CRYPTO=y else OBJS += $(DIR_WPA_SUPPLICANT)/tls_none.o endif @@ -163,10 +248,60 @@ endif ifdef MS_FUNCS +OBJS += $(DIR_WPA_SUPPLICANT)/ms_funcs.o +NEED_CRYPTO=y +endif + +ifdef NEED_CRYPTO ifndef TLS_FUNCS +ifeq ($(CONFIG_TLS), openssl) LIBS += -lcrypto +LIBS_p += -lcrypto +LIBS_h += -lcrypto +endif +ifeq ($(CONFIG_TLS), gnutls) +LIBS += -lgcrypt +LIBS_p += -lgcrypt +LIBS_h += -lgcrypt +endif +endif +ifeq ($(CONFIG_TLS), openssl) +OBJS += $(DIR_WPA_SUPPLICANT)/crypto.o +OBJS_p += $(DIR_WPA_SUPPLICANT)/crypto.o +HOBJS += $(DIR_WPA_SUPPLICANT)/crypto.o +CONFIG_INTERNAL_SHA256=y +endif +ifeq ($(CONFIG_TLS), gnutls) +OBJS += $(DIR_WPA_SUPPLICANT)/crypto_gnutls.o +OBJS_p += $(DIR_WPA_SUPPLICANT)/crypto_gnutls.o +HOBJS += $(DIR_WPA_SUPPLICANT)/crypto_gnutls.o +CONFIG_INTERNAL_SHA256=y endif -OBJS += $(DIR_WPA_SUPPLICANT)/ms_funcs.o $(DIR_WPA_SUPPLICANT)/crypto.o +else +CONFIG_INTERNAL_AES=y +CONFIG_INTERNAL_SHA1=y +CONFIG_INTERNAL_MD5=y +CONFIG_INTERNAL_SHA256=y +endif + +ifdef CONFIG_INTERNAL_AES +CFLAGS += -DINTERNAL_AES +endif +ifdef CONFIG_INTERNAL_SHA1 +CFLAGS += -DINTERNAL_SHA1 +endif +ifdef CONFIG_INTERNAL_SHA256 +CFLAGS += -DINTERNAL_SHA256 +endif +ifdef CONFIG_INTERNAL_MD5 +CFLAGS += -DINTERNAL_MD5 +endif +ifdef CONFIG_INTERNAL_MD4 +CFLAGS += -DINTERNAL_MD4 +endif + +ifdef NEED_SHA256 +OBJS += sha256.o endif ifdef CONFIG_RADIUS_SERVER @@ -178,6 +313,12 @@ CFLAGS += -DCONFIG_IPV6 endif +ifdef CONFIG_FULL_DYNAMIC_VLAN +# define CONFIG_FULL_DYNAMIC_VLAN to have hostapd manipulate bridges +# and vlan interfaces for the vlan feature. +CFLAGS += -DCONFIG_FULL_DYNAMIC_VLAN +endif + ALL=hostapd hostapd_cli all: verify_config $(ALL) @@ -201,10 +342,7 @@ rm -f driver_conf.c echo '/* THIS FILE AUTOMATICALLY GENERATED, DO NOT EDIT! */' \ > driver_conf.c - echo '#include ' >> driver_conf.c - echo '#include ' >> driver_conf.c - echo '#include ' >> driver_conf.c - echo '#include ' >> driver_conf.c + echo '#include "includes.h"' >> driver_conf.c echo '#include "hostapd.h"' >> driver_conf.c echo '#include "driver.h"' >> driver_conf.c ifdef CONFIG_DRIVER_HOSTAP @@ -219,6 +357,9 @@ ifdef CONFIG_DRIVER_PRISM54 echo "void prism54_driver_register(void);" >> driver_conf.c endif +ifdef CONFIG_DRIVER_DEVICESCAPE + echo "void devicescape_driver_register(void);" >> driver_conf.c +endif ifdef CONFIG_DRIVER_BSD echo "void bsd_driver_register(void);" >> driver_conf.c endif @@ -238,6 +379,9 @@ ifdef CONFIG_DRIVER_PRISM54 echo "prism54_driver_register();" >> driver_conf.c endif +ifdef CONFIG_DRIVER_DEVICESCAPE + echo "devicescape_driver_register();" >> driver_conf.c +endif ifdef CONFIG_DRIVER_BSD echo "bsd_driver_register();" >> driver_conf.c endif @@ -249,7 +393,48 @@ hostapd_cli: hostapd_cli.o $(DIR_WPA_SUPPLICANT)/wpa_ctrl.o $(CC) -o hostapd_cli hostapd_cli.o $(DIR_WPA_SUPPLICANT)/wpa_ctrl.o +NOBJS = nt_password_hash.o $(DIR_WPA_SUPPLICANT)/ms_funcs.o sha1.o rc4.o md5.o +NOBJS += $(DIR_WPA_SUPPLICANT)/crypto.o os_$(CONFIG_OS).o +ifdef TLS_FUNCS +LIBS_n += -lcrypto +endif + +nt_password_hash: $(NOBJS) + $(CC) -o nt_password_hash $(NOBJS) $(LIBS_n) + +hlr_auc_gw: $(HOBJS) + $(CC) -o hlr_auc_gw $(HOBJS) $(LIBS_h) + clean: - rm -f core *~ *.o hostapd hostapd_cli *.d driver_conf.c + rm -f core *~ *.o hostapd hostapd_cli nt_password_hash hlr_auc_gw + rm -f *.d driver_conf.c + +%.eps: %.fig + fig2dev -L eps $*.fig $*.eps + +%.png: %.fig + fig2dev -L png -m 3 $*.fig | pngtopnm | pnmscale 0.4 | pnmtopng \ + > $*.png + +docs-pics: doc/hostapd.png doc/hostapd.eps + +docs: docs-pics + doxygen doc/doxygen.full + $(MAKE) -C doc/latex + cp doc/latex/refman.pdf hostapd-devel.pdf + +docs-fast: docs-pics + doxygen doc/doxygen.fast + +clean-docs: + rm -rf doc/latex doc/html + rm -f doc/hosta.d{eps,png} hostapd-devel.pdf + +TEST_SRC_MILENAGE = milenage.c aes_wrap.c common.c os_$(CONFIG_OS).c +test-milenage: $(TEST_SRC_MILENAGE) + $(CC) -o test-milenage -Wall -Werror $(TEST_SRC_MILENAGE) \ + -DTEST_MAIN_MILENAGE -I. -I../wpa_supplicant -DINTERNAL_AES + ./test-milenage + rm test-milenage -include $(OBJS:%.o=%.d) ==== //depot/projects/wifi/contrib/hostapd/README#3 (text+ko) ==== @@ -27,13 +27,13 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA (this copy of the license is in COPYING file) -Alternatively, this software may be distributed under the terms of BSD -license: +Alternatively, this software may be distributed, used, and modified +under the terms of BSD license: Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -92,9 +92,9 @@ madwifi driver for cards based on Atheros chip set (ar521x) (http://sourceforge.net/projects/madwifi/) - Please note that you will need to modify the hostapd Makefile - to use correct path for madwifi driver root directory - (CFLAGS += -I../head line in Makefile). + Please note that you will need to add the correct path for + madwifi driver root directory in .config (see defconfig file for + an example: CFLAGS += -I) Prism54 driver for Intersil/Conexant Prism GT/Duette/Indigo (http://www.prism54.org/) @@ -158,14 +158,6 @@ device that is also used with IEEE 802.11 management frames. The frames to the Supplicant are sent using the same device. -hostapd includes a minimal colocated Authentication Server for testing -purposes. It only requests the identity of the Supplicant and -authorizes any host that is able to send a valid EAP Response -frame. This can be used for quick testing since it does not require an -external Authentication Server, but it should not be used for any real -authentication purposes since no keys are required and anyone can -authenticate. - The normal configuration of the Authenticator would use an external Authentication Server. hostapd supports RADIUS encapsulation of EAP packets, so the Authentication Server should be a RADIUS server, like ==== //depot/projects/wifi/contrib/hostapd/accounting.c#3 (text+ko) ==== @@ -1,6 +1,5 @@ /* - * Host AP (software wireless LAN access point) user space daemon for - * Host AP kernel driver / Accounting + * hostapd / RADIUS Accounting * Copyright (c) 2002-2005, Jouni Malinen * * This program is free software; you can redistribute it and/or modify @@ -13,18 +12,8 @@ * See README and COPYING for more details. */ -#include -#include -#include -#include -#include -#include -#include +#include "includes.h" #include -#include -#include -#include - #include "hostapd.h" #include "radius.h" @@ -40,7 +29,13 @@ * input/output octets and updates Acct-{Input,Output}-Gigawords. */ #define ACCT_DEFAULT_UPDATE_INTERVAL 300 -static struct radius_msg * accounting_msg(hostapd *hapd, struct sta_info *sta, +/* from ieee802_1x.c */ +const char *radius_mode_txt(struct hostapd_data *hapd); +int radius_sta_rate(struct hostapd_data *hapd, struct sta_info *sta); + + +static struct radius_msg * accounting_msg(struct hostapd_data *hapd, + struct sta_info *sta, int status_type) { struct radius_msg *msg; @@ -131,7 +126,7 @@ } snprintf(buf, sizeof(buf), RADIUS_802_1X_ADDR_FORMAT ":%s", - MAC2STR(hapd->own_addr), hapd->conf->ssid); + MAC2STR(hapd->own_addr), hapd->conf->ssid.ssid); if (!radius_msg_add_attr(msg, RADIUS_ATTR_CALLED_STATION_ID, (u8 *) buf, strlen(buf))) { printf("Could not add Called-Station-Id\n"); @@ -154,7 +149,10 @@ goto fail; } - snprintf(buf, sizeof(buf), "CONNECT 11Mbps 802.11b"); + snprintf(buf, sizeof(buf), "CONNECT %d%sMbps %s", + radius_sta_rate(hapd, sta) / 2, + (radius_sta_rate(hapd, sta) & 1) ? ".5" : "", + radius_mode_txt(hapd)); if (!radius_msg_add_attr(msg, RADIUS_ATTR_CONNECT_INFO, (u8 *) buf, strlen(buf))) { printf("Could not add Connect-Info\n"); @@ -211,7 +209,7 @@ static void accounting_interim_update(void *eloop_ctx, void *timeout_ctx) { - hostapd *hapd = eloop_ctx; + struct hostapd_data *hapd = eloop_ctx; struct sta_info *sta = timeout_ctx; int interval; @@ -229,11 +227,11 @@ } -void accounting_sta_start(hostapd *hapd, struct sta_info *sta) +void accounting_sta_start(struct hostapd_data *hapd, struct sta_info *sta) { struct radius_msg *msg; int interval; - + if (sta->acct_session_started) return; @@ -260,7 +258,8 @@ } -void accounting_sta_report(hostapd *hapd, struct sta_info *sta, int stop) +void accounting_sta_report(struct hostapd_data *hapd, struct sta_info *sta, + int stop) { struct radius_msg *msg; int cause = sta->acct_terminate_cause; @@ -360,14 +359,14 @@ } -void accounting_sta_interim(hostapd *hapd, struct sta_info *sta) +void accounting_sta_interim(struct hostapd_data *hapd, struct sta_info *sta) { if (sta->acct_session_started) accounting_sta_report(hapd, sta, 0); } -void accounting_sta_stop(hostapd *hapd, struct sta_info *sta) +void accounting_sta_stop(struct hostapd_data *hapd, struct sta_info *sta) { if (sta->acct_session_started) { accounting_sta_report(hapd, sta, 1); @@ -435,7 +434,7 @@ } -int accounting_init(hostapd *hapd) +int accounting_init(struct hostapd_data *hapd) { /* Acct-Session-Id should be unique over reboots. If reliable clock is * not available, this could be replaced with reboot counter, etc. */ @@ -451,7 +450,18 @@ } -void accounting_deinit(hostapd *hapd) +void accounting_deinit(struct hostapd_data *hapd) { accounting_report_state(hapd, 0); } + + +int accounting_reconfig(struct hostapd_data *hapd, + struct hostapd_config *oldconf) +{ + if (!hapd->radius_client_reconfigured) + return 0; + + accounting_deinit(hapd); + return accounting_init(hapd); +} ==== //depot/projects/wifi/contrib/hostapd/accounting.h#2 (text+ko) ==== @@ -1,13 +1,27 @@ +/* + * hostapd / RADIUS Accounting + * Copyright (c) 2002-2005, Jouni Malinen + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * Alternatively, this software may be distributed under the terms of BSD + * license. + * + * See README and COPYING for more details. + */ + #ifndef ACCOUNTING_H #define ACCOUNTING_H - -void accounting_sta_start(hostapd *hapd, struct sta_info *sta); -void accounting_sta_interim(hostapd *hapd, struct sta_info *sta); -void accounting_sta_stop(hostapd *hapd, struct sta_info *sta); +void accounting_sta_start(struct hostapd_data *hapd, struct sta_info *sta); +void accounting_sta_interim(struct hostapd_data *hapd, struct sta_info *sta); +void accounting_sta_stop(struct hostapd_data *hapd, struct sta_info *sta); void accounting_sta_get_id(struct hostapd_data *hapd, struct sta_info *sta); -int accounting_init(hostapd *hapd); -void accounting_deinit(hostapd *hapd); - +int accounting_init(struct hostapd_data *hapd); +void accounting_deinit(struct hostapd_data *hapd); +int accounting_reconfig(struct hostapd_data *hapd, + struct hostapd_config *oldconf); #endif /* ACCOUNTING_H */ ==== //depot/projects/wifi/contrib/hostapd/aes.c#3 (text+ko) ==== @@ -21,6 +21,8 @@ * See README and COPYING for more details. */ +#include "includes.h" + /* * rijndael-alg-fst.c * @@ -1060,7 +1062,7 @@ u32 *rk; if (len != 16) return NULL; - rk = malloc(4 * 44); + rk = os_malloc(4 * 44); if (rk == NULL) return NULL; rijndaelKeySetupEnc(rk, key); @@ -1076,7 +1078,7 @@ void aes_encrypt_deinit(void *ctx) { - free(ctx); + os_free(ctx); } @@ -1085,7 +1087,7 @@ u32 *rk; if (len != 16) return NULL; - rk = malloc(4 * 44); + rk = os_malloc(4 * 44); if (rk == NULL) return NULL; rijndaelKeySetupDec(rk, key); @@ -1101,5 +1103,5 @@ void aes_decrypt_deinit(void *ctx) { - free(ctx); + os_free(ctx); } ==== //depot/projects/wifi/contrib/hostapd/aes_wrap.c#3 (text+ko) ==== @@ -19,17 +19,18 @@ * See README and COPYING for more details. */ -#include -#include -#include +#include "includes.h" + #include "common.h" #include "aes_wrap.h" #include "crypto.h" -#ifndef EAP_TLS_FUNCS +#ifdef INTERNAL_AES #include "aes.c" -#endif /* EAP_TLS_FUNCS */ +#endif /* INTERNAL_AES */ + +#ifndef CONFIG_NO_AES_WRAP /** * aes_wrap - Wrap keys with AES Key Wrap Algorithm (128-bit KEK) (RFC3394) @@ -49,8 +50,8 @@ r = cipher + 8; /* 1) Initialize variables. */ - memset(a, 0xa6, 8); - memcpy(r, plain, 8 * n); + os_memset(a, 0xa6, 8); + os_memcpy(r, plain, 8 * n); ctx = aes_encrypt_init(kek, 16); if (ctx == NULL) @@ -66,12 +67,12 @@ for (j = 0; j <= 5; j++) { r = cipher + 8; for (i = 1; i <= n; i++) { - memcpy(b, a, 8); - memcpy(b + 8, r, 8); + os_memcpy(b, a, 8); + os_memcpy(b + 8, r, 8); aes_encrypt(ctx, b, b); - memcpy(a, b, 8); + os_memcpy(a, b, 8); a[7] ^= n * j + i; - memcpy(r, b + 8, 8); + os_memcpy(r, b + 8, 8); r += 8; } } @@ -86,7 +87,9 @@ return 0; } +#endif /* CONFIG_NO_AES_WRAP */ + /** * aes_unwrap - Unwrap key with AES Key Wrap Algorithm (128-bit KEK) (RFC3394) * @kek: Key encryption key (KEK) @@ -102,9 +105,9 @@ void *ctx; /* 1) Initialize variables. */ - memcpy(a, cipher, 8); + os_memcpy(a, cipher, 8); r = plain; - memcpy(r, cipher + 8, 8 * n); + os_memcpy(r, cipher + 8, 8 * n); ctx = aes_decrypt_init(kek, 16); if (ctx == NULL) @@ -120,13 +123,13 @@ for (j = 5; j >= 0; j--) { r = plain + (n - 1) * 8; for (i = n; i >= 1; i--) { - memcpy(b, a, 8); + os_memcpy(b, a, 8); b[7] ^= n * j + i; - memcpy(b + 8, r, 8); + os_memcpy(b + 8, r, 8); aes_decrypt(ctx, b, b); - memcpy(a, b, 8); - memcpy(r, b + 8, 8); + os_memcpy(a, b, 8); + os_memcpy(r, b + 8, 8); r -= 8; } } @@ -148,6 +151,8 @@ #define BLOCK_SIZE 16 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 9 16:44:27 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A4BF716A503; Mon, 9 Apr 2007 16:44:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DC33A16A409 for ; Mon, 9 Apr 2007 16:44:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B51F213C46E for ; Mon, 9 Apr 2007 16:44:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l39GiQsw008449 for ; Mon, 9 Apr 2007 16:44:26 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l39GiQ9u008443 for perforce@freebsd.org; Mon, 9 Apr 2007 16:44:26 GMT (envelope-from sam@freebsd.org) Date: Mon, 9 Apr 2007 16:44:26 GMT Message-Id: <200704091644.l39GiQ9u008443@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117752 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2007 16:44:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=117752 Change 117752 by sam@sam_ebb on 2007/04/09 16:44:09 removed; not used Affected files ... .. //depot/projects/wifi/contrib/hostapd/madwifi.conf#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Mon Apr 9 16:45:29 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DAEC216A406; Mon, 9 Apr 2007 16:45:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B917716A400 for ; Mon, 9 Apr 2007 16:45:28 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id ABAF313C457 for ; Mon, 9 Apr 2007 16:45:28 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l39GjSfY009544 for ; Mon, 9 Apr 2007 16:45:28 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l39GjS4Y009538 for perforce@freebsd.org; Mon, 9 Apr 2007 16:45:28 GMT (envelope-from sam@freebsd.org) Date: Mon, 9 Apr 2007 16:45:28 GMT Message-Id: <200704091645.l39GjS4Y009538@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117753 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2007 16:45:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=117753 Change 117753 by sam@sam_ebb on 2007/04/09 16:44:47 update for v0.5.7 Affected files ... .. //depot/projects/wifi/usr.sbin/wpa/hostapd/Makefile#3 edit .. //depot/projects/wifi/usr.sbin/wpa/hostapd/driver_freebsd.c#4 edit .. //depot/projects/wifi/usr.sbin/wpa/hostapd_cli/Makefile#4 edit Differences ... ==== //depot/projects/wifi/usr.sbin/wpa/hostapd/Makefile#3 (text+ko) ==== @@ -7,13 +7,20 @@ SRCS= hostapd.c eloop.c ieee802_1x.c eapol_sm.c radius.c md5.c rc4.c \ common.c ieee802_11.c config.c ieee802_11_auth.c accounting.c \ sta_info.c radius_client.c sha1.c wpa.c aes_wrap.c tls_none.c \ - ctrl_iface.c driver_conf.c l2_packet.c driver_freebsd.c + ctrl_iface.c driver_conf.c os_unix.c preauth.c pmksa_cache.c \ + beacon.c hw_features.c wme.c ap_list.c reconfig.c mlme.c \ + vlan_init.c ieee802_11h.c l2_packet.c driver_freebsd.c CLEANFILES=driver_conf.c MAN= hostapd.8 hostapd.conf.5 CFLAGS+= -I${.CURDIR} -I${HOSTAPD_DISTDIR} CFLAGS+= -DCONFIG_DRIVER_BSD +CFLAGS+= -DCONFIG_CTRL_IFACE +CFLAGS+= -DCONFIG_CTRL_IFACE_UNIX +CFLAGS+= -DINTERNAL_AES +CFLAGS+= -DINTERNAL_SHA1 +CFLAGS+= -DINTERNAL_MD5 DPADD+= ${LIBPCAP} LDADD+= -lpcap ==== //depot/projects/wifi/usr.sbin/wpa/hostapd/driver_freebsd.c#4 (text+ko) ==== @@ -55,7 +55,7 @@ static const struct driver_ops bsd_driver_ops; -static int bsd_sta_deauth(void *priv, u8 *addr, int reason_code); +static int bsd_sta_deauth(void *priv, const u8 *addr, int reason_code); static int set80211var(struct bsd_driver_data *drv, int op, const void *arg, int arg_len) @@ -130,8 +130,8 @@ { static const char *ciphernames[] = { "WEP", "TKIP", "AES-OCB", "AES-CCM", "*BAD*", "CKIP", "NONE" }; - hostapd *hapd = drv->hapd; - struct hostapd_config *conf = hapd->conf; + struct hostapd_data *hapd = drv->hapd; + struct hostapd_bss_config *conf = hapd->conf; int v; switch (conf->wpa_group) { @@ -218,7 +218,7 @@ bsd_set_iface_flags(void *priv, int dev_up) { struct bsd_driver_data *drv = priv; - hostapd *hapd = drv->hapd; + struct hostapd_data *hapd = drv->hapd; struct ifreq ifr; HOSTAPD_DEBUG(HOSTAPD_DEBUG_VERBOSE, @@ -260,11 +260,11 @@ } static int -bsd_set_ieee8021x(void *priv, int enabled) +bsd_set_ieee8021x(const char *ifname, void *priv, int enabled) { struct bsd_driver_data *drv = priv; - hostapd *hapd = drv->hapd; - struct hostapd_config *conf = hapd->conf; + struct hostapd_data *hapd = drv->hapd; + struct hostapd_bss_config *conf = hapd->conf; HOSTAPD_DEBUG(HOSTAPD_DEBUG_VERBOSE, "%s: enabled=%d\n", __func__, enabled); @@ -294,23 +294,22 @@ } static int -bsd_set_privacy(void *priv, int enabled) +bsd_set_privacy(const char *ifname, void *priv, int enabled) { struct bsd_driver_data *drv = priv; - hostapd *hapd = drv->hapd; + struct hostapd_data *hapd = drv->hapd; HOSTAPD_DEBUG(HOSTAPD_DEBUG_MINIMAL, "%s: enabled=%d\n", __func__, enabled); - return set80211param(priv, IEEE80211_IOC_PRIVACY, enabled) && - set80211param(priv, IEEE80211_IOC_DROPUNENCRYPTED, enabled); + return set80211param(priv, IEEE80211_IOC_PRIVACY, enabled); } static int -bsd_set_sta_authorized(void *priv, u8 *addr, int authorized) +bsd_set_sta_authorized(void *priv, const u8 *addr, int authorized) { struct bsd_driver_data *drv = priv; - hostapd *hapd = drv->hapd; + struct hostapd_data *hapd = drv->hapd; struct ieee80211req_mlme mlme; HOSTAPD_DEBUG(HOSTAPD_DEBUG_VERBOSE, @@ -327,10 +326,21 @@ } static int -bsd_del_key(void *priv, unsigned char *addr, int key_idx) +bsd_sta_set_flags(void *priv, const u8 *addr, int flags_or, int flags_and) +{ + /* For now, only support setting Authorized flag */ + if (flags_or & WLAN_STA_AUTHORIZED) + return bsd_set_sta_authorized(priv, addr, 1); + if (!(flags_and & WLAN_STA_AUTHORIZED)) + return bsd_set_sta_authorized(priv, addr, 0); + return 0; +} + +static int +bsd_del_key(void *priv, const unsigned char *addr, int key_idx) { struct bsd_driver_data *drv = priv; - hostapd *hapd = drv->hapd; + struct hostapd_data *hapd = drv->hapd; struct ieee80211req_del_key wk; HOSTAPD_DEBUG(HOSTAPD_DEBUG_MINIMAL, @@ -349,12 +359,12 @@ } static int -bsd_set_key(void *priv, const char *alg, - unsigned char *addr, int key_idx, - u8 *key, size_t key_len) +bsd_set_key(const char *ifname, void *priv, const char *alg, + const u8 *addr, int key_idx, + const u8 *key, size_t key_len, int txkey) { struct bsd_driver_data *drv = priv; - hostapd *hapd = drv->hapd; + struct hostapd_data *hapd = drv->hapd; struct ieee80211req_key wk; u_int8_t cipher; @@ -401,10 +411,11 @@ static int -bsd_get_seqnum(void *priv, u8 *addr, int idx, u8 *seq) +bsd_get_seqnum(const char *ifname, void *priv, const u8 *addr, int idx, + u8 *seq) { struct bsd_driver_data *drv = priv; - hostapd *hapd = drv->hapd; + struct hostapd_data *hapd = drv->hapd; struct ieee80211req_key wk; HOSTAPD_DEBUG(HOSTAPD_DEBUG_MINIMAL, @@ -441,7 +452,7 @@ static int bsd_read_sta_driver_data(void *priv, struct hostap_sta_driver_data *data, - u8 *addr) + const u8 *addr) { struct bsd_driver_data *drv = priv; struct ieee80211req_sta_stats stats; @@ -458,10 +469,10 @@ } static int -bsd_sta_clear_stats(void *priv, u8 *addr) +bsd_sta_clear_stats(void *priv, const u8 *addr) { struct bsd_driver_data *drv = priv; - hostapd *hapd = drv->hapd; + struct hostapd_data *hapd = drv->hapd; struct ieee80211req_sta_stats stats; HOSTAPD_DEBUG(HOSTAPD_DEBUG_MINIMAL, "%s: addr=%s\n", @@ -474,7 +485,7 @@ } static int -bsd_set_opt_ie(void *priv, const u8 *ie, size_t ie_len) +bsd_set_opt_ie(const char *ifname, void *priv, const u8 *ie, size_t ie_len) { /* * Do nothing; we setup parameters at startup that define the @@ -484,10 +495,10 @@ } static int -bsd_sta_deauth(void *priv, u8 *addr, int reason_code) +bsd_sta_deauth(void *priv, const u8 *addr, int reason_code) { struct bsd_driver_data *drv = priv; - hostapd *hapd = drv->hapd; + struct hostapd_data *hapd = drv->hapd; struct ieee80211req_mlme mlme; HOSTAPD_DEBUG(HOSTAPD_DEBUG_MINIMAL, @@ -501,10 +512,10 @@ } static int -bsd_sta_disassoc(void *priv, u8 *addr, int reason_code) +bsd_sta_disassoc(void *priv, const u8 *addr, int reason_code) { struct bsd_driver_data *drv = priv; - hostapd *hapd = drv->hapd; + struct hostapd_data *hapd = drv->hapd; struct ieee80211req_mlme mlme; HOSTAPD_DEBUG(HOSTAPD_DEBUG_MINIMAL, @@ -520,7 +531,7 @@ bsd_del_sta(struct bsd_driver_data *drv, u8 addr[IEEE80211_ADDR_LEN]) { struct hostapd_data *hapd = drv->hapd; - struct hostapd_config *conf = hapd->conf; + struct hostapd_bss_config *conf = hapd->conf; struct sta_info *sta; hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211, @@ -528,11 +539,11 @@ sta = ap_get_sta(hapd, addr); if (sta != NULL) { - sta->flags &= ~WLAN_STA_ASSOC; + sta->flags &= ~(WLAN_STA_AUTH | WLAN_STA_ASSOC); if (conf->wpa) - wpa_sm_event(hapd, sta, WPA_DISASSOC); + wpa_auth_sm_event(sta->wpa_sm, WPA_DISASSOC); sta->acct_terminate_cause = RADIUS_ACCT_TERMINATE_CAUSE_USER_REQUEST; - ieee802_1x_set_port_enabled(hapd, sta, 0); + ieee802_1x_notify_port_enabled(sta->eapol_sm, 0); ap_free_sta(hapd, sta); } return 0; @@ -542,7 +553,7 @@ bsd_new_sta(struct bsd_driver_data *drv, u8 addr[IEEE80211_ADDR_LEN]) { struct hostapd_data *hapd = drv->hapd; - struct hostapd_config *conf = hapd->conf; + struct hostapd_bss_config *conf = hapd->conf; struct sta_info *sta; struct ieee80211req_wpaie ie; int new_assoc, ielen, res; @@ -563,35 +574,25 @@ printf("Failed to get WPA/RSN information element.\n"); return -1; /* XXX not right */ } - ielen = ie.wpa_ie[1]; - if (ielen == 0) { + if (ie.wpa_ie[1] == 0) { printf("No WPA/RSN information element for station!\n"); return -1; /* XXX not right */ } - ielen += 2; - res = wpa_validate_wpa_ie(hapd, sta, ie.wpa_ie, ielen, - ie.wpa_ie[0] == WLAN_EID_RSN ? - HOSTAPD_WPA_VERSION_WPA2 : - HOSTAPD_WPA_VERSION_WPA); + if (sta->wpa_sm == NULL) + sta->wpa_sm = wpa_auth_sta_init(hapd->wpa_auth, + sta->addr); + if (sta->wpa_sm == NULL) { + printf("Failed to initialize WPA state machine\n"); + return -1; + } + ielen = 2 + ie.wpa_ie[1]; + res = wpa_validate_wpa_ie(hapd->wpa_auth, sta->wpa_sm, + ie.wpa_ie, ielen); if (res != WPA_IE_OK) { printf("WPA/RSN information element rejected? " "(res %u)\n", res); return -1; } - if (sta->wpa_ie != NULL) - free(sta->wpa_ie); - sta->wpa_ie = malloc(ielen); - if (sta->wpa_ie == NULL) { - printf("No memory for WPA/RSN information element!\n"); - return -1; - } - memcpy(sta->wpa_ie, ie.wpa_ie, ielen); - sta->wpa_ie_len = ielen; - } else { - if (sta->wpa_ie != NULL) - free(sta->wpa_ie); - sta->wpa_ie = NULL; - sta->wpa_ie_len = 0; } /* @@ -599,16 +600,11 @@ * kick the authenticator into action. */ new_assoc = (sta->flags & WLAN_STA_ASSOC) == 0; - sta->flags |= WLAN_STA_ASSOC; - if (new_assoc) { - if (conf->wpa) - wpa_sm_event(hapd, sta, WPA_ASSOC); - hostapd_new_assoc_sta(hapd, sta, !new_assoc); - } else { - if (conf->wpa) - wpa_sm_event(hapd, sta, WPA_REAUTH); - } + sta->flags |= WLAN_STA_AUTH | WLAN_STA_ASSOC; + wpa_auth_sm_event(sta->wpa_sm, WPA_ASSOC); + hostapd_new_assoc_sta(hapd, sta, !new_assoc); ieee802_1x_notify_port_enabled(sta->eapol_sm, 1); + return 0; } @@ -711,10 +707,11 @@ static int -bsd_send_eapol(void *priv, u8 *addr, u8 *data, size_t data_len, int encrypt) +bsd_send_eapol(void *priv, const u8 *addr, const u8 *data, size_t data_len, + int encrypt, const u8 *own_addr) { struct bsd_driver_data *drv = priv; - hostapd *hapd = drv->hapd; + struct hostapd_data *hapd = drv->hapd; unsigned char buf[3000]; unsigned char *bp = buf; struct l2_ethhdr *eth; @@ -738,12 +735,11 @@ } eth = (struct l2_ethhdr *) bp; memcpy(eth->h_dest, addr, ETH_ALEN); - memcpy(eth->h_source, drv->hapd->own_addr, ETH_ALEN); + memcpy(eth->h_source, own_addr, ETH_ALEN); eth->h_proto = htons(ETH_P_EAPOL); memcpy(eth+1, data, data_len); - if (HOSTAPD_DEBUG_COND(HOSTAPD_DEBUG_MSGDUMPS)) - hostapd_hexdump("TX EAPOL", bp, len); + wpa_hexdump(MSG_MSGDUMP, "TX EAPOL", bp, len); status = l2_packet_send(drv->sock_xmit, addr, ETH_P_EAPOL, bp, len); @@ -756,7 +752,7 @@ handle_read(void *ctx, const u8 *src_addr, const u8 *buf, size_t len) { struct bsd_driver_data *drv = ctx; - hostapd *hapd = drv->hapd; + struct hostapd_data *hapd = drv->hapd; struct sta_info *sta; sta = ap_get_sta(hapd, src_addr); @@ -771,10 +767,10 @@ } static int -bsd_get_ssid(void *priv, u8 *buf, int len) +bsd_get_ssid(const char *ifname, void *priv, u8 *buf, int len) { struct bsd_driver_data *drv = priv; - hostapd *hapd = drv->hapd; + struct hostapd_data *hapd = drv->hapd; int ssid_len = get80211var(priv, IEEE80211_IOC_SSID, buf, len); HOSTAPD_DEBUG(HOSTAPD_DEBUG_MINIMAL, "%s: ssid=\"%.*s\"\n", @@ -784,10 +780,10 @@ } static int -bsd_set_ssid(void *priv, u8 *buf, int len) +bsd_set_ssid(const char *ifname, void *priv, const u8 *buf, int len) { struct bsd_driver_data *drv = priv; - hostapd *hapd = drv->hapd; + struct hostapd_data *hapd = drv->hapd; HOSTAPD_DEBUG(HOSTAPD_DEBUG_MINIMAL, "%s: ssid=\"%.*s\"\n", __func__, len, buf); @@ -875,7 +871,7 @@ .set_generic_elem = bsd_set_opt_ie, .wireless_event_init = bsd_wireless_event_init, .wireless_event_deinit = bsd_wireless_event_deinit, - .set_sta_authorized = bsd_set_sta_authorized, + .sta_set_flags = bsd_sta_set_flags, .read_sta_data = bsd_read_sta_driver_data, .send_eapol = bsd_send_eapol, .sta_disassoc = bsd_sta_disassoc, ==== //depot/projects/wifi/usr.sbin/wpa/hostapd_cli/Makefile#4 (text+ko) ==== @@ -9,6 +9,9 @@ PROG= hostapd_cli SRCS= hostapd_cli.c wpa_ctrl.c +CFLAGS+= -DCONFIG_CTRL_IFACE +CFLAGS+= -DCONFIG_CTRL_IFACE_UNIX + MAN= hostapd_cli.8 .include From owner-p4-projects@FreeBSD.ORG Mon Apr 9 18:14:52 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9C7916A408; Mon, 9 Apr 2007 18:14:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 96DAD16A401 for ; Mon, 9 Apr 2007 18:14:51 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8681D13C489 for ; Mon, 9 Apr 2007 18:14:51 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l39IEp2j081589 for ; Mon, 9 Apr 2007 18:14:51 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l39IEK8q081480 for perforce@freebsd.org; Mon, 9 Apr 2007 18:14:20 GMT (envelope-from scottl@freebsd.org) Date: Mon, 9 Apr 2007 18:14:20 GMT Message-Id: <200704091814.l39IEK8q081480@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 117760 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2007 18:14:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=117760 Change 117760 by scottl@scottl-x64 on 2007/04/09 18:13:59 IFC Affected files ... .. //depot/projects/scottl-camlock/src/MAINTAINERS#2 integrate .. //depot/projects/scottl-camlock/src/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/Makefile.inc1#2 integrate .. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#2 integrate .. //depot/projects/scottl-camlock/src/UPDATING#2 integrate .. //depot/projects/scottl-camlock/src/bin/df/df.c#2 integrate .. //depot/projects/scottl-camlock/src/cddl/Makefile#1 branch .. //depot/projects/scottl-camlock/src/cddl/Makefile.inc#1 branch .. //depot/projects/scottl-camlock/src/cddl/lib/Makefile#1 branch .. //depot/projects/scottl-camlock/src/cddl/lib/Makefile.inc#1 branch .. //depot/projects/scottl-camlock/src/cddl/lib/libavl/Makefile#1 branch .. //depot/projects/scottl-camlock/src/cddl/lib/libnvpair/Makefile#1 branch .. //depot/projects/scottl-camlock/src/cddl/lib/libumem/Makefile#1 branch .. //depot/projects/scottl-camlock/src/cddl/lib/libuutil/Makefile#1 branch .. //depot/projects/scottl-camlock/src/cddl/lib/libzfs/Makefile#1 branch .. //depot/projects/scottl-camlock/src/cddl/lib/libzpool/Makefile#1 branch .. //depot/projects/scottl-camlock/src/cddl/sbin/Makefile#1 branch .. //depot/projects/scottl-camlock/src/cddl/sbin/Makefile.inc#1 branch .. //depot/projects/scottl-camlock/src/cddl/sbin/zfs/Makefile#1 branch .. //depot/projects/scottl-camlock/src/cddl/sbin/zpool/Makefile#1 branch .. //depot/projects/scottl-camlock/src/cddl/usr.bin/Makefile#1 branch .. //depot/projects/scottl-camlock/src/cddl/usr.bin/Makefile.inc#1 branch .. //depot/projects/scottl-camlock/src/cddl/usr.bin/ztest/Makefile#1 branch .. //depot/projects/scottl-camlock/src/cddl/usr.sbin/Makefile#1 branch .. //depot/projects/scottl-camlock/src/cddl/usr.sbin/Makefile.inc#1 branch .. //depot/projects/scottl-camlock/src/cddl/usr.sbin/zdb/Makefile#1 branch .. //depot/projects/scottl-camlock/src/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/scottl-camlock/src/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/scottl-camlock/src/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/scottl-camlock/src/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/scottl-camlock/src/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/scottl-camlock/src/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/scottl-camlock/src/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/scottl-camlock/src/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/scottl-camlock/src/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/scottl-camlock/src/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/scottl-camlock/src/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/scottl-camlock/src/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/scottl-camlock/src/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/scottl-camlock/src/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/hlfsd/hlfsd.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/binutils/gas/as.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/binutils/gas/tc.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/CHANGES#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/FREEBSD-upgrade#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/LICENSE#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/Makefile-libbz2_so#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/README#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/README.COMPILATION.PROBLEMS#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/Y2K_INFO#2 delete .. //depot/projects/scottl-camlock/src/contrib/bzip2/blocksort.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/bzip2.1#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/bzip2.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/bzip2recover.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/bzlib.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/bzlib.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/bzlib_private.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/compress.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/crctable.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/decompress.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/dlltest.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/huffman.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/manual.texi#2 delete .. //depot/projects/scottl-camlock/src/contrib/bzip2/randtable.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/sample1.bz2.uu#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/sample1.ref.gz.uu#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/sample2.bz2.uu#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/sample2.ref.gz.uu#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/sample3.bz2.uu#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/sample3.ref.gz.uu#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/spewG.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/unzcrash.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/words0#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/words2#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bzip2/words3#2 integrate .. //depot/projects/scottl-camlock/src/contrib/netcat/nc.1#2 integrate .. //depot/projects/scottl-camlock/src/contrib/netcat/netcat.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/netcat/socks.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/openpam/lib/openpam_readline.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/opensolaris/cmd/zdb/zdb.8#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/cmd/zdb/zdb.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/cmd/zfs/zfs.8#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/cmd/zpool/zpool.8#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/cmd/ztest/ztest.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/head/assert.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/head/atomic.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/head/libintl.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/head/stdio_ext.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/head/synch.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/head/thread.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libzpool/common/util.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/tcpdump/print-stp.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/tcsh/sh.lex.c#2 integrate .. //depot/projects/scottl-camlock/src/etc/defaults/periodic.conf#2 integrate .. //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#2 integrate .. //depot/projects/scottl-camlock/src/etc/devd.conf#2 integrate .. //depot/projects/scottl-camlock/src/etc/mtree/BSD.root.dist#2 integrate .. //depot/projects/scottl-camlock/src/etc/network.subr#2 integrate .. //depot/projects/scottl-camlock/src/etc/periodic/daily/404.status-zfs#1 branch .. //depot/projects/scottl-camlock/src/etc/periodic/daily/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/FILESYSTEMS#1 branch .. //depot/projects/scottl-camlock/src/etc/rc.d/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/addswap#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/adjkerntz#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/bootconf.sh#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/cleanvar#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/geli2#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/hostname#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/ip6addrctl#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/ip6fw#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/ipfilter#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/ipfw#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/ipmon#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/ipsec#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/isdnd#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/kldxref#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/mountcritremote#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/mountd#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/netif#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/nfslocking#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/pf#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/pflog#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/pfsync#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/power_profile#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/ppp#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/var#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/zfs#1 branch .. //depot/projects/scottl-camlock/src/etc/rc.firewall#2 integrate .. //depot/projects/scottl-camlock/src/games/fortune/datfiles/fortunes#2 integrate .. //depot/projects/scottl-camlock/src/games/fortune/datfiles/fortunes-o.real#2 integrate .. //depot/projects/scottl-camlock/src/include/stdio.h#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive.h.in#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_check_magic.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_entry.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_private.h#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_data_into_buffer.c#2 delete .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_data_into_fd.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_extract.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_open_memory.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_private.h#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_compression_bzip2.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_compression_compress.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_compression_gzip.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_compression_none.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_format_all.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_format_ar.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_format_iso9660.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_format_tar.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_disk.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_format_ar.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_format_ustar.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/libarchive-formats.5#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_ar.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_format_ar.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libatm/cache_key.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/amd64/stdlib/Makefile.inc#1 branch .. //depot/projects/scottl-camlock/src/lib/libc/amd64/stdlib/div.S#1 branch .. //depot/projects/scottl-camlock/src/lib/libc/amd64/stdlib/ldiv.S#1 branch .. //depot/projects/scottl-camlock/src/lib/libc/amd64/stdlib/lldiv.S#1 branch .. //depot/projects/scottl-camlock/src/lib/libc/gen/Symbol.map#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/dlfcn.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/getvfsbyname.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/valloc.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/resolv/Symbol.map#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/resolv/res_debug.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdlib/malloc.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdlib/malloc.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdlib/posix_memalign.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/lseek.2#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/pathconf.2#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/ptrace.2#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/uuid/uuid_compare.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libcrypt/crypt.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_accept_sec_context.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_add_cred.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_add_oid_set_member.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_canonicalize_name.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_display_name.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_duplicate_name.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_export_sec_context.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_import_name.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_init_sec_context.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_inquire_cred.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_names.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_utils.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libradius/radlib.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libstand/environment.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libthr/thread/thr_info.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libypclnt/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/libypclnt/ypclnt.3#2 delete .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/Symbol.map#1 branch .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/Versions.def#1 branch .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/i386/Symbol.map#1 branch .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/map_object.c#2 integrate .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/rtld.c#2 integrate .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/rtld.h#2 integrate .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/rtld_lock.c#2 integrate .. //depot/projects/scottl-camlock/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate .. //depot/projects/scottl-camlock/src/sbin/dump/traverse.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/gbde/test.sh#2 integrate .. //depot/projects/scottl-camlock/src/sbin/geom/class/journal/geom_journal.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/ggate/ggatec/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/ggate/shared/ggate.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifconfig.8#2 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifieee80211.c#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man3/pthread_cond_timedwait.3#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man3/pthread_cond_wait.3#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/if_bridge.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/man4.i386/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/man4.i386/acpi_aiboost.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/mpt.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/nfe.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/pci.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/polling.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/tcp.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/watchdog.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/src.conf.5#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man7/hier.7#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VFS_SET.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/condvar.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/lock.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/mtx_pool.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/mutex.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/rwlock.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/sema.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/sleep.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/sx.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/vhold.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/watchdog.9#2 integrate .. //depot/projects/scottl-camlock/src/share/misc/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/share/misc/committers-doc.dot#1 branch .. //depot/projects/scottl-camlock/src/share/misc/committers-ports.dot#1 branch .. //depot/projects/scottl-camlock/src/share/misc/committers-src.dot#1 branch .. //depot/projects/scottl-camlock/src/share/mk/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/share/mk/bsd.lib.mk#2 integrate .. //depot/projects/scottl-camlock/src/share/mk/bsd.libnames.mk#2 integrate .. //depot/projects/scottl-camlock/src/share/mk/bsd.own.mk#2 integrate .. //depot/projects/scottl-camlock/src/share/mk/bsd.symver.mk#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/cpu_switch.S#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/genassym.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/support.S#8 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/pcb.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/segments.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_dummy.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_locore.s#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_machdep.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_proto.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_syscall.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_sysent.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_sysvec.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/syscalls.master#13 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/uart_dev_at91usart.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/uart_cpu_sa1110.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/uart_dev_sa1110.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/uart_cpu_i80321.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/boot2/boot2.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/emac.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/getc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/memcmp.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/sd-card.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/spi_flash.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/strlen.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf#12 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot0.5/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot0.5/boot0.5.s#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot0.5/selector.s#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot0.5/start.s#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/boot.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sg.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/linprocfs/linprocfs.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_emul.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_emul.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_file.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_futex.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_util.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/kern_ndis.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/ndis_var.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_ndis.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_pe.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_filio.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#20 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#19 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.amd64#14 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.i386#14 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.ia64#11 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.pc98#13 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.powerpc#12 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options#18 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/dnlc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/atomic.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/dnlc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/vfs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_ec.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_hpet.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahb/ahb.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/arcmsr/arcmsr.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-chipset.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-dma.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-lowlevel.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata_if.m#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_lro.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/sys/mvec.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/sys/uipc_mvec.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed_pccard.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/firewire.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwohci_pci.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis_pccard.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ipmi/ipmi_pci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_library.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_library.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_pci.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_sbus.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/dev/msk/if_msk.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci_pci.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pcireg.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sio/sio_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sk/if_sk.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sk/if_skreg.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/midi.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/cmi.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/channel.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/mixer.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/streams/streams.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_bus.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_bus_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_core.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_cpu.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_cpu_amd64.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_cpu_i386.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_cpu_ia64.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_cpu_pc98.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_cpu_powerpc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_cpu_sparc64.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_dev_ns8250.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_dev_sab82532.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_dev_z8530.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_kbd_sun.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_subr.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_aue.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_axe.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_ural.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ubser.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/fs/devfs/devfs_vnops.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/fs/fdescfs/fdesc_vfsops.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/fdescfs/fdesc_vnops.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/fifofs/fifo_vnops.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/unionfs/union_subr.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/geom/eli/g_eli.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_ctl.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/geom/journal/g_journal.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/geom/uzip/g_uzip.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/support/mrlock.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/support/mrlock.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/acpica/acpi_machdep.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/identcpu.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/initcpu.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/minidump_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/support.s#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/trap.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/pmap.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/specialreg.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/vmparam.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_dummy.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_proto.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_syscall.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_sysent.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_sysvec.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/syscalls.master#16 integrate .. //depot/projects/scottl-camlock/src/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/i4b/layer1/isic/i4b_avm_a1.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/i4b/layer1/isic/i4b_isic_pnp.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/i4b/layer1/isic/i4b_itk_ix1.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/i4b/layer1/isic/i4b_tel_s016.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/i4b/layer1/isic/i4b_tel_s0163.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_descrip.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_event.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_fork.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_jail.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_lock.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_mbuf.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_mutex.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_rwlock.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sx.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_lock.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_witness.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_generic.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_mqueue.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_syscalls.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_usrreq.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_bio.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_cache.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_lookup.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_mount.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_subr.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_syscalls.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/libkern/memset.c#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/Makefile#19 integrate .. //depot/projects/scottl-camlock/src/sys/modules/cam/Makefile#9 integrate .. //depot/projects/scottl-camlock/src/sys/modules/cryptodev/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/libalias/libalias/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/zfs/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/netatm/atm_if.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_base.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_pcb.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_fw2.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_var.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias_db.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias_ftp.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias_irc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias_proxy.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias_skinny.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_asconf.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_auth.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_bsd_addr.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_constants.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_indata.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_input.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_os_bsd.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_output.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_output.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_pcb.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_pcb.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_structs.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_timer.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_uio.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_usrreq.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctputil.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_input.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_output.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_sack.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_subr.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_syncache.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_timer.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_src.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/sctp6_usrreq.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netsmb/smb_dev.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_srvsubs.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/opencrypto/cryptodev.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/conf/GENERIC#13 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/conf/NOTES#5 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/uninorth.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/extintr.c#2 delete .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_bsm_klib.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/include/smp.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/sys/_sx.h#1 branch .. //depot/projects/scottl-camlock/src/sys/sys/elf_common.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/filedesc.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/filio.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/sys/jail.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/kernel.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/sys/link_elf.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/lock.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/sys/lock_profile.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/sys/lockmgr.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/sys/mbuf.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/sys/mount.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/sys/mutex.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/sys/param.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/sys/priv.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sleepqueue.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sx.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sysent.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/systm.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/sys/unistd.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/sys/vnode.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_snapshot.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_softdep.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_vfsops.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_vnops.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_fault.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_kern.c#8 integrate .. //depot/projects/scottl-camlock/src/tools/build/mk/OptionalObsoleteFiles.inc#2 integrate .. //depot/projects/scottl-camlock/src/tools/build/options/WITHOUT_ZFS#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/netinet/ipblock/Makefile#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/netinet/ipblock/ipblock.c#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/sockets/socketpair/socketpair.c#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/multitest.t#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.b2a.out#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.c0.out#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.c1.out#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.c2.out#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.c3.out#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/54_5.3#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.sh#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/bzip2/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/bzip2/doc/Makefile#2 delete .. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendars/calendar.freebsd#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/lastcomm/lastcomm.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/lastcomm/lastcomm.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/lsvfs/lsvfs.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/passwd/passwd.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/sed/POSIX#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/sed/process.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/read.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/test/test-basic.sh#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/write.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/acpi/acpidump/acpi.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/acpi/acpidump/acpidump.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/arp/arp.4#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/gstat/gstat.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/jail/jail.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ngctl/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ntp/doc/ntpd.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/exec.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/lib.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/plist.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/url.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pstat/pstat.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pstat/pstat.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pw/cpdir.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pw/pw.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pw/pw.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pw/pw.conf.5#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pw/pw.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pw/pw_conf.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pw/pw_user.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rpc.lockd/lockd.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rpc.lockd/rpc.lockd.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rpc.statd/procs.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rpc.statd/rpc.statd.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rpc.statd/statd.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sa/pdb.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/config.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/index.c#2 integrate Differences ... ==== //depot/projects/scottl-camlock/src/MAINTAINERS#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.142 2006/11/11 22:24:10 kris Exp $ +$FreeBSD: src/MAINTAINERS,v 1.143 2007/04/06 10:57:15 pjd Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -108,6 +108,7 @@ geom_stripe pjd Pre-commit review preferred. geom_zero pjd Pre-commit review preferred. sbin/geom pjd Pre-commit review preferred. +zfs pjd Pre-commit review preferred. nfs alfred Will be happy to review code, but not mandatory. rpc.lockd alfred Will be happy to review code, but not mandatory. truss alfred Will be happy to review code, but not mandatory. ==== //depot/projects/scottl-camlock/src/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.339 2006/11/28 01:03:29 ru Exp $ +# $FreeBSD: src/Makefile,v 1.340 2007/04/02 21:32:44 marcel Exp $ # # The user-driven targets are: # @@ -261,12 +261,14 @@ # existing system is. # .if make(universe) +TARGETS?=amd64 arm i386 ia64 pc98 powerpc sparc64 sun4v + universe: universe_prologue universe_prologue: @echo "--------------------------------------------------------------" @echo ">>> make universe started on ${STARTTIME}" @echo "--------------------------------------------------------------" -.for target in amd64 arm i386 ia64 pc98 powerpc sparc64 sun4v +.for target in ${TARGETS} KERNCONFS!= cd ${.CURDIR}/sys/${target}/conf && \ find [A-Z]*[A-Z] -type f -maxdepth 0 \ ! -name DEFAULTS ! -name LINT ==== //depot/projects/scottl-camlock/src/Makefile.inc1#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.570 2007/03/09 12:11:56 rafan Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.571 2007/04/06 02:13:29 pjd Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -40,6 +40,9 @@ .if ${MK_GAMES} != "no" SUBDIR+=games .endif +.if ${MK_CDDL} != "no" +SUBDIR+=cddl +.endif SUBDIR+=gnu include .if ${MK_KERBEROS} != "no" SUBDIR+=kerberos5 @@ -430,6 +433,9 @@ .for _t in obj includes cd ${.CURDIR}/include; ${LIB32WMAKE} ${_t} cd ${.CURDIR}/lib; ${LIB32WMAKE} ${_t} +.if ${MK_CDDL} != "no" + cd ${.CURDIR}/cddl/lib; ${LIB32WMAKE} ${_t} +.endif cd ${.CURDIR}/gnu/lib; ${LIB32WMAKE} ${_t} .if ${MK_CRYPT} != "no" cd ${.CURDIR}/secure/lib; ${LIB32WMAKE} ${_t} @@ -1014,12 +1020,16 @@ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ - ${_secure_lib_libssl} + ${_secure_lib_libssl} lib/libthr -_generic_libs= gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib +_generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib lib/libopie__L lib/libtacplus__L: lib/libmd__L +.if ${MK_CDDL} != "no" +_cddl_lib= cddl/lib +.endif + .if ${MK_CRYPT} != "no" .if ${MK_OPENSSL} != "no" _secure_lib_libcrypto= secure/lib/libcrypto ==== //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.76 2007/03/19 11:15:53 delphij Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.77 2007/03/28 07:49:57 delphij Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070328: bzip2 1.0.4 +OLD_FILES+=usr/share/info/bzip2.info.gz # 20070303: libarchive 2.0 OLD_LIBS+=usr/lib/libarchive.so.3 # 20070301: remove addr2ascii and ascii2addr ==== //depot/projects/scottl-camlock/src/UPDATING#2 (text+ko) ==== @@ -24,8 +24,9 @@ 20070302: Firmwares for ipw(4) and iwi(4) are now included in the base tree. In order to use them one must agree to the respective LICENSE in - share/doc/legal and define legal..license_ack=1 via - loader.conf(5) or kenv(1). + share/doc/legal and define legal.intel_.license_ack=1 via + loader.conf(5) or kenv(1). Make sure to deinstall the now + deprecated modules from the respective firmware ports. 20070228: The name resolution/mapping functions addr2ascii(3) and ascii2addr(3) @@ -757,4 +758,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.482 2007/03/02 14:56:15 flz Exp $ +$FreeBSD: src/UPDATING,v 1.484 2007/04/03 10:04:54 brueffer Exp $ ==== //depot/projects/scottl-camlock/src/bin/df/df.c#2 (text+ko) ==== @@ -44,7 +44,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.67 2007/03/08 06:10:17 will Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.68 2007/04/06 15:36:43 kan Exp $"); #include #include @@ -384,7 +384,7 @@ static void prtstat(struct statfs *sfsp, struct maxwidths *mwp) { - static u_long blocksize; + static long blocksize; static int headerlen, timesthrough = 0; static const char *header; int64_t used, availblks, inodes; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 9 18:50:37 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 12FFA16A405; Mon, 9 Apr 2007 18:50:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BCE6716A400 for ; Mon, 9 Apr 2007 18:50:36 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id AADE413C4C4 for ; Mon, 9 Apr 2007 18:50:36 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l39Ioap2086750 for ; Mon, 9 Apr 2007 18:50:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l39Ik7lW086456 for perforce@freebsd.org; Mon, 9 Apr 2007 18:46:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 9 Apr 2007 18:46:07 GMT Message-Id: <200704091846.l39Ik7lW086456@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 117762 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2007 18:50:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=117762 Change 117762 by rwatson@rwatson_cinnamon_afs on 2007/04/09 18:41:20 Integrate Arla work branch. Affected files ... .. //depot/projects/arla/COPYRIGHT#2 integrate .. //depot/projects/arla/MAINTAINERS#2 integrate .. //depot/projects/arla/Makefile#2 integrate .. //depot/projects/arla/Makefile.inc1#2 integrate .. //depot/projects/arla/ObsoleteFiles.inc#2 integrate .. //depot/projects/arla/README#2 integrate .. //depot/projects/arla/UPDATING#2 integrate .. //depot/projects/arla/bin/cat/cat.1#2 integrate .. //depot/projects/arla/bin/chmod/chmod.1#2 integrate .. //depot/projects/arla/bin/cp/cp.1#2 integrate .. //depot/projects/arla/bin/cp/cp.c#2 integrate .. //depot/projects/arla/bin/cp/extern.h#2 integrate .. //depot/projects/arla/bin/cp/utils.c#2 integrate .. //depot/projects/arla/bin/csh/config.h#2 integrate .. //depot/projects/arla/bin/csh/config_p.h#2 integrate .. //depot/projects/arla/bin/date/netdate.c#2 integrate .. //depot/projects/arla/bin/dd/Makefile#2 integrate .. //depot/projects/arla/bin/df/df.1#2 integrate .. //depot/projects/arla/bin/df/df.c#2 integrate .. //depot/projects/arla/bin/domainname/domainname.1#2 integrate .. //depot/projects/arla/bin/ed/main.c#2 integrate .. //depot/projects/arla/bin/expr/expr.1#2 integrate .. //depot/projects/arla/bin/expr/expr.y#2 integrate .. //depot/projects/arla/bin/getfacl/getfacl.1#2 integrate .. //depot/projects/arla/bin/hostname/hostname.1#2 integrate .. //depot/projects/arla/bin/hostname/hostname.c#2 integrate .. //depot/projects/arla/bin/kill/kill.1#2 integrate .. //depot/projects/arla/bin/ls/ls.1#2 integrate .. //depot/projects/arla/bin/ls/print.c#2 integrate .. //depot/projects/arla/bin/mkdir/mkdir.1#2 integrate .. //depot/projects/arla/bin/mkdir/mkdir.c#2 integrate .. //depot/projects/arla/bin/pax/cpio.c#2 integrate .. //depot/projects/arla/bin/pax/pax.1#2 integrate .. //depot/projects/arla/bin/pax/tar.c#2 integrate .. //depot/projects/arla/bin/ps/ps.1#2 integrate .. //depot/projects/arla/bin/rcp/rcp.1#2 integrate .. //depot/projects/arla/bin/rm/rm.1#2 integrate .. //depot/projects/arla/bin/rm/rm.c#2 integrate .. //depot/projects/arla/bin/rmdir/rmdir.1#2 integrate .. //depot/projects/arla/bin/setfacl/setfacl.1#2 integrate .. //depot/projects/arla/bin/setfacl/setfacl.c#2 integrate .. //depot/projects/arla/bin/sh/cd.c#2 integrate .. //depot/projects/arla/bin/sh/eval.c#2 integrate .. //depot/projects/arla/bin/sh/exec.c#2 integrate .. //depot/projects/arla/bin/sh/expand.c#2 integrate .. //depot/projects/arla/bin/sh/histedit.c#2 integrate .. //depot/projects/arla/bin/sh/jobs.c#2 integrate .. //depot/projects/arla/bin/sh/jobs.h#2 integrate .. //depot/projects/arla/bin/sh/main.c#2 integrate .. //depot/projects/arla/bin/sh/parser.c#2 integrate .. //depot/projects/arla/bin/sh/parser.h#2 integrate .. //depot/projects/arla/bin/sh/sh.1#2 integrate .. //depot/projects/arla/bin/sh/var.c#2 integrate .. //depot/projects/arla/bin/sh/var.h#2 integrate .. //depot/projects/arla/bin/test/test.1#2 integrate .. //depot/projects/arla/cddl/Makefile#1 branch .. //depot/projects/arla/cddl/Makefile.inc#1 branch .. //depot/projects/arla/cddl/lib/Makefile#1 branch .. //depot/projects/arla/cddl/lib/Makefile.inc#1 branch .. //depot/projects/arla/cddl/lib/libavl/Makefile#1 branch .. //depot/projects/arla/cddl/lib/libnvpair/Makefile#1 branch .. //depot/projects/arla/cddl/lib/libumem/Makefile#1 branch .. //depot/projects/arla/cddl/lib/libuutil/Makefile#1 branch .. //depot/projects/arla/cddl/lib/libzfs/Makefile#1 branch .. //depot/projects/arla/cddl/lib/libzpool/Makefile#1 branch .. //depot/projects/arla/cddl/sbin/Makefile#1 branch .. //depot/projects/arla/cddl/sbin/Makefile.inc#1 branch .. //depot/projects/arla/cddl/sbin/zfs/Makefile#1 branch .. //depot/projects/arla/cddl/sbin/zpool/Makefile#1 branch .. //depot/projects/arla/cddl/usr.bin/Makefile#1 branch .. //depot/projects/arla/cddl/usr.bin/Makefile.inc#1 branch .. //depot/projects/arla/cddl/usr.bin/ztest/Makefile#1 branch .. //depot/projects/arla/cddl/usr.sbin/Makefile#1 branch .. //depot/projects/arla/cddl/usr.sbin/Makefile.inc#1 branch .. //depot/projects/arla/cddl/usr.sbin/zdb/Makefile#1 branch .. //depot/projects/arla/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/arla/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/arla/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/arla/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/arla/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/arla/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/arla/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/arla/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/arla/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/arla/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/arla/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/arla/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/arla/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/arla/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/arla/contrib/amd/hlfsd/hlfsd.h#2 integrate .. //depot/projects/arla/contrib/bind9/CHANGES#2 integrate .. //depot/projects/arla/contrib/bind9/COPYRIGHT#2 integrate .. //depot/projects/arla/contrib/bind9/FAQ#2 integrate .. //depot/projects/arla/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/arla/contrib/bind9/Makefile.in#2 integrate .. //depot/projects/arla/contrib/bind9/README#2 integrate .. //depot/projects/arla/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/arla/contrib/bind9/bin/check/named-checkconf.c#2 integrate .. //depot/projects/arla/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/arla/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/arla/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/arla/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/arla/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/arla/contrib/bind9/bin/dig/dig.c#2 integrate .. //depot/projects/arla/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/arla/contrib/bind9/bin/dig/dighost.c#2 integrate .. //depot/projects/arla/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/arla/contrib/bind9/bin/dig/host.c#2 integrate .. //depot/projects/arla/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/arla/contrib/bind9/bin/dig/include/dig/dig.h#2 integrate .. //depot/projects/arla/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/arla/contrib/bind9/bin/dig/nslookup.c#2 integrate .. //depot/projects/arla/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/arla/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/arla/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/arla/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/arla/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/arla/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate .. //depot/projects/arla/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/aclconf.c#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/client.c#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/config.c#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/controlconf.c#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/include/named/aclconf.h#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/include/named/client.h#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/include/named/config.h#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/include/named/control.h#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/include/named/globals.h#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/include/named/logconf.h#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/include/named/lwresd.h#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/include/named/server.h#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/include/named/sortlist.h#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/include/named/tkeyconf.h#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/include/named/tsigconf.h#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/include/named/zoneconf.h#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/interfacemgr.c#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/logconf.c#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/lwdgabn.c#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/lwdgrbn.c#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/lwresd.c#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/main.c#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/named.conf.5#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/named.conf.docbook#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/named.conf.html#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/server.c#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/sortlist.c#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/tkeyconf.c#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/tsigconf.c#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/unix/os.c#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/update.c#2 integrate .. //depot/projects/arla/contrib/bind9/bin/named/zoneconf.c#2 integrate .. //depot/projects/arla/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate .. //depot/projects/arla/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/arla/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/arla/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate .. //depot/projects/arla/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate .. //depot/projects/arla/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/arla/contrib/bind9/bin/rndc/rndc.c#2 integrate .. //depot/projects/arla/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/arla/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/arla/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/arla/contrib/bind9/config.threads.in#2 integrate .. //depot/projects/arla/contrib/bind9/configure.in#2 integrate .. //depot/projects/arla/contrib/bind9/doc/arm/Bv9ARM-book.xml#2 integrate .. //depot/projects/arla/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/arla/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/arla/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate .. //depot/projects/arla/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate .. //depot/projects/arla/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate .. //depot/projects/arla/contrib/bind9/doc/arm/Bv9ARM.ch06.html#2 integrate .. //depot/projects/arla/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate .. //depot/projects/arla/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate .. //depot/projects/arla/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate .. //depot/projects/arla/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate .. //depot/projects/arla/contrib/bind9/doc/arm/Bv9ARM.pdf#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/Makefile.in#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/api#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/config.h.in#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/configure#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/configure.in#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/dst/dst_api.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/include/isc/list.h#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/include/netdb.h#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/inet/inet_net_ntop.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/irs/dns.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/irs/gai_strerror.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/irs/gen_ho.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/irs/gethostent.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/irs/getnameinfo.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/irs/getprotoent_r.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/irs/getservent_r.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/irs/irp.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/irs/irp_nw.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/irs/irpmarshall.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/irs/irs_data.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/irs/lcl_ho.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/irs/lcl_pr.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/isc/eventlib.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/isc/eventlib_p.h#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/isc/heap.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/isc/hex.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/isc/memcluster.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/nameser/ns_sign.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/port_after.h.in#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/port_before.h.in#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/resolv/mtctxres.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind9/api#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind9/check.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/bind9/include/bind9/check.h#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/Makefile.in#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/acl.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/adb.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/api#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/cache.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/compress.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/dispatch.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/dnssec.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/dst_api.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/gen.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/include/dns/acl.h#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/include/dns/cache.h#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/include/dns/compress.h#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/include/dns/keytable.h#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/include/dns/message.h#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/include/dns/name.h#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/include/dns/peer.h#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/include/dns/resolver.h#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/include/dns/types.h#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/include/dns/xfrin.h#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/include/dns/zone.h#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/keytable.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/lookup.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/masterdump.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/name.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/openssl_link.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/openssldh_link.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/opensslrsa_link.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/peer.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/portlist.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/rdata.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#1 branch .. //depot/projects/arla/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#1 branch .. //depot/projects/arla/contrib/bind9/lib/dns/rdata/generic/dlv_65323.c#2 delete .. //depot/projects/arla/contrib/bind9/lib/dns/rdata/generic/dlv_65323.h#2 delete .. //depot/projects/arla/contrib/bind9/lib/dns/rdataset.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/request.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/resolver.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/tcpmsg.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/tkey.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/validator.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/xfrin.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/dns/zone.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/isc/api#2 integrate .. //depot/projects/arla/contrib/bind9/lib/isc/hash.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/isc/heap.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/isc/hmacmd5.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/isc/include/isc/heap.h#2 integrate .. //depot/projects/arla/contrib/bind9/lib/isc/include/isc/list.h#2 integrate .. //depot/projects/arla/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate .. //depot/projects/arla/contrib/bind9/lib/isc/include/isc/symtab.h#2 integrate .. //depot/projects/arla/contrib/bind9/lib/isc/lex.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/isc/log.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/isc/netscope.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/isc/nothreads/condition.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/isc/nothreads/mutex.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/isc/print.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/isc/sockaddr.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/isc/taskpool.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/isc/timer.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/isc/unix/entropy.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/isc/unix/fsaccess.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/isc/unix/ipv6.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/isc/unix/socket.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/isccc/api#2 integrate .. //depot/projects/arla/contrib/bind9/lib/isccfg/include/isccfg/cfg.h#2 integrate .. //depot/projects/arla/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#2 integrate .. //depot/projects/arla/contrib/bind9/lib/isccfg/namedconf.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/isccfg/parser.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/api#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/gai_strerror.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/lwconfig.c#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres.3#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres.html#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate .. //depot/projects/arla/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate .. //depot/projects/arla/contrib/bind9/libtool.m4#2 integrate .. //depot/projects/arla/contrib/bind9/ltmain.sh#2 integrate .. //depot/projects/arla/contrib/bind9/make/rules.in#2 integrate .. //depot/projects/arla/contrib/bind9/version#2 integrate .. //depot/projects/arla/contrib/binutils/bfd/elf64-sparc.c#2 integrate .. //depot/projects/arla/contrib/binutils/gas/as.h#2 integrate .. //depot/projects/arla/contrib/binutils/gas/tc.h#2 integrate .. //depot/projects/arla/contrib/bsnmp/NEWS#2 integrate .. //depot/projects/arla/contrib/bsnmp/gensnmpdef/gensnmpdef.1#2 integrate .. //depot/projects/arla/contrib/bsnmp/gensnmpdef/gensnmpdef.c#2 integrate .. //depot/projects/arla/contrib/bsnmp/gensnmptree/gensnmptree.1#2 integrate .. //depot/projects/arla/contrib/bsnmp/gensnmptree/gensnmptree.c#2 integrate .. //depot/projects/arla/contrib/bsnmp/snmp_mibII/mibII.c#2 integrate .. //depot/projects/arla/contrib/bsnmp/snmpd/action.c#2 integrate .. //depot/projects/arla/contrib/bsnmp/snmpd/tree.def#2 integrate .. //depot/projects/arla/contrib/bzip2/CHANGES#2 integrate .. //depot/projects/arla/contrib/bzip2/FREEBSD-upgrade#2 integrate .. //depot/projects/arla/contrib/bzip2/LICENSE#2 integrate .. //depot/projects/arla/contrib/bzip2/Makefile#2 integrate .. //depot/projects/arla/contrib/bzip2/Makefile-libbz2_so#2 integrate .. //depot/projects/arla/contrib/bzip2/README#2 integrate .. //depot/projects/arla/contrib/bzip2/README.COMPILATION.PROBLEMS#2 integrate .. //depot/projects/arla/contrib/bzip2/Y2K_INFO#2 delete .. //depot/projects/arla/contrib/bzip2/blocksort.c#2 integrate .. //depot/projects/arla/contrib/bzip2/bzip2.1#2 integrate .. //depot/projects/arla/contrib/bzip2/bzip2.c#2 integrate .. //depot/projects/arla/contrib/bzip2/bzip2recover.c#2 integrate .. //depot/projects/arla/contrib/bzip2/bzlib.c#2 integrate .. //depot/projects/arla/contrib/bzip2/bzlib.h#2 integrate .. //depot/projects/arla/contrib/bzip2/bzlib_private.h#2 integrate .. //depot/projects/arla/contrib/bzip2/compress.c#2 integrate .. //depot/projects/arla/contrib/bzip2/crctable.c#2 integrate .. //depot/projects/arla/contrib/bzip2/decompress.c#2 integrate .. //depot/projects/arla/contrib/bzip2/dlltest.c#2 integrate .. //depot/projects/arla/contrib/bzip2/huffman.c#2 integrate .. //depot/projects/arla/contrib/bzip2/manual.texi#2 delete .. //depot/projects/arla/contrib/bzip2/randtable.c#2 integrate .. //depot/projects/arla/contrib/bzip2/sample1.bz2.uu#2 integrate .. //depot/projects/arla/contrib/bzip2/sample1.ref.gz.uu#2 integrate .. //depot/projects/arla/contrib/bzip2/sample2.bz2.uu#2 integrate .. //depot/projects/arla/contrib/bzip2/sample2.ref.gz.uu#2 integrate .. //depot/projects/arla/contrib/bzip2/sample3.bz2.uu#2 integrate .. //depot/projects/arla/contrib/bzip2/sample3.ref.gz.uu#2 integrate .. //depot/projects/arla/contrib/bzip2/spewG.c#2 integrate .. //depot/projects/arla/contrib/bzip2/unzcrash.c#2 integrate .. //depot/projects/arla/contrib/bzip2/words0#2 integrate .. //depot/projects/arla/contrib/bzip2/words2#2 integrate .. //depot/projects/arla/contrib/bzip2/words3#2 integrate .. //depot/projects/arla/contrib/com_err/compile_et.1#2 integrate .. //depot/projects/arla/contrib/cvs/src/log.c#2 integrate .. //depot/projects/arla/contrib/file/ChangeLog#2 integrate .. //depot/projects/arla/contrib/file/FREEBSD-upgrade#2 integrate .. //depot/projects/arla/contrib/file/Magdir/adventure#2 integrate .. //depot/projects/arla/contrib/file/Magdir/amigaos#2 integrate .. //depot/projects/arla/contrib/file/Magdir/animation#2 integrate .. //depot/projects/arla/contrib/file/Magdir/apple#2 integrate .. //depot/projects/arla/contrib/file/Magdir/archive#2 integrate .. //depot/projects/arla/contrib/file/Magdir/audio#2 integrate .. //depot/projects/arla/contrib/file/Magdir/basis#1 branch .. //depot/projects/arla/contrib/file/Magdir/bflt#1 branch .. //depot/projects/arla/contrib/file/Magdir/bout#2 integrate .. //depot/projects/arla/contrib/file/Magdir/btsnoop#1 branch .. //depot/projects/arla/contrib/file/Magdir/c64#2 integrate .. //depot/projects/arla/contrib/file/Magdir/cad#2 integrate .. //depot/projects/arla/contrib/file/Magdir/commands#2 integrate .. //depot/projects/arla/contrib/file/Magdir/compress#2 integrate .. //depot/projects/arla/contrib/file/Magdir/console#2 integrate .. //depot/projects/arla/contrib/file/Magdir/cracklib#1 branch .. //depot/projects/arla/contrib/file/Magdir/ctags#2 integrate .. //depot/projects/arla/contrib/file/Magdir/database#2 integrate .. //depot/projects/arla/contrib/file/Magdir/diff#2 integrate .. //depot/projects/arla/contrib/file/Magdir/digital#2 integrate .. //depot/projects/arla/contrib/file/Magdir/dump#2 integrate .. //depot/projects/arla/contrib/file/Magdir/elf#2 integrate .. //depot/projects/arla/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/arla/contrib/file/Magdir/flash#2 integrate .. //depot/projects/arla/contrib/file/Magdir/fsav#2 integrate .. //depot/projects/arla/contrib/file/Magdir/gnu#2 integrate .. //depot/projects/arla/contrib/file/Magdir/iff#2 integrate .. //depot/projects/arla/contrib/file/Magdir/images#2 integrate .. //depot/projects/arla/contrib/file/Magdir/java#2 integrate .. //depot/projects/arla/contrib/file/Magdir/linux#2 integrate .. //depot/projects/arla/contrib/file/Magdir/lisp#2 integrate .. //depot/projects/arla/contrib/file/Magdir/mach#2 integrate .. //depot/projects/arla/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/arla/contrib/file/Magdir/mail.news#2 integrate .. //depot/projects/arla/contrib/file/Magdir/maple#2 integrate .. //depot/projects/arla/contrib/file/Magdir/misctools#2 integrate .. //depot/projects/arla/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/arla/contrib/file/Magdir/mup#1 branch .. //depot/projects/arla/contrib/file/Magdir/ncr#2 integrate .. //depot/projects/arla/contrib/file/Magdir/perl#2 integrate .. //depot/projects/arla/contrib/file/Magdir/printer#2 integrate .. //depot/projects/arla/contrib/file/Magdir/psion#2 integrate .. //depot/projects/arla/contrib/file/Magdir/python#2 integrate .. //depot/projects/arla/contrib/file/Magdir/riff#2 integrate .. //depot/projects/arla/contrib/file/Magdir/scientific#1 branch .. //depot/projects/arla/contrib/file/Magdir/sgi#2 integrate .. //depot/projects/arla/contrib/file/Magdir/sharc#2 integrate .. //depot/projects/arla/contrib/file/Magdir/sql#2 integrate .. //depot/projects/arla/contrib/file/Magdir/varied.out#2 integrate .. //depot/projects/arla/contrib/file/Magdir/wordprocessors#2 integrate .. //depot/projects/arla/contrib/file/Makefile.am#2 integrate .. //depot/projects/arla/contrib/file/Makefile.in#2 integrate .. //depot/projects/arla/contrib/file/aclocal.m4#2 integrate .. //depot/projects/arla/contrib/file/apprentice.c#2 integrate .. //depot/projects/arla/contrib/file/ascmagic.c#2 integrate .. //depot/projects/arla/contrib/file/compress.c#2 integrate .. //depot/projects/arla/contrib/file/config.h.in#2 integrate .. //depot/projects/arla/contrib/file/configure#2 integrate .. //depot/projects/arla/contrib/file/configure.in#2 integrate .. //depot/projects/arla/contrib/file/file.c#2 integrate .. //depot/projects/arla/contrib/file/file.h#2 integrate .. //depot/projects/arla/contrib/file/file.man#2 integrate .. //depot/projects/arla/contrib/file/fsmagic.c#2 integrate .. //depot/projects/arla/contrib/file/funcs.c#2 integrate .. //depot/projects/arla/contrib/file/libmagic.man#2 integrate .. //depot/projects/arla/contrib/file/magic.c#2 integrate .. //depot/projects/arla/contrib/file/magic.man#2 integrate .. //depot/projects/arla/contrib/file/magic.mime#2 integrate .. //depot/projects/arla/contrib/file/magic2mime#2 integrate .. //depot/projects/arla/contrib/file/patchlevel.h#2 integrate .. //depot/projects/arla/contrib/file/print.c#2 integrate .. //depot/projects/arla/contrib/file/readelf.c#2 integrate .. //depot/projects/arla/contrib/file/readelf.h#2 integrate .. //depot/projects/arla/contrib/file/softmagic.c#2 integrate .. //depot/projects/arla/contrib/gcc/ChangeLog#2 integrate .. //depot/projects/arla/contrib/gcc/ansidecl.h#2 integrate .. //depot/projects/arla/contrib/gcc/builtins.c#2 integrate .. //depot/projects/arla/contrib/gcc/c-common.c#2 integrate .. //depot/projects/arla/contrib/gcc/c-common.h#2 integrate .. //depot/projects/arla/contrib/gcc/c-decl.c#2 integrate .. //depot/projects/arla/contrib/gcc/c-objc-common.c#2 integrate .. //depot/projects/arla/contrib/gcc/c-pch.c#2 integrate .. //depot/projects/arla/contrib/gcc/c-typeck.c#2 integrate .. //depot/projects/arla/contrib/gcc/cccp.1#2 delete .. //depot/projects/arla/contrib/gcc/cfgcleanup.c#2 integrate .. //depot/projects/arla/contrib/gcc/combine.c#2 integrate .. //depot/projects/arla/contrib/gcc/config.gcc#2 integrate .. //depot/projects/arla/contrib/gcc/config.host#2 integrate .. //depot/projects/arla/contrib/gcc/config.in#2 integrate .. //depot/projects/arla/contrib/gcc/config/alpha/alpha.c#2 integrate .. //depot/projects/arla/contrib/gcc/config/alpha/alpha.md#2 integrate .. //depot/projects/arla/contrib/gcc/config/arm/arm-protos.h#2 integrate .. //depot/projects/arla/contrib/gcc/config/arm/arm.c#2 integrate .. //depot/projects/arla/contrib/gcc/config/arm/arm.md#2 integrate .. //depot/projects/arla/contrib/gcc/config/host-linux.c#1 branch .. //depot/projects/arla/contrib/gcc/config/host-solaris.c#1 branch .. //depot/projects/arla/contrib/gcc/config/i386/i386.c#2 integrate .. //depot/projects/arla/contrib/gcc/config/i386/i386.md#2 integrate .. //depot/projects/arla/contrib/gcc/config/ia64/hpux.h#2 integrate .. //depot/projects/arla/contrib/gcc/config/rs6000/aix51.h#2 integrate .. //depot/projects/arla/contrib/gcc/config/rs6000/host-darwin.c#2 integrate .. //depot/projects/arla/contrib/gcc/config/rs6000/linux64.h#2 integrate .. //depot/projects/arla/contrib/gcc/config/rs6000/rs6000-protos.h#2 integrate .. //depot/projects/arla/contrib/gcc/config/rs6000/rs6000.c#2 integrate .. //depot/projects/arla/contrib/gcc/config/rs6000/rs6000.h#2 integrate .. //depot/projects/arla/contrib/gcc/config/rs6000/rs6000.md#2 integrate .. //depot/projects/arla/contrib/gcc/config/rs6000/sysv4.h#2 integrate .. //depot/projects/arla/contrib/gcc/config/sparc/gmon-sol2.c#2 integrate .. //depot/projects/arla/contrib/gcc/config/sparc/sol2-gas-bi.h#2 integrate .. //depot/projects/arla/contrib/gcc/config/sparc/sol2.h#2 integrate .. //depot/projects/arla/contrib/gcc/config/sparc/sparc.c#2 integrate .. //depot/projects/arla/contrib/gcc/config/sparc/sparc.h#2 integrate .. //depot/projects/arla/contrib/gcc/config/x-linux#1 branch .. //depot/projects/arla/contrib/gcc/config/x-solaris#1 branch .. //depot/projects/arla/contrib/gcc/configure#2 integrate .. //depot/projects/arla/contrib/gcc/configure.ac#2 integrate .. //depot/projects/arla/contrib/gcc/coverage.c#2 integrate .. //depot/projects/arla/contrib/gcc/cp/ChangeLog#2 integrate .. //depot/projects/arla/contrib/gcc/cp/call.c#2 integrate .. //depot/projects/arla/contrib/gcc/cp/class.c#2 integrate .. //depot/projects/arla/contrib/gcc/cp/cp-tree.def#2 integrate .. //depot/projects/arla/contrib/gcc/cp/cp-tree.h#2 integrate .. //depot/projects/arla/contrib/gcc/cp/cvt.c#2 integrate .. //depot/projects/arla/contrib/gcc/cp/decl.c#2 integrate .. //depot/projects/arla/contrib/gcc/cp/decl2.c#2 integrate .. //depot/projects/arla/contrib/gcc/cp/error.c#2 integrate .. //depot/projects/arla/contrib/gcc/cp/init.c#2 integrate .. //depot/projects/arla/contrib/gcc/cp/lex.c#2 integrate .. //depot/projects/arla/contrib/gcc/cp/method.c#2 integrate .. //depot/projects/arla/contrib/gcc/cp/name-lookup.c#2 integrate .. //depot/projects/arla/contrib/gcc/cp/name-lookup.h#2 integrate .. //depot/projects/arla/contrib/gcc/cp/parser.c#2 integrate .. //depot/projects/arla/contrib/gcc/cp/pt.c#2 integrate .. //depot/projects/arla/contrib/gcc/cp/search.c#2 integrate .. //depot/projects/arla/contrib/gcc/cp/semantics.c#2 integrate .. //depot/projects/arla/contrib/gcc/cp/typeck.c#2 integrate .. //depot/projects/arla/contrib/gcc/cpp.1#2 delete .. //depot/projects/arla/contrib/gcc/cppfiles.c#2 integrate .. //depot/projects/arla/contrib/gcc/cpphash.h#2 integrate .. //depot/projects/arla/contrib/gcc/cppinit.c#2 integrate .. //depot/projects/arla/contrib/gcc/cse.c#2 integrate .. //depot/projects/arla/contrib/gcc/doc/contrib.texi#2 integrate .. //depot/projects/arla/contrib/gcc/doc/cpp.1#2 integrate .. //depot/projects/arla/contrib/gcc/doc/gcc.1#2 integrate .. //depot/projects/arla/contrib/gcc/doc/gcov.1#2 integrate .. //depot/projects/arla/contrib/gcc/doc/hostconfig.texi#2 integrate .. //depot/projects/arla/contrib/gcc/doc/include/gcc-common.texi#2 integrate .. //depot/projects/arla/contrib/gcc/doc/invoke.texi#2 integrate .. //depot/projects/arla/contrib/gcc/expmed.c#2 integrate .. //depot/projects/arla/contrib/gcc/f/ChangeLog#2 integrate .. //depot/projects/arla/contrib/gcc/f/g77.texi#2 integrate .. //depot/projects/arla/contrib/gcc/f/g77spec.c#2 integrate .. //depot/projects/arla/contrib/gcc/flow.c#2 integrate .. //depot/projects/arla/contrib/gcc/fold-const.c#2 integrate .. //depot/projects/arla/contrib/gcc/function.c#2 integrate .. //depot/projects/arla/contrib/gcc/gcc.1#2 delete .. //depot/projects/arla/contrib/gcc/gcc.c#2 integrate .. //depot/projects/arla/contrib/gcc/gcov-dump.c#2 integrate .. //depot/projects/arla/contrib/gcc/gcov.c#2 integrate .. //depot/projects/arla/contrib/gcc/gcse.c#2 integrate .. //depot/projects/arla/contrib/gcc/ggc-common.c#2 integrate .. //depot/projects/arla/contrib/gcc/global.c#2 integrate .. //depot/projects/arla/contrib/gcc/hooks.c#2 integrate .. //depot/projects/arla/contrib/gcc/hooks.h#2 integrate .. //depot/projects/arla/contrib/gcc/hosthooks-def.h#2 integrate .. //depot/projects/arla/contrib/gcc/hosthooks.h#2 integrate .. //depot/projects/arla/contrib/gcc/local-alloc.c#2 integrate .. //depot/projects/arla/contrib/gcc/longlong.h#2 integrate .. //depot/projects/arla/contrib/gcc/loop.c#2 integrate .. //depot/projects/arla/contrib/gcc/md5.c#2 integrate .. //depot/projects/arla/contrib/gcc/md5.h#2 integrate .. //depot/projects/arla/contrib/gcc/mips-tdump.c#2 integrate .. //depot/projects/arla/contrib/gcc/mips-tfile.c#2 integrate .. //depot/projects/arla/contrib/gcc/mklibgcc.in#2 integrate .. //depot/projects/arla/contrib/gcc/optabs.c#2 integrate .. //depot/projects/arla/contrib/gcc/pretty-print.c#2 integrate .. //depot/projects/arla/contrib/gcc/reg-stack.c#2 integrate .. //depot/projects/arla/contrib/gcc/regrename.c#2 integrate .. //depot/projects/arla/contrib/gcc/regs.h#2 integrate .. //depot/projects/arla/contrib/gcc/rtl.h#2 integrate .. //depot/projects/arla/contrib/gcc/sched-rgn.c#2 integrate .. //depot/projects/arla/contrib/gcc/simplify-rtx.c#2 integrate .. //depot/projects/arla/contrib/gcc/stmt.c#2 integrate .. //depot/projects/arla/contrib/gcc/toplev.c#2 integrate .. //depot/projects/arla/contrib/gcc/tree.c#2 integrate .. //depot/projects/arla/contrib/gcc/unroll.c#2 integrate .. //depot/projects/arla/contrib/gcc/version.c#2 integrate .. //depot/projects/arla/contrib/gdb/FREEBSD-Xlist#2 integrate .. //depot/projects/arla/contrib/gdb/gdb/config/powerpc/fbsd.mh#1 branch .. //depot/projects/arla/contrib/gdb/gdb/config/powerpc/fbsd.mt#1 branch .. //depot/projects/arla/contrib/gdb/gdb/config/powerpc/nm-fbsd.h#1 branch .. //depot/projects/arla/contrib/gdb/gdb/config/rs6000/nm-rs6000.h#1 branch .. //depot/projects/arla/contrib/gdb/gdb/config/rs6000/nm-rs6000ly.h#1 branch .. //depot/projects/arla/contrib/gdb/gdb/config/rs6000/rs6000.mh#1 branch .. //depot/projects/arla/contrib/gdb/gdb/config/rs6000/rs6000.mt#1 branch .. //depot/projects/arla/contrib/gdb/gdb/config/rs6000/rs6000lynx.mh#1 branch .. //depot/projects/arla/contrib/gdb/gdb/config/rs6000/rs6000lynx.mt#1 branch .. //depot/projects/arla/contrib/gdb/gdb/config/rs6000/tm-rs6000.h#1 branch .. //depot/projects/arla/contrib/gdb/gdb/config/rs6000/tm-rs6000ly.h#1 branch .. //depot/projects/arla/contrib/gdb/gdb/config/rs6000/xm-rs6000.h#1 branch .. //depot/projects/arla/contrib/gdb/gdb/ppcfbsd-nat.c#1 branch .. //depot/projects/arla/contrib/gdb/gdb/ppcfbsd-tdep.c#1 branch .. //depot/projects/arla/contrib/gdb/gdb/ppcfbsd-tdep.h#1 branch .. //depot/projects/arla/contrib/gdb/gdb/rs6000-nat.c#1 branch .. //depot/projects/arla/contrib/gdb/gdb/rs6000-tdep.c#1 branch .. //depot/projects/arla/contrib/gdtoa/README#2 integrate .. //depot/projects/arla/contrib/gdtoa/arithchk.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/dmisc.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/dtoa.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/g_Qfmt.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/g__fmt.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/g_ddfmt.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/g_dfmt.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/g_ffmt.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/g_xLfmt.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/g_xfmt.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/gdtoa.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/gdtoa.h#2 integrate .. //depot/projects/arla/contrib/gdtoa/gdtoaimp.h#2 integrate .. //depot/projects/arla/contrib/gdtoa/gethex.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/gmisc.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/hd_init.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/hexnan.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/makefile#2 integrate .. //depot/projects/arla/contrib/gdtoa/misc.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/qnan.c#1 branch .. //depot/projects/arla/contrib/gdtoa/smisc.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/strtoIQ.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/strtoId.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/strtoIdd.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/strtoIf.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/strtoIg.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/strtoIx.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/strtoIxL.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/strtod.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/strtodI.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/strtodg.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/strtodnrp.c#1 branch .. //depot/projects/arla/contrib/gdtoa/strtof.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/strtopQ.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/strtopd.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/strtopdd.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/strtopf.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/strtopx.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/strtopxL.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/strtorQ.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/strtord.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/strtordd.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/strtorf.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/strtorx.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/strtorxL.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/sum.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/test/Qtest.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/test/dItest.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/test/ddtest.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/test/dt.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/test/dtest.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/test/dtst.out#2 integrate .. //depot/projects/arla/contrib/gdtoa/test/ftest.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/test/getround.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/test/makefile#2 integrate .. //depot/projects/arla/contrib/gdtoa/test/strtodt.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/test/x.ou0#2 integrate .. //depot/projects/arla/contrib/gdtoa/test/x.ou1#2 integrate .. //depot/projects/arla/contrib/gdtoa/test/xL.ou1#2 integrate .. //depot/projects/arla/contrib/gdtoa/test/xLtest.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/test/xsum0.out#2 integrate .. //depot/projects/arla/contrib/gdtoa/test/xtest.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/ulp.c#2 integrate .. //depot/projects/arla/contrib/gdtoa/xsum0.out#2 integrate .. //depot/projects/arla/contrib/groff/tmac/doc-common#2 integrate .. //depot/projects/arla/contrib/groff/tmac/doc-syms#2 integrate .. //depot/projects/arla/contrib/groff/tmac/groff_mdoc.man#2 integrate .. //depot/projects/arla/contrib/ipfilter/BSD/Makefile#2 integrate .. //depot/projects/arla/contrib/ipfilter/HISTORY#2 integrate .. //depot/projects/arla/contrib/ipfilter/Makefile#2 integrate .. //depot/projects/arla/contrib/ipfilter/bpf_filter.c#2 integrate .. //depot/projects/arla/contrib/ipfilter/ip_fil.c#2 integrate .. //depot/projects/arla/contrib/ipfilter/ipf.h#2 integrate .. //depot/projects/arla/contrib/ipfilter/iplang/iplang_y.y#2 integrate .. //depot/projects/arla/contrib/ipfilter/ipmon.h#2 integrate .. //depot/projects/arla/contrib/ipfilter/ipsd/sbpf.c#2 integrate .. //depot/projects/arla/contrib/ipfilter/ipsend/ipsend.c#2 integrate .. //depot/projects/arla/contrib/ipfilter/ipsend/iptests.c#2 integrate .. //depot/projects/arla/contrib/ipfilter/ipsend/lsock.c#2 integrate .. //depot/projects/arla/contrib/ipfilter/ipsend/resend.c#2 integrate .. //depot/projects/arla/contrib/ipfilter/ipsend/sbpf.c#2 integrate .. //depot/projects/arla/contrib/ipfilter/ipsend/sock.c#2 integrate .. //depot/projects/arla/contrib/ipfilter/ipt.h#2 integrate .. //depot/projects/arla/contrib/ipfilter/lib/Makefile#2 integrate .. //depot/projects/arla/contrib/ipfilter/lib/addicmp.c#2 integrate .. //depot/projects/arla/contrib/ipfilter/lib/addkeep.c#2 delete .. //depot/projects/arla/contrib/ipfilter/lib/facpri.c#2 integrate .. //depot/projects/arla/contrib/ipfilter/lib/getport.c#2 integrate .. //depot/projects/arla/contrib/ipfilter/lib/icmpcode.c#2 integrate .. //depot/projects/arla/contrib/ipfilter/lib/ipft_tx.c#2 integrate .. //depot/projects/arla/contrib/ipfilter/lib/make_range.c#2 delete .. //depot/projects/arla/contrib/ipfilter/lib/optprint.c#2 integrate .. //depot/projects/arla/contrib/ipfilter/lib/printfr.c#2 integrate .. //depot/projects/arla/contrib/ipfilter/lib/printlog.c#2 integrate .. //depot/projects/arla/contrib/ipfilter/man/ipmon.8#2 integrate .. //depot/projects/arla/contrib/ipfilter/radix.c#2 integrate .. //depot/projects/arla/contrib/ipfilter/samples/proxy.c#2 integrate .. //depot/projects/arla/contrib/ipfilter/test/Makefile#2 integrate .. //depot/projects/arla/contrib/ipfilter/test/expected/f20#1 branch .. //depot/projects/arla/contrib/ipfilter/test/expected/i1#2 integrate .. //depot/projects/arla/contrib/ipfilter/test/expected/i10#2 integrate .. //depot/projects/arla/contrib/ipfilter/test/expected/i11#2 integrate .. //depot/projects/arla/contrib/ipfilter/test/expected/i18#2 integrate .. //depot/projects/arla/contrib/ipfilter/test/expected/i5#2 integrate .. //depot/projects/arla/contrib/ipfilter/test/expected/i8#2 integrate .. //depot/projects/arla/contrib/ipfilter/test/expected/i9#2 integrate .. //depot/projects/arla/contrib/ipfilter/test/expected/in2#2 integrate .. //depot/projects/arla/contrib/ipfilter/test/expected/in5#2 integrate .. //depot/projects/arla/contrib/ipfilter/test/expected/ni19#1 branch .. //depot/projects/arla/contrib/ipfilter/test/expected/ni20#1 branch .. //depot/projects/arla/contrib/ipfilter/test/expected/ni21#1 branch .. //depot/projects/arla/contrib/ipfilter/test/input/f2#2 integrate .. //depot/projects/arla/contrib/ipfilter/test/input/f20#1 branch .. //depot/projects/arla/contrib/ipfilter/test/input/ni19#1 branch .. //depot/projects/arla/contrib/ipfilter/test/input/ni20#1 branch .. //depot/projects/arla/contrib/ipfilter/test/input/ni21#1 branch .. //depot/projects/arla/contrib/ipfilter/test/regress/f20#1 branch .. //depot/projects/arla/contrib/ipfilter/test/regress/i1#2 integrate .. //depot/projects/arla/contrib/ipfilter/test/regress/i10#2 integrate .. //depot/projects/arla/contrib/ipfilter/test/regress/i11#2 integrate .. //depot/projects/arla/contrib/ipfilter/test/regress/i15#2 integrate .. //depot/projects/arla/contrib/ipfilter/test/regress/i17#2 integrate .. //depot/projects/arla/contrib/ipfilter/test/regress/i18#2 integrate .. //depot/projects/arla/contrib/ipfilter/test/regress/i5#2 integrate .. //depot/projects/arla/contrib/ipfilter/test/regress/i8#2 integrate .. //depot/projects/arla/contrib/ipfilter/test/regress/i9#2 integrate .. //depot/projects/arla/contrib/ipfilter/test/regress/in2#2 integrate .. //depot/projects/arla/contrib/ipfilter/test/regress/in5#2 integrate .. //depot/projects/arla/contrib/ipfilter/test/regress/ni19.ipf#1 branch .. //depot/projects/arla/contrib/ipfilter/test/regress/ni19.nat#1 branch .. //depot/projects/arla/contrib/ipfilter/test/regress/ni20.ipf#1 branch .. //depot/projects/arla/contrib/ipfilter/test/regress/ni20.nat#1 branch .. //depot/projects/arla/contrib/ipfilter/test/regress/ni21.ipf#1 branch .. //depot/projects/arla/contrib/ipfilter/test/regress/ni21.nat#1 branch .. //depot/projects/arla/contrib/ipfilter/test/test.format#2 integrate .. //depot/projects/arla/contrib/ipfilter/todo#1 branch .. //depot/projects/arla/contrib/ipfilter/tools/ipf.c#2 integrate .. //depot/projects/arla/contrib/ipfilter/tools/ipf_y.y#2 integrate .. //depot/projects/arla/contrib/ipfilter/tools/ipfcomp.c#2 integrate .. //depot/projects/arla/contrib/ipfilter/tools/ipfs.c#2 integrate .. //depot/projects/arla/contrib/ipfilter/tools/ipfstat.c#2 integrate .. //depot/projects/arla/contrib/ipfilter/tools/ipftest.c#2 integrate .. //depot/projects/arla/contrib/ipfilter/tools/ipmon.c#2 integrate .. //depot/projects/arla/contrib/ipfilter/tools/ipnat_y.y#2 integrate .. //depot/projects/arla/contrib/ipfilter/tools/ipsyncm.c#2 integrate .. //depot/projects/arla/contrib/ipfilter/tools/ipsyncs.c#2 integrate .. //depot/projects/arla/contrib/ipfilter/tools/lexer.c#2 integrate .. //depot/projects/arla/contrib/less/LICENSE#2 integrate .. //depot/projects/arla/contrib/less/Makefile.aut#2 integrate .. //depot/projects/arla/contrib/less/Makefile.in#2 integrate .. //depot/projects/arla/contrib/less/Makefile.wnb#2 integrate .. //depot/projects/arla/contrib/less/NEWS#2 integrate .. //depot/projects/arla/contrib/less/README#2 integrate .. //depot/projects/arla/contrib/less/brac.c#2 integrate .. //depot/projects/arla/contrib/less/ch.c#2 integrate .. //depot/projects/arla/contrib/less/charset.c#2 integrate .. //depot/projects/arla/contrib/less/charset.h#1 branch .. //depot/projects/arla/contrib/less/cmd.h#2 integrate .. //depot/projects/arla/contrib/less/cmdbuf.c#2 integrate .. //depot/projects/arla/contrib/less/command.c#2 integrate .. //depot/projects/arla/contrib/less/configure#2 integrate .. //depot/projects/arla/contrib/less/configure.ac#2 integrate .. //depot/projects/arla/contrib/less/decode.c#2 integrate .. //depot/projects/arla/contrib/less/defines.ds#2 integrate .. //depot/projects/arla/contrib/less/defines.h.in#2 integrate .. //depot/projects/arla/contrib/less/defines.o2#2 integrate .. //depot/projects/arla/contrib/less/defines.o9#2 integrate .. //depot/projects/arla/contrib/less/defines.wn#2 integrate .. //depot/projects/arla/contrib/less/edit.c#2 integrate .. //depot/projects/arla/contrib/less/filename.c#2 integrate .. //depot/projects/arla/contrib/less/forwback.c#2 integrate .. //depot/projects/arla/contrib/less/funcs.h#2 integrate .. //depot/projects/arla/contrib/less/ifile.c#2 integrate .. //depot/projects/arla/contrib/less/input.c#2 integrate .. //depot/projects/arla/contrib/less/jump.c#2 integrate .. //depot/projects/arla/contrib/less/less.h#2 integrate .. //depot/projects/arla/contrib/less/less.man#2 integrate .. //depot/projects/arla/contrib/less/less.nro#2 integrate .. //depot/projects/arla/contrib/less/lessecho.c#2 integrate .. //depot/projects/arla/contrib/less/lessecho.man#1 branch .. //depot/projects/arla/contrib/less/lessecho.nro#1 branch .. //depot/projects/arla/contrib/less/lesskey.c#2 integrate .. //depot/projects/arla/contrib/less/lesskey.h#2 integrate .. //depot/projects/arla/contrib/less/lesskey.man#2 integrate .. //depot/projects/arla/contrib/less/lesskey.nro#2 integrate .. //depot/projects/arla/contrib/less/lglob.h#2 integrate .. //depot/projects/arla/contrib/less/line.c#2 integrate .. //depot/projects/arla/contrib/less/linenum.c#2 integrate .. //depot/projects/arla/contrib/less/lsystem.c#2 integrate .. //depot/projects/arla/contrib/less/main.c#2 integrate .. //depot/projects/arla/contrib/less/mark.c#2 integrate .. //depot/projects/arla/contrib/less/mkhelp.c#2 integrate .. //depot/projects/arla/contrib/less/optfunc.c#2 integrate .. //depot/projects/arla/contrib/less/option.c#2 integrate .. //depot/projects/arla/contrib/less/option.h#2 integrate .. //depot/projects/arla/contrib/less/opttbl.c#2 integrate .. //depot/projects/arla/contrib/less/os.c#2 integrate .. //depot/projects/arla/contrib/less/output.c#2 integrate .. //depot/projects/arla/contrib/less/pckeys.h#2 integrate .. //depot/projects/arla/contrib/less/position.c#2 integrate .. //depot/projects/arla/contrib/less/position.h#2 integrate .. //depot/projects/arla/contrib/less/prompt.c#2 integrate .. //depot/projects/arla/contrib/less/screen.c#2 integrate .. //depot/projects/arla/contrib/less/scrsize.c#2 integrate .. //depot/projects/arla/contrib/less/search.c#2 integrate .. //depot/projects/arla/contrib/less/signal.c#2 integrate .. //depot/projects/arla/contrib/less/tags.c#2 integrate .. //depot/projects/arla/contrib/less/ttyin.c#2 integrate .. //depot/projects/arla/contrib/less/version.c#2 integrate .. //depot/projects/arla/contrib/libbegemot/rpoll.c#2 integrate .. //depot/projects/arla/contrib/libbegemot/rpoll.h#2 integrate .. //depot/projects/arla/contrib/libbegemot/rpoll.man#2 integrate .. //depot/projects/arla/contrib/libf2c/ChangeLog#2 integrate .. //depot/projects/arla/contrib/libobjc/ChangeLog#2 integrate .. //depot/projects/arla/contrib/libobjc/README#2 integrate .. //depot/projects/arla/contrib/libpcap/CHANGES#2 integrate .. //depot/projects/arla/contrib/libpcap/CREDITS#2 integrate .. //depot/projects/arla/contrib/libpcap/FREEBSD-upgrade#2 integrate .. //depot/projects/arla/contrib/libpcap/README.dag#2 integrate .. //depot/projects/arla/contrib/libpcap/VERSION#2 integrate .. //depot/projects/arla/contrib/libpcap/config.h.in#2 integrate .. //depot/projects/arla/contrib/libpcap/configure#2 integrate .. //depot/projects/arla/contrib/libpcap/configure.in#2 integrate .. //depot/projects/arla/contrib/libpcap/doc/pcap.html#1 branch .. //depot/projects/arla/contrib/libpcap/doc/pcap.txt#1 branch .. //depot/projects/arla/contrib/libpcap/doc/pcap.xml#1 branch .. //depot/projects/arla/contrib/libpcap/ethertype.h#2 integrate .. //depot/projects/arla/contrib/libpcap/fad-win32.c#2 integrate .. //depot/projects/arla/contrib/libpcap/gencode.c#2 integrate .. //depot/projects/arla/contrib/libpcap/gencode.h#2 integrate .. //depot/projects/arla/contrib/libpcap/grammar.y#2 integrate .. //depot/projects/arla/contrib/libpcap/pcap-bpf.c#2 integrate .. //depot/projects/arla/contrib/libpcap/pcap-bpf.h#2 integrate .. //depot/projects/arla/contrib/libpcap/pcap-dag.c#2 integrate .. //depot/projects/arla/contrib/libpcap/pcap-dag.h#2 integrate .. //depot/projects/arla/contrib/libpcap/pcap-dlpi.c#2 integrate .. //depot/projects/arla/contrib/libpcap/pcap-int.h#2 integrate .. //depot/projects/arla/contrib/libpcap/pcap-linux.c#2 integrate .. //depot/projects/arla/contrib/libpcap/pcap-stdinc.h#2 integrate .. //depot/projects/arla/contrib/libpcap/pcap-win32.c#2 integrate .. //depot/projects/arla/contrib/libpcap/pcap.3#2 integrate .. //depot/projects/arla/contrib/libpcap/pcap.c#2 integrate .. //depot/projects/arla/contrib/libpcap/pcap.h#2 integrate .. //depot/projects/arla/contrib/libpcap/savefile.c#2 integrate .. //depot/projects/arla/contrib/libpcap/scanner.l#2 integrate .. //depot/projects/arla/contrib/libreadline/CHANGELOG#2 integrate .. //depot/projects/arla/contrib/libreadline/CHANGES#2 integrate .. //depot/projects/arla/contrib/libreadline/FREEBSD-upgrade#2 integrate .. //depot/projects/arla/contrib/libreadline/INSTALL#2 integrate .. //depot/projects/arla/contrib/libreadline/NEWS#2 integrate .. //depot/projects/arla/contrib/libreadline/README#2 integrate .. //depot/projects/arla/contrib/libreadline/aclocal.m4#2 integrate .. //depot/projects/arla/contrib/libreadline/bind.c#2 integrate .. //depot/projects/arla/contrib/libreadline/callback.c#2 integrate .. //depot/projects/arla/contrib/libreadline/complete.c#2 integrate .. //depot/projects/arla/contrib/libreadline/config.h.in#2 integrate .. //depot/projects/arla/contrib/libreadline/configure#2 integrate .. //depot/projects/arla/contrib/libreadline/configure.in#2 integrate .. //depot/projects/arla/contrib/libreadline/display.c#2 integrate .. //depot/projects/arla/contrib/libreadline/doc/history.texi#2 integrate .. //depot/projects/arla/contrib/libreadline/doc/hstech.texi#2 integrate .. //depot/projects/arla/contrib/libreadline/doc/hsuser.texi#2 integrate .. //depot/projects/arla/contrib/libreadline/doc/readline.3#2 integrate .. //depot/projects/arla/contrib/libreadline/doc/rlman.texi#2 integrate .. //depot/projects/arla/contrib/libreadline/doc/rltech.texi#2 integrate .. //depot/projects/arla/contrib/libreadline/doc/rluser.texi#2 integrate .. //depot/projects/arla/contrib/libreadline/doc/rluserman.texi#2 integrate .. //depot/projects/arla/contrib/libreadline/doc/version.texi#2 integrate .. //depot/projects/arla/contrib/libreadline/examples/excallback.c#2 integrate .. //depot/projects/arla/contrib/libreadline/examples/rlfe/Makefile.in#2 integrate .. //depot/projects/arla/contrib/libreadline/histexpand.c#2 integrate .. //depot/projects/arla/contrib/libreadline/histfile.c#2 integrate .. //depot/projects/arla/contrib/libreadline/history.c#2 integrate .. //depot/projects/arla/contrib/libreadline/input.c#2 integrate .. //depot/projects/arla/contrib/libreadline/isearch.c#2 integrate .. //depot/projects/arla/contrib/libreadline/kill.c#2 integrate .. //depot/projects/arla/contrib/libreadline/macro.c#2 integrate .. //depot/projects/arla/contrib/libreadline/misc.c#2 integrate .. //depot/projects/arla/contrib/libreadline/readline.c#2 integrate .. //depot/projects/arla/contrib/libreadline/readline.h#2 integrate .. //depot/projects/arla/contrib/libreadline/rlconf.h#2 integrate .. //depot/projects/arla/contrib/libreadline/rlmbutil.h#2 integrate .. //depot/projects/arla/contrib/libreadline/rlprivate.h#2 integrate .. //depot/projects/arla/contrib/libreadline/rltty.c#2 integrate .. //depot/projects/arla/contrib/libreadline/search.c#2 integrate .. //depot/projects/arla/contrib/libreadline/signals.c#2 integrate .. //depot/projects/arla/contrib/libreadline/support/shlib-install#2 integrate .. //depot/projects/arla/contrib/libreadline/support/shobj-conf#2 integrate .. //depot/projects/arla/contrib/libreadline/terminal.c#2 integrate .. //depot/projects/arla/contrib/libreadline/text.c#2 integrate .. //depot/projects/arla/contrib/libreadline/tilde.c#2 integrate .. //depot/projects/arla/contrib/libreadline/undo.c#2 integrate .. //depot/projects/arla/contrib/libreadline/vi_mode.c#2 integrate .. //depot/projects/arla/contrib/libstdc++/ChangeLog#2 integrate .. //depot/projects/arla/contrib/libstdc++/include/bits/c++config#2 integrate .. //depot/projects/arla/contrib/libstdc++/include/bits/fstream.tcc#2 integrate .. //depot/projects/arla/contrib/libstdc++/include/c_std/std_cmath.h#2 integrate .. //depot/projects/arla/contrib/libstdc++/include/ext/demangle.h#2 delete .. //depot/projects/arla/contrib/libstdc++/include/ext/hashtable.h#2 integrate .. //depot/projects/arla/contrib/lukemftpd/src/Makefile#2 integrate .. //depot/projects/arla/contrib/lukemftpd/src/cmds.c#2 integrate .. //depot/projects/arla/contrib/lukemftpd/src/conf.c#2 integrate .. //depot/projects/arla/contrib/lukemftpd/src/extern.h#2 integrate .. //depot/projects/arla/contrib/lukemftpd/src/ftpcmd.y#2 integrate .. //depot/projects/arla/contrib/lukemftpd/src/ftpd.8#2 integrate .. //depot/projects/arla/contrib/lukemftpd/src/ftpd.c#2 integrate .. //depot/projects/arla/contrib/lukemftpd/src/ftpd.conf.5#2 integrate .. //depot/projects/arla/contrib/lukemftpd/src/logutmp.c#2 integrate .. //depot/projects/arla/contrib/lukemftpd/src/logwtmp.c#2 integrate .. //depot/projects/arla/contrib/lukemftpd/src/pathnames.h#2 integrate .. //depot/projects/arla/contrib/lukemftpd/src/popen.c#2 integrate .. //depot/projects/arla/contrib/lukemftpd/src/version.h#2 integrate .. //depot/projects/arla/contrib/ncurses/ANNOUNCE#2 integrate .. //depot/projects/arla/contrib/ncurses/AUTHORS#1 branch .. //depot/projects/arla/contrib/ncurses/FREEBSD-Xlist#1 branch .. //depot/projects/arla/contrib/ncurses/FREEBSD-upgrade#1 branch .. //depot/projects/arla/contrib/ncurses/INSTALL#2 integrate .. //depot/projects/arla/contrib/ncurses/MANIFEST#2 integrate .. //depot/projects/arla/contrib/ncurses/Makefile.glibc#2 delete .. //depot/projects/arla/contrib/ncurses/Makefile.in#2 integrate .. //depot/projects/arla/contrib/ncurses/Makefile.os2#2 integrate .. //depot/projects/arla/contrib/ncurses/NEWS#2 integrate .. //depot/projects/arla/contrib/ncurses/README#2 integrate .. //depot/projects/arla/contrib/ncurses/README.emx#2 integrate .. //depot/projects/arla/contrib/ncurses/README.glibc#2 delete .. //depot/projects/arla/contrib/ncurses/TO-DO#2 integrate .. //depot/projects/arla/contrib/ncurses/aclocal.m4#2 integrate .. //depot/projects/arla/contrib/ncurses/announce.html.in#2 integrate .. //depot/projects/arla/contrib/ncurses/c++/Makefile.in#2 delete .. //depot/projects/arla/contrib/ncurses/c++/NEWS#2 delete .. //depot/projects/arla/contrib/ncurses/c++/PROBLEMS#2 delete .. //depot/projects/arla/contrib/ncurses/c++/README-first#2 delete .. //depot/projects/arla/contrib/ncurses/c++/cursesapp.cc#2 delete .. //depot/projects/arla/contrib/ncurses/c++/cursesapp.h#2 delete .. //depot/projects/arla/contrib/ncurses/c++/cursesf.cc#2 delete .. //depot/projects/arla/contrib/ncurses/c++/cursesf.h#2 delete .. //depot/projects/arla/contrib/ncurses/c++/cursesm.cc#2 delete .. //depot/projects/arla/contrib/ncurses/c++/cursesm.h#2 delete .. //depot/projects/arla/contrib/ncurses/c++/cursesmain.cc#2 delete .. //depot/projects/arla/contrib/ncurses/c++/cursesp.cc#2 delete .. //depot/projects/arla/contrib/ncurses/c++/cursesp.h#2 delete .. //depot/projects/arla/contrib/ncurses/c++/cursespad.cc#2 delete .. //depot/projects/arla/contrib/ncurses/c++/cursesw.cc#2 delete .. //depot/projects/arla/contrib/ncurses/c++/cursesw.h#2 delete .. //depot/projects/arla/contrib/ncurses/c++/cursslk.cc#2 delete .. //depot/projects/arla/contrib/ncurses/c++/cursslk.h#2 delete .. //depot/projects/arla/contrib/ncurses/c++/demo.cc#2 delete .. //depot/projects/arla/contrib/ncurses/c++/edit_cfg.sh#2 delete .. //depot/projects/arla/contrib/ncurses/c++/etip.h.in#2 delete .. //depot/projects/arla/contrib/ncurses/c++/headers#2 delete .. //depot/projects/arla/contrib/ncurses/c++/internal.h#2 delete .. //depot/projects/arla/contrib/ncurses/c++/modules#2 delete .. //depot/projects/arla/contrib/ncurses/config.guess#2 integrate .. //depot/projects/arla/contrib/ncurses/config.sub#2 integrate .. //depot/projects/arla/contrib/ncurses/configure#2 integrate .. //depot/projects/arla/contrib/ncurses/configure.in#2 integrate .. //depot/projects/arla/contrib/ncurses/convert_configure.pl#2 integrate .. //depot/projects/arla/contrib/ncurses/dist.mk#2 integrate .. //depot/projects/arla/contrib/ncurses/doc/hackguide.doc#2 integrate .. //depot/projects/arla/contrib/ncurses/doc/html/NCURSES-Programming-HOWTO.html#1 branch .. //depot/projects/arla/contrib/ncurses/doc/html/announce.html#2 integrate .. //depot/projects/arla/contrib/ncurses/doc/html/hackguide.html#2 integrate .. //depot/projects/arla/contrib/ncurses/doc/html/ncurses-intro.html#2 integrate .. //depot/projects/arla/contrib/ncurses/doc/ncurses-intro.doc#2 integrate .. //depot/projects/arla/contrib/ncurses/form/Makefile.in#2 integrate .. //depot/projects/arla/contrib/ncurses/form/READ.ME#2 integrate .. //depot/projects/arla/contrib/ncurses/form/f_trace.c#1 branch .. //depot/projects/arla/contrib/ncurses/form/fld_arg.c#2 integrate .. //depot/projects/arla/contrib/ncurses/form/fld_attr.c#2 integrate .. //depot/projects/arla/contrib/ncurses/form/fld_current.c#2 integrate .. //depot/projects/arla/contrib/ncurses/form/fld_def.c#2 integrate .. //depot/projects/arla/contrib/ncurses/form/fld_dup.c#2 integrate .. //depot/projects/arla/contrib/ncurses/form/fld_ftchoice.c#2 integrate .. //depot/projects/arla/contrib/ncurses/form/fld_ftlink.c#2 integrate .. //depot/projects/arla/contrib/ncurses/form/fld_info.c#2 integrate .. //depot/projects/arla/contrib/ncurses/form/fld_just.c#2 integrate .. //depot/projects/arla/contrib/ncurses/form/fld_link.c#2 integrate .. //depot/projects/arla/contrib/ncurses/form/fld_max.c#2 integrate .. //depot/projects/arla/contrib/ncurses/form/fld_move.c#2 integrate .. //depot/projects/arla/contrib/ncurses/form/fld_newftyp.c#2 integrate .. //depot/projects/arla/contrib/ncurses/form/fld_opts.c#2 integrate .. //depot/projects/arla/contrib/ncurses/form/fld_pad.c#2 integrate .. //depot/projects/arla/contrib/ncurses/form/fld_page.c#2 integrate .. //depot/projects/arla/contrib/ncurses/form/fld_stat.c#2 integrate .. //depot/projects/arla/contrib/ncurses/form/fld_type.c#2 integrate .. //depot/projects/arla/contrib/ncurses/form/fld_user.c#2 integrate .. //depot/projects/arla/contrib/ncurses/form/form.h#2 integrate .. //depot/projects/arla/contrib/ncurses/form/form.priv.h#2 integrate .. //depot/projects/arla/contrib/ncurses/form/frm_cursor.c#2 integrate .. //depot/projects/arla/contrib/ncurses/form/frm_data.c#2 integrate .. //depot/projects/arla/contrib/ncurses/form/frm_def.c#2 integrate .. //depot/projects/arla/contrib/ncurses/form/frm_driver.c#2 integrate .. //depot/projects/arla/contrib/ncurses/form/frm_hook.c#2 integrate .. //depot/projects/arla/contrib/ncurses/form/frm_opts.c#2 integrate .. //depot/projects/arla/contrib/ncurses/form/frm_page.c#2 integrate .. //depot/projects/arla/contrib/ncurses/form/frm_post.c#2 integrate .. //depot/projects/arla/contrib/ncurses/form/frm_req_name.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 9 20:26:21 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F6C416A405; Mon, 9 Apr 2007 20:26:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A9C8916A403 for ; Mon, 9 Apr 2007 20:26:20 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9790813C448 for ; Mon, 9 Apr 2007 20:26:20 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l39KQK42010161 for ; Mon, 9 Apr 2007 20:26:20 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l39KNaId007363 for perforce@freebsd.org; Mon, 9 Apr 2007 20:23:36 GMT (envelope-from csjp@freebsd.org) Date: Mon, 9 Apr 2007 20:23:36 GMT Message-Id: <200704092023.l39KNaId007363@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 117769 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2007 20:26:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=117769 Change 117769 by csjp@csjp_push on 2007/04/09 20:23:27 IFC Affected files ... .. //depot/projects/trustedbsd/audit3/MAINTAINERS#15 integrate .. //depot/projects/trustedbsd/audit3/Makefile#12 integrate .. //depot/projects/trustedbsd/audit3/Makefile.inc1#18 integrate .. //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#12 integrate .. //depot/projects/trustedbsd/audit3/UPDATING#18 integrate .. //depot/projects/trustedbsd/audit3/bin/csh/config.h#5 integrate .. //depot/projects/trustedbsd/audit3/bin/csh/config_p.h#3 integrate .. //depot/projects/trustedbsd/audit3/bin/df/df.1#4 integrate .. //depot/projects/trustedbsd/audit3/bin/df/df.c#6 integrate .. //depot/projects/trustedbsd/audit3/bin/expr/expr.1#4 integrate .. //depot/projects/trustedbsd/audit3/bin/expr/expr.y#3 integrate .. //depot/projects/trustedbsd/audit3/bin/kill/kill.1#4 integrate .. //depot/projects/trustedbsd/audit3/bin/rcp/rcp.1#4 integrate .. //depot/projects/trustedbsd/audit3/bin/setfacl/setfacl.c#4 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/exec.c#6 integrate .. //depot/projects/trustedbsd/audit3/cddl/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/cddl/Makefile.inc#1 branch .. //depot/projects/trustedbsd/audit3/cddl/lib/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/cddl/lib/Makefile.inc#1 branch .. //depot/projects/trustedbsd/audit3/cddl/lib/libavl/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/cddl/lib/libnvpair/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/cddl/lib/libumem/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/cddl/lib/libuutil/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/cddl/lib/libzfs/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/cddl/lib/libzpool/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/cddl/sbin/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/cddl/sbin/Makefile.inc#1 branch .. //depot/projects/trustedbsd/audit3/cddl/sbin/zfs/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/cddl/sbin/zpool/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/cddl/usr.bin/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/cddl/usr.bin/Makefile.inc#1 branch .. //depot/projects/trustedbsd/audit3/cddl/usr.bin/ztest/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/cddl/usr.sbin/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/cddl/usr.sbin/Makefile.inc#1 branch .. //depot/projects/trustedbsd/audit3/cddl/usr.sbin/zdb/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/trustedbsd/audit3/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/trustedbsd/audit3/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/trustedbsd/audit3/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/trustedbsd/audit3/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/trustedbsd/audit3/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/trustedbsd/audit3/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/trustedbsd/audit3/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/trustedbsd/audit3/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/trustedbsd/audit3/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/trustedbsd/audit3/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/trustedbsd/audit3/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/trustedbsd/audit3/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/trustedbsd/audit3/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/hlfsd/hlfsd.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/CHANGES#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/FAQ#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/FAQ.xml#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/README#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/api#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/validator.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/resolver.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/validator.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/version#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/binutils/gas/as.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/binutils/gas/tc.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/CHANGES#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/LICENSE#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/Makefile-libbz2_so#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/README#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/README.COMPILATION.PROBLEMS#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/Y2K_INFO#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bzip2/blocksort.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/bzip2.1#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/bzip2.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/bzip2recover.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/bzlib.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/bzlib.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/bzlib_private.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/compress.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/crctable.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/decompress.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/dlltest.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/huffman.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/manual.texi#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bzip2/randtable.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/sample1.bz2.uu#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/sample1.ref.gz.uu#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/sample2.bz2.uu#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/sample2.ref.gz.uu#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/sample3.bz2.uu#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/sample3.ref.gz.uu#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/spewG.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/unzcrash.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/words0#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/words2#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bzip2/words3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libpcap/pcap-bpf.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ANNOUNCE#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/AUTHORS#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ncurses/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ncurses/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ncurses/INSTALL#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/MANIFEST#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/Makefile.glibc#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/Makefile.os2#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/NEWS#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/README#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/README.emx#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/README.glibc#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/TO-DO#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/aclocal.m4#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/announce.html.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/c++/Makefile.in#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/c++/NEWS#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/c++/PROBLEMS#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/c++/README-first#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/c++/cursesapp.cc#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/c++/cursesapp.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/c++/cursesf.cc#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/c++/cursesf.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/c++/cursesm.cc#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/c++/cursesm.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/c++/cursesmain.cc#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/c++/cursesp.cc#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/c++/cursesp.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/c++/cursespad.cc#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/c++/cursesw.cc#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/c++/cursesw.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/c++/cursslk.cc#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/c++/cursslk.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/c++/demo.cc#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/c++/edit_cfg.sh#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/c++/etip.h.in#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/c++/headers#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/c++/internal.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/c++/modules#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/config.guess#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/config.sub#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/configure#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/configure.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/convert_configure.pl#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/dist.mk#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/doc/hackguide.doc#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/doc/html/NCURSES-Programming-HOWTO.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ncurses/doc/html/announce.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/doc/html/hackguide.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/doc/html/ncurses-intro.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/doc/ncurses-intro.doc#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/READ.ME#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/f_trace.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/fld_arg.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/fld_attr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/fld_current.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/fld_def.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/fld_dup.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/fld_ftchoice.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/fld_ftlink.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/fld_info.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/fld_just.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/fld_link.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/fld_max.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/fld_move.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/fld_newftyp.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/fld_opts.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/fld_pad.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/fld_page.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/fld_stat.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/fld_type.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/fld_user.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/form.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/form.priv.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/frm_cursor.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/frm_data.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/frm_def.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/frm_driver.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/frm_hook.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/frm_opts.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/frm_page.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/frm_post.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/frm_req_name.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/frm_scale.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/frm_sub.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/frm_user.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/frm_win.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/fty_alnum.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/fty_alpha.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/fty_enum.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/fty_int.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/fty_ipv4.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/fty_num.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/fty_regex.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/llib-lform#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/llib-lformw#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ncurses/form/modules#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/include/Caps#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/include/Caps.aix4#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/include/Caps.hpux11#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ncurses/include/Caps.keys#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/include/Caps.osf1r5#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/include/Caps.uwin#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/include/MKhashsize.sh#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/include/MKkey_defs.sh#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/include/MKncurses_def.sh#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/include/MKparametrized.sh#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/include/MKterm.h.awk.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/include/curses.h.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/include/curses.tail#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/include/curses.wide#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/include/hashed_db.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ncurses/include/nc_alloc.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/include/nc_tparm.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ncurses/include/ncurses_cfg.hin#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/include/ncurses_defs#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/include/ncurses_dll.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/include/term_entry.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/include/tic.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/install-sh#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/captoinfo.1m#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/clear.1#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_add_wch.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_add_wchstr.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_addch.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_addchstr.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_addstr.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_addwstr.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_attr.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_beep.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_bkgd.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_bkgrnd.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_border.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_border_set.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_clear.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_color.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_delch.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_deleteln.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_extend.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_get_wch.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_get_wstr.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_getcchar.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_getch.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_getstr.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_getyx.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_in_wch.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_in_wchstr.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_inch.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_inchstr.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_initscr.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_inopts.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_ins_wch.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_ins_wstr.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_insch.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_insstr.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_instr.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_inwstr.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_kernel.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_mouse.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_move.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_outopts.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_overlay.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_pad.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_print.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_printw.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_refresh.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_scanw.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_scr_dump.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_scroll.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_slk.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_termattrs.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_termcap.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_terminfo.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_touch.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_trace.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_util.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/curs_window.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/default_colors.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/define_key.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/form.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/form_cursor.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/form_data.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/form_driver.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/form_field.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/form_field_attributes.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/form_field_buffer.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/form_field_info.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/form_field_just.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/form_field_new.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/form_field_opts.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/form_field_userptr.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/form_field_validation.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/form_fieldtype.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/form_hook.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/form_new.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/form_new_page.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/form_opts.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/form_page.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/form_post.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/form_requestname.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/form_userptr.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/form_win.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/infocmp.1m#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/infotocap.1m#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/key_defined.3x#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/keybound.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/keyok.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/legacy_coding.3x#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/make_sed.sh#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/man_db.renames#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/manlinks.sed#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/menu.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/menu_attributes.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/menu_cursor.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/menu_driver.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/menu_format.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/menu_hook.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/menu_items.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/menu_mark.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/menu_new.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/menu_opts.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/menu_pattern.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/menu_post.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/menu_requestname.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/menu_spacing.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/menu_userptr.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/menu_win.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/mitem_current.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/mitem_name.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/mitem_new.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/mitem_opts.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/mitem_userptr.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/mitem_value.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/ncurses.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/panel.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/resizeterm.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/term.5#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/term.7#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/terminfo.head#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/terminfo.tail#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/tic.1m#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/toe.1m#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/tput.1#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/tset.1#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/man/wresize.3x#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/READ.ME#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/eti.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/llib-lmenu#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/llib-lmenuw#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/m_attribs.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/m_cursor.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/m_driver.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/m_format.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/m_global.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/m_hook.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/m_item_cur.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/m_item_nam.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/m_item_new.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/m_item_opt.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/m_item_top.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/m_item_use.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/m_item_val.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/m_item_vis.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/m_items.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/m_new.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/m_opts.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/m_pad.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/m_pattern.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/m_post.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/m_req_name.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/m_scale.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/m_spacing.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/m_sub.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/m_trace.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/m_userptr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/m_win.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/menu.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/menu.priv.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/mf_common.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/menu/modules#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/misc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/misc/chkdef.cmd#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/misc/cleantic.cmd#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/misc/cmpdef.cmd#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/misc/csort#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ncurses/misc/emx.src#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/misc/gen_edit.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ncurses/misc/indent.pro#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/misc/jpf-indent#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ncurses/misc/makedef.cmd#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/misc/ncu-indent#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ncurses/misc/ncurses-config.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ncurses/misc/run_tic.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/misc/shlib#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/misc/terminfo.src#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/mk-0th.awk#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/mk-1st.awk#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/mk-2nd.awk#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/mkinstalldirs#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/README#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/README.IZ#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/SigAction.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/MKkeyname.awk#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/MKlib_gen.sh#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/MKunctrl.awk#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/README#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/define_key.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/key_defined.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/keybound.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/keyok.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/legacy_coding.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_addch.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_addstr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_beep.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_bkgd.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_box.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_chgat.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_clrbot.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_color.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_colorset.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_dft_fgbg.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_erase.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_freeall.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_getch.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_getstr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_hline.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_initscr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_insch.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_insdel.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_insnstr.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_insstr.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_instr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_mouse.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_move.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_mvwin.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_newterm.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_newwin.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_overlay.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_pad.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_printw.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_redrawln.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_refresh.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_restart.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_screen.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_scroll.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_set_term.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_slk.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_slkatr_set.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_slkatrof.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_slkatron.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_slkatrset.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_slkattr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_slkclear.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_slkcolor.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_slklab.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_slkrefr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_slkset.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_ungetch.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_vline.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_wattroff.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_wattron.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/lib_window.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/resizeterm.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/safe_sprintf.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/sigaction.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/tries.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/version.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/vsscanf.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/base/wresize.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/curses.priv.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/llib-lncurses#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/llib-lncursesw#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/modules#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/MKcaptab.awk#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/MKfallback.sh#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/MKkeys_list.sh#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/MKnames.awk#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/README#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/access.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/add_tries.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/alloc_entry.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/alloc_ttype.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/captoinfo.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/comp_error.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/comp_expand.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/comp_hash.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/comp_parse.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/comp_scan.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/db_iterator.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/doalloc.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/free_ttype.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/hashed_db.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/home_terminfo.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/init_keytry.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/lib_acs.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/lib_cur_term.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/lib_data.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/lib_has_cap.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/lib_kernel.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/lib_napms.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/lib_options.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/lib_print.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/lib_raw.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/lib_setup.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/lib_termcap.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/lib_termname.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/lib_tgoto.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/lib_ti.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/lib_tparm.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/lib_tputs.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/make_keys.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/name_match.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/parse_entry.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/read_entry.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/read_termcap.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/setbuf.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/strings.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/trim_sgr0.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tinfo/write_entry.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/trace/README#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/trace/lib_trace.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/trace/lib_traceatr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/trace/lib_tracebits.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/trace/lib_tracechr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/trace/lib_tracedmp.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/trace/lib_tracemse.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/trace/trace_buf.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/trace/varargs.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/trace/visbuf.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tty/MKexpanded.sh#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tty/hashmap.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tty/lib_mvcur.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tty/lib_tstp.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tty/lib_twait.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tty/lib_vidattr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tty/tty_display.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/tty/tty_update.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/widechar/charable.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/widechar/lib_add_wch.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/widechar/lib_box_set.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/widechar/lib_cchar.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/widechar/lib_get_wch.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/widechar/lib_get_wstr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/widechar/lib_in_wch.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/widechar/lib_ins_nwstr.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/widechar/lib_ins_wch.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/widechar/lib_inwstr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/widechar/lib_pecho_wchar.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/widechar/lib_slk_wset.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/widechar/lib_vid_attr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/widechar/lib_wacs.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/ncurses/widechar/lib_wunctrl.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/panel/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/panel/llib-lpanel#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/panel/llib-lpanelw#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ncurses/panel/p_above.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/panel/p_below.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/panel/p_bottom.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/panel/p_delete.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/panel/p_hidden.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/panel/p_hide.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/panel/p_move.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/panel/p_new.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/panel/p_replace.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/panel/p_show.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/panel/p_top.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/panel/p_update.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/panel/p_user.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/panel/p_win.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/panel/panel.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/panel/panel.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/panel/panel.priv.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/progs/MKtermsort.sh#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/progs/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/progs/capconvert#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/progs/clear.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/progs/clear.sh#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/progs/dump_entry.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/progs/dump_entry.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/progs/infocmp.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/progs/modules#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/progs/progs.priv.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/progs/tic.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/progs/toe.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/progs/tput.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/progs/tset.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/tack/COPYING#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/tack/HISTORY#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/tack/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/tack/ansi.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/tack/charset.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/tack/color.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/tack/control.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/tack/crum.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/tack/edit.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/tack/fun.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/tack/init.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/tack/menu.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/tack/modes.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/tack/modules#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/tack/output.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/tack/pad.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/tack/scan.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/tack/sync.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/tack/sysdep.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/tack/tack.1#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/tack/tack.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/tack/tack.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/tar-copy.sh#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/Makefile.in#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/README#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/blue.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/bs.6#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/bs.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/cardfile.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/cardfile.dat#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/configure#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/configure.in#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/ditto.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/dots.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/filter.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/firework.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/firstlast.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/gdc.6#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/gdc.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/hanoi.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/hashtest.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/keynames.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/knight.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/lrtest.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/modules#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/ncurses.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/ncurses_tst.hin#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/newdemo.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/railroad.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/rain.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/tclock.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/test.priv.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/testaddch.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/testcurs.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/testscanw.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/tracemunch#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/view.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/worm.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/ncurses/test/xmas.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/netcat/nc.1#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/netcat/netcat.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/netcat/socks.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openpam/lib/openpam_readline.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/cmd/zdb/zdb.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/cmd/zdb/zdb.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/cmd/zfs/zfs.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/cmd/zpool/zpool.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/cmd/ztest/ztest.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/head/assert.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/head/atomic.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/head/libintl.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/head/stdio_ext.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/head/synch.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/head/thread.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzpool/common/util.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-stp.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/FREEBSD-Xlist#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/Fixes#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/Imakefile#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/MAKEDIFFS#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/MAKESHAR#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/Makefile.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/Makefile.std#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/Makefile.vms#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/README#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/complete.tcsh#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/config.h.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/config/bsd4.4#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/config_f.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/configure#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/configure.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/ed.chared.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/ed.decls.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/ed.defns.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/ed.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/ed.init.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/ed.inputl.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/ed.refresh.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/ed.screen.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/ed.term.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/ed.term.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/ed.xmap.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/eight-bit.me#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/gethost.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/glob.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/glob.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/host.defs#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/imake.config#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/ma.setp.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/mi.termios.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/mi.varargs.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/set1#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/set10#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/set11#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/set12#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/set13#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/set14#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/set15#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/set16#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/set17#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/set18#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/set19#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/set2#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/set20#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/set21#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/set22#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/set23#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/set24#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/set25#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/set26#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/set27#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/set29#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/set3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/set30#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/set31#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/set4#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/set5#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/set6#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/set7#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/set8#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/set9#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/set1#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/set10#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/set11#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/set12#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/set13#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/set14#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/set15#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/set16#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/set17#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/set18#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/set19#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/set2#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/set20#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/set21#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/set22#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/set23#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/set24#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/set25#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/set26#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/set27#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/set29#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/set3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/set30#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/set31#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/set4#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/set5#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/set6#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/set7#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/set8#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/set9#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/set1#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/set10#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/set11#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/set12#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/set13#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/set14#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/set15#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/set16#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/set17#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/set18#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/set19#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/set2#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/set20#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/set21#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/set22#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/set23#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/set24#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/set25#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/set26#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/set27#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/set29#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/set3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/set30#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/set31#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/set4#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/set5#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/set6#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/set7#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/set8#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/set9#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/set1#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/set10#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/set11#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/set12#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/set13#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/set14#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/set15#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/set16#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/set17#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/set18#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/set19#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/set2#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/set20#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/set21#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/set22#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/set23#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/set24#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/set25#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/set26#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/set27#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/set29#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/set3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/set30#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/set31#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/set4#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/set5#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/set6#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/set7#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/set8#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/set9#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/set1#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/set10#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/set11#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/set12#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/set13#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/set14#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/set15#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/set16#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/set17#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/set18#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/set19#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/set2#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/set20#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/set21#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/set22#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/set23#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/set24#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/set25#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/set26#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/set27#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/set29#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/set3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/set30#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/set31#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/set4#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/set5#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/set6#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/set7#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/set8#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/set9#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/set1#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/set10#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/set11#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/set12#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/set13#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/set14#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/set15#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/set16#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/set17#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/set18#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/set19#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/set2#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/set20#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/set21#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/set22#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/set23#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/set24#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/set25#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/set26#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/set27#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/set29#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/set3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/set30#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/set31#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/set4#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/set5#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/set6#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/set7#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/set8#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/set9#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/set1#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/set10#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/set11#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/set12#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/set13#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/set14#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/set15#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/set16#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/set17#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/set18#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/set19#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/set2#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/set20#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/set21#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/set22#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/set23#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/set24#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/set25#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/set26#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/set27#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/set29#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/set3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/set30#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/set31#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/set4#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/set5#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/set6#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/set7#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/set8#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/set9#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/ja/set1#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/ja/set10#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/ja/set11#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/ja/set12#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/ja/set13#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/ja/set15#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/ja/set16#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/ja/set17#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/ja/set18#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/ja/set2#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/ja/set21#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/ja/set24#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/ja/set29#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/ja/set3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/ja/set30#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/ja/set4#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/ja/set5#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/ja/set6#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/ja/set7#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/ja/set8#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/pl/set1#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/pl/set10#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/pl/set11#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/pl/set12#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/pl/set13#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/pl/set14#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/pl/set15#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/pl/set16#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/pl/set17#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/pl/set18#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/pl/set19#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/pl/set2#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/pl/set20#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/pl/set21#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/pl/set22#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/pl/set23#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/pl/set24#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/pl/set25#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/pl/set26#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/pl/set27#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/pl/set29#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/pl/set3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/pl/set30#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 9 21:22:31 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DBC6C16A413; Mon, 9 Apr 2007 21:22:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 93B3316A410 for ; Mon, 9 Apr 2007 21:22:30 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 80ED213C4BB for ; Mon, 9 Apr 2007 21:22:30 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l39LMUbO066303 for ; Mon, 9 Apr 2007 21:22:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l39LMUsi066275 for perforce@freebsd.org; Mon, 9 Apr 2007 21:22:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 9 Apr 2007 21:22:30 GMT Message-Id: <200704092122.l39LMUsi066275@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 117771 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2007 21:22:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=117771 Change 117771 by rwatson@rwatson_cinnamon_afs on 2007/04/09 21:22:11 Integrate Arla's nnpfs/bsd tree to src/sys/fs/nnpfs; integrated using arla_from_vendor branch, which will be expanded to bring in files from other bits of the Arla distribution. nnpfs/bsd/bin is excluded. Affected files ... .. //depot/projects/arla/sys/fs/nnpfs/Info.plist.in#1 branch .. //depot/projects/arla/sys/fs/nnpfs/Makefile.in#1 branch .. //depot/projects/arla/sys/fs/nnpfs/README#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs.h#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_blocks_locl.h#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_common.h#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_deb.h#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_dev.h#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_fs.h#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_locl.h#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_msg_locl.h#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_node.h#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_syscalls.h#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_vfsops-bsd.h#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_vfsops.h#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_vnodeops.h#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_wrap.h#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_blocks.c#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_common-bsd.c#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_common.c#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_deb.c#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_dev-bsd.c#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_dev-common.c#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_dev-freebsd.c#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_dev-macos.c#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_dev-netbsd.c#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_dev-openbsd.c#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_info.c#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_message.c#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_node-bsd.c#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_node.c#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_syscalls-common.c#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_syscalls-wrap-bsd.c#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_syscalls-wrap-dragonfly.c#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_syscalls-wrap-freebsd.c#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_syscalls-wrap-macos.c#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_vfsops-bsd.c#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_vfsops-common.c#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_vfsops-freebsd.c#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_vfsops-macos.c#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_vfsops-netbsd.c#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_vfsops-openbsd.c#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_vnodeops-bsd.c#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_vnodeops-common.c#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_vnodeops-macos.c#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_vnodeops-netbsd.c#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_wrap-bsd.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Mon Apr 9 21:40:54 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 989AA16A404; Mon, 9 Apr 2007 21:40:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3C22E16A402 for ; Mon, 9 Apr 2007 21:40:54 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 27FF913C45E for ; Mon, 9 Apr 2007 21:40:54 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l39LesxF077386 for ; Mon, 9 Apr 2007 21:40:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l39Lergu077381 for perforce@freebsd.org; Mon, 9 Apr 2007 21:40:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 9 Apr 2007 21:40:53 GMT Message-Id: <200704092140.l39Lergu077381@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 117772 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2007 21:40:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=117772 Change 117772 by rwatson@rwatson_cinnamon_afs on 2007/04/09 21:40:15 Delete second copy of FreeBSD src tree in arla projects directory, likely a mistaken integ variation in earlier use of this branch. Affected files ... .. //depot/projects/arla/src/COPYRIGHT#2 delete .. //depot/projects/arla/src/LOCKS#2 delete .. //depot/projects/arla/src/MAINTAINERS#2 delete .. //depot/projects/arla/src/Makefile#2 delete .. //depot/projects/arla/src/Makefile.inc1#2 delete .. //depot/projects/arla/src/ObsoleteFiles.inc#2 delete .. //depot/projects/arla/src/README#2 delete .. //depot/projects/arla/src/UPDATING#2 delete .. //depot/projects/arla/src/bin/Makefile#2 delete .. //depot/projects/arla/src/bin/Makefile.inc#2 delete .. //depot/projects/arla/src/bin/cat/Makefile#2 delete .. //depot/projects/arla/src/bin/cat/cat.1#2 delete .. //depot/projects/arla/src/bin/cat/cat.c#2 delete .. //depot/projects/arla/src/bin/chflags/Makefile#2 delete .. //depot/projects/arla/src/bin/chflags/chflags.1#2 delete .. //depot/projects/arla/src/bin/chflags/chflags.c#2 delete .. //depot/projects/arla/src/bin/chio/Makefile#2 delete .. //depot/projects/arla/src/bin/chio/chio.1#2 delete .. //depot/projects/arla/src/bin/chio/chio.c#2 delete .. //depot/projects/arla/src/bin/chio/defs.h#2 delete .. //depot/projects/arla/src/bin/chio/pathnames.h#2 delete .. //depot/projects/arla/src/bin/chmod/Makefile#2 delete .. //depot/projects/arla/src/bin/chmod/chmod.1#2 delete .. //depot/projects/arla/src/bin/chmod/chmod.c#2 delete .. //depot/projects/arla/src/bin/cp/Makefile#2 delete .. //depot/projects/arla/src/bin/cp/cp.1#2 delete .. //depot/projects/arla/src/bin/cp/cp.c#2 delete .. //depot/projects/arla/src/bin/cp/extern.h#2 delete .. //depot/projects/arla/src/bin/cp/utils.c#2 delete .. //depot/projects/arla/src/bin/csh/Makefile#2 delete .. //depot/projects/arla/src/bin/csh/USD.doc/csh.1#2 delete .. //depot/projects/arla/src/bin/csh/USD.doc/csh.2#2 delete .. //depot/projects/arla/src/bin/csh/USD.doc/csh.3#2 delete .. //depot/projects/arla/src/bin/csh/USD.doc/csh.4#2 delete .. //depot/projects/arla/src/bin/csh/USD.doc/csh.a#2 delete .. //depot/projects/arla/src/bin/csh/USD.doc/csh.g#2 delete .. //depot/projects/arla/src/bin/csh/USD.doc/tabs#2 delete .. //depot/projects/arla/src/bin/csh/config.h#2 delete .. //depot/projects/arla/src/bin/csh/config_p.h#2 delete .. //depot/projects/arla/src/bin/csh/host.defs#2 delete .. //depot/projects/arla/src/bin/csh/iconv.h#2 delete .. //depot/projects/arla/src/bin/csh/iconv_stub.c#2 delete .. //depot/projects/arla/src/bin/date/Makefile#2 delete .. //depot/projects/arla/src/bin/date/date.1#2 delete .. //depot/projects/arla/src/bin/date/date.c#2 delete .. //depot/projects/arla/src/bin/date/extern.h#2 delete .. //depot/projects/arla/src/bin/date/netdate.c#2 delete .. //depot/projects/arla/src/bin/date/vary.c#2 delete .. //depot/projects/arla/src/bin/date/vary.h#2 delete .. //depot/projects/arla/src/bin/dd/Makefile#2 delete .. //depot/projects/arla/src/bin/dd/args.c#2 delete .. //depot/projects/arla/src/bin/dd/conv.c#2 delete .. //depot/projects/arla/src/bin/dd/conv_tab.c#2 delete .. //depot/projects/arla/src/bin/dd/dd.1#2 delete .. //depot/projects/arla/src/bin/dd/dd.c#2 delete .. //depot/projects/arla/src/bin/dd/dd.h#2 delete .. //depot/projects/arla/src/bin/dd/extern.h#2 delete .. //depot/projects/arla/src/bin/dd/gen.c#2 delete .. //depot/projects/arla/src/bin/dd/misc.c#2 delete .. //depot/projects/arla/src/bin/dd/position.c#2 delete .. //depot/projects/arla/src/bin/dd/ref.ascii#2 delete .. //depot/projects/arla/src/bin/dd/ref.ebcdic#2 delete .. //depot/projects/arla/src/bin/dd/ref.ibm#2 delete .. //depot/projects/arla/src/bin/dd/ref.lcase#2 delete .. //depot/projects/arla/src/bin/dd/ref.oldascii#2 delete .. //depot/projects/arla/src/bin/dd/ref.oldebcdic#2 delete .. //depot/projects/arla/src/bin/dd/ref.oldibm#2 delete .. //depot/projects/arla/src/bin/dd/ref.pareven#2 delete .. //depot/projects/arla/src/bin/dd/ref.parnone#2 delete .. //depot/projects/arla/src/bin/dd/ref.parodd#2 delete .. //depot/projects/arla/src/bin/dd/ref.parset#2 delete .. //depot/projects/arla/src/bin/dd/ref.swab#2 delete .. //depot/projects/arla/src/bin/dd/ref.ucase#2 delete .. //depot/projects/arla/src/bin/df/Makefile#2 delete .. //depot/projects/arla/src/bin/df/df.1#2 delete .. //depot/projects/arla/src/bin/df/df.c#2 delete .. //depot/projects/arla/src/bin/domainname/Makefile#2 delete .. //depot/projects/arla/src/bin/domainname/domainname.1#2 delete .. //depot/projects/arla/src/bin/domainname/domainname.c#2 delete .. //depot/projects/arla/src/bin/echo/Makefile#2 delete .. //depot/projects/arla/src/bin/echo/echo.1#2 delete .. //depot/projects/arla/src/bin/echo/echo.c#2 delete .. //depot/projects/arla/src/bin/ed/Makefile#2 delete .. //depot/projects/arla/src/bin/ed/POSIX#2 delete .. //depot/projects/arla/src/bin/ed/README#2 delete .. //depot/projects/arla/src/bin/ed/buf.c#2 delete .. //depot/projects/arla/src/bin/ed/cbc.c#2 delete .. //depot/projects/arla/src/bin/ed/ed.1#2 delete .. //depot/projects/arla/src/bin/ed/ed.h#2 delete .. //depot/projects/arla/src/bin/ed/glbl.c#2 delete .. //depot/projects/arla/src/bin/ed/io.c#2 delete .. //depot/projects/arla/src/bin/ed/main.c#2 delete .. //depot/projects/arla/src/bin/ed/re.c#2 delete .. //depot/projects/arla/src/bin/ed/sub.c#2 delete .. //depot/projects/arla/src/bin/ed/test/=.err#2 delete .. //depot/projects/arla/src/bin/ed/test/Makefile#2 delete .. //depot/projects/arla/src/bin/ed/test/README#2 delete .. //depot/projects/arla/src/bin/ed/test/TODO#2 delete .. //depot/projects/arla/src/bin/ed/test/a.d#2 delete .. //depot/projects/arla/src/bin/ed/test/a.r#2 delete .. //depot/projects/arla/src/bin/ed/test/a.t#2 delete .. //depot/projects/arla/src/bin/ed/test/a1.err#2 delete .. //depot/projects/arla/src/bin/ed/test/a2.err#2 delete .. //depot/projects/arla/src/bin/ed/test/addr.d#2 delete .. //depot/projects/arla/src/bin/ed/test/addr.r#2 delete .. //depot/projects/arla/src/bin/ed/test/addr.t#2 delete .. //depot/projects/arla/src/bin/ed/test/addr1.err#2 delete .. //depot/projects/arla/src/bin/ed/test/addr2.err#2 delete .. //depot/projects/arla/src/bin/ed/test/ascii.d.uu#2 delete .. //depot/projects/arla/src/bin/ed/test/ascii.r.uu#2 delete .. //depot/projects/arla/src/bin/ed/test/ascii.t#2 delete .. //depot/projects/arla/src/bin/ed/test/bang1.d#2 delete .. //depot/projects/arla/src/bin/ed/test/bang1.err#2 delete .. //depot/projects/arla/src/bin/ed/test/bang1.r#2 delete .. //depot/projects/arla/src/bin/ed/test/bang1.t#2 delete .. //depot/projects/arla/src/bin/ed/test/bang2.err#2 delete .. //depot/projects/arla/src/bin/ed/test/c.d#2 delete .. //depot/projects/arla/src/bin/ed/test/c.r#2 delete .. //depot/projects/arla/src/bin/ed/test/c.t#2 delete .. //depot/projects/arla/src/bin/ed/test/c1.err#2 delete .. //depot/projects/arla/src/bin/ed/test/c2.err#2 delete .. //depot/projects/arla/src/bin/ed/test/ckscripts.sh#2 delete .. //depot/projects/arla/src/bin/ed/test/d.d#2 delete .. //depot/projects/arla/src/bin/ed/test/d.err#2 delete .. //depot/projects/arla/src/bin/ed/test/d.r#2 delete .. //depot/projects/arla/src/bin/ed/test/d.t#2 delete .. //depot/projects/arla/src/bin/ed/test/e1.d#2 delete .. //depot/projects/arla/src/bin/ed/test/e1.err#2 delete .. //depot/projects/arla/src/bin/ed/test/e1.r#2 delete .. //depot/projects/arla/src/bin/ed/test/e1.t#2 delete .. //depot/projects/arla/src/bin/ed/test/e2.d#2 delete .. //depot/projects/arla/src/bin/ed/test/e2.err#2 delete .. //depot/projects/arla/src/bin/ed/test/e2.r#2 delete .. //depot/projects/arla/src/bin/ed/test/e2.t#2 delete .. //depot/projects/arla/src/bin/ed/test/e3.d#2 delete .. //depot/projects/arla/src/bin/ed/test/e3.err#2 delete .. //depot/projects/arla/src/bin/ed/test/e3.r#2 delete .. //depot/projects/arla/src/bin/ed/test/e3.t#2 delete .. //depot/projects/arla/src/bin/ed/test/e4.d#2 delete .. //depot/projects/arla/src/bin/ed/test/e4.r#2 delete .. //depot/projects/arla/src/bin/ed/test/e4.t#2 delete .. //depot/projects/arla/src/bin/ed/test/f1.err#2 delete .. //depot/projects/arla/src/bin/ed/test/f2.err#2 delete .. //depot/projects/arla/src/bin/ed/test/g1.d#2 delete .. //depot/projects/arla/src/bin/ed/test/g1.err#2 delete .. //depot/projects/arla/src/bin/ed/test/g1.r#2 delete .. //depot/projects/arla/src/bin/ed/test/g1.t#2 delete .. //depot/projects/arla/src/bin/ed/test/g2.d#2 delete .. //depot/projects/arla/src/bin/ed/test/g2.err#2 delete .. //depot/projects/arla/src/bin/ed/test/g2.r#2 delete .. //depot/projects/arla/src/bin/ed/test/g2.t#2 delete .. //depot/projects/arla/src/bin/ed/test/g3.d#2 delete .. //depot/projects/arla/src/bin/ed/test/g3.err#2 delete .. //depot/projects/arla/src/bin/ed/test/g3.r#2 delete .. //depot/projects/arla/src/bin/ed/test/g3.t#2 delete .. //depot/projects/arla/src/bin/ed/test/g4.d#2 delete .. //depot/projects/arla/src/bin/ed/test/g4.r#2 delete .. //depot/projects/arla/src/bin/ed/test/g4.t#2 delete .. //depot/projects/arla/src/bin/ed/test/g5.d#2 delete .. //depot/projects/arla/src/bin/ed/test/g5.r#2 delete .. //depot/projects/arla/src/bin/ed/test/g5.t#2 delete .. //depot/projects/arla/src/bin/ed/test/h.err#2 delete .. //depot/projects/arla/src/bin/ed/test/i.d#2 delete .. //depot/projects/arla/src/bin/ed/test/i.r#2 delete .. //depot/projects/arla/src/bin/ed/test/i.t#2 delete .. //depot/projects/arla/src/bin/ed/test/i1.err#2 delete .. //depot/projects/arla/src/bin/ed/test/i2.err#2 delete .. //depot/projects/arla/src/bin/ed/test/i3.err#2 delete .. //depot/projects/arla/src/bin/ed/test/j.d#2 delete .. //depot/projects/arla/src/bin/ed/test/j.r#2 delete .. //depot/projects/arla/src/bin/ed/test/j.t#2 delete .. //depot/projects/arla/src/bin/ed/test/k.d#2 delete .. //depot/projects/arla/src/bin/ed/test/k.r#2 delete .. //depot/projects/arla/src/bin/ed/test/k.t#2 delete .. //depot/projects/arla/src/bin/ed/test/k1.err#2 delete .. //depot/projects/arla/src/bin/ed/test/k2.err#2 delete .. //depot/projects/arla/src/bin/ed/test/k3.err#2 delete .. //depot/projects/arla/src/bin/ed/test/k4.err#2 delete .. //depot/projects/arla/src/bin/ed/test/l.d#2 delete .. //depot/projects/arla/src/bin/ed/test/l.r#2 delete .. //depot/projects/arla/src/bin/ed/test/l.t#2 delete .. //depot/projects/arla/src/bin/ed/test/m.d#2 delete .. //depot/projects/arla/src/bin/ed/test/m.err#2 delete .. //depot/projects/arla/src/bin/ed/test/m.r#2 delete .. //depot/projects/arla/src/bin/ed/test/m.t#2 delete .. //depot/projects/arla/src/bin/ed/test/mkscripts.sh#2 delete .. //depot/projects/arla/src/bin/ed/test/n.d#2 delete .. //depot/projects/arla/src/bin/ed/test/n.r#2 delete .. //depot/projects/arla/src/bin/ed/test/n.t#2 delete .. //depot/projects/arla/src/bin/ed/test/nl.err#2 delete .. //depot/projects/arla/src/bin/ed/test/nl1.d#2 delete .. //depot/projects/arla/src/bin/ed/test/nl1.r#2 delete .. //depot/projects/arla/src/bin/ed/test/nl1.t#2 delete .. //depot/projects/arla/src/bin/ed/test/nl2.d#2 delete .. //depot/projects/arla/src/bin/ed/test/nl2.r#2 delete .. //depot/projects/arla/src/bin/ed/test/nl2.t#2 delete .. //depot/projects/arla/src/bin/ed/test/p.d#2 delete .. //depot/projects/arla/src/bin/ed/test/p.r#2 delete .. //depot/projects/arla/src/bin/ed/test/p.t#2 delete .. //depot/projects/arla/src/bin/ed/test/q.d#2 delete .. //depot/projects/arla/src/bin/ed/test/q.r#2 delete .. //depot/projects/arla/src/bin/ed/test/q.t#2 delete .. //depot/projects/arla/src/bin/ed/test/q1.err#2 delete .. //depot/projects/arla/src/bin/ed/test/r1.d#2 delete .. //depot/projects/arla/src/bin/ed/test/r1.err#2 delete .. //depot/projects/arla/src/bin/ed/test/r1.r#2 delete .. //depot/projects/arla/src/bin/ed/test/r1.t#2 delete .. //depot/projects/arla/src/bin/ed/test/r2.d#2 delete .. //depot/projects/arla/src/bin/ed/test/r2.err#2 delete .. //depot/projects/arla/src/bin/ed/test/r2.r#2 delete .. //depot/projects/arla/src/bin/ed/test/r2.t#2 delete .. //depot/projects/arla/src/bin/ed/test/r3.d#2 delete .. //depot/projects/arla/src/bin/ed/test/r3.r#2 delete .. //depot/projects/arla/src/bin/ed/test/r3.t#2 delete .. //depot/projects/arla/src/bin/ed/test/s1.d#2 delete .. //depot/projects/arla/src/bin/ed/test/s1.err#2 delete .. //depot/projects/arla/src/bin/ed/test/s1.r#2 delete .. //depot/projects/arla/src/bin/ed/test/s1.t#2 delete .. //depot/projects/arla/src/bin/ed/test/s10.err#2 delete .. //depot/projects/arla/src/bin/ed/test/s2.d#2 delete .. //depot/projects/arla/src/bin/ed/test/s2.err#2 delete .. //depot/projects/arla/src/bin/ed/test/s2.r#2 delete .. //depot/projects/arla/src/bin/ed/test/s2.t#2 delete .. //depot/projects/arla/src/bin/ed/test/s3.d#2 delete .. //depot/projects/arla/src/bin/ed/test/s3.err#2 delete .. //depot/projects/arla/src/bin/ed/test/s3.r#2 delete .. //depot/projects/arla/src/bin/ed/test/s3.t#2 delete .. //depot/projects/arla/src/bin/ed/test/s4.err#2 delete .. //depot/projects/arla/src/bin/ed/test/s5.err#2 delete .. //depot/projects/arla/src/bin/ed/test/s6.err#2 delete .. //depot/projects/arla/src/bin/ed/test/s7.err#2 delete .. //depot/projects/arla/src/bin/ed/test/s8.err#2 delete .. //depot/projects/arla/src/bin/ed/test/s9.err#2 delete .. //depot/projects/arla/src/bin/ed/test/t.d#2 delete .. //depot/projects/arla/src/bin/ed/test/t.r#2 delete .. //depot/projects/arla/src/bin/ed/test/t1.d#2 delete .. //depot/projects/arla/src/bin/ed/test/t1.err#2 delete .. //depot/projects/arla/src/bin/ed/test/t1.r#2 delete .. //depot/projects/arla/src/bin/ed/test/t1.t#2 delete .. //depot/projects/arla/src/bin/ed/test/t2.d#2 delete .. //depot/projects/arla/src/bin/ed/test/t2.err#2 delete .. //depot/projects/arla/src/bin/ed/test/t2.r#2 delete .. //depot/projects/arla/src/bin/ed/test/t2.t#2 delete .. //depot/projects/arla/src/bin/ed/test/u.d#2 delete .. //depot/projects/arla/src/bin/ed/test/u.err#2 delete .. //depot/projects/arla/src/bin/ed/test/u.r#2 delete .. //depot/projects/arla/src/bin/ed/test/u.t#2 delete .. //depot/projects/arla/src/bin/ed/test/v.d#2 delete .. //depot/projects/arla/src/bin/ed/test/v.r#2 delete .. //depot/projects/arla/src/bin/ed/test/v.t#2 delete .. //depot/projects/arla/src/bin/ed/test/w.d#2 delete .. //depot/projects/arla/src/bin/ed/test/w.r#2 delete .. //depot/projects/arla/src/bin/ed/test/w.t#2 delete .. //depot/projects/arla/src/bin/ed/test/w1.err#2 delete .. //depot/projects/arla/src/bin/ed/test/w2.err#2 delete .. //depot/projects/arla/src/bin/ed/test/w3.err#2 delete .. //depot/projects/arla/src/bin/ed/test/x.err#2 delete .. //depot/projects/arla/src/bin/ed/test/z.err#2 delete .. //depot/projects/arla/src/bin/ed/undo.c#2 delete .. //depot/projects/arla/src/bin/expr/Makefile#2 delete .. //depot/projects/arla/src/bin/expr/expr.1#2 delete .. //depot/projects/arla/src/bin/expr/expr.y#2 delete .. //depot/projects/arla/src/bin/getfacl/Makefile#2 delete .. //depot/projects/arla/src/bin/getfacl/getfacl.1#2 delete .. //depot/projects/arla/src/bin/getfacl/getfacl.c#2 delete .. //depot/projects/arla/src/bin/hostname/Makefile#2 delete .. //depot/projects/arla/src/bin/hostname/hostname.1#2 delete .. //depot/projects/arla/src/bin/hostname/hostname.c#2 delete .. //depot/projects/arla/src/bin/kenv/Makefile#2 delete .. //depot/projects/arla/src/bin/kenv/kenv.1#2 delete .. //depot/projects/arla/src/bin/kenv/kenv.c#2 delete .. //depot/projects/arla/src/bin/kill/Makefile#2 delete .. //depot/projects/arla/src/bin/kill/kill.1#2 delete .. //depot/projects/arla/src/bin/kill/kill.c#2 delete .. //depot/projects/arla/src/bin/ln/Makefile#2 delete .. //depot/projects/arla/src/bin/ln/ln.1#2 delete .. //depot/projects/arla/src/bin/ln/ln.c#2 delete .. //depot/projects/arla/src/bin/ln/symlink.7#2 delete .. //depot/projects/arla/src/bin/ls/Makefile#2 delete .. //depot/projects/arla/src/bin/ls/cmp.c#2 delete .. //depot/projects/arla/src/bin/ls/extern.h#2 delete .. //depot/projects/arla/src/bin/ls/ls.1#2 delete .. //depot/projects/arla/src/bin/ls/ls.c#2 delete .. //depot/projects/arla/src/bin/ls/ls.h#2 delete .. //depot/projects/arla/src/bin/ls/print.c#2 delete .. //depot/projects/arla/src/bin/ls/util.c#2 delete .. //depot/projects/arla/src/bin/mkdir/Makefile#2 delete .. //depot/projects/arla/src/bin/mkdir/mkdir.1#2 delete .. //depot/projects/arla/src/bin/mkdir/mkdir.c#2 delete .. //depot/projects/arla/src/bin/mv/Makefile#2 delete .. //depot/projects/arla/src/bin/mv/mv.1#2 delete .. //depot/projects/arla/src/bin/mv/mv.c#2 delete .. //depot/projects/arla/src/bin/pax/Makefile#2 delete .. //depot/projects/arla/src/bin/pax/ar_io.c#2 delete .. //depot/projects/arla/src/bin/pax/ar_subs.c#2 delete .. //depot/projects/arla/src/bin/pax/buf_subs.c#2 delete .. //depot/projects/arla/src/bin/pax/cache.c#2 delete .. //depot/projects/arla/src/bin/pax/cache.h#2 delete .. //depot/projects/arla/src/bin/pax/cpio.1#2 delete .. //depot/projects/arla/src/bin/pax/cpio.c#2 delete .. //depot/projects/arla/src/bin/pax/cpio.h#2 delete .. //depot/projects/arla/src/bin/pax/extern.h#2 delete .. //depot/projects/arla/src/bin/pax/file_subs.c#2 delete .. //depot/projects/arla/src/bin/pax/ftree.c#2 delete .. //depot/projects/arla/src/bin/pax/ftree.h#2 delete .. //depot/projects/arla/src/bin/pax/gen_subs.c#2 delete .. //depot/projects/arla/src/bin/pax/getoldopt.c#2 delete .. //depot/projects/arla/src/bin/pax/options.c#2 delete .. //depot/projects/arla/src/bin/pax/options.h#2 delete .. //depot/projects/arla/src/bin/pax/pat_rep.c#2 delete .. //depot/projects/arla/src/bin/pax/pat_rep.h#2 delete .. //depot/projects/arla/src/bin/pax/pax.1#2 delete .. //depot/projects/arla/src/bin/pax/pax.c#2 delete .. //depot/projects/arla/src/bin/pax/pax.h#2 delete .. //depot/projects/arla/src/bin/pax/sel_subs.c#2 delete .. //depot/projects/arla/src/bin/pax/sel_subs.h#2 delete .. //depot/projects/arla/src/bin/pax/tables.c#2 delete .. //depot/projects/arla/src/bin/pax/tables.h#2 delete .. //depot/projects/arla/src/bin/pax/tar.1#2 delete .. //depot/projects/arla/src/bin/pax/tar.c#2 delete .. //depot/projects/arla/src/bin/pax/tar.h#2 delete .. //depot/projects/arla/src/bin/pax/tty_subs.c#2 delete .. //depot/projects/arla/src/bin/ps/Makefile#2 delete .. //depot/projects/arla/src/bin/ps/extern.h#2 delete .. //depot/projects/arla/src/bin/ps/fmt.c#2 delete .. //depot/projects/arla/src/bin/ps/keyword.c#2 delete .. //depot/projects/arla/src/bin/ps/nlist.c#2 delete .. //depot/projects/arla/src/bin/ps/print.c#2 delete .. //depot/projects/arla/src/bin/ps/ps.1#2 delete .. //depot/projects/arla/src/bin/ps/ps.c#2 delete .. //depot/projects/arla/src/bin/ps/ps.h#2 delete .. //depot/projects/arla/src/bin/pwd/Makefile#2 delete .. //depot/projects/arla/src/bin/pwd/pwd.1#2 delete .. //depot/projects/arla/src/bin/pwd/pwd.c#2 delete .. //depot/projects/arla/src/bin/rcp/Makefile#2 delete .. //depot/projects/arla/src/bin/rcp/extern.h#2 delete .. //depot/projects/arla/src/bin/rcp/rcp.1#2 delete .. //depot/projects/arla/src/bin/rcp/rcp.c#2 delete .. //depot/projects/arla/src/bin/rcp/util.c#2 delete .. //depot/projects/arla/src/bin/realpath/Makefile#2 delete .. //depot/projects/arla/src/bin/realpath/realpath.1#2 delete .. //depot/projects/arla/src/bin/realpath/realpath.c#2 delete .. //depot/projects/arla/src/bin/rm/Makefile#2 delete .. //depot/projects/arla/src/bin/rm/rm.1#2 delete .. //depot/projects/arla/src/bin/rm/rm.c#2 delete .. //depot/projects/arla/src/bin/rmail/Makefile#2 delete .. //depot/projects/arla/src/bin/rmdir/Makefile#2 delete .. //depot/projects/arla/src/bin/rmdir/rmdir.1#2 delete .. //depot/projects/arla/src/bin/rmdir/rmdir.c#2 delete .. //depot/projects/arla/src/bin/setfacl/Makefile#2 delete .. //depot/projects/arla/src/bin/setfacl/file.c#2 delete .. //depot/projects/arla/src/bin/setfacl/mask.c#2 delete .. //depot/projects/arla/src/bin/setfacl/merge.c#2 delete .. //depot/projects/arla/src/bin/setfacl/remove.c#2 delete .. //depot/projects/arla/src/bin/setfacl/setfacl.1#2 delete .. //depot/projects/arla/src/bin/setfacl/setfacl.c#2 delete .. //depot/projects/arla/src/bin/setfacl/setfacl.h#2 delete .. //depot/projects/arla/src/bin/setfacl/util.c#2 delete .. //depot/projects/arla/src/bin/sh/Makefile#2 delete .. //depot/projects/arla/src/bin/sh/TOUR#2 delete .. //depot/projects/arla/src/bin/sh/alias.c#2 delete .. //depot/projects/arla/src/bin/sh/alias.h#2 delete .. //depot/projects/arla/src/bin/sh/arith.h#2 delete .. //depot/projects/arla/src/bin/sh/arith.y#2 delete .. //depot/projects/arla/src/bin/sh/arith_lex.l#2 delete .. //depot/projects/arla/src/bin/sh/bltin/bltin.h#2 delete .. //depot/projects/arla/src/bin/sh/bltin/echo.1#2 delete .. //depot/projects/arla/src/bin/sh/bltin/echo.c#2 delete .. //depot/projects/arla/src/bin/sh/builtins.def#2 delete .. //depot/projects/arla/src/bin/sh/cd.c#2 delete .. //depot/projects/arla/src/bin/sh/cd.h#2 delete .. //depot/projects/arla/src/bin/sh/error.c#2 delete .. //depot/projects/arla/src/bin/sh/error.h#2 delete .. //depot/projects/arla/src/bin/sh/eval.c#2 delete .. //depot/projects/arla/src/bin/sh/eval.h#2 delete .. //depot/projects/arla/src/bin/sh/exec.c#2 delete .. //depot/projects/arla/src/bin/sh/exec.h#2 delete .. //depot/projects/arla/src/bin/sh/expand.c#2 delete .. //depot/projects/arla/src/bin/sh/expand.h#2 delete .. //depot/projects/arla/src/bin/sh/funcs/cmv#2 delete .. //depot/projects/arla/src/bin/sh/funcs/dirs#2 delete .. //depot/projects/arla/src/bin/sh/funcs/kill#2 delete .. //depot/projects/arla/src/bin/sh/funcs/login#2 delete .. //depot/projects/arla/src/bin/sh/funcs/newgrp#2 delete .. //depot/projects/arla/src/bin/sh/funcs/popd#2 delete .. //depot/projects/arla/src/bin/sh/funcs/pushd#2 delete .. //depot/projects/arla/src/bin/sh/funcs/suspend#2 delete .. //depot/projects/arla/src/bin/sh/histedit.c#2 delete .. //depot/projects/arla/src/bin/sh/init.h#2 delete .. //depot/projects/arla/src/bin/sh/input.c#2 delete .. //depot/projects/arla/src/bin/sh/input.h#2 delete .. //depot/projects/arla/src/bin/sh/jobs.c#2 delete .. //depot/projects/arla/src/bin/sh/jobs.h#2 delete .. //depot/projects/arla/src/bin/sh/mail.c#2 delete .. //depot/projects/arla/src/bin/sh/mail.h#2 delete .. //depot/projects/arla/src/bin/sh/main.c#2 delete .. //depot/projects/arla/src/bin/sh/main.h#2 delete .. //depot/projects/arla/src/bin/sh/memalloc.c#2 delete .. //depot/projects/arla/src/bin/sh/memalloc.h#2 delete .. //depot/projects/arla/src/bin/sh/miscbltin.c#2 delete .. //depot/projects/arla/src/bin/sh/mkbuiltins#2 delete .. //depot/projects/arla/src/bin/sh/mkinit.c#2 delete .. //depot/projects/arla/src/bin/sh/mknodes.c#2 delete .. //depot/projects/arla/src/bin/sh/mksyntax.c#2 delete .. //depot/projects/arla/src/bin/sh/mktokens#2 delete .. //depot/projects/arla/src/bin/sh/myhistedit.h#2 delete .. //depot/projects/arla/src/bin/sh/mystring.c#2 delete .. //depot/projects/arla/src/bin/sh/mystring.h#2 delete .. //depot/projects/arla/src/bin/sh/nodes.c.pat#2 delete .. //depot/projects/arla/src/bin/sh/nodetypes#2 delete .. //depot/projects/arla/src/bin/sh/options.c#2 delete .. //depot/projects/arla/src/bin/sh/options.h#2 delete .. //depot/projects/arla/src/bin/sh/output.c#2 delete .. //depot/projects/arla/src/bin/sh/output.h#2 delete .. //depot/projects/arla/src/bin/sh/parser.c#2 delete .. //depot/projects/arla/src/bin/sh/parser.h#2 delete .. //depot/projects/arla/src/bin/sh/redir.c#2 delete .. //depot/projects/arla/src/bin/sh/redir.h#2 delete .. //depot/projects/arla/src/bin/sh/sh.1#2 delete .. //depot/projects/arla/src/bin/sh/shell.h#2 delete .. //depot/projects/arla/src/bin/sh/show.c#2 delete .. //depot/projects/arla/src/bin/sh/show.h#2 delete .. //depot/projects/arla/src/bin/sh/trap.c#2 delete .. //depot/projects/arla/src/bin/sh/trap.h#2 delete .. //depot/projects/arla/src/bin/sh/var.c#2 delete .. //depot/projects/arla/src/bin/sh/var.h#2 delete .. //depot/projects/arla/src/bin/sleep/Makefile#2 delete .. //depot/projects/arla/src/bin/sleep/sleep.1#2 delete .. //depot/projects/arla/src/bin/sleep/sleep.c#2 delete .. //depot/projects/arla/src/bin/stty/Makefile#2 delete .. //depot/projects/arla/src/bin/stty/cchar.c#2 delete .. //depot/projects/arla/src/bin/stty/extern.h#2 delete .. //depot/projects/arla/src/bin/stty/gfmt.c#2 delete .. //depot/projects/arla/src/bin/stty/key.c#2 delete .. //depot/projects/arla/src/bin/stty/modes.c#2 delete .. //depot/projects/arla/src/bin/stty/print.c#2 delete .. //depot/projects/arla/src/bin/stty/stty.1#2 delete .. //depot/projects/arla/src/bin/stty/stty.c#2 delete .. //depot/projects/arla/src/bin/stty/stty.h#2 delete .. //depot/projects/arla/src/bin/stty/util.c#2 delete .. //depot/projects/arla/src/bin/sync/Makefile#2 delete .. //depot/projects/arla/src/bin/sync/sync.8#2 delete .. //depot/projects/arla/src/bin/sync/sync.c#2 delete .. //depot/projects/arla/src/bin/test/Makefile#2 delete .. //depot/projects/arla/src/bin/test/TEST.README#2 delete .. //depot/projects/arla/src/bin/test/TEST.csh#2 delete .. //depot/projects/arla/src/bin/test/TEST.sh#2 delete .. //depot/projects/arla/src/bin/test/test.1#2 delete .. //depot/projects/arla/src/bin/test/test.c#2 delete .. //depot/projects/arla/src/contrib/amd/AUTHORS#2 delete .. //depot/projects/arla/src/contrib/amd/BUGS#2 delete .. //depot/projects/arla/src/contrib/amd/COPYING#2 delete .. //depot/projects/arla/src/contrib/amd/ChangeLog#2 delete .. //depot/projects/arla/src/contrib/amd/FREEBSD-Xlist#2 delete .. //depot/projects/arla/src/contrib/amd/FREEBSD-upgrade#2 delete .. //depot/projects/arla/src/contrib/amd/INSTALL#2 delete .. //depot/projects/arla/src/contrib/amd/MIRRORS.html#2 delete .. //depot/projects/arla/src/contrib/amd/MIRRORS.txt#2 delete .. //depot/projects/arla/src/contrib/amd/NEWS#2 delete .. //depot/projects/arla/src/contrib/amd/README#2 delete .. //depot/projects/arla/src/contrib/amd/README.ldap#2 delete .. //depot/projects/arla/src/contrib/amd/README.y2k#2 delete .. //depot/projects/arla/src/contrib/amd/amd/am_ops.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/amd.8#2 delete .. //depot/projects/arla/src/contrib/amd/amd/amd.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/amd.h#2 delete .. //depot/projects/arla/src/contrib/amd/amd/amfs_auto.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/amfs_direct.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/amfs_error.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/amfs_host.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/amfs_inherit.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/amfs_link.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/amfs_linkx.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/amfs_nfsl.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/amfs_nfsx.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/amfs_program.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/amfs_root.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/amfs_toplvl.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/amfs_union.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/amq_subr.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/amq_svc.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/autil.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/clock.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/conf.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/conf_parse.y#2 delete .. //depot/projects/arla/src/contrib/amd/amd/conf_tok.l#2 delete .. //depot/projects/arla/src/contrib/amd/amd/get_args.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/info_file.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/info_hesiod.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/info_ldap.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/info_ndbm.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/info_nis.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/info_nisplus.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/info_passwd.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/info_union.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/map.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/mapc.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/mntfs.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/nfs_prot_svc.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/nfs_start.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/nfs_subr.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/ops_TEMPLATE.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/ops_cachefs.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/ops_cdfs.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/ops_efs.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/ops_lofs.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/ops_mfs.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/ops_nfs.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/ops_nfs3.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/ops_nullfs.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/ops_pcfs.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/ops_tfs.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/ops_tmpfs.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/ops_ufs.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/ops_umapfs.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/ops_unionfs.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/ops_xfs.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/opts.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/restart.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/rpc_fwd.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/sched.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/srvr_amfs_auto.c#2 delete .. //depot/projects/arla/src/contrib/amd/amd/srvr_nfs.c#2 delete .. //depot/projects/arla/src/contrib/amd/amq/amq.8#2 delete .. //depot/projects/arla/src/contrib/amd/amq/amq.c#2 delete .. //depot/projects/arla/src/contrib/amd/amq/amq.h#2 delete .. //depot/projects/arla/src/contrib/amd/amq/amq_clnt.c#2 delete .. //depot/projects/arla/src/contrib/amd/amq/amq_xdr.c#2 delete .. //depot/projects/arla/src/contrib/amd/amq/pawd.1#2 delete .. //depot/projects/arla/src/contrib/amd/amq/pawd.c#2 delete .. //depot/projects/arla/src/contrib/amd/aux_conf.h.in#2 delete .. //depot/projects/arla/src/contrib/amd/bootstrap#2 delete .. //depot/projects/arla/src/contrib/amd/conf/checkmount/checkmount_bsd44.c#2 delete .. //depot/projects/arla/src/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#2 delete .. //depot/projects/arla/src/contrib/amd/conf/mtab/mtab_bsd.c#2 delete .. //depot/projects/arla/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#2 delete .. //depot/projects/arla/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#2 delete .. //depot/projects/arla/src/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#2 delete .. //depot/projects/arla/src/contrib/amd/conf/transp/transp_sockets.c#2 delete .. //depot/projects/arla/src/contrib/amd/conf/trap/trap_default.h#2 delete .. //depot/projects/arla/src/contrib/amd/conf/umount/umount_bsd44.c#2 delete .. //depot/projects/arla/src/contrib/amd/doc/am-utils.texi#2 delete .. //depot/projects/arla/src/contrib/amd/doc/texinfo.tex#2 delete .. //depot/projects/arla/src/contrib/amd/doc/version.texi#2 delete .. //depot/projects/arla/src/contrib/amd/fixmount/fixmount.8#2 delete .. //depot/projects/arla/src/contrib/amd/fixmount/fixmount.c#2 delete .. //depot/projects/arla/src/contrib/amd/fsinfo/fsi_analyze.c#2 delete .. //depot/projects/arla/src/contrib/amd/fsinfo/fsi_data.h#2 delete .. //depot/projects/arla/src/contrib/amd/fsinfo/fsi_dict.c#2 delete .. //depot/projects/arla/src/contrib/amd/fsinfo/fsi_gram.y#2 delete .. //depot/projects/arla/src/contrib/amd/fsinfo/fsi_lex.l#2 delete .. //depot/projects/arla/src/contrib/amd/fsinfo/fsi_util.c#2 delete .. //depot/projects/arla/src/contrib/amd/fsinfo/fsinfo.8#2 delete .. //depot/projects/arla/src/contrib/amd/fsinfo/fsinfo.c#2 delete .. //depot/projects/arla/src/contrib/amd/fsinfo/fsinfo.h#2 delete .. //depot/projects/arla/src/contrib/amd/fsinfo/wr_atab.c#2 delete .. //depot/projects/arla/src/contrib/amd/fsinfo/wr_bparam.c#2 delete .. //depot/projects/arla/src/contrib/amd/fsinfo/wr_dumpset.c#2 delete .. //depot/projects/arla/src/contrib/amd/fsinfo/wr_exportfs.c#2 delete .. //depot/projects/arla/src/contrib/amd/fsinfo/wr_fstab.c#2 delete .. //depot/projects/arla/src/contrib/amd/hlfsd/hlfsd.8#2 delete .. //depot/projects/arla/src/contrib/amd/hlfsd/hlfsd.c#2 delete .. //depot/projects/arla/src/contrib/amd/hlfsd/hlfsd.h#2 delete .. //depot/projects/arla/src/contrib/amd/hlfsd/homedir.c#2 delete .. //depot/projects/arla/src/contrib/amd/hlfsd/nfs_prot_svc.c#2 delete .. //depot/projects/arla/src/contrib/amd/hlfsd/stubs.c#2 delete .. //depot/projects/arla/src/contrib/amd/include/am_compat.h#2 delete .. //depot/projects/arla/src/contrib/amd/include/am_defs.h#2 delete .. //depot/projects/arla/src/contrib/amd/include/am_utils.h#2 delete .. //depot/projects/arla/src/contrib/amd/include/am_xdr_func.h#2 delete .. //depot/projects/arla/src/contrib/amd/include/amq_defs.h#2 delete .. //depot/projects/arla/src/contrib/amd/include/mount_headers1.h#2 delete .. //depot/projects/arla/src/contrib/amd/include/mount_headers2.h#2 delete .. //depot/projects/arla/src/contrib/amd/ldap-id.ms#2 delete .. //depot/projects/arla/src/contrib/amd/ldap-id.txt#2 delete .. //depot/projects/arla/src/contrib/amd/libamu/alloca.c#2 delete .. //depot/projects/arla/src/contrib/amd/libamu/amu.h#2 delete .. //depot/projects/arla/src/contrib/amd/libamu/hasmntopt.c#2 delete .. //depot/projects/arla/src/contrib/amd/libamu/misc_rpc.c#2 delete .. //depot/projects/arla/src/contrib/amd/libamu/mount_fs.c#2 delete .. //depot/projects/arla/src/contrib/amd/libamu/mtab.c#2 delete .. //depot/projects/arla/src/contrib/amd/libamu/nfs_prot_xdr.c#2 delete .. //depot/projects/arla/src/contrib/amd/libamu/strerror.c#2 delete .. //depot/projects/arla/src/contrib/amd/libamu/util.c#2 delete .. //depot/projects/arla/src/contrib/amd/libamu/wire.c#2 delete .. //depot/projects/arla/src/contrib/amd/libamu/xdr_func.c#2 delete .. //depot/projects/arla/src/contrib/amd/libamu/xutil.c#2 delete .. //depot/projects/arla/src/contrib/amd/m4/GNUmakefile#2 delete .. //depot/projects/arla/src/contrib/amd/m4/amdgrep#2 delete .. //depot/projects/arla/src/contrib/amd/m4/amindent#2 delete .. //depot/projects/arla/src/contrib/amd/m4/autopat#2 delete .. //depot/projects/arla/src/contrib/amd/m4/chop-aclocal.pl#2 delete .. //depot/projects/arla/src/contrib/amd/m4/copy-if-newbig#2 delete .. //depot/projects/arla/src/contrib/amd/m4/macros/HEADER#2 delete .. //depot/projects/arla/src/contrib/amd/m4/macros/TRAILER#2 delete .. //depot/projects/arla/src/contrib/amd/m4/mk-aclocal#2 delete .. //depot/projects/arla/src/contrib/amd/m4/mkconf#2 delete .. //depot/projects/arla/src/contrib/amd/m4/rmtspc#2 delete .. //depot/projects/arla/src/contrib/amd/m4/update_build_version#2 delete .. //depot/projects/arla/src/contrib/amd/mk-amd-map/mk-amd-map.8#2 delete .. //depot/projects/arla/src/contrib/amd/mk-amd-map/mk-amd-map.c#2 delete .. //depot/projects/arla/src/contrib/amd/scripts/Makefile.am#2 delete .. //depot/projects/arla/src/contrib/amd/scripts/Makefile.in#2 delete .. //depot/projects/arla/src/contrib/amd/scripts/am-eject.in#2 delete .. //depot/projects/arla/src/contrib/amd/scripts/amd.conf-sample#2 delete .. //depot/projects/arla/src/contrib/amd/scripts/amd.conf.5#2 delete .. //depot/projects/arla/src/contrib/amd/scripts/amd2ldif.in#2 delete .. //depot/projects/arla/src/contrib/amd/scripts/amd2sun.in#2 delete .. //depot/projects/arla/src/contrib/amd/scripts/automount2amd.8#2 delete .. //depot/projects/arla/src/contrib/amd/scripts/automount2amd.in#2 delete .. //depot/projects/arla/src/contrib/amd/scripts/ctl-amd.in#2 delete .. //depot/projects/arla/src/contrib/amd/scripts/ctl-hlfsd.in#2 delete .. //depot/projects/arla/src/contrib/amd/scripts/expn.1#2 delete .. //depot/projects/arla/src/contrib/amd/scripts/expn.in#2 delete .. //depot/projects/arla/src/contrib/amd/scripts/fix-amd-map.in#2 delete .. //depot/projects/arla/src/contrib/amd/scripts/fixrmtab.in#2 delete .. //depot/projects/arla/src/contrib/amd/scripts/redhat-ctl-amd.in#2 delete .. //depot/projects/arla/src/contrib/amd/scripts/wait4amd.in#2 delete .. //depot/projects/arla/src/contrib/amd/scripts/wait4amd2die.in#2 delete .. //depot/projects/arla/src/contrib/amd/tasks#2 delete .. //depot/projects/arla/src/contrib/amd/wire-test/wire-test.8#2 delete .. //depot/projects/arla/src/contrib/amd/wire-test/wire-test.c#2 delete .. //depot/projects/arla/src/contrib/bc/AUTHORS#2 delete .. //depot/projects/arla/src/contrib/bc/ChangeLog#2 delete .. //depot/projects/arla/src/contrib/bc/Examples/ckbook.b#2 delete .. //depot/projects/arla/src/contrib/bc/Examples/pi.b#2 delete .. //depot/projects/arla/src/contrib/bc/Examples/primes.b#2 delete .. //depot/projects/arla/src/contrib/bc/Examples/twins.b#2 delete .. //depot/projects/arla/src/contrib/bc/FAQ#2 delete .. //depot/projects/arla/src/contrib/bc/FREEBSD-upgrade#2 delete .. //depot/projects/arla/src/contrib/bc/INSTALL#2 delete .. //depot/projects/arla/src/contrib/bc/Makefile.am#2 delete .. //depot/projects/arla/src/contrib/bc/Makefile.in#2 delete .. //depot/projects/arla/src/contrib/bc/NEWS#2 delete .. //depot/projects/arla/src/contrib/bc/README#2 delete .. //depot/projects/arla/src/contrib/bc/Test/BUG.bc#2 delete .. //depot/projects/arla/src/contrib/bc/Test/array.b#2 delete .. //depot/projects/arla/src/contrib/bc/Test/arrayp.b#2 delete .. //depot/projects/arla/src/contrib/bc/Test/aryprm.b#2 delete .. //depot/projects/arla/src/contrib/bc/Test/atan.b#2 delete .. //depot/projects/arla/src/contrib/bc/Test/checklib.b#2 delete .. //depot/projects/arla/src/contrib/bc/Test/div.b#2 delete .. //depot/projects/arla/src/contrib/bc/Test/exp.b#2 delete .. //depot/projects/arla/src/contrib/bc/Test/fact.b#2 delete .. //depot/projects/arla/src/contrib/bc/Test/jn.b#2 delete .. //depot/projects/arla/src/contrib/bc/Test/ln.b#2 delete .. //depot/projects/arla/src/contrib/bc/Test/mul.b#2 delete .. //depot/projects/arla/src/contrib/bc/Test/raise.b#2 delete .. //depot/projects/arla/src/contrib/bc/Test/signum#2 delete .. //depot/projects/arla/src/contrib/bc/Test/sine.b#2 delete .. //depot/projects/arla/src/contrib/bc/Test/sqrt.b#2 delete .. //depot/projects/arla/src/contrib/bc/Test/sqrt1.b#2 delete .. //depot/projects/arla/src/contrib/bc/Test/sqrt2.b#2 delete .. //depot/projects/arla/src/contrib/bc/Test/testfn.b#2 delete .. //depot/projects/arla/src/contrib/bc/Test/timetest#2 delete .. //depot/projects/arla/src/contrib/bc/acconfig.h#2 delete .. //depot/projects/arla/src/contrib/bc/aclocal.m4#2 delete .. //depot/projects/arla/src/contrib/bc/bc/Makefile.am#2 delete .. //depot/projects/arla/src/contrib/bc/bc/Makefile.in#2 delete .. //depot/projects/arla/src/contrib/bc/bc/bc.y#2 delete .. //depot/projects/arla/src/contrib/bc/bc/bcdefs.h#2 delete .. //depot/projects/arla/src/contrib/bc/bc/const.h#2 delete .. //depot/projects/arla/src/contrib/bc/bc/execute.c#2 delete .. //depot/projects/arla/src/contrib/bc/bc/fix-libmath_h#2 delete .. //depot/projects/arla/src/contrib/bc/bc/global.c#2 delete .. //depot/projects/arla/src/contrib/bc/bc/global.h#2 delete .. //depot/projects/arla/src/contrib/bc/bc/libmath.b#2 delete .. //depot/projects/arla/src/contrib/bc/bc/libmath.h#2 delete .. //depot/projects/arla/src/contrib/bc/bc/load.c#2 delete .. //depot/projects/arla/src/contrib/bc/bc/main.c#2 delete .. //depot/projects/arla/src/contrib/bc/bc/proto.h#2 delete .. //depot/projects/arla/src/contrib/bc/bc/sbc.y#2 delete .. //depot/projects/arla/src/contrib/bc/bc/scan.l#2 delete .. //depot/projects/arla/src/contrib/bc/bc/storage.c#2 delete .. //depot/projects/arla/src/contrib/bc/bc/util.c#2 delete .. //depot/projects/arla/src/contrib/bc/config.h.in#2 delete .. //depot/projects/arla/src/contrib/bc/configure#2 delete .. //depot/projects/arla/src/contrib/bc/configure.in#2 delete .. //depot/projects/arla/src/contrib/bc/dc/Makefile.am#2 delete .. //depot/projects/arla/src/contrib/bc/dc/Makefile.in#2 delete .. //depot/projects/arla/src/contrib/bc/dc/array.c#2 delete .. //depot/projects/arla/src/contrib/bc/dc/dc-proto.h#2 delete .. //depot/projects/arla/src/contrib/bc/dc/dc-regdef.h#2 delete .. //depot/projects/arla/src/contrib/bc/dc/dc.c#2 delete .. //depot/projects/arla/src/contrib/bc/dc/dc.h#2 delete .. //depot/projects/arla/src/contrib/bc/dc/eval.c#2 delete .. //depot/projects/arla/src/contrib/bc/dc/misc.c#2 delete .. //depot/projects/arla/src/contrib/bc/dc/numeric.c#2 delete .. //depot/projects/arla/src/contrib/bc/dc/stack.c#2 delete .. //depot/projects/arla/src/contrib/bc/dc/string.c#2 delete .. //depot/projects/arla/src/contrib/bc/doc/Makefile.am#2 delete .. //depot/projects/arla/src/contrib/bc/doc/Makefile.in#2 delete .. //depot/projects/arla/src/contrib/bc/doc/bc.1#2 delete .. //depot/projects/arla/src/contrib/bc/doc/bc.texi#2 delete .. //depot/projects/arla/src/contrib/bc/doc/dc.1#2 delete .. //depot/projects/arla/src/contrib/bc/doc/dc.texi#2 delete .. //depot/projects/arla/src/contrib/bc/h/number.h#2 delete .. //depot/projects/arla/src/contrib/bc/install-sh#2 delete .. //depot/projects/arla/src/contrib/bc/lib/Makefile.am#2 delete .. //depot/projects/arla/src/contrib/bc/lib/Makefile.in#2 delete .. //depot/projects/arla/src/contrib/bc/lib/number.c#2 delete .. //depot/projects/arla/src/contrib/bc/lib/testmul.c#2 delete .. //depot/projects/arla/src/contrib/bc/lib/vfprintf.c#2 delete .. //depot/projects/arla/src/contrib/bc/missing#2 delete .. //depot/projects/arla/src/contrib/bc/mkinstalldirs#2 delete .. //depot/projects/arla/src/contrib/bc/stamp-h.in#2 delete .. //depot/projects/arla/src/contrib/bind9/CHANGES#2 delete .. //depot/projects/arla/src/contrib/bind9/COPYRIGHT#2 delete .. //depot/projects/arla/src/contrib/bind9/FAQ#2 delete .. //depot/projects/arla/src/contrib/bind9/FAQ.xml#2 delete .. //depot/projects/arla/src/contrib/bind9/FREEBSD-Upgrade#2 delete .. //depot/projects/arla/src/contrib/bind9/FREEBSD-Xlist#2 delete .. //depot/projects/arla/src/contrib/bind9/Makefile.in#2 delete .. //depot/projects/arla/src/contrib/bind9/README#2 delete .. //depot/projects/arla/src/contrib/bind9/acconfig.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/Makefile.in#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/check/Makefile.in#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/check/check-tool.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/check/check-tool.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/check/named-checkconf.8#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/check/named-checkconf.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/check/named-checkconf.docbook#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/check/named-checkconf.html#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/check/named-checkzone.8#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/check/named-checkzone.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/check/named-checkzone.docbook#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/check/named-checkzone.html#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/dig/Makefile.in#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/dig/dig.1#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/dig/dig.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/dig/dig.docbook#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/dig/dig.html#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/dig/dighost.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/dig/host.1#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/dig/host.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/dig/host.docbook#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/dig/host.html#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/dig/include/dig/dig.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/dig/nslookup.1#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/dig/nslookup.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/dig/nslookup.docbook#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/dig/nslookup.html#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/dnssec/Makefile.in#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/dnssec/dnssec-keygen.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/dnssec/dnssectool.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/dnssec/dnssectool.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/Makefile.in#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/aclconf.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/builtin.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/client.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/config.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/control.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/controlconf.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/include/named/aclconf.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/include/named/builtin.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/include/named/client.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/include/named/config.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/include/named/control.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/include/named/globals.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/include/named/interfacemgr.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/include/named/listenlist.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/include/named/log.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/include/named/logconf.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/include/named/lwaddr.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/include/named/lwdclient.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/include/named/lwresd.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/include/named/lwsearch.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/include/named/main.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/include/named/notify.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/include/named/ns_smf_globals.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/include/named/query.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/include/named/server.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/include/named/sortlist.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/include/named/tkeyconf.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/include/named/tsigconf.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/include/named/types.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/include/named/update.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/include/named/xfrout.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/include/named/zoneconf.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/interfacemgr.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/listenlist.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/log.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/logconf.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/lwaddr.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/lwdclient.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/lwderror.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/lwdgabn.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/lwdgnba.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/lwdgrbn.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/lwdnoop.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/lwresd.8#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/lwresd.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/lwresd.docbook#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/lwresd.html#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/lwsearch.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/main.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/named.8#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/named.conf.5#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/named.conf.docbook#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/named.conf.html#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/named.docbook#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/named.html#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/notify.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/query.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/server.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/sortlist.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/tkeyconf.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/tsigconf.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/unix/Makefile.in#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/unix/include/named/os.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/unix/os.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/update.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/xfrout.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/named/zoneconf.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/nsupdate/Makefile.in#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/nsupdate/nsupdate.8#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/nsupdate/nsupdate.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/nsupdate/nsupdate.html#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/rndc/Makefile.in#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/rndc/include/rndc/os.h#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/rndc/rndc-confgen.8#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/rndc/rndc-confgen.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/rndc/rndc-confgen.html#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/rndc/rndc.8#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/rndc/rndc.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/rndc/rndc.conf#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/rndc/rndc.conf.5#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/rndc/rndc.conf.docbook#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/rndc/rndc.conf.html#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/rndc/rndc.docbook#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/rndc/rndc.html#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/rndc/unix/Makefile.in#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/rndc/unix/os.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/rndc/util.c#2 delete .. //depot/projects/arla/src/contrib/bind9/bin/rndc/util.h#2 delete .. //depot/projects/arla/src/contrib/bind9/config.guess#2 delete .. //depot/projects/arla/src/contrib/bind9/config.sub#2 delete .. //depot/projects/arla/src/contrib/bind9/config.threads.in#2 delete .. //depot/projects/arla/src/contrib/bind9/configure.in#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/Makefile.in#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/arm/Bv9ARM.html#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/arm/Bv9ARM.pdf#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/arm/Makefile.in#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/arm/README-SGML#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/draft/update#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/misc/Makefile.in#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/misc/dnssec#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/misc/format-options.pl#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/misc/ipv6#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/misc/migration#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/misc/migration-4to9#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/misc/options#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/misc/rfc-compliance#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/misc/roadmap#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/misc/sdb#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/index#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc1032.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc1033.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc1034.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc1035.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc1101.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc1122.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc1123.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc1183.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc1348.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc1535.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc1536.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc1537.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc1591.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc1611.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc1612.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc1706.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc1712.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc1750.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc1876.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc1886.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc1982.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc1995.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc1996.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2052.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2104.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2119.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2133.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2136.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2137.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2163.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2168.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2181.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2230.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2308.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2317.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2373.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2374.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2375.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2418.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2535.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2536.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2537.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2538.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2539.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2540.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2541.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2553.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2671.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2672.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2673.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2782.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2825.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2826.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2845.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2874.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2915.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2929.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2930.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc2931.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc3007.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc3008.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc3071.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc3090.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc3110.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc3123.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc3152.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc3197.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc3225.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc3226.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc3258.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc3363.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc3364.txt#2 delete .. //depot/projects/arla/src/contrib/bind9/doc/rfc/rfc3425.txt#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 9 22:09:32 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD7DD16A403; Mon, 9 Apr 2007 22:09:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B418F16A40A for ; Mon, 9 Apr 2007 22:09:31 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8B86113C4BA for ; Mon, 9 Apr 2007 22:09:31 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l39M9Vc3083221 for ; Mon, 9 Apr 2007 22:09:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l39M9Vvn083218 for perforce@freebsd.org; Mon, 9 Apr 2007 22:09:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 9 Apr 2007 22:09:31 GMT Message-Id: <200704092209.l39M9Vvn083218@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 117776 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2007 22:09:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=117776 Change 117776 by rwatson@rwatson_cinnamon_afs on 2007/04/09 22:08:31 Add arla/nnpfs/include/nnpfs contents to src/sys/fs/nnpfs/nnpfs integration. Affected files ... .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_attr.h#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_blocks.h#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_debug.h#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_global.h#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_message.h#1 branch .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_queue.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Mon Apr 9 22:17:43 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57A1F16A401; Mon, 9 Apr 2007 22:17:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F190616A404 for ; Mon, 9 Apr 2007 22:17:42 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C7CA913C45D for ; Mon, 9 Apr 2007 22:17:42 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l39MHgMA084767 for ; Mon, 9 Apr 2007 22:17:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l39MHgYW084764 for perforce@freebsd.org; Mon, 9 Apr 2007 22:17:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 9 Apr 2007 22:17:42 GMT Message-Id: <200704092217.l39MHgYW084764@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 117778 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2007 22:17:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=117778 Change 117778 by rwatson@rwatson_cinnamon_afs on 2007/04/09 22:16:59 Add a plausible nnpfs module Makefile. Affected files ... .. //depot/projects/arla/sys/modules/nnpfs/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Apr 9 22:34:05 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E41016A403; Mon, 9 Apr 2007 22:34:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2504116A401 for ; Mon, 9 Apr 2007 22:34:05 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1304313C45A for ; Mon, 9 Apr 2007 22:34:05 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l39MY4dW088015 for ; Mon, 9 Apr 2007 22:34:04 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l39MY4et088012 for perforce@freebsd.org; Mon, 9 Apr 2007 22:34:04 GMT (envelope-from imp@freebsd.org) Date: Mon, 9 Apr 2007 22:34:04 GMT Message-Id: <200704092234.l39MY4et088012@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 117782 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2007 22:34:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=117782 Change 117782 by imp@imp_paco-paco on 2007/04/09 22:33:35 IFC @117780 Affected files ... .. //depot/projects/arm/src/sys/boot/forth/loader.conf#14 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/arm/src/sys/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/arm/src/sys/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/arm/src/sys/conf/files#67 integrate .. //depot/projects/arm/src/sys/conf/files.ia64#9 integrate .. //depot/projects/arm/src/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/arm/src/sys/kern/kern_mib.c#4 integrate .. //depot/projects/arm/src/sys/kern/vfs_mount.c#27 integrate .. //depot/projects/arm/src/sys/modules/libalias/libalias/Makefile#2 integrate .. //depot/projects/arm/src/sys/sys/kernel.h#7 integrate .. //depot/projects/arm/src/sys/sys/sysctl.h#13 integrate Differences ... ==== //depot/projects/arm/src/sys/boot/forth/loader.conf#14 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.119 2007/04/09 00:04:54 pjd Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.120 2007/04/09 22:09:09 pjd Exp $ ############################################################## ### Basic configuration options ############################ @@ -138,6 +138,7 @@ #umapfs_load="NO" # User-id map filesystem unionfs_load="NO" # Union filesystem xfs_load="NO" # XFS +zfs_load="NO" # ZFS # Related stuff ==== //depot/projects/arm/src/sys/cam/scsi/scsi_sg.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.1 2007/04/07 19:40:57 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.3 2007/04/09 05:47:32 scottl Exp $"); #include #include @@ -71,8 +71,8 @@ } sg_state; typedef enum { + SG_RDWR_FREE, SG_RDWR_INPROG, - SG_RDWR_WAITING, SG_RDWR_DONE } sg_rdwr_state; @@ -289,13 +289,12 @@ return (CAM_REQ_CMP_ERR); } - softc = (struct sg_softc *)malloc(sizeof(*softc), M_DEVBUF, M_NOWAIT); + softc = malloc(sizeof(*softc), M_DEVBUF, M_ZERO | M_NOWAIT); if (softc == NULL) { printf("sgregister: Unable to allocate softc\n"); return (CAM_REQ_CMP_ERR); } - bzero(softc, sizeof(*softc)); softc->state = SG_STATE_NORMAL; softc->pd_type = SID_TYPE(&cgd->inq_data); TAILQ_INIT(&softc->rdwr_done); @@ -388,8 +387,7 @@ rdwr = done_ccb->ccb_h.ccb_rdwr; state = rdwr->state; rdwr->state = SG_RDWR_DONE; - if (state == SG_RDWR_WAITING) - wakeup(rdwr); + wakeup(rdwr); break; } default: @@ -507,6 +505,7 @@ * The linuxolator seems to have a hard time with this, * so just return 0 and hope that apps can cope. */ + td->td_retval[0] = 60*hz; error = 0; break; case SG_IO: @@ -679,7 +678,7 @@ periph = dev->si_drv1; sc = periph->softc; - rdwr = malloc(sizeof(*rdwr), M_DEVBUF, M_WAITOK); + rdwr = malloc(sizeof(*rdwr), M_DEVBUF, M_WAITOK | M_ZERO); hdr = &rdwr->hdr.hdr; /* Copy in the header block and sanity check it */ @@ -728,13 +727,13 @@ */ buf_len = uio->uio_resid; if (buf_len != 0) { - buf = malloc(buf_len, M_DEVBUF, M_WAITOK); + buf = malloc(buf_len, M_DEVBUF, M_WAITOK | M_ZERO); error = uiomove(buf, buf_len, uio); if (error) goto out_buf; dir = CAM_DIR_OUT; } else if (hdr->reply_len != 0) { - buf = malloc(hdr->reply_len, M_DEVBUF, M_WAITOK); + buf = malloc(hdr->reply_len, M_DEVBUF, M_WAITOK | M_ZERO); buf_len = hdr->reply_len; dir = CAM_DIR_IN; } else { @@ -809,7 +808,6 @@ break; } if ((rdwr == NULL) || (rdwr->state != SG_RDWR_DONE)) { - rdwr->state = SG_RDWR_WAITING; if (tsleep(rdwr, PCATCH, "sgread", 0) == ERESTART) return (EAGAIN); goto search; ==== //depot/projects/arm/src/sys/compat/opensolaris/sys/mutex.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/opensolaris/sys/mutex.h,v 1.1 2007/04/06 01:09:06 pjd Exp $ + * $FreeBSD: src/sys/compat/opensolaris/sys/mutex.h,v 1.2 2007/04/09 01:05:31 pjd Exp $ */ #ifndef _OPENSOLARIS_SYS_MUTEX_H_ @@ -48,6 +48,9 @@ #define mutex_init(lock, desc, type, arg) do { \ ASSERT((type) == MUTEX_DEFAULT); \ + KASSERT(((lock)->lock_object.lo_flags & LO_ALLMASK) != \ + LO_EXPECTED, ("lock %s already initialized", #lock)); \ + bzero((lock), sizeof(struct sx)); \ sx_init_flags((lock), "zfs:" #lock, SX_DUPOK); \ } while (0) #define mutex_destroy(lock) sx_destroy(lock) ==== //depot/projects/arm/src/sys/compat/opensolaris/sys/rwlock.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/opensolaris/sys/rwlock.h,v 1.1 2007/04/06 01:09:06 pjd Exp $ + * $FreeBSD: src/sys/compat/opensolaris/sys/rwlock.h,v 1.2 2007/04/09 01:05:31 pjd Exp $ */ #ifndef _OPENSOLARIS_SYS_RWLOCK_H_ @@ -53,8 +53,12 @@ #define RW_LOCK_HELD(x) (rw_lock_held((x))) #define RW_ISWRITER(x) (rw_iswriter(x)) -#define rw_init(lock, desc, type, arg) \ - sx_init_flags((lock), "zfs:" #lock, SX_DUPOK) +#define rw_init(lock, desc, type, arg) do { \ + KASSERT(((lock)->lock_object.lo_flags & LO_ALLMASK) != \ + LO_EXPECTED, ("lock %s already initialized", #lock)); \ + bzero((lock), sizeof(struct sx)); \ + sx_init_flags((lock), "zfs:" #lock, SX_DUPOK); \ +} while (0) #define rw_destroy(lock) sx_destroy(lock) #define rw_enter(lock, how) do { \ if ((how) == RW_READER) \ ==== //depot/projects/arm/src/sys/conf/files#67 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1192 2007/04/08 15:18:02 kmacy Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1194 2007/04/09 17:08:27 piso Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1778,19 +1778,19 @@ netinet/ip_options.c optional inet netinet/ip_output.c optional inet netinet/raw_ip.c optional inet -netinet/sctp_usrreq.c optional inet inet6 sctp -netinet/sctp_pcb.c optional inet inet6 sctp -netinet/sctputil.c optional inet inet6 sctp +netinet/sctp_asconf.c optional inet inet6 sctp +netinet/sctp_auth.c optional inet inet6 sctp netinet/sctp_bsd_addr.c optional inet inet6 sctp -netinet/sctp_timer.c optional inet inet6 sctp +netinet/sctp_crc32.c optional inet inet6 sctp +netinet/sctp_indata.c optional inet inet6 sctp netinet/sctp_input.c optional inet inet6 sctp netinet/sctp_output.c optional inet inet6 sctp -netinet/sctp_indata.c optional inet inet6 sctp -netinet/sctp_asconf.c optional inet inet6 sctp +netinet/sctp_pcb.c optional inet inet6 sctp netinet/sctp_peeloff.c optional inet inet6 sctp -netinet/sctp_crc32.c optional inet inet6 sctp -netinet/sctp_auth.c optional inet inet6 sctp netinet/sctp_sysctl.c optional inet inet6 sctp +netinet/sctp_timer.c optional inet inet6 sctp +netinet/sctp_usrreq.c optional inet inet6 sctp +netinet/sctputil.c optional inet inet6 sctp netinet/tcp_debug.c optional tcpdebug netinet/tcp_hostcache.c optional inet netinet/tcp_input.c optional inet @@ -1804,7 +1804,6 @@ netinet/libalias/alias.c optional libalias netinet/libalias/alias_db.c optional libalias netinet/libalias/alias_mod.c optional libalias -netinet/libalias/alias_old.c optional libalias netinet/libalias/alias_proxy.c optional libalias netinet/libalias/alias_util.c optional libalias netinet6/ah_aesxcbcmac.c optional ipsec ==== //depot/projects/arm/src/sys/conf/files.ia64#9 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.90 2006/10/23 13:23:12 ru Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.91 2007/04/09 14:02:18 kan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -128,3 +128,4 @@ libkern/ia64/__umodsi3.S standard libkern/ia64/bswap16.S standard libkern/ia64/bswap32.S standard +libkern/memset.c standard ==== //depot/projects/arm/src/sys/dev/cxgb/sys/uipc_mvec.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/sys/uipc_mvec.c,v 1.2 2007/04/08 15:59:07 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/sys/uipc_mvec.c,v 1.4 2007/04/09 17:05:54 kmacy Exp $"); #include #include @@ -230,7 +230,7 @@ m->m_flags &= ~M_IOVEC; uma_zfree(zone_mbuf, m); } - +#if (!defined(__sparc64__) && !defined(__sun4v__)) struct mvec_sg_cb_arg { int error; bus_dma_segment_t seg; @@ -322,3 +322,4 @@ return (error); } +#endif /* !__sparc64__ */ ==== //depot/projects/arm/src/sys/kern/kern_mib.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_mib.c,v 1.76 2005/08/21 18:03:31 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_mib.c,v 1.77 2007/04/09 19:18:09 pjd Exp $"); #include "opt_posix.h" @@ -301,6 +301,9 @@ u_long hostid; SYSCTL_ULONG(_kern, KERN_HOSTID, hostid, CTLFLAG_RW, &hostid, 0, "Host ID"); +char hostuuid[64] = "00000000-0000-0000-0000-000000000000"; +SYSCTL_STRING(_kern, KERN_HOSTUUID, hostuuid, CTLFLAG_RW, hostuuid, + sizeof(hostuuid), "Host UUID"); /* * This is really cheating. These actually live in the libc, something ==== //depot/projects/arm/src/sys/kern/vfs_mount.c#27 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.254 2007/04/08 23:54:01 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.256 2007/04/09 21:10:04 njl Exp $"); #include #include @@ -1312,7 +1312,7 @@ static LIST_HEAD(, root_hold_token) root_holds = LIST_HEAD_INITIALIZER(&root_holds); -static int root_mount_complete = 0; +static int root_mount_complete; /* * Hold root mount. @@ -1377,24 +1377,25 @@ root_mount_done(void) { + /* + * Use a mutex to prevent the wakeup being missed and waiting for + * an extra 1 second sleep. + */ mtx_lock(&mountlist_mtx); root_mount_complete = 1; wakeup(&root_mount_complete); mtx_unlock(&mountlist_mtx); } - /* +/* * Return true if root is already mounted. */ int root_mounted(void) { - int mounted; - mtx_lock(&mountlist_mtx); - mounted = root_mount_complete; - mtx_unlock(&mountlist_mtx); - return (mounted); + /* No mutex is acquired here because int stores are atomic. */ + return (root_mount_complete); } /* ==== //depot/projects/arm/src/sys/modules/libalias/libalias/Makefile#2 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/sys/modules/libalias/libalias/Makefile,v 1.1 2006/09/26 23:26:51 piso Exp $ +# $FreeBSD: src/sys/modules/libalias/libalias/Makefile,v 1.2 2007/04/09 17:08:27 piso Exp $ .PATH: ${.CURDIR}/../../../netinet/libalias KMOD= libalias -SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_old.c alias_mod.c +SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_mod.c .include ==== //depot/projects/arm/src/sys/sys/kernel.h#7 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)kernel.h 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/sys/kernel.h,v 1.133 2007/04/05 20:40:47 pjd Exp $ + * $FreeBSD: src/sys/sys/kernel.h,v 1.135 2007/04/09 22:29:13 pjd Exp $ */ #ifndef _SYS_KERNEL_H_ @@ -56,6 +56,7 @@ /* 1.1 */ extern unsigned long hostid; +extern char hostuuid[64]; extern char hostname[MAXHOSTNAMELEN]; extern char domainname[MAXHOSTNAMELEN]; extern char kernelname[MAXPATHLEN]; ==== //depot/projects/arm/src/sys/sys/sysctl.h#13 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)sysctl.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/sys/sys/sysctl.h,v 1.145 2006/09/17 20:00:35 rwatson Exp $ + * $FreeBSD: src/sys/sys/sysctl.h,v 1.146 2007/04/09 19:18:08 pjd Exp $ */ #ifndef _SYS_SYSCTL_H_ @@ -389,7 +389,8 @@ #define KERN_USRSTACK 33 /* int: address of USRSTACK */ #define KERN_LOGSIGEXIT 34 /* int: do we log sigexit procs? */ #define KERN_IOV_MAX 35 /* int: value of UIO_MAXIOV */ -#define KERN_MAXID 36 /* number of valid kern ids */ +#define KERN_HOSTUUID 36 /* string: host UUID identifier */ +#define KERN_MAXID 37 /* number of valid kern ids */ #define CTL_KERN_NAMES { \ { 0, 0 }, \ @@ -427,6 +428,7 @@ { "usrstack", CTLTYPE_INT }, \ { "logsigexit", CTLTYPE_INT }, \ { "iov_max", CTLTYPE_INT }, \ + { "hostuuid", CTLTYPE_STRING }, \ } /* From owner-p4-projects@FreeBSD.ORG Tue Apr 10 07:24:06 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40A5716A404; Tue, 10 Apr 2007 07:24:06 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DC95316A402 for ; Tue, 10 Apr 2007 07:24:05 +0000 (UTC) (envelope-from ryanb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D11EA13C448 for ; Tue, 10 Apr 2007 07:24:05 +0000 (UTC) (envelope-from ryanb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3A7O57W005247 for ; Tue, 10 Apr 2007 07:24:05 GMT (envelope-from ryanb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3A7O5c7005241 for perforce@freebsd.org; Tue, 10 Apr 2007 07:24:05 GMT (envelope-from ryanb@FreeBSD.org) Date: Tue, 10 Apr 2007 07:24:05 GMT Message-Id: <200704100724.l3A7O5c7005241@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ryanb@FreeBSD.org using -f From: Ryan Beasley To: Perforce Change Reviews Cc: Subject: PERFORCE change 117813 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Apr 2007 07:24:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=117813 Change 117813 by ryanb@ryanb_fredrik on 2007/04/10 07:23:08 sys/soundcard.h: oss_audioinfo::real_device => legacy_device Pointy Hat to: ryanb Affected files ... .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/dsp.c#3 edit Differences ... ==== //depot/projects/soundsystem/src/sys/dev/sound/pcm/dsp.c#3 (text+ko) ==== @@ -1781,9 +1781,9 @@ ai->mixer_dev = (d->mixer_dev != NULL) ? PCMUNIT(d->mixer_dev) : -1; /** * @note - * @c real_device - OSSv4 docs: "Obsolete." + * @c legacy_device - OSSv4 docs: "Obsolete." */ - ai->real_device = -1; + ai->legacy_device = -1; strlcpy(ai->devnode, t_cdev->si_name, sizeof(ai->devnode)); ai->enabled = device_is_attached(d->dev) ? 1 : 0; /** From owner-p4-projects@FreeBSD.ORG Tue Apr 10 10:51:28 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86B1216A404; Tue, 10 Apr 2007 10:51:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4C6BE16A402 for ; Tue, 10 Apr 2007 10:51:28 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 24CE513C4B9 for ; Tue, 10 Apr 2007 10:51:28 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3AApRiZ060539 for ; Tue, 10 Apr 2007 10:51:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3AApRL4060535 for perforce@freebsd.org; Tue, 10 Apr 2007 10:51:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 10 Apr 2007 10:51:27 GMT Message-Id: <200704101051.l3AApRL4060535@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 117820 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Apr 2007 10:51:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=117820 Change 117820 by rwatson@rwatson_cinnamon_afs on 2007/04/10 10:50:54 Place hand-generated config.h in the kernel nnpfs code as we can't currently use the Arla configure to generate a config.h on FreeBSD (for reasons I haven't explored yet). Affected files ... .. //depot/projects/arla/sys/fs/nnpfs/config.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Apr 10 10:52:30 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AA2216A403; Tue, 10 Apr 2007 10:52:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1C0E216A405 for ; Tue, 10 Apr 2007 10:52:30 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0B92F13C457 for ; Tue, 10 Apr 2007 10:52:30 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3AAqTup061463 for ; Tue, 10 Apr 2007 10:52:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3AAqTfX061439 for perforce@freebsd.org; Tue, 10 Apr 2007 10:52:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 10 Apr 2007 10:52:29 GMT Message-Id: <200704101052.l3AAqTfX061439@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 117821 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Apr 2007 10:52:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=117821 Change 117821 by rwatson@rwatson_cinnamon_afs on 2007/04/10 10:51:46 Various compile fixes for FreeBSD. Quite a few of these can be immediately upstreamed to the Arla developers, as they will also affect other BSD platforms (improper ifdef'ing, etc). Affected files ... .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_locl.h#2 edit .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_vfsops-bsd.h#2 edit .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_message.c#2 edit .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_node-bsd.c#2 edit .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_syscalls-wrap-freebsd.c#2 edit .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_vfsops-bsd.c#2 edit .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_vfsops-freebsd.c#2 edit .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_vnodeops-bsd.c#2 edit .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_vnodeops-common.c#2 edit .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_wrap-bsd.c#2 edit Differences ... ==== //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_locl.h#2 (text+ko) ==== @@ -286,7 +286,7 @@ struct genfs_ops nnpfs_genfsops; #endif -#if __NetBSD_Version__ >= 399001900 /* NetBSD 3.99.19 */ +#if defined (__NetBSD__) && __NetBSD_Version__ >= 399001900 /* NetBSD 3.99.19 */ typedef struct kauth_cred *nnpfs_kernel_cred; #define nnpfs_cred_get_uid(cred) kauth_cred_getuid(cred) #else @@ -552,4 +552,4 @@ struct vop_##n##_args; \ int nnpfs_##n(struct vop_##n##_args *) -#include "nnpfs/nnpfs_vopdefs.h" +// #include "nnpfs/nnpfs_vopdefs.h" ==== //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_vfsops-bsd.h#2 (text+ko) ==== @@ -78,8 +78,11 @@ int nnpfs_root(struct mount *mp, struct vnode **vpp); +/* + * XXXRW: Need an ifdef for arg. + */ int -nnpfs_quotactl(struct mount *mp, int cmd, uid_t uid, caddr_t arg, d_thread_t *p); +nnpfs_quotactl(struct mount *mp, int cmd, uid_t uid, void *arg, d_thread_t *p); int nnpfs_statfs(struct mount *mp, nnpfs_statvfs *sbp, d_thread_t *p); ==== //depot/projects/arla/sys/fs/nnpfs/nnpfs_message.c#2 (text+ko) ==== @@ -413,7 +413,7 @@ nnpfs_block_free_all(VNODE_TO_XNODE(vp)); -#if HAVE_KERNEL_VGONEL +#ifdef HAVE_KERNEL_VGONEL vgonel (vp, p); #else /* !have vgonel nor is dragonfly */ nnpfs_interlock_unlock(&vp->v_interlock); ==== //depot/projects/arla/sys/fs/nnpfs/nnpfs_node-bsd.c#2 (text+ko) ==== @@ -720,7 +720,7 @@ * The real change is sys/kern/vfs_cache:1.20 */ -#if __NetBSD_Version__ >= 104120000 || OpenBSD > 200211 +#if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104120000)) || (defined(OpenBSD) && (OpenBSD > 200211)) if (cache_lookup(dvp, &dummy, cnp) != -1) { nnpfs_vfs_unlock(dummy, nnpfs_cnp_to_proc(cnp)); printf ("NNPFS PANIC WARNING! nnpfs_dnlc_enter: %s already in cache\n", @@ -765,7 +765,7 @@ cn->cn_nameptr = (char *)name; cn->cn_namelen = strlen(name); cn->cn_flags = 0; -#if __APPLE__ +#if defined(__APPLE__) cn->cn_hash = 0; /* Let the vfs compute the hash */ #elif defined(HAVE_KERNEL_NAMEI_HASH) { ==== //depot/projects/arla/sys/fs/nnpfs/nnpfs_syscalls-wrap-freebsd.c#2 (text+ko) ==== @@ -46,8 +46,6 @@ #include #include -#include - int nnpfs_syscall_num = AFS_SYSCALL; static int ==== //depot/projects/arla/sys/fs/nnpfs/nnpfs_vfsops-bsd.c#2 (text+ko) ==== @@ -83,8 +83,11 @@ return nnpfs_root_common(mp, vpp, nnpfs_curproc()); } +/* + * XXXRW: Need an ifdef for caddr_t? + */ int -nnpfs_quotactl(struct mount *mp, int cmd, uid_t uid, caddr_t arg, d_thread_t *p) +nnpfs_quotactl(struct mount *mp, int cmd, uid_t uid, void *arg, d_thread_t *p) { NNPFSDEB(XDEBVFOPS, ("nnpfs_quotactl: mp = %lx, cmd = %d, uid = %u, " "arg = %lx, proc = %lx\n", @@ -392,7 +395,10 @@ int error; struct mount *mp; #if !(defined(HAVE_GETFH) && defined(HAVE_FHOPEN)) - struct ucred *cred = proc->p_ucred; + /* + * XXXRW: Need a new ifdef for td_ucred. + */ + struct ucred *cred = proc->td_ucred; struct vattr vattr; fsid_t fsid; struct nnpfs_fh_args *fh_args = (struct nnpfs_fh_args *)fhp->fhdata; @@ -418,7 +424,10 @@ error = VFS_VGET(mp, &ino, vpp); } #else - error = VFS_VGET(mp, SCARG(fh_args, fileid), vpp); + /* + * XXXRW: Need ifdef magic here. + */ + error = VFS_VGET(mp, LK_EXCLUSIVE, SCARG(fh_args, fileid), vpp); #endif if (error) ==== //depot/projects/arla/sys/fs/nnpfs/nnpfs_vfsops-freebsd.c#2 (text+ko) ==== ==== //depot/projects/arla/sys/fs/nnpfs/nnpfs_vnodeops-bsd.c#2 (text+ko) ==== @@ -64,7 +64,7 @@ */ #ifdef HAVE_VOP_OPEN -int +static int nnpfs_open(struct vop_open_args * ap) /* struct vop_open { @@ -85,7 +85,7 @@ #endif /* HAVE_VOP_OPEN */ #ifdef HAVE_VOP_FSYNC -int +static int nnpfs_fsync(struct vop_fsync_args * ap) /* vop_fsync { @@ -110,7 +110,7 @@ #endif /* HAVE_VOP_FSYNC */ #ifdef HAVE_VOP_CLOSE -int +static int nnpfs_close(struct vop_close_args * ap) /* vop_close { IN struct vnode *vp; @@ -160,7 +160,7 @@ #endif /* HAVE_VOP_WRITE */ #ifdef HAVE_VOP_IOCTL -int +static int nnpfs_ioctl(struct vop_ioctl_args * ap) /* struct vnode *vp, int com, @@ -175,7 +175,7 @@ #endif /* HAVE_VOP_IOCTL */ #ifdef HAVE_VOP_SELECT -int +static int nnpfs_select(struct vop_select_args * ap) /* struct vnode *vp, int which, @@ -188,7 +188,7 @@ #endif /* HAVE_VOP_SELECT */ #ifdef HAVE_VOP_SEEK -int +static int nnpfs_seek(struct vop_seek_args * ap) /* struct vop_seek_args { @@ -206,7 +206,10 @@ #endif /* HAVE_VOP_SEEK */ #ifdef HAVE_VOP_POLL -int +/* + * XXXRW: Without a prototype, we need static. + */ +static int nnpfs_poll(struct vop_poll_args * ap) /* vop_poll { IN struct vnode *vp; @@ -220,7 +223,7 @@ #endif /* HAVE_VOP_POLL */ #ifdef HAVE_VOP_GETATTR -int +static int nnpfs_getattr(struct vop_getattr_args * ap) /* struct vnode *vp, struct vattr *vap, @@ -237,7 +240,7 @@ #endif /* HAVE_VOP_GETATTR */ #ifdef HAVE_VOP_SETATTR -int +static int nnpfs_setattr(struct vop_setattr_args * ap) /* struct vnode *vp, struct vattr *vap, @@ -250,7 +253,7 @@ #endif /* HAVE_VOP_SETATTR */ #ifdef HAVE_VOP_ACCESS -int +static int nnpfs_access(struct vop_access_args * ap) /* struct vnode *vp, @@ -264,7 +267,7 @@ #endif /* HAVE_VOP_ACCESS */ #ifdef HAVE_VOP_LOOKUP -int +static int nnpfs_lookup(struct vop_lookup_args * ap) /* struct vop_lookup_args { struct vnodeop_desc *a_desc; @@ -327,7 +330,7 @@ #endif /* HAVE_VOP_LOOKUP */ #ifdef HAVE_VOP_CACHEDLOOKUP -int +static int nnpfs_cachedlookup(struct vop_cachedlookup_args * ap) /* struct vop_cachedlookup_args { struct vnodeop_desc *a_desc; @@ -368,7 +371,7 @@ } #ifdef HAVE_VOP_CREATE -int +static int nnpfs_create(struct vop_create_args *ap) { struct vnode *dvp = ap->a_dvp; @@ -399,7 +402,7 @@ #endif /* HAVE_VOP_CREATE */ #ifdef HAVE_VOP_REMOVE -int +static int nnpfs_remove(struct vop_remove_args * ap) /* struct vnode *dvp, struct vnode *vp, @@ -427,7 +430,7 @@ #endif /* HAVE_VOP_REMOVE */ #ifdef HAVE_VOP_RENAME -int +static int nnpfs_rename(struct vop_rename_args * ap) /* vop_rename { IN WILLRELE struct vnode *fdvp; @@ -464,7 +467,7 @@ #endif /* HAVE_VOP_RENAME */ #ifdef HAVE_VOP_MKDIR -int +static int nnpfs_mkdir(struct vop_mkdir_args * ap) /* struct vnode *dvp, char *nm, @@ -499,7 +502,7 @@ #endif /* HAVE_VOP_MKDIR */ #ifdef HAVE_VOP_RMDIR -int +static int nnpfs_rmdir(struct vop_rmdir_args * ap) /* struct vnode *dvp, struct vnode *vp, @@ -539,7 +542,7 @@ #error dunno want kind of cookies you have #endif -int +static int nnpfs_readdir(struct vop_readdir_args * ap) /* struct vnode *vp, struct uio *uiop, @@ -594,7 +597,7 @@ #endif #ifdef HAVE_VOP_LINK -int +static int nnpfs_link(struct vop_link_args * ap) /* WILLRELE struct vnode *tdvp; @@ -664,7 +667,7 @@ #endif /* HAVE_VOP_LINK */ #ifdef HAVE_VOP_SYMLINK -int +static int nnpfs_symlink(struct vop_symlink_args * ap) /* IN WILLRELE struct vnode *dvp; @@ -721,7 +724,7 @@ #endif /* HAVE_VOP_READLINK */ #ifdef HAVE_VOP_INACTIVE -int +static int nnpfs_inactive(struct vop_inactive_args * ap) { #ifdef HAVE_FREEBSD_THREAD @@ -733,7 +736,7 @@ #endif /* HAVE_VOP_INACTICE */ #ifdef HAVE_VOP_RECLAIM -int +static int nnpfs_reclaim(struct vop_reclaim_args * ap) /*struct vop_reclaim_args { struct vnodeop_desc *a_desc; @@ -1027,7 +1030,7 @@ #endif /* !HAVE_KERNEL_VNODE_PAGER_GENERIC_GETPAGES */ #ifdef __FreeBSD__ -int +static int nnpfs_getpages (struct vop_getpages_args *ap) /* struct vnodeop_desc *a_desc; @@ -1067,7 +1070,7 @@ #include #include -int +static int nnpfs_putpages (struct vop_putpages_args *ap) /* struct vnodeop_desc *a_desc; @@ -1131,7 +1134,7 @@ #endif /* HAVE_VOP_CNTL */ #ifdef HAVE_VOP_PRINT -int +static int nnpfs_print (struct vop_print_args *v) { struct vop_print_args /* { @@ -1143,9 +1146,13 @@ #endif #ifdef HAVE_VOP_ADVLOCK -int +static int nnpfs_advlock(struct vop_advlock_args *v) { + /* + * XXXRW: warning/error generated on freebsd for unused ap. + */ +#if 0 struct vop_advlock_args /* { struct vnode *a_vp; caddr_t a_id; @@ -1153,6 +1160,7 @@ struct flock *a_fl; int a_flags; } */ *ap = v; +#endif #if 0 struct nnpfs_node *xn = VNODE_TO_XNODE(ap->a_vp); int ret; @@ -1202,7 +1210,7 @@ #endif /* HAVE_VOP_REVOKE */ #ifdef HAVE_VOP_CREATEVOBJECT -int +static int nnpfs_createvobject(struct vop_createvobject_args *ap) /* struct vop_createvobject_args { @@ -1219,7 +1227,7 @@ #endif /* HAVE_VOP_CREATEVOBJECT */ #ifdef HAVE_VOP_DESTROYVOBJECT -int +static int nnpfs_destroyvobject(struct vop_destroyvobject_args *ap) /* struct vop_destroyvobject_args { @@ -1234,7 +1242,7 @@ #endif /* HAVE_VOP_DESTROYVOBJECT */ #ifdef HAVE_VOP_GETVOBJECT -int +static int nnpfs_getvobject(struct vop_getvobject_args *ap) /* struct vop_getvobject_args { @@ -1250,7 +1258,7 @@ #endif /* HAVE_VOP_GETVOBJECT */ #ifdef HAVE_VOP_PATHCONF -int +static int nnpfs_pathconf(struct vop_pathconf_args *ap) /* struct vop_pathconf_args { @@ -1353,7 +1361,7 @@ static struct filterops nnpfsvnode_filtops = { 1, NULL, filt_nnpfsdetach, filt_nnpfsvnode }; -int +static int nnpfs_kqfilter(struct vop_kqfilter_args *ap) { struct vnode *vp = ap->a_vp; ==== //depot/projects/arla/sys/fs/nnpfs/nnpfs_vnodeops-common.c#2 (text+ko) ==== @@ -49,7 +49,7 @@ static void nnpfs_handle_stale(struct nnpfs_node *xn) { -#if __APPLE__ +#ifdef __APPLE__ struct vnode *vp = XNODE_TO_VNODE(xn); #endif ==== //depot/projects/arla/sys/fs/nnpfs/nnpfs_wrap-bsd.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ RCSID("$Id: nnpfs_wrap-bsd.c,v 1.55 2005/12/22 13:49:25 tol Exp $"); -#include "version.h" +// #include "version.h" int nnpfs_dev_major; From owner-p4-projects@FreeBSD.ORG Tue Apr 10 11:03:45 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24C1C16A406; Tue, 10 Apr 2007 11:03:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CBBDA16A401 for ; Tue, 10 Apr 2007 11:03:44 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A372C13C448 for ; Tue, 10 Apr 2007 11:03:44 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3AB3iad067176 for ; Tue, 10 Apr 2007 11:03:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3AB3i9w067160 for perforce@freebsd.org; Tue, 10 Apr 2007 11:03:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 10 Apr 2007 11:03:44 GMT Message-Id: <200704101103.l3AB3i9w067160@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 117823 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Apr 2007 11:03:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=117823 Change 117823 by rwatson@rwatson_cinnamon_afs on 2007/04/10 11:03:11 Integrate Arla/AFS include files into Arla project tree. They don't really belong in fs/nnpfs except in as much as nnpfs seems to depend on them being defined. Possibly this is a bug in npfs or in these include files, as ideally nnpfs would not contain AFS/Arla- specific definitions. Affected files ... .. //depot/projects/arla/sys/fs/nnpfs/afssysdefs.h#1 branch .. //depot/projects/arla/sys/fs/nnpfs/arla-pioctl.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Tue Apr 10 11:06:51 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF87816A415; Tue, 10 Apr 2007 11:06:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 715A116A40E for ; Tue, 10 Apr 2007 11:06:50 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 171A813C48A for ; Tue, 10 Apr 2007 11:06:50 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3AB6n41071430 for ; Tue, 10 Apr 2007 11:06:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3AB6nhF071418 for perforce@freebsd.org; Tue, 10 Apr 2007 11:06:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 10 Apr 2007 11:06:49 GMT Message-Id: <200704101106.l3AB6nhF071418@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 117825 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Apr 2007 11:06:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=117825 Change 117825 by rwatson@rwatson_cinnamon_afs on 2007/04/10 11:05:59 Fix #ifdefs in afssysdefs.h to compile on FreeBSD -- this should probably be upstreamed also. Affected files ... .. //depot/projects/arla/sys/fs/nnpfs/afssysdefs.h#2 edit Differences ... ==== //depot/projects/arla/sys/fs/nnpfs/afssysdefs.h#2 (text+ko) ==== @@ -42,6 +42,7 @@ * entry point syscalls. */ +#ifdef SunOS #if SunOS == 40 #define AFS_SYSCALL 31 #endif @@ -57,6 +58,7 @@ #if SunOS >= 58 #define AFS_SYSCALL 65 #endif +#endif #if defined(__hpux) #define AFS_SYSCALL 50 From owner-p4-projects@FreeBSD.ORG Tue Apr 10 11:29:21 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 945A416A405; Tue, 10 Apr 2007 11:29:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3E67A16A400 for ; Tue, 10 Apr 2007 11:29:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2CEE313C4BC for ; Tue, 10 Apr 2007 11:29:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3ABTLIs076421 for ; Tue, 10 Apr 2007 11:29:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3ABTKur076418 for perforce@freebsd.org; Tue, 10 Apr 2007 11:29:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 10 Apr 2007 11:29:20 GMT Message-Id: <200704101129.l3ABTKur076418@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 117827 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Apr 2007 11:29:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=117827 Change 117827 by rwatson@rwatson_cinnamon_afs on 2007/04/10 11:29:12 Integrate 2007/04/07 Arla CVS export into Arla project work branch. Brings in many adaptations of Arla by tol@ for more recent FreeBSD versions. Affected files ... .. //depot/projects/arla/sys/fs/nnpfs/Makefile.in#2 integrate .. //depot/projects/arla/sys/fs/nnpfs/arla-pioctl.h#2 integrate .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_blocks.h#2 integrate .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_blocks.c#2 integrate .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_dev-bsd.c#2 integrate .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_dev-common.c#2 integrate .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_dev-freebsd.c#2 integrate .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_dev-netbsd.c#2 integrate .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_dev-openbsd.c#2 integrate .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_message.c#3 integrate .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_node-bsd.c#3 integrate .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_syscalls-common.c#2 integrate .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_vfsops-bsd.c#3 integrate .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_vfsops-common.c#2 integrate .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_vfsops-freebsd.c#3 integrate .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_vnodeops-bsd.c#3 integrate .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_vnodeops-common.c#3 integrate .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_wrap-bsd.c#3 integrate Differences ... ==== //depot/projects/arla/sys/fs/nnpfs/Makefile.in#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.75 2006/10/24 16:33:00 tol Exp $ +# $Id: Makefile.in,v 1.76 2007/03/27 13:24:25 tol Exp $ SHELL = /bin/sh @@ -39,7 +39,7 @@ -I../../include -I$(srcdir)/../../include \ -I$(srcdir)/../include -DEFS = @DEFS@ $(INCDEFS) -DNNPFS_DEBUG @ARLA_KNFS@ +DEFS = @DEFS@ $(INCDEFS) -DNNPFS_DEBUG CFLAGS = @CFLAGS@ @KERNEL_CFLAGS@ @KERNEL_CPPFLAGS@ -Wno-unused @BSD_WERROR@ SYS = @SYS@ ==== //depot/projects/arla/sys/fs/nnpfs/arla-pioctl.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -/* $Id: arla-pioctl.h,v 1.6 2005/11/17 09:49:22 tol Exp $ */ +/* $Id: arla-pioctl.h,v 1.8 2007/01/24 22:44:15 lha Exp $ */ #ifndef __ARLA_PIOCT_H #define __ARLA_PIOCT_H @@ -157,6 +157,16 @@ #define ARLA_AFSCOMMONIOC_NEWALIAS arla_AFSCOMMONIOCTL(1) /* common: ... */ #define ARLA_AFSCOMMONIOC_LISTALIAS arla_AFSCOMMONIOCTL(2) /* common: ... */ +#define ARLA_VIOCGETTOK2 arla_AFSCOMMONIOCTL(7) +#define ARLA_VIOCSETTOK2 arla_AFSCOMMONIOCTL(8) + +#define ARLA_TOKEN_TYPE_NULL 0 +/* secindex 1 was used for vab */ +#define ARLA_TOKEN_TYPE_KAD 2 +/* secindex 3 was used for broken rxkad cryptall */ +#define ARLA_TOKEN_TYPE_K5 4 +#define ARLA_TOKEN_TYPE_GK 5 + /* * GETCELLSTATUS flags */ ==== //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_blocks.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005-2006, Stockholms Universitet + * Copyright (c) 2005-2007, Stockholms Universitet * (Stockholm University, Stockholm Sweden) * All rights reserved. * @@ -31,11 +31,15 @@ * POSSIBILITY OF SUCH DAMAGE. */ -/* $Id: nnpfs_blocks.h,v 1.2 2006/10/24 16:33:31 tol Exp $ */ +/* $Id: nnpfs_blocks.h,v 1.3 2007/01/24 17:09:17 tol Exp $ */ #define NNPFS_NO_INDEX 0 /* dummy cache index */ #define NNPFS_NO_OFFSET ((uint64_t)-1) /* dummy offset, no block */ -#define NNPFS_CACHE_FILE_PATH "%02X/%02X/%02llX" -#define NNPFS_CACHE_DIR_PATH "%02X/%02X@" -#define NNPFS_CACHE_PATH_SIZE ( 6 +1 +2+1 +16 +1) +#define NNPFS_CACHE_FILE_DIR1 "%02x" +#define NNPFS_CACHE_FILE_DIR_PATH NNPFS_CACHE_FILE_DIR1 "/" NNPFS_CACHE_FILE_DIR1 +#define NNPFS_CACHE_FILE_BLOCK_PATH "%02llx" + +#define NNPFS_CACHE_FILE_PATH NNPFS_CACHE_FILE_DIR_PATH "/" NNPFS_CACHE_FILE_BLOCK_PATH +#define NNPFS_CACHE_DIR_PATH NNPFS_CACHE_FILE_DIR_PATH "@" +#define NNPFS_CACHE_PATH_SIZE ( 6 +1 +2+1 +16 +1 ) ==== //depot/projects/arla/sys/fs/nnpfs/nnpfs_blocks.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005-2006, Stockholms Universitet + * Copyright (c) 2005-2007, Stockholms Universitet * (Stockholm University, Stockholm Sweden) * All rights reserved. * @@ -31,13 +31,17 @@ * POSSIBILITY OF SUCH DAMAGE. */ -/* $Id: nnpfs_blocks.c,v 1.4 2007/01/08 13:10:29 tol Exp $ */ +/* $Id: nnpfs_blocks.c,v 1.10 2007/03/28 12:05:45 tol Exp $ */ #include #include #include #include +#include +#include +#include + /* * return true if block is in cache */ @@ -259,14 +263,18 @@ } static int -nnpfs_block_extend_int(struct nnpfs_node *node, struct vnode *vp) +nnpfs_block_extend_int(struct nnpfs_node *node, struct vnode *vp, d_thread_t *p) { struct nnpfs_vfs_vattr va; int ret; VATTR_INIT(&va); nnpfs_set_va_size(&va, nnpfs_blocksize); + nnpfs_vfs_writelock(vp, p); + + /* printf("nnpfs extend_int(%p)\n", vp); */ ret = nnpfs_vnode_setattr(vp, &va, NNPFS_FROM_XNODE(node)->ctx); + nnpfs_vfs_unlock(vp, p); nnpfs_debug_assert(!ret); return ret; } @@ -278,16 +286,35 @@ static int nnpfs_block_extend(struct nnpfs_node *node, uint64_t offset) { + d_thread_t *p = nnpfs_curproc(); struct vnode *vp; int ret; nnpfs_assert(nnpfs_block_have_p(node, offset)); - - ret = nnpfs_block_open(node, offset, O_RDWR|FWRITE, &vp); + + ret = nnpfs_block_open(node, offset, FREAD|FWRITE, &vp); if (!ret) { nnpfs_assert(vp); - ret = nnpfs_block_extend_int(node, vp); - nnpfs_block_close(vp, 1); + +#ifdef __FreeBSD__ + { + struct mount *mp; + + (void)vn_start_write(vp, &mp, V_WAIT); + VOP_LEASE(vp, p, + nnpfs_vfs_context_ucred(NNPFS_FROM_XNODE(node)->ctx), + LEASE_WRITE); + + ret = nnpfs_block_extend_int(node, vp, p); + + VOP_UNLOCK(vp, 0, p); + vn_finished_write(mp); + } +#else + ret = nnpfs_block_extend_int(node, vp, p); +#endif + + nnpfs_block_close(node, vp, 1); } if (ret) @@ -297,6 +324,61 @@ return ret; } +#ifndef __APPLE__ +/* + * namei() compatible alloc/free + */ + +static long nnpfs_namei_allocs, nnpfs_namei_frees; +static void +nnpfs_namei_alloc(struct componentname *cnp) +{ + void *p = NULL; + + if (cnp->cn_flags & HASBUF) { + printf("nnpfs_namei_alloc: cnp flags 0x%lx\n", cnp->cn_flags); + return; + } + +#ifdef __FreeBSD__ + p = uma_zalloc(namei_zone, M_WAITOK); +#endif +#ifdef __OpenBSD__ + p = pool_get(&namei_pool, PR_WAITOK); +#endif +#ifdef __NetBSD__ + p = PNBUF_GET(); +#endif + if (p) { + cnp->cn_pnbuf = p; + cnp->cn_flags |= HASBUF; + nnpfs_namei_allocs++; + } +} + +static void +nnpfs_namei_free(struct componentname *cnp) +{ + if ((cnp->cn_flags & HASBUF) == 0) + return; + +#ifdef __FreeBSD__ + uma_zfree(namei_zone, cnp->cn_pnbuf); +#endif +#ifdef __NetBSD__ + PNBUF_PUT(cnp->cn_pnbuf); +#endif +#ifdef __OpenBSD__ + pool_put(&namei_pool, cnp->cn_pnbuf); +#endif + + cnp->cn_flags &= ~HASBUF; + nnpfs_namei_frees++; +} + +#endif /* !__APPLE__ */ + + /* * a handy implementation of open() * @@ -304,38 +386,139 @@ */ static int -open_file(const char *name, int fmode, - nnpfs_vfs_context ctx, struct vnode **vp) +open_file(struct vnode *cachedir, char *name, int fmode, + nnpfs_vfs_context ctx, struct vnode **vpp) { int error; #ifdef __APPLE__ /* XXX */ - error = vnode_open(name, fmode, S_IRUSR|S_IWUSR, 0, vp, ctx); + error = vnode_open(name, fmode, S_IRUSR|S_IWUSR, 0, vpp, ctx); #else { - struct nameidata nd, *ndp = &nd; d_thread_t *p = nnpfs_curproc(); - nnpfs_kernel_cred cred = nnpfs_proc_to_cred(p); + nnpfs_kernel_cred cred = nnpfs_vfs_context_ucred(ctx); + /* nnpfs_kernel_cred cred = nnpfs_proc_to_cred(p); */ + struct nameidata nd; + + memset(&nd, 0, sizeof(nd)); + + if (fmode & O_CREAT) { + NDINIT(&nd, CREATE, + FOLLOW | LOCKLEAF | LOCKPARENT | SAVENAME | NNPFS_MPSAFE, + UIO_SYSSPACE, name, p); + } else { + NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | NNPFS_MPSAFE, UIO_SYSSPACE, name, p); + } + + nd.ni_cnd.cn_cred = cred; + nd.ni_startdir = cachedir; + + nnpfs_namei_alloc(&nd.ni_cnd); + nd.ni_cnd.cn_nameptr = nd.ni_cnd.cn_pnbuf; + + error = copystr(name, nd.ni_cnd.cn_pnbuf, MAXPATHLEN, &nd.ni_pathlen); + if (error == 0 && nd.ni_pathlen == 1) + error = ENOENT; - NDINIT(ndp, LOOKUP, 0, UIO_SYSSPACE, name, - nnpfs_vfs_context_proc(ctx)); - - error = namei(ndp); - if (error != 0) + if (error) { + nnpfs_namei_free(&nd.ni_cnd); + printf("nnpfs open_file(%p, %s) copystr -> %d\n", + cachedir, name, error); + return error; + } + +#ifdef __FreeBSD__ + if ((fmode & O_ACCMODE) != FREAD) + bwillwrite(); /* do this before getting devlock? */ +#endif + /* XXX vn_start_write() etc? */ + + nnpfs_vref(cachedir); + + error = lookup(&nd); + if (error) { + nnpfs_namei_free(&nd.ni_cnd); + printf("lookup(%s) -> %d\n", name, error); return error; + } + + if (fmode & O_CREAT && nd.ni_vp) { + fmode &= ~O_CREAT; + + nnpfs_vfs_unlock(cachedir, p); + } - *vp = ndp->ni_vp; + if (fmode & O_CREAT) { + struct vattr vat; + struct mount *mp; + + if ((nd.ni_cnd.cn_flags & SAVENAME) == 0) { + nnpfs_namei_free(&nd.ni_cnd); + printf("lookup: not SAVENAME, flags 0x%lx\n", nd.ni_cnd.cn_flags); + return EINVAL; + } + + VATTR_NULL(&vat); + vat.va_type = VREG; + vat.va_mode = S_IRUSR|S_IWUSR; + if ((nd.ni_cnd.cn_flags & HASBUF) == 0) + panic("HASBUF was cleared\n"); + + /* nd.ni_cnd.cn_flags |= HASBUF; */ + +#ifdef __FreeBSD__ + (void)vn_start_write(cachedir, &mp, V_WAIT); /* V_NOWAIT? */ +#endif + VOP_LEASE(cachedir, p, cred, LEASE_WRITE); + error = VOP_CREATE(cachedir, vpp, &nd.ni_cnd, &vat); + +#ifdef __FreeBSD__ + nnpfs_namei_free(&nd.ni_cnd); + nnpfs_vfs_unlock(cachedir, p); + vn_finished_write(mp); +#else + /* NetBSD and OpenBSD releases buf w/o clearing HASBUF */ + nd.ni_cnd.cn_flags &= ~HASBUF; + nnpfs_namei_frees++; +#endif + + if (error) { + printf("nnpfs open_file(%p, %s) create -> %d\n", + cachedir, name, error); + return error; + } + } else { + *vpp = nd.ni_vp; + nnpfs_namei_free(&nd.ni_cnd); + } -#if defined(__FreeBSD__) && __FreeBSD_version >= 502000 - error = VOP_OPEN(*vp, fmode & (FWRITE|FREAD), cred, p, -1); +#if defined(__FreeBSD__) && 0 + if (nd.ni_vp + && vn_canvmio(nd.ni_vp) == TRUE + && ((nd.ni_cnd.cn_flags & (NOOBJ|LOCKLEAF)) == LOCKLEAF)) + vfs_object_create(nd.ni_vp, p, cred); +#endif + +#ifdef __FreeBSD__ + error = VOP_OPEN(*vpp, fmode, cred, p, -1); #else - error = VOP_OPEN(*vp, fmode & (FWRITE|FREAD), cred, p); + error = VOP_OPEN(*vpp, fmode, cred, p); #endif - if (error) - nnpfs_vletgo(*vp); + + if (error) { + nnpfs_vput(*vpp); + } else { + if (fmode & FWRITE) + (*vpp)->v_writecount++; + + nnpfs_vfs_unlock(*vpp, p); + } } -#endif + +#endif /* !__APPLE__! */ + NNPFSDEB(XDEBNODE, ("nnpfs open_file(%p, %s) -> %d (%p)\n", + cachedir, name, error, *vpp)); return error; } @@ -349,52 +532,88 @@ { char cachename[NNPFS_CACHE_PATH_SIZE]; uint64_t blockindex = nnpfs_block_index(offset); - uint32_t id = node->index; struct nnpfs *nnpfsp = NNPFS_FROM_XNODE(node); off_t eof = nnpfs_vattr_get_size(&node->attr); int ret; + NNPFSDEB(XDEBNODE, ("nnpfs_block_open(0x%llx)\n", (unsigned long long)offset)); + nnpfs_assert(nnpfsp); nnpfs_assert(nnpfs_block_have_p(node, offset) || (flags & O_CREAT)); - if (nnpfs_vnode_isdir(XNODE_TO_VNODE(node))) + if (nnpfs_vnode_isdir(XNODE_TO_VNODE(node))) { + nnpfs_assert((flags & O_CREAT) == 0); + *vpp = node->cache_vn; + ret = 0; + } else { +#ifdef __APPLE__ ret = snprintf(cachename, sizeof(cachename), - NNPFS_CACHE_DIR_PATH, - id / 0x100, id % 0x100); - else + NNPFS_CACHE_FILE_PATH, + node->index / 0x100, node->index % 0x100, + (unsigned long long)blockindex); +#else ret = snprintf(cachename, sizeof(cachename), - NNPFS_CACHE_FILE_PATH, - id / 0x100, id % 0x100, + NNPFS_CACHE_FILE_BLOCK_PATH, (unsigned long long)blockindex); +#endif - nnpfs_assert(ret > 0 && ret < sizeof(cachename)); + nnpfs_assert(ret > 0 && ret < sizeof(cachename)); /* XXX */ + + ret = open_file(node->cache_vn, cachename, flags, nnpfsp->ctx, vpp); + nnpfs_debug_assert(!ret); + if (ret) + return ret; + } + + /* blocks in the middle of the file should be of full length */ + if ((flags & O_CREAT) && offset < nnpfs_offset(eof)) { + ret = nnpfs_block_extend_int(node, *vpp, nnpfs_curproc()); + nnpfs_debug_assert(!ret); + if (ret) + nnpfs_block_close(node, *vpp, + ((flags & FWRITE) == FWRITE) ? 1 : 0); + } - ret = open_file(cachename, flags, nnpfsp->ctx, vpp); - nnpfs_debug_assert(!ret); - if (ret) - return ret; + NNPFSDEB(XDEBNODE, ("nnpfs_block_open -> %d\n", ret)); - /* blocks in the middle of the file should be of full length */ - if ((flags & O_CREAT) && offset < nnpfs_offset(eof)) - ret = nnpfs_block_extend_int(node, *vpp); +#if 0 + nnpfs_assert(node->cache_vn); + if (VOP_ISLOCKED(node->cache_vn, nnpfs_curproc())) { + printf("%p is locked at %d\n", node->cache_vn, __LINE__); + panic("locked at block_open:exit"); + } +#endif return ret; } void -nnpfs_block_close(struct vnode *vp, int rw) +nnpfs_block_close(struct nnpfs_node *node, struct vnode *vp, int rw) { + NNPFSDEB(XDEBNODE, ("nnpfs_block_close(%p)\n", vp)); + + if (nnpfs_vnode_isdir(XNODE_TO_VNODE(node))) + return; + #ifdef __APPLE__ vnode_close(vp, 0, NULL); #else - d_thread_t *p = nnpfs_curproc(); - struct ucred *cred = NULL; + { + d_thread_t *p = nnpfs_curproc(); + + nnpfs_vfs_writelock(vp, p); + + if (rw) + vp->v_writecount--; + + VOP_CLOSE(vp, rw ? FWRITE : FREAD, NULL, p); + nnpfs_vput(vp); + } +#endif /* !__APPLE__ */ - VOP_CLOSE(vp, rw ? FWRITE : FREAD, cred, p); - nnpfs_vletgo(vp); -#endif + NNPFSDEB(XDEBNODE, ("nnpfs_block_close done\n")); } /* @@ -415,6 +634,8 @@ nnpfs_assert(!nnpfs_block_have_p(node, offset)); nnpfs_assert(!nnpfs_vnode_isdir(XNODE_TO_VNODE(node))); + /* printf("nnpfs_block_create @0x%llx\n", (unsigned long long)offset);*/ + NNPFSDEB(XDEBNODE, ("nnpfs_block_create: %lx @0x%llx\n", (unsigned long)node, (unsigned long long )offset)); @@ -427,7 +648,7 @@ ret = nnpfs_block_open(node, offset, O_CREAT|FWRITE, &vp); if (!ret) { nnpfs_assert(vp); - nnpfs_block_close(vp, 1); + nnpfs_block_close(node, vp, 1); } /* extend previously last block to full length */ @@ -467,5 +688,5 @@ msg.offset = offset; /* XXX currently no cleanup on failed send, hope it's just a devclose */ - return nnpfs_message_send(nnpfsp->fd, &msg.header, sizeof(msg)); + return nnpfs_message_send(nnpfsp, &msg.header, sizeof(msg)); } ==== //depot/projects/arla/sys/fs/nnpfs/nnpfs_dev-bsd.c#2 (text+ko) ==== @@ -38,13 +38,12 @@ #include #include -RCSID("$Id: nnpfs_dev-bsd.c,v 1.51 2006/10/24 16:33:02 tol Exp $"); +RCSID("$Id: nnpfs_dev-bsd.c,v 1.53 2007/03/28 12:05:45 tol Exp $"); int nnpfs_devopen(nnpfs_dev_t dev, int flag, int devtype, d_thread_t *proc) { - NNPFSDEB(XDEBDEV, ("nnpfsopen dev = %d.%d, flag = %d, devtype = %d\n", - major(dev), minor(dev), flag, devtype)); + NNPFSDEB(XDEBDEV, ("nnpfsopen flag = %d, devtype = %d\n", flag, devtype)); return nnpfs_devopen_common(dev); } @@ -72,10 +71,10 @@ int flags, d_thread_t *p) { - NNPFSDEB(XDEBDEV, ("nnpfs_devioctl dev = %d.%d, cmd = %lu, " - "data = %lx, flags = %x\n", - major(dev), minor(dev), (unsigned long)cmd, - (unsigned long)data, flags)); + NNPFSDEB(XDEBDEV, ("nnpfs_devioctl dev = %d, cmd = %lu, " + "data = %lx, flags = %x\n", + minor(dev), (unsigned long)cmd, + (unsigned long)data, flags)); return ENOTTY; } @@ -240,8 +239,8 @@ if (chan->status & CHANNEL_OPENED) { #if defined(__DragonFly__) nnpfs_devclose(make_adhoc_dev(&nnpfs_cdev, i), 0, 0, NULL); -#elif defined(__FreeBSD__) && __FreeBSD_version >= 502103 - nnpfs_devclose(findcdev(makedev(0, i)), 0, 0, NULL); +#elif defined(__FreeBSD__) + nnpfs_devclose(chan->dev, 0, 0, NULL); #else nnpfs_devclose(makedev(0, i), 0, 0, NULL); #endif ==== //depot/projects/arla/sys/fs/nnpfs/nnpfs_dev-common.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ #include #include -RCSID("$Id: nnpfs_dev-common.c,v 1.80 2006/11/03 09:53:41 tol Exp $"); +RCSID("$Id: nnpfs_dev-common.c,v 1.81 2007/03/28 12:05:45 tol Exp $"); struct nnpfs nnpfs_dev[NNNPFS]; @@ -340,7 +340,7 @@ error = EINVAL; break; } - ret = nnpfs_message_receive (minor(dev), + ret = nnpfs_message_receive(chan, msg_buf, msg_buf->size, pp); @@ -361,9 +361,9 @@ * Send a message to user space. */ int -nnpfs_message_send(int fd, struct nnpfs_message_header * message, u_int size) +nnpfs_message_send(struct nnpfs *chan, + struct nnpfs_message_header *message, u_int size) { - struct nnpfs *chan = &nnpfs_dev[fd]; struct async_link *t; NNPFSDEB(XDEBMSG, ("nnpfs_message_send opcode = %d\n", message->opcode)); @@ -429,11 +429,11 @@ */ static int -nnpfs_message_rpc_int(int fd, struct nnpfs_message_header * message, u_int size, +nnpfs_message_rpc_int(struct nnpfs *chan, + struct nnpfs_message_header *message, u_int size, d_thread_t *proc, int async) { int ret; - struct nnpfs *chan = &nnpfs_dev[fd]; struct nnpfs_link *this_message; struct nnpfs_link *this_process; struct nnpfs_message_header *msg; @@ -636,17 +636,19 @@ } int -nnpfs_message_rpc(int fd, struct nnpfs_message_header * message, u_int size, +nnpfs_message_rpc(struct nnpfs *nnpfsp, + struct nnpfs_message_header *message, u_int size, d_thread_t *proc) { - return nnpfs_message_rpc_int(fd, message, size, proc, FALSE); + return nnpfs_message_rpc_int(nnpfsp, message, size, proc, FALSE); } int -nnpfs_message_rpc_async(int fd, struct nnpfs_message_header * message, u_int size, +nnpfs_message_rpc_async(struct nnpfs *nnpfsp, + struct nnpfs_message_header *message, u_int size, d_thread_t *proc) { - return nnpfs_message_rpc_int(fd, message, size, proc, TRUE); + return nnpfs_message_rpc_int(nnpfsp, message, size, proc, TRUE); } /* @@ -655,7 +657,7 @@ * invokes the correct function. */ int -nnpfs_message_receive(int fd, +nnpfs_message_receive(struct nnpfs *nnpfsp, struct nnpfs_message_header *message, u_int size, d_thread_t *p) @@ -665,58 +667,58 @@ /* Dispatch and coerce message type */ switch (message->opcode) { case NNPFS_MSG_WAKEUP: - return nnpfs_message_wakeup(fd, + return nnpfs_message_wakeup(nnpfsp, (struct nnpfs_message_wakeup *) message, message->size, p); case NNPFS_MSG_INSTALLROOT: - return nnpfs_message_installroot(fd, + return nnpfs_message_installroot(nnpfsp, (struct nnpfs_message_installroot *) message, message->size, p); case NNPFS_MSG_INSTALLNODE: - return nnpfs_message_installnode(fd, + return nnpfs_message_installnode(nnpfsp, (struct nnpfs_message_installnode *) message, message->size, p); case NNPFS_MSG_INSTALLATTR: - return nnpfs_message_installattr(fd, + return nnpfs_message_installattr(nnpfsp, (struct nnpfs_message_installattr *) message, message->size, p); case NNPFS_MSG_INSTALLDATA: - return nnpfs_message_installdata(fd, + return nnpfs_message_installdata(nnpfsp, (struct nnpfs_message_installdata *) message, message->size, p); case NNPFS_MSG_INVALIDNODE: - return nnpfs_message_invalidnode(fd, + return nnpfs_message_invalidnode(nnpfsp, (struct nnpfs_message_invalidnode *) message, message->size, p); case NNPFS_MSG_UPDATEFID: - return nnpfs_message_updatefid(fd, + return nnpfs_message_updatefid(nnpfsp, (struct nnpfs_message_updatefid *)message, message->size, p); case NNPFS_MSG_GC: - return nnpfs_message_gc(fd, + return nnpfs_message_gc(nnpfsp, (struct nnpfs_message_gc *)message, message->size, p); case NNPFS_MSG_DELETE_NODE: - return nnpfs_message_delete_node(fd, + return nnpfs_message_delete_node(nnpfsp, (struct nnpfs_message_delete_node *)message, message->size, p); case NNPFS_MSG_INSTALLQUOTA: - return nnpfs_message_installquota(fd, + return nnpfs_message_installquota(nnpfsp, (struct nnpfs_message_installquota *)message, message->size, p); case NNPFS_MSG_VERSION: - return nnpfs_message_version(fd, + return nnpfs_message_version(nnpfsp, (struct nnpfs_message_version *)message, message->size, p); @@ -766,12 +768,11 @@ } int -nnpfs_message_wakeup(int fd, +nnpfs_message_wakeup(struct nnpfs *chan, struct nnpfs_message_wakeup *message, u_int size, d_thread_t *p) { - struct nnpfs *chan = &nnpfs_dev[fd]; struct nnpfs_link *t; NNPFSDEB(XDEBMSG, ("nnpfs_message_wakeup error: %d\n", message->error)); ==== //depot/projects/arla/sys/fs/nnpfs/nnpfs_dev-freebsd.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995 - 2006 Kungliga Tekniska Högskolan + * Copyright (c) 1995 - 2007 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -39,62 +39,195 @@ #include #include -RCSID("$Id: nnpfs_dev-freebsd.c,v 1.7 2006/10/31 12:40:02 tol Exp $"); +RCSID("$Id: nnpfs_dev-freebsd.c,v 1.9 2007/03/06 13:19:03 tol Exp $"); #define NNPFS_FBSD_DEVLOCK +#if 1 void nnpfs_dev_lock(struct nnpfs *chan) { -#ifdef NNPFS_FBSD_DEVLOCK - NNPFSDEB(XDEBDEV, ("nnpfs_dev_lock\n")); - mtx_lock(&chan->dev_lock); + d_thread_t *me = curthread; + + NNPFSDEB(XDEBDEV, ("nnpfs_dev_lock, me=%p\n", me)); + + mtx_lock(&chan->lock.lock); + + while (chan->lock.recurse > 0 && chan->lock.locker != me) { + /* XXX PCATCH */ +#if 1 + (void)nnpfs_msleep(&chan->lock, &chan->lock.lock, (PZERO + 1), "nnpfslock"); +#else + int ret = 0; + while msleep(&chan->lock, &chan->lock.lock, (PZERO + 1), "nnpfslock", 7 * hz); + #endif + } + + chan->lock.locker = me; + nnpfs_assert(chan->lock.recurse >= 0); + chan->lock.recurse++; + + NNPFSDEB(XDEBDEV, ("nnpfs_dev_lock, locker %p\n", chan->lock.locker)); + + mtx_unlock(&chan->lock.lock); } void nnpfs_dev_unlock(struct nnpfs *chan) { -#ifdef NNPFS_FBSD_DEVLOCK - NNPFSDEB(XDEBDEV, ("nnpfs_dev_unlock\n")); - mtx_unlock(&chan->dev_lock); -#endif + d_thread_t *me = curthread; + + NNPFSDEB(XDEBDEV, ("nnpfs_dev_unlock, me=%p locker=%p r=%d\n", me, + chan->lock.locker, chan->lock.recurse)); + + mtx_lock(&chan->lock.lock); + + chan->lock.recurse--; + nnpfs_assert(chan->lock.recurse >= 0); + nnpfs_assert(chan->lock.locker == me); + + if (chan->lock.recurse == 0) { + chan->lock.locker = NULL; + wakeup(&chan->lock); + } + + mtx_unlock(&chan->lock.lock); } int nnpfs_dev_msleep(struct nnpfs *chan, caddr_t waitobj, int flags, const char *msg) { - int ret; -#ifdef NNPFS_FBSD_DEVLOCK - ret = nnpfs_msleep(waitobj, &chan->dev_lock, flags, msg); -#endif + d_thread_t *me = curthread; + int ret, nlocks; + + NNPFSDEB(XDEBDEV, ("nnpfs_dev_msleep %p %x %s, me %p\n", waitobj, flags, msg, me)); + + mtx_lock(&chan->lock.lock); + nlocks = chan->lock.recurse; + nnpfs_assert(chan->lock.recurse >= 0); + nnpfs_assert(chan->lock.locker == me); + + chan->lock.recurse = 0; + chan->lock.locker = NULL; + wakeup(&chan->lock); + + ret = nnpfs_msleep(waitobj, &chan->lock.lock, flags, msg); + + while (chan->lock.recurse > 0) + /* XXX PCATCH, flags, ret? */ + (void)nnpfs_msleep(&chan->lock, &chan->lock.lock, (PZERO + 1), "nnpfslock"); + + nnpfs_assert(chan->lock.recurse == 0); + chan->lock.locker = me; + chan->lock.recurse = nlocks; + + mtx_unlock(&chan->lock.lock); return ret; } int nnpfs_dev_initlock(struct nnpfs *chan) { -#ifdef NNPFS_FBSD_DEVLOCK + d_thread_t *me = curthread; + NNPFSDEB(XDEBDEV, ("nnpfs_dev_initlock\n")); - mtx_init(&chan->dev_lock, "nnpfsdevlock", NULL, MTX_DEF); - mtx_lock(&chan->dev_lock); + + if (mtx_initialized(&chan->lock.lock)) + panic("nnpfs_dev_initlock: already inited!"); + + mtx_init(&chan->lock.lock, "nnpfsdevlock", NULL, MTX_DEF); + + mtx_lock(&chan->lock.lock); + chan->lock.locker = me; + chan->lock.recurse = 1; + mtx_unlock(&chan->lock.lock); + return 0; -#endif } void nnpfs_dev_uninitlock(struct nnpfs *chan) { -#ifdef NNPFS_FBSD_DEVLOCK + d_thread_t *me = curthread; + NNPFSDEB(XDEBDEV, ("nnpfs_dev_uninitlock\n")); + if (!mtx_initialized(&chan->lock.lock)) + printf("nnpfs_dev_uninitlock: not inited!\n"); + + mtx_lock(&chan->lock.lock); + nnpfs_assert(chan->lock.recurse == 1); + nnpfs_assert(chan->lock.locker == me); + + chan->lock.recurse = 0; + chan->lock.locker = NULL; + /* * contrary to man page, it seems we need to unlock the mutex before * destroying it if we use spinlocks. Default mutexes are ok. */ - mtx_destroy(&chan->dev_lock); + + mtx_destroy(&chan->lock.lock); +} +#else + +void +nnpfs_dev_lock(struct nnpfs *chan) +{ + int ret; + NNPFSDEB(XDEBDEV, ("nnpfs_dev_lock\n")); + ret = lockmgr(&chan->dev_lock, LK_EXCLUSIVE | LK_CANRECURSE, NULL); + nnpfs_assert(!ret); +} + +void +nnpfs_dev_unlock(struct nnpfs *chan) +{ + int ret; + NNPFSDEB(XDEBDEV, ("nnpfs_dev_unlock\n")); + ret = lockmgr(&chan->dev_lock, LK_RELEASE, NULL); + nnpfs_assert(!ret); +} + +int +nnpfs_dev_msleep(struct nnpfs *chan, caddr_t waitobj, int flags, const char *msg) +{ + d_thread_t *td = curthread; + int nlocks, i, ret; + + NNPFSDEB(XDEBDEV, ("nnpfs_dev_msleep %p %x %s\n", waitobj, flags, msg)); + + ret = lockstatus(&chan->dev_lock, td); + nnpfs_assert(ret == LK_EXCLUSIVE); + + nlocks = lockcount(&chan->dev_lock); + + for (i = nlocks; i > 0 ; i--) { + ret = lockmgr(&chan->dev_lock, LK_RELEASE, NULL); + nnpfs_assert(!ret); + } + + ret = nnpfs_msleep(waitobj, &chan->dev_lock, flags, msg); + return ret; +} + +int +nnpfs_dev_initlock(struct nnpfs *chan) +{ + NNPFSDEB(XDEBDEV, ("nnpfs_dev_initlock\n")); + lockinit(&chan->dev_lock, PRIBIO /* XXX */, "nnpfsdevlock", NULL, LK_CANRECURSE | LK_NOSHARE); + return lockmgr(&chan->dev_lock, LK_EXCLUSIVE, NULL); +} + +void +nnpfs_dev_uninitlock(struct nnpfs *chan) +{ + NNPFSDEB(XDEBDEV, ("nnpfs_dev_uninitlock\n")); + lockdestroy(&chan->dev_lock); +} + #endif -} #ifndef NNPFS_FBSD_DEVLOCK @@ -155,7 +288,9 @@ #ifdef HAVE_STRUCT_CDEVSW_D_SPARE d_spare: NULL, #endif +#if __FreeBSD_version < 600007 d_maj: 128, /* XXX */ +#endif #ifdef HAVE_STRUCT_CDEVSW_D_DUMP d_dump: nodump, #endif ==== //depot/projects/arla/sys/fs/nnpfs/nnpfs_dev-netbsd.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ #include #include -RCSID("$Id: nnpfs_dev-netbsd.c,v 1.3 2005/11/22 18:19:53 lha Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 10 11:36:31 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E20D716A405; Tue, 10 Apr 2007 11:36:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B1B7816A403 for ; Tue, 10 Apr 2007 11:36:30 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A16E613C48A for ; Tue, 10 Apr 2007 11:36:30 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3ABaUKb077919 for ; Tue, 10 Apr 2007 11:36:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3ABaUJH077915 for perforce@freebsd.org; Tue, 10 Apr 2007 11:36:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 10 Apr 2007 11:36:30 GMT Message-Id: <200704101136.l3ABaUJH077915@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 117828 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Apr 2007 11:36:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=117828 Change 117828 by rwatson@rwatson_cinnamon_afs on 2007/04/10 11:36:13 FreeBSD build fixes for updates nnpfs files. Affected files ... .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_vfsops-freebsd.c#4 edit .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_vnodeops-bsd.c#4 edit Differences ... ==== //depot/projects/arla/sys/fs/nnpfs/nnpfs_vfsops-freebsd.c#4 (text+ko) ==== @@ -60,9 +60,15 @@ .vop_default = &default_vnodeops, .vop_lookup = nnpfs_dead_lookup, .vop_reclaim = nnpfs_dead_reclaim, + + /* + * XXXRW: Need appropriate ifdef here. + */ +#if 0 .vop_lock = vop_stdlock, .vop_unlock = vop_stdunlock, .vop_islocked = vop_stdislocked, +#endif }; int @@ -161,9 +167,16 @@ .vfs_statfs = nnpfs_statfs, .vfs_sync = nnpfs_sync, .vfs_vget = nnpfs_vget_freebsd, + /* + * XXXRW: Do we need ifdef, or just not define them at all? + */ +#if 0 .vfs_fhtovp = nnpfs_fhtovp, +#endif .vfs_checkexp = nnpfs_checkexp, +#if 0 .vfs_vptofh = nnpfs_vptofh, +#endif .vfs_init = nnpfs_init }; /*VFS_SET(nnpfs_vfsops, arlannpfsdev, 0);*/ ==== //depot/projects/arla/sys/fs/nnpfs/nnpfs_vnodeops-bsd.c#4 (text+ko) ==== @@ -84,8 +84,11 @@ ret = nnpfs_open_common(ap->a_vp, ap->a_mode, ctx); #ifdef __FreeBSD__ + /* + * XXXRW: Need an ifdef for this? + */ if (!ret) - vnode_create_vobject_off(ap->a_vp, + vnode_create_vobject(ap->a_vp, nnpfs_vattr_get_size(&VNODE_TO_XNODE(ap->a_vp)->attr), ap->a_td); #endif @@ -138,7 +141,7 @@ #endif /* HAVE_VOP_CLOSE */ #if defined(HAVE_VOP_READ) && !defined(__NetBSD__) -int +static int nnpfs_read(struct vop_read_args * ap) /* vop_read { IN struct vnode *vp; @@ -152,7 +155,7 @@ #endif /* HAVE_VOP_READ */ #if defined(HAVE_VOP_WRITE) && !defined(__NetBSD__) -int +static int nnpfs_write(struct vop_write_args * ap) /* vop_write { IN struct vnode *vp; @@ -722,7 +725,7 @@ #endif /* HAVE_VOP_SYMLINK */ -int +static int nnpfs_readlink(struct vop_readlink_args * ap) /* struct vnode *vp, struct uio *uiop, @@ -1064,7 +1067,7 @@ #endif /* HAVE_VOP_MMAP */ #if defined(HAVE_VOP_BMAP) && !defined(__NetBSD__) -int +static int nnpfs_bmap(struct vop_bmap_args *ap) /* IN struct vnode *vp; IN daddr_t bn; @@ -1239,7 +1242,7 @@ #endif /* HAVE_VOP_ADVOCK */ #if defined(HAVE_VOP_REVOKE) && !defined(__NetBSD__) -int +static int nnpfs_revoke(struct vop_revoke_args *v) { #if defined(HAVE_KERNEL_GENFS_REVOKE) @@ -1474,9 +1477,15 @@ .vop_bmap = nnpfs_bmap, .vop_poll = nnpfs_poll, + +/* + * XXXRW: Do we need to ifdef this? + */ +#if 0 .vop_lock = nnpfs_lock, .vop_unlock = nnpfs_unlock, .vop_islocked = nnpfs_islocked, +#endif .vop_revoke = nnpfs_revoke, }; From owner-p4-projects@FreeBSD.ORG Tue Apr 10 11:47:46 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2CE5516A40B; Tue, 10 Apr 2007 11:47:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B9F8116A403 for ; Tue, 10 Apr 2007 11:47:45 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A7B3B13C45D for ; Tue, 10 Apr 2007 11:47:45 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3ABljuI079603 for ; Tue, 10 Apr 2007 11:47:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3ABljl8079600 for perforce@freebsd.org; Tue, 10 Apr 2007 11:47:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 10 Apr 2007 11:47:45 GMT Message-Id: <200704101147.l3ABljl8079600@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 117829 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Apr 2007 11:47:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=117829 Change 117829 by rwatson@rwatson_cinnamon_afs on 2007/04/10 11:47:36 Integrate additional changes from Arla vendor branch, 2007/04/07 CVS export. Affected files ... .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs.h#2 integrate .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_blocks_locl.h#2 integrate .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_dev.h#2 integrate .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_fs.h#2 integrate .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_locl.h#3 integrate .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_msg_locl.h#2 integrate .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_node.h#2 integrate .. //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_vfsops-bsd.h#3 integrate Differences ... ==== //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -/* $Id: nnpfs.h,v 1.10 2006/10/31 12:40:08 tol Exp $ */ +/* $Id: nnpfs.h,v 1.12 2007/03/28 12:05:46 tol Exp $ */ #ifndef _bsd_nnpfs_h #define _bsd_nnpfs_h 1 @@ -83,7 +83,6 @@ #define CHANNEL_CLOSING 0x10 struct mount *mp; struct nnpfs_node *root; - int fd; struct nnpfs_nodelist_head nodehead; struct nh_node_list freehead; /* char device */ @@ -108,11 +107,15 @@ * This is sort of a substitute for GIANT, and we should split it * up. The node lists are good candidates for a separate lock. */ -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(__FreeBSD__) struct { int recurse; nnpfs_mutex_t lock; +#if defined(__APPLE__) thread_t locker; +#else + d_thread_t *locker; +#endif } lock; #else nnpfs_mutex_t dev_lock; ==== //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_blocks_locl.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -/* $Id: nnpfs_blocks_locl.h,v 1.2 2006/10/24 16:33:13 tol Exp $ */ +/* $Id: nnpfs_blocks_locl.h,v 1.3 2007/01/24 17:05:31 tol Exp $ */ typedef struct nnpfs_cache_handle { /* use bitmasks. not good when one needs one 'handle' per block */ @@ -115,4 +115,4 @@ struct vnode **vp); void -nnpfs_block_close(struct vnode *, int); +nnpfs_block_close(struct nnpfs_node *node, struct vnode *vp, int rw); ==== //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_dev.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -/* $Id: nnpfs_dev.h,v 1.25 2006/10/24 16:33:15 tol Exp $ */ +/* $Id: nnpfs_dev.h,v 1.26 2007/03/28 12:05:47 tol Exp $ */ #ifndef _nnpfs_dev_h #define _nnpfs_dev_h @@ -96,24 +96,26 @@ #endif int -nnpfs_message_send(int fd, struct nnpfs_message_header * message, u_int size); +nnpfs_message_send(struct nnpfs *chan, struct nnpfs_message_header * message, u_int size); int -nnpfs_message_rpc(int fd, struct nnpfs_message_header * message, u_int size, +nnpfs_message_rpc(struct nnpfs *nnpfsp, + struct nnpfs_message_header *message, u_int size, d_thread_t *proc); int -nnpfs_message_rpc_async(int fd, struct nnpfs_message_header * message, u_int size, +nnpfs_message_rpc_async(struct nnpfs *nnpfsp, + struct nnpfs_message_header *message, u_int size, d_thread_t *proc); int -nnpfs_message_receive(int fd, +nnpfs_message_receive(struct nnpfs *nnpfsp, struct nnpfs_message_header *message, u_int size, d_thread_t *p); int -nnpfs_message_wakeup(int fd, +nnpfs_message_wakeup(struct nnpfs *chan, struct nnpfs_message_wakeup *message, u_int size, d_thread_t *p); ==== //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_fs.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -/* $Id: nnpfs_fs.h,v 1.30 2006/10/24 16:33:16 tol Exp $ */ +/* $Id: nnpfs_fs.h,v 1.33 2007/03/14 16:44:30 tol Exp $ */ #ifndef _nnpfs_h #define _nnpfs_h @@ -61,12 +61,19 @@ #define NNPFS_FROM_XNODE(xp) NNPFS_FROM_VNODE(XNODE_TO_VNODE(xp)) +#ifdef __FreeBSD__ +extern struct vop_vector nnpfs_vnodeops; +#else extern struct vnodeops nnpfs_vnodeops; +extern vop_t **nnpfs_vnodeop_p; +#endif int nnpfs_new_node(struct nnpfs *, struct nnpfs_msg_node *, char *, struct nnpfs_node **, d_thread_t *, int); void nnpfs_free_node(struct nnpfs *nnpfsp, struct nnpfs_node *node); int nnpfs_free_all_nodes(struct nnpfs *, int, int); +void nnpfs_release_cachevn(struct nnpfs_node *node); +void nnpfs_release_data(struct nnpfs_node *node); int nnpfs_dnlc_enter(struct vnode *, nnpfs_componentname *, struct vnode *); int nnpfs_dnlc_enter_name(struct vnode *, char *, struct vnode *); ==== //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_locl.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -/* $Id: nnpfs_locl.h,v 1.110 2007/01/08 13:09:37 tol Exp $ */ +/* $Id: nnpfs_locl.h,v 1.113 2007/03/06 16:01:56 tol Exp $ */ #ifdef HAVE_CONFIG_H #include @@ -77,6 +77,9 @@ #ifdef HAVE_SYS_STATVFS_H #include #endif +#ifdef HAVE_SYS_STAT_H +#include +#endif #include #ifdef __APPLE__ #include @@ -157,6 +160,11 @@ #include #endif +#ifdef __FreeBSD__ +#include +#include +#endif + #if defined(__FreeBSD__) #define nnpfs_assert(x) \ do { if(!(x)) panic("nnpfs_assert(" #x ") failed"); } while(0); @@ -205,8 +213,16 @@ #define nnpfs_tsleep(chan, pri, msg) \ tsleep((chan), (pri), (msg), 0) +#if defined(__FreeBSD__) +#define nnpfs_msleep(chan, mtx, pri, msg) \ + msleep((chan), (mtx), (pri), (msg), 0) +#elif defined(__NetBSD__) +#define nnpfs_msleep(chan, mtx, pri, msg) \ + ltsleep((chan), (pri), (msg), 0, (mtx)) /* XXX */ +#else #define nnpfs_msleep(chan, mtx, pri, msg) \ tsleep((chan), (pri), (msg), 0) /* XXX */ +#endif #endif /* !__APPLE__ */ @@ -239,16 +255,10 @@ #if defined(__FreeBSD_version) || defined(__DragonFly__) -#if __FreeBSD_version < 400000 +#if __FreeBSD_version < 600006 # error This version is unsupported -#elif __FreeBSD_version < 440001 || (__FreeBSD_version >= 500000 && __FreeBSD_version < 500023) -typedef struct proc d_thread_t; -#elif __FreeBSD_version == 500023 -# define HAVE_FREEBSD_THREAD -typedef struct thread d_thread_t; -#elif __FreeBSD_version >= 500024 || defined(__DragonFly__) -# define HAVE_FREEBSD_THREAD #endif +#define HAVE_FREEBSD_THREAD typedef d_thread_t syscall_d_thread_t; #define syscall_thread_to_thread(x) (x) #else /* !__FreeBSD_version || __DragonFly__ */ @@ -461,6 +471,12 @@ #define NNPFS_LOCKLEAF 0 #endif +#ifdef MPSAFE +#define NNPFS_MPSAFE MPSAFE +#else +#define NNPFS_MPSAFE 0 +#endif + #if defined(HAVE_SYS_MUTEX_H) && !defined(OpenBSD) #define nnpfs_interlock_lock(interlock) mtx_lock(interlock); #define nnpfs_interlock_unlock(interlock) mtx_unlock(interlock); ==== //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_msg_locl.h#2 (text+ko) ==== @@ -31,67 +31,67 @@ * SUCH DAMAGE. */ -/* $Id: nnpfs_msg_locl.h,v 1.9 2006/10/24 16:33:18 tol Exp $ */ +/* $Id: nnpfs_msg_locl.h,v 1.10 2007/03/28 12:05:47 tol Exp $ */ #ifndef _nnpfs_msg_locl_h #define _nnpfs_msg_locl_h int -nnpfs_message_installroot(int fd, +nnpfs_message_installroot(struct nnpfs *nnpfsp, struct nnpfs_message_installroot * message, u_int size, d_thread_t *p); int -nnpfs_message_installnode(int fd, +nnpfs_message_installnode(struct nnpfs *nnpfsp, struct nnpfs_message_installnode * message, u_int size, d_thread_t *p); int -nnpfs_message_installattr(int fd, +nnpfs_message_installattr(struct nnpfs *nnpfsp, struct nnpfs_message_installattr * message, u_int size, d_thread_t *p); int -nnpfs_message_installdata(int fd, +nnpfs_message_installdata(struct nnpfs *nnpfsp, struct nnpfs_message_installdata * message, u_int size, d_thread_t *p); int -nnpfs_message_invalidnode(int fd, +nnpfs_message_invalidnode(struct nnpfs *nnpfsp, struct nnpfs_message_invalidnode * message, u_int size, d_thread_t *p); int -nnpfs_message_updatefid(int fd, +nnpfs_message_updatefid(struct nnpfs *nnpfsp, struct nnpfs_message_updatefid * message, u_int size, d_thread_t *p); int -nnpfs_message_gc(int fd, +nnpfs_message_gc(struct nnpfs *nnpfsp, struct nnpfs_message_gc *message, u_int size, d_thread_t *p); int -nnpfs_message_version(int fd, +nnpfs_message_version(struct nnpfs *nnpfsp, struct nnpfs_message_version *message, u_int size, d_thread_t *p); int -nnpfs_message_delete_node(int fd, +nnpfs_message_delete_node(struct nnpfs *nnpfsp, struct nnpfs_message_delete_node *message, u_int size, d_thread_t *p); int -nnpfs_message_installquota(int fd, +nnpfs_message_installquota(struct nnpfs *nnpfsp, struct nnpfs_message_installquota *message, u_int size, d_thread_t *p); ==== //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_node.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -/* $Id: nnpfs_node.h,v 1.45 2006/10/24 16:33:19 tol Exp $ */ +/* $Id: nnpfs_node.h,v 1.47 2007/03/06 16:01:56 tol Exp $ */ #ifndef _nnpfs_xnode_h #define _nnpfs_xnode_h @@ -113,8 +113,13 @@ #else +#if defined(__FreeBSD__) && __FreeBSD_version >= 600000 +#define nnpfs_vrecycle(vp, foo, bar) vrecycle(vp, bar) +#else +#define nnpfs_vrecycle(vp, foo, bar) vrecycle(vp, foo, bar) +#endif + #define nnpfs_vrele(vp) vrele(vp) -#define nnpfs_vrecycle(vp, foo, bar) vrecycle(vp, foo, bar) #define nnpfs_vput(vp) vput(vp) #define nnpfs_vref(vp) VREF(vp) #define nnpfs_vletgo(vn) nnpfs_vrele(vn) @@ -193,6 +198,7 @@ struct vnode *vn; uint32_t index; struct nnpfs_cache_handle data; + struct vnode *cache_vn; struct nnpfs_vfs_vattr attr; uint64_t daemon_length; #ifdef __APPLE__ @@ -206,11 +212,15 @@ nnpfs_pag_t id[NNPFS_MAXRIGHTS]; nnpfs_rights rights[NNPFS_MAXRIGHTS]; nnpfs_rights anonrights; + +#ifndef __FreeBSD__ #if (defined(HAVE_KERNEL_LOCKMGR) || defined(HAVE_KERNEL_DEBUGLOCKMGR)) && !defined(__APPLE__) nnpfs_vnode_lock lock; #else int vnlocks; #endif +#endif /* !__FreeBSD__ */ + #ifdef HAVE_KERNEL_LF_ADVLOCK #ifdef __DragonFly__ struct lockf lockf; @@ -274,8 +284,12 @@ #ifndef HAVE_VOP_T +#if defined(__FreeBSD_version) && __FreeBSD_version > 600006 +typedef struct vop_vector vop_t; +#else typedef int vop_t (void *); #endif +#endif #ifdef LK_INTERLOCK #define HAVE_LK_INTERLOCK ==== //depot/projects/arla/sys/fs/nnpfs/nnpfs/nnpfs_vfsops-bsd.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -/* $Id: nnpfs_vfsops-bsd.h,v 1.24 2006/09/01 14:37:28 tol Exp $ */ +/* $Id: nnpfs_vfsops-bsd.h,v 1.25 2007/03/06 16:01:56 tol Exp $ */ #ifndef _nnpfs_vfsops_bsd_h #define _nnpfs_vfsops_bsd_h @@ -87,7 +87,7 @@ int nnpfs_statfs(struct mount *mp, nnpfs_statvfs *sbp, d_thread_t *p); -#ifdef __DragonFly__ +#if defined(__DragonFly__) || (defined(__FreeBSD_version) && __FreeBSD_version > 600006) int nnpfs_sync(struct mount *mp, int waitfor, d_thread_t *p); #else From owner-p4-projects@FreeBSD.ORG Tue Apr 10 11:48:53 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D34B616A406; Tue, 10 Apr 2007 11:48:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 97A3816A401 for ; Tue, 10 Apr 2007 11:48:52 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6F1D813C44C for ; Tue, 10 Apr 2007 11:48:52 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3ABmlZK079664 for ; Tue, 10 Apr 2007 11:48:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3ABmlAv079661 for perforce@freebsd.org; Tue, 10 Apr 2007 11:48:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 10 Apr 2007 11:48:47 GMT Message-Id: <200704101148.l3ABmlAv079661@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 117830 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Apr 2007 11:48:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=117830 Change 117830 by rwatson@rwatson_cinnamon_afs on 2007/04/10 11:48:34 We don't need these files. Affected files ... .. //depot/projects/arla/sys/fs/nnpfs/Info.plist.in#2 delete .. //depot/projects/arla/sys/fs/nnpfs/Makefile.in#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Tue Apr 10 13:09:34 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AB1D16A406; Tue, 10 Apr 2007 13:09:34 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3BB7D16A404 for ; Tue, 10 Apr 2007 13:09:34 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 29E6413C465 for ; Tue, 10 Apr 2007 13:09:34 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3AD9YOp009741 for ; Tue, 10 Apr 2007 13:09:34 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3AD9Y7t009738 for perforce@freebsd.org; Tue, 10 Apr 2007 13:09:34 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 10 Apr 2007 13:09:34 GMT Message-Id: <200704101309.l3AD9Y7t009738@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 117837 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Apr 2007 13:09:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=117837 Change 117837 by rdivacky@rdivacky_witten on 2007/04/10 13:09:09 I got lost in the linux_foo, linux_foo64, linux_fooXYZ etc. remove param that is not present. Noticed by: netchild Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_stats.c#12 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_stats.c#12 (text+ko) ==== @@ -385,7 +385,7 @@ #ifdef DEBUG if (ldebug(statfs)) - printf(ARGS(statfs, "%s, *"), path, args->sz); + printf(ARGS(statfs, "%s, *"), path); #endif error = kern_statfs(td, path, UIO_SYSSPACE, &bsd_statfs); LFREEPATH(path); From owner-p4-projects@FreeBSD.ORG Tue Apr 10 13:19:49 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C6DD16A40A; Tue, 10 Apr 2007 13:19:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E868916A408 for ; Tue, 10 Apr 2007 13:19:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D6E6813C46E for ; Tue, 10 Apr 2007 13:19:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3ADJmg5011321 for ; Tue, 10 Apr 2007 13:19:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3ADJmai011318 for perforce@freebsd.org; Tue, 10 Apr 2007 13:19:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 10 Apr 2007 13:19:48 GMT Message-Id: <200704101319.l3ADJmai011318@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 117838 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Apr 2007 13:19:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=117838 Change 117838 by rwatson@rwatson_zoo on 2007/04/10 13:19:18 We do allow POSIX message queue privileges in jail in almost all cases, so make it all. Affected files ... .. //depot/projects/trustedbsd/priv/sys/kern/uipc_mqueue.c#8 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/kern/uipc_mqueue.c#8 (text+ko) ==== @@ -961,12 +961,9 @@ sx_assert(&pn->mn_info->mi_lock, SX_LOCKED); - /* - * XXXRW: Other instances of the message queue primitive are - * allowed in jail? - */ if (ucred->cr_uid != pn->mn_uid && - (error = priv_check_cred(ucred, PRIV_MQ_ADMIN, 0)) != 0) + (error = priv_check_cred(ucred, PRIV_MQ_ADMIN, + SUSER_ALLOWJAIL)) != 0) error = EACCES; else if (!pn->mn_deleted) { parent = pn->mn_parent; From owner-p4-projects@FreeBSD.ORG Tue Apr 10 13:32:05 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B2A516A403; Tue, 10 Apr 2007 13:32:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2C4F416A400 for ; Tue, 10 Apr 2007 13:32:05 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 021E713C4BE for ; Tue, 10 Apr 2007 13:32:05 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3ADW4Vw014885 for ; Tue, 10 Apr 2007 13:32:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3ADW4ek014881 for perforce@freebsd.org; Tue, 10 Apr 2007 13:32:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 10 Apr 2007 13:32:04 GMT Message-Id: <200704101332.l3ADW4ek014881@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 117840 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Apr 2007 13:32:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=117840 Change 117840 by rwatson@rwatson_peppercorn on 2007/04/10 13:32:03 Notes file from starting my re-re-review of kernel privileges. Affected files ... .. //depot/projects/trustedbsd/priv/notes.txt#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Apr 10 14:04:46 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0DC4916A406; Tue, 10 Apr 2007 14:04:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A645E16A404 for ; Tue, 10 Apr 2007 14:04:45 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9458413C468 for ; Tue, 10 Apr 2007 14:04:45 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3AE4jIq025012 for ; Tue, 10 Apr 2007 14:04:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3AE4jiJ025000 for perforce@freebsd.org; Tue, 10 Apr 2007 14:04:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 10 Apr 2007 14:04:45 GMT Message-Id: <200704101404.l3AE4jiJ025000@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 117841 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Apr 2007 14:04:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=117841 Change 117841 by rwatson@rwatson_zoo on 2007/04/10 14:03:50 Survey more privileges. Affected files ... .. //depot/projects/trustedbsd/priv/notes.txt#2 edit Differences ... ==== //depot/projects/trustedbsd/priv/notes.txt#2 (text+ko) ==== @@ -86,19 +86,19 @@ PRIV_ZFS_POOL_CONFIG 0 no PRIV_ZFS_INJECT 0 no PRIV_ZFS_JAIL 0 no -PRIV_VFS_READ yes -PRIV_VFS_WRITE yes -PRIV_VFS_ADMIN yes -PRIV_VFS_EXEC yes -PRIV_VFS_LOOKUP yes -PRIV_VFS_BLOCKRESERVE yes -PRIV_VFS_CHFLAGS_DEV yes -PRIV_VFS_CHOWN yes -PRIV_VFS_CHROOT yes -PRIV_VFS_RETAINSUGID yes -PRIV_VFS_EXCEEDQUOTA no -PRIV_VFS_EXTATTR_SYSTEM no -PRIV_VFS_FCHROOT yes +PRIV_VFS_READ yes yes +PRIV_VFS_WRITE yes yes +PRIV_VFS_ADMIN yes yes +PRIV_VFS_EXEC yes yes +PRIV_VFS_LOOKUP yes yes +PRIV_VFS_BLOCKRESERVE yes yes XXXX surprising? +PRIV_VFS_CHFLAGS_DEV yes yes +PRIV_VFS_CHOWN yes yes +PRIV_VFS_CHROOT yes yes +PRIV_VFS_RETAINSUGID yes yes +PRIV_VFS_EXCEEDQUOTA no no +PRIV_VFS_EXTATTR_SYSTEM no no +PRIV_VFS_FCHROOT no yes PRIV_VFS_FHOPEN no PRIV_VFS_FHSTAT no PRIV_VFS_FHSTATFS no From owner-p4-projects@FreeBSD.ORG Tue Apr 10 15:28:30 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1FA7416A40A; Tue, 10 Apr 2007 15:28:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D6FC816A407 for ; Tue, 10 Apr 2007 15:28:29 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BDD6D13C4AD for ; Tue, 10 Apr 2007 15:28:29 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3AFSTrL045295 for ; Tue, 10 Apr 2007 15:28:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3AFST2B045292 for perforce@freebsd.org; Tue, 10 Apr 2007 15:28:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 10 Apr 2007 15:28:29 GMT Message-Id: <200704101528.l3AFST2B045292@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 117844 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Apr 2007 15:28:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=117844 Change 117844 by rwatson@rwatson_zoo on 2007/04/10 15:27:42 Finish fleshing out review table for privileges. Affected files ... .. //depot/projects/trustedbsd/priv/notes.txt#3 edit Differences ... ==== //depot/projects/trustedbsd/priv/notes.txt#3 (text+ko) ==== @@ -99,84 +99,84 @@ PRIV_VFS_EXCEEDQUOTA no no PRIV_VFS_EXTATTR_SYSTEM no no PRIV_VFS_FCHROOT no yes -PRIV_VFS_FHOPEN no -PRIV_VFS_FHSTAT no -PRIV_VFS_FHSTATFS no -PRIV_VFS_GENERATION no -PRIV_VFS_GETFH no -PRIV_VFS_GETQUOTA yes -PRIV_VFS_LINK yes -PRIV_VFS_MKNOD_BAD no -PRIV_VFS_MKNOD_DEV no -PRIV_VFS_MKNOD_WHT no -PRIV_VFS_MOUNT jail_mount_allowed -PRIV_VFS_MOUNT_OWNER no -PRIV_VFS_MOUNT_EXPORTED no -PRIV_VFS_MOUNT_PERM no -PRIV_VFS_MOUNT_SUIDDIR no -PRIV_VFS_MOUNT_NONUSER jail_mount_allowed -PRIV_VFS_SETGID yes -PRIV_VFS_SETQUOTA yes -PRIV_VFS_STICKYFILE yes -PRIV_VFS_SYSFLAGS jail_chflags_allowed -PRIV_VFS_UNMOUNT jail_mount_allowed -PRIV_VM_MADV_PROTECT no -PRIV_VM_MLOCK no -PRIV_VM_MUNLOCK no -PRIV_DEVFS_RULE no -PRIV_DEVFS_SYMLINK no -PRIV_RANDOM_RESEED no -PRIV_NET_BRIDGE no -PRIV_NET_GRE no -PRIV_NET_PPP no -PRIV_NET_SLIP no -PRIV_NET_BPF no -PRIV_NET_RAW no -PRIV_NET_ROUTE no -PRIV_NET_TAP no -PRIV_NET_SETIFMTU no -PRIV_NET_SETIFFLAGS no -PRIV_NET_SETIFCAP no -PRIV_NET_SETIFNAME no -PRIV_NET_SETIFMETRIC no -PRIV_NET_SETIFPHYS no -PRIV_NET_SETIFMAC no -PRIV_NET_ADDMULTI no -PRIV_NET_DELMULTI no -PRIV_NET_HWIOCTL no -PRIV_NET_SETLLADDR no -PRIV_NET_ADDIFGROUP no -PRIV_NET_DELIFGROUP no -PRIV_NET_IFCREATE no -PRIV_NET_IFDESTROY no -PRIV_NET_ADDIFADDR no -PRIV_NET_DELIFADDR no -PRIV_NET80211_GETKEY no -PRIV_NET80211_MANAGE no -PRIV_NETATALK_RESERVEDPORT yes -PRIV_NETATM_CFG no -PRIV_NETATM_ADD no -PRIV_NETATM_DEL no -PRIV_NETATM_SET no -PRIV_NETBLUETOOTH_RAW jail_allow_raw_sockets -PRIV_NETGRAPH_CONTROL no -PRIV_NETGRAPH_TTY no -PRIV_NETINET_RESERVEDPORT no -PRIV_NETINET_IPFW no -PRIV_NETINET_DIVERT no -PRIV_NETINET_PF no -PRIV_NETINET_DUMMYNET no -PRIV_NETINET_CARP no -PRIV_NETINET_MROUTE no -PRIV_NETINET_RAW no -PRIV_NETINET_GETCRED yes -PRIV_NETINET_ADDRCTRL6 no -PRIV_NETINET_ND6 no -PRIV_NETINET_SCOPE6 no -PRIV_NETINET_ALIFETIME6 no -PRIV_NETINET_IPSEC no -PRIV_NETIPX_RESERVEDPORT no -PRIV_NETIPX_RAW no -PRIV_NETNCP no -PRIV_NETSMB no -PRIV_VM86_INTCALL no +PRIV_VFS_FHOPEN no no +PRIV_VFS_FHSTAT no no +PRIV_VFS_FHSTATFS no no +PRIV_VFS_GENERATION no no +PRIV_VFS_GETFH no no +PRIV_VFS_GETQUOTA yes yes +PRIV_VFS_LINK yes yes +PRIV_VFS_MKNOD_BAD no no +PRIV_VFS_MKNOD_DEV no no +PRIV_VFS_MKNOD_WHT no no +PRIV_VFS_MOUNT no jail_mount_allowed +PRIV_VFS_MOUNT_OWNER no no +PRIV_VFS_MOUNT_EXPORTED no no +PRIV_VFS_MOUNT_PERM no no +PRIV_VFS_MOUNT_SUIDDIR no no +PRIV_VFS_MOUNT_NONUSER no jail_mount_allowed +PRIV_VFS_SETGID yes yes +PRIV_VFS_SETQUOTA yes yes +PRIV_VFS_STICKYFILE yes yes +PRIV_VFS_SYSFLAGS jail_chflags_allowed jail_chflags_allowed XXX old way sometimes not, see msdosfs, ext2fs +PRIV_VFS_UNMOUNT no jail_mount_allowed +PRIV_VM_MADV_PROTECT no no +PRIV_VM_MLOCK no no +PRIV_VM_MUNLOCK no no +PRIV_DEVFS_RULE no no +PRIV_DEVFS_SYMLINK no no +PRIV_RANDOM_RESEED no no +PRIV_NET_BRIDGE no no +PRIV_NET_GRE no no +PRIV_NET_PPP no no +PRIV_NET_SLIP no no +PRIV_NET_BPF no no +PRIV_NET_RAW no no +PRIV_NET_ROUTE no no +PRIV_NET_TAP no no +PRIV_NET_SETIFMTU no no +PRIV_NET_SETIFFLAGS no no +PRIV_NET_SETIFCAP no no +PRIV_NET_SETIFNAME no no +PRIV_NET_SETIFMETRIC no no +PRIV_NET_SETIFPHYS no no +PRIV_NET_SETIFMAC no no +PRIV_NET_ADDMULTI no no +PRIV_NET_DELMULTI no no +PRIV_NET_HWIOCTL no no +PRIV_NET_SETLLADDR no no +PRIV_NET_ADDIFGROUP no no +PRIV_NET_DELIFGROUP no no +PRIV_NET_IFCREATE no no +PRIV_NET_IFDESTROY no no +PRIV_NET_ADDIFADDR no no +PRIV_NET_DELIFADDR no no +PRIV_NET80211_GETKEY no no +PRIV_NET80211_MANAGE no no +PRIV_NETATALK_RESERVEDPORT no no +PRIV_NETATM_CFG no no +PRIV_NETATM_ADD no no +PRIV_NETATM_DEL no no +PRIV_NETATM_SET no no +PRIV_NETBLUETOOTH_RAW no no +PRIV_NETGRAPH_CONTROL no no +PRIV_NETGRAPH_TTY no no +PRIV_NETINET_RESERVEDPORT yes yes +PRIV_NETINET_IPFW no no +PRIV_NETINET_DIVERT no no +PRIV_NETINET_PF no no +PRIV_NETINET_DUMMYNET no no +PRIV_NETINET_CARP no no +PRIV_NETINET_MROUTE no no +PRIV_NETINET_RAW jail_allow_raw_sockets jail_allow_raw_sockets +PRIV_NETINET_GETCRED yes yes +PRIV_NETINET_ADDRCTRL6 no no +PRIV_NETINET_ND6 no no +PRIV_NETINET_SCOPE6 no no +PRIV_NETINET_ALIFETIME6 no no +PRIV_NETINET_IPSEC no no +PRIV_NETIPX_RESERVEDPORT no no +PRIV_NETIPX_RAW no no +PRIV_NETNCP no no +PRIV_NETSMB no no +PRIV_VM86_INTCALL no no From owner-p4-projects@FreeBSD.ORG Tue Apr 10 16:23:46 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC99E16A404; Tue, 10 Apr 2007 16:23:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9B29B16A401 for ; Tue, 10 Apr 2007 16:23:45 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 896CD13C44B for ; Tue, 10 Apr 2007 16:23:45 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3AGNjOI058401 for ; Tue, 10 Apr 2007 16:23:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3AGNjhn058398 for perforce@freebsd.org; Tue, 10 Apr 2007 16:23:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 10 Apr 2007 16:23:45 GMT Message-Id: <200704101623.l3AGNjhn058398@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 117853 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Apr 2007 16:23:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=117853 Change 117853 by rwatson@rwatson_zoo on 2007/04/10 16:22:57 Update. Affected files ... .. //depot/projects/trustedbsd/priv/notes.txt#4 edit Differences ... ==== //depot/projects/trustedbsd/priv/notes.txt#4 (text+ko) ==== @@ -57,7 +57,7 @@ PRIV_IPC_WRITE yes yes PRIV_IPC_ADMIN yes yes PRIV_IPC_MSGSIZE yes yes -PRIV_MQ_ADMIN no yes XXX need to merge to CVS +PRIV_MQ_ADMIN yes yes PRIV_PMC_MANAGE yes no PRIV_PMC_SYSTEM yes no PRIV_SCHED_DIFFCRED yes yes @@ -175,6 +175,7 @@ PRIV_NETINET_SCOPE6 no no PRIV_NETINET_ALIFETIME6 no no PRIV_NETINET_IPSEC no no +PRIV_NETINET_REUSEPORT yes yes PRIV_NETIPX_RESERVEDPORT no no PRIV_NETIPX_RAW no no PRIV_NETNCP no no From owner-p4-projects@FreeBSD.ORG Tue Apr 10 22:05:01 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6DD5D16A406; Tue, 10 Apr 2007 22:05:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 24BCA16A400 for ; Tue, 10 Apr 2007 22:05:01 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 14BF413C458 for ; Tue, 10 Apr 2007 22:05:01 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3AM51rH058447 for ; Tue, 10 Apr 2007 22:05:01 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3AM4vG6058391 for perforce@freebsd.org; Tue, 10 Apr 2007 22:04:57 GMT (envelope-from scottl@freebsd.org) Date: Tue, 10 Apr 2007 22:04:57 GMT Message-Id: <200704102204.l3AM4vG6058391@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 117871 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Apr 2007 22:05:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=117871 Change 117871 by scottl@scottl-x64 on 2007/04/10 22:04:09 IFC Affected files ... .. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#3 integrate .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/FREEBSD-upgrade#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/KNOWNBUGS#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/PGPKEYS#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/RELEASE_NOTES#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/README#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/cf/knecht.mc#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/cf/submit.cf#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/feature/access_db.m4#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/feature/badmx.m4#1 branch .. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/feature/block_bad_helo.m4#1 branch .. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/feature/dnsbl.m4#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/feature/enhdnsbl.m4#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/feature/require_rdns.m4#1 branch .. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/m4/proto.m4#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/m4/version.m4#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/mailer/smtp.m4#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/contrib/cidrexpand#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/contrib/qtool.pl#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/doc/op/op.me#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/editmap/Makefile.m4#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/include/libmilter/mfapi.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/include/libmilter/mfdef.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/include/libmilter/milter.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/include/sm/conf.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/include/sm/errstring.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/include/sm/heap.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/include/sm/ldap.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/include/sm/misc.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/sendmail/include/sm/os/sm_os_qnx.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/sendmail/include/sm/sendmail.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/sendmail/include/sm/tailq.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/Makefile.m4#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/README#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/comm.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/api.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/design.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/index.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/installation.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/other.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/overview.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/sample.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_addheader.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_addrcpt.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_addrcpt_par.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_chgfrom.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_chgheader.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_delrcpt.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_getpriv.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_getsymval.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_insheader.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_main.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_opensocket.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_progress.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_quarantine.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_register.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_replacebody.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_setbacklog.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_setconn.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_setdbg.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_setmlreply.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_setpriv.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_setreply.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_setsymlist.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_settimeout.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_stop.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_version.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/xxfi_abort.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/xxfi_body.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/xxfi_close.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/xxfi_connect.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/xxfi_data.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/xxfi_envfrom.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/xxfi_eoh.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/xxfi_eom.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/xxfi_header.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/xxfi_helo.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/xxfi_negotiate.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/xxfi_unknown.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/engine.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/example.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/handler.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/libmilter.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/listener.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/main.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/monitor.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/smfi.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/worker.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/Makefile.m4#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/config.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/exc.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/exc.html#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/findfp.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/flags.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/ldap.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/local.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/memstat.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/snprintf.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/t-memstat.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/t-qic.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/t-sem.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/util.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/vfscanf.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libsmdb/Makefile.m4#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libsmutil/Makefile.m4#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/mail.local/Makefile.m4#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/mail.local/mail.local.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/mailstats/Makefile.m4#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/makemap/Makefile.m4#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/praliases/Makefile.m4#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/rmail/Makefile.m4#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/smrsh/Makefile.m4#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/Makefile.m4#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/README#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/TRACEFLAGS#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/TUNING#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/alias.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/arpadate.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/collect.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/conf.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/conf.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/control.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/daemon.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/daemon.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/deliver.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/domain.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/envelope.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/err.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/headers.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/helpfile#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/macro.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/mailq.1#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/main.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/map.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/map.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/mci.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/milter.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/mime.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/parseaddr.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/queue.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/ratectrl.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/readcf.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/recipient.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/sasl.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/savemail.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/sendmail.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/sm_resolve.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/srvrsmtp.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/stab.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/stats.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/timers.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/tls.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/udb.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/usersmtp.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/util.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/version.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/test/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/vacation/Makefile.m4#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/vacation/vacation.c#2 integrate .. //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#3 integrate .. //depot/projects/scottl-camlock/src/etc/mtree/BSD.root.dist#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/FILESYSTEMS#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/NETWORKING#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/hostid#1 branch .. //depot/projects/scottl-camlock/src/etc/rc.d/ipfilter#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/ipsec#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/kldxref#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/mountcritremote#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/netoptions#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/pf#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/pflog#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/pfsync#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/Symbol.map#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/sysctl.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/i386/Symbol.map#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdlib/strtol.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/ptrace.2#3 integrate .. //depot/projects/scottl-camlock/src/lib/libmilter/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/libsm/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/Symbol.map#2 integrate .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/Versions.def#2 integrate .. //depot/projects/scottl-camlock/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#3 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifconfig.8#3 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/iftrunk.c#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/trunk.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man5/rc.conf.5#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/hash.9#2 integrate .. //depot/projects/scottl-camlock/src/share/misc/committers-ports.dot#2 integrate .. //depot/projects/scottl-camlock/src/share/misc/committers-src.dot#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#16 integrate .. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf#13 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/kern/opensolaris_string.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/string.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#21 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#20 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ah_osdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/brgphy.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/miidevs#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/GENERIC#16 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/conf/GENERIC#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_jail.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_mib.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_mqueue.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_mount.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_subr.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/libkern/index.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/libkern/rindex.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/Makefile#20 integrate .. //depot/projects/scottl-camlock/src/sys/modules/dpt/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/if_trunk/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/net/ieee8023ad_lacp.c#1 branch .. //depot/projects/scottl-camlock/src/sys/net/ieee8023ad_lacp.h#1 branch .. //depot/projects/scottl-camlock/src/sys/net/if.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_ethersubr.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_trunk.c#1 branch .. //depot/projects/scottl-camlock/src/sys/net/if_trunk.h#1 branch .. //depot/projects/scottl-camlock/src/sys/net/if_var.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_pcb.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec_osdep.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/conf/GENERIC#12 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/conf/GENERIC#14 integrate .. //depot/projects/scottl-camlock/src/sys/rpc/types.h#1 branch .. //depot/projects/scottl-camlock/src/sys/sparc64/conf/GENERIC#14 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/conf/GENERIC#5 integrate .. //depot/projects/scottl-camlock/src/sys/sys/hash.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sys/kernel.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/sys/libkern.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/sys/priv.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sysctl.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_snapshot.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_softdep.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/vm/phys_pager.c#6 integrate .. //depot/projects/scottl-camlock/src/tools/regression/netinet/ipsockopt/ipsockopt.c#2 integrate .. //depot/projects/scottl-camlock/src/tools/tools/net80211/wesside/wesside/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.c#1 branch .. //depot/projects/scottl-camlock/src/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.h#1 branch .. //depot/projects/scottl-camlock/src/tools/tools/net80211/wesside/wesside/wesside.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/gcore/elfcore.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/kdump/kdump.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/kdump/kdump_subr.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/kdump/mksubr#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/mcast.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/write.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/touch/touch.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/touch/touch.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/truss/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/truss/amd64-fbsd.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/truss/extern.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/truss/i386-fbsd.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/truss/i386-linux.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/truss/ia64-fbsd.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/truss/main.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/truss/powerpc-fbsd.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/truss/setup.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/truss/sparc64-fbsd.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/truss/syscall.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/truss/syscalls.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/truss/truss.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/truss/truss.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/uuidgen/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ifmcstat/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ifmcstat/ifmcstat.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ifmcstat/ifmcstat.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sendmail/Makefile#2 integrate Differences ... ==== //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.77 2007/03/28 07:49:57 delphij Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.78 2007/04/09 19:16:48 pjd Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070409: uuidgen moved to /bin/ +OLD_FILES+=usr/bin/uuidgen # 20070328: bzip2 1.0.4 OLD_FILES+=usr/share/info/bzip2.info.gz # 20070303: libarchive 2.0 ==== //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 (text+ko) ==== @@ -290,6 +290,7 @@ #define kmem_alloc(_s, _f) umem_alloc(_s, _f) #define kmem_zalloc(_s, _f) umem_zalloc(_s, _f) #define kmem_free(_b, _s) umem_free(_b, _s) +#define kmem_size() (physmem * PAGESIZE) #define kmem_cache_create(_a, _b, _c, _d, _e, _f, _g, _h, _i) \ umem_cache_create(_a, _b, _c, _d, _e, _f, _g, _h, _i) #define kmem_cache_destroy(_c) umem_cache_destroy(_c) @@ -489,12 +490,15 @@ #define SX_SYSINIT(name, lock, desc) #define SYSCTL_DECL(...) +#define SYSCTL_NODE(...) #define SYSCTL_INT(...) -#define SYSCTL_NODE(...) +#define SYSCTL_ULONG(...) #ifdef TUNABLE_INT #undef TUNABLE_INT +#undef TUNABLE_ULONG #endif #define TUNABLE_INT(...) +#define TUNABLE_ULONG(...) /* Errors */ ==== //depot/projects/scottl-camlock/src/contrib/sendmail/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,6 +1,6 @@ -$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.32 2006/08/17 05:14:33 gshapiro Exp $ +$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.33 2007/04/09 01:46:43 gshapiro Exp $ -sendmail 8.13.8 +sendmail 8.14.1 originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/ For the import of sendmail, the following files were removed: @@ -21,8 +21,8 @@ Imported using: - cvs import -m 'Import sendmail 8.13.8' \ - src/contrib/sendmail SENDMAIL v8_13_8 + cvs import -m 'Import sendmail 8.14.1' \ + src/contrib/sendmail SENDMAIL v8_14_1 After importing, bump the version of src/etc/sendmail/freebsd*mc so mergemaster will merge /etc/mail/freebsd*cf: @@ -97,4 +97,4 @@ usr.sbin/mailwrapper/Makefile gshapiro@FreeBSD.org -16-August-2006 +08-April-2007 ==== //depot/projects/scottl-camlock/src/contrib/sendmail/KNOWNBUGS#2 (text+ko) ==== @@ -29,10 +29,10 @@ * Null bytes are not handled properly in headers. Sendmail should handle full binary data. As it stands, it handles - all values in the body, but only 0x01-0x80 and 0xA0-0xFF in - the header. Notably missing is 0x00, which would require a major - restructuring of the code -- for example, almost no C library support - could be used to handle strings. + all values in the body, but not 0x00 in the header. Changing + this would require a major restructuring of the code -- for + example, almost no C library support could be used to handle + strings. * Header checks are not called if header value is too long or empty. @@ -170,7 +170,7 @@ When sendmail is doing 8->7 bit MIME conversions, and the message contains certain MIME body types that cannot be converted to 7-bit, - sendmail will strip the message to 7-bit. + sendmail will pass the message as 8-bit. * 7->8 bit MIME conversion @@ -235,9 +235,9 @@ Sendmail will deliver to a fail if the file is owned by the DefaultUser or has the set-user-ID bit set. Unfortunately, some systems clear that bit - when a file is modified. Sendmail compensates by resetting the file mode + when a file is modified. Sendmail compensates by resetting the file mode back to it's original settings. Unfortunately, there's still a - permission failure race as sendmail checks the permissions before locking + permission failure race as sendmail checks the permissions before locking the file. This is unavoidable as sendmail must verify the file is safe to open before opening it. A file can not be locked until it is open. @@ -247,4 +247,4 @@ be used if set instead of LOCAL_RELAY ($R). This will be fixed in a future version. -$Revision: 8.57 $, Last updated $Date: 2004/12/02 23:39:01 $ +$Revision: 8.59 $, Last updated $Date: 2007/02/21 23:13:58 $ ==== //depot/projects/scottl-camlock/src/contrib/sendmail/PGPKEYS#2 (text+ko) ==== @@ -142,6 +142,82 @@ -----END PGP PUBLIC KEY BLOCK----- Type Bits KeyID Created Expires Algorithm Use +pub 1024 0x7093B841 2006-12-16 ---------- RSA Sign & Encrypt +f16 Fingerprint16 = D9 FD C5 6B EE 1E 7A A8 CE 27 D9 B9 55 8B 56 B6 +uid Sendmail Signing Key/2007 + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (OpenBSD) + +mQCNA0WDjKsAAAEEAOoLs+uE8cm6SP0S4gvfZrUHd74I9DWSbbiYCwsLoYUm0gcp +Tp+rTcLBDTrw93cti1vpEAlIz7f/kH+J+OoU0WNAZgBMsSCFZecJvmkrSldCsRJf +UwBh5FWgDWmb/iNZSAwUpisCa+BGnpKhUkC9g09h7Ss683GApJdDARhwk7hBAAUR +tDFTZW5kbWFpbCBTaWduaW5nIEtleS8yMDA3IDxzZW5kbWFpbEBTZW5kbWFpbC5P +Ukc+iQCVAwUQRYOMq5dDARhwk7hBAQFdSAQAuS8Etdrnf9+50VYoFC66SUsf8MLi +hvH2k8GeAH11weE/8Aij7eR7MerlnyJ5NJVupVDeqK+q7ToaGlb5hq0ya3rbYgwx +CpzxWTHfvS4/DWs15ajlR3QHkDRZC5pUBAHO0MqC1YskcbndWkmpMhlExb3YVvC6 +5+RyKUmxqw1Rp96JAJUDBRBFg44uHnuzyK+VliUBAcjWA/4kZeVmOOikqAzGRm3i +coFOr5BUnhxFWTcO5DtnKSvEBPRaj1b7Xz9O0sfEwrGARDigcH2V4yMSxQLJ9Tyx +S4xjFryTXYPX3+HPLmU97c8VyDF/ANCgdldVW761hXd4i3JCfHm9LMWQBWz4XQaD +iz56GHoFwvn/nrGmBi/3K+1+/YkAlQMFEEWDjnC92o/WP+p9/QEBIoQEAKitPCB9 +Lab/vs6QhHEW4UdoPTK8EcgsRQTjx+xZ0/XPC3PiLjTXM7cZk7o+oQrp5PGX1RqM +RV8bzPtJCNiwCctuYpKuYuGjljw8IhZmVxChH/5ifOo7Bw1cxGMWPGlex9x3Xel1 +P4BGi7cOvGGRasEBs5gjtpq795+tDjexh0MwiQCVAwUQRYOOfnxLZ22gDhVjAQHV +IAQAhE48oNTvzCPAyFf5EEGOsnZBDazqujZS84eAiFvIQfcDcBHCFOaK4wAKsZa4 +YhuYBxu8bz20Kecqfbfnsqyh4b3iJmXiHiL8gIpUzEBBOKesswlzAd7+6hA3/JqN +8a6djrSo/+GEC6QExnLk98qTnfrfHNbTk/hk4Pxf9343uziJAJUDBRBFg46u1uCh +/k++Kt0BAS3ZA/9FxlTjvDfI+ujW/Bj+OoWnwCm2OGiLjuWKoiVZjoz2Msp6ZE6I +1YbqJOwchBpqaHLNyY8x0eiXLYqbrk2kwST1PCAaGQoizK9ClPyptf2V/LUjyyCi +ppmRNH0rG+WSKsdof4rXRP8FmMicQAW4cme3n5/bq7Z7yQQ4RvSTCMru4IkAlQMF +EEWDjsuJaWK4Z4wKAwEBKOMEAIRl9rOD0eDvtDe5Uv7j4lIYGxe8xSRKstLzIl6T +K9spRcrqJk+6OmZHU6MMzkf44z8CB9VWcmozXFxjV+ZkO4SgyJKLZdRc0KGOB+ua +HL8q5WGMAJ2bLpmJPVoR0PK1Vf97e1kSOWdvIOfwxe8Y1IqoxnGAJmdQh6IJyBc0 +tF6MiQCVAwUQRYOO/XCgJE0e+ZJRAQHhGwP/az5s1kZ6HoJRqg1v/8DOSZEeWECP +wBw5mgW5dGfPNZ0/Ot9lOy95jlHMu80/YDmpQ6WqsqpnV1hTmj+hYOSPRTqun72l +IiPh1l0vLl00kw+LxR7T7jPSWvX2l8SjZ176KIFqj3jZpPvMk2W5cE4sjYpvOxRA +BhheDkERTnUIY+iJAJUDBRBFg48VwCnKQBb0zOkBAVKaBACEb12dzj1pQDFog8h+ +aN9spewVBI0vrxu/3PPZY0tVZJl3S71TXRVmXLYEgeVi5BL8uDuiM14NylUk0lgT +bVL/VxPsKf9HJVjdfZSbFjUBxxClTIvayTwtMSebO2AcjCiFbMpp2R6VDc791Fp/ +xvuLVr3plYLSQIL9FcBG2wJR1IkAlQMFEEWDj3PvWJZk1DLhnQEBS80D/j05Rlv3 +98Zt+L0hR0+R3qyuf1cFMNyxU5l4Iaf7qr9JRHltHo7iGE8fCGiX1Z3f5BGL03XA +r1QLusj7nk41W0K5tr3r33qSMjFWLpcOziLbzEAMDQbX0qJQmqCXT+cafiVpao0u +MqT84L2rKLQxldQM/fvOWExuioiZPKGyE3YuiQCVAwUQRYOPicGcHSUS00YdAQEU +PwP/Z4PmlZZIhle8P9Bv4c6pkuFkU6LBjF4bWf5bJ675s9Xyh6YwZ5SfFw0deaDZ +IPXQJQsjcHvbVGoTOxiQtm7y3ae+0TMDbuZSgFD6Fl/IdIdwP2Ob5yoBr1+q353C +qyLSEI6mX1P4sQwkI272ndSpHowJpuBv6lPr+sZ2uEFzVQSJAJUDBRBFg4+Qb1KT +2KObplUBAcTnA/9ueiH0gfV1H+8WOm6vUAcvaJ7aCBJ9gdUjheIEY/KDUH/pkGAg +3E8NDxojTWe88COlIOSqa61UQThSwrtTIx0oWc0E3Bza0cL2xR4apKfNPGWM1/Tp +kyoD+WYLoVpomT1MA8dBPYUKNuLVunohVscRwmHuUsz8bTTaE4abEnUmwYkAlQMF +EEWDj5qcHL3i41xWNQEBOJIEALestUaN+JpQ6JvH2zqBFIXPsBoISVuTP/CNlez0 +LSSg9Oi1anMISRNj6cpu8iYYWJxInL05pDCV5MYySB2SzVT8HgrR+3yUdVFgJGBN +2RYdfXdFqC/d68/50muZzPo+LIwKX+G33B4y0uMSdmK76UhGNW9rfWdQgce7sBph +1Z1YiQCVAwUQRYOPqTgi20fMN08tAQE7KAQAtYpp2c7OzXPXNJRbodNihpRq1RXd +qo1nJ7qVHuLVb663GMfy4TwcXytdzJjXAaMf/Rn50skQ+4YGrbIxXC3UbY9NK3xw +UzebQlzFrjEtPmS0UVyf8GJl6yQ3xuBYZ4Pe+X2hioBDDFZ+Gjn1DA2IQjoZitE5 +B0c9nlknPcv644SJAJUDBRBFg4+zIYPhsTlvB4kBAefCBADFjYutzx72jDt26otM +k44ZLD6Szv90TKLtRYM5FNhtw9VKFkg+hSo15WzUHKBsnyqBT8Qq6YKz50Wx2vts +8g2hJ8+g0A+3YuAgNnDp7h7xGS6Fgc5yGnqC0bG7T7TE/YSLfGz97vC0vbm6S6HG +9Pg+IwKl9dtoE2fkU/BMU2XO+YkAlQMFEEWDj7rI1e0plfYXcQEBi4EEAJ1tRaXf +aKj9+hVE9lTRbDukb9dsVtAKHP/rRixumf6+v5SCh4g0FzMURJ3jqlwfj2/rPrq2 +MQh1NwhLjVjaEziDCLGxV/TqpK1Yn0vpjmdsaOe01XOxi2+uy/7uo/ArGqtjHSen +7TmYODY3aKQR19eVehId4TCR1sLO9GmhnYDjiQCVAwUQRY71+s8etQMiMnoBAQGq +ygP+NdG19Qz0Tf4F4pBRAZiJdIz9hGEzx/Z7rjQhLgzaaGxOQmv2iG/92Fw9/H+M +ATmTMfbz5gxpLkBsiULI15tgKQWsFwY/pphRKcL9z4+WeTmUkv+tPxVfRYE3YuUc +QS/3A3DMIv/mcJYA6fiwsf3omzEU8VCyH0uARSJrwQcdmwCJAJUDBRBFjvsM4dT8 +FObQdHEBAeC5A/98yBTBWjhCYvB2XLbbL9dN0DKtV9oqXKhrPI9BAjRi/IeAi04b +ktzwUC45TLQXlVB1EK27b2mjNwPFcOtM+IrO00gIf1lNh222lSJUISv5rLnHp02j +xmyQfblYVQ9iPNiJMWNzID59+ntX+MXO71NwyA7UovMTvCcaFWhTrfGk4okAlQMF +EEWPCSBfHshviAyeVQEBS3wD/04nsshuG5NkdqgL8+E0RycXqXchIJ9GP+Vu9sxB +aGAh8qzp6xDh6r7A36JCwuUpZWCOC10z4/+QjMwZBQiLH4+deQk7j7L5LxDAWIs6 +DImewMQsg2zF3XlD/Sz+TjKUA1HMwmDOagrygwpbZRYlhJscov/aUeBmUTmaEsP4 +cETBiEYEEBECAAYFAkWPz+8ACgkQOIoVOB4I2B3ysQCgoPb3snzfJrbqM6T/Y+tu +YfUd59IAnifkpVQIfhZf1aWIPNYXnlYnpVrZiEYEEBECAAYFAkWPshcACgkQorv7 +JAz5Vve5KACg7oh+VFz6UxqjfkiimQ6l/8uI9msAnRB9DBRE6Ebh9CjV15bvm7Y7 +as8y +=w7F1 +-----END PGP PUBLIC KEY BLOCK----- + +Type Bits KeyID Created Expires Algorithm Use pub 1024 0xAF959625 2005-12-31 ---------- RSA Sign & Encrypt f16 Fingerprint16 = E3 F4 97 BC 9F DF 3F 1D 9B 0D DF D5 77 9A C9 79 uid Sendmail Signing Key/2006 @@ -1653,4 +1729,4 @@ =nES8 -----END PGP PUBLIC KEY BLOCK----- -$Revision: 8.24 $, Last updated $Date: 2006/05/01 19:10:19 $ +$Revision: 8.25 $, Last updated $Date: 2007/01/02 22:38:08 $ ==== //depot/projects/scottl-camlock/src/contrib/sendmail/RELEASE_NOTES#2 (text+ko) ==== @@ -1,11 +1,279 @@ SENDMAIL RELEASE NOTES - $Id: RELEASE_NOTES,v 8.1777.2.15 2006/08/07 17:22:09 ca Exp $ + $Id: RELEASE_NOTES,v 8.1888 2007/04/03 23:28:40 ca Exp $ This listing shows the version of the sendmail binary, the version of the sendmail configuration files, the date of release, and a summary of the changes in that release. +8.14.1/8.14.1 2007/04/03 + Even though a milter rejects a recipient the MTA will still keep + it in its list of recipients and deliver to it if the + transaction is accepted. This is a regression introduced + in 8.14.0 due to the change for SMFIP_RCPT_REJ. Bug + found by Andy Fiddaman. + The new DaemonPortOptions which begin with a lower case character + could not be set in 8.14.0. + If a server shut down the connection in response to a STARTTLS + command, sendmail would log a misleading error message + due to an internal inconsistency. Problem found by + Werner Wiethege. + Document how some sendmail.cf options change the behavior of mailq. + Noted by Paul Menchini of the North Carolina School of + Science and Mathematics. + CONFIG: Add confSOFT_BOUNCE m4 option for setting SoftBounce. + CONFIG: 8.14.0's RELEASE_NOTES failed to mention the addition + of the confMAX_NOOP_COMMANDS and confSHARED_MEMORY_KEY_FILE + m4 options for setting MaxNOOPCommands and + SharedMemoryKeyFile. + CONFIG: Add confMILTER_MACROS_EOH and confMILTER_MACROS_DATA m4 + options for setting Milter.macros.eoh and Milter.macros.data. + CONTRIB: Use flock() and fcntl() in qtool.pl if necessary. + Patch from Daniel Carroll of Mesa State College. + LIBMILTER: Make sure an unknown command does not affect the + currently available macros. Problem found by Andy Fiddaman. + LIBMILTER: The MTA did not offer SMFIF_SETSYMLIST during option + negotiation. Problem reported by Bryan Costales. + LIBMILTER: Fix several minor errors in the documentation. + Patches from Bryan Costales. + PORTABILITY FIXES: + AIX 5.{1,2}: libsm/util.c failed to compile due to + redefinition of several macros, e.g., SIG_ERR. + Patch from Jim Pirzyk with assistance by Bob + Booth, University of Illinois at Urbana-Champaign. + Add support for QNX.6. Patch from Sean Boudreau of QNX + Software Systems. + New Files: + devtools/M4/depend/QNX6.m4 + devtools/OS/QNX.6.x + include/sm/os/sm_os_qnx.h + + New Files added in 8.14.0, but not shown in the release notes entry: + libmilter/docs/smfi_chgfrom.html + libmilter/docs/smfi_version.html + +8.14.0/8.14.0 2007/01/31 + Header field values are now 8 bit clean. Notes: + - header field names are still restricted to 7 bit. + - RFC 2822 allows only 7 bit (US-ASCII) characters in + headers. + Preserve spaces after the colon in a header. Previously, any + number of spaces after the colon would be changed to + exactly one space. + In some cases of deeply nested aliases/forwarding, mail can + be silently lost. Moreover, the MaxAliasRecursion + limit may be reached too early, e.g., the counter + may be off by a factor of 4 in case of a sequence of + .forward files that refer to others. Patch from + Motonori Nakamura of Kyoto University. + Fix a regression in 8.13.8: if InputMailFilters is set then + "sendmail -bs" can trigger an assertion because the + hostname of the client is undefined. It is now set + to "localhost" for the xxfi_connect() callback. + Avoid referencing a freed variable during cleanup when terminating. + Problem reported and diagnosed by Joe Maimon. + New option HeloName to set the name for the HELO/EHLO command. + Patch from Nik Clayton. + New option SoftBounce to issue temporary errors (4xy) instead of + permanent errors (5xy). This can be useful for testing. + New suboptions for DaemonPortOptions to set them individually + per daemon socket: + DeliveryMode DeliveryMode + refuseLA RefuseLA + delayLA DelayLA + queueLA QueueLA + children MaxDaemonChildren + New option -K for LDAP maps to replace %1 through %9 in the + lookup key with the LDAP escaped contents of the + arguments specified in the map lookup. Loosely based + on patch from Wolfgang Hottgenroth. + Log the time after which a greet_pause delay triggered. Patch + from Nik Clayton. + If a client is rejected via TCP wrapper or some other check + performed by validate_connection() (in conf.c) then do + not also invoke greet_pause. Problem noted by Jim Pirzyk + of the University of Illinois at Urbana-Champaign. + If a client terminates the SMTP connection during a pause + introduced by greet_pause, then a misleading message + was logged previously. Problem noted by Vernon Schryver + et.al., patch from Matej Vela. + New command "mstat" for control socket to provide "machine + readable" status. + New named config file rule check_eom which is called at the end + of a message, its parameter is the size of the message. + If the macro {addr_type} indicates that the current address + is a header address it also distinguishes between + recipient and sender addresses (as it is done for + envelope addresses). + When a macro is set in check_relay, then its value is accessible + by all transactions in the same SMTP session. + Increase size of key for ldap lookups to 1024 (MAXKEY). + New option MaxNOOPCommands to override default of 20 for the + number of "useless" commands before the SMTP server will + slow down responding. + New option SharedMemoryKeyFile: if shared memory support is + enabled, the MTA can be asked to select a shared memory + key itself by setting SharedMemoryKey to -1 and specifying + a file where to store the selected key. + Try to deal with open HTTP proxies that are used to send spam + by recognizing some commands from them. If the first command + from the client is GET, POST, CONNECT, or USER, then the + connection is terminated immediately. + New PrivacyOptions noactualrecipient to avoid putting + X-Actual-Recipient lines in DSNs revealing the actual + account that addresses map to. Patch from Dan Harkless. + New options B, z, and Z for DNS maps: + -B: specify a domain that is always appended to queries. + -z: specify the delimiter at which to cut off the result of + a query if it is too long. + -Z: specify the maximum number of entries to be concatenated + to form the result of a lookup. + New target "check" in the Makefile of libsm: instead of running tests + implicitly while building libsm, they must be explicitly + started by using "make check". + Fixed some inconsistent checks for NULL pointers that have been + reported by the SATURN tool which has been developed by + Isil Dillig and Thomas Dillig of Stanford University. + Fix a potential race condition caused by a signal handler for + terminated child processes. Problem noted by David F. Skoll. + When a milter deleted a recipient, that recipient could cause a + queue group selection. This has been disabled as it was not + intended. + New operator 'r' for the arith map to return a random number. + Patch from Motonori Nakamura of Kyoto University. + New compile time option MILTER_NO_NAGLE to turn off the Nagle + algorithm for communication with libmilter ("cork" on Linux), + which may improve the communication performance on some + operating systems. Patch from John Gardiner Myers of + Proofpoint. + If sendmail received input that contained a CR without subsequent LF + (thus violating RFC 2821 (2.3.7)), it could previously + generate an additional blank line in the output as the last + line. + Restarting persistent queue runners by sending a HUP signal to + the "queue control process" (QCP) works now. + Increase the length of an input line to 12288 to deal with + really long lines during SMTP AUTH negotiations. + Problem noted by Werner Wiethege. + If ARPANET mode (-ba) was selected STARTTLS would fail (due to + a missing initialization call for that case). Problem + noted by Neil Rickert of Northern Illinois University. + If sendmail is linked against a library that initializes Cyrus-SASL + before sendmail did it (such as libnss-ldap), then SMTP AUTH + could fail for the sendmail client. A patch by Moritz Both + works around the API design flaw of Cyrus-SASLv2. + CONFIG: Make it possible to unset the StatusFile option by + undefining STATUS_FILE. By not setting StatusFile, + the MTA will not attempt to open a statistics file on + each delivery. + CONFIG: New FEATURE(`require_rdns') to reject messages from SMTP + clients whose IP address does not have proper reverse DNS. + Contributed by Neil Rickert of Northern Illinois University + and John Beck of Sun Microsystems. + CONFIG: New FEATURE(`block_bad_helo') to reject messages from SMTP + clients which provide a HELO/EHLO argument which is either + unqualified, or is one of our own names (i.e., the server + name instead of the client name). Contributed by Neil + Rickert of Northern Illinois University and John Beck of + Sun Microsystems. + CONFIG: New FEATURE(`badmx') to reject envelope sender addresses + (MAIL) whose domain part resolves to a "bad" MX record. + Based on contribution from William Dell Wisner. + CONFIG: New macros SMTP_MAILER_LL and RELAY_MAILER_LL to override + the maximum line length of the smtp mailers. + CONFIG: New option `relaytofulladdress' for FEATURE(`access_db') + to allow entries in the access map to be of the form + To:user@example.com RELAY + CONFIG: New subsuboptions eoh and data to specify the list of + macros a milter should receive at those stages in the + SMTP dialogue. + CONFIG: New option confHELO_NAME for HeloName to set the name + for the HELO/EHLO command. + CONFIG: dnsbl and enhdnsbl can now also discard or quarantine + messages by using those values as second argument. + Patches from Nelson Fung. + CONTRIB: cidrexpand uses a hash symbol as comment character and + ignores everything after it unless it is in quotes or + preceeded by a backslash. + DEVTOOLS: New macro confMKDIR: if set to a program that creates + directories, then it used for "make install" to create + the required installation directories. + DEVTOOLS: New macro confCCLINK to specify the linker to use for + executables (defaults to confCC). + LIBMILTER: A new version of the milter API has been created that + has several changes which are listed below and documented + in the webpages reachable via libmilter/docs/index.html. + LIBMILTER: The meaning of the version macro SMFI_VERSION has been + changed. It now refers only to the version of libmilter, + not to the protocol version (which is used only internally, + it is not user/milter-programmer visible). Additionally, + a version function smfi_version() has been introduced such + that a milter program can check the libmilter version also + at runtime which is useful if a shared library is used. + LIBMILTER: A new callback xxfi_negotiate() can be used to + dynamically (i.e., at runtime) determine the available + protocol actions and features of the MTA and also to + specify which of these a milter wants to use. This allows + for more flexibility than hardcoding these flags in the + xxfi_flags field of the smfiDesc structure. + LIBMILTER: A new callback xxfi_data() is available so milters + can act on the DATA command. + LIBMILTER: A new callback xxfi_unknown() is available so milters + can receive also unknown SMTP commands. + LIBMILTER: A new return code SMFIS_NOREPLY has been added which + can be used by the xxfi_header() callback provided the + milter requested the SMFIP_NOHREPL protocol action. + LIBMILTER: The new return code SMFIS_SKIP can be used in the + xxfi_body() callback to skip over further body chunks + and directly advance to the xxfi_eom() callback. This + is useful if a milter can make a decision based on the + body chunks it already received without reading the entire + rest of the body and the milter wants to invoke functions + that are only available from the xxfi_eom() callback. + LIBMILTER: A new function smfi_addrcpt_par() can be used to add + new recipients including ESMTP parameters. + LIBMILTER: A new function smfi_chgfrom() can be used to change the + envelope sender including ESMTP parameters. + LIBMILTER: A milter can now request to be informed about rejected + recipients (RCPT) too. This requires to set the protocol + flag SMFIP_RCPT_REJ during option negotiation. Whether + a RCPT has been rejected can be checked by comparing the + value of the macro {rcpt_mailer} with "error". + LIBMILTER: A milter can now override the list of macros that it + wants to receive from the MTA for each protocol step + by invoking the function smfi_setsymlist() during option + negotiation. + LIBMILTER: A milter can receive header field values with all + leading spaces by requesting the SMFIP_HDR_LEADSPC + protocol action. Also, if the flag is set then the MTA + does not add a leading space to headers that are added, + inserted, or replaced. + LIBMILTER: If a milter sets the reply code to "421" for the HELO + callback, the SMTP server will terminate the SMTP session + with that error to match the behavior of all other callbacks. + New Files: + cf/feature/badmx.m4 + cf/feature/block_bad_helo.m4 + cf/feature/require_rdns.m4 + devtools/M4/UNIX/check.m4 + include/sm/misc.h + include/sm/sendmail.h + include/sm/tailq.h + libmilter/docs/smfi_addrcpt_par.html + libmilter/docs/smfi_setsymlist.html + libmilter/docs/xxfi_data.html + libmilter/docs/xxfi_negotiate.html + libmilter/docs/xxfi_unknown.html + libmilter/example.c + libmilter/monitor.c + libmilter/worker.c + libsm/memstat.c + libsm/t-memstat.c + libsm/t-qic.c + libsm/util.c + sendmail/daemon.h + sendmail/map.h + 8.13.8/8.13.8 2006/08/09 Fix a regression in 8.13.7: if shared memory is activated, then the server can erroneously report that there is @@ -1317,7 +1585,7 @@ Properly count message size for mailstats during mail collection. Problem noted by Werner Wiethege. Log complete response from LMTP delivery agent on failure. Based on - patch from by Motonori Nakamura of Kyoto University. + patch from Motonori Nakamura of Kyoto University. Provide workaround for getopt() implementations that do not catch missing arguments. Fix the message size calculation if the message body is replaced by ==== //depot/projects/scottl-camlock/src/contrib/sendmail/cf/README#2 (text+ko) ==== @@ -397,6 +397,9 @@ that ARRIVE from an address that resolves to one of the SMTP mailers and which are converted to MIME will be labeled with this character set. +SMTP_MAILER_LL [990] The maximum line length for SMTP mailers + (except the relay mailer). +RELAY_MAILER_LL [2040] The maximum line length for the relay mailer. UUCP_MAILER_PATH [/usr/bin/uux] The program used to send UUCP mail. UUCP_MAILER_FLAGS [undefined] Flags added to UUCP mailer. Default flags are `DFMhuU' (and `m' for uucp-new mailer, @@ -1031,12 +1034,6 @@ See the LDAP ROUTING section below for more information. -nodns If you aren't running DNS at your site (for example, - you are UUCP-only connected). It's hard to consider - this a "feature", but hey, it had to go somewhere. - Actually, as of 8.7 this is a no-op -- remove "dns" from - the hosts service switch entry instead. - nullclient This is a special case -- it creates a configuration file containing nothing but support for forwarding all mail to a central hub via a local SMTP-based network. The argument @@ -1241,12 +1238,15 @@ versions when delay_checks was not in use. See doc/op/op.* about check_relay, {client_name}, and {client_ptr}. -dnsbl Turns on rejection of hosts found in an DNS based rejection - list. The first is used as the domain in which blocked - hosts are listed. A second argument can be used to change - the default error message. Without that second argument, - the error message will be +dnsbl Turns on rejection, discarding, or quarantining of hosts + found in a DNS based list. The first argument is used as + the domain in which blocked hosts are listed. A second + argument can be used to change the default error message, + or select one of the operations `discard' and `quarantine'. + Without that second argument, the error message will be + Rejected: IP-ADDRESS listed at SERVER + where IP-ADDRESS and SERVER are replaced by the appropriate information. By default, temporary lookup failures are ignored. This behavior can be changed by specifying a @@ -1485,6 +1485,81 @@ R$* $: $&{daemon_flags} R$* a $* $# 0 +block_bad_helo Reject messages from SMTP clients which provide a HELO/EHLO + argument which is either unqualified, or is one of our own + names (i.e., the server name instead of the client name). + This check is performed at RCPT stage and disabled for the + following cases: + - authenticated sessions, + - connections from IP addresses in class $={R}. + Currently access_db lookups can not be used to + (selectively) disable this test, moreover, + FEATURE(`delay_checks') + is required. + +require_rdns Reject mail from connecting SMTP clients without proper + rDNS (reverse DNS), functional gethostbyaddr() resolution. + Note: this feature will cause false positives, i.e., there + are legitimate MTAs that do not have proper DNS entries. + Rejecting mails from those MTAs is a local policy decision. + + The basic policy is to reject message with a 5xx error if + the IP address fails to resolve. However, if this is a + temporary failure, a 4xx temporary failure is returned. + If the look-up succeeds, but returns an apparently forged + value, this is treated as a temporary failure with a 4xx + error code. + + EXCEPTIONS: + + Exceptions based on access entries are discussed below. + Any IP address matched using $=R (the "relay-domains" file) + is excepted from the rules. Since we have explicitly + allowed relaying for this host, based on IP address, we + ignore the rDNS failure. + + The philosophical assumption here is that most users do + not control their rDNS. They should be able to send mail + through their ISP, whether or not they have valid rDNS. + The class $=R, roughly speaking, contains those IP addresses + and address ranges for which we are the ISP, or are acting + as if the ISP. + + If `delay_checks' is in effect (recommended), then any + sender who has authenticated is also excepted from the + restrictions. This happens because the rules produced by + this FEATURE() will not be applied to authenticated senders + (assuming `delay_checks'). + + ACCESS MAP ENTRIES: + + Entries such as + Connect:1.2.3.4 OK + Connect:1.2 RELAY + will whitelist IP address 1.2.3.4, so that the rDNS + blocking does apply to that IP address + + Entries such as + Connect:1.2.3.4 REJECT + will have the effect of forcing a temporary failure for + that address to be treated as a permanent failure. + +badmx Reject envelope sender addresses (MAIL) whose domain part + resolves to a "bad" MX record. By default these are + MX records which resolve to A records that match the + regular expression: + + ^(127\.|10\.|0\.0\.0\.0) + + This default regular expression can be overridden by + specifying an argument, e.g., + + FEATURE(`badmx', `^127\.0\.0\.1') + + Note: this feature requires that the sendmail binary + has been compiled with the options MAP_REGEX and + DNSMAP. + +-------+ | HACKS | +-------+ @@ -2426,10 +2501,15 @@ FEATURE(`access_db', `hash -T /etc/mail/access_map') Notice: If a second argument is specified it must contain the option -`-T' as shown above. The optional third and fourth parameters -may be `skip' or `lookupdotdomain'. The former enables SKIP as -value part (see below), the latter is another way to enable the -feature of the same name (see above). +`-T' as shown above. The optional parameters may be + + `skip' enables SKIP as value part (see below). + `lookupdotdomain' another way to enable the feature of the + same name (see above). + `relaytofulladdress' enable entries of the form + To:user@example.com RELAY + to allow relaying to just a specific + e-mail address instead of an entire domain. Remember, since /etc/mail/access is a database, after creating the text file as described below, you must use makemap to create the database @@ -2497,7 +2577,8 @@ name is unresolvable. "Accept" does not mean "relay", but at most acceptance for local recipients. That is, OK allows less than RELAY. - RELAY Accept mail addressed to the indicated domain or + RELAY Accept mail addressed to the indicated domain + (or address if `relaytofulladdress' is set) or received from the indicated domain for relaying through your SMTP server. RELAY also serves as an implicit OK for the other checks. @@ -2628,7 +2709,7 @@ FEATURE(`dnsbl', `dnsbl.example.com') This will cause sendmail to reject mail from any site listed in the -DNS based blacklist. You must select an DNSB based blacklist domain +DNS based blacklist. You must select a DNS based blacklist domain to check by specifying an argument to the FEATURE. The default error message is @@ -2636,10 +2717,18 @@ where IP-ADDRESS and SERVER are replaced by the appropriate information. A second argument can be used to specify a different -text. By default, temporary lookup failures are ignored and hence -cause the connection not to be rejected by the DNS based rejection -list. This behavior can be changed by specifying a third argument, -which must be either `t' or a full error message. For example: +text or action. For example, + + FEATURE(`dnsbl', `dnsbl.example.com', `quarantine') + +would quarantine the message if the client IP address is listed +at `dnsbl.example.com'. + +By default, temporary lookup failures are ignored +and hence cause the connection not to be rejected by the DNS based +rejection list. This behavior can be changed by specifying a third +argument, which must be either `t' or a full error message. For +example: FEATURE(`dnsbl', `dnsbl.example.com', `', `"451 Temporary lookup failure for " $&{client_addr} " in dnsbl.example.com"') @@ -4033,6 +4122,11 @@ "double bounce" error message to this address. If it expands to an empty string, double bounces are dropped. +confSOFT_BOUNCE SoftBounce [False] If set, issue temporary errors + (4xy) instead of permanent errors + (5xy). This can be useful during + testing of a new configuration to + avoid erroneous bouncing of mails. confDEAD_LETTER_DROP DeadLetterDrop [undefined] Filename to save bounce messages which could not be returned to the user or sent to postmaster. @@ -4197,6 +4291,11 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 11 14:45:24 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 785B816A409; Wed, 11 Apr 2007 14:45:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4A3A416A406 for ; Wed, 11 Apr 2007 14:45:24 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3E5DE13C4BA for ; Wed, 11 Apr 2007 14:45:24 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3BEjOox082339 for ; Wed, 11 Apr 2007 14:45:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3BEjJ1H082336 for perforce@freebsd.org; Wed, 11 Apr 2007 14:45:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 11 Apr 2007 14:45:19 GMT Message-Id: <200704111445.l3BEjJ1H082336@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 117899 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Apr 2007 14:45:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=117899 Change 117899 by rwatson@rwatson_zoo on 2007/04/11 14:45:05 Integrate TrustedBSD base branch from CVS HEAD: - zfs bug fixes - sendmail 8.14.1 - UFS_GJOURNAL in GENERIC - PRIV_NETINET_REUSEPORT, PRIV_NET_TRUNK - host uuid - cxgb mvec - if_trunk - tcp_timer rework - soft updates fixes - truss now uses ptrace instead of procfs, works with threads Affected files ... .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#21 integrate .. //depot/projects/trustedbsd/base/cddl/lib/libzpool/Makefile#2 integrate .. //depot/projects/trustedbsd/base/contrib/opensolaris/cmd/zpool/zpool_main.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/opensolaris/cmd/ztest/ztest.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzpool/common/kernel.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/FREEBSD-upgrade#22 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/KNOWNBUGS#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/PGPKEYS#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/RELEASE_NOTES#19 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/README#17 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/knecht.mc#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/submit.cf#18 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/access_db.m4#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/badmx.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/block_bad_helo.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/dnsbl.m4#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/enhdnsbl.m4#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/require_rdns.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/proto.m4#16 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/version.m4#19 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/mailer/smtp.m4#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/contrib/cidrexpand#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/contrib/qtool.pl#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/doc/op/op.me#16 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/editmap/Makefile.m4#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/libmilter/mfapi.h#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/libmilter/mfdef.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/libmilter/milter.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/conf.h#15 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/errstring.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/heap.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/ldap.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/misc.h#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/os/sm_os_qnx.h#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/sendmail.h#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/tailq.h#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/Makefile#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/Makefile.m4#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/README#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/comm.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/api.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/design.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/index.html#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/installation.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/other.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/overview.html#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/sample.html#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_addheader.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_addrcpt.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_addrcpt_par.html#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_chgfrom.html#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_chgheader.html#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_delrcpt.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_getpriv.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_getsymval.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_insheader.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_main.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_opensocket.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_progress.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_quarantine.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_register.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_replacebody.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_setbacklog.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_setconn.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_setdbg.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_setmlreply.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_setpriv.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_setreply.html#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_setsymlist.html#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_settimeout.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_stop.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_version.html#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/xxfi_abort.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/xxfi_body.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/xxfi_close.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/xxfi_connect.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/xxfi_data.html#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/xxfi_envfrom.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/xxfi_eoh.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/xxfi_eom.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/xxfi_header.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/xxfi_helo.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/xxfi_negotiate.html#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/xxfi_unknown.html#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/engine.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/example.c#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/handler.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/libmilter.h#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/listener.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/main.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/monitor.c#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/smfi.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/worker.c#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/Makefile#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/Makefile.m4#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/config.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/exc.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/exc.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/findfp.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/flags.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/ldap.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/local.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/memstat.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/snprintf.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-memstat.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-qic.c#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-sem.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/util.c#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/vfscanf.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsmdb/Makefile.m4#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsmutil/Makefile.m4#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/mail.local/Makefile.m4#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/mail.local/mail.local.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/mailstats/Makefile.m4#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/makemap/Makefile.m4#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/praliases/Makefile.m4#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/rmail/Makefile.m4#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/smrsh/Makefile.m4#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/Makefile#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/Makefile.m4#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/README#17 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/TRACEFLAGS#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/TUNING#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/alias.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/arpadate.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/collect.c#15 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/conf.c#19 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/conf.h#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/control.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/daemon.c#16 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/daemon.h#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/src/deliver.c#18 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/domain.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/envelope.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/err.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/headers.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/helpfile#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/macro.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/mailq.1#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/main.c#17 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/map.c#15 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/map.h#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/src/mci.c#15 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/milter.c#17 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/mime.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/parseaddr.c#17 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/queue.c#19 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/ratectrl.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/readcf.c#15 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/recipient.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sasl.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/savemail.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sendmail.h#18 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sm_resolve.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/srvrsmtp.c#19 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/stab.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/stats.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/timers.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/tls.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/udb.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/usersmtp.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/util.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/version.c#19 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/test/Makefile#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/vacation/Makefile.m4#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/vacation/vacation.c#10 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#67 integrate .. //depot/projects/trustedbsd/base/etc/devd.conf#22 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.root.dist#15 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/FILESYSTEMS#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#46 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/NETWORKING#10 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/hostid#1 branch .. //depot/projects/trustedbsd/base/etc/rc.d/ipfilter#19 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ipsec#12 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/kldxref#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/mountcritremote#14 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/netoptions#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/pf#14 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/pflog#10 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/pfsync#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/Symbol.map#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/sysctl.3#14 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/Symbol.map#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strtol.3#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/ptrace.2#11 integrate .. //depot/projects/trustedbsd/base/lib/libmilter/Makefile#7 integrate .. //depot/projects/trustedbsd/base/lib/libsm/Makefile#11 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/Makefile#15 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/Symbol.map#2 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/Versions.def#2 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/i386/Symbol.map#2 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/article.sgml#5 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/Makefile#12 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#47 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/iftrunk.c#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#74 integrate .. //depot/projects/trustedbsd/base/share/man/man4/trunk.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#69 integrate .. //depot/projects/trustedbsd/base/share/man/man9/hash.9#4 integrate .. //depot/projects/trustedbsd/base/share/misc/committers-ports.dot#2 integrate .. //depot/projects/trustedbsd/base/share/misc/committers-src.dot#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/GENERIC#31 integrate .. //depot/projects/trustedbsd/base/sys/boot/forth/loader.conf#37 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_sg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_ioctl.h#12 integrate .. //depot/projects/trustedbsd/base/sys/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate .. //depot/projects/trustedbsd/base/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/trustedbsd/base/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/trustedbsd/base/sys/compat/opensolaris/kern/opensolaris_string.c#2 integrate .. //depot/projects/trustedbsd/base/sys/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/trustedbsd/base/sys/compat/opensolaris/sys/kobj.h#2 integrate .. //depot/projects/trustedbsd/base/sys/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/trustedbsd/base/sys/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/trustedbsd/base/sys/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/trustedbsd/base/sys/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/trustedbsd/base/sys/compat/opensolaris/sys/string.h#2 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#84 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#113 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.ia64#39 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/utmisc.c#16 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.h#38 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#49 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-dma.c#39 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/ah_osdep.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/cxgb_lro.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/sys/mvec.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/cxgb/sys/uipc_mvec.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mii/brgphy.c#32 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/miidevs#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/msk/if_msk.c#5 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli.c#14 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#63 integrate .. //depot/projects/trustedbsd/base/sys/ia64/conf/GENERIC#42 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_jail.c#28 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mib.c#21 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_mqueue.c#8 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#58 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#86 integrate .. //depot/projects/trustedbsd/base/sys/libkern/index.c#5 integrate .. //depot/projects/trustedbsd/base/sys/libkern/rindex.c#6 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#86 integrate .. //depot/projects/trustedbsd/base/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/dpt/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/if_trunk/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/libalias/libalias/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/zfs/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/net/ieee8023ad_lacp.c#1 branch .. //depot/projects/trustedbsd/base/sys/net/ieee8023ad_lacp.h#1 branch .. //depot/projects/trustedbsd/base/sys/net/if.c#53 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ethersubr.c#54 integrate .. //depot/projects/trustedbsd/base/sys/net/if_trunk.c#1 branch .. //depot/projects/trustedbsd/base/sys/net/if_trunk.h#1 branch .. //depot/projects/trustedbsd/base/sys/net/if_var.h#42 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_pcb.c#48 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#72 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_output.c#38 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_sack.c#14 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_subr.c#58 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_syncache.c#46 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_timer.c#29 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_timer.h#16 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_usrreq.c#42 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_var.h#37 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/ipsec_osdep.h#5 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/GENERIC#52 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/conf/GENERIC#37 integrate .. //depot/projects/trustedbsd/base/sys/rpc/types.h#1 branch .. //depot/projects/trustedbsd/base/sys/sparc64/conf/GENERIC#59 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/nexusvar.h#5 delete .. //depot/projects/trustedbsd/base/sys/sun4v/conf/GENERIC#5 integrate .. //depot/projects/trustedbsd/base/sys/sys/hash.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sys/kernel.h#26 integrate .. //depot/projects/trustedbsd/base/sys/sys/libkern.h#22 integrate .. //depot/projects/trustedbsd/base/sys/sys/mutex.h#33 integrate .. //depot/projects/trustedbsd/base/sys/sys/param.h#65 integrate .. //depot/projects/trustedbsd/base/sys/sys/priv.h#4 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysctl.h#34 integrate .. //depot/projects/trustedbsd/base/sys/sys/systm.h#47 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_snapshot.c#45 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_softdep.c#46 integrate .. //depot/projects/trustedbsd/base/sys/vm/phys_pager.c#17 integrate .. //depot/projects/trustedbsd/base/tools/regression/netinet/ipsockopt/ipsockopt.c#5 integrate .. //depot/projects/trustedbsd/base/tools/tools/net80211/wesside/wesside/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.c#1 branch .. //depot/projects/trustedbsd/base/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.h#1 branch .. //depot/projects/trustedbsd/base/tools/tools/net80211/wesside/wesside/wesside.c#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/gcore/elfcore.c#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/kdump/kdump.c#15 integrate .. //depot/projects/trustedbsd/base/usr.bin/kdump/kdump_subr.h#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/kdump/mksubr#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/mcast.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/sed/TEST/math.sed#4 delete .. //depot/projects/trustedbsd/base/usr.bin/tar/write.c#18 integrate .. //depot/projects/trustedbsd/base/usr.bin/touch/touch.1#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/touch/touch.c#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/Makefile#10 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/amd64-fbsd.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/extern.h#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/i386-fbsd.c#13 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/i386-linux.c#12 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/ia64-fbsd.c#10 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/main.c#16 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/powerpc-fbsd.c#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/setup.c#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/sparc64-fbsd.c#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/syscall.h#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/syscalls.c#24 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/truss.1#10 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/truss.h#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/uuidgen/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ifmcstat/Makefile#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ifmcstat/ifmcstat.8#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ifmcstat/ifmcstat.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sendmail/Makefile#17 integrate Differences ... ==== //depot/projects/trustedbsd/base/ObsoleteFiles.inc#21 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.77 2007/03/28 07:49:57 delphij Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.78 2007/04/09 19:16:48 pjd Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070409: uuidgen moved to /bin/ +OLD_FILES+=usr/bin/uuidgen # 20070328: bzip2 1.0.4 OLD_FILES+=usr/share/info/bzip2.info.gz # 20070303: libarchive 2.0 ==== //depot/projects/trustedbsd/base/cddl/lib/libzpool/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.2 2007/04/07 23:54:53 pjd Exp $ .include "${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/Makefile.files" @@ -11,7 +11,7 @@ # LIST_SRCS .PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/os # ATOMIC_SRCS -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/arch/${MACHINE_ARCH} +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/atomic/${MACHINE_ARCH} LIB= zpool SHLIB_MAJOR?=1 ==== //depot/projects/trustedbsd/base/contrib/opensolaris/cmd/zpool/zpool_main.c#2 (text+ko) ==== @@ -1082,6 +1082,10 @@ "incompatible version.\n")); break; + case ZPOOL_STATUS_HOSTID_MISMATCH: + (void) printf(gettext("status: The pool was last accessed by " + "another system.\n")); + break; default: /* * No other status can be seen when importing pools. @@ -1098,6 +1102,10 @@ "imported using its name or numeric identifier, " "though\n\tsome features will not be available " "without an explicit 'zpool upgrade'.\n")); + else if (reason == ZPOOL_STATUS_HOSTID_MISMATCH) + (void) printf(gettext("action: The pool can be " + "imported using its name or numeric " + "identifier and\n\tthe '-f' flag.\n")); else (void) printf(gettext("action: The pool can be " "imported using its name or numeric " @@ -1187,10 +1195,37 @@ "is formatted using a newer ZFS version\n"), name); return (1); } else if (state != POOL_STATE_EXPORTED && !force) { - (void) fprintf(stderr, gettext("cannot import '%s': pool " - "may be in use from other system\n"), name); - (void) fprintf(stderr, gettext("use '-f' to import anyway\n")); - return (1); + uint64_t hostid; + + if (nvlist_lookup_uint64(config, ZPOOL_CONFIG_HOSTID, + &hostid) == 0) { + if ((unsigned long)hostid != gethostid()) { + char *hostname; + uint64_t timestamp; + time_t t; + + verify(nvlist_lookup_string(config, + ZPOOL_CONFIG_HOSTNAME, &hostname) == 0); + verify(nvlist_lookup_uint64(config, + ZPOOL_CONFIG_TIMESTAMP, ×tamp) == 0); + t = timestamp; + (void) fprintf(stderr, gettext("cannot import " + "'%s': pool may be in use from other " + "system, it was last accessed by %s " + "(hostid: 0x%lx) on %s"), name, hostname, + (unsigned long)hostid, + asctime(localtime(&t))); + (void) fprintf(stderr, gettext("use '-f' to " + "import anyway\n")); + return (1); + } + } else { + (void) fprintf(stderr, gettext("cannot import '%s': " + "pool may be in use from other system\n"), name); + (void) fprintf(stderr, gettext("use '-f' to import " + "anyway\n")); + return (1); + } } if (zpool_import(g_zfs, config, newname, altroot) != 0) ==== //depot/projects/trustedbsd/base/contrib/opensolaris/cmd/ztest/ztest.c#2 (text+ko) ==== @@ -246,6 +246,8 @@ #define ZTEST_DIROBJ_BLOCKSIZE (1 << 10) #define ZTEST_DIRSIZE 256 +static void usage(boolean_t); + /* * These libumem hooks provide a reasonable set of defaults for the allocator's * debugging facilities. @@ -303,13 +305,17 @@ if (toupper(buf[0]) == ends[i]) break; } - if (i == strlen(ends)) - fatal(0, "invalid bytes suffix: %s", buf); + if (i == strlen(ends)) { + (void) fprintf(stderr, "ztest: invalid bytes suffix: %s\n", + buf); + usage(B_FALSE); + } if (buf[1] == '\0' || (toupper(buf[1]) == 'B' && buf[2] == '\0')) { return (10*i); } - fatal(0, "invalid bytes suffix: %s", buf); - return (-1); + (void) fprintf(stderr, "ztest: invalid bytes suffix: %s\n", buf); + usage(B_FALSE); + /* NOTREACHED */ } static uint64_t @@ -320,32 +326,40 @@ val = strtoull(buf, &end, 0); if (end == buf) { - fatal(0, "bad numeric value: %s", buf); + (void) fprintf(stderr, "ztest: bad numeric value: %s\n", buf); + usage(B_FALSE); } else if (end[0] == '.') { double fval = strtod(buf, &end); fval *= pow(2, str2shift(end)); - if (fval > UINT64_MAX) - fatal(0, "value too large: %s", buf); + if (fval > UINT64_MAX) { + (void) fprintf(stderr, "ztest: value too large: %s\n", + buf); + usage(B_FALSE); + } val = (uint64_t)fval; } else { int shift = str2shift(end); - if (shift >= 64 || (val << shift) >> shift != val) - fatal(0, "value too large: %s", buf); + if (shift >= 64 || (val << shift) >> shift != val) { + (void) fprintf(stderr, "ztest: value too large: %s\n", + buf); + usage(B_FALSE); + } val <<= shift; } return (val); } static void -usage(void) +usage(boolean_t requested) { char nice_vdev_size[10]; char nice_gang_bang[10]; + FILE *fp = requested ? stdout : stderr; nicenum(zopt_vdev_size, nice_vdev_size); nicenum(zio_gang_bang, nice_gang_bang); - (void) printf("Usage: %s\n" + (void) fprintf(fp, "Usage: %s\n" "\t[-v vdevs (default: %llu)]\n" "\t[-s size_of_each_vdev (default: %s)]\n" "\t[-a alignment_shift (default: %d) (use 0 for random)]\n" @@ -364,6 +378,7 @@ "\t[-T time] total run time (default: %llu sec)\n" "\t[-P passtime] time per pass (default: %llu sec)\n" "\t[-z zil failure rate (default: fail every 2^%llu allocs)]\n" + "\t[-h] (print help)\n" "", cmdname, (u_longlong_t)zopt_vdevs, /* -v */ @@ -382,7 +397,7 @@ (u_longlong_t)zopt_time, /* -T */ (u_longlong_t)zopt_passtime, /* -P */ (u_longlong_t)zio_zil_fail_shift); /* -z */ - exit(1); + exit(requested ? 0 : 1); } static uint64_t @@ -422,7 +437,7 @@ zio_zil_fail_shift = 5; while ((opt = getopt(argc, argv, - "v:s:a:m:r:R:d:t:g:i:k:p:f:VET:P:z:")) != EOF) { + "v:s:a:m:r:R:d:t:g:i:k:p:f:VET:P:z:h")) != EOF) { value = 0; switch (opt) { case 'v': @@ -496,9 +511,12 @@ case 'z': zio_zil_fail_shift = MIN(value, 16); break; + case 'h': + usage(B_TRUE); + break; case '?': default: - usage(); + usage(B_FALSE); break; } } ==== //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 (text+ko) ==== @@ -98,6 +98,7 @@ EZFS_POOLPROPS, /* couldn't retrieve pool props */ EZFS_POOL_NOTSUP, /* ops not supported for this type of pool */ EZFS_POOL_INVALARG, /* invalid argument for this pool operation */ + EZFS_NAMETOOLONG, /* dataset name is too long */ EZFS_UNKNOWN }; @@ -192,6 +193,7 @@ ZPOOL_STATUS_CORRUPT_DATA, /* data errors in user (meta)data */ ZPOOL_STATUS_FAILING_DEV, /* device experiencing errors */ ZPOOL_STATUS_VERSION_NEWER, /* newer on-disk version */ + ZPOOL_STATUS_HOSTID_MISMATCH, /* last accessed by another system */ /* * The following are not faults per se, but still an error possibly ==== //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 (text+ko) ==== @@ -379,7 +379,7 @@ uint_t i, nspares; boolean_t config_seen; uint64_t best_txg; - char *name; + char *name, *hostname; zfs_cmd_t zc = { 0 }; uint64_t version, guid; size_t len; @@ -388,6 +388,7 @@ nvlist_t **child = NULL; uint_t c; boolean_t isactive; + uint64_t hostid; if (nvlist_alloc(&ret, 0, 0) != 0) goto nomem; @@ -430,6 +431,8 @@ * pool guid * name * pool state + * hostid (if available) + * hostname (if available) */ uint64_t state; @@ -453,6 +456,20 @@ if (nvlist_add_uint64(config, ZPOOL_CONFIG_POOL_STATE, state) != 0) goto nomem; + hostid = 0; + if (nvlist_lookup_uint64(tmp, + ZPOOL_CONFIG_HOSTID, &hostid) == 0) { + if (nvlist_add_uint64(config, + ZPOOL_CONFIG_HOSTID, hostid) != 0) + goto nomem; + verify(nvlist_lookup_string(tmp, + ZPOOL_CONFIG_HOSTNAME, + &hostname) == 0); + if (nvlist_add_string(config, + ZPOOL_CONFIG_HOSTNAME, + hostname) != 0) + goto nomem; + } config_seen = B_TRUE; } @@ -622,6 +639,20 @@ } /* + * Restore the original information read from the actual label. + */ + (void) nvlist_remove(config, ZPOOL_CONFIG_HOSTID, + DATA_TYPE_UINT64); + (void) nvlist_remove(config, ZPOOL_CONFIG_HOSTNAME, + DATA_TYPE_STRING); + if (hostid != 0) { + verify(nvlist_add_uint64(config, ZPOOL_CONFIG_HOSTID, + hostid) == 0); + verify(nvlist_add_string(config, ZPOOL_CONFIG_HOSTNAME, + hostname) == 0); + } + + /* * Add this pool to the list of configs. */ verify(nvlist_lookup_string(config, ZPOOL_CONFIG_POOL_NAME, ==== //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 (text+ko) ==== @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -43,6 +43,7 @@ #include #include +#include #include "libzfs_impl.h" /* @@ -50,7 +51,7 @@ * in libzfs.h. Note that there are some status results which go past the end * of this table, and hence have no associated message ID. */ -static char *msgid_table[] = { +static char *zfs_msgid_table[] = { "ZFS-8000-14", "ZFS-8000-2Q", "ZFS-8000-3C", @@ -60,7 +61,8 @@ "ZFS-8000-72", "ZFS-8000-8A", "ZFS-8000-9P", - "ZFS-8000-A5" + "ZFS-8000-A5", + "ZFS-8000-EY" }; /* @@ -69,7 +71,7 @@ * and the article referred to by 'zpool status' must match that indicated by * the syslog error message. We override missing data as well as corrupt pool. */ -static char *msgid_table_active[] = { +static char *zfs_msgid_table_active[] = { "ZFS-8000-14", "ZFS-8000-D3", /* overridden */ "ZFS-8000-D3", /* overridden */ @@ -82,7 +84,7 @@ "ZFS-8000-CS", /* overridden */ }; -#define NMSGID (sizeof (msgid_table) / sizeof (msgid_table[0])) +#define NMSGID (sizeof (zfs_msgid_table) / sizeof (zfs_msgid_table[0])) /* ARGSUSED */ static int @@ -178,6 +180,8 @@ uint_t vsc; uint64_t nerr; uint64_t version; + uint64_t stateval; + uint64_t hostid = 0; verify(nvlist_lookup_uint64(config, ZPOOL_CONFIG_VERSION, &version) == 0); @@ -185,6 +189,16 @@ &nvroot) == 0); verify(nvlist_lookup_uint64_array(nvroot, ZPOOL_CONFIG_STATS, (uint64_t **)&vs, &vsc) == 0); + verify(nvlist_lookup_uint64(config, ZPOOL_CONFIG_POOL_STATE, + &stateval) == 0); + (void) nvlist_lookup_uint64(config, ZPOOL_CONFIG_HOSTID, &hostid); + + /* + * Pool last accessed by another system. + */ + if (hostid != 0 && (unsigned long)hostid != gethostid() && + stateval == POOL_STATE_ACTIVE) + return (ZPOOL_STATUS_HOSTID_MISMATCH); /* * Newer on-disk version. @@ -270,7 +284,7 @@ if (ret >= NMSGID) *msgid = NULL; else - *msgid = msgid_table_active[ret]; + *msgid = zfs_msgid_table_active[ret]; return (ret); } @@ -283,7 +297,7 @@ if (ret >= NMSGID) *msgid = NULL; else - *msgid = msgid_table[ret]; + *msgid = zfs_msgid_table[ret]; return (ret); } ==== //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 (text+ko) ==== @@ -167,6 +167,8 @@ case EZFS_POOL_INVALARG: return (dgettext(TEXT_DOMAIN, "invalid argument for " "this pool operation")); + case EZFS_NAMETOOLONG: + return (dgettext(TEXT_DOMAIN, "dataset name is too long")); case EZFS_UNKNOWN: return (dgettext(TEXT_DOMAIN, "unknown error")); default: @@ -306,6 +308,11 @@ "dataset is busy")); zfs_verror(hdl, EZFS_BUSY, fmt, ap); break; + + case ENAMETOOLONG: + zfs_verror(hdl, EZFS_NAMETOOLONG, fmt, ap); + break; + default: zfs_error_aux(hdl, strerror(errno)); zfs_verror(hdl, EZFS_UNKNOWN, fmt, ap); @@ -490,6 +497,21 @@ hdl->libzfs_printerr = printerr; } +static int +libzfs_load(void) +{ + int error; + + if (modfind("zfs") < 0) { + /* Not present in kernel, try loading it. */ + if (kldload("zfs") < 0 || modfind("zfs") < 0) { + if (errno != EEXIST) + return (error); + } + } + return (0); +} + libzfs_handle_t * libzfs_init(void) { @@ -500,8 +522,12 @@ } if ((hdl->libzfs_fd = open(ZFS_DEV, O_RDWR)) < 0) { - free(hdl); - return (NULL); + if (libzfs_load() == 0) + hdl->libzfs_fd = open(ZFS_DEV, O_RDWR); + if (hdl->libzfs_fd < 0) { + free(hdl); + return (NULL); + } } if ((hdl->libzfs_mnttab = fopen(MNTTAB, "r")) == NULL) { ==== //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzpool/common/kernel.c#2 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include #include +#include /* * Emulation of kernel services in userland. @@ -45,6 +46,11 @@ int hz = 119; /* frequency when using gethrtime() >> 23 for lbolt */ uint64_t physmem; vnode_t *rootdir = (vnode_t *)0xabcd1234; +char hw_serial[11]; + +struct utsname utsname = { + "userland", "libzpool", "1", "1", "na" +}; /* * ========================================================================= @@ -770,6 +776,17 @@ return (random_get_bytes_common(ptr, len, "/dev/urandom")); } +int +ddi_strtoul(const char *hw_serial, char **nptr, int base, unsigned long *result) +{ + char *end; + + *result = strtoul(hw_serial, &end, base); + if (*result == 0) + return (errno); + return (0); +} + /* * ========================================================================= * kernel emulation setup & teardown @@ -795,6 +812,8 @@ dprintf("physmem = %llu pages (%.2f GB)\n", physmem, (double)physmem * sysconf(_SC_PAGE_SIZE) / (1ULL << 30)); + snprintf(hw_serial, sizeof (hw_serial), "%ld", gethostid()); + spa_init(mode); } ==== //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 (text+ko) ==== @@ -290,6 +290,7 @@ #define kmem_alloc(_s, _f) umem_alloc(_s, _f) #define kmem_zalloc(_s, _f) umem_zalloc(_s, _f) #define kmem_free(_b, _s) umem_free(_b, _s) +#define kmem_size() (physmem * PAGESIZE) #define kmem_cache_create(_a, _b, _c, _d, _e, _f, _g, _h, _i) \ umem_cache_create(_a, _b, _c, _d, _e, _f, _g, _h, _i) #define kmem_cache_destroy(_c) umem_cache_destroy(_c) @@ -436,6 +437,14 @@ #define zone_dataset_visible(x, y) (1) #define INGLOBALZONE(z) (1) +/* + * Hostname information + */ +extern struct utsname utsname; +extern char hw_serial[]; +extern int ddi_strtoul(const char *str, char **nptr, int base, + unsigned long *result); + #ifdef __cplusplus } #endif @@ -481,12 +490,15 @@ #define SX_SYSINIT(name, lock, desc) #define SYSCTL_DECL(...) +#define SYSCTL_NODE(...) #define SYSCTL_INT(...) -#define SYSCTL_NODE(...) +#define SYSCTL_ULONG(...) #ifdef TUNABLE_INT #undef TUNABLE_INT +#undef TUNABLE_ULONG #endif #define TUNABLE_INT(...) +#define TUNABLE_ULONG(...) /* Errors */ ==== //depot/projects/trustedbsd/base/contrib/sendmail/FREEBSD-upgrade#22 (text+ko) ==== @@ -1,6 +1,6 @@ -$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.32 2006/08/17 05:14:33 gshapiro Exp $ +$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.33 2007/04/09 01:46:43 gshapiro Exp $ -sendmail 8.13.8 +sendmail 8.14.1 originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/ For the import of sendmail, the following files were removed: @@ -21,8 +21,8 @@ Imported using: - cvs import -m 'Import sendmail 8.13.8' \ - src/contrib/sendmail SENDMAIL v8_13_8 + cvs import -m 'Import sendmail 8.14.1' \ + src/contrib/sendmail SENDMAIL v8_14_1 After importing, bump the version of src/etc/sendmail/freebsd*mc so mergemaster will merge /etc/mail/freebsd*cf: @@ -97,4 +97,4 @@ usr.sbin/mailwrapper/Makefile gshapiro@FreeBSD.org -16-August-2006 +08-April-2007 ==== //depot/projects/trustedbsd/base/contrib/sendmail/KNOWNBUGS#9 (text+ko) ==== @@ -29,10 +29,10 @@ * Null bytes are not handled properly in headers. Sendmail should handle full binary data. As it stands, it handles - all values in the body, but only 0x01-0x80 and 0xA0-0xFF in - the header. Notably missing is 0x00, which would require a major - restructuring of the code -- for example, almost no C library support - could be used to handle strings. + all values in the body, but not 0x00 in the header. Changing + this would require a major restructuring of the code -- for + example, almost no C library support could be used to handle + strings. * Header checks are not called if header value is too long or empty. @@ -170,7 +170,7 @@ When sendmail is doing 8->7 bit MIME conversions, and the message contains certain MIME body types that cannot be converted to 7-bit, - sendmail will strip the message to 7-bit. + sendmail will pass the message as 8-bit. * 7->8 bit MIME conversion @@ -235,9 +235,9 @@ Sendmail will deliver to a fail if the file is owned by the DefaultUser or has the set-user-ID bit set. Unfortunately, some systems clear that bit - when a file is modified. Sendmail compensates by resetting the file mode + when a file is modified. Sendmail compensates by resetting the file mode back to it's original settings. Unfortunately, there's still a - permission failure race as sendmail checks the permissions before locking + permission failure race as sendmail checks the permissions before locking the file. This is unavoidable as sendmail must verify the file is safe to open before opening it. A file can not be locked until it is open. @@ -247,4 +247,4 @@ be used if set instead of LOCAL_RELAY ($R). This will be fixed in a future version. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 11 14:50:31 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5CE4516A409; Wed, 11 Apr 2007 14:50:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2EB9616A405 for ; Wed, 11 Apr 2007 14:50:31 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 25DA613C448 for ; Wed, 11 Apr 2007 14:50:31 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3BEoUeC085245 for ; Wed, 11 Apr 2007 14:50:31 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3BEoUOY085241 for perforce@freebsd.org; Wed, 11 Apr 2007 14:50:30 GMT (envelope-from sam@freebsd.org) Date: Wed, 11 Apr 2007 14:50:30 GMT Message-Id: <200704111450.l3BEoUOY085241@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117900 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Apr 2007 14:50:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=117900 Change 117900 by sam@sam_ebb on 2007/04/11 14:49:38 add missing bits Affected files ... .. //depot/projects/wifi/contrib/wpa_supplicant/aes.h#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/asn1.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/asn1.h#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/asn1_test.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/bignum.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/bignum.h#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/build_config.h#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/config_none.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/config_winreg.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/crypto_cryptoapi.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/crypto_internal.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/crypto_libtomcrypt.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/crypto_none.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/ctrl_iface_dbus.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/ctrl_iface_dbus.h#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/ctrl_iface_named_pipe.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/ctrl_iface_udp.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/ctrl_iface_unix.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/dbus-wpa_supplicant.conf#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/dbus_dict_helpers.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/dbus_dict_helpers.h#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/des.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/eap_gpsk.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/eap_gpsk_common.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/eap_gpsk_common.h#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/eap_methods.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/eap_methods.h#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/eap_sake.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/eap_sake_common.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/eap_sake_common.h#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/eap_vendor_test.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/eloop_none.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/eloop_win.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/includes.h#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/libtommath.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/md4.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/mlme.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/mlme.h#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/ndis_events.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/nmake.mak#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/openssl-0.9.8d-tls-extensions.patch#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/os.h#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/os_unix.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/pmksa_cache.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/pmksa_cache.h#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/rsa.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/rsa.h#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/sha256.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/sha256.h#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/state_machine.h#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/tls_internal.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/tlsv1_client.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/tlsv1_client.h#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/tlsv1_common.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/tlsv1_common.h#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_common.h#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/x509v3.c#1 add .. //depot/projects/wifi/contrib/wpa_supplicant/x509v3.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 11 14:50:32 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 009E816A525; Wed, 11 Apr 2007 14:50:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BC5BC16A50F for ; Wed, 11 Apr 2007 14:50:31 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8ECCF13C46A for ; Wed, 11 Apr 2007 14:50:31 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3BEoV7P085252 for ; Wed, 11 Apr 2007 14:50:31 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3BEoVYP085248 for perforce@freebsd.org; Wed, 11 Apr 2007 14:50:31 GMT (envelope-from sam@freebsd.org) Date: Wed, 11 Apr 2007 14:50:31 GMT Message-Id: <200704111450.l3BEoVYP085248@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117901 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Apr 2007 14:50:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=117901 Change 117901 by sam@sam_ebb on 2007/04/11 14:50:01 add missing bits Affected files ... .. //depot/projects/wifi/contrib/hostapd/aes.h#1 add .. //depot/projects/wifi/contrib/hostapd/ap_list.c#1 add .. //depot/projects/wifi/contrib/hostapd/ap_list.h#1 add .. //depot/projects/wifi/contrib/hostapd/beacon.c#1 add .. //depot/projects/wifi/contrib/hostapd/beacon.h#1 add .. //depot/projects/wifi/contrib/hostapd/build_config.h#1 add .. //depot/projects/wifi/contrib/hostapd/des.c#1 add .. //depot/projects/wifi/contrib/hostapd/eap_aka.c#1 add .. //depot/projects/wifi/contrib/hostapd/eap_gpsk.c#1 add .. //depot/projects/wifi/contrib/hostapd/eap_gpsk_common.c#1 add .. //depot/projects/wifi/contrib/hostapd/eap_gpsk_common.h#1 add .. //depot/projects/wifi/contrib/hostapd/eap_methods.c#1 add .. //depot/projects/wifi/contrib/hostapd/eap_methods.h#1 add .. //depot/projects/wifi/contrib/hostapd/eap_sake.c#1 add .. //depot/projects/wifi/contrib/hostapd/eap_sake_common.c#1 add .. //depot/projects/wifi/contrib/hostapd/eap_sake_common.h#1 add .. //depot/projects/wifi/contrib/hostapd/eap_vendor_test.c#1 add .. //depot/projects/wifi/contrib/hostapd/eloop_none.c#1 add .. //depot/projects/wifi/contrib/hostapd/eloop_win.c#1 add .. //depot/projects/wifi/contrib/hostapd/hlr_auc_gw.c#1 add .. //depot/projects/wifi/contrib/hostapd/hlr_auc_gw.milenage_db#1 add .. //depot/projects/wifi/contrib/hostapd/hostapd.vlan#1 add .. //depot/projects/wifi/contrib/hostapd/hw_features.c#1 add .. //depot/projects/wifi/contrib/hostapd/hw_features.h#1 add .. //depot/projects/wifi/contrib/hostapd/ieee802_11h.c#1 add .. //depot/projects/wifi/contrib/hostapd/ieee802_11h.h#1 add .. //depot/projects/wifi/contrib/hostapd/includes.h#1 add .. //depot/projects/wifi/contrib/hostapd/md4.c#1 add .. //depot/projects/wifi/contrib/hostapd/milenage.c#1 add .. //depot/projects/wifi/contrib/hostapd/milenage.h#1 add .. //depot/projects/wifi/contrib/hostapd/mlme.c#1 add .. //depot/projects/wifi/contrib/hostapd/mlme.h#1 add .. //depot/projects/wifi/contrib/hostapd/nt_password_hash.c#1 add .. //depot/projects/wifi/contrib/hostapd/os.h#1 add .. //depot/projects/wifi/contrib/hostapd/os_unix.c#1 add .. //depot/projects/wifi/contrib/hostapd/pmksa_cache.c#1 add .. //depot/projects/wifi/contrib/hostapd/pmksa_cache.h#1 add .. //depot/projects/wifi/contrib/hostapd/preauth.c#1 add .. //depot/projects/wifi/contrib/hostapd/preauth.h#1 add .. //depot/projects/wifi/contrib/hostapd/reconfig.c#1 add .. //depot/projects/wifi/contrib/hostapd/sha256.c#1 add .. //depot/projects/wifi/contrib/hostapd/sha256.h#1 add .. //depot/projects/wifi/contrib/hostapd/state_machine.h#1 add .. //depot/projects/wifi/contrib/hostapd/tls_gnutls.c#1 add .. //depot/projects/wifi/contrib/hostapd/vlan_init.c#1 add .. //depot/projects/wifi/contrib/hostapd/vlan_init.h#1 add .. //depot/projects/wifi/contrib/hostapd/wme.c#1 add .. //depot/projects/wifi/contrib/hostapd/wme.h#1 add .. //depot/projects/wifi/contrib/hostapd/wpa_common.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 11 15:02:49 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9F2A16A473; Wed, 11 Apr 2007 15:02:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7593216A46E for ; Wed, 11 Apr 2007 15:02:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6315313C4CC for ; Wed, 11 Apr 2007 15:02:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3BF2mLr087780 for ; Wed, 11 Apr 2007 15:02:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3BF2kg8087773 for perforce@freebsd.org; Wed, 11 Apr 2007 15:02:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 11 Apr 2007 15:02:46 GMT Message-Id: <200704111502.l3BF2kg8087773@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 117902 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Apr 2007 15:02:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=117902 Change 117902 by rwatson@rwatson_zoo on 2007/04/11 15:02:38 Integrate TrustedBSD priv branch. Affected files ... .. //depot/projects/trustedbsd/priv/sys/amd64/conf/GENERIC#7 integrate .. //depot/projects/trustedbsd/priv/sys/boot/forth/loader.conf#5 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_sg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_ioctl.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/kern/opensolaris_string.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/kobj.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/string.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/conf/NOTES#11 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files#13 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files.ia64#3 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/utmisc.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-all.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-chipset.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-dma.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/ah_osdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_lro.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/sys/mvec.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/sys/uipc_mvec.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/mii/brgphy.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/miidevs#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/msk/if_msk.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/geom/eli/g_eli.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/i386/conf/GENERIC#7 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/conf/GENERIC#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_jail.c#18 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_mib.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_mqueue.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_mount.c#11 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_subr.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/libkern/index.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/libkern/rindex.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/Makefile#9 integrate .. //depot/projects/trustedbsd/priv/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/dpt/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/if_trunk/Makefile#1 branch .. //depot/projects/trustedbsd/priv/sys/modules/libalias/libalias/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/zfs/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/net/ieee8023ad_lacp.c#1 branch .. //depot/projects/trustedbsd/priv/sys/net/ieee8023ad_lacp.h#1 branch .. //depot/projects/trustedbsd/priv/sys/net/if.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_ethersubr.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_trunk.c#1 branch .. //depot/projects/trustedbsd/priv/sys/net/if_trunk.h#1 branch .. //depot/projects/trustedbsd/priv/sys/net/if_var.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/in_pcb.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_input.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_output.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_sack.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_subr.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_syncache.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_timer.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_timer.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_usrreq.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_var.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/netipsec/ipsec_osdep.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/pc98/conf/GENERIC#6 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/conf/GENERIC#7 integrate .. //depot/projects/trustedbsd/priv/sys/rpc/types.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sparc64/conf/GENERIC#6 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/include/nexusvar.h#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/conf/GENERIC#5 integrate .. //depot/projects/trustedbsd/priv/sys/sys/hash.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/kernel.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/sys/libkern.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/mutex.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/sys/param.h#9 integrate .. //depot/projects/trustedbsd/priv/sys/sys/priv.h#13 integrate .. //depot/projects/trustedbsd/priv/sys/sys/sysctl.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/sys/systm.h#11 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_snapshot.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_softdep.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/vm/phys_pager.c#4 integrate Differences ... ==== //depot/projects/trustedbsd/priv/sys/amd64/conf/GENERIC#7 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.473 2007/02/09 19:03:17 brooks Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.475 2007/04/10 21:40:12 pjd Exp $ cpu HAMMER ident GENERIC @@ -34,6 +34,7 @@ options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists options UFS_DIRHASH # Improve performance on big directories +options UFS_GJOURNAL # Enable gjournal-based UFS journaling options MD_ROOT # MD is a potential root device options NFSCLIENT # Network Filesystem Client options NFSSERVER # Network Filesystem Server ==== //depot/projects/trustedbsd/priv/sys/boot/forth/loader.conf#5 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.118 2007/02/04 06:35:10 imp Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.120 2007/04/09 22:09:09 pjd Exp $ ############################################################## ### Basic configuration options ############################ @@ -138,6 +138,7 @@ #umapfs_load="NO" # User-id map filesystem unionfs_load="NO" # Union filesystem xfs_load="NO" # XFS +zfs_load="NO" # ZFS # Related stuff @@ -418,3 +419,10 @@ #module_after="cmd" # executes "cmd" after loading the module #module_error="cmd" # executes "cmd" if load fails +############################################################## +### Always try to load ZFS pool cache file ################# +############################################################## + +zpool_cache_load="YES" +zpool_cache_type="/boot/zfs/zpool.cache" +zpool_cache_name="/boot/zfs/zpool.cache" ==== //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_sg.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.1 2007/04/07 19:40:57 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.4 2007/04/10 20:03:42 scottl Exp $"); #include #include @@ -71,8 +71,8 @@ } sg_state; typedef enum { + SG_RDWR_FREE, SG_RDWR_INPROG, - SG_RDWR_WAITING, SG_RDWR_DONE } sg_rdwr_state; @@ -100,11 +100,13 @@ struct sg_softc { sg_state state; sg_flags flags; - uint8_t pd_type; struct devstat *device_stats; TAILQ_HEAD(, sg_rdwr) rdwr_done; struct cdev *dev; struct cdev *devalias; + int sg_timeout; + int sg_user_timeout; + uint8_t pd_type; union ccb saved_ccb; }; @@ -289,15 +291,16 @@ return (CAM_REQ_CMP_ERR); } - softc = (struct sg_softc *)malloc(sizeof(*softc), M_DEVBUF, M_NOWAIT); + softc = malloc(sizeof(*softc), M_DEVBUF, M_ZERO | M_NOWAIT); if (softc == NULL) { printf("sgregister: Unable to allocate softc\n"); return (CAM_REQ_CMP_ERR); } - bzero(softc, sizeof(*softc)); softc->state = SG_STATE_NORMAL; softc->pd_type = SID_TYPE(&cgd->inq_data); + softc->sg_timeout = SG_DEFAULT_TIMEOUT / SG_DEFAULT_HZ * hz; + softc->sg_user_timeout = SG_DEFAULT_TIMEOUT; TAILQ_INIT(&softc->rdwr_done); periph->softc = softc; @@ -388,8 +391,7 @@ rdwr = done_ccb->ccb_h.ccb_rdwr; state = rdwr->state; rdwr->state = SG_RDWR_DONE; - if (state == SG_RDWR_WAITING) - wakeup(rdwr); + wakeup(rdwr); break; } default: @@ -497,16 +499,22 @@ error = copyout(&sg_version, arg, sizeof(sg_version)); break; case SG_SET_TIMEOUT: - case LINUX_SG_SET_TIMEOUT: + case LINUX_SG_SET_TIMEOUT: { + u_int user_timeout; + + error = copyin(arg, &user_timeout, sizeof(u_int)); + if (error == 0) { + softc->sg_user_timeout = user_timeout; + softc->sg_timeout = user_timeout / SG_DEFAULT_HZ * hz; + } break; + } case SG_GET_TIMEOUT: case LINUX_SG_GET_TIMEOUT: /* - * XXX This ioctl is highly brain damaged because it requires - * that the value be returned in the syscall return value. - * The linuxolator seems to have a hard time with this, - * so just return 0 and hope that apps can cope. + * The value is returned directly to the syscall. */ + td->td_retval[0] = softc->sg_user_timeout; error = 0; break; case SG_IO: @@ -679,7 +687,7 @@ periph = dev->si_drv1; sc = periph->softc; - rdwr = malloc(sizeof(*rdwr), M_DEVBUF, M_WAITOK); + rdwr = malloc(sizeof(*rdwr), M_DEVBUF, M_WAITOK | M_ZERO); hdr = &rdwr->hdr.hdr; /* Copy in the header block and sanity check it */ @@ -728,13 +736,13 @@ */ buf_len = uio->uio_resid; if (buf_len != 0) { - buf = malloc(buf_len, M_DEVBUF, M_WAITOK); + buf = malloc(buf_len, M_DEVBUF, M_WAITOK | M_ZERO); error = uiomove(buf, buf_len, uio); if (error) goto out_buf; dir = CAM_DIR_OUT; } else if (hdr->reply_len != 0) { - buf = malloc(hdr->reply_len, M_DEVBUF, M_WAITOK); + buf = malloc(hdr->reply_len, M_DEVBUF, M_WAITOK | M_ZERO); buf_len = hdr->reply_len; dir = CAM_DIR_IN; } else { @@ -752,7 +760,7 @@ buf_len, SG_MAX_SENSE, cdb_len, - 60*hz); + sc->sg_timeout); /* * Send off the command and hope that it works. This path does not @@ -809,7 +817,6 @@ break; } if ((rdwr == NULL) || (rdwr->state != SG_RDWR_DONE)) { - rdwr->state = SG_RDWR_WAITING; if (tsleep(rdwr, PCATCH, "sgread", 0) == ERESTART) return (EAGAIN); goto search; ==== //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_sg.h#2 (text+ko) ==== @@ -1,7 +1,7 @@ /* * Structures and definitions for SCSI commands to the SG passthrough device. * - * $FreeBSD: src/sys/cam/scsi/scsi_sg.h,v 1.1 2007/04/07 19:40:57 scottl Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_sg.h,v 1.2 2007/04/10 20:03:42 scottl Exp $ */ #ifndef _SCSI_SG_H @@ -136,4 +136,9 @@ #define DRIVER_MASK 0x0f #define SUGGEST_MASK 0xf0 +/* Other definitions */ +/* HZ isn't always available, so simulate it */ +#define SG_DEFAULT_HZ 1000 +#define SG_DEFAULT_TIMEOUT (60*SG_DEFAULT_HZ) + #endif /* !_SCSI_SG_H */ ==== //depot/projects/trustedbsd/priv/sys/compat/linux/linux_ioctl.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_ioctl.h,v 1.25 2007/04/07 19:40:58 scottl Exp $ + * $FreeBSD: src/sys/compat/linux/linux_ioctl.h,v 1.26 2007/04/10 21:37:37 scottl Exp $ */ #ifndef _LINUX_IOCTL_H_ @@ -134,34 +134,34 @@ /* * SG */ -#define LINUX_SG_SET_TIMEOUT 0x2201 -#define LINUX_SG_GET_TIMEOUT 0x2202 -#define LINUX_SG_EMULATED_HOST 0x2203 -#define LINUX_SG_SET_TRANSFORM 0x2204 -#define LINUX_SG_GET_TRANSFORM 0x2205 -#define LINUX_SG_GET_COMMAND_Q 0x2270 -#define LINUX_SG_SET_COMMAND_Q 0x2271 -#define LINUX_SG_SET_RESERVED_SIZE 0x2275 -#define LINUX_SG_GET_RESERVED_SIZE 0x2272 -#define LINUX_SG_GET_SCSI_ID 0x2276 -#define LINUX_SG_SET_FORCE_LOW_DMA 0x2279 -#define LINUX_SG_GET_LOW_DMA 0x227a -#define LINUX_SG_SET_FORCE_PACK_ID 0x227b -#define LINUX_SG_GET_PACK_ID 0x227c -#define LINUX_SG_GET_NUM_WAITING 0x227d -#define LINUX_SG_SET_DEBUG 0x227e -#define LINUX_SG_GET_SG_TABLESIZE 0x227f -#define LINUX_SG_GET_VERSION_NUM 0x2282 -#define LINUX_SG_NEXT_CMD_LEN 0x2283 -#define LINUX_SG_SCSI_RESET 0x2284 -#define LINUX_SG_IO 0x2285 -#define LINUX_SG_GET_REQUEST_TABLE 0x2286 -#define LINUX_SG_SET_KEEP_ORPHAN 0x2287 -#define LINUX_SG_GET_KEEP_ORPHAN 0x2288 -#define LINUX_SG_GET_ACCESS_COUNT 0x2289 +#define LINUX_SG_SET_TIMEOUT 0x2201 +#define LINUX_SG_GET_TIMEOUT 0x2202 +#define LINUX_SG_EMULATED_HOST 0x2203 +#define LINUX_SG_SET_TRANSFORM 0x2204 +#define LINUX_SG_GET_TRANSFORM 0x2205 +#define LINUX_SG_GET_COMMAND_Q 0x2270 +#define LINUX_SG_SET_COMMAND_Q 0x2271 +#define LINUX_SG_SET_RESERVED_SIZE 0x2275 +#define LINUX_SG_GET_RESERVED_SIZE 0x2272 +#define LINUX_SG_GET_SCSI_ID 0x2276 +#define LINUX_SG_SET_FORCE_LOW_DMA 0x2279 +#define LINUX_SG_GET_LOW_DMA 0x227a +#define LINUX_SG_SET_FORCE_PACK_ID 0x227b +#define LINUX_SG_GET_PACK_ID 0x227c +#define LINUX_SG_GET_NUM_WAITING 0x227d +#define LINUX_SG_SET_DEBUG 0x227e +#define LINUX_SG_GET_SG_TABLESIZE 0x227f +#define LINUX_SG_GET_VERSION_NUM 0x2282 +#define LINUX_SG_NEXT_CMD_LEN 0x2283 +#define LINUX_SG_SCSI_RESET 0x2284 +#define LINUX_SG_IO 0x2285 +#define LINUX_SG_GET_REQUEST_TABLE 0x2286 +#define LINUX_SG_SET_KEEP_ORPHAN 0x2287 +#define LINUX_SG_GET_KEEP_ORPHAN 0x2288 +#define LINUX_SG_GET_ACCESS_COUNT 0x2289 -#define LINUX_IOCTL_SG_MIN 0x2200 -#define LINUX_IOCTL_SG_MAX 0x22ff +#define LINUX_IOCTL_SG_MIN 0x2200 +#define LINUX_IOCTL_SG_MAX 0x22ff /* * VFAT ==== //depot/projects/trustedbsd/priv/sys/compat/opensolaris/kern/opensolaris_kmem.c#2 (text+ko) ==== @@ -25,18 +25,25 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_kmem.c,v 1.1 2007/04/06 01:09:06 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_kmem.c,v 1.2 2007/04/10 02:35:56 pjd Exp $"); #include #include #include #include -#include #include #include #include + +#include +#include +#include +#include + +#ifdef KMEM_DEBUG #include #include +#endif #ifdef _KERNEL static MALLOC_DEFINE(M_SOLARIS, "solaris", "Solaris"); @@ -82,12 +89,6 @@ return (p); } -void * -kmem_zalloc(size_t size, int kmflags) -{ - return (kmem_alloc(size, kmflags | M_ZERO)); -} - void zfs_kmem_free(void *buf, size_t size __unused) { @@ -107,6 +108,20 @@ free(buf, M_SOLARIS); } +u_long +kmem_size(void) +{ + + return ((u_long)vm_kmem_size); +} + +u_long +kmem_used(void) +{ + + return ((u_long)kmem_map->size); +} + static int kmem_std_constructor(void *mem, int size __unused, void *private, int flags) { ==== //depot/projects/trustedbsd/priv/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 (text+ko) ==== @@ -25,17 +25,18 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_kobj.c,v 1.1 2007/04/06 01:09:06 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_kobj.c,v 1.2 2007/04/08 23:57:08 pjd Exp $"); #include #include #include +#include #include #include #include #include -#include #include +#include #include void @@ -62,8 +63,8 @@ return (p); } -struct _buf * -kobj_open_file(const char *file) +static void * +kobj_open_file_vnode(const char *file) { struct thread *td = curthread; struct nameidata nd; @@ -79,16 +80,45 @@ error = vn_open_cred(&nd, &flags, 0, td->td_ucred, -1); NDFREE(&nd, NDF_ONLY_PNBUF); if (error != 0) - return ((struct _buf *)-1); + return (NULL); /* We just unlock so we hold a reference. */ VOP_UNLOCK(nd.ni_vp, 0, td); - return ((struct _buf *)nd.ni_vp); + return (nd.ni_vp); +} + +static void * +kobj_open_file_loader(const char *file) +{ + + return (preload_search_by_name(file)); +} + +struct _buf * +kobj_open_file(const char *file) +{ + struct _buf *out; + + out = kmem_alloc(sizeof(*out), KM_SLEEP); + out->mounted = root_mounted(); + /* + * If root is already mounted we read file using file system, + * if not, we use loader. + */ + if (out->mounted) + out->ptr = kobj_open_file_vnode(file); + else + out->ptr = kobj_open_file_loader(file); + if (out->ptr == NULL) { + kmem_free(out, sizeof(*out)); + return ((struct _buf *)-1); + } + return (out); } -int -kobj_get_filesize(struct _buf *file, uint64_t *size) +static int +kobj_get_filesize_vnode(struct _buf *file, uint64_t *size) { - struct vnode *vp = (struct vnode *)file; + struct vnode *vp = file->ptr; struct thread *td = curthread; struct vattr va; int error; @@ -101,10 +131,32 @@ return (error); } +static int +kobj_get_filesize_loader(struct _buf *file, uint64_t *size) +{ + void *ptr; + + ptr = preload_search_info(file->ptr, MODINFO_SIZE); + if (ptr == NULL) + return (ENOENT); + *size = (uint64_t)*(size_t *)ptr; + return (0); +} + +int +kobj_get_filesize(struct _buf *file, uint64_t *size) +{ + + if (file->mounted) + return (kobj_get_filesize_vnode(file, size)); + else + return (kobj_get_filesize_loader(file, size)); +} + int -kobj_read_file(struct _buf *file, char *buf, unsigned size, unsigned off) +kobj_read_file_vnode(struct _buf *file, char *buf, unsigned size, unsigned off) { - struct vnode *vp = (struct vnode *)file; + struct vnode *vp = file->ptr; struct thread *td = curthread; struct uio auio; struct iovec aiov; @@ -130,13 +182,39 @@ return (error != 0 ? -1 : size - auio.uio_resid); } +int +kobj_read_file_loader(struct _buf *file, char *buf, unsigned size, unsigned off) +{ + char *ptr; + + ptr = preload_search_info(file->ptr, MODINFO_ADDR); + if (ptr == NULL) + return (ENOENT); + ptr = *(void **)ptr; + bcopy(ptr + off, buf, size); + return (0); +} + +int +kobj_read_file(struct _buf *file, char *buf, unsigned size, unsigned off) +{ + + if (file->mounted) + return (kobj_read_file_vnode(file, buf, size, off)); + else + return (kobj_read_file_loader(file, buf, size, off)); +} + void kobj_close_file(struct _buf *file) { - struct vnode *vp = (struct vnode *)file; - struct thread *td = curthread; - int flags; + + if (file->mounted) { + struct vnode *vp = file->ptr; + struct thread *td = curthread; + int flags = FREAD; - flags = FREAD; - vn_close(vp, flags, td->td_ucred, td); + vn_close(vp, flags, td->td_ucred, td); + } + kmem_free(file, sizeof(*file)); } ==== //depot/projects/trustedbsd/priv/sys/compat/opensolaris/kern/opensolaris_string.c#2 (text+ko) ==== @@ -32,37 +32,6 @@ (((c) >= 'a' && (c) <= 'z') || ((c) >= 'A' && (c) <= 'Z')) char * -strchr(const char *s, int c) -{ - char ch; - - ch = c; - for (;; ++s) { - if (*s == ch) - return ((char *)s); - if (*s == '\0') - return (NULL); - } - /* NOTREACHED */ -} - -char * -strrchr(const char *s, int c) -{ - char *save; - char ch; - - ch = c; - for (save = NULL;; ++s) { - if (*s == ch) - save = (char *)s; - if (*s == '\0') - return (save); - } - /* NOTREACHED */ -} - -char * strpbrk(const char *s, const char *b) { const char *p; ==== //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/kmem.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/opensolaris/sys/kmem.h,v 1.1 2007/04/06 01:09:06 pjd Exp $ + * $FreeBSD: src/sys/compat/opensolaris/sys/kmem.h,v 1.2 2007/04/10 02:35:56 pjd Exp $ */ #ifndef _OPENSOLARIS_SYS_KMEM_H_ @@ -32,6 +32,7 @@ #include #include #include + #include #include #include @@ -55,8 +56,9 @@ } kmem_cache_t; void *zfs_kmem_alloc(size_t size, int kmflags); -void *kmem_zalloc(size_t size, int kmflags); void zfs_kmem_free(void *buf, size_t size); +u_long kmem_size(void); +u_long kmem_used(void); kmem_cache_t *kmem_cache_create(char *name, size_t bufsize, size_t align, int (*constructor)(void *, void *, int), void (*destructor)(void *, void *), void (*reclaim)(void *) __unused, void *private, vmem_t *vmp, int cflags); @@ -69,6 +71,7 @@ void *calloc(size_t n, size_t s); #define kmem_alloc(size, kmflags) zfs_kmem_alloc((size), (kmflags)) +#define kmem_zalloc(size, kmflags) zfs_kmem_alloc((size), (kmflags) | M_ZERO) #define kmem_free(buf, size) zfs_kmem_free((buf), (size)) #endif /* _OPENSOLARIS_SYS_KMEM_H_ */ ==== //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/kobj.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/opensolaris/sys/kobj.h,v 1.1 2007/04/06 01:09:06 pjd Exp $ + * $FreeBSD: src/sys/compat/opensolaris/sys/kobj.h,v 1.2 2007/04/08 23:57:08 pjd Exp $ */ #ifndef _OPENSOLARIS_SYS_KOBJ_H_ @@ -31,6 +31,13 @@ #include #include +#include_next +#ifdef AT_UID +#undef AT_UID +#endif +#ifdef AT_GID +#undef AT_GID +#endif #include #define KM_NOWAIT 0x01 @@ -41,7 +48,8 @@ void *kobj_zalloc(size_t size, int flag); struct _buf { - void *dummy; + void *ptr; + int mounted; }; struct _buf *kobj_open_file(const char *path); ==== //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/mutex.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/opensolaris/sys/mutex.h,v 1.1 2007/04/06 01:09:06 pjd Exp $ + * $FreeBSD: src/sys/compat/opensolaris/sys/mutex.h,v 1.2 2007/04/09 01:05:31 pjd Exp $ */ #ifndef _OPENSOLARIS_SYS_MUTEX_H_ @@ -48,6 +48,9 @@ #define mutex_init(lock, desc, type, arg) do { \ ASSERT((type) == MUTEX_DEFAULT); \ + KASSERT(((lock)->lock_object.lo_flags & LO_ALLMASK) != \ + LO_EXPECTED, ("lock %s already initialized", #lock)); \ + bzero((lock), sizeof(struct sx)); \ sx_init_flags((lock), "zfs:" #lock, SX_DUPOK); \ } while (0) #define mutex_destroy(lock) sx_destroy(lock) ==== //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/rwlock.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/opensolaris/sys/rwlock.h,v 1.1 2007/04/06 01:09:06 pjd Exp $ + * $FreeBSD: src/sys/compat/opensolaris/sys/rwlock.h,v 1.2 2007/04/09 01:05:31 pjd Exp $ */ #ifndef _OPENSOLARIS_SYS_RWLOCK_H_ @@ -53,8 +53,12 @@ #define RW_LOCK_HELD(x) (rw_lock_held((x))) #define RW_ISWRITER(x) (rw_iswriter(x)) -#define rw_init(lock, desc, type, arg) \ - sx_init_flags((lock), "zfs:" #lock, SX_DUPOK) +#define rw_init(lock, desc, type, arg) do { \ + KASSERT(((lock)->lock_object.lo_flags & LO_ALLMASK) != \ + LO_EXPECTED, ("lock %s already initialized", #lock)); \ + bzero((lock), sizeof(struct sx)); \ + sx_init_flags((lock), "zfs:" #lock, SX_DUPOK); \ +} while (0) #define rw_destroy(lock) sx_destroy(lock) #define rw_enter(lock, how) do { \ if ((how) == RW_READER) \ ==== //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/string.h#2 (text+ko) ==== @@ -23,14 +23,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/opensolaris/sys/string.h,v 1.1 2007/04/06 01:09:06 pjd Exp $ + * $FreeBSD: src/sys/compat/opensolaris/sys/string.h,v 1.2 2007/04/10 21:42:12 wkoszek Exp $ */ #ifndef _OPENSOLARIS_SYS_STRING_H_ #define _OPENSOLARIS_SYS_STRING_H_ -char *strchr(const char *, int); -char *strrchr(const char *p, int c); +#include + char *strpbrk(const char *, const char *); void strident_canon(char *s, size_t n); ==== //depot/projects/trustedbsd/priv/sys/conf/NOTES#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1419 2007/04/07 19:40:57 scottl Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1421 2007/04/10 03:09:38 thompsa Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -813,6 +813,7 @@ options PPP_BSDCOMP #PPP BSD-compress support options PPP_DEFLATE #PPP zlib/deflate/gzip support options PPP_FILTER #enable bpf filtering (needs bpf) +device trunk #Trunk aggregation interface device ef # Multiple ethernet frames support options ETHER_II # enable Ethernet_II frame ==== //depot/projects/trustedbsd/priv/sys/conf/files#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1191 2007/04/07 19:40:57 scottl Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1195 2007/04/10 00:35:31 thompsa Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -520,6 +520,7 @@ dev/cxgb/common/cxgb_mv88e1xxx.c optional cxgb pci dev/cxgb/common/cxgb_xgmac.c optional cxgb pci dev/cxgb/common/cxgb_t3_hw.c optional cxgb pci +dev/cxgb/sys/uipc_mvec.c optional cxgb pci dev/cy/cy.c optional cy dev/cy/cy_isa.c optional cy isa dev/cy/cy_pci.c optional cy pci @@ -1526,6 +1527,7 @@ net/bpf_filter.c optional bpf | netgraph_bpf net/bridgestp.c optional if_bridge net/bsd_comp.c optional ppp_bsdcomp +net/ieee8023ad_lacp.c optional trunk net/if.c standard net/if_arcsubr.c optional arcnet net/if_atmsubr.c optional atm @@ -1552,6 +1554,7 @@ net/if_stf.c optional stf net/if_tun.c optional tun net/if_tap.c optional tap +net/if_trunk.c optional trunk net/if_vlan.c optional vlan net/netisr.c standard net/ppp_deflate.c optional ppp_deflate @@ -1774,19 +1777,19 @@ netinet/ip_options.c optional inet netinet/ip_output.c optional inet netinet/raw_ip.c optional inet -netinet/sctp_usrreq.c optional inet inet6 sctp -netinet/sctp_pcb.c optional inet inet6 sctp -netinet/sctputil.c optional inet inet6 sctp +netinet/sctp_asconf.c optional inet inet6 sctp +netinet/sctp_auth.c optional inet inet6 sctp netinet/sctp_bsd_addr.c optional inet inet6 sctp -netinet/sctp_timer.c optional inet inet6 sctp +netinet/sctp_crc32.c optional inet inet6 sctp +netinet/sctp_indata.c optional inet inet6 sctp netinet/sctp_input.c optional inet inet6 sctp netinet/sctp_output.c optional inet inet6 sctp -netinet/sctp_indata.c optional inet inet6 sctp -netinet/sctp_asconf.c optional inet inet6 sctp +netinet/sctp_pcb.c optional inet inet6 sctp netinet/sctp_peeloff.c optional inet inet6 sctp -netinet/sctp_crc32.c optional inet inet6 sctp -netinet/sctp_auth.c optional inet inet6 sctp netinet/sctp_sysctl.c optional inet inet6 sctp +netinet/sctp_timer.c optional inet inet6 sctp +netinet/sctp_usrreq.c optional inet inet6 sctp +netinet/sctputil.c optional inet inet6 sctp netinet/tcp_debug.c optional tcpdebug netinet/tcp_hostcache.c optional inet netinet/tcp_input.c optional inet @@ -1800,7 +1803,6 @@ netinet/libalias/alias.c optional libalias netinet/libalias/alias_db.c optional libalias netinet/libalias/alias_mod.c optional libalias -netinet/libalias/alias_old.c optional libalias netinet/libalias/alias_proxy.c optional libalias netinet/libalias/alias_util.c optional libalias netinet6/ah_aesxcbcmac.c optional ipsec ==== //depot/projects/trustedbsd/priv/sys/conf/files.ia64#3 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.90 2006/10/23 13:23:12 ru Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.91 2007/04/09 14:02:18 kan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -128,3 +128,4 @@ libkern/ia64/__umodsi3.S standard libkern/ia64/bswap16.S standard libkern/ia64/bswap32.S standard +libkern/memset.c standard ==== //depot/projects/trustedbsd/priv/sys/contrib/dev/acpica/utmisc.c#3 (text+ko) ==== @@ -1295,6 +1295,11 @@ { va_list args; +#ifdef _KERNEL + /* Temporarily hide too verbose printfs. */ + if (!bootverbose) + return; +#endif /* * Removed ModuleName, LineNumber, and acpica version, not needed ==== //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 (text+ko) ==== @@ -124,8 +124,6 @@ #include #include -#define ARC_FREE_AT_ONCE 4194304 - static kmutex_t arc_reclaim_thr_lock; static kcondvar_t arc_reclaim_thr_cv; /* used to signal reclaim thr */ static uint8_t arc_thread_exit; @@ -154,7 +152,6 @@ */ u_long zfs_arc_max; u_long zfs_arc_min; -#ifdef _KERNEL TUNABLE_ULONG("vfs.zfs.arc_max", &zfs_arc_max); TUNABLE_ULONG("vfs.zfs.arc_min", &zfs_arc_min); SYSCTL_DECL(_vfs_zfs); @@ -162,7 +159,6 @@ "Maximum ARC size"); SYSCTL_ULONG(_vfs_zfs, OID_AUTO, arc_min, CTLFLAG_RD, &zfs_arc_min, 0, "Minimum ARC size"); -#endif /* * Note that buffers can be on one of 5 states: @@ -1443,7 +1439,7 @@ return (1); #endif #else - if (kmem_map->size > (vm_kmem_size * 3) / 4) + if (kmem_used() > kmem_size() / 2) return (1); #endif @@ -2686,17 +2682,21 @@ return (0); } +static kmutex_t arc_lowmem_lock; #ifdef _KERNEL -static eventhandler_tag zfs_event_lowmem = NULL; +static eventhandler_tag arc_event_lowmem = NULL; static void -zfs_lowmem(void *arg __unused, int howto __unused) +arc_lowmem(void *arg __unused, int howto __unused) { + /* Serialize access via arc_lowmem_lock. */ + mutex_enter(&arc_lowmem_lock); zfs_needfree = 1; cv_signal(&arc_reclaim_thr_cv); while (zfs_needfree) tsleep(&zfs_needfree, 0, "zfs:lowmem", hz / 5); + mutex_exit(&arc_lowmem_lock); } #endif @@ -2705,12 +2705,13 @@ { mutex_init(&arc_reclaim_thr_lock, NULL, MUTEX_DEFAULT, NULL); cv_init(&arc_reclaim_thr_cv, NULL, CV_DEFAULT, NULL); + mutex_init(&arc_lowmem_lock, NULL, MUTEX_DEFAULT, NULL); /* Convert seconds to clock ticks */ arc_min_prefetch_lifespan = 1 * hz; /* Start out with 1/8 of all memory */ - arc_c = physmem * PAGESIZE / 8; + arc_c = kmem_size() / 8; #if 0 #ifdef _KERNEL /* >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 11 18:24:29 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22A4E16A405; Wed, 11 Apr 2007 18:24:29 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E5BED16A401 for ; Wed, 11 Apr 2007 18:24:28 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C4CB113C459 for ; Wed, 11 Apr 2007 18:24:28 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3BIOSqS035644 for ; Wed, 11 Apr 2007 18:24:28 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3BIOSNb035641 for perforce@freebsd.org; Wed, 11 Apr 2007 18:24:28 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 11 Apr 2007 18:24:28 GMT Message-Id: <200704111824.l3BIOSNb035641@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 117909 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Apr 2007 18:24:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=117909 Change 117909 by gonzo@gonzo_jeeves on 2007/04/11 18:23:31 o Whitespaces nits Affected files ... .. //depot/projects/mips2/src/sys/mips/mips4k/malta/obio.c#2 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips4k/malta/obio.c#2 (text+ko) ==== @@ -103,9 +103,11 @@ if (rman_init(&sc->oba_irq_rman) != 0 || rman_manage_region(&sc->oba_irq_rman, 4, 4) != 0) panic("obio_attach: failed to set up IRQ rman"); + device_add_child(dev, "uart", 0); bus_generic_probe(dev); bus_generic_attach(dev); + return (0); } From owner-p4-projects@FreeBSD.ORG Wed Apr 11 18:27:48 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D54D516A402; Wed, 11 Apr 2007 18:27:47 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 83BDC16A401 for ; Wed, 11 Apr 2007 18:27:47 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 761A113C44B for ; Wed, 11 Apr 2007 18:27:47 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3BIRlSA036097 for ; Wed, 11 Apr 2007 18:27:47 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3BIRXAC036091 for perforce@freebsd.org; Wed, 11 Apr 2007 18:27:33 GMT (envelope-from jhb@freebsd.org) Date: Wed, 11 Apr 2007 18:27:33 GMT Message-Id: <200704111827.l3BIRXAC036091@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 117910 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Apr 2007 18:27:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=117910 Change 117910 by jhb@jhb_zion on 2007/04/11 18:27:24 IFC @117906. Affected files ... .. //depot/projects/smpng/sys/amd64/conf/GENERIC#57 integrate .. //depot/projects/smpng/sys/arm/at91/uart_cpu_at91rm9200usart.c#3 integrate .. //depot/projects/smpng/sys/arm/at91/uart_dev_at91usart.c#11 integrate .. //depot/projects/smpng/sys/arm/sa11x0/uart_cpu_sa1110.c#5 integrate .. //depot/projects/smpng/sys/arm/sa11x0/uart_dev_sa1110.c#6 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/uart_cpu_i80321.c#5 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#2 integrate .. //depot/projects/smpng/sys/boot/arm/at91/boot2/boot2.c#5 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#48 integrate .. //depot/projects/smpng/sys/boot/pc98/boot0.5/Makefile#4 integrate .. //depot/projects/smpng/sys/boot/pc98/boot0.5/boot0.5.s#3 integrate .. //depot/projects/smpng/sys/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/smpng/sys/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/smpng/sys/boot/pc98/boot0.5/selector.s#2 integrate .. //depot/projects/smpng/sys/boot/pc98/boot0.5/start.s#3 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/boot.c#10 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sg.c#1 branch .. //depot/projects/smpng/sys/cam/scsi/scsi_sg.h#1 branch .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#57 integrate .. //depot/projects/smpng/sys/compat/linux/linux_file.c#36 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#48 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.h#14 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#36 integrate .. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#26 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#41 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_pe.c#8 integrate .. //depot/projects/smpng/sys/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/smpng/sys/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/smpng/sys/compat/svr4/svr4_filio.c#17 integrate .. //depot/projects/smpng/sys/conf/NOTES#141 integrate .. //depot/projects/smpng/sys/conf/files#203 integrate .. //depot/projects/smpng/sys/conf/files.amd64#51 integrate .. //depot/projects/smpng/sys/conf/files.i386#106 integrate .. //depot/projects/smpng/sys/conf/files.ia64#58 integrate .. //depot/projects/smpng/sys/conf/files.pc98#88 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#36 integrate .. //depot/projects/smpng/sys/conf/options#140 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utmisc.c#20 integrate .. //depot/projects/smpng/sys/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/dnlc.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/atomic.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/dnlc.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/vfs.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/smpng/sys/dev/ata/ata-all.h#52 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#81 integrate .. //depot/projects/smpng/sys/dev/ata/ata-dma.c#51 integrate .. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#37 integrate .. //depot/projects/smpng/sys/dev/ata/ata_if.m#4 integrate .. //depot/projects/smpng/sys/dev/ath/ah_osdep.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_lro.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/sys/mvec.h#1 branch .. //depot/projects/smpng/sys/dev/cxgb/sys/uipc_mvec.c#1 branch .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pccard.c#8 integrate .. //depot/projects/smpng/sys/dev/mii/brgphy.c#41 integrate .. //depot/projects/smpng/sys/dev/mii/miidevs#25 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_cam.c#23 integrate .. //depot/projects/smpng/sys/dev/msk/if_msk.c#6 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#15 integrate .. //depot/projects/smpng/sys/dev/sound/pci/cmi.c#34 integrate .. //depot/projects/smpng/sys/dev/streams/streams.c#33 integrate .. //depot/projects/smpng/sys/dev/uart/uart.h#5 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus.h#11 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus_pci.c#8 integrate .. //depot/projects/smpng/sys/dev/uart/uart_core.c#16 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu.h#9 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_amd64.c#8 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_i386.c#8 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_ia64.c#9 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_pc98.c#9 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_powerpc.c#3 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_sparc64.c#16 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_ns8250.c#17 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_sab82532.c#11 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_z8530.c#14 integrate .. //depot/projects/smpng/sys/dev/uart/uart_kbd_sun.c#11 integrate .. //depot/projects/smpng/sys/dev/uart/uart_subr.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/if_ural.c#23 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#63 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vfsops.c#22 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vnops.c#26 integrate .. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#42 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs.c#24 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs.h#25 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_subr.c#29 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli.c#21 integrate .. //depot/projects/smpng/sys/geom/journal/g_journal.c#5 integrate .. //depot/projects/smpng/sys/geom/uzip/g_uzip.c#9 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#87 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#53 integrate .. //depot/projects/smpng/sys/i386/i386/initcpu.c#29 integrate .. //depot/projects/smpng/sys/i386/i386/minidump_machdep.c#3 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#117 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#107 integrate .. //depot/projects/smpng/sys/i386/include/pmap.h#35 integrate .. //depot/projects/smpng/sys/i386/include/specialreg.h#15 integrate .. //depot/projects/smpng/sys/i386/include/vmparam.h#8 integrate .. //depot/projects/smpng/sys/ia64/conf/GENERIC#56 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#104 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#51 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#108 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#48 integrate .. //depot/projects/smpng/sys/kern/kern_mbuf.c#23 integrate .. //depot/projects/smpng/sys/kern/kern_mib.c#29 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#146 integrate .. //depot/projects/smpng/sys/kern/kern_sx.c#46 integrate .. //depot/projects/smpng/sys/kern/subr_lock.c#7 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#162 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#49 integrate .. //depot/projects/smpng/sys/kern/uipc_mqueue.c#13 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#102 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#76 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#34 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#43 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#72 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#140 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#128 integrate .. //depot/projects/smpng/sys/libkern/index.c#4 integrate .. //depot/projects/smpng/sys/libkern/memset.c#1 branch .. //depot/projects/smpng/sys/libkern/rindex.c#5 integrate .. //depot/projects/smpng/sys/modules/Makefile#138 integrate .. //depot/projects/smpng/sys/modules/cam/Makefile#12 integrate .. //depot/projects/smpng/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/dpt/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/if_trunk/Makefile#1 branch .. //depot/projects/smpng/sys/modules/libalias/libalias/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/zfs/Makefile#1 branch .. //depot/projects/smpng/sys/net/ieee8023ad_lacp.c#1 branch .. //depot/projects/smpng/sys/net/ieee8023ad_lacp.h#1 branch .. //depot/projects/smpng/sys/net/if.c#93 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#82 integrate .. //depot/projects/smpng/sys/net/if_trunk.c#1 branch .. //depot/projects/smpng/sys/net/if_trunk.h#1 branch .. //depot/projects/smpng/sys/net/if_var.h#48 integrate .. //depot/projects/smpng/sys/netatm/atm_if.c#17 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#73 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#45 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#84 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#33 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_db.c#5 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_ftp.c#4 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_irc.c#4 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_proxy.c#5 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_skinny.c#4 integrate .. //depot/projects/smpng/sys/netinet/sctp_asconf.c#7 integrate .. //depot/projects/smpng/sys/netinet/sctp_bsd_addr.h#4 integrate .. //depot/projects/smpng/sys/netinet/sctp_constants.h#8 integrate .. //depot/projects/smpng/sys/netinet/sctp_indata.c#9 integrate .. //depot/projects/smpng/sys/netinet/sctp_input.c#9 integrate .. //depot/projects/smpng/sys/netinet/sctp_os_bsd.h#8 integrate .. //depot/projects/smpng/sys/netinet/sctp_output.c#9 integrate .. //depot/projects/smpng/sys/netinet/sctp_output.h#4 integrate .. //depot/projects/smpng/sys/netinet/sctp_pcb.c#8 integrate .. //depot/projects/smpng/sys/netinet/sctp_pcb.h#7 integrate .. //depot/projects/smpng/sys/netinet/sctp_sysctl.c#3 integrate .. //depot/projects/smpng/sys/netinet/sctp_sysctl.h#3 integrate .. //depot/projects/smpng/sys/netinet/sctp_timer.c#7 integrate .. //depot/projects/smpng/sys/netinet/sctp_uio.h#8 integrate .. //depot/projects/smpng/sys/netinet/sctp_usrreq.c#9 integrate .. //depot/projects/smpng/sys/netinet/sctputil.c#10 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#102 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#47 integrate .. //depot/projects/smpng/sys/netinet/tcp_sack.c#21 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#90 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#57 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#35 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.h#14 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#60 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#49 integrate .. //depot/projects/smpng/sys/netinet6/ipsec.c#28 integrate .. //depot/projects/smpng/sys/netinet6/sctp6_usrreq.c#8 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_osdep.h#5 integrate .. //depot/projects/smpng/sys/netsmb/smb_dev.c#23 integrate .. //depot/projects/smpng/sys/opencrypto/cryptodev.c#22 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#69 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#43 integrate .. //depot/projects/smpng/sys/rpc/types.h#1 branch .. //depot/projects/smpng/sys/security/audit/audit_bsm_klib.c#5 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#77 integrate .. //depot/projects/smpng/sys/sun4v/conf/GENERIC#6 integrate .. //depot/projects/smpng/sys/sun4v/include/smp.h#5 integrate .. //depot/projects/smpng/sys/sys/elf_common.h#10 integrate .. //depot/projects/smpng/sys/sys/filedesc.h#30 integrate .. //depot/projects/smpng/sys/sys/filio.h#4 integrate .. //depot/projects/smpng/sys/sys/hash.h#2 integrate .. //depot/projects/smpng/sys/sys/jail.h#17 integrate .. //depot/projects/smpng/sys/sys/kernel.h#36 integrate .. //depot/projects/smpng/sys/sys/libkern.h#24 integrate .. //depot/projects/smpng/sys/sys/link_elf.h#4 integrate .. //depot/projects/smpng/sys/sys/lock.h#46 integrate .. //depot/projects/smpng/sys/sys/lock_profile.h#5 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#70 integrate .. //depot/projects/smpng/sys/sys/mount.h#60 integrate .. //depot/projects/smpng/sys/sys/mutex.h#73 integrate .. //depot/projects/smpng/sys/sys/param.h#115 integrate .. //depot/projects/smpng/sys/sys/priv.h#5 integrate .. //depot/projects/smpng/sys/sys/sx.h#26 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#43 integrate .. //depot/projects/smpng/sys/sys/systm.h#83 integrate .. //depot/projects/smpng/sys/sys/unistd.h#16 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#62 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#63 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#94 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#52 integrate .. //depot/projects/smpng/sys/vm/phys_pager.c#16 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#66 integrate .. //depot/projects/smpng/sys/vm/vm_kern.c#37 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#57 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.473 2007/02/09 19:03:17 brooks Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.475 2007/04/10 21:40:12 pjd Exp $ cpu HAMMER ident GENERIC @@ -34,6 +34,7 @@ options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists options UFS_DIRHASH # Improve performance on big directories +options UFS_GJOURNAL # Enable gjournal-based UFS journaling options MD_ROOT # MD is a potential root device options NFSCLIENT # Network Filesystem Client options NFSSERVER # Network Filesystem Server ==== //depot/projects/smpng/sys/arm/at91/uart_cpu_at91rm9200usart.c#3 (text) ==== @@ -27,7 +27,7 @@ #include "opt_uart.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/uart_cpu_at91rm9200usart.c,v 1.2 2006/05/13 23:41:16 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/uart_cpu_at91rm9200usart.c,v 1.3 2007/04/02 22:00:21 marcel Exp $"); #include #include @@ -43,7 +43,7 @@ bus_space_tag_t uart_bus_space_io; bus_space_tag_t uart_bus_space_mem; -extern struct uart_ops at91_usart_ops; +extern struct uart_class at91_usart_class; extern struct bus_space at91_bs_tag; int @@ -55,7 +55,10 @@ int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { - di->ops = at91_usart_ops; + struct uart_class *class; + + class = &at91_usart_class; + di->ops = uart_getops(class); di->bas.chan = 0; di->bas.bst = &at91_bs_tag; /* @@ -77,7 +80,5 @@ uart_bus_space_io = &at91_bs_tag; uart_bus_space_mem = NULL; /* Check the environment for overrides */ - if (uart_getenv(devtype, di) == 0) - return (0); - return (0); + return (uart_getenv(devtype, di, class)); } ==== //depot/projects/smpng/sys/arm/at91/uart_dev_at91usart.c#11 (text) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.11 2007/01/18 22:01:19 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.12 2007/04/02 22:00:21 marcel Exp $"); #include "opt_comconsole.h" @@ -196,7 +196,7 @@ return (0); } -struct uart_ops at91_usart_ops = { +static struct uart_ops at91_usart_ops = { .probe = at91_usart_probe, .init = at91_usart_init, .term = at91_usart_term, @@ -662,10 +662,12 @@ } return (EINVAL); } + struct uart_class at91_usart_class = { - "at91_usart class", + "at91_usart", at91_usart_methods, sizeof(struct at91_usart_softc), + .uc_ops = &at91_usart_ops, .uc_range = 8, .uc_rclk = DEFAULT_RCLK }; ==== //depot/projects/smpng/sys/arm/sa11x0/uart_cpu_sa1110.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_cpu_sa1110.c,v 1.6 2006/06/21 10:56:59 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_cpu_sa1110.c,v 1.7 2007/04/02 22:00:21 marcel Exp $"); #include #include @@ -42,7 +42,7 @@ bus_space_tag_t uart_bus_space_io; bus_space_tag_t uart_bus_space_mem; -extern struct uart_ops uart_sa1110_ops; +extern struct uart_class uart_sa1110_class; vm_offset_t sa1110_uart_vaddr; @@ -55,7 +55,8 @@ int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { - di->ops = uart_sa1110_ops; + + di->ops = uart_getops(&uart_sa1110_class); di->bas.chan = 0; di->bas.bst = &sa11x0_bs_tag; di->bas.bsh = sa1110_uart_vaddr; ==== //depot/projects/smpng/sys/arm/sa11x0/uart_dev_sa1110.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_dev_sa1110.c,v 1.7 2007/01/18 22:01:19 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_dev_sa1110.c,v 1.8 2007/04/02 22:00:21 marcel Exp $"); #include #include @@ -57,7 +57,7 @@ extern SLIST_HEAD(uart_devinfo_list, uart_devinfo) uart_sysdevs; -struct uart_ops uart_sa1110_ops = { +static struct uart_ops uart_sa1110_ops = { .probe = sa1110_probe, .init = sa1110_init, .term = sa1110_term, @@ -272,10 +272,12 @@ { return (EINVAL); } + struct uart_class uart_sa1110_class = { - "sa1110 class", + "sa1110", sa1110_methods, 1, + .uc_ops = &uart_sa1110_ops, .uc_range = 8, .uc_rclk = 3686400 }; ==== //depot/projects/smpng/sys/arm/xscale/i80321/uart_cpu_i80321.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/uart_cpu_i80321.c,v 1.4 2005/01/20 22:23:26 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/uart_cpu_i80321.c,v 1.5 2007/04/02 22:00:22 marcel Exp $"); #include #include @@ -51,7 +51,7 @@ int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { - di->ops = uart_ns8250_ops; + di->ops = uart_getops(&uart_ns8250_class); di->bas.chan = 0; di->bas.bst = &obio_bs_tag; di->bas.regshft = 0; ==== //depot/projects/smpng/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c,v 1.1 2006/11/19 23:55:23 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c,v 1.2 2007/04/02 22:00:22 marcel Exp $"); #include #include @@ -51,7 +51,7 @@ int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { - di->ops = uart_ns8250_ops; + di->ops = uart_getops(&uart_ns8250_class); di->bas.chan = 0; di->bas.bst = &ixp425_a4x_bs_tag; di->bas.regshft = 0; ==== //depot/projects/smpng/sys/boot/arm/at91/boot2/boot2.c#5 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.4 2007/03/28 21:18:45 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.5 2007/04/02 20:26:04 imp Exp $"); #include #include @@ -148,8 +148,9 @@ board_init(); EMAC_Init(); - sdcard_init(); EMAC_SetMACAddress(mac); + while (sdcard_init() == 0) + printf("Looking for SD card\n"); dmadat = (void *)(0x20000000 + (16 << 20)); /* Process configuration file */ ==== //depot/projects/smpng/sys/boot/forth/loader.conf#48 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.118 2007/02/04 06:35:10 imp Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.120 2007/04/09 22:09:09 pjd Exp $ ############################################################## ### Basic configuration options ############################ @@ -138,6 +138,7 @@ #umapfs_load="NO" # User-id map filesystem unionfs_load="NO" # Union filesystem xfs_load="NO" # XFS +zfs_load="NO" # ZFS # Related stuff @@ -418,3 +419,10 @@ #module_after="cmd" # executes "cmd" after loading the module #module_error="cmd" # executes "cmd" if load fails +############################################################## +### Always try to load ZFS pool cache file ################# +############################################################## + +zpool_cache_load="YES" +zpool_cache_type="/boot/zfs/zpool.cache" +zpool_cache_name="/boot/zfs/zpool.cache" ==== //depot/projects/smpng/sys/boot/pc98/boot0.5/Makefile#4 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/sys/boot/pc98/boot0.5/Makefile,v 1.4 2004/12/21 08:47:16 ru Exp $ +# $FreeBSD: src/sys/boot/pc98/boot0.5/Makefile,v 1.6 2007/04/07 13:37:45 nyan Exp $ PROG= ${BOOT}.out INTERNALPROG= FILES= ${BOOT} NO_MAN= -SRCS= start.s boot.s boot0.5.s disk.s selector.s support.s syscons.s +SRCS= start.s boot.s boot0.5.s disk.s selector.s support.s syscons.s \ + putssjis.s CLEANFILES= ${BOOT} ${BOOT}.bin BOOT= boot0.5 @@ -13,7 +14,7 @@ # unless you are glutton for punishment. BOOT_BOOT0_ORG?= 0x0000 -LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG} +LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG} -Wl,-T,${.CURDIR}/ldscript # The size of boot0.5 must be 7168 bytes ${BOOT}: ${BOOT}.bin ==== //depot/projects/smpng/sys/boot/pc98/boot0.5/boot0.5.s#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# Copyright (c) KATO Takenori, 1999, 2000. +# Copyright (c) KATO Takenori, 1999, 2000, 2007. # # All rights reserved. Unpublished rights reserved under the copyright # laws of Japan. @@ -25,7 +25,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/sys/boot/pc98/boot0.5/boot0.5.s,v 1.3 2007/03/17 05:30:03 kato Exp $ +# $FreeBSD: src/sys/boot/pc98/boot0.5/boot0.5.s,v 1.4 2007/04/07 08:37:04 kato Exp $ # .global main .code16 @@ -261,8 +261,8 @@ .global ishireso ishireso: .byte 0 -title: .asciz "PC98 Boot Selector Version 1.1" -copyright: .ascii "(C)Copyright 1999, 2000 KATO Takenori. " +title: .asciz "PC98 Boot Selector Version 1.2" +copyright: .ascii "(C)Copyright 1999-2007 KATO Takenori. " .asciz "All rights reserved." msg_device: .asciz "Device" msg_sasi: .asciz "SASI/IDE unit " ==== //depot/projects/smpng/sys/boot/pc98/boot0.5/selector.s#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# Copyright (c) KATO Takenori, 1999, 2000. +# Copyright (c) KATO Takenori, 1999, 2000, 2007. # # All rights reserved. Unpublished rights reserved under the copyright # laws of Japan. @@ -25,7 +25,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/sys/boot/pc98/boot0.5/selector.s,v 1.2 2000/08/06 14:35:37 kato Exp $ +# $FreeBSD: src/sys/boot/pc98/boot0.5/selector.s,v 1.3 2007/04/07 08:37:04 kato Exp $ # .code16 @@ -299,6 +299,11 @@ jne dev_right movw $3, mode # N88-BASIC ret + + # XXX + .space 5, 0x90 + ret # Dummy ret @0x9ab + dev_up: cmpw $0, curdevice je devmode_loop ==== //depot/projects/smpng/sys/boot/pc98/boot0.5/start.s#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# Copyright (c) KATO Takenori, 1999, 2000. +# Copyright (c) KATO Takenori, 1999, 2000, 2007. # # All rights reserved. Unpublished rights reserved under the copyright # laws of Japan. @@ -25,7 +25,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/sys/boot/pc98/boot0.5/start.s,v 1.2 2003/05/02 09:33:12 kato Exp $ +# $FreeBSD: src/sys/boot/pc98/boot0.5/start.s,v 1.3 2007/04/07 08:37:04 kato Exp $ # .global start .code16 @@ -34,8 +34,19 @@ start: jmp start1 + # Magic + .org 0x053, 0x20 + .byte 0x4e, 0x45, 0x43 + + .org 0x8f + .byte 0x32, 0x2e, 0x37, 0x30 + .org 0x2d4 start1: + # The instruction 'call 0x9ab' can be here. See also selector.s. + nop + nop + nop cli movw %cs, %ax movw %ax, %ds ==== //depot/projects/smpng/sys/boot/pc98/boot2/boot.c#10 (text+ko) ==== @@ -49,7 +49,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/boot.c,v 1.16 2006/11/02 17:28:38 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/boot.c,v 1.17 2007/04/06 20:50:24 kan Exp $"); #include "boot.h" #include @@ -70,7 +70,7 @@ static char kernel_config_namebuf[NAMEBUF_LEN + sizeof "config"]; static char linebuf[NAMEBUF_LEN]; static char namebuf[NAMEBUF_LEN]; -static struct bootinfo bootinfo; +struct bootinfo bootinfo; int loadflags; static void getbootdev(char *ptr, int *howto); ==== //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#57 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.108 2007/03/30 17:56:44 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.109 2007/04/06 18:15:56 jkim Exp $"); #include #include @@ -1238,3 +1238,5 @@ PSEUDOFS(linprocfs, 1); MODULE_DEPEND(linprocfs, linux, 1, 1, 1); MODULE_DEPEND(linprocfs, procfs, 1, 1, 1); +MODULE_DEPEND(linprocfs, sysvmsg, 1, 1, 1); +MODULE_DEPEND(linprocfs, sysvsem, 1, 1, 1); ==== //depot/projects/smpng/sys/compat/linux/linux_file.c#36 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.102 2007/03/29 02:11:45 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.103 2007/04/04 09:11:31 rwatson Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -193,7 +193,7 @@ linux_at(struct thread *td, int dirfd, char *filename, char **newpath, char **freebuf) { struct file *fp; - int error = 0; + int error = 0, vfslocked; struct vnode *dvp; struct filedesc *fdp = td->td_proc->p_fd; char *fullpath = "unknown"; @@ -207,9 +207,10 @@ /* check for AT_FDWCD */ if (dirfd == LINUX_AT_FDCWD) { - FILEDESC_LOCK(fdp); + FILEDESC_SLOCK(fdp); dvp = fdp->fd_cdir; - FILEDESC_UNLOCK(fdp); + vref(dvp); + FILEDESC_SUNLOCK(fdp); } else { error = fget(td, dirfd, &fp); if (error) @@ -220,16 +221,28 @@ fdrop(fp, td); return (ENOTDIR); } + vref(dvp); fdrop(fp, td); } + /* + * XXXRW: This is bogus, as vn_fullpath() returns only an advisory + * file path, and may fail in several common situations, including + * for file systmes that don't use the name cache, and if the entry + * for the file falls out of the name cache. We should implement + * openat() in the FreeBSD native system call layer properly (using a + * requested starting directory), and have Linux and other ABIs wrap + * the native implementation. + */ error = vn_fullpath(td, dvp, &fullpath, &freepath); if (!error) { *newpath = malloc(strlen(fullpath) + strlen(filename) + 2, M_TEMP, M_WAITOK | M_ZERO); *freebuf = freepath; sprintf(*newpath, "%s/%s", fullpath, filename); } - + vfslocked = VFS_LOCK_GIANT(dvp->v_mount); + vrele(dvp); + VFS_UNLOCK_GIANT(vfslocked); return (error); } ==== //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#48 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.137 2006/07/06 21:42:36 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.138 2007/04/07 19:40:58 scottl Exp $"); #include #include @@ -86,6 +86,7 @@ static linux_ioctl_function_t linux_ioctl_termio; static linux_ioctl_function_t linux_ioctl_private; static linux_ioctl_function_t linux_ioctl_drm; +static linux_ioctl_function_t linux_ioctl_sg; static linux_ioctl_function_t linux_ioctl_special; static struct linux_ioctl_handler cdrom_handler = @@ -108,6 +109,8 @@ { linux_ioctl_private, LINUX_IOCTL_PRIVATE_MIN, LINUX_IOCTL_PRIVATE_MAX }; static struct linux_ioctl_handler drm_handler = { linux_ioctl_drm, LINUX_IOCTL_DRM_MIN, LINUX_IOCTL_DRM_MAX }; +static struct linux_ioctl_handler sg_handler = +{ linux_ioctl_sg, LINUX_IOCTL_SG_MIN, LINUX_IOCTL_SG_MAX }; DATA_SET(linux_ioctl_handler_set, cdrom_handler); DATA_SET(linux_ioctl_handler_set, vfat_handler); @@ -119,6 +122,7 @@ DATA_SET(linux_ioctl_handler_set, termio_handler); DATA_SET(linux_ioctl_handler_set, private_handler); DATA_SET(linux_ioctl_handler_set, drm_handler); +DATA_SET(linux_ioctl_handler_set, sg_handler); struct handler_element { @@ -1583,6 +1587,11 @@ break; } + case LINUX_SCSI_GET_BUS_NUMBER: + case LINUX_SCSI_GET_IDLUN: + error = linux_ioctl_sg(td, args); + break; + /* LINUX_CDROM_SEND_PACKET */ /* LINUX_CDROM_NEXT_WRITABLE */ /* LINUX_CDROM_LAST_WRITTEN */ @@ -2522,6 +2531,24 @@ return ioctl(td, (struct ioctl_args *)args); } +static int +linux_ioctl_sg(struct thread *td, struct linux_ioctl_args *args) +{ + struct file *fp; + u_long cmd; + int error; + + if ((error = fget(td, args->fd, &fp)) != 0) { + printf("sg_linux_ioctl: fget returned %d\n", error); + return (error); + } + cmd = args->cmd; + + error = (fo_ioctl(fp, cmd, (caddr_t)args->arg, td->td_ucred, td)); + fdrop(fp, td); + return (error); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 11 18:29:50 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BEE5616A407; Wed, 11 Apr 2007 18:29:50 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 94E4C16A405 for ; Wed, 11 Apr 2007 18:29:50 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8C2DA13C480 for ; Wed, 11 Apr 2007 18:29:50 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3BIToIG036230 for ; Wed, 11 Apr 2007 18:29:50 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3BIToAl036220 for perforce@freebsd.org; Wed, 11 Apr 2007 18:29:50 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 11 Apr 2007 18:29:50 GMT Message-Id: <200704111829.l3BIToAl036220@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 117911 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Apr 2007 18:29:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=117911 Change 117911 by gonzo@gonzo_jeeves on 2007/04/11 18:28:49 o Remove unnecessary return. o Use uart_getops to set uart operations. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips4k/malta/uart_cpu_maltausart.c#4 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips4k/malta/uart_cpu_maltausart.c#4 (text+ko) ==== @@ -60,13 +60,12 @@ uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2) { return ((b1->bsh == b2->bsh && b1->bst == b2->bst) ? 1 : 0); - return (0); } int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { - di->ops = uart_ns8250_ops; + di->ops = uart_getops(&uart_ns8250_class); di->bas.chan = 0; di->bas.bst = 0; di->bas.regshft = 0; From owner-p4-projects@FreeBSD.ORG Wed Apr 11 18:33:56 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6408816A408; Wed, 11 Apr 2007 18:33:56 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3773616A406 for ; Wed, 11 Apr 2007 18:33:56 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2E8B813C48C for ; Wed, 11 Apr 2007 18:33:56 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3BIXuHj037526 for ; Wed, 11 Apr 2007 18:33:56 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3BIXu3K037522 for perforce@freebsd.org; Wed, 11 Apr 2007 18:33:56 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 11 Apr 2007 18:33:56 GMT Message-Id: <200704111833.l3BIXu3K037522@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 117912 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Apr 2007 18:33:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=117912 Change 117912 by gonzo@gonzo_jeeves on 2007/04/11 18:32:59 o Do not mess with sp in trapframe. Save it as-is. Otherwise ddb failes to unwind call stack. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/exception.S#22 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/exception.S#22 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips2/src/sys/mips/mips/exception.S#21 $ + * $P4: //depot/projects/mips2/src/sys/mips/mips/exception.S#22 $ */ /* $NetBSD: mipsX_subr.S,v 1.19 2005/12/11 12:18:09 christos Exp $ */ @@ -286,11 +286,11 @@ LEAF(GenericException) .set noat - subu sp, sp, TF_SIZE la k0, 1f j exception_save_registers - move k1, sp + subu k1, sp, TF_SIZE 1: + subu sp, sp, TF_SIZE /* * A generic exception may result in DDB being invoked. If we @@ -329,7 +329,6 @@ jal exception_restore_registers nop - addu sp, sp, TF_SIZE eret .set at @@ -345,11 +344,11 @@ LEAF(KernIntr) .set noat - subu sp, sp, TF_SIZE la k0, 1f j exception_save_registers - move k1, sp + subu k1, sp, TF_SIZE 1: + subu sp, sp, TF_SIZE /* * A generic exception may result in DDB being invoked. If we @@ -384,7 +383,6 @@ jal exception_restore_registers nop - addu sp, sp, TF_SIZE eret .set at @@ -920,13 +918,6 @@ sw a0, TF_REG_MULHI(k1) sw a1, TF_REG_EPC(k1) - /* - * When restore returns, TF_SIZE gets added to the SP for - * return. So in restore, we subtract TF_SIZE, which means - * the value stored herein will be the value returned to. - * To accomodate this, we add TF_SIZE, which makes up for the - * initial subtraction for the trapframe. - */ sw sp, TF_REG_SP(k1) sw gp, TF_REG_GP(k1) @@ -964,3 +955,4 @@ nop END(save_kdbaux) #endif /* DDB */ + From owner-p4-projects@FreeBSD.ORG Wed Apr 11 18:39:03 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C0C716A409; Wed, 11 Apr 2007 18:39:03 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 51C9C16A400 for ; Wed, 11 Apr 2007 18:39:03 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 48D0313C489 for ; Wed, 11 Apr 2007 18:39:03 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3BId3SZ037822 for ; Wed, 11 Apr 2007 18:39:03 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3BId3gS037816 for perforce@freebsd.org; Wed, 11 Apr 2007 18:39:03 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 11 Apr 2007 18:39:03 GMT Message-Id: <200704111839.l3BId3gS037816@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 117913 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Apr 2007 18:39:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=117913 Change 117913 by gonzo@gonzo_jeeves on 2007/04/11 18:38:40 o Move intrname/eintrnames and intrcount/eintrcount from support.S to exception.S Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/exception.S#23 edit .. //depot/projects/mips2/src/sys/mips/mips/support.S#11 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/exception.S#23 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips2/src/sys/mips/mips/exception.S#22 $ + * $P4: //depot/projects/mips2/src/sys/mips/mips/exception.S#23 $ */ /* $NetBSD: mipsX_subr.S,v 1.19 2005/12/11 12:18:09 christos Exp $ */ @@ -956,3 +956,20 @@ END(save_kdbaux) #endif /* DDB */ +/* + * intrnames/eintrnames, intrcnt/eintrcnt + */ + .data + .globl intrcnt + .globl eintrcnt +intrcnt: + .space (NHARD_IRQS + NSOFT_IRQS) * 4 +eintrcnt: + + + .globl intrnames +intrnames: + .space (NHARD_IRQS + NSOFT_IRQS) * (MAXCOMLEN + 1) + + .globl eintrnames +eintrnames: ==== //depot/projects/mips2/src/sys/mips/mips/support.S#11 (text+ko) ==== @@ -434,22 +434,4 @@ END(fswberr) -/* - * XXXMIPS: - */ - .data - .globl intrcnt - .globl eintrcnt -intrcnt: - .space 1 -eintrcnt: - .space 2 - - - .globl intrnames - .globl eintrnames -intrnames: - .space 3 -eintrnames: - .space 4 From owner-p4-projects@FreeBSD.ORG Wed Apr 11 19:09:42 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A707B16A412; Wed, 11 Apr 2007 19:09:42 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3E7C516A409 for ; Wed, 11 Apr 2007 19:09:42 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2E4CA13C4C5 for ; Wed, 11 Apr 2007 19:09:42 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3BJ9gHB043753 for ; Wed, 11 Apr 2007 19:09:42 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3BJ9fUu043750 for perforce@freebsd.org; Wed, 11 Apr 2007 19:09:41 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 11 Apr 2007 19:09:41 GMT Message-Id: <200704111909.l3BJ9fUu043750@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 117915 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Apr 2007 19:09:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=117915 Change 117915 by gonzo@gonzo_jeeves on 2007/04/11 19:08:48 o Obsolete pmap_page_protect in favour of pmap_remove_write o Dump physical memory chunks in verbose mode o Get rid of PG_BUSY flug o Set PG_WRITABLE in pmap_enter Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/pmap.c#27 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/pmap.c#27 (text+ko) ==== @@ -315,6 +315,22 @@ } } + if (bootverbose) { + int indx; + + printf("Physical memory chunk(s):\n"); + for (indx = 0; phys_avail[indx + 1] != 0; indx += 2) { + vm_paddr_t size; + + size = phys_avail[indx + 1] - phys_avail[indx]; + printf("%#08jx - %#08jx, %ju bytes (%ju pages)\n", + (uintmax_t)phys_avail[indx], + (uintmax_t)phys_avail[indx + 1] - 1, + (uintmax_t)size, (uintmax_t)size / PAGE_SIZE); + } + } + + /* * Steal the message buffer from the beginning of memory. */ @@ -766,7 +782,6 @@ VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED | VM_ALLOC_ZERO); vm_page_lock_queues(); - vm_page_flag_clear(lev1pg, PG_BUSY); lev1pg->valid = VM_PAGE_BITS_ALL; vm_page_unlock_queues(); VM_OBJECT_UNLOCK(pmap->pm_pteobj); @@ -1221,10 +1236,7 @@ if(!mem) panic("pmap_enter: failed to get a page for lev2 segment"); - vm_page_lock_queues(); - vm_page_flag_clear(mem, PG_BUSY); mem->valid = VM_PAGE_BITS_ALL; - vm_page_unlock_queues(); VM_OBJECT_UNLOCK(pmap->pm_pteobj); pmap_segmap(pmap, va) = @@ -1304,6 +1316,13 @@ if (wired) pmap->pm_stats.wired_count++; + if(prot & VM_PROT_WRITE) + { + vm_page_lock_queues(); + vm_page_flag_set(m, PG_WRITEABLE); + vm_page_unlock_queues(); + } + wired = wired ? PG_W : 0; global = pmap == kernel_pmap ? PG_G : 0; p = pte_prot(pmap, prot); @@ -1576,42 +1595,36 @@ } /* - * pmap_page_protect: - * - * Lower the permission for all mappings to a given page. + * Clear the write and modified bits in each of the given page's mappings. */ void -pmap_page_protect(vm_page_t m, vm_prot_t prot) +pmap_remove_write(vm_page_t m) { pv_entry_t pv, npv; vm_offset_t va; pt_entry_t *pte; - /* - * Consider only readonly case + if((m->flags & PG_WRITEABLE) == 0) + return; + + /* + * Loop over all current mappings + * setting/clearing as appropos. */ - if ((prot & VM_PROT_WRITE) == 0) { - if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) { - /* - * Loop over all current mappings - * setting/clearing as appropos. - */ - for(pv = TAILQ_FIRST(&m->md.pv_list); pv; pv = npv) { - npv = TAILQ_NEXT(pv, pv_plist); - pte = pmap_pte(pv->pv_pmap, pv->pv_va); - - if ((pte == NULL) || !pte_valid(pte)) - panic("page on pm_pvlist has no pte\n"); + for(pv = TAILQ_FIRST(&m->md.pv_list); pv; pv = npv) + { + npv = TAILQ_NEXT(pv, pv_plist); + pte = pmap_pte(pv->pv_pmap, pv->pv_va); + + if ((pte == NULL) || !pte_valid(pte)) + panic("page on pm_pvlist has no pte\n"); - va = pv->pv_va; - pmap_protect(pv->pv_pmap, va, va + PAGE_SIZE, - prot); + va = pv->pv_va; + pmap_protect(pv->pv_pmap, va, va + PAGE_SIZE, + VM_PROT_READ | VM_PROT_EXECUTE); + } - } - } else { - pmap_remove_all(m); - } - } + vm_page_flag_clear(m, PG_WRITEABLE); } /* From owner-p4-projects@FreeBSD.ORG Wed Apr 11 19:15:52 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 641F016A405; Wed, 11 Apr 2007 19:15:52 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EFC6F16A403 for ; Wed, 11 Apr 2007 19:15:51 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E67E613C44B for ; Wed, 11 Apr 2007 19:15:51 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3BJFpf8045225 for ; Wed, 11 Apr 2007 19:15:51 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3BJFpkU045222 for perforce@freebsd.org; Wed, 11 Apr 2007 19:15:51 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 11 Apr 2007 19:15:51 GMT Message-Id: <200704111915.l3BJFpkU045222@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 117916 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Apr 2007 19:15:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=117916 Change 117916 by gonzo@gonzo_jeeves on 2007/04/11 19:15:23 o In the case of "closest symbol detected" report offset from the match as well. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/db_trace.c#5 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/db_trace.c#5 (text+ko) ==== @@ -162,8 +162,8 @@ db_printf("0x%08x", pc); if(name != NULL) - db_printf(" in %s(stacksize=%d, ra saved at %d)\n", - name, stacksize, ra_stack_pos); + db_printf(" in %s+0x%x(stacksize=%d, ra saved at %d)\n", + name, offset, stacksize, ra_stack_pos); else db_printf(" in %p(stacksize=%d, ra saved at %d)\n", (void *)func, stacksize, ra_stack_pos); From owner-p4-projects@FreeBSD.ORG Wed Apr 11 20:03:13 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF81F16A408; Wed, 11 Apr 2007 20:03:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5F0C716A404 for ; Wed, 11 Apr 2007 20:03:13 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 52EA213C4BD for ; Wed, 11 Apr 2007 20:03:13 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3BK3Dpc053776 for ; Wed, 11 Apr 2007 20:03:13 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3BK2gVM052576 for perforce@freebsd.org; Wed, 11 Apr 2007 20:02:42 GMT (envelope-from peter@freebsd.org) Date: Wed, 11 Apr 2007 20:02:42 GMT Message-Id: <200704112002.l3BK2gVM052576@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 117919 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Apr 2007 20:03:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=117919 Change 117919 by peter@peter_overcee on 2007/04/11 20:02:25 IFC @117918 Affected files ... .. //depot/projects/hammer/MAINTAINERS#43 integrate .. //depot/projects/hammer/Makefile#41 integrate .. //depot/projects/hammer/Makefile.inc1#121 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#24 integrate .. //depot/projects/hammer/UPDATING#99 integrate .. //depot/projects/hammer/bin/df/df.c#22 integrate .. //depot/projects/hammer/cddl/Makefile#1 branch .. //depot/projects/hammer/cddl/Makefile.inc#1 branch .. //depot/projects/hammer/cddl/lib/Makefile#1 branch .. //depot/projects/hammer/cddl/lib/Makefile.inc#1 branch .. //depot/projects/hammer/cddl/lib/libavl/Makefile#1 branch .. //depot/projects/hammer/cddl/lib/libnvpair/Makefile#1 branch .. //depot/projects/hammer/cddl/lib/libumem/Makefile#1 branch .. //depot/projects/hammer/cddl/lib/libuutil/Makefile#1 branch .. //depot/projects/hammer/cddl/lib/libzfs/Makefile#1 branch .. //depot/projects/hammer/cddl/lib/libzpool/Makefile#1 branch .. //depot/projects/hammer/cddl/sbin/Makefile#1 branch .. //depot/projects/hammer/cddl/sbin/Makefile.inc#1 branch .. //depot/projects/hammer/cddl/sbin/zfs/Makefile#1 branch .. //depot/projects/hammer/cddl/sbin/zpool/Makefile#1 branch .. //depot/projects/hammer/cddl/usr.bin/Makefile#1 branch .. //depot/projects/hammer/cddl/usr.bin/Makefile.inc#1 branch .. //depot/projects/hammer/cddl/usr.bin/ztest/Makefile#1 branch .. //depot/projects/hammer/cddl/usr.sbin/Makefile#1 branch .. //depot/projects/hammer/cddl/usr.sbin/Makefile.inc#1 branch .. //depot/projects/hammer/cddl/usr.sbin/zdb/Makefile#1 branch .. //depot/projects/hammer/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/hammer/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/hammer/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/hammer/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/hammer/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/hammer/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/hammer/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/hammer/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/hammer/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/hammer/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/hammer/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/hammer/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/hammer/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/hammer/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/hammer/contrib/amd/hlfsd/hlfsd.h#4 integrate .. //depot/projects/hammer/contrib/binutils/gas/as.h#4 integrate .. //depot/projects/hammer/contrib/binutils/gas/tc.h#3 integrate .. //depot/projects/hammer/contrib/bzip2/CHANGES#3 integrate .. //depot/projects/hammer/contrib/bzip2/FREEBSD-upgrade#3 integrate .. //depot/projects/hammer/contrib/bzip2/LICENSE#3 integrate .. //depot/projects/hammer/contrib/bzip2/Makefile#3 integrate .. //depot/projects/hammer/contrib/bzip2/Makefile-libbz2_so#3 integrate .. //depot/projects/hammer/contrib/bzip2/README#3 integrate .. //depot/projects/hammer/contrib/bzip2/README.COMPILATION.PROBLEMS#3 integrate .. //depot/projects/hammer/contrib/bzip2/Y2K_INFO#2 delete .. //depot/projects/hammer/contrib/bzip2/blocksort.c#3 integrate .. //depot/projects/hammer/contrib/bzip2/bzip2.1#3 integrate .. //depot/projects/hammer/contrib/bzip2/bzip2.c#4 integrate .. //depot/projects/hammer/contrib/bzip2/bzip2recover.c#3 integrate .. //depot/projects/hammer/contrib/bzip2/bzlib.c#4 integrate .. //depot/projects/hammer/contrib/bzip2/bzlib.h#3 integrate .. //depot/projects/hammer/contrib/bzip2/bzlib_private.h#3 integrate .. //depot/projects/hammer/contrib/bzip2/compress.c#3 integrate .. //depot/projects/hammer/contrib/bzip2/crctable.c#3 integrate .. //depot/projects/hammer/contrib/bzip2/decompress.c#3 integrate .. //depot/projects/hammer/contrib/bzip2/dlltest.c#2 integrate .. //depot/projects/hammer/contrib/bzip2/huffman.c#3 integrate .. //depot/projects/hammer/contrib/bzip2/manual.texi#2 delete .. //depot/projects/hammer/contrib/bzip2/randtable.c#3 integrate .. //depot/projects/hammer/contrib/bzip2/sample1.bz2.uu#3 integrate .. //depot/projects/hammer/contrib/bzip2/sample1.ref.gz.uu#3 integrate .. //depot/projects/hammer/contrib/bzip2/sample2.bz2.uu#3 integrate .. //depot/projects/hammer/contrib/bzip2/sample2.ref.gz.uu#3 integrate .. //depot/projects/hammer/contrib/bzip2/sample3.bz2.uu#3 integrate .. //depot/projects/hammer/contrib/bzip2/sample3.ref.gz.uu#3 integrate .. //depot/projects/hammer/contrib/bzip2/spewG.c#2 integrate .. //depot/projects/hammer/contrib/bzip2/unzcrash.c#2 integrate .. //depot/projects/hammer/contrib/bzip2/words0#2 integrate .. //depot/projects/hammer/contrib/bzip2/words2#2 integrate .. //depot/projects/hammer/contrib/bzip2/words3#2 integrate .. //depot/projects/hammer/contrib/netcat/nc.1#5 integrate .. //depot/projects/hammer/contrib/netcat/netcat.c#3 integrate .. //depot/projects/hammer/contrib/netcat/socks.c#3 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_readline.c#3 integrate .. //depot/projects/hammer/contrib/opensolaris/cmd/zdb/zdb.8#1 branch .. //depot/projects/hammer/contrib/opensolaris/cmd/zdb/zdb.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/cmd/zfs/zfs.8#1 branch .. //depot/projects/hammer/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch .. //depot/projects/hammer/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch .. //depot/projects/hammer/contrib/opensolaris/cmd/zpool/zpool.8#1 branch .. //depot/projects/hammer/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch .. //depot/projects/hammer/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/cmd/ztest/ztest.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/head/assert.h#1 branch .. //depot/projects/hammer/contrib/opensolaris/head/atomic.h#1 branch .. //depot/projects/hammer/contrib/opensolaris/head/libintl.h#1 branch .. //depot/projects/hammer/contrib/opensolaris/head/stdio_ext.h#1 branch .. //depot/projects/hammer/contrib/opensolaris/head/synch.h#1 branch .. //depot/projects/hammer/contrib/opensolaris/head/thread.h#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libzpool/common/util.c#1 branch .. //depot/projects/hammer/contrib/sendmail/FREEBSD-upgrade#16 integrate .. //depot/projects/hammer/contrib/sendmail/KNOWNBUGS#5 integrate .. //depot/projects/hammer/contrib/sendmail/PGPKEYS#8 integrate .. //depot/projects/hammer/contrib/sendmail/RELEASE_NOTES#13 integrate .. //depot/projects/hammer/contrib/sendmail/cf/README#11 integrate .. //depot/projects/hammer/contrib/sendmail/cf/cf/knecht.mc#4 integrate .. //depot/projects/hammer/contrib/sendmail/cf/cf/submit.cf#13 integrate .. //depot/projects/hammer/contrib/sendmail/cf/feature/access_db.m4#3 integrate .. //depot/projects/hammer/contrib/sendmail/cf/feature/badmx.m4#1 branch .. //depot/projects/hammer/contrib/sendmail/cf/feature/block_bad_helo.m4#1 branch .. //depot/projects/hammer/contrib/sendmail/cf/feature/dnsbl.m4#5 integrate .. //depot/projects/hammer/contrib/sendmail/cf/feature/enhdnsbl.m4#4 integrate .. //depot/projects/hammer/contrib/sendmail/cf/feature/require_rdns.m4#1 branch .. //depot/projects/hammer/contrib/sendmail/cf/m4/proto.m4#11 integrate .. //depot/projects/hammer/contrib/sendmail/cf/m4/version.m4#13 integrate .. //depot/projects/hammer/contrib/sendmail/cf/mailer/smtp.m4#2 integrate .. //depot/projects/hammer/contrib/sendmail/contrib/cidrexpand#5 integrate .. //depot/projects/hammer/contrib/sendmail/contrib/qtool.pl#3 integrate .. //depot/projects/hammer/contrib/sendmail/doc/op/op.me#10 integrate .. //depot/projects/hammer/contrib/sendmail/editmap/Makefile.m4#3 integrate .. //depot/projects/hammer/contrib/sendmail/include/libmilter/mfapi.h#7 integrate .. //depot/projects/hammer/contrib/sendmail/include/libmilter/mfdef.h#5 integrate .. //depot/projects/hammer/contrib/sendmail/include/libmilter/milter.h#5 integrate .. //depot/projects/hammer/contrib/sendmail/include/sm/conf.h#11 integrate .. //depot/projects/hammer/contrib/sendmail/include/sm/errstring.h#4 integrate .. //depot/projects/hammer/contrib/sendmail/include/sm/heap.h#2 integrate .. //depot/projects/hammer/contrib/sendmail/include/sm/ldap.h#4 integrate .. //depot/projects/hammer/contrib/sendmail/include/sm/misc.h#1 branch .. //depot/projects/hammer/contrib/sendmail/include/sm/os/sm_os_qnx.h#1 branch .. //depot/projects/hammer/contrib/sendmail/include/sm/sendmail.h#1 branch .. //depot/projects/hammer/contrib/sendmail/include/sm/tailq.h#1 branch .. //depot/projects/hammer/contrib/sendmail/libmilter/Makefile#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/Makefile.m4#3 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/README#6 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/comm.c#6 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/api.html#4 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/design.html#4 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/index.html#4 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/installation.html#4 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/other.html#4 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/overview.html#4 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/sample.html#5 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_addheader.html#4 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_addrcpt.html#5 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_addrcpt_par.html#1 branch .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_chgfrom.html#1 branch .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_chgheader.html#5 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_delrcpt.html#5 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_getpriv.html#4 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_getsymval.html#4 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_insheader.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_main.html#4 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_opensocket.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_progress.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_quarantine.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_register.html#5 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_replacebody.html#4 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_setbacklog.html#4 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_setconn.html#5 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_setdbg.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_setmlreply.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_setpriv.html#4 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_setreply.html#7 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_setsymlist.html#1 branch .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_settimeout.html#5 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_stop.html#3 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_version.html#1 branch .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/xxfi_abort.html#4 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/xxfi_body.html#4 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/xxfi_close.html#4 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/xxfi_connect.html#5 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/xxfi_data.html#1 branch .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/xxfi_envfrom.html#4 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html#5 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/xxfi_eoh.html#4 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/xxfi_eom.html#4 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/xxfi_header.html#5 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/xxfi_helo.html#5 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/xxfi_negotiate.html#1 branch .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/xxfi_unknown.html#1 branch .. //depot/projects/hammer/contrib/sendmail/libmilter/engine.c#9 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/example.c#1 branch .. //depot/projects/hammer/contrib/sendmail/libmilter/handler.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/libmilter.h#7 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/listener.c#9 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/main.c#5 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/monitor.c#1 branch .. //depot/projects/hammer/contrib/sendmail/libmilter/smfi.c#5 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/worker.c#1 branch .. //depot/projects/hammer/contrib/sendmail/libsm/Makefile#2 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/Makefile.m4#6 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/config.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/exc.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/exc.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/findfp.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/flags.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/ldap.c#9 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/local.h#6 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/memstat.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/snprintf.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/t-memstat.c#3 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/t-qic.c#1 branch .. //depot/projects/hammer/contrib/sendmail/libsm/t-sem.c#3 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/util.c#1 branch .. //depot/projects/hammer/contrib/sendmail/libsm/vfscanf.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/libsmdb/Makefile.m4#3 integrate .. //depot/projects/hammer/contrib/sendmail/libsmutil/Makefile.m4#3 integrate .. //depot/projects/hammer/contrib/sendmail/mail.local/Makefile.m4#4 integrate .. //depot/projects/hammer/contrib/sendmail/mail.local/mail.local.c#8 integrate .. //depot/projects/hammer/contrib/sendmail/mailstats/Makefile.m4#3 integrate .. //depot/projects/hammer/contrib/sendmail/makemap/Makefile.m4#3 integrate .. //depot/projects/hammer/contrib/sendmail/praliases/Makefile.m4#3 integrate .. //depot/projects/hammer/contrib/sendmail/rmail/Makefile.m4#3 integrate .. //depot/projects/hammer/contrib/sendmail/smrsh/Makefile.m4#3 integrate .. //depot/projects/hammer/contrib/sendmail/src/Makefile#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/Makefile.m4#5 integrate .. //depot/projects/hammer/contrib/sendmail/src/README#11 integrate .. //depot/projects/hammer/contrib/sendmail/src/TRACEFLAGS#8 integrate .. //depot/projects/hammer/contrib/sendmail/src/TUNING#4 integrate .. //depot/projects/hammer/contrib/sendmail/src/alias.c#5 integrate .. //depot/projects/hammer/contrib/sendmail/src/arpadate.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/collect.c#11 integrate .. //depot/projects/hammer/contrib/sendmail/src/conf.c#13 integrate .. //depot/projects/hammer/contrib/sendmail/src/conf.h#6 integrate .. //depot/projects/hammer/contrib/sendmail/src/control.c#6 integrate .. //depot/projects/hammer/contrib/sendmail/src/daemon.c#10 integrate .. //depot/projects/hammer/contrib/sendmail/src/daemon.h#1 branch .. //depot/projects/hammer/contrib/sendmail/src/deliver.c#12 integrate .. //depot/projects/hammer/contrib/sendmail/src/domain.c#9 integrate .. //depot/projects/hammer/contrib/sendmail/src/envelope.c#7 integrate .. //depot/projects/hammer/contrib/sendmail/src/err.c#5 integrate .. //depot/projects/hammer/contrib/sendmail/src/headers.c#12 integrate .. //depot/projects/hammer/contrib/sendmail/src/helpfile#5 integrate .. //depot/projects/hammer/contrib/sendmail/src/macro.c#3 integrate .. //depot/projects/hammer/contrib/sendmail/src/mailq.1#5 integrate .. //depot/projects/hammer/contrib/sendmail/src/main.c#11 integrate .. //depot/projects/hammer/contrib/sendmail/src/map.c#10 integrate .. //depot/projects/hammer/contrib/sendmail/src/map.h#1 branch .. //depot/projects/hammer/contrib/sendmail/src/mci.c#10 integrate .. //depot/projects/hammer/contrib/sendmail/src/milter.c#11 integrate .. //depot/projects/hammer/contrib/sendmail/src/mime.c#8 integrate .. //depot/projects/hammer/contrib/sendmail/src/parseaddr.c#11 integrate .. //depot/projects/hammer/contrib/sendmail/src/queue.c#13 integrate .. //depot/projects/hammer/contrib/sendmail/src/ratectrl.c#3 integrate .. //depot/projects/hammer/contrib/sendmail/src/readcf.c#10 integrate .. //depot/projects/hammer/contrib/sendmail/src/recipient.c#7 integrate .. //depot/projects/hammer/contrib/sendmail/src/sasl.c#6 integrate .. //depot/projects/hammer/contrib/sendmail/src/savemail.c#8 integrate .. //depot/projects/hammer/contrib/sendmail/src/sendmail.h#12 integrate .. //depot/projects/hammer/contrib/sendmail/src/sm_resolve.c#5 integrate .. //depot/projects/hammer/contrib/sendmail/src/srvrsmtp.c#13 integrate .. //depot/projects/hammer/contrib/sendmail/src/stab.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/src/stats.c#3 integrate .. //depot/projects/hammer/contrib/sendmail/src/timers.c#3 integrate .. //depot/projects/hammer/contrib/sendmail/src/tls.c#10 integrate .. //depot/projects/hammer/contrib/sendmail/src/udb.c#6 integrate .. //depot/projects/hammer/contrib/sendmail/src/usersmtp.c#10 integrate .. //depot/projects/hammer/contrib/sendmail/src/util.c#9 integrate .. //depot/projects/hammer/contrib/sendmail/src/version.c#13 integrate .. //depot/projects/hammer/contrib/sendmail/test/Makefile#2 integrate .. //depot/projects/hammer/contrib/sendmail/vacation/Makefile.m4#3 integrate .. //depot/projects/hammer/contrib/sendmail/vacation/vacation.c#6 integrate .. //depot/projects/hammer/contrib/tcpdump/print-stp.c#6 integrate .. //depot/projects/hammer/contrib/tcsh/sh.lex.c#5 integrate .. //depot/projects/hammer/etc/defaults/periodic.conf#19 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#75 integrate .. //depot/projects/hammer/etc/devd.conf#29 integrate .. //depot/projects/hammer/etc/mtree/BSD.root.dist#18 integrate .. //depot/projects/hammer/etc/network.subr#18 integrate .. //depot/projects/hammer/etc/periodic/daily/404.status-zfs#1 branch .. //depot/projects/hammer/etc/periodic/daily/Makefile#6 integrate .. //depot/projects/hammer/etc/rc#20 integrate .. //depot/projects/hammer/etc/rc.d/FILESYSTEMS#1 branch .. //depot/projects/hammer/etc/rc.d/Makefile#52 integrate .. //depot/projects/hammer/etc/rc.d/NETWORKING#11 integrate .. //depot/projects/hammer/etc/rc.d/addswap#6 integrate .. //depot/projects/hammer/etc/rc.d/adjkerntz#6 integrate .. //depot/projects/hammer/etc/rc.d/bootconf.sh#5 integrate .. //depot/projects/hammer/etc/rc.d/cleanvar#11 integrate .. //depot/projects/hammer/etc/rc.d/geli2#2 integrate .. //depot/projects/hammer/etc/rc.d/hostid#1 branch .. //depot/projects/hammer/etc/rc.d/hostname#9 integrate .. //depot/projects/hammer/etc/rc.d/ip6addrctl#5 integrate .. //depot/projects/hammer/etc/rc.d/ip6fw#9 integrate .. //depot/projects/hammer/etc/rc.d/ipfilter#22 integrate .. //depot/projects/hammer/etc/rc.d/ipfw#14 integrate .. //depot/projects/hammer/etc/rc.d/ipmon#12 integrate .. //depot/projects/hammer/etc/rc.d/ipsec#11 integrate .. //depot/projects/hammer/etc/rc.d/isdnd#12 integrate .. //depot/projects/hammer/etc/rc.d/kldxref#5 integrate .. //depot/projects/hammer/etc/rc.d/mountcritremote#13 integrate .. //depot/projects/hammer/etc/rc.d/mountd#9 integrate .. //depot/projects/hammer/etc/rc.d/netif#19 integrate .. //depot/projects/hammer/etc/rc.d/netoptions#6 integrate .. //depot/projects/hammer/etc/rc.d/nfslocking#8 integrate .. //depot/projects/hammer/etc/rc.d/pf#14 integrate .. //depot/projects/hammer/etc/rc.d/pflog#10 integrate .. //depot/projects/hammer/etc/rc.d/pfsync#3 integrate .. //depot/projects/hammer/etc/rc.d/power_profile#10 integrate .. //depot/projects/hammer/etc/rc.d/ppp#5 integrate .. //depot/projects/hammer/etc/rc.d/var#7 integrate .. //depot/projects/hammer/etc/rc.d/zfs#1 branch .. //depot/projects/hammer/etc/rc.firewall#6 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#65 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes-o.real#6 integrate .. //depot/projects/hammer/include/stdio.h#12 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#39 integrate .. //depot/projects/hammer/lib/libarchive/archive.h.in#16 integrate .. //depot/projects/hammer/lib/libarchive/archive_check_magic.c#7 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.c#28 integrate .. //depot/projects/hammer/lib/libarchive/archive_private.h#24 integrate .. //depot/projects/hammer/lib/libarchive/archive_read.3#23 integrate .. //depot/projects/hammer/lib/libarchive/archive_read.c#20 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_data_into_buffer.c#7 delete .. //depot/projects/hammer/lib/libarchive/archive_read_data_into_fd.c#14 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#32 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_open_memory.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_private.h#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_bzip2.c#12 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_compress.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_gzip.c#12 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_none.c#11 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_all.c#9 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_ar.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_iso9660.c#13 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#31 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_disk.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_ar.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_ustar.c#15 integrate .. //depot/projects/hammer/lib/libarchive/libarchive-formats.5#13 integrate .. //depot/projects/hammer/lib/libarchive/test/Makefile#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_ar.c#1 branch .. //depot/projects/hammer/lib/libarchive/test/test_write_format_ar.c#1 branch .. //depot/projects/hammer/lib/libatm/cache_key.c#4 integrate .. //depot/projects/hammer/lib/libc/amd64/stdlib/Makefile.inc#3 branch .. //depot/projects/hammer/lib/libc/amd64/stdlib/div.S#3 branch .. //depot/projects/hammer/lib/libc/amd64/stdlib/ldiv.S#3 branch .. //depot/projects/hammer/lib/libc/amd64/stdlib/lldiv.S#1 branch .. //depot/projects/hammer/lib/libc/gen/Symbol.map#3 integrate .. //depot/projects/hammer/lib/libc/gen/dlfcn.c#7 integrate .. //depot/projects/hammer/lib/libc/gen/getvfsbyname.3#5 integrate .. //depot/projects/hammer/lib/libc/gen/sysctl.3#11 integrate .. //depot/projects/hammer/lib/libc/gen/valloc.3#5 integrate .. //depot/projects/hammer/lib/libc/i386/Symbol.map#2 integrate .. //depot/projects/hammer/lib/libc/resolv/Symbol.map#4 integrate .. //depot/projects/hammer/lib/libc/resolv/res_debug.c#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.3#14 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#35 integrate .. //depot/projects/hammer/lib/libc/stdlib/posix_memalign.3#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/strtol.3#7 integrate .. //depot/projects/hammer/lib/libc/sys/lseek.2#6 integrate .. //depot/projects/hammer/lib/libc/sys/pathconf.2#8 integrate .. //depot/projects/hammer/lib/libc/sys/ptrace.2#9 integrate .. //depot/projects/hammer/lib/libc/uuid/uuid_compare.c#5 integrate .. //depot/projects/hammer/lib/libcrypt/crypt.3#8 integrate .. //depot/projects/hammer/lib/libgssapi/gss_accept_sec_context.c#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_add_cred.c#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_add_oid_set_member.c#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_canonicalize_name.c#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_display_name.c#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_duplicate_name.c#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_export_sec_context.c#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_import_name.c#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_init_sec_context.c#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_inquire_cred.c#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_names.c#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_utils.c#2 integrate .. //depot/projects/hammer/lib/libmilter/Makefile#6 integrate .. //depot/projects/hammer/lib/libradius/radlib.c#4 integrate .. //depot/projects/hammer/lib/libsm/Makefile#11 integrate .. //depot/projects/hammer/lib/libstand/environment.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_info.c#9 integrate .. //depot/projects/hammer/lib/libypclnt/Makefile#9 integrate .. //depot/projects/hammer/lib/libypclnt/ypclnt.3#2 delete .. //depot/projects/hammer/libexec/rtld-elf/Makefile#16 integrate .. //depot/projects/hammer/libexec/rtld-elf/Symbol.map#1 branch .. //depot/projects/hammer/libexec/rtld-elf/Versions.def#1 branch .. //depot/projects/hammer/libexec/rtld-elf/i386/Symbol.map#1 branch .. //depot/projects/hammer/libexec/rtld-elf/map_object.c#11 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#37 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.h#11 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld_lock.c#4 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#5 integrate .. //depot/projects/hammer/sbin/dump/traverse.c#12 integrate .. //depot/projects/hammer/sbin/gbde/test.sh#5 integrate .. //depot/projects/hammer/sbin/geom/class/journal/geom_journal.c#2 integrate .. //depot/projects/hammer/sbin/ggate/ggatec/Makefile#5 integrate .. //depot/projects/hammer/sbin/ggate/shared/ggate.c#6 integrate .. //depot/projects/hammer/sbin/ifconfig/Makefile#10 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#40 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#29 integrate .. //depot/projects/hammer/sbin/ifconfig/iftrunk.c#1 branch .. //depot/projects/hammer/share/man/man3/pthread_cond_timedwait.3#3 integrate .. //depot/projects/hammer/share/man/man3/pthread_cond_wait.3#4 integrate .. //depot/projects/hammer/share/man/man4/Makefile#88 integrate .. //depot/projects/hammer/share/man/man4/if_bridge.4#14 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#36 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_aiboost.4#1 branch .. //depot/projects/hammer/share/man/man4/mpt.4#10 integrate .. //depot/projects/hammer/share/man/man4/nfe.4#3 integrate .. //depot/projects/hammer/share/man/man4/pci.4#7 integrate .. //depot/projects/hammer/share/man/man4/polling.4#20 integrate .. //depot/projects/hammer/share/man/man4/tcp.4#19 integrate .. //depot/projects/hammer/share/man/man4/trunk.4#1 branch .. //depot/projects/hammer/share/man/man4/watchdog.4#7 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#78 integrate .. //depot/projects/hammer/share/man/man5/src.conf.5#7 integrate .. //depot/projects/hammer/share/man/man7/hier.7#31 integrate .. //depot/projects/hammer/share/man/man9/Makefile#68 integrate .. //depot/projects/hammer/share/man/man9/VFS_SET.9#8 integrate .. //depot/projects/hammer/share/man/man9/condvar.9#8 integrate .. //depot/projects/hammer/share/man/man9/hash.9#3 integrate .. //depot/projects/hammer/share/man/man9/lock.9#7 integrate .. //depot/projects/hammer/share/man/man9/mtx_pool.9#6 integrate .. //depot/projects/hammer/share/man/man9/mutex.9#18 integrate .. //depot/projects/hammer/share/man/man9/rwlock.9#5 integrate .. //depot/projects/hammer/share/man/man9/sema.9#5 integrate .. //depot/projects/hammer/share/man/man9/sleep.9#14 integrate .. //depot/projects/hammer/share/man/man9/sx.9#14 integrate .. //depot/projects/hammer/share/man/man9/vhold.9#4 integrate .. //depot/projects/hammer/share/man/man9/watchdog.9#5 integrate .. //depot/projects/hammer/share/misc/Makefile#5 integrate .. //depot/projects/hammer/share/misc/committers-doc.dot#1 branch .. //depot/projects/hammer/share/misc/committers-ports.dot#1 branch .. //depot/projects/hammer/share/misc/committers-src.dot#1 branch .. //depot/projects/hammer/share/mk/Makefile#9 integrate .. //depot/projects/hammer/share/mk/bsd.lib.mk#30 integrate .. //depot/projects/hammer/share/mk/bsd.libnames.mk#34 integrate .. //depot/projects/hammer/share/mk/bsd.own.mk#15 integrate .. //depot/projects/hammer/share/mk/bsd.symver.mk#1 branch .. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#38 integrate .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#44 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#158 integrate .. //depot/projects/hammer/sys/amd64/amd64/support.S#36 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#93 integrate .. //depot/projects/hammer/sys/amd64/include/pcb.h#26 integrate .. //depot/projects/hammer/sys/amd64/include/segments.h#20 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_locore.s#2 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_machdep.c#15 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_proto.h#11 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_syscall.h#11 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysent.c#11 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysvec.c#15 integrate .. //depot/projects/hammer/sys/amd64/linux32/syscalls.master#11 integrate .. //depot/projects/hammer/sys/arm/at91/uart_cpu_at91rm9200usart.c#3 integrate .. //depot/projects/hammer/sys/arm/at91/uart_dev_at91usart.c#7 integrate .. //depot/projects/hammer/sys/arm/sa11x0/uart_cpu_sa1110.c#4 integrate .. //depot/projects/hammer/sys/arm/sa11x0/uart_dev_sa1110.c#6 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/uart_cpu_i80321.c#5 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#2 integrate .. //depot/projects/hammer/sys/boot/arm/at91/boot2/boot2.c#3 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#33 integrate .. //depot/projects/hammer/sys/boot/pc98/boot0.5/Makefile#4 integrate .. //depot/projects/hammer/sys/boot/pc98/boot0.5/boot0.5.s#3 integrate .. //depot/projects/hammer/sys/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/hammer/sys/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/hammer/sys/boot/pc98/boot0.5/selector.s#2 integrate .. //depot/projects/hammer/sys/boot/pc98/boot0.5/start.s#3 integrate .. //depot/projects/hammer/sys/boot/pc98/boot2/boot.c#9 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_sg.c#1 branch .. //depot/projects/hammer/sys/cam/scsi/scsi_sg.h#1 branch .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#34 integrate .. //depot/projects/hammer/sys/compat/linux/linux_emul.c#5 integrate .. //depot/projects/hammer/sys/compat/linux/linux_emul.h#3 integrate .. //depot/projects/hammer/sys/compat/linux/linux_file.c#20 integrate .. //depot/projects/hammer/sys/compat/linux/linux_futex.c#3 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#31 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.h#12 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#40 integrate .. //depot/projects/hammer/sys/compat/ndis/ndis_var.h#26 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#41 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_pe.c#10 integrate .. //depot/projects/hammer/sys/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/hammer/sys/compat/svr4/svr4_filio.c#13 integrate .. //depot/projects/hammer/sys/conf/NOTES#116 integrate .. //depot/projects/hammer/sys/conf/files#148 integrate .. //depot/projects/hammer/sys/conf/files.amd64#89 integrate .. //depot/projects/hammer/sys/conf/files.i386#75 integrate .. //depot/projects/hammer/sys/conf/files.ia64#38 integrate .. //depot/projects/hammer/sys/conf/files.pc98#58 integrate .. //depot/projects/hammer/sys/conf/files.powerpc#22 integrate .. //depot/projects/hammer/sys/conf/options#103 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utmisc.c#13 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/dnlc.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/atomic.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/dnlc.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/vfs.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#37 integrate .. //depot/projects/hammer/sys/dev/ahb/ahb.c#15 integrate .. //depot/projects/hammer/sys/dev/arcmsr/arcmsr.c#10 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.h#43 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#76 integrate .. //depot/projects/hammer/sys/dev/ata/ata-dma.c#28 integrate .. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#38 integrate .. //depot/projects/hammer/sys/dev/ata/ata_if.m#4 integrate .. //depot/projects/hammer/sys/dev/ath/ah_osdep.c#2 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#72 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_lro.c#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/sys/mvec.h#1 branch .. //depot/projects/hammer/sys/dev/cxgb/sys/uipc_mvec.c#1 branch .. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#34 integrate .. //depot/projects/hammer/sys/dev/firewire/firewire.c#33 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#37 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pccard.c#12 integrate .. //depot/projects/hammer/sys/dev/ipmi/ipmi_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/isp/isp_freebsd.c#26 integrate .. //depot/projects/hammer/sys/dev/isp/isp_freebsd.h#20 integrate .. //depot/projects/hammer/sys/dev/isp/isp_library.c#6 integrate .. //depot/projects/hammer/sys/dev/isp/isp_library.h#5 integrate .. //depot/projects/hammer/sys/dev/isp/isp_pci.c#27 integrate .. //depot/projects/hammer/sys/dev/isp/isp_sbus.c#17 integrate .. //depot/projects/hammer/sys/dev/mii/brgphy.c#29 integrate .. //depot/projects/hammer/sys/dev/mii/miidevs#16 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_cam.c#13 integrate .. //depot/projects/hammer/sys/dev/msk/if_msk.c#4 integrate .. //depot/projects/hammer/sys/dev/mxge/if_mxge.c#6 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#59 integrate .. //depot/projects/hammer/sys/dev/pci/pci_pci.c#20 integrate .. //depot/projects/hammer/sys/dev/pci/pcireg.h#16 integrate .. //depot/projects/hammer/sys/dev/sk/if_sk.c#6 integrate .. //depot/projects/hammer/sys/dev/sk/if_skreg.h#4 integrate .. //depot/projects/hammer/sys/dev/sound/midi/midi.c#9 integrate .. //depot/projects/hammer/sys/dev/sound/pci/cmi.c#20 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/channel.c#23 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/mixer.c#22 integrate .. //depot/projects/hammer/sys/dev/sound/usb/uaudio.c#14 integrate .. //depot/projects/hammer/sys/dev/streams/streams.c#14 integrate .. //depot/projects/hammer/sys/dev/uart/uart.h#6 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus.h#12 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/uart/uart_core.c#17 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu.h#9 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_amd64.c#9 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_i386.c#9 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_ia64.c#10 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_pc98.c#11 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_powerpc.c#3 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_sparc64.c#19 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_ns8250.c#16 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_sab82532.c#13 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_z8530.c#17 integrate .. //depot/projects/hammer/sys/dev/uart/uart_kbd_sun.c#10 integrate .. //depot/projects/hammer/sys/dev/uart/uart_subr.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/if_aue.c#33 integrate .. //depot/projects/hammer/sys/dev/usb/if_axe.c#30 integrate .. //depot/projects/hammer/sys/dev/usb/if_ural.c#19 integrate .. //depot/projects/hammer/sys/dev/usb/ubser.c#15 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#47 integrate .. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vfsops.c#16 integrate .. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vnops.c#19 integrate .. //depot/projects/hammer/sys/fs/fifofs/fifo_vnops.c#37 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs.c#13 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs.h#11 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_subr.c#21 integrate .. //depot/projects/hammer/sys/geom/eli/g_eli.c#15 integrate .. //depot/projects/hammer/sys/geom/geom_ctl.c#23 integrate .. //depot/projects/hammer/sys/geom/journal/g_journal.c#3 integrate .. //depot/projects/hammer/sys/geom/uzip/g_uzip.c#10 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/mrlock.c#2 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/mrlock.h#2 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_machdep.c#27 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#50 integrate .. //depot/projects/hammer/sys/i386/i386/identcpu.c#38 integrate .. //depot/projects/hammer/sys/i386/i386/initcpu.c#18 integrate .. //depot/projects/hammer/sys/i386/i386/minidump_machdep.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#90 integrate .. //depot/projects/hammer/sys/i386/i386/support.s#14 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#52 integrate .. //depot/projects/hammer/sys/i386/include/pmap.h#29 integrate .. //depot/projects/hammer/sys/i386/include/specialreg.h#13 integrate .. //depot/projects/hammer/sys/i386/include/vmparam.h#9 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#29 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#8 integrate .. //depot/projects/hammer/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#8 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_avm_a1.c#7 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_isic_pnp.c#9 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_itk_ix1.c#7 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_tel_s016.c#8 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_tel_s0163.c#7 integrate .. //depot/projects/hammer/sys/ia64/conf/GENERIC#28 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#64 integrate .. //depot/projects/hammer/sys/kern/kern_event.c#44 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#59 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#22 integrate .. //depot/projects/hammer/sys/kern/kern_lock.c#28 integrate .. //depot/projects/hammer/sys/kern/kern_mbuf.c#22 integrate .. //depot/projects/hammer/sys/kern/kern_mib.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_mutex.c#43 integrate .. //depot/projects/hammer/sys/kern/kern_rwlock.c#7 integrate .. //depot/projects/hammer/sys/kern/kern_sx.c#13 integrate .. //depot/projects/hammer/sys/kern/subr_lock.c#5 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#60 integrate .. //depot/projects/hammer/sys/kern/sys_generic.c#29 integrate .. //depot/projects/hammer/sys/kern/uipc_mqueue.c#9 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#60 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#48 integrate .. //depot/projects/hammer/sys/kern/vfs_cache.c#20 integrate .. //depot/projects/hammer/sys/kern/vfs_lookup.c#26 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#75 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#110 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#64 integrate .. //depot/projects/hammer/sys/libkern/index.c#5 integrate .. //depot/projects/hammer/sys/libkern/memset.c#1 branch .. //depot/projects/hammer/sys/libkern/rindex.c#6 integrate .. //depot/projects/hammer/sys/modules/Makefile#105 integrate .. //depot/projects/hammer/sys/modules/cam/Makefile#11 integrate .. //depot/projects/hammer/sys/modules/cryptodev/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/dpt/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/if_trunk/Makefile#1 branch .. //depot/projects/hammer/sys/modules/libalias/libalias/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/zfs/Makefile#1 branch .. //depot/projects/hammer/sys/net/ieee8023ad_lacp.c#1 branch .. //depot/projects/hammer/sys/net/ieee8023ad_lacp.h#1 branch .. //depot/projects/hammer/sys/net/if.c#67 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#60 integrate .. //depot/projects/hammer/sys/net/if_trunk.c#1 branch .. //depot/projects/hammer/sys/net/if_trunk.h#1 branch .. //depot/projects/hammer/sys/net/if_var.h#42 integrate .. //depot/projects/hammer/sys/netatm/atm_if.c#14 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#46 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#45 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.h#31 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#79 integrate .. //depot/projects/hammer/sys/netinet/ip_var.h#28 integrate .. //depot/projects/hammer/sys/netinet/libalias/alias_db.c#5 integrate .. //depot/projects/hammer/sys/netinet/libalias/alias_ftp.c#5 integrate .. //depot/projects/hammer/sys/netinet/libalias/alias_irc.c#5 integrate .. //depot/projects/hammer/sys/netinet/libalias/alias_proxy.c#5 integrate .. //depot/projects/hammer/sys/netinet/libalias/alias_skinny.c#5 integrate .. //depot/projects/hammer/sys/netinet/sctp_asconf.c#5 integrate .. //depot/projects/hammer/sys/netinet/sctp_auth.c#5 integrate .. //depot/projects/hammer/sys/netinet/sctp_bsd_addr.h#4 integrate .. //depot/projects/hammer/sys/netinet/sctp_constants.h#5 integrate .. //depot/projects/hammer/sys/netinet/sctp_indata.c#5 integrate .. //depot/projects/hammer/sys/netinet/sctp_input.c#5 integrate .. //depot/projects/hammer/sys/netinet/sctp_os_bsd.h#5 integrate .. //depot/projects/hammer/sys/netinet/sctp_output.c#5 integrate .. //depot/projects/hammer/sys/netinet/sctp_output.h#4 integrate .. //depot/projects/hammer/sys/netinet/sctp_pcb.c#5 integrate .. //depot/projects/hammer/sys/netinet/sctp_pcb.h#4 integrate .. //depot/projects/hammer/sys/netinet/sctp_structs.h#5 integrate .. //depot/projects/hammer/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/hammer/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/hammer/sys/netinet/sctp_timer.c#5 integrate .. //depot/projects/hammer/sys/netinet/sctp_uio.h#5 integrate .. //depot/projects/hammer/sys/netinet/sctp_usrreq.c#5 integrate .. //depot/projects/hammer/sys/netinet/sctputil.c#5 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#69 integrate .. //depot/projects/hammer/sys/netinet/tcp_output.c#39 integrate .. //depot/projects/hammer/sys/netinet/tcp_sack.c#27 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#61 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#39 integrate .. //depot/projects/hammer/sys/netinet/tcp_timer.c#24 integrate .. //depot/projects/hammer/sys/netinet/tcp_timer.h#10 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#43 integrate .. //depot/projects/hammer/sys/netinet/tcp_var.h#40 integrate .. //depot/projects/hammer/sys/netinet6/in6_src.c#20 integrate .. //depot/projects/hammer/sys/netinet6/ipsec.c#21 integrate .. //depot/projects/hammer/sys/netinet6/sctp6_usrreq.c#5 integrate .. //depot/projects/hammer/sys/netipsec/ipsec_osdep.h#5 integrate .. //depot/projects/hammer/sys/netsmb/smb_dev.c#15 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvsubs.c#25 integrate .. //depot/projects/hammer/sys/opencrypto/cryptodev.c#22 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#42 integrate .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#30 integrate .. //depot/projects/hammer/sys/powerpc/conf/NOTES#4 integrate .. //depot/projects/hammer/sys/powerpc/powermac/uninorth.c#13 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/extintr.c#4 delete .. //depot/projects/hammer/sys/rpc/types.h#1 branch .. //depot/projects/hammer/sys/security/audit/audit_bsm_klib.c#5 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#51 integrate .. //depot/projects/hammer/sys/sun4v/conf/GENERIC#3 integrate .. //depot/projects/hammer/sys/sun4v/include/smp.h#3 integrate .. //depot/projects/hammer/sys/sys/_sx.h#1 branch .. //depot/projects/hammer/sys/sys/elf_common.h#8 integrate .. //depot/projects/hammer/sys/sys/filedesc.h#18 integrate .. //depot/projects/hammer/sys/sys/filio.h#4 integrate .. //depot/projects/hammer/sys/sys/hash.h#2 integrate .. //depot/projects/hammer/sys/sys/jail.h#12 integrate .. //depot/projects/hammer/sys/sys/kernel.h#20 integrate .. //depot/projects/hammer/sys/sys/libkern.h#15 integrate .. //depot/projects/hammer/sys/sys/link_elf.h#4 integrate .. //depot/projects/hammer/sys/sys/lock.h#19 integrate .. //depot/projects/hammer/sys/sys/lock_profile.h#3 integrate .. //depot/projects/hammer/sys/sys/lockmgr.h#12 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#57 integrate .. //depot/projects/hammer/sys/sys/mount.h#49 integrate .. //depot/projects/hammer/sys/sys/mutex.h#27 integrate .. //depot/projects/hammer/sys/sys/param.h#83 integrate .. //depot/projects/hammer/sys/sys/priv.h#3 integrate .. //depot/projects/hammer/sys/sys/sleepqueue.h#10 integrate .. //depot/projects/hammer/sys/sys/sx.h#11 integrate .. //depot/projects/hammer/sys/sys/sysctl.h#31 integrate .. //depot/projects/hammer/sys/sys/sysent.h#10 integrate .. //depot/projects/hammer/sys/sys/systm.h#44 integrate .. //depot/projects/hammer/sys/sys/unistd.h#11 integrate .. //depot/projects/hammer/sys/sys/vnode.h#69 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#47 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#42 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#66 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#41 integrate .. //depot/projects/hammer/sys/vm/phys_pager.c#11 integrate .. //depot/projects/hammer/sys/vm/vm_fault.c#43 integrate .. //depot/projects/hammer/sys/vm/vm_kern.c#26 integrate .. //depot/projects/hammer/tools/build/mk/OptionalObsoleteFiles.inc#6 integrate .. //depot/projects/hammer/tools/build/options/WITHOUT_ZFS#1 branch .. //depot/projects/hammer/tools/regression/netinet/ipblock/Makefile#1 branch .. //depot/projects/hammer/tools/regression/netinet/ipblock/ipblock.c#1 branch .. //depot/projects/hammer/tools/regression/netinet/ipsockopt/ipsockopt.c#5 integrate .. //depot/projects/hammer/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c#6 integrate .. //depot/projects/hammer/tools/regression/sockets/socketpair/socketpair.c#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/sed/multitest.t#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/sed/regress.b2a.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/sed/regress.c0.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/sed/regress.c1.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/sed/regress.c2.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/sed/regress.c3.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/sed/regress.multitest.out/54_5.3#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/sed/regress.sh#5 integrate .. //depot/projects/hammer/tools/tools/net80211/wesside/wesside/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.c#1 branch .. //depot/projects/hammer/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.h#1 branch .. //depot/projects/hammer/tools/tools/net80211/wesside/wesside/wesside.c#2 integrate .. //depot/projects/hammer/usr.bin/bzip2/Makefile#5 integrate .. //depot/projects/hammer/usr.bin/bzip2/doc/Makefile#3 delete .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#51 integrate .. //depot/projects/hammer/usr.bin/gcore/elfcore.c#7 integrate .. //depot/projects/hammer/usr.bin/kdump/kdump.c#16 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 12 04:17:23 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3BD816A406; Thu, 12 Apr 2007 04:17:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8C6CE16A401 for ; Thu, 12 Apr 2007 04:17:23 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7FA1013C44C for ; Thu, 12 Apr 2007 04:17:23 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3C4HN37074392 for ; Thu, 12 Apr 2007 04:17:23 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3C4HNoJ074389 for perforce@freebsd.org; Thu, 12 Apr 2007 04:17:23 GMT (envelope-from scottl@freebsd.org) Date: Thu, 12 Apr 2007 04:17:23 GMT Message-Id: <200704120417.l3C4HNoJ074389@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 117938 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Apr 2007 04:17:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=117938 Change 117938 by scottl@scottl-y1 on 2007/04/12 04:17:03 Lock the SG periph. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sg.c#3 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sg.c#3 (text+ko) ==== @@ -410,10 +410,6 @@ if (periph == NULL) return (ENXIO); - softc = (struct sg_softc *)periph->softc; - if (softc->flags & SG_FLAG_INVALID) - return (ENXIO); - /* * Don't allow access when we're running at a high securelevel. */ @@ -421,13 +417,19 @@ if (error) return (error); - if ((error = cam_periph_lock(periph, PRIBIO | PCATCH)) != 0) - return (error); + cam_periph_lock(periph); + + softc = (struct sg_softc *)periph->softc; + if (softc->flags & SG_FLAG_INVALID) { + cam_periph_unlock(periph); + return (ENXIO); + } if ((softc->flags & SG_FLAG_OPEN) == 0) { - if (cam_periph_acquire(periph) != CAM_REQ_CMP) - return (ENXIO); softc->flags |= SG_FLAG_OPEN; + } else { + /* Device closes aren't symmetrical, fix up the refcount. */ + cam_periph_release(periph); } cam_periph_unlock(periph); @@ -440,17 +442,14 @@ { struct cam_periph *periph; struct sg_softc *softc; - int error; periph = (struct cam_periph *)dev->si_drv1; if (periph == NULL) return (ENXIO); + cam_periph_lock(periph); + softc = (struct sg_softc *)periph->softc; - - if ((error = cam_periph_lock(periph, PRIBIO)) != 0) - return (error); - softc->flags &= ~SG_FLAG_OPEN; cam_periph_unlock(periph); @@ -473,6 +472,8 @@ if (periph == NULL) return (ENXIO); + cam_periph_lock(periph); + softc = (struct sg_softc *)periph->softc; error = 0; @@ -669,6 +670,7 @@ break; } + cam_periph_unlock(periph); return (error); } @@ -686,7 +688,6 @@ int error = 0, cdb_len, buf_len, dir; periph = dev->si_drv1; - sc = periph->softc; rdwr = malloc(sizeof(*rdwr), M_DEVBUF, M_WAITOK | M_ZERO); hdr = &rdwr->hdr.hdr; @@ -699,12 +700,11 @@ if (error) goto out_hdr; - ccb = xpt_alloc_ccb(); + ccb = xpt_alloc_ccb(periph->sim); if (ccb == NULL) { error = ENOMEM; goto out_hdr; } - xpt_setup_ccb(&ccb->ccb_h, periph->path, /*priority*/5); csio = &ccb->csio; /* @@ -751,6 +751,9 @@ dir = CAM_DIR_NONE; } + cam_periph_lock(periph); + sc = periph->softc; + xpt_setup_ccb(&ccb->ccb_h, periph->path, /*priority*/5); cam_fill_csio(csio, /*retries*/1, sgdone, @@ -774,7 +777,9 @@ ccb->ccb_h.ccb_rdwr = rdwr; ccb->ccb_h.ccb_type = SG_CCB_RDWR_IO; TAILQ_INSERT_TAIL(&sc->rdwr_done, rdwr, rdwr_link); - return (sgsendrdwr(periph, ccb)); + error = sgsendrdwr(periph, ccb); + cam_periph_unlock(periph); + return (error); out_buf: free(buf, M_DEVBUF); @@ -797,7 +802,6 @@ int error, pack_len, reply_len, pack_id; periph = dev->si_drv1; - sc = periph->softc; /* XXX The pack len field needs to be updated and written out instead * of discarded. Not sure how to do that. @@ -811,17 +815,20 @@ return (error); uio->uio_rw = UIO_READ; + cam_periph_lock(periph); + sc = periph->softc; search: TAILQ_FOREACH(rdwr, &sc->rdwr_done, rdwr_link) { if (rdwr->tag == pack_id) break; } if ((rdwr == NULL) || (rdwr->state != SG_RDWR_DONE)) { - if (tsleep(rdwr, PCATCH, "sgread", 0) == ERESTART) + if (msleep(rdwr, periph->sim->mtx, PCATCH, "sgread", 0) == ERESTART) return (EAGAIN); goto search; } TAILQ_REMOVE(&sc->rdwr_done, rdwr, rdwr_link); + cam_periph_unlock(periph); hdr = &rdwr->hdr.hdr; csio = &rdwr->ccb->csio; @@ -865,7 +872,9 @@ if ((error == 0) && (hdr->result == 0)) error = uiomove(rdwr->buf, rdwr->buf_len, uio); + cam_periph_lock(periph); xpt_free_ccb(rdwr->ccb); + cam_periph_unlock(periph); free(rdwr->buf, M_DEVBUF); free(rdwr, M_DEVBUF); return (error); From owner-p4-projects@FreeBSD.ORG Thu Apr 12 12:28:04 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 96A4016A403; Thu, 12 Apr 2007 12:28:04 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 309E216A401 for ; Thu, 12 Apr 2007 12:28:04 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1CD3713C44B for ; Thu, 12 Apr 2007 12:28:04 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3CCS4mQ081426 for ; Thu, 12 Apr 2007 12:28:04 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3CCS3XW081420 for perforce@freebsd.org; Thu, 12 Apr 2007 12:28:03 GMT (envelope-from gonzo@FreeBSD.org) Date: Thu, 12 Apr 2007 12:28:03 GMT Message-Id: <200704121228.l3CCS3XW081420@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 117957 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Apr 2007 12:28:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=117957 Change 117957 by gonzo@gonzo_jeeves on 2007/04/12 12:27:08 o Migrate on new inetrrupt filtering API. o Replace "magic numbers" with named constants and export them through genassym.c. Affected files ... .. //depot/projects/mips2/src/sys/mips/include/intr_machdep.h#3 edit .. //depot/projects/mips2/src/sys/mips/mips/cpu.c#18 edit .. //depot/projects/mips2/src/sys/mips/mips/genassym.c#7 edit .. //depot/projects/mips2/src/sys/mips/mips/intr_machdep.c#3 edit .. //depot/projects/mips2/src/sys/mips/mips/nexus.c#4 edit .. //depot/projects/mips2/src/sys/mips/mips/tick.c#5 edit .. //depot/projects/mips2/src/sys/mips/mips4k/malta/gt_pci.c#5 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/intr_machdep.h#3 (text+ko) ==== @@ -23,26 +23,21 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips2/src/sys/mips/include/intr_machdep.h#2 $ + * $P4: //depot/projects/mips2/src/sys/mips/include/intr_machdep.h#3 $ */ #ifndef _MACHINE_INTR_H_ #define _MACHINE_INTR_H_ +#define NHARD_IRQS 6 +#define NSOFT_IRQS 2 + struct trapframe; -/* - * Include the platform-specific MD interrupt header. - */ -/* - * XXXMIPS: We don't have this file. - */ -#if 0 -#include -#endif - -void cpu_establish_hardintr(int, void (*)(void *), void *); -void cpu_establish_softintr(int, void (*)(void *), void *); +void cpu_establish_hardintr(const char *, int (*)(void*), void (*)(void*), + void *, int, int, void **); +void cpu_establish_softintr(const char *, int (*)(void*), void (*)(void*), + void *, int, int, void **); void cpu_intr(struct trapframe *); #endif /* !_MACHINE_INTR_H_ */ ==== //depot/projects/mips2/src/sys/mips/mips/cpu.c#18 (text+ko) ==== @@ -83,6 +83,9 @@ size_t len, max; max = 0x80; + if(bootverbose) + printf("Installing exception vector:\n\t[%p..%p] <- [%p..%p]\n", + (void *)addr, (void *)(addr+max), begin, end); len = end - begin; if (len > max) panic("exception code too big for vector %jx", (intmax_t) addr); @@ -263,7 +266,8 @@ static struct resource *cpu_alloc_resource(device_t, device_t, int, int *, u_long, u_long, u_long, u_int); static int cpu_setup_intr(device_t, device_t, struct resource *, int, - driver_intr_t *, void *, void **); + driver_filter_t *f, driver_intr_t *, void *, + void **); static device_method_t cpu_methods[] = { /* Device interface */ @@ -345,7 +349,8 @@ static int cpu_setup_intr(device_t dev, device_t child, struct resource *res, int flags, - driver_intr_t *handler, void *arg, void **cookiep) + driver_filter_t *filt, driver_intr_t *handler, void *arg, + void **cookiep) { int error; int intr; @@ -358,7 +363,8 @@ intr = rman_get_start(res); - cpu_establish_hardintr(intr, handler, arg); + cpu_establish_hardintr(device_get_nameunit(child), filt, handler, arg, + intr, flags, cookiep); device_printf(child, "established CPU interrupt %d\n", intr); return (0); } ==== //depot/projects/mips2/src/sys/mips/mips/genassym.c#7 (text+ko) ==== @@ -60,6 +60,7 @@ #include #include +#include #include #include #include @@ -67,6 +68,7 @@ ASSYM(MIPS_KSEG0_START, MIPS_KSEG0_START); ASSYM(MIPS_KSSEG_START, MIPS_KSSEG_START); ASSYM(MIPS_PG_G, PG_G); + ASSYM(P_VMSPACE, offsetof(struct proc, p_vmspace)); ASSYM(PC_CURTHREAD, offsetof(struct pcpu, pc_curthread)); ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb)); @@ -76,7 +78,6 @@ ASSYM(TDF_NEEDRESCHED, TDF_NEEDRESCHED); ASSYM(TD_FLAGS, offsetof(struct thread, td_flags)); - ASSYM(TD_FRAME, offsetof(struct thread, td_frame)); ASSYM(TD_KSTACK, offsetof(struct thread, td_kstack)); ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); @@ -191,3 +192,6 @@ ASSYM(VM_MIN_KERNEL_ADDRESS, VM_MIN_KERNEL_ADDRESS); ASSYM(VM_MAX_KERNEL_ADDRESS, VM_MAX_KERNEL_ADDRESS); +ASSYM(NHARD_IRQS, NHARD_IRQS); +ASSYM(NSOFT_IRQS, NSOFT_IRQS); +ASSYM(MAXCOMLEN, MAXCOMLEN); ==== //depot/projects/mips2/src/sys/mips/mips/intr_machdep.c#3 (text+ko) ==== @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -42,53 +43,87 @@ #include #include -struct intrhand { - void (*handler)(void *); - void *arg; -}; -static struct intrhand intrhard[6]; -static struct intrhand intrsoft[2]; +static struct intr_event *hardintr_events[NHARD_IRQS]; +static struct intr_event *softintr_events[NSOFT_IRQS]; + +#ifdef notyet +static int intrcnt_tab[NHARD_IRQS + NSOFT_IRQS]; +static int intrcnt_index = 0; +static int last_printed = 0; +#endif void -cpu_establish_hardintr(int intr, void (*handler)(void *), void *arg) +cpu_establish_hardintr(const char *name, driver_filter_t *filt, + void (*handler)(void*), void *arg, int irq, int flags, + void **cookiep) { - struct intrhand *ih; + struct intr_event *event; + int error; + + if (irq < 0 || irq > NHARD_IRQS) + panic("%s called for unknown hard intr %d", __func__, irq); + + event = hardintr_events[irq]; + if (event == NULL) { + error = intr_event_create(&event, (void *)irq, 0, + (void (*)(void *))NULL, "hard intr%d:", irq); + if (error) + return; + hardintr_events[irq] = event; +#ifdef notyet + last_printed += + snprintf(intrnames + last_printed, + MAXCOMLEN + 1, + "hard irq%d: %s", irq, name); + last_printed++; + intrcnt_tab[irq] = intrcnt_index; + intrcnt_index++; +#endif + + } - if (intr < 0 || intr > 5) - panic("%s called for unknown hard intr %d", __func__, intr); - ih = &intrhard[intr]; - if (ih->handler != NULL && ih->handler != handler) - panic("%s cannot share hard intr %d", __func__, intr); - ih->handler = handler; - ih->arg = arg; + intr_event_add_handler(event, name, filt, handler, arg, + intr_priority(flags), flags, cookiep); - mips_wr_status(mips_rd_status() | (((1<< intr) << 8) << 2)); + mips_wr_status(mips_rd_status() | (((1<< irq) << 8) << 2)); } void -cpu_establish_softintr(int intr, void (*handler)(void *), void *arg) +cpu_establish_softintr(const char *name, driver_filter_t *filt, + void (*handler)(void*), void *arg, int irq, int flags, + void **cookiep) { - struct intrhand *ih; + struct intr_event *event; + int error; + + if (irq < 0 || irq > NSOFT_IRQS) + panic("%s called for unknown hard intr %d", __func__, irq); + + event = softintr_events[irq]; + if (event == NULL) { + error = intr_event_create(&event, (void *)irq, 0, + (void (*)(void *))NULL, "intr%d:", irq); + if (error) + return; + softintr_events[irq] = event; + } - if (intr < 0 || intr > 1) - panic("%s called for unknown soft intr %d", __func__, intr); - ih = &intrsoft[intr]; - if (ih->handler != NULL && ih->handler != handler) - panic("%s cannot share soft intr %d", __func__, intr); - ih->handler = handler; - ih->arg = arg; + intr_event_add_handler(event, name, filt, handler, arg, + intr_priority(flags), flags, cookiep); - mips_wr_status(mips_rd_status() | ((1 << intr) << 8)); + mips_wr_status(mips_rd_status() | (((1<< irq) << 8))); } void cpu_intr(struct trapframe *tf) { - struct intrhand *ih; + struct intr_handler *ih; + struct intr_event *event; register_t cause; int hard; int intr; int i; + int thread; critical_enter(); @@ -104,25 +139,39 @@ /* Software interrupt. */ i--; /* Get a 0-offset interrupt. */ hard = 0; - ih = &intrsoft[i]; + event = softintr_events[i]; break; default: /* Hardware interrupt. */ i -= 2; /* Trim software interrupt bits. */ i--; /* Get a 0-offset interrupt. */ hard = 1; - ih = &intrhard[i]; + event = hardintr_events[i]; break; } - if (ih->handler != NULL) { - if (ih->arg == NULL) - (*ih->handler)(tf); + + if (!event || TAILQ_EMPTY(&event->ie_handlers)) + { + printf("stray %s interrupt %d\n", + hard ? "hard" : "soft", i); + continue; + } + + /* Execute fast handlers. */ + thread = 0; + TAILQ_FOREACH(ih, &event->ie_handlers, ih_next) { + if (ih->ih_filter == NULL) + thread = 1; else - (*ih->handler)(ih->arg); - } else - printf("stray %s interrupt %d\n", - hard ? "hard" : "soft", i); + ih->ih_filter(ih->ih_argument ? + ih->ih_argument : tf); + } + + /* Schedule thread if needed. */ + if (thread) + intr_event_schedule_thread(event); } + KASSERT(i == 0, ("all interrupts handled")); critical_exit(); ==== //depot/projects/mips2/src/sys/mips/mips/nexus.c#4 (text+ko) ==== @@ -80,7 +80,7 @@ struct resource *); static int nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, - driver_intr_t *intr, void *arg, void **cookiep); + driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep); static int nexus_teardown_intr(device_t, device_t, struct resource *, void *); @@ -124,7 +124,7 @@ static int nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, - driver_intr_t *intr, void *arg, void **cookiep) + driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep) { int irq; @@ -132,7 +132,9 @@ irq = rman_get_start(res); if(irq > 5) return(0); - cpu_establish_hardintr(irq, intr, arg); + + cpu_establish_hardintr(device_get_nameunit(child), filt, intr, arg, + irq, flags, cookiep); intr_restore(sr); return (0); } ==== //depot/projects/mips2/src/sys/mips/mips/tick.c#5 (text+ko) ==== @@ -203,7 +203,6 @@ /* * Set next clock edge. */ - mips_wr_compare(mips_rd_count() + counter_freq / hz); /* @@ -218,7 +217,7 @@ hardclock(usermode, pc); } - return (FILTER_HANDLED); + return FILTER_HANDLED; } static int @@ -250,9 +249,10 @@ device_printf(dev, "failed to allocate irq\n"); return (ENXIO); } - error = bus_setup_intr(dev, irq, - INTR_TYPE_CLK | INTR_MPSAFE | INTR_FAST, - clock_intr, NULL, NULL, NULL); + + error = bus_setup_intr(dev, irq, INTR_TYPE_CLK, clock_intr, NULL, + NULL, NULL); + if (error != 0) { device_printf(dev, "bus_setup_intr returned %d\n", error); return (error); ==== //depot/projects/mips2/src/sys/mips/mips4k/malta/gt_pci.c#5 (text+ko) ==== @@ -46,6 +46,7 @@ #include #include +#include #include #include #include @@ -90,17 +91,6 @@ #define OCW3_POLL_IRQ(x) ((x) & 0x7f) #define OCW3_POLL_PENDING (1U << 7) -struct intrhand { - LIST_ENTRY(intrhand) ih_list; - driver_intr_t *ih_func; - void *ih_arg; - int ih_irq; -}; - -struct pci_intrhead { - LIST_HEAD(, intrhand) intr_list; -}; - struct gt_pci_softc { device_t sc_dev; bus_space_tag_t sc_st; @@ -118,7 +108,7 @@ uint32_t sc_io; struct resource *sc_irq; - struct pci_intrhead sc_intrtab[ICU_LEN]; + struct intr_event *sc_eventstab[ICU_LEN]; uint16_t sc_imask; uint16_t sc_elcr; @@ -151,8 +141,9 @@ gt_pci_intr(void *v) { struct gt_pci_softc *sc = v; - struct intrhand *ih; - int irq; + struct intr_event *event; + struct intr_handler *ih; + int irq, thread; for (;;) { bus_space_write_1(sc->sc_pciio, sc->sc_ioh_icu1, PIC_OCW3, @@ -176,8 +167,23 @@ irq = 2; } - LIST_FOREACH(ih, &sc->sc_intrtab[irq].intr_list, ih_list) - (*ih->ih_func)(ih->ih_arg); + event = sc->sc_eventstab[irq]; + thread = 0; + + if (event && !TAILQ_EMPTY(&event->ie_handlers)) + { + /* Execute fast handlers. */ + TAILQ_FOREACH(ih, &event->ie_handlers, ih_next) { + if (ih->ih_filter == NULL) + thread = 1; + else + ih->ih_filter(ih->ih_argument); + } + } + + /* Schedule thread if needed. */ + if (thread) + intr_event_schedule_thread(event); /* Send a specific EOI to the 8259. */ if (irq > 7) { @@ -192,8 +198,6 @@ } } - - static int gt_pci_probe(device_t dev) { @@ -205,9 +209,9 @@ gt_pci_attach(device_t dev) { - uint32_t busno; + uint32_t busno; struct gt_pci_softc *sc = device_get_softc(dev); - int rid, i; + int rid; busno = 0; sc->sc_dev = dev; @@ -270,7 +274,7 @@ ICW1_RESET | ICW1_IC4); /* * XXX: values from NetBSD's - */ + */ bus_space_write_1(sc->sc_pciio, sc->sc_ioh_icu1, 1, 0/*XXX*/); bus_space_write_1(sc->sc_pciio, sc->sc_ioh_icu1, 1, @@ -338,30 +342,20 @@ (1U << 14) | /* IDE primary */ (1U << 15); /* IDE secondary */ - /* Initialize our interrupt table. */ - for (i = 0; i < ICU_LEN; i++) { - LIST_INIT(&sc->sc_intrtab[i].intr_list); - } - /* Hook up our interrupt handler. */ - if ((sc->sc_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, + if ((sc->sc_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, MALTA_SOUTHBRIDGE_INTR, MALTA_SOUTHBRIDGE_INTR, 1, RF_SHAREABLE | RF_ACTIVE)) == NULL) { device_printf(dev, "unable to allocate IRQ resource\n"); return ENXIO; - } + } - if ((bus_setup_intr(dev, sc->sc_irq, INTR_FAST | INTR_MPSAFE, - NULL, gt_pci_intr, sc, &sc->sc_ih))) { + if ((bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_MISC, + NULL, gt_pci_intr, sc, &sc->sc_ih))) { device_printf(dev, "WARNING: unable to register interrupt handler\n"); return ENXIO; - } - - if (sc->sc_ih == NULL) - - - + } /* Initialize memory and i/o rmans. */ device_add_child(dev, "pci", busno); @@ -392,8 +386,8 @@ uint32_t addr; uint32_t shift, mask; - if (gt_pci_conf_setup(sc, bus, slot, func, reg & ~3, &addr)) - return (uint32_t)(-1); + if (gt_pci_conf_setup(sc, bus, slot, func, reg & ~3, &addr)) + return (uint32_t)(-1); /* Clear cause register bits. */ GT_REGVAL(GT_INTR_CAUSE) = 0; @@ -644,37 +638,36 @@ } static int -gt_pci_setup_intr(device_t dev, device_t child, - struct resource *ires, int flags, driver_intr_t *intr, void *arg, - void **cookiep) +gt_pci_setup_intr(device_t dev, device_t child, struct resource *ires, + int flags, driver_filter_t *filt, driver_intr_t *handler, + void *arg, void **cookiep) { struct gt_pci_softc *sc = device_get_softc(dev); - struct intrhand *ih; - int irq; + struct intr_event *event; + int irq, error; irq = rman_get_start(ires); if (irq >= ICU_LEN || irq == 2) panic("%s: bad irq or type", __func__); - ih = malloc(sizeof(*ih), M_DEVBUF, M_NOWAIT); - if (ih == NULL) - return ENOMEM; + event = sc->sc_eventstab[irq]; + if (event == NULL) { + error = intr_event_create(&event, (void *)irq, 0, + (void (*)(void *))NULL, "gt_pci intr%d:", irq); + if (error) + return 0; + sc->sc_eventstab[irq] = event; + } - ih->ih_func = intr; - ih->ih_arg = arg; - ih->ih_irq = irq; + intr_event_add_handler(event, device_get_nameunit(child), filt, + handler, arg, intr_priority(flags), flags, cookiep); - /* Insert the handler into the table. */ - LIST_INSERT_HEAD(&sc->sc_intrtab[irq].intr_list, ih, ih_list); - /* Enable it, set trigger mode. */ sc->sc_imask &= ~(1 << irq); sc->sc_elcr &= ~(1 << irq); gt_pci_set_icus(sc); - *cookiep = (void *)ih; - return 0; } @@ -682,19 +675,7 @@ gt_pci_teardown_intr(device_t dev, device_t child, struct resource *res, void *cookie) { - struct gt_pci_softc *sc = device_get_softc(dev); - struct intrhand *ih = cookie; - LIST_REMOVE(ih, ih_list); - - /* If there are no more handlers on this IRQ, disable it. */ - if (LIST_FIRST(&sc->sc_intrtab[ih->ih_irq].intr_list) == NULL) { - sc->sc_imask |= (1 << ih->ih_irq); - gt_pci_set_icus(sc); - } - - free(ih, M_DEVBUF); - - return 0; + return (intr_event_remove_handler(cookie)); } static device_method_t gt_pci_methods[] = { From owner-p4-projects@FreeBSD.ORG Thu Apr 12 13:58:03 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B755D16A406; Thu, 12 Apr 2007 13:58:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 73A4516A404 for ; Thu, 12 Apr 2007 13:58:03 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 606BB13C4C1 for ; Thu, 12 Apr 2007 13:58:03 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3CDw359013872 for ; Thu, 12 Apr 2007 13:58:03 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3CDw2AT013869 for perforce@freebsd.org; Thu, 12 Apr 2007 13:58:02 GMT (envelope-from csjp@freebsd.org) Date: Thu, 12 Apr 2007 13:58:02 GMT Message-Id: <200704121358.l3CDw2AT013869@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 117965 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Apr 2007 13:58:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=117965 Change 117965 by csjp@csjp_push on 2007/04/12 13:57:46 Add some bzero()s to ensure that we are proerly clearing any old data. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#31 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#31 (text+ko) ==== @@ -534,6 +534,7 @@ PROC_UNLOCK(td->td_proc); return (E2BIG); } + bzero(&ai, sizeof(ai)); ai.ai_auid = td->td_proc->p_au->ai_auid; ai.ai_mask = td->td_proc->p_au->ai_mask; ai.ai_asid = td->td_proc->p_au->ai_asid; @@ -573,6 +574,7 @@ * XXXRW: Test privilege while holding the proc lock? */ PROC_LOCK(td->td_proc); + bzero(td->td_proc->p_au, sizeof(struct auditinfo_addr)); td->td_proc->p_au->ai_auid = ai.ai_auid; td->td_proc->p_au->ai_mask = ai.ai_mask; td->td_proc->p_au->ai_asid = ai.ai_asid; From owner-p4-projects@FreeBSD.ORG Thu Apr 12 14:56:17 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A34816A408; Thu, 12 Apr 2007 14:56:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2B75716A400 for ; Thu, 12 Apr 2007 14:56:17 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 170EF13C4BC for ; Thu, 12 Apr 2007 14:56:17 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3CEuGgg025261 for ; Thu, 12 Apr 2007 14:56:16 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3CEuGw0025258 for perforce@freebsd.org; Thu, 12 Apr 2007 14:56:16 GMT (envelope-from csjp@freebsd.org) Date: Thu, 12 Apr 2007 14:56:16 GMT Message-Id: <200704121456.l3CEuGw0025258@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 117966 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Apr 2007 14:56:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=117966 Change 117966 by csjp@csjp_push on 2007/04/12 14:55:23 Fix endian error which will result in ip6 addresses to have their bytes swapped in extended process tokens. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#30 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#30 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#29 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#30 $ * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.9 2006/12/28 22:18:43 rwatson Exp $ */ @@ -635,12 +635,10 @@ ADD_U_INT32(dptr, sid); ADD_U_INT32(dptr, tid->at_port); ADD_U_INT32(dptr, tid->at_type); - ADD_U_INT32(dptr, tid->at_addr[0]); - if (tid->at_type == AU_IPv6) { - ADD_U_INT32(dptr, tid->at_addr[1]); - ADD_U_INT32(dptr, tid->at_addr[2]); - ADD_U_INT32(dptr, tid->at_addr[3]); - } + if (tid->at_type == AU_IPv6) + ADD_MEM(dptr, &tid->at_addr[0], 4 * sizeof(u_int32_t)); + else + ADD_MEM(dptr, &tid->at_addr[0], sizeof(u_int32_t)); return (t); } From owner-p4-projects@FreeBSD.ORG Thu Apr 12 16:53:44 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6FEC616A406; Thu, 12 Apr 2007 16:53:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4193916A400 for ; Thu, 12 Apr 2007 16:53:44 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2E86713C43E for ; Thu, 12 Apr 2007 16:53:44 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3CGriFe061371 for ; Thu, 12 Apr 2007 16:53:44 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3CGrh3Q061367 for perforce@freebsd.org; Thu, 12 Apr 2007 16:53:43 GMT (envelope-from scottl@freebsd.org) Date: Thu, 12 Apr 2007 16:53:43 GMT Message-Id: <200704121653.l3CGrh3Q061367@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 117967 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Apr 2007 16:53:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=117967 Change 117967 by scottl@scottl-y1 on 2007/04/12 16:53:21 Drop the sim lock when calling cam_periph_mapmem(). This is needed because of the possibility of sleeping and triggering I/O from VM and proc methods that get called. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#22 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sg.c#4 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#22 (text+ko) ==== @@ -567,7 +567,14 @@ bzero(&mapinfo, sizeof(mapinfo)); + /* + * cam_periph_mapmem calls into proc and vm functions that can + * sleep as well as trigger I/O, so we can't hold the lock. + * Dropping it here is reasonably safe. + */ + cam_periph_unlock(periph); error = cam_periph_mapmem(ccb, &mapinfo); + cam_periph_lock(periph); /* * cam_periph_mapmem returned an error, we can't continue. ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sg.c#4 (text+ko) ==== @@ -891,7 +891,15 @@ if (((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) && (ccb->csio.data_ptr != NULL)) { bzero(&mapinfo, sizeof(mapinfo)); + + /* + * cam_periph_mapmem calls into proc and vm functions that can + * sleep as well as trigger I/O, so we can't hold the lock. + * Dropping it here is reasonably safe. + */ + cam_periph_unlock(periph); error = cam_periph_mapmem(ccb, &mapinfo); + cam_periph_lock(periph); if (error) return (error); need_unmap = 1; From owner-p4-projects@FreeBSD.ORG Thu Apr 12 18:46:09 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB19D16A402; Thu, 12 Apr 2007 18:46:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6475F16A400 for ; Thu, 12 Apr 2007 18:46:08 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5364613C459 for ; Thu, 12 Apr 2007 18:46:08 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3CIk8Nu082091 for ; Thu, 12 Apr 2007 18:46:08 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3CIk7qi082088 for perforce@freebsd.org; Thu, 12 Apr 2007 18:46:07 GMT (envelope-from peter@freebsd.org) Date: Thu, 12 Apr 2007 18:46:07 GMT Message-Id: <200704121846.l3CIk7qi082088@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 117972 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Apr 2007 18:46:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=117972 Change 117972 by peter@peter_overcee on 2007/04/12 18:45:43 Add pad-free syscall stubs. For now, they just wrap the old syscalls but with the reformatted args. Doing it this way avoids breaking libc. See lib/libc/sys/mmap.c for an example of why the old way sucks. It turns a 6 arg syscall (which is an abi-compliant 6-arg max regparm call) into a bogus 8-arg syscall (which is not abi-compliant for syscalls). Args spill over onto the stack. Affected files ... .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#45 edit .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#45 edit .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#42 edit .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#42 edit .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#42 edit .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#46 edit .. //depot/projects/hammer/sys/kern/init_sysent.c#58 edit .. //depot/projects/hammer/sys/kern/sys_generic.c#30 edit .. //depot/projects/hammer/sys/kern/syscalls.c#56 edit .. //depot/projects/hammer/sys/kern/syscalls.master#57 edit .. //depot/projects/hammer/sys/kern/systrace_args.c#2 edit .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#65 edit .. //depot/projects/hammer/sys/sys/syscall.h#55 edit .. //depot/projects/hammer/sys/sys/syscall.mk#55 edit .. //depot/projects/hammer/sys/sys/sysproto.h#56 edit .. //depot/projects/hammer/sys/vm/vm_mmap.c#40 edit Differences ... ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#45 (text+ko) ==== @@ -483,6 +483,22 @@ return (mmap(td, &ap)); } +int +freebsd32_new_mmap(struct thread *td, struct freebsd32_new_mmap_args *uap) +{ + struct freebsd32_mmap_args ap; + + ap.addr = uap->addr; + ap.len = uap->len; + ap.prot = uap->prot; + ap.flags = uap->flags; + ap.fd = uap->fd; + ap.poslo = uap->poslo; + ap.poshi = uap->poshi; + + return (freebsd32_mmap(td, &ap)); +} + struct itimerval32 { struct timeval32 it_interval; struct timeval32 it_value; @@ -1624,6 +1640,69 @@ return (ftruncate(td, &ap)); } +/* versions without the 'int pad' argument */ +int +freebsd32_new_pread(struct thread *td, struct freebsd32_new_pread_args *uap) +{ + struct pread_args ap; + + ap.fd = uap->fd; + ap.buf = uap->buf; + ap.nbyte = uap->nbyte; + ap.offset = (uap->offsetlo | ((off_t)uap->offsethi << 32)); + return (pread(td, &ap)); +} + +int +freebsd32_new_pwrite(struct thread *td, struct freebsd32_new_pwrite_args *uap) +{ + struct pwrite_args ap; + + ap.fd = uap->fd; + ap.buf = uap->buf; + ap.nbyte = uap->nbyte; + ap.offset = (uap->offsetlo | ((off_t)uap->offsethi << 32)); + return (pwrite(td, &ap)); +} + +int +freebsd32_new_lseek(struct thread *td, struct freebsd32_new_lseek_args *uap) +{ + int error; + struct lseek_args ap; + off_t pos; + + ap.fd = uap->fd; + ap.offset = (uap->offsetlo | ((off_t)uap->offsethi << 32)); + ap.whence = uap->whence; + error = lseek(td, &ap); + /* Expand the quad return into two parts for eax and edx */ + pos = *(off_t *)(td->td_retval); + td->td_retval[0] = pos & 0xffffffff; /* %eax */ + td->td_retval[1] = pos >> 32; /* %edx */ + return error; +} + +int +freebsd32_new_truncate(struct thread *td, struct freebsd32_new_truncate_args *uap) +{ + struct truncate_args ap; + + ap.path = uap->path; + ap.length = (uap->lengthlo | ((off_t)uap->lengthhi << 32)); + return (truncate(td, &ap)); +} + +int +freebsd32_new_ftruncate(struct thread *td, struct freebsd32_new_ftruncate_args *uap) +{ + struct ftruncate_args ap; + + ap.fd = uap->fd; + ap.length = (uap->lengthlo | ((off_t)uap->lengthhi << 32)); + return (ftruncate(td, &ap)); +} + struct sf_hdtr32 { uint32_t headers; int hdr_cnt; ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#45 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.76 2006/12/20 19:39:10 jkim Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.88 2006/12/20 19:36:03 jkim Exp */ @@ -322,6 +322,45 @@ char param_l_[PADL_(struct thr_param32 *)]; struct thr_param32 * param; char param_r_[PADR_(struct thr_param32 *)]; char param_size_l_[PADL_(int)]; int param_size; char param_size_r_[PADR_(int)]; }; +struct freebsd32_new_pread_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char buf_l_[PADL_(void *)]; void * buf; char buf_r_[PADR_(void *)]; + char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)]; + char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)]; + char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)]; +}; +struct freebsd32_new_pwrite_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char buf_l_[PADL_(const void *)]; const void * buf; char buf_r_[PADR_(const void *)]; + char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)]; + char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)]; + char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)]; +}; +struct freebsd32_new_mmap_args { + char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)]; + char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; + char prot_l_[PADL_(int)]; int prot; char prot_r_[PADR_(int)]; + char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char poslo_l_[PADL_(u_int32_t)]; u_int32_t poslo; char poslo_r_[PADR_(u_int32_t)]; + char poshi_l_[PADL_(u_int32_t)]; u_int32_t poshi; char poshi_r_[PADR_(u_int32_t)]; +}; +struct freebsd32_new_lseek_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)]; + char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)]; + char whence_l_[PADL_(int)]; int whence; char whence_r_[PADR_(int)]; +}; +struct freebsd32_new_truncate_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char lengthlo_l_[PADL_(u_int32_t)]; u_int32_t lengthlo; char lengthlo_r_[PADR_(u_int32_t)]; + char lengthhi_l_[PADL_(u_int32_t)]; u_int32_t lengthhi; char lengthhi_r_[PADR_(u_int32_t)]; +}; +struct freebsd32_new_ftruncate_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char lengthlo_l_[PADL_(u_int32_t)]; u_int32_t lengthlo; char lengthlo_r_[PADR_(u_int32_t)]; + char lengthhi_l_[PADL_(u_int32_t)]; u_int32_t lengthhi; char lengthhi_r_[PADR_(u_int32_t)]; +}; int freebsd32_wait4(struct thread *, struct freebsd32_wait4_args *); int freebsd32_recvmsg(struct thread *, struct freebsd32_recvmsg_args *); int freebsd32_sendmsg(struct thread *, struct freebsd32_sendmsg_args *); @@ -377,6 +416,12 @@ int freebsd32_thr_suspend(struct thread *, struct freebsd32_thr_suspend_args *); int freebsd32_umtx_op(struct thread *, struct freebsd32_umtx_op_args *); int freebsd32_thr_new(struct thread *, struct freebsd32_thr_new_args *); +int freebsd32_new_pread(struct thread *, struct freebsd32_new_pread_args *); +int freebsd32_new_pwrite(struct thread *, struct freebsd32_new_pwrite_args *); +int freebsd32_new_mmap(struct thread *, struct freebsd32_new_mmap_args *); +int freebsd32_new_lseek(struct thread *, struct freebsd32_new_lseek_args *); +int freebsd32_new_truncate(struct thread *, struct freebsd32_new_truncate_args *); +int freebsd32_new_ftruncate(struct thread *, struct freebsd32_new_ftruncate_args *); #ifdef COMPAT_43 @@ -521,6 +566,12 @@ #define FREEBSD32_SYS_AUE_freebsd32_thr_suspend AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_umtx_op AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_thr_new AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_new_pread AUE_PREAD +#define FREEBSD32_SYS_AUE_freebsd32_new_pwrite AUE_PWRITE +#define FREEBSD32_SYS_AUE_freebsd32_new_mmap AUE_MMAP +#define FREEBSD32_SYS_AUE_freebsd32_new_lseek AUE_LSEEK +#define FREEBSD32_SYS_AUE_freebsd32_new_truncate AUE_TRUNCATE +#define FREEBSD32_SYS_AUE_freebsd32_new_ftruncate AUE_FTRUNCATE #undef PAD_ #undef PADL_ ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#42 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.74 2006/12/20 19:39:10 jkim Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.88 2006/12/20 19:36:03 jkim Exp */ @@ -331,4 +331,10 @@ #define FREEBSD32_SYS_sctp_generic_sendmsg 472 #define FREEBSD32_SYS_sctp_generic_sendmsg_iov 473 #define FREEBSD32_SYS_sctp_generic_recvmsg 474 -#define FREEBSD32_SYS_MAXSYSCALL 475 +#define FREEBSD32_SYS_freebsd32_new_pread 475 +#define FREEBSD32_SYS_freebsd32_new_pwrite 476 +#define FREEBSD32_SYS_freebsd32_new_mmap 477 +#define FREEBSD32_SYS_freebsd32_new_lseek 478 +#define FREEBSD32_SYS_freebsd32_new_truncate 479 +#define FREEBSD32_SYS_freebsd32_new_ftruncate 480 +#define FREEBSD32_SYS_MAXSYSCALL 481 ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#42 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.65 2006/12/20 19:39:10 jkim Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.88 2006/12/20 19:36:03 jkim Exp */ @@ -482,4 +482,10 @@ "sctp_generic_sendmsg", /* 472 = sctp_generic_sendmsg */ "sctp_generic_sendmsg_iov", /* 473 = sctp_generic_sendmsg_iov */ "sctp_generic_recvmsg", /* 474 = sctp_generic_recvmsg */ + "freebsd32_new_pread", /* 475 = freebsd32_new_pread */ + "freebsd32_new_pwrite", /* 476 = freebsd32_new_pwrite */ + "freebsd32_new_mmap", /* 477 = freebsd32_new_mmap */ + "freebsd32_new_lseek", /* 478 = freebsd32_new_lseek */ + "freebsd32_new_truncate", /* 479 = freebsd32_new_truncate */ + "freebsd32_new_ftruncate", /* 480 = freebsd32_new_ftruncate */ }; ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#42 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.75 2006/12/20 19:39:10 jkim Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.88 2006/12/20 19:36:03 jkim Exp */ @@ -507,4 +507,10 @@ { AS(sctp_generic_sendmsg_args), (sy_call_t *)sctp_generic_sendmsg, AUE_NULL, NULL, 0, 0 }, /* 472 = sctp_generic_sendmsg */ { AS(sctp_generic_sendmsg_iov_args), (sy_call_t *)sctp_generic_sendmsg_iov, AUE_NULL, NULL, 0, 0 }, /* 473 = sctp_generic_sendmsg_iov */ { AS(sctp_generic_recvmsg_args), (sy_call_t *)sctp_generic_recvmsg, AUE_NULL, NULL, 0, 0 }, /* 474 = sctp_generic_recvmsg */ + { AS(freebsd32_new_pread_args), (sy_call_t *)freebsd32_new_pread, AUE_PREAD, NULL, 0, 0 }, /* 475 = freebsd32_new_pread */ + { AS(freebsd32_new_pwrite_args), (sy_call_t *)freebsd32_new_pwrite, AUE_PWRITE, NULL, 0, 0 }, /* 476 = freebsd32_new_pwrite */ + { AS(freebsd32_new_mmap_args), (sy_call_t *)freebsd32_new_mmap, AUE_MMAP, NULL, 0, 0 }, /* 477 = freebsd32_new_mmap */ + { AS(freebsd32_new_lseek_args), (sy_call_t *)freebsd32_new_lseek, AUE_LSEEK, NULL, 0, 0 }, /* 478 = freebsd32_new_lseek */ + { AS(freebsd32_new_truncate_args), (sy_call_t *)freebsd32_new_truncate, AUE_TRUNCATE, NULL, 0, 0 }, /* 479 = freebsd32_new_truncate */ + { AS(freebsd32_new_ftruncate_args), (sy_call_t *)freebsd32_new_ftruncate, AUE_FTRUNCATE, NULL, 0, 0 }, /* 480 = freebsd32_new_ftruncate */ }; ==== //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#46 (text+ko) ==== @@ -781,3 +781,19 @@ 474 AUE_NULL NOPROTO { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \ struct sockaddr * from, __socklen_t *fromlenaddr, \ struct sctp_sndrcvinfo *sinfo, int *msg_flags); } +475 AUE_PREAD STD { ssize_t freebsd32_new_pread(int fd, \ + void *buf,size_t nbyte, \ + u_int32_t offsetlo, u_int32_t offsethi); } +476 AUE_PWRITE STD { ssize_t freebsd32_new_pwrite(int fd, \ + const void *buf, size_t nbyte, \ + u_int32_t offsetlo, u_int32_t offsethi); } +477 AUE_MMAP STD { caddr_t freebsd32_new_mmap(caddr_t addr, \ + size_t len, int prot, int flags, int fd, \ + u_int32_t poslo, u_int32_t poshi); } +478 AUE_LSEEK STD { off_t freebsd32_new_lseek(int fd, \ + u_int32_t offsetlo, u_int32_t offsethi, \ + int whence); } +479 AUE_TRUNCATE STD { int freebsd32_new_truncate(char *path, \ + u_int32_t lengthlo, u_int32_t lengthhi); } +480 AUE_FTRUNCATE STD { int freebsd32_new_ftruncate(int fd, \ + u_int32_t lengthlo, u_int32_t lengthhi); } ==== //depot/projects/hammer/sys/kern/init_sysent.c#58 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.228 2006/11/11 22:01:25 ru Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.231 2006/11/03 15:23:14 rrs Exp */ @@ -504,4 +504,10 @@ { AS(sctp_generic_sendmsg_args), (sy_call_t *)sctp_generic_sendmsg, AUE_NULL, NULL, 0, 0 }, /* 472 = sctp_generic_sendmsg */ { AS(sctp_generic_sendmsg_iov_args), (sy_call_t *)sctp_generic_sendmsg_iov, AUE_NULL, NULL, 0, 0 }, /* 473 = sctp_generic_sendmsg_iov */ { AS(sctp_generic_recvmsg_args), (sy_call_t *)sctp_generic_recvmsg, AUE_NULL, NULL, 0, 0 }, /* 474 = sctp_generic_recvmsg */ + { AS(_new_pread_args), (sy_call_t *)_new_pread, AUE_PREAD, NULL, 0, 0 }, /* 475 = _new_pread */ + { AS(_new_pwrite_args), (sy_call_t *)_new_pwrite, AUE_PWRITE, NULL, 0, 0 }, /* 476 = _new_pwrite */ + { AS(_new_mmap_args), (sy_call_t *)_new_mmap, AUE_MMAP, NULL, 0, 0 }, /* 477 = _new_mmap */ + { AS(_new_lseek_args), (sy_call_t *)_new_lseek, AUE_LSEEK, NULL, 0, 0 }, /* 478 = _new_lseek */ + { AS(_new_truncate_args), (sy_call_t *)_new_truncate, AUE_TRUNCATE, NULL, 0, 0 }, /* 479 = _new_truncate */ + { AS(_new_ftruncate_args), (sy_call_t *)_new_ftruncate, AUE_FTRUNCATE, NULL, 0, 0 }, /* 480 = _new_ftruncate */ }; ==== //depot/projects/hammer/sys/kern/sys_generic.c#30 (text+ko) ==== @@ -144,6 +144,21 @@ return(error); } +int +_new_pread(td, uap) + struct thread *td; + struct _new_pread_args *uap; +{ + struct pread_args oargs; + + oargs.fd = uap->fd; + oargs.buf = uap->buf; + oargs.nbyte = uap->nbyte; + oargs.pad = 0; + oargs.offset = uap->offset; + return (pread(td, &oargs)); +} + /* * Scatter read system call. */ @@ -339,6 +354,21 @@ return(error); } +int +_new_pwrite(td, uap) + struct thread *td; + struct _new_pwrite_args *uap; +{ + struct pwrite_args oargs; + + oargs.fd = uap->fd; + oargs.buf = uap->buf; + oargs.nbyte = uap->nbyte; + oargs.pad = 0; + oargs.offset = uap->offset; + return (pwrite(td, &oargs)); +} + /* * Gather write system call. */ ==== //depot/projects/hammer/sys/kern/syscalls.c#56 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.212 2006/11/11 22:01:25 ru Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.231 2006/11/03 15:23:14 rrs Exp */ @@ -482,4 +482,10 @@ "sctp_generic_sendmsg", /* 472 = sctp_generic_sendmsg */ "sctp_generic_sendmsg_iov", /* 473 = sctp_generic_sendmsg_iov */ "sctp_generic_recvmsg", /* 474 = sctp_generic_recvmsg */ + "_new_pread", /* 475 = _new_pread */ + "_new_pwrite", /* 476 = _new_pwrite */ + "_new_mmap", /* 477 = _new_mmap */ + "_new_lseek", /* 478 = _new_lseek */ + "_new_truncate", /* 479 = _new_truncate */ + "_new_ftruncate", /* 480 = _new_ftruncate */ }; ==== //depot/projects/hammer/sys/kern/syscalls.master#57 (text+ko) ==== @@ -835,5 +835,15 @@ 474 AUE_NULL STD { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \ struct sockaddr * from, __socklen_t *fromlenaddr, \ struct sctp_sndrcvinfo *sinfo, int *msg_flags); } +475 AUE_PREAD STD { ssize_t _new_pread(int fd, void *buf, \ + size_t nbyte, off_t offset); } +476 AUE_PWRITE STD { ssize_t _new_pwrite(int fd, const void *buf, \ + size_t nbyte, off_t offset); } +477 AUE_MMAP STD { caddr_t _new_mmap(caddr_t addr, size_t len, \ + int prot, int flags, int fd, off_t pos); } +478 AUE_LSEEK STD { off_t _new_lseek(int fd, off_t offset, \ + int whence); } +479 AUE_TRUNCATE STD { int _new_truncate(char *path, off_t length); } +480 AUE_FTRUNCATE STD { int _new_ftruncate(int fd, off_t length); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/hammer/sys/kern/systrace_args.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call argument to DTrace register array converstion. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/systrace_args.c,v 1.12 2006/11/11 22:01:25 ru Exp $ + * $FreeBSD$ * This file is part of the DTrace syscall provider. */ @@ -2805,6 +2805,63 @@ *n_args = 7; break; } + /* _new_pread */ + case 475: { + struct _new_pread_args *p = params; + iarg[0] = p->fd; /* int */ + uarg[1] = (intptr_t) p->buf; /* void * */ + uarg[2] = p->nbyte; /* size_t */ + iarg[3] = p->offset; /* off_t */ + *n_args = 4; + break; + } + /* _new_pwrite */ + case 476: { + struct _new_pwrite_args *p = params; + iarg[0] = p->fd; /* int */ + uarg[1] = (intptr_t) p->buf; /* const void * */ + uarg[2] = p->nbyte; /* size_t */ + iarg[3] = p->offset; /* off_t */ + *n_args = 4; + break; + } + /* _new_mmap */ + case 477: { + struct _new_mmap_args *p = params; + uarg[0] = (intptr_t) p->addr; /* caddr_t */ + uarg[1] = p->len; /* size_t */ + iarg[2] = p->prot; /* int */ + iarg[3] = p->flags; /* int */ + iarg[4] = p->fd; /* int */ + iarg[5] = p->pos; /* off_t */ + *n_args = 6; + break; + } + /* _new_lseek */ + case 478: { + struct _new_lseek_args *p = params; + iarg[0] = p->fd; /* int */ + iarg[1] = p->offset; /* off_t */ + iarg[2] = p->whence; /* int */ + *n_args = 3; + break; + } + /* _new_truncate */ + case 479: { + struct _new_truncate_args *p = params; + uarg[0] = (intptr_t) p->path; /* char * */ + iarg[1] = p->length; /* off_t */ + *n_args = 2; + break; + } + /* _new_ftruncate */ + case 480: { + struct _new_ftruncate_args *p = params; + iarg[0] = p->fd; /* int */ + iarg[1] = p->length; /* off_t */ + *n_args = 2; + break; + } default: *n_args = 0; break; ==== //depot/projects/hammer/sys/kern/vfs_syscalls.c#65 (text+ko) ==== @@ -1788,16 +1788,29 @@ off_t offset; int whence; } */ nuap; - int error; nuap.fd = uap->fd; nuap.offset = uap->offset; nuap.whence = uap->whence; - error = lseek(td, &nuap); - return (error); + return (lseek(td, &nuap)); } #endif /* COMPAT_43 */ +/* Skip the 'pad' argument */ +int +_new_lseek(td, uap) + struct thread *td; + register struct _new_lseek_args *uap; +{ + struct lseek_args ouap; + + ouap.fd = uap->fd; + ouap.pad = 0; + ouap.offset = uap->offset; + ouap.whence = uap->whence; + return (lseek(td, &ouap)); +} + /* * Check access permissions using passed credentials. */ @@ -3154,6 +3167,33 @@ } #endif /* COMPAT_43 */ +/* Versions without the pad argument */ +int +_new_truncate(td, uap) + struct thread *td; + register struct _new_truncate_args *uap; +{ + struct truncate_args ouap; + + ouap.path = uap->path; + ouap.pad = 0; + ouap.length = uap->length; + return (truncate(td, &ouap)); +} + +int +_new_ftruncate(td, uap) + struct thread *td; + register struct _new_ftruncate_args *uap; +{ + struct ftruncate_args ouap; + + ouap.fd = uap->fd; + ouap.pad = 0; + ouap.length = uap->length; + return (ftruncate(td, &ouap)); +} + /* * Sync an open file. */ ==== //depot/projects/hammer/sys/sys/syscall.h#55 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/syscall.h,v 1.209 2006/11/11 22:01:24 ru Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.231 2006/11/03 15:23:14 rrs Exp */ @@ -394,4 +394,10 @@ #define SYS_sctp_generic_sendmsg 472 #define SYS_sctp_generic_sendmsg_iov 473 #define SYS_sctp_generic_recvmsg 474 -#define SYS_MAXSYSCALL 475 +#define SYS__new_pread 475 +#define SYS__new_pwrite 476 +#define SYS__new_mmap 477 +#define SYS__new_lseek 478 +#define SYS__new_truncate 479 +#define SYS__new_ftruncate 480 +#define SYS_MAXSYSCALL 481 ==== //depot/projects/hammer/sys/sys/syscall.mk#55 (text+ko) ==== @@ -1,6 +1,6 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. -# $FreeBSD: src/sys/sys/syscall.mk,v 1.164 2006/11/11 22:01:24 ru Exp $ +# $FreeBSD$ # created from FreeBSD: src/sys/kern/syscalls.master,v 1.231 2006/11/03 15:23:14 rrs Exp MIASM = \ syscall.o \ @@ -335,4 +335,10 @@ sctp_peeloff.o \ sctp_generic_sendmsg.o \ sctp_generic_sendmsg_iov.o \ - sctp_generic_recvmsg.o + sctp_generic_recvmsg.o \ + _new_pread.o \ + _new_pwrite.o \ + _new_mmap.o \ + _new_lseek.o \ + _new_truncate.o \ + _new_ftruncate.o ==== //depot/projects/hammer/sys/sys/sysproto.h#56 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.213 2006/11/11 22:01:24 ru Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.231 2006/11/03 15:23:14 rrs Exp */ @@ -1482,6 +1482,39 @@ char sinfo_l_[PADL_(struct sctp_sndrcvinfo *)]; struct sctp_sndrcvinfo * sinfo; char sinfo_r_[PADR_(struct sctp_sndrcvinfo *)]; char msg_flags_l_[PADL_(int *)]; int * msg_flags; char msg_flags_r_[PADR_(int *)]; }; +struct _new_pread_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char buf_l_[PADL_(void *)]; void * buf; char buf_r_[PADR_(void *)]; + char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)]; + char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)]; +}; +struct _new_pwrite_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char buf_l_[PADL_(const void *)]; const void * buf; char buf_r_[PADR_(const void *)]; + char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)]; + char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)]; +}; +struct _new_mmap_args { + char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)]; + char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; + char prot_l_[PADL_(int)]; int prot; char prot_r_[PADR_(int)]; + char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char pos_l_[PADL_(off_t)]; off_t pos; char pos_r_[PADR_(off_t)]; +}; +struct _new_lseek_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)]; + char whence_l_[PADL_(int)]; int whence; char whence_r_[PADR_(int)]; +}; +struct _new_truncate_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char length_l_[PADL_(off_t)]; off_t length; char length_r_[PADR_(off_t)]; +}; +struct _new_ftruncate_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char length_l_[PADL_(off_t)]; off_t length; char length_r_[PADR_(off_t)]; +}; int nosys(struct thread *, struct nosys_args *); void sys_exit(struct thread *, struct sys_exit_args *); int fork(struct thread *, struct fork_args *); @@ -1814,6 +1847,12 @@ int sctp_generic_sendmsg(struct thread *, struct sctp_generic_sendmsg_args *); int sctp_generic_sendmsg_iov(struct thread *, struct sctp_generic_sendmsg_iov_args *); int sctp_generic_recvmsg(struct thread *, struct sctp_generic_recvmsg_args *); +int _new_pread(struct thread *, struct _new_pread_args *); +int _new_pwrite(struct thread *, struct _new_pwrite_args *); +int _new_mmap(struct thread *, struct _new_mmap_args *); +int _new_lseek(struct thread *, struct _new_lseek_args *); +int _new_truncate(struct thread *, struct _new_truncate_args *); +int _new_ftruncate(struct thread *, struct _new_ftruncate_args *); #ifdef COMPAT_43 @@ -2365,6 +2404,12 @@ #define SYS_AUE_sctp_generic_sendmsg AUE_NULL #define SYS_AUE_sctp_generic_sendmsg_iov AUE_NULL #define SYS_AUE_sctp_generic_recvmsg AUE_NULL +#define SYS_AUE__new_pread AUE_PREAD +#define SYS_AUE__new_pwrite AUE_PWRITE +#define SYS_AUE__new_mmap AUE_MMAP +#define SYS_AUE__new_lseek AUE_LSEEK +#define SYS_AUE__new_truncate AUE_TRUNCATE +#define SYS_AUE__new_ftruncate AUE_FTRUNCATE #undef PAD_ #undef PADL_ ==== //depot/projects/hammer/sys/vm/vm_mmap.c#40 (text+ko) ==== @@ -392,6 +392,23 @@ return (error); } +int +_new_mmap(td, uap) + struct thread *td; + struct _new_mmap_args *uap; +{ + struct mmap_args oargs; + + oargs.addr = uap->addr; + oargs.len = uap->len; + oargs.prot = uap->prot; + oargs.flags = uap->flags; + oargs.fd = uap->fd; + oargs.pad = 0; + oargs.pos = uap->pos; + return (mmap(td, &oargs)); +} + #ifdef COMPAT_43 #ifndef _SYS_SYSPROTO_H_ struct ommap_args { From owner-p4-projects@FreeBSD.ORG Thu Apr 12 20:40:36 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8152216A408; Thu, 12 Apr 2007 20:40:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0BAA016A400 for ; Thu, 12 Apr 2007 20:40:36 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E7A1013C4AE for ; Thu, 12 Apr 2007 20:40:35 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3CKeZwp006946 for ; Thu, 12 Apr 2007 20:40:35 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3CKeY7b006943 for perforce@freebsd.org; Thu, 12 Apr 2007 20:40:34 GMT (envelope-from peter@freebsd.org) Date: Thu, 12 Apr 2007 20:40:34 GMT Message-Id: <200704122040.l3CKeY7b006943@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 117977 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Apr 2007 20:40:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=117977 Change 117977 by peter@peter_overcee on 2007/04/12 20:39:33 Add working forward compatability stubs for __xstat family. Affected files ... .. //depot/projects/hammer/sys/kern/init_sysent.c#59 edit .. //depot/projects/hammer/sys/kern/kern_descrip.c#65 edit .. //depot/projects/hammer/sys/kern/syscalls.c#57 edit .. //depot/projects/hammer/sys/kern/syscalls.master#58 edit .. //depot/projects/hammer/sys/kern/systrace_args.c#3 edit .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#66 edit .. //depot/projects/hammer/sys/sys/_types.h#16 edit .. //depot/projects/hammer/sys/sys/stat.h#12 edit .. //depot/projects/hammer/sys/sys/syscall.h#56 edit .. //depot/projects/hammer/sys/sys/syscall.mk#56 edit .. //depot/projects/hammer/sys/sys/sysproto.h#57 edit .. //depot/projects/hammer/sys/sys/vnode.h#70 edit Differences ... ==== //depot/projects/hammer/sys/kern/init_sysent.c#59 (text+ko) ==== @@ -447,9 +447,9 @@ { AS(__mac_execve_args), (sy_call_t *)__mac_execve, AUE_NULL, NULL, 0, 0 }, /* 415 = __mac_execve */ { AS(sigaction_args), (sy_call_t *)sigaction, AUE_SIGACTION, NULL, 0, 0 }, /* 416 = sigaction */ { AS(sigreturn_args), (sy_call_t *)sigreturn, AUE_SIGRETURN, NULL, 0, 0 }, /* 417 = sigreturn */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 418 = __xstat */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 419 = __xfstat */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 420 = __xlstat */ + { AS(__xstat_args), (sy_call_t *)__xstat, AUE_STAT, NULL, 0, 0 }, /* 418 = __xstat */ + { AS(__xfstat_args), (sy_call_t *)__xfstat, AUE_FSTAT, NULL, 0, 0 }, /* 419 = __xfstat */ + { AS(__xlstat_args), (sy_call_t *)__xlstat, AUE_LSTAT, NULL, 0, 0 }, /* 420 = __xlstat */ { AS(getcontext_args), (sy_call_t *)getcontext, AUE_NULL, NULL, 0, 0 }, /* 421 = getcontext */ { AS(setcontext_args), (sy_call_t *)setcontext, AUE_NULL, NULL, 0, 0 }, /* 422 = setcontext */ { AS(swapcontext_args), (sy_call_t *)swapcontext, AUE_NULL, NULL, 0, 0 }, /* 423 = swapcontext */ ==== //depot/projects/hammer/sys/kern/kern_descrip.c#65 (text+ko) ==== @@ -1080,6 +1080,31 @@ return (error); } +#ifndef _SYS_SYSPROTO_H_ +struct __xfstat_args { + int ver; + int fd; + struct _new_stat *sb; +}; +#endif +/* ARGSUSED */ +int +__xfstat(struct thread *td, struct __xfstat_args *uap) +{ + struct stat ub; + struct _new_stat nub; + int error; + + if (uap->ver != __STATVER) + return (EOPNOTSUPP); + error = kern_fstat(td, uap->fd, &ub); + if (error == 0) { + cvtnewstat(&ub, &nub); + error = copyout(&nub, uap->sb, sizeof(nub)); + } + return (error); +} + int kern_fstat(struct thread *td, int fd, struct stat *sbp) { ==== //depot/projects/hammer/sys/kern/syscalls.c#57 (text+ko) ==== @@ -425,9 +425,9 @@ "__mac_execve", /* 415 = __mac_execve */ "sigaction", /* 416 = sigaction */ "sigreturn", /* 417 = sigreturn */ - "#418", /* 418 = __xstat */ - "#419", /* 419 = __xfstat */ - "#420", /* 420 = __xlstat */ + "__xstat", /* 418 = __xstat */ + "__xfstat", /* 419 = __xfstat */ + "__xlstat", /* 420 = __xlstat */ "getcontext", /* 421 = getcontext */ "setcontext", /* 422 = setcontext */ "swapcontext", /* 423 = swapcontext */ ==== //depot/projects/hammer/sys/kern/syscalls.master#58 (text+ko) ==== @@ -735,9 +735,12 @@ struct sigaction *oact); } 417 AUE_SIGRETURN STD { int sigreturn( \ const struct __ucontext *sigcntxp); } -418 AUE_NULL UNIMPL __xstat -419 AUE_NULL UNIMPL __xfstat -420 AUE_NULL UNIMPL __xlstat +418 AUE_STAT STD { int __xstat(int ver, char *path, \ + struct _new_stat *ub); } +419 AUE_FSTAT STD { int __xfstat(int ver, int fd, \ + struct _new_stat *sb); } +420 AUE_LSTAT STD { int __xlstat(int ver, char *path, \ + struct _new_stat *ub); } 421 AUE_NULL STD { int getcontext(struct __ucontext *ucp); } 422 AUE_NULL STD { int setcontext( \ const struct __ucontext *ucp); } ==== //depot/projects/hammer/sys/kern/systrace_args.c#3 (text+ko) ==== @@ -2380,6 +2380,33 @@ *n_args = 1; break; } + /* __xstat */ + case 418: { + struct __xstat_args *p = params; + iarg[0] = p->ver; /* int */ + uarg[1] = (intptr_t) p->path; /* char * */ + uarg[2] = (intptr_t) p->ub; /* struct _new_stat * */ + *n_args = 3; + break; + } + /* __xfstat */ + case 419: { + struct __xfstat_args *p = params; + iarg[0] = p->ver; /* int */ + iarg[1] = p->fd; /* int */ + uarg[2] = (intptr_t) p->sb; /* struct _new_stat * */ + *n_args = 3; + break; + } + /* __xlstat */ + case 420: { + struct __xlstat_args *p = params; + iarg[0] = p->ver; /* int */ + uarg[1] = (intptr_t) p->path; /* char * */ + uarg[2] = (intptr_t) p->ub; /* struct _new_stat * */ + *n_args = 3; + break; + } /* getcontext */ case 421: { struct getcontext_args *p = params; ==== //depot/projects/hammer/sys/kern/vfs_syscalls.c#66 (text+ko) ==== @@ -2033,6 +2033,33 @@ #endif /* COMPAT_43 */ /* + * Convert from a current to new stat structure. + */ +void +cvtnewstat(st, nst) + struct stat *st; + struct _new_stat *nst; +{ + bzero(nst, sizeof *nst); + nst->st_dev = st->st_dev; + nst->st_ino = st->st_ino; + nst->st_mode = st->st_mode; + nst->st_nlink = st->st_nlink; + nst->st_uid = st->st_uid; + nst->st_gid = st->st_gid; + nst->st_rdev = st->st_rdev; + nst->st_atimespec = st->st_atimespec; + nst->st_mtimespec = st->st_mtimespec; + nst->st_ctimespec = st->st_ctimespec; + nst->st_size = st->st_size; + nst->st_blocks = st->st_blocks; + nst->st_blksize = st->st_blksize; + nst->st_flags = st->st_flags; + nst->st_gen = st->st_gen; + nst->st_birthtimespec = st->st_birthtimespec; +} + +/* * Get file status; this version follows links. */ #ifndef _SYS_SYSPROTO_H_ @@ -2058,7 +2085,31 @@ return (error); } +#ifndef _SYS_SYSPROTO_H_ +struct __xstat_args { + int ver; + char *path; + struct _new_stat *ub; +}; +#endif int +__xstat(struct thread *td, struct __xstat_args *uap) +{ + struct stat sb; + struct _new_stat nsb; + int error; + + if (uap->ver != __STATVER) + return (EOPNOTSUPP); + error = kern_stat(td, uap->path, UIO_USERSPACE, &sb); + if (error == 0) { + cvtnewstat(&sb, &nsb); + error = copyout(&nsb, uap->ub, sizeof (nsb)); + } + return (error); +} + +int kern_stat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp) { struct nameidata nd; @@ -2109,6 +2160,30 @@ return (error); } +#ifndef _SYS_SYSPROTO_H_ +struct __xlstat_args { + int ver; + char *path; + struct _new_stat *ub; +}; +#endif +int +__xlstat(struct thread *td, struct __xlstat_args *uap) +{ + struct stat sb; + struct _new_stat nsb; + int error; + + if (uap->ver != __STATVER) + return (EOPNOTSUPP); + error = kern_lstat(td, uap->path, UIO_USERSPACE, &sb); + if (error == 0) { + cvtnewstat(&sb, &nsb); + error = copyout(&nsb, uap->ub, sizeof (nsb)); + } + return (error); +} + int kern_lstat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp) { ==== //depot/projects/hammer/sys/sys/_types.h#16 (text+ko) ==== @@ -62,6 +62,11 @@ typedef __uint32_t __uid_t; typedef unsigned int __useconds_t; /* microseconds (unsigned) */ +/* New types for 64 bit inode number support (forward compat only) */ +typedef __uint64_t __new_ino_t; /* inode number */ +typedef __uint32_t __new_mode_t; /* permissions */ +typedef __uint32_t __new_nlink_t; /* link count */ + /* * Unusual type definitions. */ ==== //depot/projects/hammer/sys/sys/stat.h#12 (text+ko) ==== @@ -174,6 +174,40 @@ #endif }; +/* New 64 bit inode number support forward compatability */ +struct _new_stat { + __dev_t st_dev; /* inode's device */ + __dev_t st_rdev; /* device type */ + __new_mode_t st_mode; /* inode protection mode */ + __new_nlink_t st_nlink; /* number of hard links */ + uid_t st_uid; /* user ID of the file's owner */ + gid_t st_gid; /* group ID of the file's group */ + __new_ino_t st_ino; /* inode's number */ +#if __BSD_VISIBLE + struct timespec st_atimespec; /* time of last access */ + struct timespec st_mtimespec; /* time of last data modification */ + struct timespec st_ctimespec; /* time of last file status change */ + struct timespec st_birthtimespec; /* time of file creation */ +#else + time_t st_atime; /* time of last access */ + long st_atimensec; /* nsec of last access */ + time_t st_mtime; /* time of last data modification */ + long st_mtimensec; /* nsec of last data modification */ + time_t st_ctime; /* time of last file status change */ + long st_ctimensec; /* nsec of last file status change */ + time_t st_birthtime; /* time of file creation */ + long st_birthtimensec; /* nsec of file creation */ +#endif + off_t st_size; /* file size, in bytes */ + __int64_t st_blocks; /* blocks allocated for file */ + __uint32_t st_blksize; /* optimal blocksize for I/O */ + fflags_t st_flags; /* user defined flags for file */ + __uint32_t st_gen; /* file generation number */ + __int32_t __pad2; /* pad to 64 bit alignment */ + __int64_t __pad3[4]; /* spare */ +}; +#define __STATVER 700 /* FreeBSD 7.0 */ + #if __BSD_VISIBLE struct nstat { __dev_t st_dev; /* inode's device */ ==== //depot/projects/hammer/sys/sys/syscall.h#56 (text+ko) ==== @@ -344,6 +344,9 @@ #define SYS___mac_execve 415 #define SYS_sigaction 416 #define SYS_sigreturn 417 +#define SYS___xstat 418 +#define SYS___xfstat 419 +#define SYS___xlstat 420 #define SYS_getcontext 421 #define SYS_setcontext 422 #define SYS_swapcontext 423 ==== //depot/projects/hammer/sys/sys/syscall.mk#56 (text+ko) ==== @@ -286,6 +286,9 @@ __mac_execve.o \ sigaction.o \ sigreturn.o \ + __xstat.o \ + __xfstat.o \ + __xlstat.o \ getcontext.o \ setcontext.o \ swapcontext.o \ ==== //depot/projects/hammer/sys/sys/sysproto.h#57 (text+ko) ==== @@ -1257,6 +1257,21 @@ struct sigreturn_args { char sigcntxp_l_[PADL_(const struct __ucontext *)]; const struct __ucontext * sigcntxp; char sigcntxp_r_[PADR_(const struct __ucontext *)]; }; +struct __xstat_args { + char ver_l_[PADL_(int)]; int ver; char ver_r_[PADR_(int)]; + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char ub_l_[PADL_(struct _new_stat *)]; struct _new_stat * ub; char ub_r_[PADR_(struct _new_stat *)]; +}; +struct __xfstat_args { + char ver_l_[PADL_(int)]; int ver; char ver_r_[PADR_(int)]; + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char sb_l_[PADL_(struct _new_stat *)]; struct _new_stat * sb; char sb_r_[PADR_(struct _new_stat *)]; +}; +struct __xlstat_args { + char ver_l_[PADL_(int)]; int ver; char ver_r_[PADR_(int)]; + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char ub_l_[PADL_(struct _new_stat *)]; struct _new_stat * ub; char ub_r_[PADR_(struct _new_stat *)]; +}; struct getcontext_args { char ucp_l_[PADL_(struct __ucontext *)]; struct __ucontext * ucp; char ucp_r_[PADR_(struct __ucontext *)]; }; @@ -1797,6 +1812,9 @@ int __mac_execve(struct thread *, struct __mac_execve_args *); int sigaction(struct thread *, struct sigaction_args *); int sigreturn(struct thread *, struct sigreturn_args *); +int __xstat(struct thread *, struct __xstat_args *); +int __xfstat(struct thread *, struct __xfstat_args *); +int __xlstat(struct thread *, struct __xlstat_args *); int getcontext(struct thread *, struct getcontext_args *); int setcontext(struct thread *, struct setcontext_args *); int swapcontext(struct thread *, struct swapcontext_args *); @@ -2354,6 +2372,9 @@ #define SYS_AUE___mac_execve AUE_NULL #define SYS_AUE_sigaction AUE_SIGACTION #define SYS_AUE_sigreturn AUE_SIGRETURN +#define SYS_AUE___xstat AUE_STAT +#define SYS_AUE___xfstat AUE_FSTAT +#define SYS_AUE___xlstat AUE_LSTAT #define SYS_AUE_getcontext AUE_NULL #define SYS_AUE_setcontext AUE_NULL #define SYS_AUE_swapcontext AUE_NULL ==== //depot/projects/hammer/sys/sys/vnode.h#70 (text+ko) ==== @@ -550,6 +550,7 @@ struct thread; struct proc; struct stat; +struct _new_stat; struct nstat; struct ucred; struct uio; @@ -569,6 +570,7 @@ int change_dir(struct vnode *vp, struct thread *td); int change_root(struct vnode *vp, struct thread *td); void cvtstat(struct stat *st, struct ostat *ost); +void cvtnewstat(struct stat *st, struct _new_stat *ost); void cvtnstat(struct stat *sb, struct nstat *nsb); int getnewvnode(const char *tag, struct mount *mp, struct vop_vector *vops, struct vnode **vpp); From owner-p4-projects@FreeBSD.ORG Fri Apr 13 05:12:17 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BEBB816A404; Fri, 13 Apr 2007 05:12:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 716D316A401 for ; Fri, 13 Apr 2007 05:12:16 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6359A13C465 for ; Fri, 13 Apr 2007 05:12:16 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3D5CGqa034984 for ; Fri, 13 Apr 2007 05:12:16 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3D5CGQA034970 for perforce@freebsd.org; Fri, 13 Apr 2007 05:12:16 GMT (envelope-from scottl@freebsd.org) Date: Fri, 13 Apr 2007 05:12:16 GMT Message-Id: <200704130512.l3D5CGQA034970@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 117988 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Apr 2007 05:12:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=117988 Change 117988 by scottl@scottl-y1 on 2007/04/13 05:11:35 Drop the periph lock around calling make_dev Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#10 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ses.c#12 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sg.c#5 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#10 (text+ko) ==== @@ -374,9 +374,11 @@ DEVSTAT_PRIORITY_OTHER); /* Register the device */ + cam_periph_unlock(periph); softc->dev = make_dev(&ch_cdevsw, periph->unit_number, UID_ROOT, GID_OPERATOR, 0600, "%s%d", periph->periph_name, periph->unit_number); + cam_periph_lock(periph); softc->dev->si_drv1 = periph; /* ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ses.c#12 (text+ko) ==== @@ -364,9 +364,11 @@ return (CAM_REQ_CMP_ERR); } + cam_periph_unlock(periph); softc->ses_dev = make_dev(&ses_cdevsw, unit2minor(periph->unit_number), UID_ROOT, GID_OPERATOR, 0600, "%s%d", periph->periph_name, periph->unit_number); + cam_periph_lock(periph); softc->ses_dev->si_drv1 = periph; /* ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sg.c#5 (text+ko) ==== @@ -319,11 +319,13 @@ DEVSTAT_PRIORITY_PASS); /* Register the device */ + cam_periph_unlock(periph); softc->dev = make_dev(&sg_cdevsw, unit2minor(periph->unit_number), UID_ROOT, GID_OPERATOR, 0600, "%s%d", periph->periph_name, periph->unit_number); softc->devalias = make_dev_alias(softc->dev, "sg%c", 'a' + periph->unit_number); + cam_periph_lock(periph); softc->dev->si_drv1 = periph; /* From owner-p4-projects@FreeBSD.ORG Fri Apr 13 11:00:32 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14FB016A403; Fri, 13 Apr 2007 11:00:32 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D711116A400 for ; Fri, 13 Apr 2007 11:00:31 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B07F113C480 for ; Fri, 13 Apr 2007 11:00:31 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3DB0VmD006485 for ; Fri, 13 Apr 2007 11:00:31 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3DB0VNh006482 for perforce@freebsd.org; Fri, 13 Apr 2007 11:00:31 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 13 Apr 2007 11:00:31 GMT Message-Id: <200704131100.l3DB0VNh006482@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 117996 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Apr 2007 11:00:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=117996 Change 117996 by hselasky@hselasky_mini_itx on 2007/04/13 11:00:10 Fix a bug where "usbd_find_edesc()" returns the wrong descriptor. Reported by Markus Henschel. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#31 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#31 (text+ko) ==== @@ -352,7 +352,7 @@ if (curidx == endptidx) { return ((desc->bLength >= USB_ENDPOINT_DESCRIPTOR_SIZE) ? - ((void *)d) : NULL); + ((void *)desc) : NULL); } curidx++; } From owner-p4-projects@FreeBSD.ORG Fri Apr 13 15:55:48 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6771816A405; Fri, 13 Apr 2007 15:55:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2C0F816A401 for ; Fri, 13 Apr 2007 15:55:48 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1AF9B13C480 for ; Fri, 13 Apr 2007 15:55:48 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3DFtl0Q074899 for ; Fri, 13 Apr 2007 15:55:47 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3DFtlhe074896 for perforce@freebsd.org; Fri, 13 Apr 2007 15:55:47 GMT (envelope-from scottl@freebsd.org) Date: Fri, 13 Apr 2007 15:55:47 GMT Message-Id: <200704131555.l3DFtlhe074896@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 118008 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Apr 2007 15:55:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=118008 Change 118008 by scottl@scottl-y1 on 2007/04/13 15:54:55 Untested but hopefully functional locking for the target driver. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_target.c#10 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_target.c#10 (text+ko) ==== @@ -47,6 +47,7 @@ #include #include #include +#include #include /* Transaction information attached to each CCB sent by the user */ @@ -160,7 +161,11 @@ static MALLOC_DEFINE(M_TARG, "TARG", "TARG data"); -/* Create softc and initialize it. Only one proc can open each targ device. */ +/* + * Create softc and initialize it. Only one proc can open each targ device. + * There is no locking here because a periph doesn't get created until an + * ioctl is issued to do so, and that can't happen until this method returns. + */ static int targopen(struct cdev *dev, int flags, int fmt, struct thread *td) { @@ -199,9 +204,24 @@ targclose(struct cdev *dev, int flag, int fmt, struct thread *td) { struct targ_softc *softc; + struct cam_periph *periph; int error; softc = (struct targ_softc *)dev->si_drv1; + if ((softc->periph == NULL) || + (softc->state & TARG_STATE_LUN_ENABLED) == 0) { + destroy_dev(dev); + FREE(softc, M_TARG); + return (0); + } + + /* + * Acquire a hold on the periph so that it doesn't go away before + * we are ready at the end of the function. + */ + periph = softc->periph; + cam_periph_acquire(periph); + cam_periph_lock(periph); error = targdisable(softc); if (error == CAM_REQ_CMP) { dev->si_drv1 = 0; @@ -212,6 +232,9 @@ destroy_dev(dev); FREE(softc, M_TARG); } + cam_periph_unlock(periph); + cam_periph_release(periph); + return (error); } @@ -229,44 +252,56 @@ { struct ioc_enable_lun *new_lun; struct cam_path *path; + struct cam_sim *sim; new_lun = (struct ioc_enable_lun *)addr; - status = xpt_create_path(&path, /*periph*/NULL, - new_lun->path_id, - new_lun->target_id, - new_lun->lun_id); + status = xpt_create_path_unlocked(&path, /*periph*/NULL, + new_lun->path_id, + new_lun->target_id, + new_lun->lun_id); if (status != CAM_REQ_CMP) { printf("Couldn't create path, status %#x\n", status); break; } + sim = xpt_path_sim(path); + mtx_lock(sim->mtx); status = targenable(softc, path, new_lun->grp6_len, new_lun->grp7_len); xpt_free_path(path); + mtx_unlock(sim->mtx); break; } case TARGIOCDISABLE: + if (softc->periph == NULL) { + status = CAM_DEV_NOT_THERE; + break; + } + cam_periph_lock(softc->periph); status = targdisable(softc); + cam_periph_unlock(softc->periph); break; case TARGIOCDEBUG: { #ifdef CAMDEBUG struct ccb_debug cdbg; + /* If no periph available, disallow debugging changes */ + if ((softc->state & TARG_STATE_LUN_ENABLED) == 0) { + status = CAM_DEV_NOT_THERE; + break; + } bzero(&cdbg, sizeof cdbg); if (*((int *)addr) != 0) cdbg.flags = CAM_DEBUG_PERIPH; else cdbg.flags = CAM_DEBUG_NONE; + cam_periph_lock(softc->periph); xpt_setup_ccb(&cdbg.ccb_h, softc->path, /*priority*/0); cdbg.ccb_h.func_code = XPT_DEBUG; cdbg.ccb_h.cbfcnp = targdone; - /* If no periph available, disallow debugging changes */ - if ((softc->state & TARG_STATE_LUN_ENABLED) == 0) { - status = CAM_DEV_NOT_THERE; - break; - } xpt_action((union ccb *)&cdbg); + cam_periph_unlock(softc->periph); status = cdbg.ccb_h.status & CAM_STATUS_MASK; #else status = CAM_FUNC_NOTAVAIL; @@ -294,10 +329,12 @@ revents = poll_events & (POLLOUT | POLLWRNORM); if ((poll_events & (POLLIN | POLLRDNORM)) != 0) { /* Poll for read() depends on user and abort queues. */ + cam_periph_lock(softc->periph); if (!TAILQ_EMPTY(&softc->user_ccb_queue) || !TAILQ_EMPTY(&softc->abort_queue)) { revents |= poll_events & (POLLIN | POLLRDNORM); } + cam_periph_unlock(softc->periph); /* Only sleep if the user didn't poll for write. */ if (revents == 0) selrecord(td, &softc->read_select); @@ -335,8 +372,10 @@ int retval; softc = (struct targ_softc *)kn->kn_hook; + cam_periph_lock(softc->periph); retval = !TAILQ_EMPTY(&softc->user_ccb_queue) || !TAILQ_EMPTY(&softc->abort_queue); + cam_periph_unlock(softc->periph); return (retval); } @@ -532,6 +571,7 @@ switch (func_code) { case XPT_ACCEPT_TARGET_IO: case XPT_IMMED_NOTIFY: + cam_periph_lock(softc->periph); ccb = targgetccb(softc, func_code, priority); descr = (struct targ_cmd_descr *)ccb->ccb_h.targ_descr; descr->user_ccb = user_ccb; @@ -542,8 +582,10 @@ TAILQ_INSERT_TAIL(&softc->pending_ccb_queue, &ccb->ccb_h, periph_links.tqe); + cam_periph_unlock(softc->periph); break; default: + cam_periph_lock(softc->periph); if ((func_code & XPT_FC_QUEUED) != 0) { CAM_DEBUG(softc->path, CAM_DEBUG_PERIPH, ("Sending queued ccb %#x (%p)\n", @@ -569,6 +611,7 @@ targsendccb(softc, ccb, descr); targreturnccb(softc, ccb); } + cam_periph_unlock(softc->periph); break; } write_len += sizeof(user_ccb); @@ -796,8 +839,6 @@ union ccb *user_ccb; int read_len, error; - mtx_lock(&Giant); - error = 0; read_len = 0; softc = (struct targ_softc *)dev->si_drv1; @@ -806,11 +847,12 @@ CAM_DEBUG(softc->path, CAM_DEBUG_PERIPH, ("targread\n")); /* If no data is available, wait or return immediately */ + cam_periph_lock(softc->periph); ccb_h = TAILQ_FIRST(user_queue); user_descr = TAILQ_FIRST(abort_queue); while (ccb_h == NULL && user_descr == NULL) { if ((ioflag & IO_NDELAY) == 0) { - error = tsleep(user_queue, + error = msleep(user_queue, softc->periph->sim->mtx, PRIBIO | PCATCH, "targrd", 0); ccb_h = TAILQ_FIRST(user_queue); user_descr = TAILQ_FIRST(abort_queue); @@ -822,7 +864,7 @@ } } } else { - mtx_unlock(&Giant); + cam_periph_unlock(softc->periph); return (EAGAIN); } } @@ -841,7 +883,9 @@ error = targreturnccb(softc, (union ccb *)ccb_h); if (error != 0) goto read_fail; + cam_periph_unlock(softc->periph); error = uiomove((caddr_t)&user_ccb, sizeof(user_ccb), uio); + cam_periph_lock(softc->periph); if (error != 0) goto read_fail; read_len += sizeof(user_ccb); @@ -859,7 +903,9 @@ ("targread aborted descr %p (%p)\n", user_descr, user_ccb)); suword(&user_ccb->ccb_h.status, CAM_REQ_ABORTED); + cam_periph_unlock(softc->periph); error = uiomove((caddr_t)&user_ccb, sizeof(user_ccb), uio); + cam_periph_lock(softc->periph); if (error != 0) goto read_fail; read_len += sizeof(user_ccb); @@ -876,7 +922,7 @@ error = ENOSPC; read_fail: - mtx_unlock(&Giant); + cam_periph_unlock(softc->periph); return (error); } From owner-p4-projects@FreeBSD.ORG Fri Apr 13 16:05:00 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 12CE116A40A; Fri, 13 Apr 2007 16:05:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D8F6D16A408 for ; Fri, 13 Apr 2007 16:04:59 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C8DF913C4CA for ; Fri, 13 Apr 2007 16:04:59 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3DG4xEl077388 for ; Fri, 13 Apr 2007 16:04:59 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3DG4xoi077385 for perforce@freebsd.org; Fri, 13 Apr 2007 16:04:59 GMT (envelope-from scottl@freebsd.org) Date: Fri, 13 Apr 2007 16:04:59 GMT Message-Id: <200704131604.l3DG4xoi077385@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 118009 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Apr 2007 16:05:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=118009 Change 118009 by scottl@scottl-y1 on 2007/04/13 16:04:15 Add xpt_create_path_unlocked() to allow a non-wildcard path to be created without needing the sim locked first. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#55 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.h#7 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#55 (text+ko) ==== @@ -4102,11 +4102,6 @@ struct cam_path *path; cam_status status; -#if 0 - if (perph != NULL) - mtx_assert(perph->sim->mtx, MA_OWNED); -#endif - path = (struct cam_path *)malloc(sizeof(*path), M_CAMXPT, M_NOWAIT); if (path == NULL) { @@ -4122,6 +4117,36 @@ return (status); } +cam_status +xpt_create_path_unlocked(struct cam_path **new_path_ptr, + struct cam_periph *periph, path_id_t path_id, + target_id_t target_id, lun_id_t lun_id) +{ + struct cam_path *path; + struct cam_eb *bus = NULL; + cam_status status; + int need_unlock = 0; + + path = (struct cam_path *)malloc(sizeof(*path), M_CAMXPT, M_WAITOK); + + if (path_id != CAM_BUS_WILDCARD) { + bus = xpt_find_bus(path_id); + if (bus != NULL) { + need_unlock = 1; + mtx_lock(bus->sim->mtx); + } + } + status = xpt_compile_path(path, periph, path_id, target_id, lun_id); + if (need_unlock) + mtx_unlock(bus->sim->mtx); + if (status != CAM_REQ_CMP) { + free(path, M_CAMXPT); + path = NULL; + } + *new_path_ptr = path; + return (status); +} + static cam_status xpt_compile_path(struct cam_path *new_path, struct cam_periph *perph, path_id_t path_id, target_id_t target_id, lun_id_t lun_id) ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.h#7 (text+ko) ==== @@ -58,6 +58,10 @@ struct cam_periph *perph, path_id_t path_id, target_id_t target_id, lun_id_t lun_id); +cam_status xpt_create_path_unlocked(struct cam_path **new_path_ptr, + struct cam_periph *perph, + path_id_t path_id, + target_id_t target_id, lun_id_t lun_id); void xpt_free_path(struct cam_path *path); int xpt_path_comp(struct cam_path *path1, struct cam_path *path2); From owner-p4-projects@FreeBSD.ORG Fri Apr 13 16:49:04 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04B2F16A407; Fri, 13 Apr 2007 16:49:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C9D7016A405 for ; Fri, 13 Apr 2007 16:49:03 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BA33013C469 for ; Fri, 13 Apr 2007 16:49:03 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3DGn3oP093323 for ; Fri, 13 Apr 2007 16:49:03 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3DGn3Jg093320 for perforce@freebsd.org; Fri, 13 Apr 2007 16:49:03 GMT (envelope-from scottl@freebsd.org) Date: Fri, 13 Apr 2007 16:49:03 GMT Message-Id: <200704131649.l3DGn3Jg093320@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 118014 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Apr 2007 16:49:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=118014 Change 118014 by scottl@scottl-y1 on 2007/04/13 16:48:19 Change the last instances of tsleep to msleep. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_targ_bh.c#7 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_target.c#11 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_targ_bh.c#7 (text+ko) ==== @@ -447,7 +447,7 @@ /* FALLTHROUGH */ default: /* XXX Wait for callback of targbhdislun() */ - tsleep(softc, PRIBIO, "targbh", hz/2); + msleep(softc, periph->sim->mtx, PRIBIO, "targbh", hz/2); free(softc, M_SCSIBH); break; } ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_target.c#11 (text+ko) ==== @@ -1083,7 +1083,7 @@ /* If we aborted at least one pending CCB ok, wait for it. */ if (cab.ccb_h.status == CAM_REQ_CMP) { - tsleep(&softc->pending_ccb_queue, + msleep(&softc->pending_ccb_queue, softc->path->sim->mtx, PRIBIO | PCATCH, "tgabrt", 0); } From owner-p4-projects@FreeBSD.ORG Fri Apr 13 17:15:45 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 29EEE16A406; Fri, 13 Apr 2007 17:15:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B376A16A404 for ; Fri, 13 Apr 2007 17:15:44 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A335113C4AD for ; Fri, 13 Apr 2007 17:15:44 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3DHFiGc099445 for ; Fri, 13 Apr 2007 17:15:44 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3DHFi38099408 for perforce@freebsd.org; Fri, 13 Apr 2007 17:15:44 GMT (envelope-from scottl@freebsd.org) Date: Fri, 13 Apr 2007 17:15:44 GMT Message-Id: <200704131715.l3DHFi38099408@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 118018 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Apr 2007 17:15:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=118018 Change 118018 by scottl@scottl-y1 on 2007/04/13 17:11:24 Fix compile errors from the last version. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_target.c#12 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_target.c#12 (text+ko) ==== @@ -1051,6 +1051,7 @@ struct targ_cmd_descr *descr; struct ccb_abort cab; struct ccb_hdr *ccb_h; + struct cam_sim *sim; CAM_DEBUG(softc->path, CAM_DEBUG_PERIPH, ("abort_all_pending\n")); @@ -1083,7 +1084,8 @@ /* If we aborted at least one pending CCB ok, wait for it. */ if (cab.ccb_h.status == CAM_REQ_CMP) { - msleep(&softc->pending_ccb_queue, softc->path->sim->mtx, + sim = xpt_path_sim(softc->path); + msleep(&softc->pending_ccb_queue, sim->mtx, PRIBIO | PCATCH, "tgabrt", 0); } From owner-p4-projects@FreeBSD.ORG Fri Apr 13 17:46:23 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A10116A406; Fri, 13 Apr 2007 17:46:23 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DCD5216A404 for ; Fri, 13 Apr 2007 17:46:22 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CB38013C483 for ; Fri, 13 Apr 2007 17:46:22 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3DHkMqF004385 for ; Fri, 13 Apr 2007 17:46:22 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3DHkMYD004382 for perforce@freebsd.org; Fri, 13 Apr 2007 17:46:22 GMT (envelope-from lulf@FreeBSD.org) Date: Fri, 13 Apr 2007 17:46:22 GMT Message-Id: <200704131746.l3DHkMYD004382@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 118020 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Apr 2007 17:46:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=118020 Change 118020 by lulf@lulf_vimes on 2007/04/13 17:45:56 - Update and create new SoC branches. Affected files ... .. //depot/projects/soc2007/lulf-gvinum/vinum_kernel/geom_vinum.c#1 branch .. //depot/projects/soc2007/lulf-gvinum/vinum_kernel/geom_vinum.h#1 branch .. //depot/projects/soc2007/lulf-gvinum/vinum_kernel/geom_vinum_drive.c#1 branch .. //depot/projects/soc2007/lulf-gvinum/vinum_kernel/geom_vinum_init.c#1 branch .. //depot/projects/soc2007/lulf-gvinum/vinum_kernel/geom_vinum_list.c#1 branch .. //depot/projects/soc2007/lulf-gvinum/vinum_kernel/geom_vinum_move.c#1 branch .. //depot/projects/soc2007/lulf-gvinum/vinum_kernel/geom_vinum_plex.c#1 branch .. //depot/projects/soc2007/lulf-gvinum/vinum_kernel/geom_vinum_raid5.c#1 branch .. //depot/projects/soc2007/lulf-gvinum/vinum_kernel/geom_vinum_raid5.h#1 branch .. //depot/projects/soc2007/lulf-gvinum/vinum_kernel/geom_vinum_rename.c#1 branch .. //depot/projects/soc2007/lulf-gvinum/vinum_kernel/geom_vinum_rm.c#1 branch .. //depot/projects/soc2007/lulf-gvinum/vinum_kernel/geom_vinum_share.c#1 branch .. //depot/projects/soc2007/lulf-gvinum/vinum_kernel/geom_vinum_share.h#1 branch .. //depot/projects/soc2007/lulf-gvinum/vinum_kernel/geom_vinum_state.c#1 branch .. //depot/projects/soc2007/lulf-gvinum/vinum_kernel/geom_vinum_subr.c#1 branch .. //depot/projects/soc2007/lulf-gvinum/vinum_kernel/geom_vinum_var.h#1 branch .. //depot/projects/soc2007/lulf-gvinum/vinum_kernel/geom_vinum_volume.c#1 branch .. //depot/projects/soc2007/lulf-gvinum/vinum_user/Makefile#1 branch .. //depot/projects/soc2007/lulf-gvinum/vinum_user/gvinum.8#1 branch .. //depot/projects/soc2007/lulf-gvinum/vinum_user/gvinum.c#1 branch .. //depot/projects/soc2007/lulf-gvinum/vinum_user/gvinum.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum_drive.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum_init.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum_list.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum_move.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum_plex.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum_raid5.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum_raid5.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum_rename.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum_rm.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum_share.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum_share.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum_state.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum_subr.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum_var.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum_volume.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/Makefile#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum_drive.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum_init.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum_list.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum_move.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum_plex.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum_raid5.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum_raid5.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum_rename.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum_rm.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum_share.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum_share.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum_state.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum_subr.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum_var.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum_volume.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/gvinum.8#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/gvinum.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/gvinum.h#1 branch .. //depot/user/lulf/gvinum_bugs/vinum_kernel/geom_vinum.h#2 edit .. //depot/user/lulf/gvinum_bugs/vinum_kernel/geom_vinum_drive.c#2 edit .. //depot/user/lulf/gvinum_bugs/vinum_kernel/geom_vinum_plex.c#2 edit .. //depot/user/lulf/gvinum_bugs/vinum_kernel/geom_vinum_rm.c#3 edit .. //depot/user/lulf/gvinum_bugs/vinum_kernel/geom_vinum_subr.c#4 edit .. //depot/user/lulf/gvinum_bugs/vinum_kernel/geom_vinum_var.h#2 edit .. //depot/user/lulf/gvinum_bugs/vinum_kernel/geom_vinum_volume.c#2 edit .. //depot/user/lulf/gvinum_concat/vinum_kernel/geom_vinum_create.c#6 edit .. //depot/user/lulf/gvinum_concat/vinum_kernel/geom_vinum_share.c#2 edit .. //depot/user/lulf/gvinum_concat/vinum_user/gvinum.c#14 edit Differences ... ==== //depot/user/lulf/gvinum_bugs/vinum_kernel/geom_vinum.h#2 (text+ko) ==== @@ -91,5 +91,7 @@ int gv_sd_to_plex(struct gv_plex *, struct gv_sd *, int); void gv_update_plex_config(struct gv_plex *); void gv_update_vol_size(struct gv_volume *, off_t); +off_t gv_vol_size(struct gv_volume *); +off_t gv_plex_size(struct gv_plex *); #endif /* !_GEOM_VINUM_H_ */ ==== //depot/user/lulf/gvinum_bugs/vinum_kernel/geom_vinum_drive.c#2 (text+ko) ==== @@ -401,7 +401,7 @@ struct g_geom *gp, *gp2; struct g_consumer *cp; struct gv_drive *d; - struct gv_sd *s; + struct gv_sd *s, *s2; struct gv_softc *sc; struct gv_freelist *fl; struct gv_hdr *vhdr; @@ -463,7 +463,6 @@ * configuration. */ d = gv_find_drive(sc, vhdr->label.name); - /* We already know about this drive. */ if (d != NULL) { /* Check if this drive already has a geom. */ @@ -471,10 +470,22 @@ g_topology_unlock(); break; } - bcopy(vhdr, d->hdr, sizeof(*vhdr)); - + /* If we have a dummy, remove it. */ + if (d->flags & GV_DRIVE_DUMMY) { + LIST_FOREACH_SAFE(s, &d->subdisks, from_drive, + s2) { + s->drive_sc = NULL; + LIST_REMOVE(s, from_drive); + } + LIST_REMOVE(d, drive); + g_free(d); + d = NULL; + } else + bcopy(vhdr, d->hdr, sizeof(*vhdr)); + + } /* This is a new drive. */ - } else { + if (d == NULL) { d = g_malloc(sizeof(*d), M_WAITOK | M_ZERO); /* Initialize all needed variables. */ @@ -526,10 +537,12 @@ * them. */ LIST_FOREACH(s, &sc->subdisks, sd) { - if (!strncmp(s->drive, d->name, GV_MAXDRIVENAME)) + if (!strncmp(s->drive, d->name, GV_MAXDRIVENAME)) { /* XXX: errors ignored */ gv_sd_to_drive(sc, d, s, errstr, sizeof(errstr)); + s->flags ^= GV_SD_AWAITING; + } } /* This drive is now up for sure. */ ==== //depot/user/lulf/gvinum_bugs/vinum_kernel/geom_vinum_plex.c#2 (text+ko) ==== @@ -728,6 +728,9 @@ * configuration, we don't check the given value (should we?). * XXX: shouldn't be done here */ + printf("Adding sd %s on drive %s\n", s->name, s->drive); + if (s->flags & GV_SD_AWAITING) + s->state = GV_SD_DOWN; gv_sd_to_plex(p, s, 0); /* Now check if there's already a geom for this plex. */ ==== //depot/user/lulf/gvinum_bugs/vinum_kernel/geom_vinum_rm.c#3 (text+ko) ==== @@ -217,9 +217,7 @@ { struct g_geom *gp; struct gv_volume *v; - struct gv_plex *p2; struct gv_sd *s, *s2; - off_t minplexsize; int err; g_topology_assert(); @@ -265,16 +263,8 @@ p->vol_sc->plexcount--; LIST_REMOVE(p, in_volume); p->vol_sc = NULL; - /* Correctly update the volume size. XXX: Do this on subdisk - * removal also? */ - p2 = LIST_FIRST(&v->plexes); - minplexsize = p2->size; - LIST_FOREACH(p2, &v->plexes, plex) { - if (p2->size < minplexsize) { - minplexsize = p2->size; - } - } - gv_update_vol_size(v, minplexsize); + /* Correctly update the volume size. */ + gv_update_vol_size(v, gv_vol_size(v)); } gv_kill_plex_thread(p); @@ -293,14 +283,28 @@ gv_rm_sd(struct gv_softc *sc, struct gctl_req *req, struct gv_sd *s, int flags) { struct g_provider *pp; + struct gv_plex *p; + struct gv_volume *v; KASSERT(s != NULL, ("gv_rm_sd: NULL s")); pp = s->provider; + p = s->plex_sc; + v = NULL; /* Clean up. */ - if (s->plex_sc) + if (p != NULL) { LIST_REMOVE(s, in_plex); + + p->sdcount--; + /* Update the plexsize. */ + p->size = gv_plex_size(p); + v = p->vol_sc; + if (v != NULL) { + /* Update the size of our plex' volume. */ + gv_update_vol_size(v, gv_vol_size(v)); + } + } if (s->drive_sc) LIST_REMOVE(s, from_drive); LIST_REMOVE(s, sd); ==== //depot/user/lulf/gvinum_bugs/vinum_kernel/geom_vinum_subr.c#4 (text+ko) ==== @@ -89,6 +89,7 @@ struct gv_volume *v, *v2; struct gv_plex *p, *p2; struct gv_sd *s, *s2; + struct gv_drive *d; int tokens; char *token[GV_MAXARGS]; @@ -164,6 +165,25 @@ } } + /* If drive's not up yet, we create a dummy. */ + d = gv_find_drive(sc, s->drive); + if (d == NULL) { + d = g_malloc(sizeof(*d), + M_WAITOK | M_ZERO); + d->size = s->size; + strlcpy(d->name, s->drive, + GV_MAXDRIVENAME); + d->flags |= GV_DRIVE_DUMMY; + LIST_INSERT_HEAD(&sc->drives, d, + drive); + LIST_INSERT_HEAD(&d->subdisks, s, + from_drive); + s->drive_sc = d; + } + + if ((d->flags & GV_DRIVE_DUMMY) && s->state == GV_SD_UP) + s->flags |= GV_SD_AWAITING; + s->vinumconf = sc; LIST_INSERT_HEAD(&sc->subdisks, s, sd); } @@ -345,6 +365,60 @@ v->size = size; } +/* Calculates the plex size. */ +off_t +gv_plex_size(struct gv_plex *p) +{ + struct gv_sd *s; + off_t size; + + KASSERT(p != NULL, ("gv_plex_size: NULL p")); + + if (p->sdcount == 0) + return (0); + + /* Adjust the size of our plex. */ + size = 0; + switch (p->org) { + case GV_PLEX_CONCAT: + LIST_FOREACH(s, &p->subdisks, in_plex) + size += s->size; + break; + case GV_PLEX_STRIPED: + s = LIST_FIRST(&p->subdisks); + size = p->sdcount * s->size; + break; + case GV_PLEX_RAID5: + s = LIST_FIRST(&p->subdisks); + size = (p->sdcount - 1) * s->size; + break; + } + + return (size); +} + +/* Returns the size of a volume. */ +off_t +gv_vol_size(struct gv_volume *v) +{ + struct gv_plex *p; + off_t minplexsize; + + KASSERT(v != NULL, ("gv_vol_size: NULL v")); + + p = LIST_FIRST(&v->plexes); + if (p == NULL) + return (0); + + minplexsize = p->size; + LIST_FOREACH(p, &v->plexes, plex) { + if (p->size < minplexsize) { + minplexsize = p->size; + } + } + return (minplexsize); +} + void gv_update_plex_config(struct gv_plex *p) { @@ -641,13 +715,11 @@ gv_free_sd(struct gv_sd *s) { struct gv_drive *d; - struct gv_plex *p; struct gv_freelist *fl, *fl2; KASSERT(s != NULL, ("gv_free_sd: NULL s")); d = s->drive_sc; - p = s->plex_sc; if (d == NULL) return; @@ -693,21 +765,8 @@ fl->offset = s->drive_offset; } - printf("Decrementing from %d to %d\n", p->sdcount, p->sdcount - 1); d->avail += s->size; d->sdcount--; - p->sdcount--; - switch(p->org) { - case GV_PLEX_CONCAT: - p->size -= s->size; - break; - case GV_PLEX_STRIPED: - p->size = p->sdcount * s->size; - break; - case GV_PLEX_RAID5: - p->size = (p->sdcount - 1) * s->size; - break; - } } void ==== //depot/user/lulf/gvinum_bugs/vinum_kernel/geom_vinum_var.h#2 (text+ko) ==== @@ -190,6 +190,7 @@ #define GV_DRIVE_THREAD_DIE 0x02 /* Signal the worker thread to die. */ #define GV_DRIVE_THREAD_DEAD 0x04 /* The worker thread has died. */ #define GV_DRIVE_NEWBORN 0x08 /* The drive was just created. */ +#define GV_DRIVE_DUMMY 0x10 /* This is a dummy drive. */ struct gv_hdr *hdr; /* The drive header. */ @@ -230,6 +231,7 @@ int flags; #define GV_SD_NEWBORN 0x01 /* Subdisk was just created. */ #define GV_SD_INITCANCEL 0x02 /* Cancel initialization process. */ +#define GV_SD_AWAITING 0x04 /* Awaiting underlying drive. */ char drive[GV_MAXDRIVENAME]; /* Name of underlying drive. */ char plex[GV_MAXPLEXNAME]; /* Name of associated plex. */ ==== //depot/user/lulf/gvinum_bugs/vinum_kernel/geom_vinum_volume.c#2 (text+ko) ==== ==== //depot/user/lulf/gvinum_concat/vinum_kernel/geom_vinum_create.c#6 (text+ko) ==== ==== //depot/user/lulf/gvinum_concat/vinum_kernel/geom_vinum_share.c#2 (text+ko) ==== ==== //depot/user/lulf/gvinum_concat/vinum_user/gvinum.c#14 (text+ko) ==== @@ -170,11 +170,6 @@ if (name == NULL) err(1, "not enough memory"); -/* req = gctl_get_handle(); - gctl_ro_param(req, "class", -1, "VINUM"); - gctl_ro_param(req, "verb", -1, "exists"); - gctl_ro_param(req, "type", sizeof(int), &type);*/ - /* * We loop to find a unique drive name for our object. Jump out of the loop * if we reach 100000, which is a pretty big number never going to be reach @@ -220,12 +215,8 @@ printf("Trying to create drive on %s\n", device); /* Strip away eventual /dev/ in front. */ - if (*device == '/') { - device++; - while (*device != '/') - device++; - device++; - } + if (strncmp(device, "/dev/", 5) == 0) + device += 5; drivename = gvinum_find_name("gvinumdrive", GV_TYPE_DRIVE, GV_MAXDRIVENAME); From owner-p4-projects@FreeBSD.ORG Fri Apr 13 17:47:25 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1829C16A407; Fri, 13 Apr 2007 17:47:25 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D201016A402 for ; Fri, 13 Apr 2007 17:47:24 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C199813C4BE for ; Fri, 13 Apr 2007 17:47:24 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3DHlODf004433 for ; Fri, 13 Apr 2007 17:47:24 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3DHlOBZ004430 for perforce@freebsd.org; Fri, 13 Apr 2007 17:47:24 GMT (envelope-from lulf@FreeBSD.org) Date: Fri, 13 Apr 2007 17:47:24 GMT Message-Id: <200704131747.l3DHlOBZ004430@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 118021 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Apr 2007 17:47:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=118021 Change 118021 by lulf@lulf_vimes on 2007/04/13 17:46:51 - Integrate to the main gvinum branch. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_main/vinum_kernel/geom_vinum.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_kernel/geom_vinum.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_kernel/geom_vinum_drive.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_kernel/geom_vinum_init.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_kernel/geom_vinum_list.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_kernel/geom_vinum_move.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_kernel/geom_vinum_plex.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_kernel/geom_vinum_raid5.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_kernel/geom_vinum_raid5.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_kernel/geom_vinum_rename.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_kernel/geom_vinum_rm.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_kernel/geom_vinum_share.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_kernel/geom_vinum_share.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_kernel/geom_vinum_state.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_kernel/geom_vinum_subr.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_kernel/geom_vinum_var.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_kernel/geom_vinum_volume.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_user/Makefile#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_user/geom_vinum.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_user/geom_vinum.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_user/geom_vinum_drive.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_user/geom_vinum_init.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_user/geom_vinum_list.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_user/geom_vinum_move.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_user/geom_vinum_plex.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_user/geom_vinum_raid5.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_user/geom_vinum_raid5.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_user/geom_vinum_rename.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_user/geom_vinum_rm.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_user/geom_vinum_share.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_user/geom_vinum_share.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_user/geom_vinum_state.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_user/geom_vinum_subr.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_user/geom_vinum_var.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_user/geom_vinum_volume.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_user/gvinum.8#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_user/gvinum.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/vinum_user/gvinum.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 13 17:50:00 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2177516A408; Fri, 13 Apr 2007 17:50:00 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C0A4F16A402 for ; Fri, 13 Apr 2007 17:49:59 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id AD83213C44C for ; Fri, 13 Apr 2007 17:49:59 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3DHnxcN004578 for ; Fri, 13 Apr 2007 17:49:59 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3DHnwWS004540 for perforce@freebsd.org; Fri, 13 Apr 2007 17:49:58 GMT (envelope-from rdivacky@FreeBSD.org) Date: Fri, 13 Apr 2007 17:49:58 GMT Message-Id: <200704131749.l3DHnwWS004540@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 118022 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Apr 2007 17:50:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=118022 Change 118022 by rdivacky@rdivacky_witten on 2007/04/13 17:47:49 Linux *at family of syscalls branch. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_misc.c#8 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_ipc.c#10 edit .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_ipc.c#2 edit .. //depot/projects/linuxolator/src/sys/i386/ibcs2/ibcs2_ipc.c#2 edit .. //depot/projects/linuxolator/src/sys/kern/sysv_shm.c#6 edit .. //depot/projects/linuxolator/src/sys/sys/syscallsubr.h#6 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/acpica/madt.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/bios.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/db_interface.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/db_trace.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/fpu.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/io.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/io_apic.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/local_apic.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/mpboot.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/mptable.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/msi.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/support.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/conf/.cvsignore#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/conf/DEFAULTS#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/conf/MAC#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/conf/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/conf/NOTES#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/_bus.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/_limits.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/_types.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/apicreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/apicvar.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/asm.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/atomic.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/bus.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/clock.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/cpu.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/elf.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/endian.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/exec.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/float.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/fpu.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/frame.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/intr_machdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/iodev.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/kdb.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/limits.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/md_var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/memdev.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/metadata.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/minidump.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/mptable.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/mutex.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/param.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/pc/bios.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/pcb.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/pcb_ext.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/pmap.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/ppireg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/proc.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/profile.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/psl.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/reg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/reloc.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/resource.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/runq.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/segments.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/sf_buf.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/signal.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/smp.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/timerreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/trap.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/tss.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/varargs.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/isa/atpic.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/isa/clock.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/isa/icu.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/isa/isa.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/isa/isa.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/isa/nmi.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/syscalls.master#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/autoconf.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/bcopy_page.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/bcopyinout.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/blockio.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/bootconfig.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/copystr.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/cpufunc.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/db_disasm.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/db_interface.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/db_trace.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/disassem.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/dump_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/elf_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/exception.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/fiq.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/fiq_subr.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/fusu.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/genassym.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/identcpu.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/in_cksum.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/inckern.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/intr.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/locore.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/mem.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/nexus.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/nexus_io.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/nexus_io_asm.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/pmap.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/setcpsr.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/setstack.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/support.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/swtch.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/sys_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/trap.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/uio_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/undefined.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/vectors.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/vm_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/at91.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/at91_mci.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/at91_mcireg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/at91_pio.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/at91_piovar.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/at91_pmc.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/at91_rtc.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/at91_ssc.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/at91var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/files.at91#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/files.kb920x#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/std.at91#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/compile/.cvsignore#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/conf/.cvsignore#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/conf/AVILA#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/conf/BWCT#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/conf/BWCT.hints#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/conf/EP80219#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/conf/IQ31244#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/conf/KB920X#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/conf/KB920X.hints#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/conf/SIMICS#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/_bus.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/_inttypes.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/_limits.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/_stdint.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/_types.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/armreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/asm.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/asmacros.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/atomic.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/blockio.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/bootconfig.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/bus.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/bus_dma.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/clock.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/cpu.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/cpuconf.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/cpufunc.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/db_machdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/disassem.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/elf.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/endian.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/exec.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/fiq.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/float.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/floatingpoint.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/fp.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/frame.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/gdb_machdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/ieee.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/ieeefp.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/in_cksum.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/intr.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/katelib.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/kdb.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/limits.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/machdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/md_var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/memdev.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/metadata.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/mutex.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/param.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/pcb.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/pcpu.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/pmap.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/pmc_mdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/proc.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/profile.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/psl.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/pte.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/ptrace.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/reg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/reloc.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/resource.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/runq.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/setjmp.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/sf_buf.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/sigframe.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/signal.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/smp.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/stdarg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/swi.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/sysarch.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/trap.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/ucontext.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/undefined.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/utrap.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/vmparam.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/ep80219_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/files.ep80219#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/files.i80219#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/std.ep80219#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/std.i80219#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/avila_ata.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/avila_led.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/avila_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/files.avila#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/files.ixp425#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/if_npe.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/if_npereg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/ixdp425_pci.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/ixdp425reg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/ixp425.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/ixp425_a4x_io.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/ixp425_a4x_space.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/ixp425_iic.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/ixp425_intr.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/ixp425_mem.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/ixp425_npe.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/ixp425_npereg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/ixp425_npevar.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/ixp425_pci.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/ixp425_pci_asm.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/ixp425_pci_space.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/ixp425_qmgr.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/ixp425_qmgr.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/ixp425_space.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/ixp425_timer.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/ixp425_wdog.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/ixp425reg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/ixp425var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/std.avila#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/std.ixp425#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/uart_bus_ixp425.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/std.xscale#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/xscalereg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/xscalevar.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/README#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/boot0/README#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/boot2/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/boot2/board.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/boot2/boot2.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/boot2/kb920x_board.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/bootspi/ee.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/bootspi/ee.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/arm_init.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/memcmp.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/memcpy.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/memset.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/strcmp.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/strcpy.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/strcvt.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/strlen.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/Makefile.inc#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/bcache.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/boot.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/bootstrap.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/commands.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/console.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/dev_net.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/dev_net.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/devopen.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/help.common#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/interp.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/interp_backslash.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/interp_forth.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/interp_parse.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/isapnp.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/isapnp.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/load.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/load_elf.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/load_elf32.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/load_elf64.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/load_elf_obj.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/loader.8#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/ls.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/merge_help.awk#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/misc.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/module.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/newvers.sh#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/panic.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/pnp.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/reloc_elf.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/reloc_elf32.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/reloc_elf64.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/ufsread.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/Makefile.inc#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/include/README#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/include/efi.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/include/efiapi.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/include/eficon.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/include/efidebug.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/include/efidef.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/include/efidevp.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/include/efierr.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/include/efifs.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/include/efilib.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/include/efinet.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/include/efipart.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/include/efiprot.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/include/efiser.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/libefi/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/libefi/delay.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/libefi/errno.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/libefi/handles.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/efi/libefi/time.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/arm/sysdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/arm/sysdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/dict.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/ficl.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/ficl.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/fileaccess.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/float.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/loader.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/math64.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/math64.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/prefix.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/search.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/stack.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/testmain.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/tools.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/unix.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/vm.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ficl/words.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/forth/beastie.4th#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/forth/frames.4th#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/forth/loader.4th#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/forth/loader.4th.8#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/forth/loader.conf#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/forth/loader.conf.5#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/forth/loader.rc#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/forth/pnp.4th#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/forth/screen.4th#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/forth/support.4th#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/Makefile.inc#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/boot0/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/boot2/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/boot2/lib.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/boot2/sio.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/btx/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libi386/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libi386/pread.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libi386/time.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/loader/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/loader/conf.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/loader/help.i386#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/loader/main.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/loader/version#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/mbr/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/Makefile.inc#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/common/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/common/autoload.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/common/bootinfo.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/common/copy.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/common/devicename.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/common/exec.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/common/libia64.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/efi/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/efi/conf.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/efi/main.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/efi/start.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/efi/version#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/ski/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/ski/acpi_stub.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/ski/conf.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/ski/delay.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/ski/efi_stub.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/ski/exit.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/ski/ldscript.ia64#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/ski/libski.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/ski/main.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/ski/pal_stub.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/ski/sal_stub.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/ski/skiconsole.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/ski/skifs.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/ski/skiload.cmd#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/ski/skimd.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/ski/ssc.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/ski/start.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/ski/time.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/ski/version#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ofw/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ofw/common/main.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ofw/libofw/openfirm_mmu.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/Makefile.inc#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot2/README.serial.98#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot2/io.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot2/start.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/boot2/table.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/btx/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/btx/Makefile.inc#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/cdboot/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/cdboot/cdboot.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/libpc98/bioscd.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/libpc98/biossmap.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/loader/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/loader/conf.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/pc98/loader/main.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/powerpc/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/powerpc/loader/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/powerpc/loader/conf.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/powerpc/loader/help.ofw#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/powerpc/loader/ldscript.powerpc#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/powerpc/loader/metadata.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/powerpc/loader/start.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/powerpc/loader/version#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/sparc64/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/sparc64/Makefile.inc#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/sparc64/boot1/_start.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/sparc64/loader/main.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/sparc64/loader/version#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/bsm/audit.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/bsm/audit_internal.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/bsm/audit_kevents.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/bsm/audit_record.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/cam.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/cam.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/cam_ccb.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/cam_debug.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/cam_periph.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/cam_periph.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/cam_queue.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/cam_queue.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/cam_sim.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/cam_sim.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/cam_xpt.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/cam_xpt.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/cam_xpt_periph.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/cam_xpt_sim.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_all.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_all.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_cd.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_cd.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_ch.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_ch.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_da.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_da.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_dvcfg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_iu.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_low.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_low.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_low_pisa.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_low_pisa.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_message.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_pass.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_pass.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_pt.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_pt.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_sa.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_sa.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_ses.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_ses.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_sg.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_sg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_targ_bh.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_target.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_targetio.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/00READ#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/README#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/TODO#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/cnode.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_fbsd.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_io.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_kernel.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_namecache.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_namecache.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_opstats.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_pioctl.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_psdev.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_psdev.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_subr.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_subr.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_venus.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_venus.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_vfsops.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_vfsops.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_vnops.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_vnops.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32_misc.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32_proto.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32_signal.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32_syscall.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32_syscalls.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32_sysent.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32_util.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/syscalls.conf#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/syscalls.master#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/ia32/ia32_genassym.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/ia32/ia32_reg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/ia32/ia32_signal.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/ia32/ia32_sysvec.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/ia32/ia32_util.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linprocfs/linprocfs.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linsysfs/linsysfs.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_emul.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_emul.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_futex.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_futex.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_getcwd.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_ioctl.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_ioctl.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_ipc.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_ipc.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_mib.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_mib.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_misc.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_misc.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_signal.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_signal.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_socket.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_socket.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_stats.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_sysctl.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_sysproto.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_time.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_uid16.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_util.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_util.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/ndis/cfg_var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/ndis/hal_var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/ndis/kern_ndis.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/ndis/kern_windrv.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/ndis/ndis_var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/ndis/ntoskrnl_var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/ndis/pe_var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/ndis/resource_var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/ndis/subr_hal.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/ndis/subr_ndis.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/ndis/subr_ntoskrnl.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/ndis/subr_pe.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/ndis/subr_usbd.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/ndis/usbd_var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/ndis/winx32_wrap.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/ndis/winx64_wrap.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/netbsd/dvcfg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/netbsd/physio_proc.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/pecoff/imgact_pecoff.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/pecoff/imgact_pecoff.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/svr4/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/svr4/imgact_svr4.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/svr4/svr4.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 13 19:53:42 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01E6516A403; Fri, 13 Apr 2007 19:53:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C24AB16A401 for ; Fri, 13 Apr 2007 19:53:41 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 98F7313C4BB for ; Fri, 13 Apr 2007 19:53:41 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3DJrfmT029262 for ; Fri, 13 Apr 2007 19:53:41 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3DJrf0R029257 for perforce@freebsd.org; Fri, 13 Apr 2007 19:53:41 GMT (envelope-from scottl@freebsd.org) Date: Fri, 13 Apr 2007 19:53:41 GMT Message-Id: <200704131953.l3DJrf0R029257@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 118044 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Apr 2007 19:53:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=118044 Change 118044 by scottl@scottl-y1 on 2007/04/13 19:53:01 Fix a compile error Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_targ_bh.c#8 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_targ_bh.c#8 (text+ko) ==== @@ -46,6 +46,7 @@ #include #include #include +#include #include #include From owner-p4-projects@FreeBSD.ORG Fri Apr 13 19:54:43 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD95216A404; Fri, 13 Apr 2007 19:54:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8B4C116A401 for ; Fri, 13 Apr 2007 19:54:43 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 796B713C448 for ; Fri, 13 Apr 2007 19:54:43 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3DJshio029484 for ; Fri, 13 Apr 2007 19:54:43 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3DJshWl029480 for perforce@freebsd.org; Fri, 13 Apr 2007 19:54:43 GMT (envelope-from scottl@freebsd.org) Date: Fri, 13 Apr 2007 19:54:43 GMT Message-Id: <200704131954.l3DJshWl029480@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 118045 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Apr 2007 19:54:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=118045 Change 118045 by scottl@scottl-y1 on 2007/04/13 19:54:06 Switch the XPT SIM to using its own mutex. Remove dead code. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#56 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#56 (text+ko) ==== @@ -262,6 +262,7 @@ struct intr_config_hook *xpt_config_hook; + struct mtx xpt_topo_lock; struct mtx xpt_lock; }; @@ -819,11 +820,6 @@ static void xptaction(struct cam_sim *sim, union ccb *work_ccb); static void xptpoll(struct cam_sim *sim); static void camisr(void *); -#if 0 -static void xptstart(struct cam_periph *periph, union ccb *work_ccb); -static void xptasync(struct cam_periph *periph, - u_int32_t code, cam_path *path); -#endif static dev_match_ret xptbusmatch(struct dev_match_pattern *patterns, u_int num_patterns, struct cam_eb *bus); static dev_match_ret xptdevicematch(struct dev_match_pattern *patterns, @@ -862,16 +858,8 @@ static xpt_devicefunc_t xptdefdevicefunc; static xpt_periphfunc_t xptdefperiphfunc; static int xpt_for_all_busses(xpt_busfunc_t *tr_func, void *arg); -#ifdef notusedyet -static int xpt_for_all_targets(xpt_targetfunc_t *tr_func, - void *arg); -#endif static int xpt_for_all_devices(xpt_devicefunc_t *tr_func, void *arg); -#ifdef notusedyet -static int xpt_for_all_periphs(xpt_periphfunc_t *tr_func, - void *arg); -#endif static xpt_devicefunc_t xptsetasyncfunc; static xpt_busfunc_t xptsetasyncbusfunc; static cam_status xptregister(struct cam_periph *periph, @@ -1190,9 +1178,7 @@ /* * This is an immediate CCB, we can send it on directly. */ - CAM_SIM_LOCK(bus->sim); xpt_action(inccb); - CAM_SIM_UNLOCK(bus->sim); /* * Map the buffers back into user space. @@ -1429,7 +1415,7 @@ * processed. */ xpt_lock_buses(); - msleep(&xsoftc.ccb_scanq, &xsoftc.xpt_lock, PRIBIO, + msleep(&xsoftc.ccb_scanq, &xsoftc.xpt_topo_lock, PRIBIO, "ccb_scanq", 0); TAILQ_INIT(&queue); TAILQ_CONCAT(&queue, &xsoftc.ccb_scanq, sim_links.tqe); @@ -1492,6 +1478,7 @@ mtx_init(&cam_bioq_lock, "CAM BIOQ lock", NULL, MTX_DEF); mtx_init(&xsoftc.xpt_lock, "XPT lock", NULL, MTX_DEF); + mtx_init(&xsoftc.xpt_topo_lock, "XPT topology lock", NULL, MTX_DEF); /* * The xpt layer is, itself, the equivelent of a SIM. @@ -1505,7 +1492,7 @@ "xpt", /*softc*/NULL, /*unit*/0, - /*mtx*/&Giant, + /*mtx*/&xsoftc.xpt_lock, /*max_dev_transactions*/0, /*max_tagged_dev_transactions*/0, devq); @@ -1513,7 +1500,8 @@ return (ENOMEM); xpt_sim->max_ccbs = 16; - + + mtx_lock(&xsoftc.xpt_lock); if ((status = xpt_bus_register(xpt_sim, /*bus #*/0)) != CAM_SUCCESS) { printf("xpt_init: xpt_bus_register failed with status %#x," " failing attach\n", status); @@ -1536,6 +1524,7 @@ cam_periph_alloc(xptregister, NULL, NULL, NULL, "xpt", CAM_PERIPH_BIO, path, NULL, 0, xpt_sim); xpt_free_path(path); + mtx_unlock(&xsoftc.xpt_lock); /* * Register a callback for when interrupts are enabled. @@ -2662,21 +2651,21 @@ retval = 1; - mtx_lock(&xsoftc.xpt_lock); + mtx_lock(&xsoftc.xpt_topo_lock); for (bus = (start_bus ? start_bus : TAILQ_FIRST(&xsoftc.xpt_busses)); bus != NULL; bus = next_bus) { next_bus = TAILQ_NEXT(bus, links); - mtx_unlock(&xsoftc.xpt_lock); + mtx_unlock(&xsoftc.xpt_topo_lock); mtx_lock(bus->sim->mtx); retval = tr_func(bus, arg); mtx_unlock(bus->sim->mtx); if (retval == 0) return(retval); - mtx_lock(&xsoftc.xpt_lock); + mtx_lock(&xsoftc.xpt_topo_lock); } - mtx_unlock(&xsoftc.xpt_lock); + mtx_unlock(&xsoftc.xpt_topo_lock); return(retval); } @@ -2887,23 +2876,6 @@ return(xptbustraverse(NULL, xptdefbusfunc, &tr_config)); } -#ifdef notusedyet -/* - * Execute the given function for every target in the EDT. - */ -static int -xpt_for_all_targets(xpt_targetfunc_t *tr_func, void *arg) -{ - struct xpt_traverse_config tr_config; - - tr_config.depth = XPT_DEPTH_TARGET; - tr_config.tr_func = tr_func; - tr_config.tr_arg = arg; - - return(xptbustraverse(NULL, xptdefbusfunc, &tr_config)); -} -#endif /* notusedyet */ - /* * Execute the given function for every device in the EDT. */ @@ -2919,23 +2891,6 @@ return(xptbustraverse(NULL, xptdefbusfunc, &tr_config)); } -#ifdef notusedyet -/* - * Execute the given function for every peripheral in the EDT. - */ -static int -xpt_for_all_periphs(xpt_periphfunc_t *tr_func, void *arg) -{ - struct xpt_traverse_config tr_config; - - tr_config.depth = XPT_DEPTH_PERIPH; - tr_config.tr_func = tr_func; - tr_config.tr_arg = arg; - - return(xptbustraverse(NULL, xptdefbusfunc, &tr_config)); -} -#endif /* notusedyet */ - static int xptsetasyncfunc(struct cam_ed *device, void *arg) { @@ -4072,9 +4027,6 @@ void xpt_setup_ccb(struct ccb_hdr *ccb_h, struct cam_path *path, u_int32_t priority) { -#if 0 - mtx_assert(path->bus->sim->mtx, MA_OWNED); -#endif CAM_DEBUG(path, CAM_DEBUG_TRACE, ("xpt_setup_ccb\n")); ccb_h->pinfo.priority = priority; @@ -4242,9 +4194,6 @@ void xpt_free_path(struct cam_path *path) { -#if 0 - mtx_assert(path->bus->sim->mtx, MA_OWNED); -#endif CAM_DEBUG(path, CAM_DEBUG_TRACE, ("xpt_free_path\n")); xpt_release_path(path); @@ -4406,9 +4355,6 @@ struct cam_sim * xpt_path_sim(struct cam_path *path) { -#if 0 - mtx_assert(path->bus->sim->mtx, MA_OWNED); -#endif return (path->bus->sim); } @@ -4512,7 +4458,7 @@ new_bus->refcount = 1; /* Held until a bus_deregister event */ new_bus->generation = 0; s = splcam(); - mtx_lock(&xsoftc.xpt_lock); + mtx_lock(&xsoftc.xpt_topo_lock); old_bus = TAILQ_FIRST(&xsoftc.xpt_busses); while (old_bus != NULL && old_bus->path_id < new_bus->path_id) @@ -4522,7 +4468,7 @@ else TAILQ_INSERT_TAIL(&xsoftc.xpt_busses, new_bus, links); xsoftc.bus_generation++; - mtx_unlock(&xsoftc.xpt_lock); + mtx_unlock(&xsoftc.xpt_topo_lock); splx(s); /* Notify interested parties */ @@ -4616,7 +4562,7 @@ const char *strval; pathid = 0; - mtx_lock(&xsoftc.xpt_lock); + mtx_lock(&xsoftc.xpt_topo_lock); bus = TAILQ_FIRST(&xsoftc.xpt_busses); retry: /* Find an unoccupied pathid */ @@ -4625,7 +4571,7 @@ pathid++; bus = TAILQ_NEXT(bus, links); } - mtx_unlock(&xsoftc.xpt_lock); + mtx_unlock(&xsoftc.xpt_topo_lock); /* * Ensure that this pathid is not reserved for @@ -4634,7 +4580,7 @@ if (resource_string_value("scbus", pathid, "at", &strval) == 0) { ++pathid; /* Start the search over */ - mtx_lock(&xsoftc.xpt_lock); + mtx_lock(&xsoftc.xpt_topo_lock); goto retry; } return (pathid); @@ -5125,10 +5071,10 @@ s = splcam(); if ((--bus->refcount == 0) && (TAILQ_FIRST(&bus->et_entries) == NULL)) { - mtx_lock(&xsoftc.xpt_lock); + mtx_lock(&xsoftc.xpt_topo_lock); TAILQ_REMOVE(&xsoftc.xpt_busses, bus, links); xsoftc.bus_generation++; - mtx_unlock(&xsoftc.xpt_lock); + mtx_unlock(&xsoftc.xpt_topo_lock); splx(s); free(bus, M_CAMXPT); } else @@ -5354,7 +5300,7 @@ { struct cam_eb *bus; - mtx_lock(&xsoftc.xpt_lock); + mtx_lock(&xsoftc.xpt_topo_lock); for (bus = TAILQ_FIRST(&xsoftc.xpt_busses); bus != NULL; bus = TAILQ_NEXT(bus, links)) { @@ -5363,7 +5309,7 @@ break; } } - mtx_unlock(&xsoftc.xpt_lock); + mtx_unlock(&xsoftc.xpt_topo_lock); return (bus); } @@ -7103,6 +7049,11 @@ #endif /* CAM_DEBUG_FLAGS */ #ifdef CAM_DEBUG_BUS if (cam_dflags != CAM_DEBUG_NONE) { + /* + * Locking is specifically omitted here. No SIMs have + * registered yet, so xpt_create_path will only be searching + * empty lists of targets and devices. + */ if (xpt_create_path(&cam_dpath, xpt_periph, CAM_DEBUG_BUS, CAM_DEBUG_TARGET, CAM_DEBUG_LUN) != CAM_REQ_CMP) { @@ -7276,13 +7227,13 @@ void xpt_lock_buses(void) { - mtx_lock(&xsoftc.xpt_lock); + mtx_lock(&xsoftc.xpt_topo_lock); } void xpt_unlock_buses(void) { - mtx_unlock(&xsoftc.xpt_lock); + mtx_unlock(&xsoftc.xpt_topo_lock); } static void From owner-p4-projects@FreeBSD.ORG Fri Apr 13 20:06:10 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8532516A404; Fri, 13 Apr 2007 20:06:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 52E4916A403 for ; Fri, 13 Apr 2007 20:06:10 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3EE4C13C48A for ; Fri, 13 Apr 2007 20:06:10 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3DK6Ahw032427 for ; Fri, 13 Apr 2007 20:06:10 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3DK66ku032424 for perforce@freebsd.org; Fri, 13 Apr 2007 20:06:06 GMT (envelope-from marcel@freebsd.org) Date: Fri, 13 Apr 2007 20:06:06 GMT Message-Id: <200704132006.l3DK66ku032424@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 118048 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Apr 2007 20:06:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=118048 Change 118048 by marcel@marcel_cluster on 2007/04/13 20:05:29 IFC @118042 Affected files ... .. //depot/projects/uart/amd64/amd64/pmap.c#45 integrate .. //depot/projects/uart/amd64/conf/GENERIC#27 integrate .. //depot/projects/uart/boot/forth/loader.conf#14 integrate .. //depot/projects/uart/boot/pc98/boot0.5/Makefile#4 integrate .. //depot/projects/uart/boot/pc98/boot0.5/boot0.5.s#3 integrate .. //depot/projects/uart/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/uart/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/uart/boot/pc98/boot0.5/selector.s#2 integrate .. //depot/projects/uart/boot/pc98/boot0.5/start.s#2 integrate .. //depot/projects/uart/boot/pc98/boot2/boot.c#6 integrate .. //depot/projects/uart/cam/scsi/scsi_sg.c#1 branch .. //depot/projects/uart/cam/scsi/scsi_sg.h#1 branch .. //depot/projects/uart/compat/linprocfs/linprocfs.c#24 integrate .. //depot/projects/uart/compat/linux/linux_file.c#13 integrate .. //depot/projects/uart/compat/linux/linux_ioctl.c#12 integrate .. //depot/projects/uart/compat/linux/linux_ioctl.h#6 integrate .. //depot/projects/uart/compat/ndis/kern_ndis.c#10 integrate .. //depot/projects/uart/compat/ndis/ndis_var.h#7 integrate .. //depot/projects/uart/compat/ndis/subr_ndis.c#10 integrate .. //depot/projects/uart/compat/ndis/subr_pe.c#5 integrate .. //depot/projects/uart/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/uart/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/uart/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/uart/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/uart/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/uart/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/uart/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/uart/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/uart/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/uart/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_filio.c#6 integrate .. //depot/projects/uart/conf/NOTES#50 integrate .. //depot/projects/uart/conf/files#81 integrate .. //depot/projects/uart/conf/files.amd64#28 integrate .. //depot/projects/uart/conf/files.i386#34 integrate .. //depot/projects/uart/conf/files.ia64#21 integrate .. //depot/projects/uart/conf/files.pc98#28 integrate .. //depot/projects/uart/conf/files.powerpc#15 integrate .. //depot/projects/uart/conf/options#47 integrate .. //depot/projects/uart/contrib/dev/acpica/utmisc.c#7 integrate .. //depot/projects/uart/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/uart/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/uart/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/uart/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/uart/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/uart/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/uart/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/uart/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/uart/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/uart/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/uart/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/dnlc.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/atomic.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/dnlc.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/vfs.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/uart/dev/ata/ata-all.h#17 integrate .. //depot/projects/uart/dev/ata/ata-chipset.c#26 integrate .. //depot/projects/uart/dev/ata/ata-dma.c#14 integrate .. //depot/projects/uart/dev/ata/ata-lowlevel.c#22 integrate .. //depot/projects/uart/dev/ata/ata_if.m#3 integrate .. //depot/projects/uart/dev/ath/ah_osdep.c#2 integrate .. //depot/projects/uart/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/uart/dev/cxgb/cxgb_lro.c#2 integrate .. //depot/projects/uart/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/uart/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/uart/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/uart/dev/cxgb/sys/mvec.h#1 branch .. //depot/projects/uart/dev/cxgb/sys/uipc_mvec.c#1 branch .. //depot/projects/uart/dev/if_ndis/if_ndis_pccard.c#5 integrate .. //depot/projects/uart/dev/mii/brgphy.c#18 integrate .. //depot/projects/uart/dev/mii/miidevs#12 integrate .. //depot/projects/uart/dev/mpt/mpt_cam.c#23 integrate .. //depot/projects/uart/dev/msk/if_msk.c#2 integrate .. //depot/projects/uart/dev/mxge/if_mxge.c#9 integrate .. //depot/projects/uart/dev/sound/pci/cmi.c#14 integrate .. //depot/projects/uart/dev/streams/streams.c#8 integrate .. //depot/projects/uart/dev/uart/uart_bus_pci.c#20 integrate .. //depot/projects/uart/dev/usb/if_ural.c#14 integrate .. //depot/projects/uart/dev/usb/usbdevs#31 integrate .. //depot/projects/uart/fs/devfs/devfs_vnops.c#21 integrate .. //depot/projects/uart/fs/fdescfs/fdesc_vfsops.c#10 integrate .. //depot/projects/uart/fs/fdescfs/fdesc_vnops.c#12 integrate .. //depot/projects/uart/fs/fifofs/fifo_vnops.c#12 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs.c#8 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs.h#7 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs_fileno.c#3 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs_internal.h#3 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs_vncache.c#8 integrate .. //depot/projects/uart/fs/unionfs/union_subr.c#10 integrate .. //depot/projects/uart/geom/eli/g_eli.c#13 integrate .. //depot/projects/uart/geom/journal/g_journal.c#4 integrate .. //depot/projects/uart/geom/uzip/g_uzip.c#5 integrate .. //depot/projects/uart/geom/vinum/geom_vinum.h#7 integrate .. //depot/projects/uart/geom/vinum/geom_vinum_rm.c#7 integrate .. //depot/projects/uart/geom/vinum/geom_vinum_share.c#3 integrate .. //depot/projects/uart/geom/vinum/geom_vinum_subr.c#6 integrate .. //depot/projects/uart/i386/conf/GENERIC#26 integrate .. //depot/projects/uart/i386/i386/identcpu.c#25 integrate .. //depot/projects/uart/i386/i386/initcpu.c#10 integrate .. //depot/projects/uart/i386/i386/minidump_machdep.c#3 integrate .. //depot/projects/uart/i386/i386/mp_machdep.c#28 integrate .. //depot/projects/uart/i386/i386/pmap.c#48 integrate .. //depot/projects/uart/i386/i386/trap.c#19 integrate .. //depot/projects/uart/i386/include/pmap.h#14 integrate .. //depot/projects/uart/i386/include/specialreg.h#9 integrate .. //depot/projects/uart/i386/include/vmparam.h#4 integrate .. //depot/projects/uart/ia64/conf/GENERIC#18 integrate .. //depot/projects/uart/kern/kern_descrip.c#28 integrate .. //depot/projects/uart/kern/kern_event.c#17 integrate .. //depot/projects/uart/kern/kern_fork.c#20 integrate .. //depot/projects/uart/kern/kern_jail.c#11 integrate .. //depot/projects/uart/kern/kern_mbuf.c#15 integrate .. //depot/projects/uart/kern/kern_mib.c#7 integrate .. //depot/projects/uart/kern/kern_mutex.c#20 integrate .. //depot/projects/uart/kern/kern_sx.c#13 integrate .. //depot/projects/uart/kern/subr_lock.c#4 integrate .. //depot/projects/uart/kern/subr_witness.c#22 integrate .. //depot/projects/uart/kern/sys_generic.c#17 integrate .. //depot/projects/uart/kern/uipc_mqueue.c#9 integrate .. //depot/projects/uart/kern/uipc_syscalls.c#27 integrate .. //depot/projects/uart/kern/uipc_usrreq.c#20 integrate .. //depot/projects/uart/kern/vfs_cache.c#13 integrate .. //depot/projects/uart/kern/vfs_lookup.c#18 integrate .. //depot/projects/uart/kern/vfs_mount.c#32 integrate .. //depot/projects/uart/kern/vfs_subr.c#40 integrate .. //depot/projects/uart/kern/vfs_syscalls.c#33 integrate .. //depot/projects/uart/libkern/index.c#3 integrate .. //depot/projects/uart/libkern/memset.c#1 branch .. //depot/projects/uart/libkern/rindex.c#4 integrate .. //depot/projects/uart/modules/Makefile#47 integrate .. //depot/projects/uart/modules/cam/Makefile#6 integrate .. //depot/projects/uart/modules/cxgb/Makefile#2 integrate .. //depot/projects/uart/modules/dpt/Makefile#2 integrate .. //depot/projects/uart/modules/if_trunk/Makefile#1 branch .. //depot/projects/uart/modules/libalias/libalias/Makefile#2 integrate .. //depot/projects/uart/modules/zfs/Makefile#1 branch .. //depot/projects/uart/net/ieee8023ad_lacp.c#1 branch .. //depot/projects/uart/net/ieee8023ad_lacp.h#1 branch .. //depot/projects/uart/net/if.c#27 integrate .. //depot/projects/uart/net/if_ethersubr.c#22 integrate .. //depot/projects/uart/net/if_trunk.c#1 branch .. //depot/projects/uart/net/if_trunk.h#1 branch .. //depot/projects/uart/net/if_var.h#15 integrate .. //depot/projects/uart/netatm/atm_if.c#9 integrate .. //depot/projects/uart/netinet/in_pcb.c#24 integrate .. //depot/projects/uart/netinet/in_pcb.h#14 integrate .. //depot/projects/uart/netinet/ip_fw2.c#30 integrate .. //depot/projects/uart/netinet/ip_var.h#12 integrate .. //depot/projects/uart/netinet/libalias/alias_db.c#5 integrate .. //depot/projects/uart/netinet/libalias/alias_ftp.c#4 integrate .. //depot/projects/uart/netinet/libalias/alias_irc.c#4 integrate .. //depot/projects/uart/netinet/libalias/alias_proxy.c#5 integrate .. //depot/projects/uart/netinet/libalias/alias_skinny.c#4 integrate .. //depot/projects/uart/netinet/sctp_asconf.c#3 integrate .. //depot/projects/uart/netinet/sctp_bsd_addr.h#3 integrate .. //depot/projects/uart/netinet/sctp_constants.h#4 integrate .. //depot/projects/uart/netinet/sctp_indata.c#4 integrate .. //depot/projects/uart/netinet/sctp_input.c#4 integrate .. //depot/projects/uart/netinet/sctp_os_bsd.h#4 integrate .. //depot/projects/uart/netinet/sctp_output.c#4 integrate .. //depot/projects/uart/netinet/sctp_output.h#3 integrate .. //depot/projects/uart/netinet/sctp_pcb.c#4 integrate .. //depot/projects/uart/netinet/sctp_pcb.h#4 integrate .. //depot/projects/uart/netinet/sctp_sysctl.c#3 integrate .. //depot/projects/uart/netinet/sctp_sysctl.h#3 integrate .. //depot/projects/uart/netinet/sctp_timer.c#3 integrate .. //depot/projects/uart/netinet/sctp_uio.h#4 integrate .. //depot/projects/uart/netinet/sctp_usrreq.c#4 integrate .. //depot/projects/uart/netinet/sctputil.c#4 integrate .. //depot/projects/uart/netinet/tcp_input.c#32 integrate .. //depot/projects/uart/netinet/tcp_output.c#14 integrate .. //depot/projects/uart/netinet/tcp_sack.c#12 integrate .. //depot/projects/uart/netinet/tcp_subr.c#27 integrate .. //depot/projects/uart/netinet/tcp_syncache.c#21 integrate .. //depot/projects/uart/netinet/tcp_timer.c#18 integrate .. //depot/projects/uart/netinet/tcp_timer.h#7 integrate .. //depot/projects/uart/netinet/tcp_usrreq.c#20 integrate .. //depot/projects/uart/netinet/tcp_var.h#17 integrate .. //depot/projects/uart/netinet6/ipsec.c#14 integrate .. //depot/projects/uart/netinet6/sctp6_usrreq.c#4 integrate .. //depot/projects/uart/netipsec/ipsec_osdep.h#5 integrate .. //depot/projects/uart/netsmb/smb_dev.c#10 integrate .. //depot/projects/uart/opencrypto/cryptodev.c#11 integrate .. //depot/projects/uart/pc98/conf/GENERIC#21 integrate .. //depot/projects/uart/powerpc/conf/GENERIC#17 integrate .. //depot/projects/uart/rpc/types.h#1 branch .. //depot/projects/uart/security/audit/audit.c#9 integrate .. //depot/projects/uart/security/audit/audit.h#5 integrate .. //depot/projects/uart/security/audit/audit_arg.c#8 integrate .. //depot/projects/uart/security/audit/audit_bsm.c#7 integrate .. //depot/projects/uart/security/audit/audit_bsm_klib.c#6 integrate .. //depot/projects/uart/security/audit/audit_bsm_token.c#7 integrate .. //depot/projects/uart/security/audit/audit_private.h#7 integrate .. //depot/projects/uart/security/audit/audit_syscalls.c#7 integrate .. //depot/projects/uart/sparc64/conf/GENERIC#27 integrate .. //depot/projects/uart/sun4v/conf/GENERIC#4 integrate .. //depot/projects/uart/sun4v/include/smp.h#3 integrate .. //depot/projects/uart/sys/elf_common.h#7 integrate .. //depot/projects/uart/sys/eventhandler.h#7 integrate .. //depot/projects/uart/sys/filedesc.h#10 integrate .. //depot/projects/uart/sys/filio.h#4 integrate .. //depot/projects/uart/sys/hash.h#2 integrate .. //depot/projects/uart/sys/jail.h#8 integrate .. //depot/projects/uart/sys/kernel.h#14 integrate .. //depot/projects/uart/sys/libkern.h#10 integrate .. //depot/projects/uart/sys/link_elf.h#3 integrate .. //depot/projects/uart/sys/lock.h#12 integrate .. //depot/projects/uart/sys/lock_profile.h#3 integrate .. //depot/projects/uart/sys/mbuf.h#18 integrate .. //depot/projects/uart/sys/mount.h#23 integrate .. //depot/projects/uart/sys/mutex.h#18 integrate .. //depot/projects/uart/sys/param.h#32 integrate .. //depot/projects/uart/sys/priv.h#3 integrate .. //depot/projects/uart/sys/proc.h#28 integrate .. //depot/projects/uart/sys/sx.h#11 integrate .. //depot/projects/uart/sys/sysctl.h#14 integrate .. //depot/projects/uart/sys/systm.h#21 integrate .. //depot/projects/uart/sys/unistd.h#5 integrate .. //depot/projects/uart/ufs/ffs/ffs_snapshot.c#20 integrate .. //depot/projects/uart/ufs/ffs/ffs_softdep.c#25 integrate .. //depot/projects/uart/ufs/ffs/ffs_vfsops.c#30 integrate .. //depot/projects/uart/ufs/ffs/ffs_vnops.c#17 integrate .. //depot/projects/uart/vm/phys_pager.c#7 integrate .. //depot/projects/uart/vm/vm_fault.c#22 integrate .. //depot/projects/uart/vm/vm_kern.c#12 integrate Differences ... ==== //depot/projects/uart/amd64/amd64/pmap.c#45 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.581 2007/03/10 20:26:43 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.582 2007/04/13 16:07:29 alc Exp $"); /* * Manages physical address maps. @@ -3261,7 +3261,7 @@ pd_entry_t *pde; pt_entry_t *pte; - base = va & PG_FRAME; + base = trunc_page(va); offset = va & PAGE_MASK; size = roundup(offset + size, PAGE_SIZE); ==== //depot/projects/uart/amd64/conf/GENERIC#27 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.473 2007/02/09 19:03:17 brooks Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.475 2007/04/10 21:40:12 pjd Exp $ cpu HAMMER ident GENERIC @@ -34,6 +34,7 @@ options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists options UFS_DIRHASH # Improve performance on big directories +options UFS_GJOURNAL # Enable gjournal-based UFS journaling options MD_ROOT # MD is a potential root device options NFSCLIENT # Network Filesystem Client options NFSSERVER # Network Filesystem Server ==== //depot/projects/uart/boot/forth/loader.conf#14 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.118 2007/02/04 06:35:10 imp Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.120 2007/04/09 22:09:09 pjd Exp $ ############################################################## ### Basic configuration options ############################ @@ -138,6 +138,7 @@ #umapfs_load="NO" # User-id map filesystem unionfs_load="NO" # Union filesystem xfs_load="NO" # XFS +zfs_load="NO" # ZFS # Related stuff @@ -418,3 +419,10 @@ #module_after="cmd" # executes "cmd" after loading the module #module_error="cmd" # executes "cmd" if load fails +############################################################## +### Always try to load ZFS pool cache file ################# +############################################################## + +zpool_cache_load="YES" +zpool_cache_type="/boot/zfs/zpool.cache" +zpool_cache_name="/boot/zfs/zpool.cache" ==== //depot/projects/uart/boot/pc98/boot0.5/Makefile#4 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/sys/boot/pc98/boot0.5/Makefile,v 1.4 2004/12/21 08:47:16 ru Exp $ +# $FreeBSD: src/sys/boot/pc98/boot0.5/Makefile,v 1.6 2007/04/07 13:37:45 nyan Exp $ PROG= ${BOOT}.out INTERNALPROG= FILES= ${BOOT} NO_MAN= -SRCS= start.s boot.s boot0.5.s disk.s selector.s support.s syscons.s +SRCS= start.s boot.s boot0.5.s disk.s selector.s support.s syscons.s \ + putssjis.s CLEANFILES= ${BOOT} ${BOOT}.bin BOOT= boot0.5 @@ -13,7 +14,7 @@ # unless you are glutton for punishment. BOOT_BOOT0_ORG?= 0x0000 -LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG} +LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG} -Wl,-T,${.CURDIR}/ldscript # The size of boot0.5 must be 7168 bytes ${BOOT}: ${BOOT}.bin ==== //depot/projects/uart/boot/pc98/boot0.5/boot0.5.s#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# Copyright (c) KATO Takenori, 1999, 2000. +# Copyright (c) KATO Takenori, 1999, 2000, 2007. # # All rights reserved. Unpublished rights reserved under the copyright # laws of Japan. @@ -25,7 +25,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/sys/boot/pc98/boot0.5/boot0.5.s,v 1.3 2007/03/17 05:30:03 kato Exp $ +# $FreeBSD: src/sys/boot/pc98/boot0.5/boot0.5.s,v 1.4 2007/04/07 08:37:04 kato Exp $ # .global main .code16 @@ -261,8 +261,8 @@ .global ishireso ishireso: .byte 0 -title: .asciz "PC98 Boot Selector Version 1.1" -copyright: .ascii "(C)Copyright 1999, 2000 KATO Takenori. " +title: .asciz "PC98 Boot Selector Version 1.2" +copyright: .ascii "(C)Copyright 1999-2007 KATO Takenori. " .asciz "All rights reserved." msg_device: .asciz "Device" msg_sasi: .asciz "SASI/IDE unit " ==== //depot/projects/uart/boot/pc98/boot0.5/selector.s#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# Copyright (c) KATO Takenori, 1999, 2000. +# Copyright (c) KATO Takenori, 1999, 2000, 2007. # # All rights reserved. Unpublished rights reserved under the copyright # laws of Japan. @@ -25,7 +25,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/sys/boot/pc98/boot0.5/selector.s,v 1.2 2000/08/06 14:35:37 kato Exp $ +# $FreeBSD: src/sys/boot/pc98/boot0.5/selector.s,v 1.3 2007/04/07 08:37:04 kato Exp $ # .code16 @@ -299,6 +299,11 @@ jne dev_right movw $3, mode # N88-BASIC ret + + # XXX + .space 5, 0x90 + ret # Dummy ret @0x9ab + dev_up: cmpw $0, curdevice je devmode_loop ==== //depot/projects/uart/boot/pc98/boot0.5/start.s#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# Copyright (c) KATO Takenori, 1999, 2000. +# Copyright (c) KATO Takenori, 1999, 2000, 2007. # # All rights reserved. Unpublished rights reserved under the copyright # laws of Japan. @@ -25,7 +25,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/sys/boot/pc98/boot0.5/start.s,v 1.2 2003/05/02 09:33:12 kato Exp $ +# $FreeBSD: src/sys/boot/pc98/boot0.5/start.s,v 1.3 2007/04/07 08:37:04 kato Exp $ # .global start .code16 @@ -34,8 +34,19 @@ start: jmp start1 + # Magic + .org 0x053, 0x20 + .byte 0x4e, 0x45, 0x43 + + .org 0x8f + .byte 0x32, 0x2e, 0x37, 0x30 + .org 0x2d4 start1: + # The instruction 'call 0x9ab' can be here. See also selector.s. + nop + nop + nop cli movw %cs, %ax movw %ax, %ds ==== //depot/projects/uart/boot/pc98/boot2/boot.c#6 (text+ko) ==== @@ -49,7 +49,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/boot.c,v 1.16 2006/11/02 17:28:38 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/boot.c,v 1.17 2007/04/06 20:50:24 kan Exp $"); #include "boot.h" #include @@ -70,7 +70,7 @@ static char kernel_config_namebuf[NAMEBUF_LEN + sizeof "config"]; static char linebuf[NAMEBUF_LEN]; static char namebuf[NAMEBUF_LEN]; -static struct bootinfo bootinfo; +struct bootinfo bootinfo; int loadflags; static void getbootdev(char *ptr, int *howto); ==== //depot/projects/uart/compat/linprocfs/linprocfs.c#24 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.108 2007/03/30 17:56:44 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.109 2007/04/06 18:15:56 jkim Exp $"); #include #include @@ -1238,3 +1238,5 @@ PSEUDOFS(linprocfs, 1); MODULE_DEPEND(linprocfs, linux, 1, 1, 1); MODULE_DEPEND(linprocfs, procfs, 1, 1, 1); +MODULE_DEPEND(linprocfs, sysvmsg, 1, 1, 1); +MODULE_DEPEND(linprocfs, sysvsem, 1, 1, 1); ==== //depot/projects/uart/compat/linux/linux_file.c#13 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.102 2007/03/29 02:11:45 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.103 2007/04/04 09:11:31 rwatson Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -193,7 +193,7 @@ linux_at(struct thread *td, int dirfd, char *filename, char **newpath, char **freebuf) { struct file *fp; - int error = 0; + int error = 0, vfslocked; struct vnode *dvp; struct filedesc *fdp = td->td_proc->p_fd; char *fullpath = "unknown"; @@ -207,9 +207,10 @@ /* check for AT_FDWCD */ if (dirfd == LINUX_AT_FDCWD) { - FILEDESC_LOCK(fdp); + FILEDESC_SLOCK(fdp); dvp = fdp->fd_cdir; - FILEDESC_UNLOCK(fdp); + vref(dvp); + FILEDESC_SUNLOCK(fdp); } else { error = fget(td, dirfd, &fp); if (error) @@ -220,16 +221,28 @@ fdrop(fp, td); return (ENOTDIR); } + vref(dvp); fdrop(fp, td); } + /* + * XXXRW: This is bogus, as vn_fullpath() returns only an advisory + * file path, and may fail in several common situations, including + * for file systmes that don't use the name cache, and if the entry + * for the file falls out of the name cache. We should implement + * openat() in the FreeBSD native system call layer properly (using a + * requested starting directory), and have Linux and other ABIs wrap + * the native implementation. + */ error = vn_fullpath(td, dvp, &fullpath, &freepath); if (!error) { *newpath = malloc(strlen(fullpath) + strlen(filename) + 2, M_TEMP, M_WAITOK | M_ZERO); *freebuf = freepath; sprintf(*newpath, "%s/%s", fullpath, filename); } - + vfslocked = VFS_LOCK_GIANT(dvp->v_mount); + vrele(dvp); + VFS_UNLOCK_GIANT(vfslocked); return (error); } ==== //depot/projects/uart/compat/linux/linux_ioctl.c#12 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.137 2006/07/06 21:42:36 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.138 2007/04/07 19:40:58 scottl Exp $"); #include #include @@ -86,6 +86,7 @@ static linux_ioctl_function_t linux_ioctl_termio; static linux_ioctl_function_t linux_ioctl_private; static linux_ioctl_function_t linux_ioctl_drm; +static linux_ioctl_function_t linux_ioctl_sg; static linux_ioctl_function_t linux_ioctl_special; static struct linux_ioctl_handler cdrom_handler = @@ -108,6 +109,8 @@ { linux_ioctl_private, LINUX_IOCTL_PRIVATE_MIN, LINUX_IOCTL_PRIVATE_MAX }; static struct linux_ioctl_handler drm_handler = { linux_ioctl_drm, LINUX_IOCTL_DRM_MIN, LINUX_IOCTL_DRM_MAX }; +static struct linux_ioctl_handler sg_handler = +{ linux_ioctl_sg, LINUX_IOCTL_SG_MIN, LINUX_IOCTL_SG_MAX }; DATA_SET(linux_ioctl_handler_set, cdrom_handler); DATA_SET(linux_ioctl_handler_set, vfat_handler); @@ -119,6 +122,7 @@ DATA_SET(linux_ioctl_handler_set, termio_handler); DATA_SET(linux_ioctl_handler_set, private_handler); DATA_SET(linux_ioctl_handler_set, drm_handler); +DATA_SET(linux_ioctl_handler_set, sg_handler); struct handler_element { @@ -1583,6 +1587,11 @@ break; } + case LINUX_SCSI_GET_BUS_NUMBER: + case LINUX_SCSI_GET_IDLUN: + error = linux_ioctl_sg(td, args); + break; + /* LINUX_CDROM_SEND_PACKET */ /* LINUX_CDROM_NEXT_WRITABLE */ /* LINUX_CDROM_LAST_WRITTEN */ @@ -2522,6 +2531,24 @@ return ioctl(td, (struct ioctl_args *)args); } +static int +linux_ioctl_sg(struct thread *td, struct linux_ioctl_args *args) +{ + struct file *fp; + u_long cmd; + int error; + + if ((error = fget(td, args->fd, &fp)) != 0) { + printf("sg_linux_ioctl: fget returned %d\n", error); + return (error); + } + cmd = args->cmd; + + error = (fo_ioctl(fp, cmd, (caddr_t)args->arg, td->td_ucred, td)); + fdrop(fp, td); + return (error); +} + /* * Special ioctl handler */ ==== //depot/projects/uart/compat/linux/linux_ioctl.h#6 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_ioctl.h,v 1.24 2006/05/10 20:38:16 netchild Exp $ + * $FreeBSD: src/sys/compat/linux/linux_ioctl.h,v 1.26 2007/04/10 21:37:37 scottl Exp $ */ #ifndef _LINUX_IOCTL_H_ @@ -103,6 +103,8 @@ #define LINUX_CDROM_DEBUG 0x5330 #define LINUX_CDROM_GET_CAPABILITY 0x5331 #define LINUX_CDROMAUDIOBUFSIZ 0x5382 +#define LINUX_SCSI_GET_IDLUN 0x5382 +#define LINUX_SCSI_GET_BUS_NUMBER 0x5386 #define LINUX_DVD_READ_STRUCT 0x5390 #define LINUX_DVD_WRITE_STRUCT 0x5391 #define LINUX_DVD_AUTH 0x5392 @@ -130,6 +132,38 @@ #define LINUX_DVD_HOST_SEND_RPC_STATE 11 /* + * SG + */ +#define LINUX_SG_SET_TIMEOUT 0x2201 +#define LINUX_SG_GET_TIMEOUT 0x2202 +#define LINUX_SG_EMULATED_HOST 0x2203 +#define LINUX_SG_SET_TRANSFORM 0x2204 +#define LINUX_SG_GET_TRANSFORM 0x2205 +#define LINUX_SG_GET_COMMAND_Q 0x2270 +#define LINUX_SG_SET_COMMAND_Q 0x2271 +#define LINUX_SG_SET_RESERVED_SIZE 0x2275 +#define LINUX_SG_GET_RESERVED_SIZE 0x2272 +#define LINUX_SG_GET_SCSI_ID 0x2276 +#define LINUX_SG_SET_FORCE_LOW_DMA 0x2279 +#define LINUX_SG_GET_LOW_DMA 0x227a +#define LINUX_SG_SET_FORCE_PACK_ID 0x227b +#define LINUX_SG_GET_PACK_ID 0x227c +#define LINUX_SG_GET_NUM_WAITING 0x227d +#define LINUX_SG_SET_DEBUG 0x227e +#define LINUX_SG_GET_SG_TABLESIZE 0x227f +#define LINUX_SG_GET_VERSION_NUM 0x2282 +#define LINUX_SG_NEXT_CMD_LEN 0x2283 +#define LINUX_SG_SCSI_RESET 0x2284 +#define LINUX_SG_IO 0x2285 +#define LINUX_SG_GET_REQUEST_TABLE 0x2286 +#define LINUX_SG_SET_KEEP_ORPHAN 0x2287 +#define LINUX_SG_GET_KEEP_ORPHAN 0x2288 +#define LINUX_SG_GET_ACCESS_COUNT 0x2289 + +#define LINUX_IOCTL_SG_MIN 0x2200 +#define LINUX_IOCTL_SG_MAX 0x22ff + +/* * VFAT */ #define LINUX_VFAT_READDIR_BOTH 0x7201 ==== //depot/projects/uart/compat/ndis/kern_ndis.c#10 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.94 2007/02/23 16:25:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.95 2007/04/06 11:18:57 pjd Exp $"); #include #include @@ -323,8 +323,7 @@ TAILQ_FOREACH(e, device_get_sysctl_ctx(sc->ndis_dev), link) { #endif oidp = e->entry; - if (ndis_strcasecmp(oidp->oid_name, - vals->nc_cfgkey) == 0) + if (strcasecmp(oidp->oid_name, vals->nc_cfgkey) == 0) break; oidp = NULL; } ==== //depot/projects/uart/compat/ndis/ndis_var.h#7 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.46 2005/11/07 16:57:14 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.47 2007/04/06 11:18:57 pjd Exp $ */ #ifndef _NDIS_VAR_H_ @@ -1746,8 +1746,6 @@ extern int ndis_create_sysctls(void *); extern int ndis_add_sysctl(void *, char *, char *, char *, int); extern int ndis_flush_sysctls(void *); -extern int ndis_strcasecmp(const char *, const char *); -extern int ndis_strncasecmp(const char *, const char *, size_t); extern uint32_t NdisAddDevice(driver_object *, device_object *); extern void NdisAllocatePacketPool(ndis_status *, ==== //depot/projects/uart/compat/ndis/subr_ndis.c#10 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.106 2006/06/20 21:31:38 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.107 2007/04/06 11:18:57 pjd Exp $"); /* * This file implements a translation layer between the BSD networking @@ -613,53 +613,6 @@ return(NDIS_STATUS_SUCCESS); } -int -ndis_strcasecmp(s1, s2) - const char *s1; - const char *s2; -{ - char a, b; - - /* - * In the kernel, toupper() is a macro. Have to be careful - * not to use pointer arithmetic when passing it arguments. - */ - - while(1) { - a = *s1; - b = *s2++; - if (toupper(a) != toupper(b)) - break; - if (*s1++ == '\0') - return(0); - } - - return (*(const unsigned char *)s1 - *(const unsigned char *)(s2 - 1)); -} - -int -ndis_strncasecmp(s1, s2, n) - const char *s1; - const char *s2; - size_t n; -{ - char a, b; - - if (n != 0) { - do { - a = *s1; - b = *s2++; - if (toupper(a) != toupper(b)) - return (*(const unsigned char *)s1 - - *(const unsigned char *)(s2 - 1)); - if (*s1++ == '\0') - break; - } while (--n != 0); - } - - return(0); -} - static void NdisReadConfiguration(status, parm, cfg, key, type) ndis_status *status; @@ -700,7 +653,7 @@ TAILQ_FOREACH(e, device_get_sysctl_ctx(sc->ndis_dev), link) { #endif oidp = e->entry; - if (ndis_strcasecmp(oidp->oid_name, keystr) == 0) { + if (strcasecmp(oidp->oid_name, keystr) == 0) { if (strcmp((char *)oidp->oid_arg1, "UNSET") == 0) { RtlFreeAnsiString(&as); *status = NDIS_STATUS_FAILURE; @@ -809,7 +762,7 @@ TAILQ_FOREACH(e, device_get_sysctl_ctx(sc->ndis_dev), link) { #endif oidp = e->entry; - if (ndis_strcasecmp(oidp->oid_name, keystr) == 0) { + if (strcasecmp(oidp->oid_name, keystr) == 0) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 13 20:11:27 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA35416A409; Fri, 13 Apr 2007 20:11:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7069E16A401 for ; Fri, 13 Apr 2007 20:11:26 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5C1AE13C4AD for ; Fri, 13 Apr 2007 20:11:26 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3DKBQvm033566 for ; Fri, 13 Apr 2007 20:11:26 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3DKBGsG033419 for perforce@freebsd.org; Fri, 13 Apr 2007 20:11:16 GMT (envelope-from marcel@freebsd.org) Date: Fri, 13 Apr 2007 20:11:16 GMT Message-Id: <200704132011.l3DKBGsG033419@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 118049 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Apr 2007 20:11:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=118049 Change 118049 by marcel@marcel_cluster on 2007/04/13 20:10:28 IFC @118042 Affected files ... .. //depot/projects/powerpc/MAINTAINERS#2 integrate .. //depot/projects/powerpc/Makefile#2 integrate .. //depot/projects/powerpc/Makefile.inc1#4 integrate .. //depot/projects/powerpc/ObsoleteFiles.inc#5 integrate .. //depot/projects/powerpc/UPDATING#6 integrate .. //depot/projects/powerpc/bin/df/df.c#3 integrate .. //depot/projects/powerpc/cddl/Makefile#1 branch .. //depot/projects/powerpc/cddl/Makefile.inc#1 branch .. //depot/projects/powerpc/cddl/lib/Makefile#1 branch .. //depot/projects/powerpc/cddl/lib/Makefile.inc#1 branch .. //depot/projects/powerpc/cddl/lib/libavl/Makefile#1 branch .. //depot/projects/powerpc/cddl/lib/libnvpair/Makefile#1 branch .. //depot/projects/powerpc/cddl/lib/libumem/Makefile#1 branch .. //depot/projects/powerpc/cddl/lib/libuutil/Makefile#1 branch .. //depot/projects/powerpc/cddl/lib/libzfs/Makefile#1 branch .. //depot/projects/powerpc/cddl/lib/libzpool/Makefile#1 branch .. //depot/projects/powerpc/cddl/sbin/Makefile#1 branch .. //depot/projects/powerpc/cddl/sbin/Makefile.inc#1 branch .. //depot/projects/powerpc/cddl/sbin/zfs/Makefile#1 branch .. //depot/projects/powerpc/cddl/sbin/zpool/Makefile#1 branch .. //depot/projects/powerpc/cddl/usr.bin/Makefile#1 branch .. //depot/projects/powerpc/cddl/usr.bin/Makefile.inc#1 branch .. //depot/projects/powerpc/cddl/usr.bin/ztest/Makefile#1 branch .. //depot/projects/powerpc/cddl/usr.sbin/Makefile#1 branch .. //depot/projects/powerpc/cddl/usr.sbin/Makefile.inc#1 branch .. //depot/projects/powerpc/cddl/usr.sbin/zdb/Makefile#1 branch .. //depot/projects/powerpc/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/powerpc/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/powerpc/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/powerpc/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/powerpc/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/powerpc/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/powerpc/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/powerpc/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/powerpc/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/powerpc/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/powerpc/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/powerpc/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/powerpc/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/powerpc/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/powerpc/contrib/amd/hlfsd/hlfsd.h#2 integrate .. //depot/projects/powerpc/contrib/binutils/gas/as.h#2 integrate .. //depot/projects/powerpc/contrib/binutils/gas/tc.h#2 integrate .. //depot/projects/powerpc/contrib/libreadline/FREEBSD-upgrade#3 integrate .. //depot/projects/powerpc/contrib/libreadline/display.c#3 integrate .. //depot/projects/powerpc/contrib/openpam/lib/openpam_readline.c#2 integrate .. //depot/projects/powerpc/contrib/opensolaris/cmd/zdb/zdb.8#1 branch .. //depot/projects/powerpc/contrib/opensolaris/cmd/zdb/zdb.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/cmd/zfs/zfs.8#1 branch .. //depot/projects/powerpc/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch .. //depot/projects/powerpc/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch .. //depot/projects/powerpc/contrib/opensolaris/cmd/zpool/zpool.8#1 branch .. //depot/projects/powerpc/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch .. //depot/projects/powerpc/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/cmd/ztest/ztest.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/head/assert.h#1 branch .. //depot/projects/powerpc/contrib/opensolaris/head/atomic.h#1 branch .. //depot/projects/powerpc/contrib/opensolaris/head/libintl.h#1 branch .. //depot/projects/powerpc/contrib/opensolaris/head/stdio_ext.h#1 branch .. //depot/projects/powerpc/contrib/opensolaris/head/synch.h#1 branch .. //depot/projects/powerpc/contrib/opensolaris/head/thread.h#1 branch .. //depot/projects/powerpc/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch .. //depot/projects/powerpc/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch .. //depot/projects/powerpc/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch .. //depot/projects/powerpc/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch .. //depot/projects/powerpc/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch .. //depot/projects/powerpc/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch .. //depot/projects/powerpc/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch .. //depot/projects/powerpc/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch .. //depot/projects/powerpc/contrib/opensolaris/lib/libzpool/common/util.c#1 branch .. //depot/projects/powerpc/contrib/sendmail/FREEBSD-upgrade#2 integrate .. //depot/projects/powerpc/contrib/sendmail/KNOWNBUGS#2 integrate .. //depot/projects/powerpc/contrib/sendmail/PGPKEYS#2 integrate .. //depot/projects/powerpc/contrib/sendmail/RELEASE_NOTES#2 integrate .. //depot/projects/powerpc/contrib/sendmail/cf/README#2 integrate .. //depot/projects/powerpc/contrib/sendmail/cf/cf/knecht.mc#2 integrate .. //depot/projects/powerpc/contrib/sendmail/cf/cf/submit.cf#2 integrate .. //depot/projects/powerpc/contrib/sendmail/cf/feature/access_db.m4#2 integrate .. //depot/projects/powerpc/contrib/sendmail/cf/feature/badmx.m4#1 branch .. //depot/projects/powerpc/contrib/sendmail/cf/feature/block_bad_helo.m4#1 branch .. //depot/projects/powerpc/contrib/sendmail/cf/feature/dnsbl.m4#2 integrate .. //depot/projects/powerpc/contrib/sendmail/cf/feature/enhdnsbl.m4#2 integrate .. //depot/projects/powerpc/contrib/sendmail/cf/feature/require_rdns.m4#1 branch .. //depot/projects/powerpc/contrib/sendmail/cf/m4/proto.m4#2 integrate .. //depot/projects/powerpc/contrib/sendmail/cf/m4/version.m4#2 integrate .. //depot/projects/powerpc/contrib/sendmail/cf/mailer/smtp.m4#2 integrate .. //depot/projects/powerpc/contrib/sendmail/contrib/cidrexpand#2 integrate .. //depot/projects/powerpc/contrib/sendmail/contrib/qtool.pl#2 integrate .. //depot/projects/powerpc/contrib/sendmail/doc/op/op.me#2 integrate .. //depot/projects/powerpc/contrib/sendmail/editmap/Makefile.m4#2 integrate .. //depot/projects/powerpc/contrib/sendmail/include/libmilter/mfapi.h#2 integrate .. //depot/projects/powerpc/contrib/sendmail/include/libmilter/mfdef.h#2 integrate .. //depot/projects/powerpc/contrib/sendmail/include/libmilter/milter.h#2 integrate .. //depot/projects/powerpc/contrib/sendmail/include/sm/conf.h#2 integrate .. //depot/projects/powerpc/contrib/sendmail/include/sm/errstring.h#2 integrate .. //depot/projects/powerpc/contrib/sendmail/include/sm/heap.h#2 integrate .. //depot/projects/powerpc/contrib/sendmail/include/sm/ldap.h#2 integrate .. //depot/projects/powerpc/contrib/sendmail/include/sm/misc.h#1 branch .. //depot/projects/powerpc/contrib/sendmail/include/sm/os/sm_os_qnx.h#1 branch .. //depot/projects/powerpc/contrib/sendmail/include/sm/sendmail.h#1 branch .. //depot/projects/powerpc/contrib/sendmail/include/sm/tailq.h#1 branch .. //depot/projects/powerpc/contrib/sendmail/libmilter/Makefile#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/Makefile.m4#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/README#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/comm.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/api.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/design.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/index.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/installation.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/other.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/overview.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/sample.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/smfi_addheader.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/smfi_addrcpt.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/smfi_addrcpt_par.html#1 branch .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/smfi_chgfrom.html#1 branch .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/smfi_chgheader.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/smfi_delrcpt.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/smfi_getpriv.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/smfi_getsymval.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/smfi_insheader.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/smfi_main.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/smfi_opensocket.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/smfi_progress.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/smfi_quarantine.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/smfi_register.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/smfi_replacebody.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/smfi_setbacklog.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/smfi_setconn.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/smfi_setdbg.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/smfi_setmlreply.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/smfi_setpriv.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/smfi_setreply.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/smfi_setsymlist.html#1 branch .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/smfi_settimeout.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/smfi_stop.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/smfi_version.html#1 branch .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/xxfi_abort.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/xxfi_body.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/xxfi_close.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/xxfi_connect.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/xxfi_data.html#1 branch .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/xxfi_envfrom.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/xxfi_eoh.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/xxfi_eom.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/xxfi_header.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/xxfi_helo.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/xxfi_negotiate.html#1 branch .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/xxfi_unknown.html#1 branch .. //depot/projects/powerpc/contrib/sendmail/libmilter/engine.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/example.c#1 branch .. //depot/projects/powerpc/contrib/sendmail/libmilter/handler.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/libmilter.h#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/listener.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/main.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/monitor.c#1 branch .. //depot/projects/powerpc/contrib/sendmail/libmilter/smfi.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/worker.c#1 branch .. //depot/projects/powerpc/contrib/sendmail/libsm/Makefile#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libsm/Makefile.m4#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libsm/config.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libsm/exc.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libsm/exc.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libsm/findfp.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libsm/flags.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libsm/ldap.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libsm/local.h#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libsm/memstat.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libsm/snprintf.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libsm/t-memstat.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libsm/t-qic.c#1 branch .. //depot/projects/powerpc/contrib/sendmail/libsm/t-sem.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libsm/util.c#1 branch .. //depot/projects/powerpc/contrib/sendmail/libsm/vfscanf.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libsmdb/Makefile.m4#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libsmutil/Makefile.m4#2 integrate .. //depot/projects/powerpc/contrib/sendmail/mail.local/Makefile.m4#2 integrate .. //depot/projects/powerpc/contrib/sendmail/mail.local/mail.local.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/mailstats/Makefile.m4#2 integrate .. //depot/projects/powerpc/contrib/sendmail/makemap/Makefile.m4#2 integrate .. //depot/projects/powerpc/contrib/sendmail/praliases/Makefile.m4#2 integrate .. //depot/projects/powerpc/contrib/sendmail/rmail/Makefile.m4#2 integrate .. //depot/projects/powerpc/contrib/sendmail/smrsh/Makefile.m4#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/Makefile#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/Makefile.m4#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/README#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/TRACEFLAGS#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/TUNING#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/alias.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/arpadate.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/collect.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/conf.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/conf.h#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/control.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/daemon.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/daemon.h#1 branch .. //depot/projects/powerpc/contrib/sendmail/src/deliver.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/domain.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/envelope.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/err.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/headers.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/helpfile#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/macro.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/mailq.1#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/main.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/map.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/map.h#1 branch .. //depot/projects/powerpc/contrib/sendmail/src/mci.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/milter.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/mime.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/parseaddr.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/queue.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/ratectrl.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/readcf.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/recipient.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/sasl.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/savemail.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/sendmail.h#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/sm_resolve.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/srvrsmtp.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/stab.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/stats.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/timers.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/tls.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/udb.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/usersmtp.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/util.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/version.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/test/Makefile#2 integrate .. //depot/projects/powerpc/contrib/sendmail/vacation/Makefile.m4#2 integrate .. //depot/projects/powerpc/contrib/sendmail/vacation/vacation.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-stp.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/sh.lex.c#3 integrate .. //depot/projects/powerpc/etc/defaults/periodic.conf#2 integrate .. //depot/projects/powerpc/etc/defaults/rc.conf#5 integrate .. //depot/projects/powerpc/etc/devd.conf#3 integrate .. //depot/projects/powerpc/etc/mtree/BSD.root.dist#2 integrate .. //depot/projects/powerpc/etc/periodic/daily/404.status-zfs#1 branch .. //depot/projects/powerpc/etc/periodic/daily/Makefile#2 integrate .. //depot/projects/powerpc/etc/rc#2 integrate .. //depot/projects/powerpc/etc/rc.d/FILESYSTEMS#1 branch .. //depot/projects/powerpc/etc/rc.d/Makefile#2 integrate .. //depot/projects/powerpc/etc/rc.d/NETWORKING#2 integrate .. //depot/projects/powerpc/etc/rc.d/addswap#2 integrate .. //depot/projects/powerpc/etc/rc.d/adjkerntz#2 integrate .. //depot/projects/powerpc/etc/rc.d/bootconf.sh#3 integrate .. //depot/projects/powerpc/etc/rc.d/cleanvar#2 integrate .. //depot/projects/powerpc/etc/rc.d/geli2#2 integrate .. //depot/projects/powerpc/etc/rc.d/hostid#1 branch .. //depot/projects/powerpc/etc/rc.d/hostname#3 integrate .. //depot/projects/powerpc/etc/rc.d/ip6addrctl#2 integrate .. //depot/projects/powerpc/etc/rc.d/ip6fw#3 integrate .. //depot/projects/powerpc/etc/rc.d/ipfilter#3 integrate .. //depot/projects/powerpc/etc/rc.d/ipfw#3 integrate .. //depot/projects/powerpc/etc/rc.d/ipmon#2 integrate .. //depot/projects/powerpc/etc/rc.d/ipsec#2 integrate .. //depot/projects/powerpc/etc/rc.d/isdnd#3 integrate .. //depot/projects/powerpc/etc/rc.d/kldxref#2 integrate .. //depot/projects/powerpc/etc/rc.d/mountcritremote#3 integrate .. //depot/projects/powerpc/etc/rc.d/mountd#2 integrate .. //depot/projects/powerpc/etc/rc.d/netif#4 integrate .. //depot/projects/powerpc/etc/rc.d/netoptions#2 integrate .. //depot/projects/powerpc/etc/rc.d/nfslocking#3 integrate .. //depot/projects/powerpc/etc/rc.d/pf#3 integrate .. //depot/projects/powerpc/etc/rc.d/pflog#3 integrate .. //depot/projects/powerpc/etc/rc.d/pfsync#3 integrate .. //depot/projects/powerpc/etc/rc.d/power_profile#3 integrate .. //depot/projects/powerpc/etc/rc.d/var#3 integrate .. //depot/projects/powerpc/etc/rc.d/zfs#1 branch .. //depot/projects/powerpc/etc/rc.firewall#3 integrate .. //depot/projects/powerpc/etc/services#2 integrate .. //depot/projects/powerpc/include/Makefile#3 integrate .. //depot/projects/powerpc/include/rpc/Makefile#2 integrate .. //depot/projects/powerpc/include/rpc/types.h#2 delete .. //depot/projects/powerpc/include/stdio.h#2 integrate .. //depot/projects/powerpc/lib/libarchive/Makefile#4 integrate .. //depot/projects/powerpc/lib/libarchive/archive.h.in#5 integrate .. //depot/projects/powerpc/lib/libarchive/archive_check_magic.c#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_entry.c#4 integrate .. //depot/projects/powerpc/lib/libarchive/archive_platform.h#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_private.h#4 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read.3#5 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read.c#6 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_data_into_buffer.c#3 delete .. //depot/projects/powerpc/lib/libarchive/archive_read_data_into_fd.c#4 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_extract.c#4 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_open_memory.c#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_private.h#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_compression_bzip2.c#4 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_compression_compress.c#4 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_compression_gzip.c#4 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_compression_none.c#5 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_format_all.c#4 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_format_ar.c#1 branch .. //depot/projects/powerpc/lib/libarchive/archive_read_support_format_iso9660.c#5 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_format_tar.c#5 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_disk.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_set_format_ar.c#1 branch .. //depot/projects/powerpc/lib/libarchive/archive_write_set_format_ustar.c#4 integrate .. //depot/projects/powerpc/lib/libarchive/libarchive-formats.5#3 integrate .. //depot/projects/powerpc/lib/libarchive/test/Makefile#2 integrate .. //depot/projects/powerpc/lib/libarchive/test/test_read_format_ar.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_write_format_ar.c#1 branch .. //depot/projects/powerpc/lib/libatm/cache_key.c#2 integrate .. //depot/projects/powerpc/lib/libc/amd64/stdlib/Makefile.inc#1 branch .. //depot/projects/powerpc/lib/libc/amd64/stdlib/div.S#1 branch .. //depot/projects/powerpc/lib/libc/amd64/stdlib/ldiv.S#1 branch .. //depot/projects/powerpc/lib/libc/amd64/stdlib/lldiv.S#1 branch .. //depot/projects/powerpc/lib/libc/gen/Symbol.map#3 integrate .. //depot/projects/powerpc/lib/libc/gen/dlfcn.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getvfsbyname.3#3 integrate .. //depot/projects/powerpc/lib/libc/gen/sysctl.3#3 integrate .. //depot/projects/powerpc/lib/libc/i386/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libc/resolv/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libc/resolv/res_debug.c#3 integrate .. //depot/projects/powerpc/lib/libc/stdlib/strtol.3#3 integrate .. //depot/projects/powerpc/lib/libc/sys/lseek.2#3 integrate .. //depot/projects/powerpc/lib/libc/sys/pathconf.2#3 integrate .. //depot/projects/powerpc/lib/libc/sys/ptrace.2#2 integrate .. //depot/projects/powerpc/lib/libc/uuid/uuid_compare.c#2 integrate .. //depot/projects/powerpc/lib/libcrypt/crypt.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_accept_sec_context.c#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_add_cred.c#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_add_oid_set_member.c#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_canonicalize_name.c#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_display_name.c#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_duplicate_name.c#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_export_sec_context.c#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_import_name.c#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_init_sec_context.c#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_inquire_cred.c#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_names.c#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_utils.c#2 integrate .. //depot/projects/powerpc/lib/libmilter/Makefile#2 integrate .. //depot/projects/powerpc/lib/libpmc/libpmc.c#2 integrate .. //depot/projects/powerpc/lib/libpmc/pmc.3#3 integrate .. //depot/projects/powerpc/lib/libradius/radlib.c#2 integrate .. //depot/projects/powerpc/lib/libsm/Makefile#2 integrate .. //depot/projects/powerpc/lib/libstand/environment.c#2 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_info.c#3 integrate .. //depot/projects/powerpc/libexec/rtld-elf/Makefile#2 integrate .. //depot/projects/powerpc/libexec/rtld-elf/Symbol.map#1 branch .. //depot/projects/powerpc/libexec/rtld-elf/Versions.def#1 branch .. //depot/projects/powerpc/libexec/rtld-elf/i386/Symbol.map#1 branch .. //depot/projects/powerpc/libexec/rtld-elf/map_object.c#2 integrate .. //depot/projects/powerpc/libexec/rtld-elf/rtld.c#3 integrate .. //depot/projects/powerpc/libexec/rtld-elf/rtld.h#2 integrate .. //depot/projects/powerpc/libexec/rtld-elf/rtld_lock.c#2 integrate .. //depot/projects/powerpc/release/Makefile.inc.docports#2 integrate .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 integrate .. //depot/projects/powerpc/sbin/dump/traverse.c#3 integrate .. //depot/projects/powerpc/sbin/gbde/test.sh#2 integrate .. //depot/projects/powerpc/sbin/geom/class/journal/geom_journal.c#2 integrate .. //depot/projects/powerpc/sbin/ggate/ggatec/Makefile#2 integrate .. //depot/projects/powerpc/sbin/ggate/shared/ggate.c#3 integrate .. //depot/projects/powerpc/sbin/ifconfig/Makefile#2 integrate .. //depot/projects/powerpc/sbin/ifconfig/ifconfig.8#6 integrate .. //depot/projects/powerpc/sbin/ifconfig/iftrunk.c#1 branch .. //depot/projects/powerpc/share/man/man4/Makefile#7 integrate .. //depot/projects/powerpc/share/man/man4/if_bridge.4#3 integrate .. //depot/projects/powerpc/share/man/man4/mpt.4#2 integrate .. //depot/projects/powerpc/share/man/man4/nfe.4#2 integrate .. //depot/projects/powerpc/share/man/man4/pci.4#2 integrate .. //depot/projects/powerpc/share/man/man4/polling.4#2 integrate .. //depot/projects/powerpc/share/man/man4/tcp.4#4 integrate .. //depot/projects/powerpc/share/man/man4/trunk.4#1 branch .. //depot/projects/powerpc/share/man/man5/rc.conf.5#5 integrate .. //depot/projects/powerpc/share/man/man5/src.conf.5#3 integrate .. //depot/projects/powerpc/share/man/man7/hier.7#3 integrate .. //depot/projects/powerpc/share/man/man9/VFS_SET.9#2 integrate .. //depot/projects/powerpc/share/man/man9/hash.9#2 integrate .. //depot/projects/powerpc/share/misc/committers-doc.dot#3 integrate .. //depot/projects/powerpc/share/misc/committers-ports.dot#3 integrate .. //depot/projects/powerpc/share/misc/committers-src.dot#3 integrate .. //depot/projects/powerpc/share/mk/Makefile#2 integrate .. //depot/projects/powerpc/share/mk/bsd.lib.mk#2 integrate .. //depot/projects/powerpc/share/mk/bsd.libnames.mk#4 integrate .. //depot/projects/powerpc/share/mk/bsd.own.mk#3 integrate .. //depot/projects/powerpc/share/mk/bsd.symver.mk#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/powerpc/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/powerpc/sys/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/powerpc/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate .. //depot/projects/powerpc/sys/arm/at91/uart_dev_at91usart.c#3 integrate .. //depot/projects/powerpc/sys/arm/sa11x0/uart_cpu_sa1110.c#2 integrate .. //depot/projects/powerpc/sys/arm/sa11x0/uart_dev_sa1110.c#3 integrate .. //depot/projects/powerpc/sys/arm/xscale/i80321/uart_cpu_i80321.c#2 integrate .. //depot/projects/powerpc/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#2 integrate .. //depot/projects/powerpc/sys/boot/arm/at91/boot2/boot2.c#3 integrate .. //depot/projects/powerpc/sys/boot/forth/loader.conf#7 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot0.5/Makefile#4 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot0.5/boot0.5.s#4 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/powerpc/sys/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/powerpc/sys/boot/pc98/boot0.5/selector.s#3 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot0.5/start.s#4 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot2/boot.c#4 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_sg.c#1 branch .. //depot/projects/powerpc/sys/cam/scsi/scsi_sg.h#1 branch .. //depot/projects/powerpc/sys/compat/linprocfs/linprocfs.c#8 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_emul.c#5 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_emul.h#3 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_file.c#7 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_ioctl.c#5 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_ioctl.h#4 integrate .. //depot/projects/powerpc/sys/compat/ndis/kern_ndis.c#3 integrate .. //depot/projects/powerpc/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/powerpc/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/powerpc/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/powerpc/sys/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/powerpc/sys/compat/svr4/svr4_filio.c#5 integrate .. //depot/projects/powerpc/sys/conf/NOTES#9 integrate .. //depot/projects/powerpc/sys/conf/files#10 integrate .. //depot/projects/powerpc/sys/conf/files.amd64#3 integrate .. //depot/projects/powerpc/sys/conf/files.i386#6 integrate .. //depot/projects/powerpc/sys/conf/files.ia64#5 integrate .. //depot/projects/powerpc/sys/conf/files.pc98#6 integrate .. //depot/projects/powerpc/sys/conf/files.powerpc#7 integrate .. //depot/projects/powerpc/sys/conf/options#11 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/utmisc.c#6 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/dnlc.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/atomic.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/dnlc.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/vfs.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/powerpc/sys/dev/arcmsr/arcmsr.c#6 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-all.h#7 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-dma.c#6 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-lowlevel.c#3 integrate .. //depot/projects/powerpc/sys/dev/ata/ata_if.m#2 integrate .. //depot/projects/powerpc/sys/dev/ath/ah_osdep.c#2 integrate .. //depot/projects/powerpc/sys/dev/bge/if_bge.c#10 integrate .. //depot/projects/powerpc/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/powerpc/sys/dev/cxgb/cxgb_lro.c#2 integrate .. //depot/projects/powerpc/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/powerpc/sys/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/powerpc/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/powerpc/sys/dev/cxgb/sys/mvec.h#1 branch .. //depot/projects/powerpc/sys/dev/cxgb/sys/uipc_mvec.c#1 branch .. //depot/projects/powerpc/sys/dev/if_ndis/if_ndis_pccard.c#2 integrate .. //depot/projects/powerpc/sys/dev/isp/isp_freebsd.c#8 integrate .. //depot/projects/powerpc/sys/dev/isp/isp_freebsd.h#9 integrate .. //depot/projects/powerpc/sys/dev/isp/isp_library.c#3 integrate .. //depot/projects/powerpc/sys/dev/isp/isp_library.h#3 integrate .. //depot/projects/powerpc/sys/dev/isp/isp_pci.c#10 integrate .. //depot/projects/powerpc/sys/dev/isp/isp_sbus.c#6 integrate .. //depot/projects/powerpc/sys/dev/mii/brgphy.c#10 integrate .. //depot/projects/powerpc/sys/dev/mii/miidevs#8 integrate .. //depot/projects/powerpc/sys/dev/mpt/mpt_cam.c#7 integrate .. //depot/projects/powerpc/sys/dev/msk/if_msk.c#5 integrate .. //depot/projects/powerpc/sys/dev/mxge/if_mxge.c#5 integrate .. //depot/projects/powerpc/sys/dev/sk/if_sk.c#5 integrate .. //depot/projects/powerpc/sys/dev/sk/if_skreg.h#3 integrate .. //depot/projects/powerpc/sys/dev/sound/midi/midi.c#7 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/cmi.c#6 integrate .. //depot/projects/powerpc/sys/dev/sound/pcm/channel.c#6 integrate .. //depot/projects/powerpc/sys/dev/sound/pcm/mixer.c#5 integrate .. //depot/projects/powerpc/sys/dev/sound/usb/uaudio.c#6 integrate .. //depot/projects/powerpc/sys/dev/streams/streams.c#5 integrate .. //depot/projects/powerpc/sys/dev/uart/uart.h#2 integrate .. //depot/projects/powerpc/sys/dev/uart/uart_bus.h#2 integrate .. //depot/projects/powerpc/sys/dev/uart/uart_bus_pci.c#2 integrate .. //depot/projects/powerpc/sys/dev/uart/uart_core.c#3 integrate .. //depot/projects/powerpc/sys/dev/uart/uart_cpu.h#3 integrate .. //depot/projects/powerpc/sys/dev/uart/uart_cpu_amd64.c#2 integrate .. //depot/projects/powerpc/sys/dev/uart/uart_cpu_i386.c#2 integrate .. //depot/projects/powerpc/sys/dev/uart/uart_cpu_ia64.c#2 integrate .. //depot/projects/powerpc/sys/dev/uart/uart_cpu_pc98.c#2 integrate .. //depot/projects/powerpc/sys/dev/uart/uart_cpu_powerpc.c#2 integrate .. //depot/projects/powerpc/sys/dev/uart/uart_cpu_sparc64.c#2 integrate .. //depot/projects/powerpc/sys/dev/uart/uart_dev_ns8250.c#4 integrate .. //depot/projects/powerpc/sys/dev/uart/uart_dev_sab82532.c#3 integrate .. //depot/projects/powerpc/sys/dev/uart/uart_dev_z8530.c#3 integrate .. //depot/projects/powerpc/sys/dev/uart/uart_kbd_sun.c#3 integrate .. //depot/projects/powerpc/sys/dev/uart/uart_subr.c#2 integrate .. //depot/projects/powerpc/sys/dev/usb/if_ural.c#3 integrate .. //depot/projects/powerpc/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/powerpc/sys/fs/devfs/devfs_vnops.c#6 integrate .. //depot/projects/powerpc/sys/fs/fdescfs/fdesc_vfsops.c#5 integrate .. //depot/projects/powerpc/sys/fs/fdescfs/fdesc_vnops.c#6 integrate .. //depot/projects/powerpc/sys/fs/fifofs/fifo_vnops.c#6 integrate .. //depot/projects/powerpc/sys/fs/pseudofs/pseudofs.c#6 integrate .. //depot/projects/powerpc/sys/fs/pseudofs/pseudofs.h#6 integrate .. //depot/projects/powerpc/sys/fs/pseudofs/pseudofs_fileno.c#4 integrate .. //depot/projects/powerpc/sys/fs/pseudofs/pseudofs_internal.h#5 integrate .. //depot/projects/powerpc/sys/fs/pseudofs/pseudofs_vncache.c#7 integrate .. //depot/projects/powerpc/sys/fs/unionfs/union_subr.c#8 integrate .. //depot/projects/powerpc/sys/geom/eli/g_eli.c#4 integrate .. //depot/projects/powerpc/sys/geom/journal/g_journal.c#3 integrate .. //depot/projects/powerpc/sys/geom/uzip/g_uzip.c#2 integrate .. //depot/projects/powerpc/sys/geom/vinum/geom_vinum.h#2 integrate .. //depot/projects/powerpc/sys/geom/vinum/geom_vinum_rm.c#2 integrate .. //depot/projects/powerpc/sys/geom/vinum/geom_vinum_share.c#2 integrate .. //depot/projects/powerpc/sys/geom/vinum/geom_vinum_subr.c#2 integrate .. //depot/projects/powerpc/sys/i386/conf/GENERIC#7 integrate .. //depot/projects/powerpc/sys/i386/i386/identcpu.c#7 integrate .. //depot/projects/powerpc/sys/i386/i386/initcpu.c#5 integrate .. //depot/projects/powerpc/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/powerpc/sys/i386/i386/mp_machdep.c#8 integrate .. //depot/projects/powerpc/sys/i386/i386/pmap.c#8 integrate .. //depot/projects/powerpc/sys/i386/i386/trap.c#7 integrate .. //depot/projects/powerpc/sys/i386/include/pmap.h#6 integrate .. //depot/projects/powerpc/sys/i386/include/specialreg.h#6 integrate .. //depot/projects/powerpc/sys/i386/include/vmparam.h#4 integrate .. //depot/projects/powerpc/sys/i386/linux/linux_sysvec.c#5 integrate .. //depot/projects/powerpc/sys/ia64/conf/GENERIC#6 integrate .. //depot/projects/powerpc/sys/kern/kern_descrip.c#8 integrate .. //depot/projects/powerpc/sys/kern/kern_event.c#6 integrate .. //depot/projects/powerpc/sys/kern/kern_fork.c#7 integrate .. //depot/projects/powerpc/sys/kern/kern_jail.c#7 integrate .. //depot/projects/powerpc/sys/kern/kern_mbuf.c#3 integrate .. //depot/projects/powerpc/sys/kern/kern_mib.c#5 integrate .. //depot/projects/powerpc/sys/kern/kern_mutex.c#7 integrate .. //depot/projects/powerpc/sys/kern/kern_sx.c#7 integrate .. //depot/projects/powerpc/sys/kern/subr_lock.c#3 integrate .. //depot/projects/powerpc/sys/kern/subr_witness.c#9 integrate .. //depot/projects/powerpc/sys/kern/sys_generic.c#6 integrate .. //depot/projects/powerpc/sys/kern/uipc_mqueue.c#3 integrate .. //depot/projects/powerpc/sys/kern/uipc_syscalls.c#7 integrate .. //depot/projects/powerpc/sys/kern/uipc_usrreq.c#8 integrate .. //depot/projects/powerpc/sys/kern/vfs_cache.c#6 integrate .. //depot/projects/powerpc/sys/kern/vfs_lookup.c#7 integrate .. //depot/projects/powerpc/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/powerpc/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/powerpc/sys/kern/vfs_syscalls.c#8 integrate .. //depot/projects/powerpc/sys/libkern/index.c#4 integrate .. //depot/projects/powerpc/sys/libkern/memset.c#1 branch .. //depot/projects/powerpc/sys/libkern/rindex.c#4 integrate .. //depot/projects/powerpc/sys/modules/Makefile#9 integrate .. //depot/projects/powerpc/sys/modules/cam/Makefile#4 integrate .. //depot/projects/powerpc/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/powerpc/sys/modules/dpt/Makefile#2 integrate .. //depot/projects/powerpc/sys/modules/if_trunk/Makefile#1 branch .. //depot/projects/powerpc/sys/modules/libalias/libalias/Makefile#2 integrate .. //depot/projects/powerpc/sys/modules/zfs/Makefile#1 branch .. //depot/projects/powerpc/sys/net/ieee8023ad_lacp.c#1 branch .. //depot/projects/powerpc/sys/net/ieee8023ad_lacp.h#1 branch .. //depot/projects/powerpc/sys/net/if.c#7 integrate .. //depot/projects/powerpc/sys/net/if_ethersubr.c#8 integrate .. //depot/projects/powerpc/sys/net/if_trunk.c#1 branch .. //depot/projects/powerpc/sys/net/if_trunk.h#1 branch .. //depot/projects/powerpc/sys/net/if_var.h#6 integrate .. //depot/projects/powerpc/sys/netatm/atm_if.c#5 integrate .. //depot/projects/powerpc/sys/netinet/in_pcb.c#7 integrate .. //depot/projects/powerpc/sys/netinet/in_pcb.h#7 integrate .. //depot/projects/powerpc/sys/netinet/ip_fw2.c#6 integrate .. //depot/projects/powerpc/sys/netinet/ip_var.h#5 integrate .. //depot/projects/powerpc/sys/netinet/libalias/alias_db.c#3 integrate .. //depot/projects/powerpc/sys/netinet/libalias/alias_ftp.c#2 integrate .. //depot/projects/powerpc/sys/netinet/libalias/alias_irc.c#2 integrate .. //depot/projects/powerpc/sys/netinet/libalias/alias_proxy.c#3 integrate .. //depot/projects/powerpc/sys/netinet/libalias/alias_skinny.c#2 integrate .. //depot/projects/powerpc/sys/netinet/sctp_asconf.c#6 integrate .. //depot/projects/powerpc/sys/netinet/sctp_bsd_addr.h#4 integrate .. //depot/projects/powerpc/sys/netinet/sctp_constants.h#7 integrate .. //depot/projects/powerpc/sys/netinet/sctp_indata.c#7 integrate .. //depot/projects/powerpc/sys/netinet/sctp_input.c#7 integrate .. //depot/projects/powerpc/sys/netinet/sctp_os_bsd.h#7 integrate .. //depot/projects/powerpc/sys/netinet/sctp_output.c#7 integrate .. //depot/projects/powerpc/sys/netinet/sctp_output.h#4 integrate .. //depot/projects/powerpc/sys/netinet/sctp_pcb.c#7 integrate .. //depot/projects/powerpc/sys/netinet/sctp_pcb.h#6 integrate .. //depot/projects/powerpc/sys/netinet/sctp_sysctl.c#3 integrate .. //depot/projects/powerpc/sys/netinet/sctp_sysctl.h#3 integrate .. //depot/projects/powerpc/sys/netinet/sctp_timer.c#6 integrate .. //depot/projects/powerpc/sys/netinet/sctp_uio.h#7 integrate .. //depot/projects/powerpc/sys/netinet/sctp_usrreq.c#7 integrate .. //depot/projects/powerpc/sys/netinet/sctputil.c#8 integrate .. //depot/projects/powerpc/sys/netinet/tcp_input.c#8 integrate .. //depot/projects/powerpc/sys/netinet/tcp_output.c#7 integrate .. //depot/projects/powerpc/sys/netinet/tcp_sack.c#3 integrate .. //depot/projects/powerpc/sys/netinet/tcp_subr.c#7 integrate .. //depot/projects/powerpc/sys/netinet/tcp_syncache.c#6 integrate .. //depot/projects/powerpc/sys/netinet/tcp_timer.c#5 integrate .. //depot/projects/powerpc/sys/netinet/tcp_timer.h#5 integrate .. //depot/projects/powerpc/sys/netinet/tcp_usrreq.c#7 integrate .. //depot/projects/powerpc/sys/netinet/tcp_var.h#7 integrate .. //depot/projects/powerpc/sys/netinet6/ipsec.c#5 integrate .. //depot/projects/powerpc/sys/netinet6/sctp6_usrreq.c#7 integrate .. //depot/projects/powerpc/sys/netipsec/ipsec_osdep.h#2 integrate .. //depot/projects/powerpc/sys/netsmb/smb_dev.c#5 integrate .. //depot/projects/powerpc/sys/nfsserver/nfs_srvsubs.c#7 integrate .. //depot/projects/powerpc/sys/opencrypto/cryptodev.c#3 integrate .. //depot/projects/powerpc/sys/pc98/conf/GENERIC#6 integrate .. //depot/projects/powerpc/sys/powerpc/conf/GENERIC#8 integrate .. //depot/projects/powerpc/sys/rpc/types.h#1 branch .. //depot/projects/powerpc/sys/security/audit/audit.c#4 integrate .. //depot/projects/powerpc/sys/security/audit/audit.h#2 integrate .. //depot/projects/powerpc/sys/security/audit/audit_arg.c#4 integrate .. //depot/projects/powerpc/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/powerpc/sys/security/audit/audit_bsm_klib.c#3 integrate .. //depot/projects/powerpc/sys/security/audit/audit_bsm_token.c#3 integrate .. //depot/projects/powerpc/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/powerpc/sys/security/audit/audit_syscalls.c#4 integrate .. //depot/projects/powerpc/sys/sparc64/conf/GENERIC#6 integrate .. //depot/projects/powerpc/sys/sun4v/conf/GENERIC#3 integrate .. //depot/projects/powerpc/sys/sun4v/include/smp.h#4 integrate .. //depot/projects/powerpc/sys/sys/elf_common.h#5 integrate .. //depot/projects/powerpc/sys/sys/eventhandler.h#6 integrate .. //depot/projects/powerpc/sys/sys/filedesc.h#5 integrate .. //depot/projects/powerpc/sys/sys/filio.h#4 integrate .. //depot/projects/powerpc/sys/sys/hash.h#2 integrate .. //depot/projects/powerpc/sys/sys/jail.h#5 integrate .. //depot/projects/powerpc/sys/sys/kernel.h#5 integrate .. //depot/projects/powerpc/sys/sys/libkern.h#5 integrate .. //depot/projects/powerpc/sys/sys/link_elf.h#2 integrate .. //depot/projects/powerpc/sys/sys/lock.h#7 integrate .. //depot/projects/powerpc/sys/sys/lock_profile.h#4 integrate .. //depot/projects/powerpc/sys/sys/mbuf.h#7 integrate .. //depot/projects/powerpc/sys/sys/mount.h#9 integrate .. //depot/projects/powerpc/sys/sys/mutex.h#8 integrate .. //depot/projects/powerpc/sys/sys/param.h#8 integrate .. //depot/projects/powerpc/sys/sys/priv.h#4 integrate .. //depot/projects/powerpc/sys/sys/proc.h#9 integrate .. //depot/projects/powerpc/sys/sys/sx.h#7 integrate .. //depot/projects/powerpc/sys/sys/sysctl.h#5 integrate .. //depot/projects/powerpc/sys/sys/sysent.h#6 integrate .. //depot/projects/powerpc/sys/sys/systm.h#8 integrate .. //depot/projects/powerpc/sys/sys/unistd.h#4 integrate .. //depot/projects/powerpc/sys/ufs/ffs/ffs_snapshot.c#7 integrate .. //depot/projects/powerpc/sys/ufs/ffs/ffs_softdep.c#7 integrate .. //depot/projects/powerpc/sys/ufs/ffs/ffs_vfsops.c#7 integrate .. //depot/projects/powerpc/sys/ufs/ffs/ffs_vnops.c#7 integrate .. //depot/projects/powerpc/sys/vm/phys_pager.c#5 integrate .. //depot/projects/powerpc/sys/vm/vm_fault.c#6 integrate .. //depot/projects/powerpc/sys/vm/vm_kern.c#6 integrate .. //depot/projects/powerpc/tools/build/mk/OptionalObsoleteFiles.inc#4 integrate .. //depot/projects/powerpc/tools/build/options/WITHOUT_ZFS#1 branch .. //depot/projects/powerpc/tools/regression/netinet/ipsockopt/ipsockopt.c#3 integrate .. //depot/projects/powerpc/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c#2 integrate .. //depot/projects/powerpc/tools/regression/sockets/socketpair/socketpair.c#2 integrate .. //depot/projects/powerpc/tools/regression/usr.bin/sed/multitest.t#2 integrate .. //depot/projects/powerpc/tools/regression/usr.bin/sed/regress.b2a.out#1 branch .. //depot/projects/powerpc/tools/regression/usr.bin/sed/regress.c0.out#1 branch .. //depot/projects/powerpc/tools/regression/usr.bin/sed/regress.c1.out#1 branch .. //depot/projects/powerpc/tools/regression/usr.bin/sed/regress.c2.out#1 branch .. //depot/projects/powerpc/tools/regression/usr.bin/sed/regress.c3.out#1 branch .. //depot/projects/powerpc/tools/regression/usr.bin/sed/regress.multitest.out/54_5.3#2 integrate .. //depot/projects/powerpc/tools/regression/usr.bin/sed/regress.sh#3 integrate .. //depot/projects/powerpc/tools/tools/net80211/wesside/wesside/Makefile#2 integrate .. //depot/projects/powerpc/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.c#1 branch .. //depot/projects/powerpc/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.h#1 branch .. //depot/projects/powerpc/tools/tools/net80211/wesside/wesside/wesside.c#2 integrate .. //depot/projects/powerpc/usr.bin/calendar/calendars/calendar.freebsd#4 integrate .. //depot/projects/powerpc/usr.bin/finger/extern.h#2 integrate .. //depot/projects/powerpc/usr.bin/finger/finger.1#2 integrate .. //depot/projects/powerpc/usr.bin/finger/finger.c#2 integrate .. //depot/projects/powerpc/usr.bin/finger/net.c#2 integrate .. //depot/projects/powerpc/usr.bin/gcore/elfcore.c#2 integrate .. //depot/projects/powerpc/usr.bin/kdump/kdump.c#3 integrate .. //depot/projects/powerpc/usr.bin/kdump/kdump_subr.h#3 integrate .. //depot/projects/powerpc/usr.bin/kdump/mksubr#3 integrate .. //depot/projects/powerpc/usr.bin/lastcomm/lastcomm.1#2 integrate .. //depot/projects/powerpc/usr.bin/lastcomm/lastcomm.c#2 integrate .. //depot/projects/powerpc/usr.bin/lsvfs/lsvfs.c#2 integrate .. //depot/projects/powerpc/usr.bin/make/parse.c#3 integrate .. //depot/projects/powerpc/usr.bin/netstat/mcast.c#4 integrate .. //depot/projects/powerpc/usr.bin/passwd/passwd.1#2 integrate .. //depot/projects/powerpc/usr.bin/sed/POSIX#2 integrate .. //depot/projects/powerpc/usr.bin/sed/process.c#3 integrate .. //depot/projects/powerpc/usr.bin/tar/Makefile#3 integrate .. //depot/projects/powerpc/usr.bin/tar/bsdtar_platform.h#4 integrate .. //depot/projects/powerpc/usr.bin/tar/read.c#4 integrate .. //depot/projects/powerpc/usr.bin/tar/test/test-basic.sh#3 integrate .. //depot/projects/powerpc/usr.bin/tar/write.c#6 integrate .. //depot/projects/powerpc/usr.bin/touch/touch.1#2 integrate .. //depot/projects/powerpc/usr.bin/touch/touch.c#2 integrate .. //depot/projects/powerpc/usr.bin/truss/Makefile#2 integrate .. //depot/projects/powerpc/usr.bin/truss/amd64-fbsd.c#2 integrate .. //depot/projects/powerpc/usr.bin/truss/extern.h#2 integrate .. //depot/projects/powerpc/usr.bin/truss/i386-fbsd.c#2 integrate .. //depot/projects/powerpc/usr.bin/truss/i386-linux.c#2 integrate .. //depot/projects/powerpc/usr.bin/truss/ia64-fbsd.c#2 integrate .. //depot/projects/powerpc/usr.bin/truss/main.c#2 integrate .. //depot/projects/powerpc/usr.bin/truss/powerpc-fbsd.c#2 integrate .. //depot/projects/powerpc/usr.bin/truss/setup.c#2 integrate .. //depot/projects/powerpc/usr.bin/truss/sparc64-fbsd.c#2 integrate .. //depot/projects/powerpc/usr.bin/truss/syscall.h#2 integrate .. //depot/projects/powerpc/usr.bin/truss/syscalls.c#2 integrate .. //depot/projects/powerpc/usr.bin/truss/truss.1#3 integrate .. //depot/projects/powerpc/usr.bin/truss/truss.h#2 integrate .. //depot/projects/powerpc/usr.bin/uuidgen/Makefile#2 integrate .. //depot/projects/powerpc/usr.sbin/adduser/adduser.conf.5#2 integrate .. //depot/projects/powerpc/usr.sbin/adduser/adduser.sh#3 integrate .. //depot/projects/powerpc/usr.sbin/ifmcstat/Makefile#3 integrate .. //depot/projects/powerpc/usr.sbin/ifmcstat/ifmcstat.8#3 integrate .. //depot/projects/powerpc/usr.sbin/ifmcstat/ifmcstat.c#3 integrate .. //depot/projects/powerpc/usr.sbin/jail/jail.8#2 integrate .. //depot/projects/powerpc/usr.sbin/mountd/mountd.c#3 integrate .. //depot/projects/powerpc/usr.sbin/ntp/doc/ntpd.8#2 integrate .. //depot/projects/powerpc/usr.sbin/pstat/pstat.8#2 integrate .. //depot/projects/powerpc/usr.sbin/pstat/pstat.c#3 integrate .. //depot/projects/powerpc/usr.sbin/rpc.lockd/lockd.c#2 integrate .. //depot/projects/powerpc/usr.sbin/rpc.lockd/lockd_lock.c#3 integrate .. //depot/projects/powerpc/usr.sbin/rpc.lockd/rpc.lockd.8#2 integrate .. //depot/projects/powerpc/usr.sbin/rpc.statd/procs.c#2 integrate .. //depot/projects/powerpc/usr.sbin/rpc.statd/rpc.statd.8#2 integrate .. //depot/projects/powerpc/usr.sbin/rpc.statd/statd.c#2 integrate .. //depot/projects/powerpc/usr.sbin/sa/pdb.c#2 integrate .. //depot/projects/powerpc/usr.sbin/sendmail/Makefile#2 integrate .. //depot/projects/powerpc/usr.sbin/sysinstall/config.c#3 integrate .. //depot/projects/powerpc/usr.sbin/sysinstall/index.c#5 integrate Differences ... ==== //depot/projects/powerpc/MAINTAINERS#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.142 2006/11/11 22:24:10 kris Exp $ +$FreeBSD: src/MAINTAINERS,v 1.143 2007/04/06 10:57:15 pjd Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -108,6 +108,7 @@ geom_stripe pjd Pre-commit review preferred. geom_zero pjd Pre-commit review preferred. sbin/geom pjd Pre-commit review preferred. +zfs pjd Pre-commit review preferred. nfs alfred Will be happy to review code, but not mandatory. rpc.lockd alfred Will be happy to review code, but not mandatory. truss alfred Will be happy to review code, but not mandatory. ==== //depot/projects/powerpc/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.339 2006/11/28 01:03:29 ru Exp $ +# $FreeBSD: src/Makefile,v 1.340 2007/04/02 21:32:44 marcel Exp $ # # The user-driven targets are: # @@ -261,12 +261,14 @@ # existing system is. # .if make(universe) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 13 20:43:19 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D00E916A508; Fri, 13 Apr 2007 20:43:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 79FD116A503 for ; Fri, 13 Apr 2007 20:43:18 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 660AA13C458 for ; Fri, 13 Apr 2007 20:43:18 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3DKhI56039157 for ; Fri, 13 Apr 2007 20:43:18 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3DKhCXp039116 for perforce@freebsd.org; Fri, 13 Apr 2007 20:43:12 GMT (envelope-from piso@freebsd.org) Date: Fri, 13 Apr 2007 20:43:12 GMT Message-Id: <200704132043.l3DKhCXp039116@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 118053 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Apr 2007 20:43:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=118053 Change 118053 by piso@piso_newluxor on 2007/04/13 20:42:39 IFC@118052 Affected files ... .. //depot/projects/soc2005/libalias/ObsoleteFiles.inc#20 integrate .. //depot/projects/soc2005/libalias/contrib/libreadline/FREEBSD-upgrade#3 integrate .. //depot/projects/soc2005/libalias/contrib/libreadline/display.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zdb/zdb.8#2 integrate .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zfs/zfs_main.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zpool/zpool.8#2 integrate .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/ztest/ztest.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/FREEBSD-upgrade#3 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/KNOWNBUGS#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/PGPKEYS#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/RELEASE_NOTES#3 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/cf/README#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/cf/cf/knecht.mc#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/cf/cf/submit.cf#3 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/cf/feature/access_db.m4#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/cf/feature/badmx.m4#1 branch .. //depot/projects/soc2005/libalias/contrib/sendmail/cf/feature/block_bad_helo.m4#1 branch .. //depot/projects/soc2005/libalias/contrib/sendmail/cf/feature/dnsbl.m4#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/cf/feature/enhdnsbl.m4#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/cf/feature/require_rdns.m4#1 branch .. //depot/projects/soc2005/libalias/contrib/sendmail/cf/m4/proto.m4#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/cf/m4/version.m4#3 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/cf/mailer/smtp.m4#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/contrib/cidrexpand#3 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/contrib/qtool.pl#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/doc/op/op.me#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/editmap/Makefile.m4#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/include/libmilter/mfapi.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/include/libmilter/mfdef.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/include/libmilter/milter.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/include/sm/conf.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/include/sm/errstring.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/include/sm/heap.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/include/sm/ldap.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/include/sm/misc.h#1 branch .. //depot/projects/soc2005/libalias/contrib/sendmail/include/sm/os/sm_os_qnx.h#1 branch .. //depot/projects/soc2005/libalias/contrib/sendmail/include/sm/sendmail.h#1 branch .. //depot/projects/soc2005/libalias/contrib/sendmail/include/sm/tailq.h#1 branch .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/Makefile#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/Makefile.m4#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/README#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/comm.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/api.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/design.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/index.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/installation.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/other.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/overview.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/sample.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_addheader.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_addrcpt.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_addrcpt_par.html#1 branch .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_chgfrom.html#1 branch .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_chgheader.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_delrcpt.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_getpriv.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_getsymval.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_insheader.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_main.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_opensocket.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_progress.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_quarantine.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_register.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_replacebody.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_setbacklog.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_setconn.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_setdbg.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_setmlreply.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_setpriv.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_setreply.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_setsymlist.html#1 branch .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_settimeout.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_stop.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_version.html#1 branch .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/xxfi_abort.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/xxfi_body.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/xxfi_close.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/xxfi_connect.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/xxfi_data.html#1 branch .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/xxfi_envfrom.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/xxfi_eoh.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/xxfi_eom.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/xxfi_header.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/xxfi_helo.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/xxfi_negotiate.html#1 branch .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/xxfi_unknown.html#1 branch .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/engine.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/example.c#1 branch .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/handler.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/libmilter.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/listener.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/main.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/monitor.c#1 branch .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/smfi.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/worker.c#1 branch .. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/Makefile#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/Makefile.m4#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/config.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/exc.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/exc.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/findfp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/flags.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/ldap.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/local.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/memstat.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/snprintf.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/t-memstat.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/t-qic.c#1 branch .. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/t-sem.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/util.c#1 branch .. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/vfscanf.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libsmdb/Makefile.m4#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/libsmutil/Makefile.m4#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/mail.local/Makefile.m4#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/mail.local/mail.local.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/mailstats/Makefile.m4#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/makemap/Makefile.m4#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/praliases/Makefile.m4#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/rmail/Makefile.m4#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/smrsh/Makefile.m4#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/Makefile#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/Makefile.m4#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/README#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/TRACEFLAGS#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/TUNING#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/alias.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/arpadate.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/collect.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/conf.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/conf.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/control.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/daemon.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/daemon.h#1 branch .. //depot/projects/soc2005/libalias/contrib/sendmail/src/deliver.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/domain.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/envelope.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/err.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/headers.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/helpfile#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/macro.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/mailq.1#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/main.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/map.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/map.h#1 branch .. //depot/projects/soc2005/libalias/contrib/sendmail/src/mci.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/milter.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/mime.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/parseaddr.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/queue.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/ratectrl.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/readcf.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/recipient.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/sasl.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/savemail.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/sendmail.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/sm_resolve.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/srvrsmtp.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/stab.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/stats.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/timers.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/tls.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/udb.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/usersmtp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/util.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/version.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/test/Makefile#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/vacation/Makefile.m4#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/vacation/vacation.c#2 integrate .. //depot/projects/soc2005/libalias/etc/defaults/rc.conf#14 integrate .. //depot/projects/soc2005/libalias/etc/mtree/BSD.root.dist#3 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/FILESYSTEMS#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/Makefile#8 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/NETWORKING#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/hostid#1 branch .. //depot/projects/soc2005/libalias/etc/rc.d/ipfilter#5 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/ipsec#3 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/kldxref#3 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/mountcritremote#4 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/mountd#3 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/netoptions#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/pf#4 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/pflog#4 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/pfsync#4 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/zfs#2 integrate .. //depot/projects/soc2005/libalias/etc/services#2 integrate .. //depot/projects/soc2005/libalias/include/Makefile#8 integrate .. //depot/projects/soc2005/libalias/include/rpc/Makefile#2 integrate .. //depot/projects/soc2005/libalias/include/rpc/types.h#2 delete .. //depot/projects/soc2005/libalias/lib/libarchive/Makefile#6 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_platform.h#5 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_support_format_tar.c#8 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write_disk.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/Symbol.map#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/sysctl.3#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/i386/Symbol.map#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdlib/strtol.3#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/ptrace.2#4 integrate .. //depot/projects/soc2005/libalias/lib/libmilter/Makefile#2 integrate .. //depot/projects/soc2005/libalias/lib/libpmc/libpmc.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libpmc/pmc.3#3 integrate .. //depot/projects/soc2005/libalias/lib/libsm/Makefile#2 integrate .. //depot/projects/soc2005/libalias/libexec/rtld-elf/Makefile#3 integrate .. //depot/projects/soc2005/libalias/libexec/rtld-elf/Symbol.map#2 integrate .. //depot/projects/soc2005/libalias/libexec/rtld-elf/Versions.def#2 integrate .. //depot/projects/soc2005/libalias/release/Makefile.inc.docports#2 integrate .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifconfig.8#12 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/iftrunk.c#1 branch .. //depot/projects/soc2005/libalias/share/man/man4/Makefile#11 integrate .. //depot/projects/soc2005/libalias/share/man/man4/trunk.4#1 branch .. //depot/projects/soc2005/libalias/share/man/man5/rc.conf.5#12 integrate .. //depot/projects/soc2005/libalias/share/man/man9/hash.9#4 integrate .. //depot/projects/soc2005/libalias/share/misc/committers-ports.dot#2 integrate .. //depot/projects/soc2005/libalias/share/misc/committers-src.dot#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/pmap.c#10 integrate .. //depot/projects/soc2005/libalias/sys/amd64/conf/GENERIC#9 integrate .. //depot/projects/soc2005/libalias/sys/boot/forth/loader.conf#10 integrate .. //depot/projects/soc2005/libalias/sys/cam/scsi/scsi_sg.c#3 integrate .. //depot/projects/soc2005/libalias/sys/cam/scsi/scsi_sg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_ioctl.h#3 integrate .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/kern/opensolaris_string.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/string.h#2 integrate .. //depot/projects/soc2005/libalias/sys/conf/NOTES#21 integrate .. //depot/projects/soc2005/libalias/sys/conf/files#26 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.ia64#4 integrate .. //depot/projects/soc2005/libalias/sys/contrib/dev/acpica/utmisc.c#3 integrate .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/common/atomic/i386/atomic.S#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/dnlc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3 integrate .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#3 integrate .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ath/ah_osdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/brgphy.c#10 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/miidevs#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/msk/if_msk.c#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/soc2005/libalias/sys/fs/pseudofs/pseudofs.c#3 integrate .. //depot/projects/soc2005/libalias/sys/fs/pseudofs/pseudofs.h#3 integrate .. //depot/projects/soc2005/libalias/sys/fs/pseudofs/pseudofs_fileno.c#2 integrate .. //depot/projects/soc2005/libalias/sys/fs/pseudofs/pseudofs_internal.h#2 integrate .. //depot/projects/soc2005/libalias/sys/fs/pseudofs/pseudofs_vncache.c#4 integrate .. //depot/projects/soc2005/libalias/sys/geom/vinum/geom_vinum.h#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/vinum/geom_vinum_rm.c#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/vinum/geom_vinum_share.c#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/vinum/geom_vinum_subr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/conf/GENERIC#8 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/mp_machdep.c#7 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/pmap.c#8 integrate .. //depot/projects/soc2005/libalias/sys/i386/include/pmap.h#5 integrate .. //depot/projects/soc2005/libalias/sys/ia64/conf/GENERIC#7 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_jail.c#7 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_mib.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/uipc_mqueue.c#5 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_mount.c#13 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_subr.c#11 integrate .. //depot/projects/soc2005/libalias/sys/libkern/index.c#2 integrate .. //depot/projects/soc2005/libalias/sys/libkern/rindex.c#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/Makefile#14 integrate .. //depot/projects/soc2005/libalias/sys/modules/dpt/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/if_trunk/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/libalias/libalias/Makefile#12 integrate .. //depot/projects/soc2005/libalias/sys/net/ieee8023ad_lacp.c#1 branch .. //depot/projects/soc2005/libalias/sys/net/ieee8023ad_lacp.h#1 branch .. //depot/projects/soc2005/libalias/sys/net/if.c#7 integrate .. //depot/projects/soc2005/libalias/sys/net/if_ethersubr.c#10 integrate .. //depot/projects/soc2005/libalias/sys/net/if_trunk.c#1 branch .. //depot/projects/soc2005/libalias/sys/net/if_trunk.h#1 branch .. //depot/projects/soc2005/libalias/sys/net/if_var.h#5 integrate .. //depot/projects/soc2005/libalias/sys/netinet/in_pcb.c#8 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_input.c#11 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_output.c#7 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_sack.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_subr.c#11 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_syncache.c#8 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_timer.c#5 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_timer.h#6 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_usrreq.c#7 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_var.h#6 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/ipsec.c#6 integrate .. //depot/projects/soc2005/libalias/sys/netipsec/ipsec_osdep.h#4 integrate .. //depot/projects/soc2005/libalias/sys/pc98/conf/GENERIC#7 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/conf/GENERIC#10 integrate .. //depot/projects/soc2005/libalias/sys/rpc/types.h#1 branch .. //depot/projects/soc2005/libalias/sys/security/audit/audit.c#9 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit.h#5 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit_arg.c#8 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit_bsm.c#9 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit_bsm_token.c#6 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit_private.h#5 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit_syscalls.c#9 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/conf/GENERIC#7 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/conf/GENERIC#6 integrate .. //depot/projects/soc2005/libalias/sys/sys/eventhandler.h#4 integrate .. //depot/projects/soc2005/libalias/sys/sys/hash.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/kernel.h#5 integrate .. //depot/projects/soc2005/libalias/sys/sys/libkern.h#5 integrate .. //depot/projects/soc2005/libalias/sys/sys/mbuf.h#10 integrate .. //depot/projects/soc2005/libalias/sys/sys/mutex.h#6 integrate .. //depot/projects/soc2005/libalias/sys/sys/priv.h#4 integrate .. //depot/projects/soc2005/libalias/sys/sys/proc.h#11 integrate .. //depot/projects/soc2005/libalias/sys/sys/sysctl.h#6 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ffs/ffs_snapshot.c#7 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ffs/ffs_softdep.c#6 integrate .. //depot/projects/soc2005/libalias/sys/vm/phys_pager.c#4 integrate .. //depot/projects/soc2005/libalias/tools/regression/netinet/ipblock/Makefile#2 delete .. //depot/projects/soc2005/libalias/tools/regression/netinet/ipblock/ipblock.c#2 delete .. //depot/projects/soc2005/libalias/tools/regression/netinet/ipsockopt/ipsockopt.c#3 integrate .. //depot/projects/soc2005/libalias/tools/tools/net80211/wesside/wesside/Makefile#2 integrate .. //depot/projects/soc2005/libalias/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.c#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.h#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/wesside/wesside/wesside.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/finger/extern.h#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/finger/finger.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/finger/finger.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/finger/net.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/gcore/elfcore.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/kdump/kdump.c#5 integrate .. //depot/projects/soc2005/libalias/usr.bin/kdump/kdump_subr.h#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/kdump/mksubr#6 integrate .. //depot/projects/soc2005/libalias/usr.bin/make/parse.c#4 integrate .. //depot/projects/soc2005/libalias/usr.bin/netstat/mcast.c#4 integrate .. //depot/projects/soc2005/libalias/usr.bin/tar/Makefile#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/tar/bsdtar_platform.h#4 integrate .. //depot/projects/soc2005/libalias/usr.bin/tar/write.c#7 integrate .. //depot/projects/soc2005/libalias/usr.bin/touch/touch.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/touch/touch.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/truss/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/truss/amd64-fbsd.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/truss/extern.h#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/truss/i386-fbsd.c#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/truss/i386-linux.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/truss/ia64-fbsd.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/truss/main.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/truss/powerpc-fbsd.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/truss/setup.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/truss/sparc64-fbsd.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/truss/syscall.h#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/truss/syscalls.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/truss/truss.1#4 integrate .. //depot/projects/soc2005/libalias/usr.bin/truss/truss.h#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/uuidgen/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/adduser/adduser.conf.5#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/adduser/adduser.sh#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ifmcstat/Makefile#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ifmcstat/ifmcstat.8#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ifmcstat/ifmcstat.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/mountd/mountd.c#7 integrate .. //depot/projects/soc2005/libalias/usr.sbin/rpc.lockd/lockd_lock.c#5 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sendmail/Makefile#3 integrate Differences ... ==== //depot/projects/soc2005/libalias/ObsoleteFiles.inc#20 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.77 2007/03/28 07:49:57 delphij Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.78 2007/04/09 19:16:48 pjd Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070409: uuidgen moved to /bin/ +OLD_FILES+=usr/bin/uuidgen # 20070328: bzip2 1.0.4 OLD_FILES+=usr/share/info/bzip2.info.gz # 20070303: libarchive 2.0 ==== //depot/projects/soc2005/libalias/contrib/libreadline/FREEBSD-upgrade#3 (text+ko) ==== @@ -1,6 +1,7 @@ -# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.9 2006/12/31 09:50:44 ache Exp $ +# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.10 2007/04/12 14:45:25 ache Exp $ # # Official patch 001 imported as v5_2_p1 +# Official patch 002 imported as v5_2_p2 # rm doc/*.dvi doc/*.html doc/*.ps doc/*.0 doc/*.info doc/*.tex doc/texi2* doc/*.pdf ==== //depot/projects/soc2005/libalias/contrib/libreadline/display.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/libreadline/display.c,v 1.12 2006/12/31 09:47:34 ache Exp $ */ +/* $FreeBSD: src/contrib/libreadline/display.c,v 1.13 2007/04/12 14:45:25 ache Exp $ */ /* display.c -- readline redisplay facility. */ /* Copyright (C) 1987-2006 Free Software Foundation, Inc. @@ -562,6 +562,17 @@ wrap_offset = prompt_invis_chars_first_line = 0; } +#if defined (HANDLE_MULTIBYTE) +#define CHECK_INV_LBREAKS() \ + do { \ + if (newlines >= (inv_lbsize - 2)) \ + { \ + inv_lbsize *= 2; \ + inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \ + _rl_wrapped_line = (int *)xrealloc (_rl_wrapped_line, inv_lbsize * sizeof (int)); \ + } \ + } while (0) +#else #define CHECK_INV_LBREAKS() \ do { \ if (newlines >= (inv_lbsize - 2)) \ @@ -570,6 +581,7 @@ inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \ } \ } while (0) +#endif /* HANDLE_MULTIBYTE */ #if defined (HANDLE_MULTIBYTE) #define CHECK_LPOS() \ ==== //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zdb/zdb.8#2 (text+ko) ==== @@ -28,7 +28,6 @@ .fi .SH DESCRIPTION - .LP The \fBzdb\fR command is used by support engineers to diagnose failures and gather statistics. Since the \fBZFS\fR file system is always consistent on disk and is self-repairing, \fBzdb\fR should only be run under the direction by a support engineer. .LP @@ -36,7 +35,6 @@ .LP Any options supported by this command are internal to Sun and subject to change at any time. .SH EXIT STATUS - .LP The following exit values are returned: .sp @@ -73,7 +71,6 @@ .RE .SH ATTRIBUTES - .LP See \fBattributes\fR(5) for descriptions of the following attributes: .sp @@ -92,6 +89,5 @@ .TE .SH SEE ALSO - .LP \fBzfs\fR(1M), \fBzpool\fR(1M), \fBattributes\fR(5) ==== //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zfs/zfs.8#2 (text+ko) ==== @@ -26,103 +26,127 @@ .nf \fBzfs\fR [\fB-?\fR] .fi + .LP .nf \fBzfs\fR \fBcreate\fR [[\fB-o\fR property=\fIvalue\fR]]... \fIfilesystem\fR .fi + .LP .nf \fBzfs\fR \fBcreate\fR [\fB-s\fR] [\fB-b\fR \fIblocksize\fR] [[\fB-o\fR property=\fIvalue\fR]]... \fB-V\fR \fIsize\fR \fIvolume\fR .fi + .LP .nf \fBzfs\fR \fBdestroy\fR [\fB-rRf\fR] \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR .fi + .LP .nf \fBzfs\fR \fBclone\fR \fIsnapshot\fR \fIfilesystem\fR|\fIvolume\fR .fi + .LP .nf \fBzfs\fR \fBpromote\fR \fIfilesystem\fR .fi + .LP .nf \fBzfs\fR \fBrename\fR \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR [\fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR] .fi + .LP .nf \fBzfs\fR \fBsnapshot\fR [\fB-r\fR] \fIfilesystem@name\fR|\fIvolume@name\fR .fi + .LP .nf \fBzfs\fR \fBrollback\fR [\fB-rRf\fR] \fIsnapshot\fR .fi + .LP .nf \fBzfs\fR \fBlist\fR [\fB-rH\fR] [\fB-o\fR \fIprop\fR[,\fIprop\fR] ]... [ \fB-t\fR \fItype\fR[,\fItype\fR]...] [ \fB-s\fR \fIprop\fR [\fB-s\fR \fIprop\fR]... [ \fB-S\fR \fIprop\fR [\fB-S\fR \fIprop\fR]... [\fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR|\fI/pathname\fR|.\fI/pathname\fR ... .fi + .LP .nf \fBzfs\fR \fBset\fR \fIproperty\fR=\fIvalue\fR \fIfilesystem\fR|\fIvolume\fR ... .fi + .LP .nf \fBzfs\fR \fBget\fR [\fB-rHp\fR] [\fB-o\fR \fIfield\fR[,\fIfield\fR]...] [\fB-s\fR \fIsource\fR[,\fIsource\fR]...] \fIall\fR | \fIproperty\fR[,\fIproperty\fR]... \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR ... .fi + .LP .nf \fBzfs\fR \fBinherit\fR [\fB-r\fR] \fIproperty\fR \fIfilesystem\fR|\fIvolume\fR... ... .fi + .LP .nf \fBzfs\fR \fBmount\fR .fi + .LP .nf \fBzfs\fR \fBmount\fR [\fB-o \fIoptions\fR\fR] [\fB-O\fR] \fB-a\fR .fi + .LP .nf \fBzfs\fR \fBmount\fR [\fB-o \fIoptions\fR\fR] [\fB-O\fR] \fIfilesystem\fR .fi + .LP .nf \fBzfs\fR \fBunmount\fR [\fB-f\fR] \fB-a\fR .fi + .LP .nf \fBzfs\fR \fBunmount\fR [\fB-f\fR] \fB\fIfilesystem\fR|\fImountpoint\fR\fR .fi + .LP .nf \fBzfs\fR \fBshare\fR \fB-a\fR .fi + .LP .nf \fBzfs\fR \fBshare\fR \fIfilesystem\fR .fi + .LP .nf \fBzfs\fR \fBunshare\fR [\fB-f\fR] \fB-a\fR .fi + .LP .nf \fBzfs\fR \fBunshare\fR [\fB-f\fR] \fB\fIfilesystem\fR|\fImountpoint\fR\fR .fi + .LP .nf \fBzfs\fR \fBsend\fR [\fB-i\fR \fIsnapshot1\fR] \fB\fIsnapshot2\fR\fR .fi + .LP .nf \fBzfs\fR \fBreceive\fR [\fB-vnF\fR ] \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR .fi + .LP .nf \fBzfs\fR \fBreceive\fR [\fB-vnF\fR ] \fB-d\fR \fB\fIfilesystem\fR\fR @@ -137,7 +161,6 @@ .fi .SH DESCRIPTION - .LP The \fBzfs\fR command configures \fBZFS\fR datasets within a \fBZFS\fR storage pool, as described in \fBzpool\fR(1M). A dataset is identified by a unique path within the \fBZFS\fR namespace. For example: @@ -186,16 +209,14 @@ A read-only version of a file system or volume at a given point in time. It is specified as \fIfilesystem@name\fR or \fIvolume@name\fR. .RE -.SS ZFS File System Hierarchy - +.SS "ZFS File System Hierarchy" .LP A \fBZFS\fR storage pool is a logical collection of devices that provide space for datasets. A storage pool is also the root of the \fBZFS\fR file system hierarchy. .LP The root of the pool can be accessed as a file system, such as mounting and unmounting, taking snapshots, and setting properties. The physical storage characteristics, however, are managed by the \fBzpool\fR(1M) command. .LP See \fBzpool\fR(1M) for more information on creating and administering pools. -.SS Snapshots - +.SS "Snapshots" .LP A snapshot is a read-only copy of a file system or volume. Snapshots can be created extremely quickly, and initially consume no additional space within the pool. As data within the active dataset changes, the snapshot consumes more data than would otherwise be shared with the active dataset. .LP @@ -203,8 +224,7 @@ .LP File system snapshots can be accessed under the ".zfs/snapshot" directory in the root of the file system. Snapshots are automatically mounted on demand and may be unmounted at regular intervals. The visibility of the ".zfs" directory can be controlled by the "snapdir" property. -.SS Clones - +.SS "Clones" .LP A clone is a writable volume or file system whose initial contents are the same as another dataset. As with snapshots, creating a clone is nearly instantaneous, and initially consumes no additional space. .LP @@ -213,8 +233,7 @@ .LP The clone parent-child dependency relationship can be reversed by using the "\fBpromote\fR" subcommand. This causes the "origin" file system to become a clone of the specified file system, which makes it possible to destroy the file system that the clone was created from. -.SS Mount Points - +.SS "Mount Points" .LP Creating a \fBZFS\fR file system is a simple operation, so the number of file systems per system will likely be numerous. To cope with this, \fBZFS\fR automatically manages mounting and unmounting file systems without the need to edit the \fB/etc/vfstab\fR file. All automatically managed file systems are mounted by \fBZFS\fR at boot time. @@ -227,8 +246,7 @@ .LP If needed, \fBZFS\fR file systems can also be managed with traditional tools (\fBmount\fR, \fBumount\fR, \fB/etc/vfstab\fR). If a file system's mount point is set to "legacy", \fBZFS\fR makes no attempt to manage the file system, and the administrator is responsible for mounting and unmounting the file system. -.SS Zones - +.SS "Zones" .LP A \fBZFS\fR file system can be added to a non-global zone by using zonecfg's "\fBadd fs\fR" subcommand. A \fBZFS\fR file system that is added to a non-global zone must have its mountpoint property set to legacy. .LP @@ -244,8 +262,7 @@ After a dataset is delegated to a non-global zone, the "zoned" property is automatically set. A zoned file system cannot be mounted in the global zone, since the zone administrator might have to set the mount point to an unacceptable value. .LP The global administrator can forcibly clear the "zoned" property, though this should be done with extreme care. The global administrator should verify that all the mount points are acceptable before clearing the property. -.SS Native Properties - +.SS "Native Properties" .LP Properties are divided into two types, native properties and user defined properties. Native properties either export internal statistics or control \fBZFS\fR behavior. In addition, native properties are either editable or read-only. User properties have no effect on \fBZFS\fR behavior, but you can use them to annotate datasets in a way that is meaningful in your environment. For more information about user properties, see the "User Properties" section. @@ -507,11 +524,13 @@ .ne 2 .mk .na -\fBcompression=\fIon\fR | \fIoff\fR | \fIlzjb\fR\fR +\fBcompression=\fIon\fR | \fIoff\fR | \fIlzjb\fR | \fIgzip\fR | \fIgzip-N\fR\fR .ad .sp .6 .RS 4n -Controls the compression algorithm used for this dataset. There is currently only one algorithm, "\fIlzjb\fR", though this may change in future releases. The default value is "off". +Controls the compression algorithm used for this dataset. The "lzjb" compression algorithm is optimized for performance while providing decent data compression. Setting compression to "on" uses the "lzjb" compression algorithm. The "gzip" +compression algorithm uses the same compression as the \fBgzip\fR(1) command. You can specify the "gzip" level by using the value "gzip-\fIN\fR", +where \fIN\fR is an integer from 1 (fastest) to 9 (best compression ratio). Currently, "gzip" is equivalent to "gzip-6" (which is also the default for \fBgzip\fR(1)). .sp This property can also be referred to by its shortened column name "compress". .RE @@ -655,10 +674,10 @@ .ad .sp .6 .RS 4n -Controls the number of copies of data stored for this dataset. These copies are in addition to any redundancy provided by the pool (for example, mirroring or raid-z). The copies are stored on different disks if possible. The space used by multiple copies is charged to the associated -file and dataset, changing the "used" property and counting against quotas and reservations. +Controls the number of copies of data stored for this dataset. These copies are in addition to any redundancy provided by the pool, for example, mirroring or raid-z. The copies are stored on different disks, if possible. The space used by multiple copies is charged to the associated +file and dataset, changing the "used" property and counting against quotas and reservations. .sp -Changing this property only affects newly-written data. Therefore, it is recommended that this property be set at file system creation time, using the "\fB-o\fR copies=" option. +Changing this property only affects newly-written data. Therefore, set this property at file system creation time by using the "\fB-o\fR copies=" option. .RE .sp @@ -672,12 +691,10 @@ Controls whether the dataset is managed from within a jail. The default value is "off". .RE -.SS iscsioptions - +.SS "iscsioptions" .LP This read-only property, which is hidden, is used by the \fBiSCSI\fR target daemon to store persistent information, such as the \fBIQN\fR. It cannot be viewed or modified using the \fBzfs\fR command. The contents are not intended for external consumers. -.SS Temporary Mount Point Properties - +.SS "Temporary Mount Point Properties" .LP When a file system is mounted, either through \fBmount\fR(1M) for legacy mounts or the "\fBzfs mount\fR" command for normal file systems, its mount options are set according to its properties. The correlation between properties and mount options is as follows: @@ -697,8 +714,7 @@ .LP In addition, these options can be set on a per-mount basis using the \fB-o\fR option, without affecting the property that is stored on disk. The values specified on the command line override the values stored in the dataset. The \fB-nosuid\fR option is an alias for "nodevices,nosetuid". These properties are reported as "temporary" by the "\fBzfs get\fR" command. If the properties are changed while the dataset is mounted, the new setting overrides any temporary settings. -.SS User Properties - +.SS "User Properties" .LP In addition to the standard native properties, \fBZFS\fR supports arbitrary user properties. User properties have no effect on \fBZFS\fR behavior, but applications or administrators can use them to annotate datasets. .LP @@ -711,8 +727,7 @@ .LP The values of user properties are arbitrary strings, are always inherited, and are never validated. All of the commands that operate on properties ("zfs list", "zfs get", "zfs set", etc.) can be used to manipulate both native properties and user properties. Use the "\fBzfs inherit\fR" command to clear a user property . If the property is not defined in any parent dataset, it is removed entirely. Property values are limited to 1024 characters. -.SS Volumes as Swap or Dump Devices - +.SS "Volumes as Swap or Dump Devices" .LP To set up a swap area, create a \fBZFS\fR volume of a specific size and then enable swap on that device. For more information, see the EXAMPLES section. .LP @@ -720,7 +735,6 @@ .LP Using a \fBZFS\fR volume as a dump device is not supported. .SH SUBCOMMANDS - .LP All subcommands that modify state are logged persistently to the pool in their original form. .sp @@ -1466,10 +1480,10 @@ .SH EXAMPLES .LP \fBExample 1 \fRCreating a ZFS File System Hierarchy - .LP The following commands create a file system named "\fBpool/home\fR" and a file system named "\fBpool/home/bob\fR". The mount point "\fB/export/home\fR" is set for the parent file system, and automatically inherited by the child file system. + .sp .in +2 .nf @@ -1479,11 +1493,12 @@ .fi .in -2 .sp + .LP \fBExample 2 \fRCreating a ZFS Snapshot - .LP The following command creates a snapshot named "yesterday". This snapshot is mounted on demand in the ".zfs/snapshot" directory at the root of the "\fBpool/home/bob\fR" file system. + .sp .in +2 .nf @@ -1491,12 +1506,13 @@ .fi .in -2 .sp + .LP \fBExample 3 \fRTaking and destroying multiple snapshots - .LP The following command creates snapshots named "\fByesterday\fR" of "\fBpool/home\fR" and all of its descendant file systems. Each snapshot is mounted on demand in the ".zfs/snapshot" directory at the root of its file system. The second command destroys the newly created snapshots. + .sp .in +2 .nf @@ -1505,11 +1521,12 @@ .fi .in -2 .sp + .LP \fBExample 4 \fRTurning Off Compression - .LP The following commands turn compression off for all file systems under "\fBpool/home\fR", but explicitly turns it on for "\fBpool/home/anne\fR". + .sp .in +2 .nf @@ -1518,11 +1535,12 @@ .fi .in -2 .sp + .LP \fBExample 5 \fRListing ZFS Datasets - .LP The following command lists all active file systems and volumes in the system. + .sp .in +2 .nf @@ -1538,11 +1556,12 @@ .fi .in -2 .sp + .LP \fBExample 6 \fRSetting a Quota on a ZFS File System - .LP The following command sets a quota of 50 gbytes for "\fBpool/home/bob\fR". + .sp .in +2 .nf @@ -1550,11 +1569,12 @@ .fi .in -2 .sp + .LP \fBExample 7 \fRListing ZFS Properties - .LP The following command lists all properties for "\fBpool/home/bob\fR". + .sp .in +2 .nf @@ -1596,6 +1616,7 @@ .LP The following command gets a single property value. + .sp .in +2 .nf @@ -1607,6 +1628,7 @@ .LP The following command lists all properties with local settings for "\fBpool/home/bob\fR". + .sp .in +2 .nf @@ -1618,11 +1640,12 @@ .fi .in -2 .sp + .LP \fBExample 8 \fRRolling Back a ZFS File System - .LP The following command reverts the contents of "\fBpool/home/anne\fR" to the snapshot named "\fByesterday\fR", deleting all intermediate snapshots. + .sp .in +2 .nf @@ -1630,11 +1653,12 @@ .fi .in -2 .sp + .LP \fBExample 9 \fRCreating a ZFS Clone - .LP The following command creates a writable file system whose initial contents are the same as "\fBpool/home/bob@yesterday\fR". + .sp .in +2 .nf @@ -1642,11 +1666,12 @@ .fi .in -2 .sp + .LP \fBExample 10 \fRPromoting a ZFS Clone - .LP The following commands illustrate how to test out changes to a file system, and then replace the original file system with the changed one, using clones, clone promotion, and renaming: + .sp .in +2 .nf @@ -1664,11 +1689,12 @@ .fi .in -2 .sp + .LP \fBExample 11 \fRInheriting ZFS Properties - .LP The following command causes "\fBpool/home/bob\fR" and "\fBpool/home/anne\fR" to inherit the "checksum" property from their parent. + .sp .in +2 .nf @@ -1676,12 +1702,13 @@ .fi .in -2 .sp + .LP \fBExample 12 \fRRemotely Replicating ZFS Data - .LP The following commands send a full stream and then an incremental stream to a remote machine, restoring them into "\fBpoolB/received/fs\fR@a" and "\fBpoolB/received/fs@b\fR", respectively. "\fBpoolB\fR" must contain the file system "\fBpoolB/received\fR", and must not initially contain "\fBpoolB/received/fs\fR". + .sp .in +2 .nf @@ -1692,12 +1719,13 @@ .fi .in -2 .sp + .LP \fBExample 13 \fRUsing the zfs receive -d Option - .LP The following command sends a full stream of "\fBpoolA/fsA/fsB@snap\fR" to a remote machine, receiving it into "\fBpoolB/received/fsA/fsB@snap\fR". The "\fBfsA/fsB@snap\fR" portion of the received snapshot's name is determined from the name of the sent snapshot. "\fBpoolB\fR" must contain the file system "\fBpoolB/received\fR". If "\fBpoolB/received/fsA\fR" does not exist, it will be created as an empty file system. + .sp .in +2 .nf @@ -1707,11 +1735,12 @@ .fi .in -2 .sp + .LP \fBExample 14 \fRCreating a ZFS volume as a Swap Device - .LP The following example shows how to create a 5-Gbyte ZFS volume and then add the volume as a swap device. + .sp .in +2 .nf @@ -1720,11 +1749,12 @@ .fi .in -2 .sp + .LP \fBExample 15 \fRSetting User Properties - .LP The following example sets the user defined "com.example:department" property for a dataset. + .sp .in +2 .nf @@ -1732,11 +1762,12 @@ .fi .in -2 .sp + .LP \fBExample 16 \fRCreating a ZFS Volume as a iSCSI Target Device - .LP The following example shows how to create a \fBZFS\fR volume as an \fBiSCSI\fR target. + .sp .in +2 .nf @@ -1754,7 +1785,6 @@ .LP After the \fBiSCSI\fR target is created, set up the \fBiSCSI\fR initiator. For more information about the Solaris \fBiSCSI\fR initiator, see the Solaris Administration Guide: Devices and File Systems. .SH EXIT STATUS - .LP The following exit values are returned: .sp @@ -1791,7 +1821,6 @@ .RE >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 14 00:48:40 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C77816A406; Sat, 14 Apr 2007 00:48:40 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F075616A402 for ; Sat, 14 Apr 2007 00:48:39 +0000 (UTC) (envelope-from kaiw@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DD74A13C46C for ; Sat, 14 Apr 2007 00:48:39 +0000 (UTC) (envelope-from kaiw@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3E0mdfJ098356 for ; Sat, 14 Apr 2007 00:48:39 GMT (envelope-from kaiw@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3E0mcx0098328 for perforce@freebsd.org; Sat, 14 Apr 2007 00:48:38 GMT (envelope-from kaiw@FreeBSD.org) Date: Sat, 14 Apr 2007 00:48:38 GMT Message-Id: <200704140048.l3E0mcx0098328@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kaiw@FreeBSD.org using -f From: Kai WANG To: Perforce Change Reviews Cc: Subject: PERFORCE change 118063 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Apr 2007 00:48:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=118063 Change 118063 by kaiw@kaiw_outcast on 2007/04/14 00:37:28 Branch. Affected files ... .. //depot/projects/soc2007/kaiw-bintools/src/COPYRIGHT#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/LOCKS#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/MAINTAINERS#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/Makefile.inc1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/ObsoleteFiles.inc#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/README#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/UPDATING#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/Makefile.inc#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/cat/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/cat/cat.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/cat/cat.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/chflags/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/chflags/chflags.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/chflags/chflags.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/chio/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/chio/chio.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/chio/chio.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/chio/defs.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/chio/pathnames.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/chmod/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/chmod/chmod.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/chmod/chmod.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/cp/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/cp/cp.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/cp/cp.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/cp/extern.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/cp/utils.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/csh/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/csh/config.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/csh/config_p.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/csh/host.defs#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/csh/iconv.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/csh/iconv_stub.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/date/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/date/date.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/date/date.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/date/extern.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/date/netdate.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/date/vary.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/date/vary.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/dd/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/dd/args.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/dd/conv.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/dd/conv_tab.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/dd/dd.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/dd/dd.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/dd/dd.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/dd/extern.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/dd/gen.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/dd/misc.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/dd/position.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/dd/ref.ascii#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/dd/ref.ebcdic#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/dd/ref.ibm#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/dd/ref.lcase#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/dd/ref.oldascii#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/dd/ref.oldibm#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/dd/ref.pareven#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/dd/ref.parnone#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/dd/ref.parodd#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/dd/ref.parset#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/dd/ref.swab#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/dd/ref.ucase#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/df/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/df/df.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/df/df.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/domainname/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/domainname/domainname.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/domainname/domainname.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/echo/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/echo/echo.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/echo/echo.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/POSIX#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/README#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/buf.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/cbc.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/ed.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/ed.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/glbl.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/io.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/main.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/re.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/sub.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/=.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/README#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/TODO#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/a.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/a.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/a.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/a1.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/a2.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/addr.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/addr.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/addr.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/addr1.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/addr2.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/ascii.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/bang1.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/bang1.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/bang1.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/bang1.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/bang2.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/c.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/c.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/c.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/c1.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/c2.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/d.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/d.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/d.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/d.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/e1.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/e1.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/e1.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/e1.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/e2.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/e2.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/e2.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/e2.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/e3.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/e3.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/e3.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/e3.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/e4.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/e4.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/e4.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/f1.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/f2.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/g1.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/g1.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/g1.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/g1.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/g2.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/g2.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/g2.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/g2.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/g3.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/g3.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/g3.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/g3.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/g4.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/g4.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/g4.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/g5.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/g5.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/g5.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/h.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/i.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/i.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/i.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/i1.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/i2.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/i3.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/j.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/j.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/j.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/k.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/k.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/k.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/k1.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/k2.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/k3.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/k4.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/l.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/l.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/l.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/m.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/m.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/m.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/m.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/n.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/n.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/n.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/nl.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/nl1.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/nl1.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/nl1.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/nl2.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/nl2.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/nl2.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/p.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/p.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/p.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/q.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/q.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/q.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/q1.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/r1.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/r1.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/r1.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/r1.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/r2.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/r2.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/r2.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/r2.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/r3.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/r3.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/r3.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/s1.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/s1.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/s1.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/s1.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/s10.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/s2.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/s2.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/s2.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/s2.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/s3.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/s3.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/s3.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/s3.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/s4.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/s5.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/s6.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/s7.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/s8.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/s9.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/t.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/t.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/t1.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/t1.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/t1.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/t1.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/t2.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/t2.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/t2.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/t2.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/u.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/u.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/u.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/u.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/v.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/v.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/v.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/w.d#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/w.r#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/w.t#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/w1.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/w2.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/w3.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/x.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/test/z.err#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ed/undo.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/expr/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/expr/expr.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/expr/expr.y#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/getfacl/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/getfacl/getfacl.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/getfacl/getfacl.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/hostname/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/hostname/hostname.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/hostname/hostname.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/kenv/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/kenv/kenv.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/kenv/kenv.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/kill/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/kill/kill.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/kill/kill.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ln/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ln/ln.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ln/ln.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ln/symlink.7#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ls/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ls/cmp.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ls/extern.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ls/ls.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ls/ls.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ls/ls.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ls/print.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ls/util.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/mkdir/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/mkdir/mkdir.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/mkdir/mkdir.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/mv/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/mv/mv.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/mv/mv.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pax/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pax/ar_io.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pax/ar_subs.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pax/buf_subs.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pax/cache.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pax/cache.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pax/cpio.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pax/cpio.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pax/cpio.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pax/extern.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pax/file_subs.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pax/ftree.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pax/ftree.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pax/gen_subs.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pax/getoldopt.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pax/options.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pax/options.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pax/pat_rep.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pax/pat_rep.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pax/pax.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pax/pax.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pax/pax.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pax/sel_subs.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pax/sel_subs.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pax/tables.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pax/tables.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pax/tar.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pax/tar.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pax/tar.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pax/tty_subs.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ps/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ps/extern.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ps/fmt.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ps/keyword.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ps/nlist.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ps/print.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ps/ps.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ps/ps.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/ps/ps.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pwd/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pwd/pwd.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/pwd/pwd.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/rcp/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/rcp/extern.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/rcp/rcp.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/rcp/rcp.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/rcp/util.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/realpath/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/realpath/realpath.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/realpath/realpath.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/rm/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/rm/rm.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/rm/rm.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/rmail/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/rmdir/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/rmdir/rmdir.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/rmdir/rmdir.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/setfacl/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/setfacl/file.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/setfacl/mask.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/setfacl/merge.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/setfacl/remove.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/setfacl/setfacl.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/setfacl/setfacl.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/setfacl/setfacl.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/setfacl/util.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/TOUR#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/alias.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/alias.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/arith.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/arith.y#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/arith_lex.l#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/bltin/echo.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/bltin/echo.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/builtins.def#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/cd.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/cd.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/error.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/error.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/eval.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/eval.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/exec.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/exec.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/expand.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/expand.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/funcs/cmv#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/funcs/dirs#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/funcs/kill#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/funcs/login#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/funcs/newgrp#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/funcs/popd#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/funcs/pushd#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/funcs/suspend#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/histedit.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/init.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/input.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/input.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/jobs.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/jobs.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/mail.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/mail.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/main.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/main.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/memalloc.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/memalloc.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/miscbltin.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/mkbuiltins#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/mkinit.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/mknodes.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/mksyntax.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/mktokens#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/myhistedit.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/mystring.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/mystring.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/nodes.c.pat#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/nodetypes#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/options.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/options.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/output.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/output.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/parser.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/parser.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/redir.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/redir.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/sh.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/shell.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/show.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/show.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/trap.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/trap.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/var.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sh/var.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sleep/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sleep/sleep.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sleep/sleep.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/stty/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/stty/cchar.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/stty/extern.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/stty/gfmt.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/stty/key.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/stty/modes.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/stty/print.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/stty/stty.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/stty/stty.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/stty/stty.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/stty/util.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sync/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sync/sync.8#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/sync/sync.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/test/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/test/TEST.README#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/test/TEST.csh#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/test/TEST.sh#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/test/test.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/bin/test/test.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/cddl/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/cddl/Makefile.inc#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/cddl/lib/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/cddl/lib/Makefile.inc#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/cddl/lib/libavl/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/cddl/lib/libnvpair/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/cddl/lib/libumem/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/cddl/lib/libuutil/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/cddl/lib/libzfs/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/cddl/lib/libzpool/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/cddl/sbin/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/cddl/sbin/Makefile.inc#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/cddl/sbin/zfs/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/cddl/sbin/zpool/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/cddl/usr.bin/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/cddl/usr.bin/Makefile.inc#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/cddl/usr.bin/ztest/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/cddl/usr.sbin/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/cddl/usr.sbin/Makefile.inc#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/cddl/usr.sbin/zdb/Makefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/AUTHORS#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/BUGS#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/COPYING#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/ChangeLog#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/INSTALL#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/NEWS#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/README#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/README.ldap#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/README.y2k#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/amd.8#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/amd.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/amd.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/amfs_inherit.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/autil.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/clock.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/conf.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/map.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/opts.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/restart.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/sched.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amq/amq.8#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amq/amq.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amq/amq.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/bootstrap#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/doc/version.texi#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/libamu/alloca.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/libamu/util.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/m4/GNUmakefile#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/m4/amdgrep#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/m4/amindent#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/m4/autopat#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/m4/chop-aclocal.pl#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/m4/copy-if-newbig#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/m4/macros/HEADER#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/m4/macros/TRAILER#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/m4/mk-aclocal#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/m4/mkconf#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/m4/rmtspc#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/m4/update_build_version#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/tasks#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/AUTHORS#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/ChangeLog#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/FAQ#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/INSTALL#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/Makefile.am#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/Makefile.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/NEWS#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/README#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/Test/array.b#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/Test/atan.b#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/Test/div.b#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/Test/exp.b#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/Test/fact.b#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/Test/jn.b#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/Test/ln.b#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/Test/mul.b#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/Test/raise.b#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/Test/signum#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/Test/sine.b#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/Test/timetest#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/acconfig.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/aclocal.m4#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/bc/bc.y#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/bc/const.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/bc/execute.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/bc/global.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/bc/global.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/bc/load.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/bc/main.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/bc/proto.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/bc/scan.l#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/bc/storage.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/bc/util.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/config.h.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/configure#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/configure.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/dc/array.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/dc/dc.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/dc/dc.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/dc/eval.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/dc/misc.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/dc/stack.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/dc/string.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/doc/bc.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/doc/dc.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/h/number.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/install-sh#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/lib/number.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/missing#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bc/stamp-h.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/CHANGES#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/FAQ#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/Makefile.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/README#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/acconfig.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/aclconf.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/include/named/aclconf.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/config.guess#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/config.sub#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/config.threads.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/configure.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc2052.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc2104.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc2119.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc2133.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc2136.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc2137.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc2163.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc2168.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc2181.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc2230.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc2308.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc2317.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc2373.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc2374.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc2375.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc2418.txt#1 branch .. //depot/projects/soc2007/kaiw-bintools/src/contrib/bind9/doc/rfc/rfc2535.txt#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 14 04:20:11 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A2BCD16A403; Sat, 14 Apr 2007 04:20:11 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2E46C16A400 for ; Sat, 14 Apr 2007 04:20:11 +0000 (UTC) (envelope-from adamartin@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 20A5913C480 for ; Sat, 14 Apr 2007 04:20:11 +0000 (UTC) (envelope-from adamartin@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3E4KBdQ041864 for ; Sat, 14 Apr 2007 04:20:11 GMT (envelope-from adamartin@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3E4KA0a041861 for perforce@freebsd.org; Sat, 14 Apr 2007 04:20:10 GMT (envelope-from adamartin@FreeBSD.org) Date: Sat, 14 Apr 2007 04:20:10 GMT Message-Id: <200704140420.l3E4KA0a041861@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to adamartin@FreeBSD.org using -f From: Adam Martin To: Perforce Change Reviews Cc: Subject: PERFORCE change 118076 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Apr 2007 04:20:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=118076 Change 118076 by adamartin@adamartin_hobbes on 2007/04/14 04:19:21 Checkin of changes before scheduled outage. (fixes to many crash conditions.) Affected files ... .. //depot/projects/soc2006/adamartin_autofs/autofs/Makefile#9 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs.c#10 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_ctl.c#11 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_dev.c#10 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_dev.h#8 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_tfsinit.c#2 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_tfsops.c#5 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/debug.h#2 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/protocol.c#10 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/protocol.h#9 edit .. //depot/projects/soc2006/adamartin_autofs/templatefs/templatefs.h#4 edit .. //depot/projects/soc2006/adamartin_autofs/templatefs/templatefs_vnops.c#3 edit Differences ... ==== //depot/projects/soc2006/adamartin_autofs/autofs/Makefile#9 (text+ko) ==== @@ -28,9 +28,11 @@ AUTOFS_DEV_SOURCE=autofs_ctl.c autofs_dev.c AUTOFS_FS_SOURCE=autofs_tfsops.c autofs_tfsinit.c vnode_if.h -AUTOFS_CORE_SOURCE=autofs.c protocol.c +AUTOFS_CORE_SOURCE=autofs.c +AUTOFS_PROTOCOL_SOURCE=protocol.c AUTOFS_SUPPORT_SOURCE=autofs_subr.c -SRCS=$(AUTOFS_CORE_SOURCE) $(AUTOFS_FS_SOURCE) $(AUTOFS_DEV_SOURCE) $(AUTOFS_SUPPORT_SOURCE) +SRCS=$(AUTOFS_CORE_SOURCE) $(AUTOFS_FS_SOURCE) $(AUTOFS_DEV_SOURCE) $(AUTOFS_SUPPORT_SOURCE) $(AUTOFS_PROTOCOL_SOURCE) +#SRCS=$(AUTOFS_CORE_SOURCE) $(AUTOFS_PROTOCOL_SOURCE) $(AUTOFS_SUPPORT_SOURCE) $(AUTOFS_DEV_SOURCE) HEADERS=autofs.h cleanup.h protocol.h autofs_subr.h autofs_ctl.h autofs_dev.h debug.h KMOD=autofs ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs.c#10 (text+ko) ==== @@ -53,10 +53,13 @@ #include "debug.h" +#define PUBLIC_LOADER static +PUBLIC_LOADER int autofs_handle_loader( + struct module *mod, int action, void *args ); -static int +PUBLIC_LOADER int autofs_handle_loader( struct module *mod, int action, void *args ) { int err; @@ -73,6 +76,8 @@ GID_WHEEL, 0600, AUTOFS_CTL_DEV_NAME ); + + dev_depends( autofs_ctl_dev, autofs_ctl_dev ); DEBUG EPRINTF( "." ); autofs_ctl_init(); DEBUG EPRINTF( "." ); @@ -85,16 +90,17 @@ * Find out what we should do for QUIESCE option? * */ + + //cleanup_autofs(); + //free( autofs_ctl_state, M_AUTOFS_CTL_NODES ); + destroy_dev( autofs_ctl_dev ); EPRINTF( "AutoFS quiesced.\n" ); return 0; break; case MOD_UNLOAD: - //cleanup_autofs(); - destroy_dev( autofs_ctl_dev ); - //free( autofs_ctl_state, M_AUTOFS_CTL_NODES ); - EPRINTF( "AutoFS unloaded.\n" ); + printf( "AutoFS unloaded.\n" ); break; default: ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs_ctl.c#11 (text+ko) ==== @@ -40,6 +40,8 @@ #include #include +#include + //#include //#include "cleanup.h"> @@ -53,6 +55,14 @@ #define AUTOFS_NAME "autofs_dev" + +#define AUTOFS_DEV_PERMS ( \ + ( ( S_IRUSR ) | ( S_IWUSR ) ) \ + | \ + ( ( S_IRGRP ) | ( S_IWGRP ) ) \ + ) + + struct cdev *autofs_ctl_dev; struct autofs_ctl_state autofs_ctl_state; @@ -76,7 +86,7 @@ .d_close= autofs_dev_close, .d_read= autofs_dev_read, .d_write= autofs_dev_write, - .d_poll= autofs_dev_poll, + //.d_poll= autofs_dev_poll, .d_version= D_VERSION, .d_name= AUTOFS_NAME, }; @@ -121,7 +131,7 @@ { $cleanup_init; - int error; + int error; struct cdevsw *devsw; struct cdev *device; struct autofs_dev_bufs *buffers; @@ -129,9 +139,15 @@ struct tfs_info *ti; struct autofs_protocol_state *prot_state; - error= 0; + error= 0; + + ti= NULL; + - instance_p= NULL; + /* + * TODO: return instance via instance_p. For now we leak... + */ + instance_p= NULL; /* * Allocate all autofs buffers, and setup a new TemplateFS instance. @@ -157,9 +173,7 @@ { $return ( error ); } -# if 0 - $cleanup( tfs_destroy_instance( ti );); -# endif + // $cleanup( tfs_destroy_instance( ti ); ); /* * Associate TemplateFS data structures together @@ -167,20 +181,20 @@ - prot_state->message= NULL; - prot_state->current_state= PROTOCOL_WAITING; - prot_state->bytes_read= 0; + prot_state->message= NULL; + prot_state->current_state= PROTOCOL_WAITING; + prot_state->bytes_read= 0; - buffers->input= autofs_queue_init(); - buffers->output= autofs_queue_init(); - buffers->instances= 0; + buffers->input= autofs_queue_init(); + buffers->output= autofs_queue_init(); + buffers->instances= 0; /* * Make the device, and lock it. */ - device= make_dev( devsw, num, UID_ROOT, GID_WHEEL, 0600, + device= make_dev( devsw, num, UID_ROOT, GID_WHEEL, AUTOFS_DEV_PERMS, AUTOFS_DEV_FORMAT"%d", num ); /* Possible race? Locking the device? */ @@ -192,11 +206,12 @@ { panic( "Bad device in %s:%d\n", __FILE__, __LINE__ ); } - prot_state->instance= instance; - buffers->this_instance= instance; - ti->ti_priv= (void *) instance; - device->si_priv= (struct cdev_priv *) instance; - instance->templatefs_info= ti; + prot_state->instance= instance; + buffers->this_instance= instance; + ti->ti_priv= (void *) instance; + device->si_priv= (struct cdev_priv *) instance; + instance->templatefs_info= ti; + instance->dev_buffers= buffers; /* * Don't deallocate the resources -- ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs_dev.c#10 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2006 + * Copyright (c) 2006,2007 * Adam Martin, Erez Zadok. All rights reserved. * * This code is derived from software in FreeBSD, and 4.4BSD. @@ -48,8 +48,21 @@ #include "autofs_dev.h" #include "autofs_subr.h" +#include + #define AUTOFS_IO_BUF_SIZE ( 4096 ) +#define LONG_TIMEOUT_SECONDS ( 10 ) +#define TIMEOUT_MICROSECONDS ( 50000 ) + +static struct timeval __LONG_TIMEOUT_SECONDS= +{ + .tv_sec= 0, + .tv_usec= TIMEOUT_MICROSECONDS, +}; + +#define LONG_TIMEOUT ( tvtohz( &__LONG_TIMEOUT_SECONDS ) ) + struct uio *in_buffer, *out_buffer; @@ -72,15 +85,19 @@ error= 0; + DEBUG printf( "Trying to open AutoFS device...\n" ); + instance= AUTOFS_GET_INSTANCE( DEV, dev ); buffers= AUTOFS_GET_BUFFERS( DEV, dev ); inst_p= &( buffers->instances ); + DEBUG printf( "AutoFS Device instances: %d\n", *inst_p ); + if( *inst_p == 0 ) { ( *inst_p )++; } else { - DEBUG EPRINTF( "Tried to open the autofs device \"%s\" " + DEBUG printf( "Tried to open the autofs device \"%s\" " "multiple times!\n", dev->si_devsw->d_name ); error= ENXIO; } @@ -105,7 +122,7 @@ if( *inst_p == 0 ) { - DEBUG EPRINTF( "Tried to close device: \"%s\", beyond natural " + DEBUG printf( "Tried to close device: \"%s\", beyond natural " "close minimum!\n", dev->si_devsw->d_name ); error= EDOOFUS; } @@ -131,6 +148,9 @@ int amt; int error; unsigned char out_buf[ AUTOFS_IO_BUF_SIZE ]; /* No more than a page! */ + int sleepstat; + + DEBUG7 printf( "Entered autofs_dev_read\n" ); error= 0; amt= MIN( uio->uio_resid, AUTOFS_IO_BUF_SIZE ); @@ -142,11 +162,42 @@ do { remains= autofs_queue_remaining( q ); + DEBUG7 printf( "Got %d remaining bytes...\n", remains ); /* * We really should do SOME kind of sleep. This is * more a spinlock * right now. */ + + if( remains != 0 ) break; + sleepstat= tsleep( q, PCATCH, "BAFS", LONG_TIMEOUT ); + + switch( sleepstat ) + { + case EWOULDBLOCK: + SKIP DEBUG printf( "Blocking more.\n" ); + break; + + + case ERESTART: + DEBUG_L(17) printf( "restart system call?\n" ); + + return ERESTART; + break; + + case EINTR: + DEBUG_L(17) printf( "Interrupted... die?\n" ); + + return EINTR; + break; + + + default: + /** NOTREACHED **/ + DEBUG0 printf( "Unknown sleepstatus!\n" ); + break; + } + } while( remains == 0 ); /** FIXME: Shouldn't this be == **/ ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs_dev.h#8 (text+ko) ==== ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs_tfsinit.c#2 (text+ko) ==== @@ -27,6 +27,8 @@ * */ +#define FIXED_VFS_SET_BUG + #include "autofs.h" #include #include @@ -72,6 +74,8 @@ struct tfs_node *foo; +void null_wrapper______( void ); + static struct tfs_info * autofs_mount_handler( TFS_MOUNT_HANDLER_ARGS ) @@ -130,12 +134,16 @@ ti->ti_priv= AUTOFS_GET_INSTANCE( DEV, dev ); + strlcpy( ti->ti_name, dev_name, TFS_FSNAMELEN ); + DEBUG3 EPRINTF( "Making a fake node: %p is the parent (root) node", ti->ti_root ); foo= tfs_create_dir( ti->ti_root, "foo", autofs_attr, autofs_vis, 0 ); foo->tn_lookup= autofs_lookup; + vput( devvp ); + DEBUG3 EPRINTF( "leaving autofs_mount\n" ); return ti; } @@ -180,8 +188,8 @@ /** Make some fake files... Could be that these are killing us? **/ - foo= tfs_create_dir( ti->ti_root, "foo", autofs_attr, autofs_vis, 0 ); - foo->tn_lookup= autofs_lookup; + //foo= tfs_create_dir( ti->ti_root, "foo", autofs_attr, autofs_vis, 0 ); + //foo->tn_lookup= autofs_lookup; return 0; } @@ -192,5 +200,19 @@ return 0; } +#ifndef FIXED_VFS_SET_BUG +#undef VFS_SET +#define VFS_SET( a, b, c ) +#endif TEMPLATEFS( autofs, AUTOFS_VERSION, autofs_mount_handler ); + +#ifndef FIXED_VFS_SET_BUG +void null_wrapper______() +{ + autofs_mount_handler( NULL, NULL, NULL ); + autofs_init( NULL, NULL ); + autofs_uninit( NULL, NULL ); + autofs_vfsops= autofs_vfsops; +} +#endif ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs_tfsops.c#5 (text+ko) ==== @@ -68,6 +68,9 @@ #include "autofs_templatefs.h" +#define DOTDOT_CHECKER_SHORTCUT SKIP + + int autofs_vis( TFS_VIS_ARGS ) { @@ -118,6 +121,11 @@ instance= AUTOFS_GET_INSTANCE( ROOT, ti ); buffers= AUTOFS_GET_BUFFERS( ROOT, ti ); + if( buffers == NULL ) + { + panic( "Buffers shouldn't be null!" ); + } + DEBUG7 EPRINTF( "cn_nameptr= %s, cn_pnbuf= %s\n", c.cn_nameptr, c.cn_pnbuf ); DEBUG7 EPRINTF( "cn_namelen= %ld, cn_consume= %ld\n", c.cn_namelen, @@ -126,14 +134,15 @@ /* Prepare a mount message */ msg.flags= 0; msg.transaction_id= generate_tid(); + msg.reserved= 0; msg.message_type= COMMAND_MOUNT_REQUEST; - msg.message_data= (char *) &mr; + //msg.message_data= (char *) &mr; mr.action= ACTION_MOUNT; mr.mountpoint_len= c.cn_namelen; strlcpy( mr.mountpoint, c.cn_nameptr, c.cn_namelen ); - if( strcmp( mr.mountpoint, ".." ) ) + DOTDOT_CHECKER_SHORTCUT if( strcmp( mr.mountpoint, ".." ) ) { return 0; } @@ -142,6 +151,7 @@ //if( take_autofs_lock( instance, node ) ) //{ + DEBUG7 EPRINTF( "Passing protocol message: %p\n", &msg ); send_mount_request( &msg, buffers ); //} ==== //depot/projects/soc2006/adamartin_autofs/autofs/debug.h#2 (text+ko) ==== @@ -125,12 +125,24 @@ #else /*** FREEBSD_SYS ***/ -#define EPRINTF( a, ... ) \ - do\ - {\ - printf( a, ## __VA_ARGS__ );\ - uprintf( a, ## __VA_ARGS__ );\ - } while( 0 ) + +#include +#include +#include + + +#define EPRINTF( a, ... ) \ + \ + do \ + { \ + printf( a, ## __VA_ARGS__ ); \ + SKIP if( mtx_trylock( &Giant ) ) \ + { \ + mtx_unlock( &Giant ); \ + uprintf( a, ## __VA_ARGS__ ); \ + } \ + } while( 0 ) \ + #endif /*** FREEBSD_SYS ***/ ==== //depot/projects/soc2006/adamartin_autofs/autofs/protocol.c#10 (text+ko) ==== @@ -106,7 +106,7 @@ int cnt; error= 0; - cnt=0; + cnt= 0; instance= AUTOFS_GET_INSTANCE( PROTOCOL, protocol ); @@ -261,8 +261,18 @@ struct mount_request *mb; queue *out_buffer; + DEBUG7 EPRINTF( "Sending Mount request...\n" ); + DEBUG7 EPRINTF( "Given request buffer pointer: %p\n", req ); out_buffer= buffers->output; - mb= (struct mount_request *) req->message_data; + mb= (struct mount_request *) ( *( + (struct mount_request **) + ( ( (unsigned char *) &req ) + sizeof( + struct message_header ) ) ) ) ; + + DEBUG7 EPRINTF( "Mount output buffer %p, request buffer %p\n", + out_buffer, mb ); + + return 0; write_buffer( out_buffer, (void *) req, sizeof( struct message_header ) ); @@ -271,6 +281,7 @@ write_buffer( out_buffer, (void *) mb->mountpoint, mb->mountpoint_len ); + DEBUG7 EPRINTF( "Done with mount request write\n" ); return 0; } ==== //depot/projects/soc2006/adamartin_autofs/autofs/protocol.h#9 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2006 + * Copyright (c) 2006,2007 * Adam Martin, Erez Zadok. All rights reserved. * * This code is derived from software in FreeBSD, and 4.4BSD. @@ -47,10 +47,17 @@ uint64_t flags; /* flags, for some usage, yet to be determined. */ uint64_t transaction_id; /* Used to identify which transaction the message pertains to. */ + + uint32_t reserved; /* Reserved for future use (Padding for now, + keep at 0) */ uint32_t message_type; /* Used to identify which command is issued in this packet. COMMAND_* constants are used to fill these */ + +# ifdef AUTOFS_USE_VARIABLE_LENGTH_TERMINATORS void *message_data; /* The rest of the message data, as an indeterminate length. */ + +# endif /*** AUTOFS_USE_VARIABLE_LENGTH_TERMINATORS ***/ }; ==== //depot/projects/soc2006/adamartin_autofs/templatefs/templatefs.h#4 (text+ko) ==== @@ -315,6 +315,7 @@ \ static int \ _##name##_init(struct vfsconf *vfc) { \ + printf( "Initing Templatefs..." ); \ /*return tfs_init(&name##_info, vfc);*/ \ return 0; \ } \ @@ -332,9 +333,9 @@ .vfs_uninit = _##name##_uninit, \ .vfs_unmount = tfs_unmount, \ }; \ -VFS_SET(name##_vfsops, name, VFCF_SYNTHETIC); \ -MODULE_VERSION(name, version); \ -MODULE_DEPEND(name, templatefs, 1, 1, 1); +VFS_SET(name##_vfsops, name, VFCF_SYNTHETIC | VFCF_READONLY); \ + +//MODULE_DEPEND(name, templatefs, 1, 1, 1); #endif ==== //depot/projects/soc2006/adamartin_autofs/templatefs/templatefs_vnops.c#3 (text+ko) ==== @@ -459,6 +459,7 @@ TFS_RETURN (td->tn_lookup(curthread, pfind(pid), td, cnp)); #else td->tn_lookup(curthread, pfind(pid), td, cnp); + printf( "tn_lookup returned\n" ); #endif } /**/ From owner-p4-projects@FreeBSD.ORG Sat Apr 14 05:36:01 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2AB6116A408; Sat, 14 Apr 2007 05:36:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0012F16A406 for ; Sat, 14 Apr 2007 05:36:00 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E7DAC13C45E for ; Sat, 14 Apr 2007 05:36:00 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3E5a0Q3063844 for ; Sat, 14 Apr 2007 05:36:00 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3E5a0wX063841 for perforce@freebsd.org; Sat, 14 Apr 2007 05:36:00 GMT (envelope-from scottl@freebsd.org) Date: Sat, 14 Apr 2007 05:36:00 GMT Message-Id: <200704140536.l3E5a0wX063841@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 118078 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Apr 2007 05:36:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=118078 Change 118078 by scottl@scottl-x64 on 2007/04/14 05:35:26 Add cam_periph_block|unblock. This generates an exclusive lock on a periph instance that will cause cam_periph_lock() to sleep until the reference is released. Its primary use at the moment is to protect the periph probe sequence from other threads opening the device. An SX lock is not used because the blocking thread may return to userland before unblocking. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#18 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#11 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#17 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#11 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#29 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#18 (text+ko) ==== @@ -165,10 +165,12 @@ init_level++; + xpt_lock_buses(); for (p_drv = periph_drivers; *p_drv != NULL; p_drv++) { if (strcmp((*p_drv)->driver_name, name) == 0) break; } + xpt_unlock_buses(); sim = xpt_path_sim(path); path_id = xpt_path_path_id(path); @@ -307,6 +309,30 @@ } +void +cam_periph_block(struct cam_periph *periph) +{ + + mtx_assert(periph->sim->mtx, MA_OWNED); + + cam_periph_acquire(periph); + periph->flags |= CAM_PERIPH_LOCKED; +} + +void +cam_periph_unblock(struct cam_periph *periph) +{ + + mtx_assert(periph->sim->mtx, MA_OWNED); + + periph->flags &= ~CAM_PERIPH_LOCKED; + if (periph->flags &CAM_PERIPH_LOCK_WANTED) { + periph->flags &= ~CAM_PERIPH_LOCK_WANTED; + wakeup(periph); + } + cam_periph_release(periph); +} + /* * Look for the next unit number that is not currently in use for this * peripheral type starting at "newunit". Also exclude unit numbers that @@ -506,9 +532,16 @@ void cam_periph_lock(struct cam_periph *periph) { + struct mtx *mtx; - mtx_lock(periph->sim->mtx); - periph->flags |= CAM_PERIPH_LOCKED; + mtx = periph->sim->mtx; + mtx_lock(mtx); + if (periph->flags & CAM_PERIPH_LOCKED) { + periph->flags |= CAM_PERIPH_LOCK_WANTED; + if (mtx == &Giant) + mtx = NULL; + msleep(periph, mtx, PCATCH, "periph", 0); + }; } /* @@ -518,7 +551,6 @@ cam_periph_unlock(struct cam_periph *periph) { - periph->flags &= ~CAM_PERIPH_LOCKED; mtx_unlock(periph->sim->mtx); } ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#11 (text+ko) ==== @@ -142,6 +142,8 @@ void cam_periph_unlock(struct cam_periph *periph); cam_status cam_periph_acquire(struct cam_periph *periph); void cam_periph_release(struct cam_periph *periph); +void cam_periph_block(struct cam_periph *periph); +void cam_periph_unblock(struct cam_periph *periph); void cam_periph_invalidate(struct cam_periph *periph); int cam_periph_mapmem(union ccb *ccb, struct cam_periph_map_info *mapinfo); ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#17 (text+ko) ==== @@ -977,7 +977,7 @@ cdregisterexit: /* Refcount this periph now that it's been created. */ - (void)cam_periph_acquire(periph); + cam_periph_block(periph); if ((softc->flags & CD_FLAG_CHANGER) == 0) xpt_schedule(periph, /*priority*/5); @@ -1784,7 +1784,7 @@ * operation. */ xpt_release_ccb(done_ccb); - cam_periph_release(periph); + cam_periph_unblock(periph); return; } case CD_CCB_WAITING: ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#11 (text+ko) ==== @@ -393,7 +393,7 @@ xpt_action((union ccb *)&csa); /* Refcount this periph now that it's been created. */ - (void)cam_periph_acquire(periph); + cam_periph_block(periph); xpt_schedule(periph, /*priority*/5); return(CAM_REQ_CMP); @@ -655,7 +655,7 @@ * operation. */ xpt_release_ccb(done_ccb); - cam_periph_release(periph); + cam_periph_unblock(periph); return; } case CH_CCB_WAITING: ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#29 (text+ko) ==== @@ -1201,10 +1201,11 @@ xpt_action((union ccb *)&csa); /* - * Refcount the periph while dastart is called to finish the probe. - * The reference will be dropped in dadone at the end of probe. + * Take an exclusive refcount on the periph while dastart is called + * to finish the probe. The reference will be dropped in dadone at + * the end of probe. */ - (void)cam_periph_acquire(periph); + cam_periph_block(periph); xpt_schedule(periph, /*priority*/5); /* @@ -1226,7 +1227,6 @@ softc = (struct da_softc *)periph->softc; - switch (softc->state) { case DA_STATE_NORMAL: { @@ -1687,7 +1687,7 @@ * operation. */ xpt_release_ccb(done_ccb); - cam_periph_release(periph); + cam_periph_unblock(periph); return; } case DA_CCB_WAITING: From owner-p4-projects@FreeBSD.ORG Sat Apr 14 11:18:14 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1811C16A404; Sat, 14 Apr 2007 11:18:14 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D88CD16A402 for ; Sat, 14 Apr 2007 11:18:13 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CC8D513C46C for ; Sat, 14 Apr 2007 11:18:13 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3EBIDqB037110 for ; Sat, 14 Apr 2007 11:18:13 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3EBICLn037053 for perforce@freebsd.org; Sat, 14 Apr 2007 11:18:12 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 14 Apr 2007 11:18:12 GMT Message-Id: <200704141118.l3EBICLn037053@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 118086 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Apr 2007 11:18:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=118086 Change 118086 by rdivacky@rdivacky_witten on 2007/04/14 11:17:28 Implement linux_openat(), linux_fstatat64() and linux_faccessat(): o extend struct nameidata to incorporate vdir param o add NDINIT_AT that fills in vdir, NDINIT always fills in NULL o change namei to use vdir as its starting dir if its non-NULL o create kern_openat and kern_accessat o add AT_FDCWD define that specifies CWD as dfd The names will probably change and the place for AT_FDCWD might change as well. Note that I saw a panic when starting X with this patch but I cannot reproduce it so its hard to say whether its related but I don't think so. Suggested by: rwatson Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_dummy.c#2 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_proto.h#2 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_syscall.h#2 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_sysent.c#2 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/syscalls.master#2 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#2 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_stats.c#2 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_dummy.c#2 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_proto.h#2 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_syscall.h#2 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_sysent.c#2 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/syscalls.master#2 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_lookup.c#2 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#2 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/fcntl.h#2 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/namei.h#2 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscallsubr.h#2 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_dummy.c#2 (text+ko) ==== @@ -101,14 +101,12 @@ DUMMY(mknodat); DUMMY(fchownat); DUMMY(futimesat); -DUMMY(fstatat64); DUMMY(unlinkat); DUMMY(renameat); DUMMY(linkat); DUMMY(symlinkat); DUMMY(readlinkat); DUMMY(fchmodat); -DUMMY(faccessat); DUMMY(pselect6); DUMMY(ppoll); DUMMY(unshare); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_proto.h#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.31 2007/03/30 00:08:21 jkim Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp */ @@ -892,7 +892,10 @@ register_t dummy; }; struct linux_fstatat64_args { - register_t dummy; + char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; + char pathname_l_[PADL_(char *)]; char * pathname; char pathname_r_[PADR_(char *)]; + char statbuf_l_[PADL_(struct l_stat64 *)]; struct l_stat64 * statbuf; char statbuf_r_[PADR_(struct l_stat64 *)]; + char flag_l_[PADL_(l_int)]; l_int flag; char flag_r_[PADR_(l_int)]; }; struct linux_unlinkat_args { register_t dummy; @@ -913,7 +916,9 @@ register_t dummy; }; struct linux_faccessat_args { - register_t dummy; + char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; + char filename_l_[PADL_(char *)]; char * filename; char filename_r_[PADR_(char *)]; + char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)]; }; struct linux_pselect6_args { register_t dummy; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_syscall.h#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.31 2007/03/30 00:08:21 jkim Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp */ ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_sysent.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.31 2007/03/30 00:08:21 jkim Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp */ @@ -320,14 +320,14 @@ { 0, (sy_call_t *)linux_mknodat, AUE_NULL, NULL, 0, 0 }, /* 297 = linux_mknodat */ { 0, (sy_call_t *)linux_fchownat, AUE_NULL, NULL, 0, 0 }, /* 298 = linux_fchownat */ { 0, (sy_call_t *)linux_futimesat, AUE_NULL, NULL, 0, 0 }, /* 299 = linux_futimesat */ - { 0, (sy_call_t *)linux_fstatat64, AUE_NULL, NULL, 0, 0 }, /* 300 = linux_fstatat64 */ + { AS(linux_fstatat64_args), (sy_call_t *)linux_fstatat64, AUE_NULL, NULL, 0, 0 }, /* 300 = linux_fstatat64 */ { 0, (sy_call_t *)linux_unlinkat, AUE_NULL, NULL, 0, 0 }, /* 301 = linux_unlinkat */ { 0, (sy_call_t *)linux_renameat, AUE_NULL, NULL, 0, 0 }, /* 302 = linux_renameat */ { 0, (sy_call_t *)linux_linkat, AUE_NULL, NULL, 0, 0 }, /* 303 = linux_linkat */ { 0, (sy_call_t *)linux_symlinkat, AUE_NULL, NULL, 0, 0 }, /* 304 = linux_symlinkat */ { 0, (sy_call_t *)linux_readlinkat, AUE_NULL, NULL, 0, 0 }, /* 305 = linux_readlinkat */ { 0, (sy_call_t *)linux_fchmodat, AUE_NULL, NULL, 0, 0 }, /* 306 = linux_fchmodat */ - { 0, (sy_call_t *)linux_faccessat, AUE_NULL, NULL, 0, 0 }, /* 307 = linux_faccessat */ + { AS(linux_faccessat_args), (sy_call_t *)linux_faccessat, AUE_NULL, NULL, 0, 0 }, /* 307 = linux_faccessat */ { 0, (sy_call_t *)linux_pselect6, AUE_NULL, NULL, 0, 0 }, /* 308 = linux_pselect6 */ { 0, (sy_call_t *)linux_ppoll, AUE_NULL, NULL, 0, 0 }, /* 309 = linux_ppoll */ { 0, (sy_call_t *)linux_unshare, AUE_NULL, NULL, 0, 0 }, /* 310 = linux_unshare */ ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/syscalls.master#2 (text+ko) ==== @@ -469,14 +469,15 @@ 297 AUE_NULL STD { int linux_mknodat(void); } 298 AUE_NULL STD { int linux_fchownat(void); } 299 AUE_NULL STD { int linux_futimesat(void); } -300 AUE_NULL STD { int linux_fstatat64(void); } +300 AUE_NULL STD { int linux_fstatat64(l_int dfd, char *pathname, \ + struct l_stat64 *statbuf, l_int flag); } 301 AUE_NULL STD { int linux_unlinkat(void); } 302 AUE_NULL STD { int linux_renameat(void); } 303 AUE_NULL STD { int linux_linkat(void); } 304 AUE_NULL STD { int linux_symlinkat(void); } 305 AUE_NULL STD { int linux_readlinkat(void); } 306 AUE_NULL STD { int linux_fchmodat(void); } -307 AUE_NULL STD { int linux_faccessat(void); } +307 AUE_NULL STD { int linux_faccessat(l_int dfd, char *filename, l_int mode); } 308 AUE_NULL STD { int linux_pselect6(void); } 309 AUE_NULL STD { int linux_ppoll(void); } 310 AUE_NULL STD { int linux_unshare(void); } ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#2 (text+ko) ==== @@ -88,7 +88,7 @@ static int -linux_common_open(struct thread *td, char *path, int l_flags, int mode, int openat) +linux_common_open(struct thread *td, char *path, int l_flags, int mode, int dirfd) { struct proc *p = td->td_proc; struct file *fp; @@ -130,7 +130,10 @@ bsd_flags |= O_NOFOLLOW; /* XXX LINUX_O_NOATIME: unable to be easily implemented. */ - error = kern_open(td, path, UIO_SYSSPACE, bsd_flags, mode); + if (dirfd != -1) + error = kern_openat(td, path, UIO_SYSSPACE, bsd_flags, mode, dirfd); + else + error = kern_open(td, path, UIO_SYSSPACE, bsd_flags, mode); if (!error) { fd = td->td_retval[0]; /* @@ -172,113 +175,36 @@ if (ldebug(open)) printf(LMSG("open returns error %d"), error); #endif - if (!openat) - LFREEPATH(path); + LFREEPATH(path); return error; } -/* - * common code for linux *at set of syscalls - * - * works like this: - * if filename is absolute - * ignore dirfd - * else - * if dirfd == AT_FDCWD - * return CWD/filename - * else - * return DIRFD/filename - */ -static int -linux_at(struct thread *td, int dirfd, char *filename, char **newpath, char **freebuf) -{ - struct file *fp; - int error = 0, vfslocked; - struct vnode *dvp; - struct filedesc *fdp = td->td_proc->p_fd; - char *fullpath = "unknown"; - char *freepath = NULL; - - /* don't do anything if the pathname is absolute */ - if (*filename == '/') { - *newpath= filename; - return (0); - } - - /* check for AT_FDWCD */ - if (dirfd == LINUX_AT_FDCWD) { - FILEDESC_SLOCK(fdp); - dvp = fdp->fd_cdir; - vref(dvp); - FILEDESC_SUNLOCK(fdp); - } else { - error = fget(td, dirfd, &fp); - if (error) - return (error); - dvp = fp->f_vnode; - /* only a dir can be dfd */ - if (dvp->v_type != VDIR) { - fdrop(fp, td); - return (ENOTDIR); - } - vref(dvp); - fdrop(fp, td); - } - - /* - * XXXRW: This is bogus, as vn_fullpath() returns only an advisory - * file path, and may fail in several common situations, including - * for file systmes that don't use the name cache, and if the entry - * for the file falls out of the name cache. We should implement - * openat() in the FreeBSD native system call layer properly (using a - * requested starting directory), and have Linux and other ABIs wrap - * the native implementation. - */ - error = vn_fullpath(td, dvp, &fullpath, &freepath); - if (!error) { - *newpath = malloc(strlen(fullpath) + strlen(filename) + 2, M_TEMP, M_WAITOK | M_ZERO); - *freebuf = freepath; - sprintf(*newpath, "%s/%s", fullpath, filename); - } - vfslocked = VFS_LOCK_GIANT(dvp->v_mount); - vrele(dvp); - VFS_UNLOCK_GIANT(vfslocked); - return (error); -} - int linux_openat(struct thread *td, struct linux_openat_args *args) { - char *newpath, *oldpath, *freebuf = NULL, *path; - int error; + char *newpath, *path; + int error, dirfd; + + path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); + error = copyinstr(args->filename, path, MAXPATHLEN, NULL); - oldpath = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); - error = copyinstr(args->filename, oldpath, MAXPATHLEN, NULL); + if (args->flags & LINUX_O_CREAT) + LCONVPATH_SEG(td, path, &newpath, 1, UIO_SYSSPACE); + else + LCONVPATH_SEG(td, path, &newpath, 0, UIO_SYSSPACE); + free(path, M_TEMP); #ifdef DEBUG if (ldebug(openat)) printf(ARGS(openat, "%i, %s, 0x%x, 0x%x"), args->dfd, - oldpath, args->flags, args->mode); + newpath, args->flags, args->mode); #endif + if (args->dfd == LINUX_AT_FDCWD) + dirfd = AT_FDCWD; + else + dirfd = args->dfd; - error = linux_at(td, args->dfd, oldpath, &newpath, &freebuf); - if (error) - return (error); -#ifdef DEBUG - printf(LMSG("newpath: %s"), newpath); -#endif - if (args->flags & LINUX_O_CREAT) - LCONVPATH_SEG(td, newpath, &path, 1, UIO_SYSSPACE); - else - LCONVPATH_SEG(td, newpath, &path, 0, UIO_SYSSPACE); - if (freebuf) - free(freebuf, M_TEMP); - if (*oldpath != '/') - free(newpath, M_TEMP); - - error = linux_common_open(td, path, args->flags, args->mode, 1); - free(oldpath, M_TEMP); - return (error); + return linux_common_open(td, path, args->flags, args->mode, dirfd); } int @@ -297,7 +223,7 @@ path, args->flags, args->mode); #endif - return linux_common_open(td, path, args->flags, args->mode, 0); + return linux_common_open(td, path, args->flags, args->mode, -1); } int @@ -647,6 +573,34 @@ } int +linux_faccessat(struct thread *td, struct linux_faccessat_args *args) +{ + char *path; + int error, dfd; + + /* linux convention */ + if (args->mode & ~(F_OK | X_OK | W_OK | R_OK)) + return (EINVAL); + + LCONVPATHEXIST(td, args->filename, &path); + +#ifdef DEBUG + if (ldebug(access)) + printf(ARGS(access, "%s, %d"), path, args->mode); +#endif + + if (args->dfd == LINUX_AT_FDCWD) + dfd = -1; + else + dfd = args->dfd; + + error = kern_accessat(td, path, UIO_SYSSPACE, args->mode, dfd); + LFREEPATH(path); + + return (error); +} + +int linux_unlink(struct thread *td, struct linux_unlink_args *args) { char *path; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_stats.c#2 (text+ko) ==== @@ -578,4 +578,56 @@ return (error); } +/* XXX: racy? */ +int +linux_fstatat64(struct thread *td, struct linux_fstatat64_args *args) +{ + int error; + char *path, *newpath; + int fd, dfd; + struct stat buf; + + /* open the file */ + path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); + error = copyinstr(args->pathname, path, MAXPATHLEN, NULL); + if (error) { + free(path, M_TEMP); + return (EFAULT); + } + + LCONVPATH_SEG(td, path, &newpath, 0, UIO_SYSSPACE); + free(path, M_TEMP); + +#ifdef DEBUG + if (ldebug(fstatat64)) + printf(ARGS(fstatat64, "%i, %s, %i"), args->dfd, newpath, args->flag); +#endif + + if (args->dfd == LINUX_AT_FDCWD) + dfd = AT_FDCWD; + else + dfd = args->dfd; + + error = kern_openat(td, newpath, UIO_SYSSPACE, O_RDONLY, 0, dfd); + if (error) { + LFREEPATH(newpath); + return (error); + } + /* file opened */ + fd = td->td_retval[0]; + td->td_retval[0] = 0; + + /* do the actual fstat */ + + error = kern_fstat(td, fd, &buf); + translate_fd_major_minor(td, fd, &buf); + if (!error) + error = stat64_copyout(&buf, args->statbuf); + + /* close the opened file */ + kern_close(td, fd); + LFREEPATH(newpath); + return (0); +} + #endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */ ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_dummy.c#2 (text+ko) ==== @@ -91,14 +91,12 @@ DUMMY(mknodat); DUMMY(fchownat); DUMMY(futimesat); -DUMMY(fstatat64); DUMMY(unlinkat); DUMMY(renameat); DUMMY(linkat); DUMMY(symlinkat); DUMMY(readlinkat); DUMMY(fchmodat); -DUMMY(faccessat); DUMMY(pselect6); DUMMY(ppoll); DUMMY(unshare); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_proto.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_proto.h,v 1.92 2007/03/29 02:11:46 julian Exp $ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.86 2007/02/15 00:54:40 jkim Exp + * $FreeBSD$ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.87 2007/03/29 02:11:46 julian Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -911,7 +911,10 @@ register_t dummy; }; struct linux_fstatat64_args { - register_t dummy; + char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; + char pathname_l_[PADL_(char *)]; char * pathname; char pathname_r_[PADR_(char *)]; + char statbuf_l_[PADL_(struct l_stat64 *)]; struct l_stat64 * statbuf; char statbuf_r_[PADR_(struct l_stat64 *)]; + char flag_l_[PADL_(l_int)]; l_int flag; char flag_r_[PADR_(l_int)]; }; struct linux_unlinkat_args { register_t dummy; @@ -932,7 +935,9 @@ register_t dummy; }; struct linux_faccessat_args { - register_t dummy; + char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; + char filename_l_[PADL_(char *)]; char * filename; char filename_r_[PADR_(char *)]; + char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)]; }; struct linux_pselect6_args { register_t dummy; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_syscall.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_syscall.h,v 1.85 2007/03/29 02:11:46 julian Exp $ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.86 2007/02/15 00:54:40 jkim Exp + * $FreeBSD$ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.87 2007/03/29 02:11:46 julian Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_sysent.c#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_sysent.c,v 1.92 2007/03/29 02:11:46 julian Exp $ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.86 2007/02/15 00:54:40 jkim Exp + * $FreeBSD$ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.87 2007/03/29 02:11:46 julian Exp */ #include @@ -319,14 +319,14 @@ { 0, (sy_call_t *)linux_mknodat, AUE_NULL, NULL, 0, 0 }, /* 297 = linux_mknodat */ { 0, (sy_call_t *)linux_fchownat, AUE_NULL, NULL, 0, 0 }, /* 298 = linux_fchownat */ { 0, (sy_call_t *)linux_futimesat, AUE_NULL, NULL, 0, 0 }, /* 299 = linux_futimesat */ - { 0, (sy_call_t *)linux_fstatat64, AUE_NULL, NULL, 0, 0 }, /* 300 = linux_fstatat64 */ + { AS(linux_fstatat64_args), (sy_call_t *)linux_fstatat64, AUE_NULL, NULL, 0, 0 }, /* 300 = linux_fstatat64 */ { 0, (sy_call_t *)linux_unlinkat, AUE_NULL, NULL, 0, 0 }, /* 301 = linux_unlinkat */ { 0, (sy_call_t *)linux_renameat, AUE_NULL, NULL, 0, 0 }, /* 302 = linux_renameat */ { 0, (sy_call_t *)linux_linkat, AUE_NULL, NULL, 0, 0 }, /* 303 = linux_linkat */ { 0, (sy_call_t *)linux_symlinkat, AUE_NULL, NULL, 0, 0 }, /* 304 = linux_symlinkat */ { 0, (sy_call_t *)linux_readlinkat, AUE_NULL, NULL, 0, 0 }, /* 305 = linux_readlinkat */ { 0, (sy_call_t *)linux_fchmodat, AUE_NULL, NULL, 0, 0 }, /* 306 = linux_fchmodat */ - { 0, (sy_call_t *)linux_faccessat, AUE_NULL, NULL, 0, 0 }, /* 307 = linux_faccessat */ + { AS(linux_faccessat_args), (sy_call_t *)linux_faccessat, AUE_NULL, NULL, 0, 0 }, /* 307 = linux_faccessat */ { 0, (sy_call_t *)linux_pselect6, AUE_NULL, NULL, 0, 0 }, /* 308 = linux_pselect6 */ { 0, (sy_call_t *)linux_ppoll, AUE_NULL, NULL, 0, 0 }, /* 309 = linux_ppoll */ { 0, (sy_call_t *)linux_unshare, AUE_NULL, NULL, 0, 0 }, /* 310 = linux_unshare */ ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/syscalls.master#2 (text+ko) ==== @@ -479,14 +479,15 @@ 297 AUE_NULL STD { int linux_mknodat(void); } 298 AUE_NULL STD { int linux_fchownat(void); } 299 AUE_NULL STD { int linux_futimesat(void); } -300 AUE_NULL STD { int linux_fstatat64(void); } +300 AUE_NULL STD { int linux_fstatat64(l_int dfd, char *pathname, \ + struct l_stat64 *statbuf, l_int flag); } 301 AUE_NULL STD { int linux_unlinkat(void); } 302 AUE_NULL STD { int linux_renameat(void); } 303 AUE_NULL STD { int linux_linkat(void); } 304 AUE_NULL STD { int linux_symlinkat(void); } 305 AUE_NULL STD { int linux_readlinkat(void); } 306 AUE_NULL STD { int linux_fchmodat(void); } -307 AUE_NULL STD { int linux_faccessat(void); } +307 AUE_NULL STD { int linux_faccessat(l_int dfd, char *filename, l_int mode); } 308 AUE_NULL STD { int linux_pselect6(void); } 309 AUE_NULL STD { int linux_ppoll(void); } 310 AUE_NULL STD { int linux_unshare(void); } ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_lookup.c#2 (text+ko) ==== @@ -192,7 +192,10 @@ ndp->ni_rootdir = fdp->fd_rdir; ndp->ni_topdir = fdp->fd_jdir; - dp = fdp->fd_cdir; + if (ndp->ni_vdir) + dp = ndp->ni_vdir; + else + dp = fdp->fd_cdir; vfslocked = VFS_LOCK_GIANT(dp->v_mount); VREF(dp); FILEDESC_SUNLOCK(fdp); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#2 (text+ko) ==== @@ -87,6 +87,10 @@ const struct timespec *, int, int); static int vn_access(struct vnode *vp, int user_flags, struct ucred *cred, struct thread *td); +static int kern_common_open(struct thread *td, char *path, enum uio_seg pathseg, + int flags, int mode, struct nameidata *nd); +static int kern_common_access(struct thread *td, char *path, enum uio_seg pathseg, + int flags, struct nameidata *nd); /* * The module initialization routine for POSIX asynchronous I/O will @@ -958,6 +962,47 @@ kern_open(struct thread *td, char *path, enum uio_seg pathseg, int flags, int mode) { + struct nameidata nd; + + AUDIT_ARG(fflags, flags); + AUDIT_ARG(mode, mode); + NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td); + + return kern_common_open(td, path, pathseg, flags, mode, &nd); +} + +int +kern_openat(struct thread *td, char *path, enum uio_seg pathseg, int flags, + int mode, int dirfd) +{ + int error; + struct nameidata nd; + struct vnode *dir_vn; + + AUDIT_ARG(fflags, flags); + AUDIT_ARG(mode, mode); + /* XXX: audit dirfd */ + + if (dirfd == AT_FDCWD) + dir_vn = NULL; + else { + error = fgetvp(td, dirfd, &dir_vn); + if (error) + return (error); + } + + NDINIT_AT(&nd, LOOKUP, FOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); + + error = kern_common_open(td, path, pathseg, flags, mode, &nd); + if (dirfd != AT_FDCWD) + vrele(dir_vn); + return (error); +} + +static int +kern_common_open(struct thread *td, char *path, enum uio_seg pathseg, int flags, + int mode, struct nameidata *nd) +{ struct proc *p = td->td_proc; struct filedesc *fdp = p->p_fd; struct file *fp; @@ -968,23 +1013,20 @@ struct file *nfp; int type, indx, error; struct flock lf; - struct nameidata nd; int vfslocked; - AUDIT_ARG(fflags, flags); - AUDIT_ARG(mode, mode); if ((flags & O_ACCMODE) == O_ACCMODE) return (EINVAL); flags = FFLAGS(flags); + error = falloc(td, &nfp, &indx); if (error) return (error); /* An extra reference on `nfp' has been held for us by falloc(). */ fp = nfp; cmode = ((mode &~ fdp->fd_cmask) & ALLPERMS) &~ S_ISTXT; - NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td); td->td_dupfd = -1; /* XXX check for fdopen */ - error = vn_open(&nd, &flags, cmode, indx); + error = vn_open(nd, &flags, cmode, indx); if (error) { /* * If the vn_open replaced the method vector, something @@ -1022,9 +1064,9 @@ return (error); } td->td_dupfd = 0; - vfslocked = NDHASGIANT(&nd); - NDFREE(&nd, NDF_ONLY_PNBUF); - vp = nd.ni_vp; + vfslocked = NDHASGIANT(nd); + NDFREE(nd, NDF_ONLY_PNBUF); + vp = nd->ni_vp; FILE_LOCK(fp); fp->f_vnode = vp; @@ -1855,9 +1897,44 @@ int kern_access(struct thread *td, char *path, enum uio_seg pathseg, int flags) { + struct nameidata nd; + + NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, + pathseg, path, td); + + return kern_common_access(td, path, pathseg, flags, &nd); +} + +int +kern_accessat(struct thread *td, char *path, enum uio_seg pathseg, int flags, int dirfd) +{ + int error; + struct nameidata nd; + struct vnode *dir_vn; + + if (dirfd == AT_FDCWD) + dir_vn = NULL; + else { + error = fgetvp(td, dirfd, &dir_vn); + if (error) + return (error); + } + + NDINIT_AT(&nd, LOOKUP, FOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, + pathseg, path, td, dir_vn); + + error = kern_common_access(td, path, pathseg, flags, &nd); + if (dirfd != AT_FDCWD) + vrele(dir_vn); + return (error); +} + +static int +kern_common_access(struct thread *td, char *path, enum uio_seg pathseg, int flags, + struct nameidata *nd) +{ struct ucred *cred, *tmpcred; - register struct vnode *vp; - struct nameidata nd; + struct vnode *vp; int vfslocked; int error; @@ -1871,15 +1948,13 @@ tmpcred->cr_uid = cred->cr_ruid; tmpcred->cr_groups[0] = cred->cr_rgid; td->td_ucred = tmpcred; - NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, - pathseg, path, td); - if ((error = namei(&nd)) != 0) + if ((error = namei(nd)) != 0) goto out1; - vfslocked = NDHASGIANT(&nd); - vp = nd.ni_vp; + vfslocked = NDHASGIANT(nd); + vp = nd->ni_vp; error = vn_access(vp, flags, tmpcred, td); - NDFREE(&nd, NDF_ONLY_PNBUF); + NDFREE(nd, NDF_ONLY_PNBUF); vput(vp); VFS_UNLOCK_GIANT(vfslocked); out1: ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/fcntl.h#2 (text+ko) ==== @@ -105,6 +105,9 @@ #ifdef _KERNEL #define FHASLOCK 0x4000 /* descriptor holds advisory lock */ #endif +#ifdef __BSD_VISIBLE +#define AT_FDCWD -100 /* just like Linux */ +#endif /* Defined by POSIX 1003.1; BSD default, but must be distinct from O_RDONLY. */ #define O_NOCTTY 0x8000 /* don't assign controlling terminal */ ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/namei.h#2 (text+ko) ==== @@ -63,6 +63,7 @@ */ const char *ni_dirp; /* pathname pointer */ enum uio_seg ni_segflg; /* location of pathname */ + struct vnode *ni_vdir; /* relative directory */ /* * Arguments to lookup. */ @@ -148,8 +149,6 @@ /* * Initialization of a nameidata structure. */ -static void NDINIT(struct nameidata *, u_long, u_long, enum uio_seg, - const char *, struct thread *); static __inline void NDINIT(struct nameidata *ndp, u_long op, u_long flags, @@ -162,6 +161,23 @@ ndp->ni_segflg = segflg; ndp->ni_dirp = namep; ndp->ni_cnd.cn_thread = td; + ndp->ni_vdir = NULL; +} + +static __inline void +NDINIT_AT(struct nameidata *ndp, + u_long op, u_long flags, + enum uio_seg segflg, + const char *namep, + struct thread *td, + struct vnode *dvp) +{ + ndp->ni_cnd.cn_nameiop = op; + ndp->ni_cnd.cn_flags = flags; + ndp->ni_segflg = segflg; + ndp->ni_dirp = namep; + ndp->ni_cnd.cn_thread = td; + ndp->ni_vdir = dvp; } #define NDF_NO_DVP_RELE 0x00000001 ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscallsubr.h#2 (text+ko) ==== @@ -55,6 +55,8 @@ socklen_t *namelen, struct file **fp); int kern_access(struct thread *td, char *path, enum uio_seg pathseg, int flags); +int kern_accessat(struct thread *td, char *path, enum uio_seg pathseg, + int flags, int dirfd); int kern_adjtime(struct thread *td, struct timeval *delta, struct timeval *olddelta); int kern_alternate_path(struct thread *td, const char *prefix, char *path, @@ -120,6 +122,8 @@ struct timespec *rmt); int kern_open(struct thread *td, char *path, enum uio_seg pathseg, int flags, int mode); +int kern_openat(struct thread *td, char *path, enum uio_seg pathseg, + int flags, int mode, int dirfd); int kern_pathconf(struct thread *td, char *path, enum uio_seg pathseg, int name); int kern_preadv(struct thread *td, int fd, struct uio *auio, off_t offset); From owner-p4-projects@FreeBSD.ORG Sat Apr 14 12:48:12 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E8F8916A404; Sat, 14 Apr 2007 12:48:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A41FF16A401 for ; Sat, 14 Apr 2007 12:48:11 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 956C913C4B8 for ; Sat, 14 Apr 2007 12:48:11 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3ECmBf9063045 for ; Sat, 14 Apr 2007 12:48:11 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3ECmBfV063042 for perforce@freebsd.org; Sat, 14 Apr 2007 12:48:11 GMT (envelope-from gabor@freebsd.org) Date: Sat, 14 Apr 2007 12:48:11 GMT Message-Id: <200704141248.l3ECmBfV063042@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 118095 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Apr 2007 12:48:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=118095 Change 118095 by gabor@gabor_server on 2007/04/14 12:47:59 Roll back current DESTDIR implementation, final step. It's done now. I did it with the best care I could do, but I broke something around the distfile extraction part, thus I have to investigate what's wrong before I can add some fully chrooted code for the new DESTDIR. Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#11 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#11 (text+ko) ==== @@ -4683,34 +4683,18 @@ else \ dir=$${dir%%:*}; \ fi; \ - if [ -z "${DESTDIR}" ] ; then \ - ${ECHO_MSG} -n "===> ${PKGNAME} depends on shared library: $$lib"; \ - if ${LDCONFIG} -r | ${GREP} -vwF -e "${PKGCOMPATDIR}" | ${GREP} -qwE -e "-l$$pattern"; then \ - ${ECHO_MSG} " - found"; \ - if [ ${_DEPEND_ALWAYS} = 1 ]; then \ - ${ECHO_MSG} " (but building it anyway)"; \ - notfound=1; \ - else \ - notfound=0; \ - fi; \ + ${ECHO_MSG} -n "===> ${PKGNAME} depends on shared library: $$lib"; \ + if ${LDCONFIG} -r | ${GREP} -vwF -e "${PKGCOMPATDIR}" | ${GREP} -qwE -e "-l$$pattern"; then \ + ${ECHO_MSG} " - found"; \ + if [ ${_DEPEND_ALWAYS} = 1 ]; then \ + ${ECHO_MSG} " (but building it anyway)"; \ + notfound=1; \ else \ - ${ECHO_MSG} " - not found"; \ - notfound=1; \ + notfound=0; \ fi; \ else \ - ${ECHO_MSG} -n "===> ${PKGNAME} depends on shared library in ${DESTDIR}: $$lib"; \ - if ${CHROOT} ${DESTDIR} ${LDCONFIG} -r | ${GREP} -vwF -e "${PKGCOMPATDIR}" | ${GREP} -qwE -e "-l$$pattern"; then \ - ${ECHO_MSG} " - found"; \ - if [ ${_DEPEND_ALWAYS} = 1 ]; then \ - ${ECHO_MSG} " (but building it anyway)"; \ - notfound=1; \ - else \ - notfound=0; \ - fi; \ - else \ - ${ECHO_MSG} " - not found"; \ - notfound=1; \ - fi; \ + ${ECHO_MSG} " - not found"; \ + notfound=1; \ fi; \ if [ $$notfound != 0 ]; then \ ${ECHO_MSG} "===> Verifying $$target for $$lib in $$dir"; \ From owner-p4-projects@FreeBSD.ORG Sat Apr 14 13:51:33 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7EE6F16A407; Sat, 14 Apr 2007 13:51:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 313F016A401 for ; Sat, 14 Apr 2007 13:51:33 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 21E2D13C469 for ; Sat, 14 Apr 2007 13:51:33 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3EDpXCB076428 for ; Sat, 14 Apr 2007 13:51:33 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3EDpWZQ076425 for perforce@freebsd.org; Sat, 14 Apr 2007 13:51:32 GMT (envelope-from gabor@freebsd.org) Date: Sat, 14 Apr 2007 13:51:32 GMT Message-Id: <200704141351.l3EDpWZQ076425@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 118097 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Apr 2007 13:51:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=118097 Change 118097 by gabor@gabor_server on 2007/04/14 13:51:25 IFC (And note that it seems to work now, I was wrong when I said it does not work. That issues must have been a side-effect of the incomplete progress. Now it's time to add some easy and simple chrooted version of DESTDIR.) Affected files ... .. //depot/projects/soc2006/gabor_destdir/GIDs#5 integrate .. //depot/projects/soc2006/gabor_destdir/LEGAL#5 integrate .. //depot/projects/soc2006/gabor_destdir/MOVED#6 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.kde.mk#4 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.lua.mk#3 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.sites.mk#6 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.xfce.mk#2 integrate .. //depot/projects/soc2006/gabor_destdir/UIDs#5 integrate .. //depot/projects/soc2006/gabor_destdir/UPDATING#6 integrate Differences ... ==== //depot/projects/soc2006/gabor_destdir/GIDs#5 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: ports/GIDs,v 1.34 2007/03/31 12:53:57 laszlof Exp $ +$FreeBSD: ports/GIDs,v 1.37 2007/04/11 13:27:34 miwi Exp $ # Please keep this file sorted by GID! smmsp:*:25: bind:*:53: @@ -52,6 +52,7 @@ ircproxyd:*:118: mythtv:*:119: pdns:*:120 +_ntp:*:123: fetchmail:*:124 postfix:*:125: maildrop:*:126: @@ -65,6 +66,7 @@ sfs:*:171: agk:*:172: polipo:*:173: +flowtools:*:174: nagios:*:181: moinmoin:*:192: cups:*:193: @@ -106,3 +108,4 @@ openxpki:*:777: netdisco:*:840: bacula:*:910: +otrs:*:121: ==== //depot/projects/soc2006/gabor_destdir/LEGAL#5 (text+ko) ==== @@ -1,5 +1,5 @@ # Creator: Jordan Hubbard -# $FreeBSD: ports/LEGAL,v 1.531 2007/03/31 03:41:14 alepulver Exp $ +# $FreeBSD: ports/LEGAL,v 1.534 2007/04/13 15:52:55 miwi Exp $ ********************************************************************** *** NOTE TO COMMITTERS *** @@ -130,6 +130,7 @@ See http://www.opensource.apple.com/apsl/ vbsd*e.tar.Z security/vscan Restricted to the license terms set for VirusScan +dbvis java/dbvis Redistribution is not permitted dc3play-* graphics/dc3play No redistribution due to beta status dcl-*-C.tar.gz science/cdcl No commercial use @@ -498,6 +499,7 @@ savage/savage* games/linux-savage Savage is freeware, but i am not sure of its license sdr-* mbone/sdr Crypto; export-controlled +seatools_cli.tar sysutils/seatools Distfile should be loaded by hand serialmail-* mail/serialmail No license -- see http://cr.yp.to/softwarelaw.html service-config-* sysutils/service-config Possibly restricted binary @@ -593,8 +595,6 @@ upsmon* sysutils/upsmon Redistribute only with original source code ut_linux_mgr_* sysutils/linux-megamgr Redistribution prohibited -urchin*.tar.gz www/urchin5 Commercial software, also comes - bundled with Apache-SSL linux-ut/* games/linux-ut Redistribution limited ut2004-lnx-* games/linux-ut2004-demo Redistribution limited uzap.tar.gz editors/uzap Restrictive copyright ==== //depot/projects/soc2006/gabor_destdir/MOVED#6 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1339 2007/04/06 21:48:08 gerald Exp $ +# $FreeBSD: ports/MOVED,v 1.1348 2007/04/11 11:29:23 sem Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -2898,3 +2898,41 @@ editors/flim113-emacs20||2007-04-02|Has expired: unfetchable, obsolete editors/semi113-emacs20||2007-04-02|Has expired: unfetchable, obsolete lang/gfortran|lang/gcc42|2007-04-06|Superseded by and equivalent to gcc42 +japanese/ptex-tetex|japanese/ptex|2007-04-08|Merged into japanese/ptex +japanese/ptex-base|japanese/ptex|2007-04-08|Merged into japanese/ptex +games/kgeography|misc/kdeedu3|2007-04-09|Merged into kdeedu +games/bos|games/boswars|2007-04-09|Project name changed +mail/p5-Mail-Box1|mail/p5-Mail-Box|2007-04-10|Has expired: obsolete, use mail/p5-Mail-Box instead +x11-themes/kde-icons-wasp||2007-04-10|Has expired: Unfetchable +x11-themes/kde-icons-sparkling||2007-04-10|Has expired: Unfetchable +audio/x4x||2007-04-10|Has expired: Does not build +audio/marlin||2007-04-10|Has expired: does not build with new nautilus-cd-burner +chinese/tatter-tools||2007-04-10|Has expired: Incorrect pkg-plist +chinese/vim-scdoc||2007-04-10|Has expired: Does not build +databases/mergeant||2007-04-10|Has expired: does not build with new libgnomedb +databases/pecl-paradox||2007-04-10|Has expired: Does not compile +deskutils/yank||2007-04-10|Has expired: Incomplete pkg-plist +emulators/kmamerun||2007-04-10|Has expired: Project was abandoned 4 years ago and expects an old version of XMAME, please use other frontends instead (like gxmame) +graphics/hobbes-icons-xpm||2007-04-10|Has expired: Archaic port +japanese/firefox-ja||2007-04-10|Has expired: Incomplete pkg-plist +japanese/lookup-xemacs||2007-04-10|Has expired: Does not install +lang/linux-hla||2007-04-10|Has expired: Does not compile +mail/vmailmgr||2007-04-10|Has expired: Incomplete pkg-plist +multimedia/qvamps||2007-04-10|Has expired: Touches filesystem prior to 'make install' +net-mgmt/sting||2007-04-10|Has expired: Broken on all supported versions of FreeBSD +net-mgmt/tas||2007-04-10|Has expired: Incomplete pkg-plist +net-p2p/verlihub-plugins||2007-04-10|Has expired: Does not configure, it needs at least verlihub 1.0 +news/inn-stable||2007-04-10|Has expired: Fails to patch +palm/malsync||2007-04-10|Has expired: Does not build with new pilot-link +russian/elm.language||2007-04-10|Has expired: Leaves behind files on deinstall +russian/pine.language||2007-04-10|Has expired: Leaves behind config file on deinstall +science/py-scipy03||2007-04-10|Has expired: Replaced by py-scipy +security/php4-cryptopp||2007-04-10|Has expired: Does not compile +sysutils/tct||2007-04-10|Has expired: this port is obsolete, please use sysutils/sleuthkit instead +textproc/ocaml-yaxi||2007-04-10|Has expired: Does not build +ukrainian/pine.language||2007-04-10|Has expired: Leaves behind config file on deinstall +www/mod_zap||2007-04-10|Has expired: Incomplete pkg-plist +www/sahana2||2007-04-10|Has expired: Conflicting dependencies: php4 vs php5 +www/urchin5||2007-04-10|Has expired: Does not install +databases/cyrus-smlacapd||2007-04-10|Has expired: this software is obsolete +databases/mysql-administrator||2007-04-11|Removed ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.kde.mk#4 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: Makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.kde.mk,v 1.70 2007/03/25 04:07:55 lofi Exp $ +# $FreeBSD: ports/Mk/bsd.kde.mk,v 1.71 2007/04/12 12:33:34 lofi Exp $ # # Please view me with 4 column tabs! @@ -162,7 +162,7 @@ _QT_COMPONENTS_ALL= accessible assistant codecs-cn codecs-jp codecs-kr \ codecs-tw corelib designer doc gui iconengines \ - imageformats inputformats assistantclient \ + imageformats inputmethods assistantclient \ linguist moc network opengl pixeltool porting \ qmake qt3support qtconfig qtestlib qvfb rcc sql svg \ uic uic3 xml @@ -179,7 +179,7 @@ gui_DEPENDS= x11-toolkits/qt4-gui iconengines_DEPENDS= graphics/qt4-iconengines imageformats_DEPENDS= graphics/qt4-imageformats -inputformats_DEPENDS= x11/qt4-inputformats +inputmethods_DEPENDS= x11/qt4-inputmethods assistantclient_DEPENDS=devel/qt4-libqtassistantclient assistantclient_NAME= libQtAssistantClient linguist_DEPENDS= devel/qt4-linguist ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.lua.mk#3 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.lua.mk,v 1.10 2007/01/05 02:56:47 alepulver Exp $ +# $FreeBSD: ports/Mk/bsd.lua.mk,v 1.13 2007/04/11 03:22:34 alepulver Exp $ # # bsd.lua.mk - Support for Lua based ports. # @@ -164,28 +164,30 @@ _LUA_PORT_lua_5.1= lang/lua _LUA_DEPTYPE_lua_5.1= build -_LUA_PORT_filename_5.1= devel/lua-filename -_LUA_PORT_gettext_5.1= devel/lua-gettext -_LUA_PORT_posix_5.1= devel/lua-posix +_LUA_PORT_filename_5.1= devel/lua-filename +_LUA_PORT_gettext_5.1= devel/lua-gettext +_LUA_PORT_posix_5.1= devel/lua-posix _LUA_PORT_pty_5.1= devel/lua-pty . for comp in ${_LUA_COMPS_ALL} _LUA_COMP= ${comp} . for ver in ${_LUA_VERS_ALL} +# XXX The hardcoded values here have to match LUA_* variables (later), and +# are here only to allow autodetection of installed versions. . if ${_LUA_COMP} == "lua" -_LUA_LIB_${comp}_${ver}= lua-${LUA_VER}.${LUA_VER_SH} -_LUA_SHVER_${comp}_${ver}= ${LUA_VER_SH} -_LUA_FILE_${comp}_${ver}= ${LUA_LIBDIR}/liblua.a +_LUA_LIB_${comp}_${ver}= lua-${ver}.${_LUA_SHVER_${comp}_${ver}} +_LUA_SHVER_${comp}_${ver}= ${ver:C/[[:digit:]]\.([[:digit:]])/\1/} +_LUA_FILE_${comp}_${ver}= ${LOCALBASE}/lib/lua${ver:S/.//g}/liblua.a . elif ${_LUA_COMP} == "tolua" -_LUA_FILE_${comp}_${ver}= ${LUA_LIBDIR}/libtolua.a +_LUA_FILE_${comp}_${ver}= ${LOCALBASE}/lib/lua${ver:S/.//g}/libtolua.a _LUA_DEPTYPE_${comp}_${ver}=build . elif ${_LUA_COMP} == "ruby" -_LUA_FILE_${comp}_${ver}= ${RUBY_SITEARCHLIBDIR}/lua-${LUA_VER}.so +_LUA_FILE_${comp}_${ver}= ${RUBY_SITEARCHLIBDIR}/lua-${ver}.so _LUA_DEPTYPE_${comp}_${ver}=lib -. else -. if !defined(_LUA_FILE_${comp}_${ver}) -_LUA_FILE_${comp}_${ver}= ${LUA_MODSHAREDIR}/${comp}.lua -. endif +. elif !defined(_LUA_FILE_${comp}_${ver}) +_LUA_FILE_${comp}_${ver}= ${LOCALBASE}/share/lua/${ver}/${comp}.lua +. endif +. if !defined(_LUA_DEPTYPE_${comp}_${ver}) _LUA_DEPTYPE_${comp}_${ver}=run . endif . endfor @@ -257,7 +259,7 @@ # Used for autodetection of installed versions. -.if defined(_WX_Need_Version) +.if defined(_LUA_Need_Version) _LUA_VER_INSTALLED:= ${_HAVE_LUA:Mlua-*:S/lua-//} .endif @@ -390,7 +392,7 @@ # 4) _LUA_VER_FINAL - Available versions. # -.for list in _LUA_VER_FINAL ${_LUA_LISTS_ORDER} +.for list in _LUA_VER_FINAL ${_LUA_VERS_LISTS} . if defined(${list}) . for ver in ${${list}} . if ${_LUA_VER_FINAL:M${ver}} != "" ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.sites.mk#6 (text+ko) ==== @@ -20,7 +20,7 @@ # # Note: all entries should terminate with a slash. # -# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.416 2007/04/03 21:58:35 stas Exp $ +# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.417 2007/04/11 07:42:33 sat Exp $ # # Where to put distfiles that don't have any other master site @@ -116,6 +116,11 @@ http://bsd3.cenkes.org/%SUBDIR%/ .endif +.if !defined(IGNORE_MASTER_SITE_CHEESESHOP) +MASTER_SITE_CHEESESHOP+= \ + http://cheeseshop.python.org/packages/%SUBDIR%/ +.endif + .if !defined(IGNORE_MASTER_SITE_COMP_SOURCES) MASTER_SITE_COMP_SOURCES+= \ ftp://gatekeeper.dec.com/pub/usenet/comp.sources.%SUBDIR%/ \ @@ -1340,6 +1345,7 @@ APACHE_JAKARTA:${PORTNAME:S,-,/,}/source \ BERLIOS:${PORTNAME:L} \ CENKES:myports \ + CHEESESHOP:source/${DISTNAME:C/(.).*/\1/}/${DISTNAME:C/(.*)-[0-9].*/\1/} \ CSME:myports \ DEBIAN:pool/main/${PORTNAME:C/^((lib)?.).*$/\1/}/${PORTNAME} \ GCC:releases/${DISTNAME} \ ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.xfce.mk#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: ports/Mk/bsd.xfce.mk,v 1.1 2007/03/14 04:06:11 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.xfce.mk,v 1.2 2007/04/11 16:26:45 oliver Exp $ # .if !defined(_POSTMKINCLUDED) && !defined(Xfce_Pre_Include) @@ -15,27 +15,33 @@ _USE_XFCE_ALL= configenv libexo libgui libutil libmcs mcsmanager panel \ thunar wm xfdev -MASTER_SITE_SUBDIR?= xfce-4.4.0 +MASTER_SITE_SUBDIR?= xfce-4.4.1 configenv_CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib" -libexo_LIB_DEPENDS= exo-0.3:${PORTSDIR}/x11/libexo +libexo_BUILD_DEPENDS= libexo>=0.3.2:${PORTSDIR}/x11/libexo +libexo_RUN_DEPENDS= libexo>=0.3.2:${PORTSDIR}/x11/libexo -libgui_LIB_DEPENDS= xfcegui4.6:${PORTSDIR}/x11-toolkits/libxfce4gui +libgui_BUILD_DEPENDS= libxfce4gui>=4.4.1:${PORTSDIR}/x11-toolkits/libxfce4gui +libgui_RUN_DEPENDS= libxfce4gui>=4.4.1:${PORTSDIR}/x11-toolkits/libxfce4gui -libutil_LIB_DEPENDS= xfce4util.4:${PORTSDIR}/x11/libxfce4util +libutil_BUILD_DEPENDS= libxfce4util>=4.4.1:${PORTSDIR}/x11/libxfce4util +libutil_RUN_DEPENDS= libxfce4util>=4.4.1:${PORTSDIR}/x11/libxfce4util -libmcs_LIB_DEPENDS= xfce4mcs-manager.3:${PORTSDIR}/x11/libxfce4mcs +libmcs_BUILD_DEPENDS= libxfce4mcs>=4.4.1:${PORTSDIR}/x11/libxfce4mcs +libmcs_RUN_DEPENDS= libxfce4mcs>=4.4.1:${PORTSDIR}/x11/libxfce4mcs -mcsmanager_BUILD_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager -mcsmanager_RUN_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager +mcsmanager_BUILD_DEPENDS= xfce4-mcs-manager>=4.4.1:${PORTSDIR}/sysutils/xfce4-mcs-manager +mcsmanager_RUN_DEPENDS= xfce4-mcs-manager>=4.4.1:${PORTSDIR}/sysutils/xfce4-mcs-manager -panel_LIB_DEPENDS= xfce4panel.2:${PORTSDIR}/x11-wm/xfce4-panel +panel_BUILD_DEPENDS= xfce4-panel>=4.4.1:${PORTSDIR}/x11-wm/xfce4-panel +panel_RUN_DEPENDS= xfce4-panel>=4.4.1:${PORTSDIR}/x11-wm/xfce4-panel -thunar_LIB_DEPENDS= thunar-vfs-1.4:${PORTSDIR}/x11-fm/thunar +thunar_BUILD_DEPENDS= Thunar>=0.8.0:${PORTSDIR}/x11-fm/thunar +thunar_RUN_DEPENDS= Thunar>=0.8.0:${PORTSDIR}/x11-fm/thunar -wm_BUILD_DEPENDS= xfwm4:${PORTSDIR}/x11-wm/xfce4-wm -wm_RUN_DEPENDS= xfwm4:${PORTSDIR}/x11-wm/xfce4-wm +wm_BUILD_DEPENDS= xfce4-wm>=4.4.1:${PORTSDIR}/x11-wm/xfce4-wm +wm_RUN_DEPENDS= xfce4-wm>=4.4.1:${PORTSDIR}/x11-wm/xfce4-wm xfdev_RUN_DEPENDS= xfce4-dev-tools:${PORTSDIR}/devel/xfce4-dev-tools ==== //depot/projects/soc2006/gabor_destdir/UIDs#5 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: ports/UIDs,v 1.37 2007/03/31 12:53:57 laszlof Exp $ +$FreeBSD: ports/UIDs,v 1.41 2007/04/11 13:27:34 miwi Exp $ # Please keep this file sorted by UID! smmsp:*:25:25:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin bind:*:53:53:Bind Sandbox:/:/sbin/nologin @@ -61,6 +61,7 @@ ircproxyd:*:118:118:Night Light IRC Proxy:/nonexistent:/sbin/nologin mythtv:*:119:119:MythTV pseudo-user:/home/mythtv:/bin/sh pdns_recursor:*:120:120:pdns_recursor pseudo-user:/nonexistent:/sbin/nologin +_ntp:*:123:123:NTP Daemon:/var/empty:/sbin/nologin fetchmail:*:124:124:Fetchmail mail-retrieval daemon:/nonexistent:/sbin/nologin postfix:*:125:125:Postfix Mail System:/var/spool/postfix:/sbin/nologin navcron:*:127:127:Network Administration Visualized:/usr/local/nav:/sbin/nologin @@ -73,6 +74,7 @@ sfs:*:171:171:Self-Certifying File System:/nonexistent:/sbin/nologin agk:*:172:172:AquaGateKeeper:/nonexistent:/nonexistent polipo:*:173:173:polipo web cache:/nonexistent:/sbin/nologin +flowtools:*:174:174:Flow-tools collector pseudo-user:/nonexistent:/sbin/nologin nagios:*:181:181:Nagios pseudo-user:/var/spool/nagios:/sbin/nologin moinmoin:*:192:192:MoinMoin User:/nonexistent:/sbin/nologin cups:*:193:193:Cups Owner:/nonexistent:/sbin/nologin @@ -115,3 +117,4 @@ openxpki:*:777:777:OpenXPKI Owner:/nonexistent:/usr/sbin/nologin netdisco:*:840:840:netdisco daemon:/nonexistent:/usr/sbin/nologin bacula:*:910:910:Bacula Daemon:/var/db/bacula:/sbin/nologin +otrs:*:121:121:OTRS Administrator:/usr/local/otrs:/bin/csh ==== //depot/projects/soc2006/gabor_destdir/UPDATING#6 (text+ko) ==== @@ -6,6 +6,15 @@ time you update your ports collection, before attempting any port upgrades. +20070408: + AFFECTS: users of japanese/ptex{,-base,-tetex} + AUTHOR: hrs@FreeBSD.org + + The japanese/ptex has been removed and japanese/ptex-tetex has been + renamed with japanese/ptex. A pair of ptex and ptex-base and + ptex-tetex are basically the same with each other, so there should + be no functionality regression. + 20070407: AFFECTS: users of net-mgmt/nagios AUTHOR: jarrod@netleader.com.au @@ -17,8 +26,8 @@ Stopping nagios. # find / -user nagios -exec chown 181 {} \; # find / -group nagios -exec chgrp 181 {} \; - # pw usermod nagios -u 181 # pw groupmod nagios -g 181 + # pw usermod nagios -u 181 -g 181 # /usr/local/etc/rc.d/nagios start Performing sanity check of nagios configuration: OK Starting nagios. @@ -98,7 +107,7 @@ 1. Remove the current linux base port. 2. Add to your /etc/make.conf "OVERRIDE_LINUX_BASE_PORT=fc6". 3. Make sure no linux application is running. - 4. Set apropriate sysctl (compat.linux.osrelease=2.6.16). + 4. Set appropriate sysctl (compat.linux.osrelease=2.6.16). 5. Install emulation/linux_base-fc6. 5a. Those who use linux ports with automatic plist building should apply the following patch: @@ -5079,4 +5088,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.496 2007/04/07 14:29:12 rafan Exp $ +$FreeBSD: ports/UPDATING,v 1.499 2007/04/13 11:31:19 blackend Exp $