From owner-p4-projects@FreeBSD.ORG Sun Jul 6 01:42:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C36E41065682; Sun, 6 Jul 2008 01:42:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 85AE3106564A; Sun, 6 Jul 2008 01:42:31 +0000 (UTC) (envelope-from nyan@jp.FreeBSD.org) Received: from watery.cc.kogakuin.ac.jp (watery.cc.kogakuin.ac.jp [133.80.152.80]) by mx1.freebsd.org (Postfix) with ESMTP id 1F4C18FC15; Sun, 6 Jul 2008 01:42:30 +0000 (UTC) (envelope-from nyan@jp.FreeBSD.org) Received: from localhost (localhost [IPv6:::1]) by watery.cc.kogakuin.ac.jp (unknown) with ESMTP id m661FePO072727; Sun, 6 Jul 2008 10:15:40 +0900 (JST) (envelope-from nyan@jp.FreeBSD.org) Date: Sun, 06 Jul 2008 10:15:12 +0900 (JST) Message-Id: <20080706.101512.193761302.nyan@jp.FreeBSD.org> To: marcel@freebsd.org From: Takahashi Yoshihiro In-Reply-To: <200807051805.m65I5T4Y056554@repoman.freebsd.org> References: <200807051805.m65I5T4Y056554@repoman.freebsd.org> X-Mailer: Mew version 6.1 on Emacs 22.2 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: perforce@freebsd.org Subject: Re: PERFORCE change 144729 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, 06 Jul 2008 01:42:32 -0000 In article <200807051805.m65I5T4Y056554@repoman.freebsd.org> Marcel Moolenaar writes: > @@ -67,9 +65,7 @@ > struct uart_class *class; > unsigned int i, j, ivar; > > - class = &uart_ns8250_class; /* currently ns8250 only */ > - if (class == NULL) > - return (ENXIO); > + class = &uart_i8251_class; > > /* Check the environment. */ > if (uart_getenv(devtype, di, class) == 0) Please revert this change. We want to use ns8250 class as default. And the above comment in the diff was wrong... The uart_i8251_class should be added to the uart_classes in uart_subr.c. --- TAKAHASHI Yoshihiro From owner-p4-projects@FreeBSD.ORG Sun Jul 6 02:10:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CAF7D1065676; Sun, 6 Jul 2008 02:10:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8C9EC1065671; Sun, 6 Jul 2008 02:10:15 +0000 (UTC) (envelope-from nyan@jp.FreeBSD.org) Received: from watery.cc.kogakuin.ac.jp (watery.cc.kogakuin.ac.jp [133.80.152.80]) by mx1.freebsd.org (Postfix) with ESMTP id 252BF8FC0A; Sun, 6 Jul 2008 02:10:14 +0000 (UTC) (envelope-from nyan@jp.FreeBSD.org) Received: from localhost (localhost [IPv6:::1]) by watery.cc.kogakuin.ac.jp (unknown) with ESMTP id m662AE4t075191; Sun, 6 Jul 2008 11:10:14 +0900 (JST) (envelope-from nyan@jp.FreeBSD.org) Date: Sun, 06 Jul 2008 11:09:43 +0900 (JST) Message-Id: <20080706.110943.226722229.nyan@jp.FreeBSD.org> To: marcel@freebsd.org From: Takahashi Yoshihiro In-Reply-To: <200807051943.m65JhHZ6066371@repoman.freebsd.org> References: <200807051943.m65JhHZ6066371@repoman.freebsd.org> X-Mailer: Mew version 6.1 on Emacs 22.2 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: perforce@freebsd.org Subject: Re: PERFORCE change 144741 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, 06 Jul 2008 02:10:16 -0000 In article <200807051943.m65JhHZ6066371@repoman.freebsd.org> Marcel Moolenaar writes: > static struct isa_pnp_id isa_i8251_ids[] = { > {0x0100e4a5, "RSA-98III"}, > {0} > }; > /* Probe PnP _and_ non-PnP i8251 here. */ > if (ISA_PNP_PROBE(parent, dev, isa_i8251_ids) != ENXIO) { > sc->sc_class = &uart_i8251_class; > return (uart_bus_probe(dev, 0, 0, 0, 0)); > } These are wrong. RSA98-III is based on ns8250 and has extended FIFO buffer. So I think that the uart_rsa_class should be added. FYI, RSA series are not for pc98 only. RSA-PCI (PCI) and RSA-DVII (ISA) exist but not supported yet. --- TAKAHASHI Yoshihiro From owner-p4-projects@FreeBSD.ORG Sun Jul 6 07:40:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FD3E1065679; Sun, 6 Jul 2008 07:40:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 649A11065677 for ; Sun, 6 Jul 2008 07:40:38 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 33CAE8FC16 for ; Sun, 6 Jul 2008 07:40:38 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m667ecEw072025 for ; Sun, 6 Jul 2008 07:40:38 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m667eXuX072017 for perforce@freebsd.org; Sun, 6 Jul 2008 07:40:33 GMT (envelope-from julian@freebsd.org) Date: Sun, 6 Jul 2008 07:40:33 GMT Message-Id: <200807060740.m667eXuX072017@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 144759 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, 06 Jul 2008 07:40:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=144759 Change 144759 by julian@julian_trafmon1 on 2008/07/06 07:40:24 Add a first draft of a vimage porting guide Affected files ... .. //depot/projects/vimage/porting_to_vimage.txt#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jul 6 07:44:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BCC291065676; Sun, 6 Jul 2008 07:44:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8056C106564A for ; Sun, 6 Jul 2008 07:44:42 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 69BDA8FC0A for ; Sun, 6 Jul 2008 07:44:42 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m667igSN072429 for ; Sun, 6 Jul 2008 07:44:42 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m667igbh072427 for perforce@freebsd.org; Sun, 6 Jul 2008 07:44:42 GMT (envelope-from julian@freebsd.org) Date: Sun, 6 Jul 2008 07:44:42 GMT Message-Id: <200807060744.m667igbh072427@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 144760 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, 06 Jul 2008 07:44:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=144760 Change 144760 by julian@julian_trafmon1 on 2008/07/06 07:43:58 Add a note I forgot about Affected files ... .. //depot/projects/vimage/porting_to_vimage.txt#2 edit Differences ... ==== //depot/projects/vimage/porting_to_vimage.txt#2 (text+ko) ==== @@ -51,10 +51,14 @@ required for the module to stash away the virtual machine instance somewhere, and make associated changes in the code. +5/ Add the code described below to the files that make up the module + Details: +(temp. for module FOO add a definition for VNET_MOD_FOO in sys/vimage.h) + Symbols defined in other modules that have been virtualised will have been moved to a module-specific virtualisation structure. It will be defined in a .h file for just this purpose. If a module will never export virtualise From owner-p4-projects@FreeBSD.ORG Sun Jul 6 07:46:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E9E0B1065686; Sun, 6 Jul 2008 07:46:44 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE34D106567D for ; Sun, 6 Jul 2008 07:46:44 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 973488FC19 for ; Sun, 6 Jul 2008 07:46:44 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m667kixF072683 for ; Sun, 6 Jul 2008 07:46:44 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m667kivJ072681 for perforce@freebsd.org; Sun, 6 Jul 2008 07:46:44 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 6 Jul 2008 07:46:44 GMT Message-Id: <200807060746.m667kivJ072681@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 144761 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, 06 Jul 2008 07:46:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=144761 Change 144761 by hselasky@hselasky_laptop001 on 2008/07/06 07:45:48 The beginning of a new generic USB file system interface, to better support the upcoming LibUSB 1.0. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#5 (text+ko) ==== @@ -102,6 +102,68 @@ uint8_t ude_addr; /* not used */ }; +struct usb2_fs_start { + uint8_t ep_index; +}; + +struct usb2_fs_stop { + uint8_t ep_index; +}; + +/* This structure is used for all endpoint types */ +struct usb2_fs_endpoint { + void *priv_sc0; /* private client data */ + void *priv_sc1; /* private client data */ + /* + * NOTE: isochronous USB transfer only use one buffer, but can have + * multiple frame lengths ! + */ + void **ppBuffer; /* pointer to userland buffers */ + uint32_t *pLength; /* pointer to frame lengths, updated + * to actual length */ + uint32_t nFrames; /* number of frames, updated to actual + * frames */ + uint16_t flags; + /* a single short frame will terminate */ +#define USB2_FS_FLAG_SINGLE_SHORT_OK 0x0001 + /* multiple short frames are allowed */ +#define USB2_FS_FLAG_MULTI_SHORT_OK 0x0002 + /* all frame(s) transmitted are short terminated */ +#define USB2_FS_FLAG_FORCE_SHORT 0x0004 + /* will do a clear-stall before xfer */ +#define USB2_FS_FLAG_CLEAR_STALL 0x0008 + uint16_t timeout; /* in milliseconds */ + /* timeout value for no timeout */ +#define USB2_FS_TIMEOUT_NONE 0 +}; + +struct usb2_fs_init { + /* userland pointer to endpoints structure */ + struct usb2_fs_endpoint *pEndpoints; + /* maximum number of endpoints */ + uint8_t ep_index_max; +}; + +struct usb2_fs_uninit { + uint8_t dummy; +}; + +struct usb2_fs_open { + uint32_t max_bufsize; + uint32_t max_frames; + uint8_t dev_index; /* currently unused */ + uint8_t ep_index; + uint8_t ep_no; /* bEndpointNumber */ +}; + +struct usb2_fs_close { + uint8_t ep_index; +}; + +struct usb2_fs_clear_stall_sync { + unit8_t ep_index; +}; + /* USB controller */ #define USB_REQUEST _IOWR('U', 1, struct usb2_ctl_request) #define USB_SETDEBUG _IOW ('U', 2, int) @@ -140,4 +202,13 @@ #define USB_GET_CM_OVER_DATA _IOR ('U', 130, int) #define USB_SET_CM_OVER_DATA _IOW ('U', 131, int) +/* USB file system interface */ +#define USB_FS_START _IOW ('U', 192, struct usb2_fs_start) +#define USB_FS_STOP _IOW ('U', 193, struct usb2_fs_stop) +#define USB_FS_INIT _IOW ('U', 194, struct usb2_fs_init) +#define USB_FS_UNINIT _IOW ('U', 195, struct usb2_fs_uninit) +#define USB_FS_OPEN _IOW ('U', 196, struct usb2_fs_open) +#define USB_FS_CLOSE _IOW ('U', 197, struct usb2_fs_close) +#define USB_FS_CLEAR_STALL_SYNC _IOW ('U', 198, struct usb2_fs_clear_stall_sync) + #endif /* _USB2_IOCTL_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Jul 6 08:50:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 849691065674; Sun, 6 Jul 2008 08:50:49 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4A6BE1065670 for ; Sun, 6 Jul 2008 08:50:49 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 33AE08FC15 for ; Sun, 6 Jul 2008 08:50:49 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m668onqp089750 for ; Sun, 6 Jul 2008 08:50:49 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m668onpR089748 for perforce@freebsd.org; Sun, 6 Jul 2008 08:50:49 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 6 Jul 2008 08:50:49 GMT Message-Id: <200807060850.m668onpR089748@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 144764 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, 06 Jul 2008 08:50:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=144764 Change 144764 by hselasky@hselasky_laptop001 on 2008/07/06 08:49:50 Compile fix and add USB status on transfer completion. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#6 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#6 (text+ko) ==== @@ -135,6 +135,7 @@ uint16_t timeout; /* in milliseconds */ /* timeout value for no timeout */ #define USB2_FS_TIMEOUT_NONE 0 + uint8_t status; /* see USB_ERR_XXX */ }; struct usb2_fs_init { @@ -161,7 +162,7 @@ }; struct usb2_fs_clear_stall_sync { - unit8_t ep_index; + uint8_t ep_index; }; /* USB controller */ From owner-p4-projects@FreeBSD.ORG Sun Jul 6 08:57:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C0C41065683; Sun, 6 Jul 2008 08:57:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 021161065681 for ; Sun, 6 Jul 2008 08:57:57 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DF8808FC12 for ; Sun, 6 Jul 2008 08:57:56 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m668vukA090287 for ; Sun, 6 Jul 2008 08:57:56 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m668vue2090285 for perforce@freebsd.org; Sun, 6 Jul 2008 08:57:56 GMT (envelope-from trasz@freebsd.org) Date: Sun, 6 Jul 2008 08:57:56 GMT Message-Id: <200807060857.m668vue2090285@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 144766 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, 06 Jul 2008 08:57:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=144766 Change 144766 by trasz@trasz_traszkan on 2008/07/06 08:57:32 With NFS4 ACLs, it is possible that applying a mode to an ACL which is identical to the mode computed from that ACL will modify the ACL. For example, mode computed from the following ACL is 0600: user:kamila:rwx--------C--:------:allow owner@:--x-----------:------:deny owner@:rw-p---A-W-Co-:------:allow group@:rwxp----------:------:deny group@:--------------:------:allow everyone@:rwxp---A-W-Co-:------:deny everyone@:------a-R-c--s:------:allow However, applying that mode (chmod 0600) changes the ACL into this: user:kamila:rwx-----------:------:deny user:kamila:rwx--------C--:------:allow owner@:--x-----------:------:deny owner@:rw-p---A-W-Co-:------:allow group@:rwxp----------:------:deny group@:--------------:------:allow everyone@:rwxp---A-W-Co-:------:deny everyone@:------a-R-c--s:------:allow In chmod(1) utility, there is an optimisation, which makes it not call chmod(2) if the mode of the file is the same as the new mode. Disable that optimisation for files which may have NFS4 ACLs. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/TODO#5 edit .. //depot/projects/soc2008/trasz_nfs4acl/bin/chmod/chmod.c#2 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/TODO#5 (text+ko) ==== @@ -6,10 +6,6 @@ - Add error checking to acl_to_text_nfs4.c. -- Find out what to do with chmod(1). Right now, "chmod 600" on file - which already has mode 0600 does not call chmod(2) at all - and it - should, as it might cause ACL recomputation. - - Make access control more granular. - Attach ZFS to the framework. ==== //depot/projects/soc2008/trasz_nfs4acl/bin/chmod/chmod.c#2 (text+ko) ==== @@ -54,6 +54,7 @@ #include void usage(void); +int may_have_nfs4acl(const FTSENT *ent); int main(int argc, char *argv[]) @@ -180,8 +181,15 @@ break; } newmode = getmode(set, p->fts_statp->st_mode); - if ((newmode & ALLPERMS) == (p->fts_statp->st_mode & ALLPERMS)) - continue; + /* + * With NFS4 ACLs, it is possible that applying a mode + * identical to the one computed from an ACL will change + * that ACL. + */ + if (may_have_nfs4acl(p) == 0) { + if ((newmode & ALLPERMS) == (p->fts_statp->st_mode & ALLPERMS)) + continue; + } if ((*change_mode)(p->fts_accpath, newmode) && !fflag) { warn("%s", p->fts_path); rval = 1; @@ -219,3 +227,25 @@ "usage: chmod [-fhv] [-R [-H | -L | -P]] mode file ...\n"); exit(1); } + +int +may_have_nfs4acl(const FTSENT *ent) +{ + int ret; + static dev_t previous_dev = (dev_t)-1; + static int supports_acls = -1; + + if (previous_dev != ent->fts_statp->st_dev) { + previous_dev = ent->fts_statp->st_dev; + supports_acls = 0; + + ret = pathconf(ent->fts_accpath, _PC_EXTENDED_SECURITY_NP); + if (ret > 0) + supports_acls = 1; + else if (ret < 0 && errno != EINVAL) + warn("%s", ent->fts_path); + } + + return (supports_acls); +} + From owner-p4-projects@FreeBSD.ORG Sun Jul 6 09:28:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 39B12106566C; Sun, 6 Jul 2008 09:28:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EC21F1065673 for ; Sun, 6 Jul 2008 09:28:27 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D57F78FC0A for ; Sun, 6 Jul 2008 09:28:27 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m669SRJW093826 for ; Sun, 6 Jul 2008 09:28:27 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m669SR5X093824 for perforce@freebsd.org; Sun, 6 Jul 2008 09:28:27 GMT (envelope-from gabor@freebsd.org) Date: Sun, 6 Jul 2008 09:28:27 GMT Message-Id: <200807060928.m669SR5X093824@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 144767 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, 06 Jul 2008 09:28:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=144767 Change 144767 by gabor@gabor_server on 2008/07/06 09:28:26 - Add --exclude for -r Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#54 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#30 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#47 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#54 (text+ko) ==== @@ -80,10 +80,17 @@ int eflags = REG_STARTEND; int matchall; /* shortcut */ + +/* Searching patterns */ int patterns, pattern_sz; char **pattern; regex_t *r_pattern; +/* Filename exclusion patterns */ +int epatterns, epattern_sz; +char **epattern; +regex_t *er_pattern; + /* For regex errors */ char re_error[RE_ERROR_BUF + 1]; @@ -112,6 +119,7 @@ int xflag; /* -x: pattern must match entire line */ int lbflag; /* --line-buffered */ int nullflag; /* --null */ +int exclflag; /* --exclude */ char *label; /* --label */ char *color; /* --color */ unsigned long long mcount; /* count for -m */ @@ -128,7 +136,8 @@ MMAP_OPT, LINEBUF_OPT, LABEL_OPT, - NULL_OPT + NULL_OPT, + R_EXCLUDE_OPT }; /* Housekeeping */ @@ -162,6 +171,7 @@ {"null", no_argument, NULL, NULL_OPT}, {"color", optional_argument, NULL, COLOR_OPT}, {"colour", optional_argument, NULL, COLOR_OPT}, + {"exclude", required_argument, NULL, R_EXCLUDE_OPT}, {"after-context", required_argument, NULL, 'A'}, {"text", no_argument, NULL, 'a'}, {"before-context", required_argument, NULL, 'B'}, @@ -239,6 +249,22 @@ } static void +add_epattern(char *pat, size_t len) +{ + if (epatterns == epattern_sz) { + epattern_sz *= 2; + epattern = grep_realloc(epattern, ++epattern_sz * sizeof(*epattern)); + } + if (len > 0 && pat[len - 1] == '\n') + --len; + /* pat may not be NUL-terminated */ + epattern[epatterns] = grep_malloc(len + 1); + memcpy(epattern[epatterns], pat, len); + epattern[epatterns][len] = '\0'; + ++epatterns; +} + +static void read_patterns(const char *fn) { FILE *f; @@ -481,6 +507,12 @@ case NULL_OPT: nullflag = 1; break; + case R_EXCLUDE_OPT: + if (dirbehave != DIR_RECURSE) + usage(); + exclflag = 1; + add_epattern(optarg, strlen(optarg)); + break; case HELP_OPT: default: usage(); @@ -516,6 +548,15 @@ errx(2, "%s", re_error); } } + er_pattern = grep_calloc(epatterns, sizeof(*er_pattern)); + for (i = 0; i < epatterns; ++i) { + c = regcomp(&er_pattern[i], epattern[i], REG_EXTENDED); + if (c != 0) { + regerror(c, &er_pattern[i], re_error, + RE_ERROR_BUF); + errx(2, "%s", re_error); + } + } if (lbflag) setlinebuf(stdout); ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#30 (text+ko) ==== @@ -82,14 +82,14 @@ /* Command line flags */ extern int Eflag, Fflag, Gflag, Hflag, Jflag, Lflag, Zflag, bflag, cflag, hflag, iflag, lflag, mflag, nflag, oflag, - qflag, sflag, vflag, wflag, xflag, nullflag; + qflag, sflag, vflag, wflag, xflag, nullflag, exclflag; extern unsigned long long Aflag, Bflag, mcount; extern char *color, *label; extern int binbehave, devbehave, dirbehave, linkbehave; -extern int first, prev, matchall, patterns, tail, notfound; -extern char **pattern; -extern regex_t *r_pattern; +extern int first, prev, matchall, patterns, epatterns, tail, notfound; +extern char **pattern, **epattern; +extern regex_t *r_pattern, *er_pattern; /* For regex errors */ #define RE_ERROR_BUF 512 ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#47 (text+ko) ==== @@ -62,7 +62,7 @@ { FTS *fts; FTSENT *p; - int c, fts_flags; + int i, c, ok, fts_flags; c = fts_flags = 0; @@ -92,7 +92,21 @@ p->fts_path); break; default: - c += procfile(p->fts_path); + if (exclflag) { + regmatch_t pmatch; + + ok = 1; + pmatch.rm_so = 0; + pmatch.rm_eo = strlen(p->fts_path); + for (i = 0; i < patterns; i++) + if (regexec(&er_pattern[i], p->fts_path, 0, &pmatch, eflags) == 0) { + ok = 0; + break; + } + } else + ok = 1; + if (ok) + c += procfile(p->fts_path); break; } } From owner-p4-projects@FreeBSD.ORG Sun Jul 6 09:34:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67B5F1065670; Sun, 6 Jul 2008 09:34:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1267E1065688 for ; Sun, 6 Jul 2008 09:34:34 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DECD18FC0C for ; Sun, 6 Jul 2008 09:34:33 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m669YXmw094324 for ; Sun, 6 Jul 2008 09:34:33 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m669YXvU094322 for perforce@freebsd.org; Sun, 6 Jul 2008 09:34:33 GMT (envelope-from gabor@freebsd.org) Date: Sun, 6 Jul 2008 09:34:33 GMT Message-Id: <200807060934.m669YXvU094322@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 144768 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, 06 Jul 2008 09:34:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=144768 Change 144768 by gabor@gabor_server on 2008/07/06 09:34:21 - Revert previous change, this was not really what is desired Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#55 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#31 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#48 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#55 (text+ko) ==== @@ -80,17 +80,10 @@ int eflags = REG_STARTEND; int matchall; /* shortcut */ - -/* Searching patterns */ int patterns, pattern_sz; char **pattern; regex_t *r_pattern; -/* Filename exclusion patterns */ -int epatterns, epattern_sz; -char **epattern; -regex_t *er_pattern; - /* For regex errors */ char re_error[RE_ERROR_BUF + 1]; @@ -119,7 +112,6 @@ int xflag; /* -x: pattern must match entire line */ int lbflag; /* --line-buffered */ int nullflag; /* --null */ -int exclflag; /* --exclude */ char *label; /* --label */ char *color; /* --color */ unsigned long long mcount; /* count for -m */ @@ -136,8 +128,7 @@ MMAP_OPT, LINEBUF_OPT, LABEL_OPT, - NULL_OPT, - R_EXCLUDE_OPT + NULL_OPT }; /* Housekeeping */ @@ -171,7 +162,6 @@ {"null", no_argument, NULL, NULL_OPT}, {"color", optional_argument, NULL, COLOR_OPT}, {"colour", optional_argument, NULL, COLOR_OPT}, - {"exclude", required_argument, NULL, R_EXCLUDE_OPT}, {"after-context", required_argument, NULL, 'A'}, {"text", no_argument, NULL, 'a'}, {"before-context", required_argument, NULL, 'B'}, @@ -249,22 +239,6 @@ } static void -add_epattern(char *pat, size_t len) -{ - if (epatterns == epattern_sz) { - epattern_sz *= 2; - epattern = grep_realloc(epattern, ++epattern_sz * sizeof(*epattern)); - } - if (len > 0 && pat[len - 1] == '\n') - --len; - /* pat may not be NUL-terminated */ - epattern[epatterns] = grep_malloc(len + 1); - memcpy(epattern[epatterns], pat, len); - epattern[epatterns][len] = '\0'; - ++epatterns; -} - -static void read_patterns(const char *fn) { FILE *f; @@ -507,12 +481,6 @@ case NULL_OPT: nullflag = 1; break; - case R_EXCLUDE_OPT: - if (dirbehave != DIR_RECURSE) - usage(); - exclflag = 1; - add_epattern(optarg, strlen(optarg)); - break; case HELP_OPT: default: usage(); @@ -548,15 +516,6 @@ errx(2, "%s", re_error); } } - er_pattern = grep_calloc(epatterns, sizeof(*er_pattern)); - for (i = 0; i < epatterns; ++i) { - c = regcomp(&er_pattern[i], epattern[i], REG_EXTENDED); - if (c != 0) { - regerror(c, &er_pattern[i], re_error, - RE_ERROR_BUF); - errx(2, "%s", re_error); - } - } if (lbflag) setlinebuf(stdout); ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#31 (text+ko) ==== @@ -82,14 +82,14 @@ /* Command line flags */ extern int Eflag, Fflag, Gflag, Hflag, Jflag, Lflag, Zflag, bflag, cflag, hflag, iflag, lflag, mflag, nflag, oflag, - qflag, sflag, vflag, wflag, xflag, nullflag, exclflag; + qflag, sflag, vflag, wflag, xflag, nullflag; extern unsigned long long Aflag, Bflag, mcount; extern char *color, *label; extern int binbehave, devbehave, dirbehave, linkbehave; -extern int first, prev, matchall, patterns, epatterns, tail, notfound; -extern char **pattern, **epattern; -extern regex_t *r_pattern, *er_pattern; +extern int first, prev, matchall, patterns, tail, notfound; +extern char **pattern; +extern regex_t *r_pattern; /* For regex errors */ #define RE_ERROR_BUF 512 ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#48 (text+ko) ==== @@ -62,7 +62,7 @@ { FTS *fts; FTSENT *p; - int i, c, ok, fts_flags; + int c, fts_flags; c = fts_flags = 0; @@ -92,21 +92,7 @@ p->fts_path); break; default: - if (exclflag) { - regmatch_t pmatch; - - ok = 1; - pmatch.rm_so = 0; - pmatch.rm_eo = strlen(p->fts_path); - for (i = 0; i < patterns; i++) - if (regexec(&er_pattern[i], p->fts_path, 0, &pmatch, eflags) == 0) { - ok = 0; - break; - } - } else - ok = 1; - if (ok) - c += procfile(p->fts_path); + c += procfile(p->fts_path); break; } } From owner-p4-projects@FreeBSD.ORG Sun Jul 6 10:00:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F9461065677; Sun, 6 Jul 2008 10:00:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C6ED31065673 for ; Sun, 6 Jul 2008 09:59:59 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AFFF88FC13 for ; Sun, 6 Jul 2008 09:59:59 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m669xxf1096249 for ; Sun, 6 Jul 2008 09:59:59 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m669xxRp096247 for perforce@freebsd.org; Sun, 6 Jul 2008 09:59:59 GMT (envelope-from gabor@freebsd.org) Date: Sun, 6 Jul 2008 09:59:59 GMT Message-Id: <200807060959.m669xxRp096247@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 144769 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, 06 Jul 2008 10:00:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=144769 Change 144769 by gabor@gabor_server on 2008/07/06 09:59:55 - Add --unidirectional-new-file Affected files ... .. //depot/projects/soc2008/gabor_textproc/diff/diff.1#3 edit .. //depot/projects/soc2008/gabor_textproc/diff/diff.c#10 edit .. //depot/projects/soc2008/gabor_textproc/diff/diff.h#5 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/diff/diff.1#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" .\" @(#)diff.1 8.1 (Berkeley) 6/30/93 .\" -.Dd Jul 4, 2008 +.Dd Jul 6, 2008 .Dt DIFF 1 .Os .Sh NAME @@ -281,6 +281,8 @@ The .Ar file argument can be a directory. +.It Fl Fl unidirectional-new-file +Treat the first file as empty and generate a diff accordingly. .It Fl w , Fl Fl ignore-all-space Is similar to .Fl b ==== //depot/projects/soc2008/gabor_textproc/diff/diff.c#10 (text+ko) ==== @@ -45,7 +45,7 @@ #include "diff.h" int aflag, bflag, dflag, iflag, lflag, Nflag, Pflag, pflag, rflag; -int sflag, tflag, Tflag, wflag; +int sflag, tflag, Tflag, wflag, uniflag; int format, status; int fcase_behave = FCASE_SENSITIVE; unsigned long long context; @@ -60,7 +60,8 @@ FCASE_SENSITIVE_OPT, FCASE_IGNORE_OPT, FROMFILE_OPT, - TOFILE_OPT + TOFILE_OPT, + UNIDIR_OPT }; #define OPTIONS "0123456789abC:cdD:efhI:iL:lnNPpqrS:sTtU:uvwX:x:" @@ -76,8 +77,8 @@ { "GTYPE-group-format", required_argument, NULL, OPT_GTYPE }, { "line-format", required_argument, NULL, OPT_LF }, { "LTYPE-line-format", required_argument, NULL, OPT_LLF }, - { "tabsize", optional_argument, NULL, OPT_TSIZE }, - { "unidirectional-new-file", no_argument, NULL, OPT_UNINF }, */ + { "tabsize", optional_argument, NULL, OPT_TSIZE }, */ + { "unidirectional-new-file", no_argument, NULL, UNIDIR_OPT }, { "from-file", required_argument, NULL, FROMFILE_OPT }, { "to-file", required_argument, NULL, TOFILE_OPT }, /* XXX: UNIMPLEMENTED @@ -133,7 +134,7 @@ main(int argc, char **argv) { char *ep, *fromfile = NULL, *tofile = NULL, **oargv; - int ch, lastch, gotstdin, prevoptind, newarg; + int ch, lastch, gotstdin, prevoptind, newarg, flags = 0; char *dst, *src; oargv = argv; @@ -261,6 +262,9 @@ err(2, "--from-file and --to-file are both specified"); asprintf(&fromfile, "%s", optarg); break; + case UNIDIR_OPT: + uniflag = 1; + break; case TOFILE_OPT: if (fromfile != NULL) err(2, "--from-file and --to-file are both specified"); @@ -326,8 +330,12 @@ if (strcmp(src, "-") == 0) { fstat(STDIN_FILENO, &stb1); gotstdin = 1; - } else if (stat(src, &stb1) != 0) - err(2, "%s", src); + } else if (stat(src, &stb1) != 0) { + if (uniflag) + flags |= D_EMPTY1; + else + err(2, "%s", src); + } if (strcmp(dst, "-") == 0) { fstat(STDIN_FILENO, &stb2); gotstdin = 1; @@ -352,7 +360,7 @@ if (stat(argv[1], &stb2) < 0) err(2, "%s", argv[1]); } - print_status(diffreg(src, dst, 0), src, dst, + print_status(diffreg(src, dst, flags), src, dst, NULL); if (fromfile != NULL) dst = argv[ch]; ==== //depot/projects/soc2008/gabor_textproc/diff/diff.h#5 (text+ko) ==== @@ -83,7 +83,7 @@ }; extern int aflag, bflag, dflag, iflag, lflag, Nflag, Pflag, pflag, rflag, - sflag, tflag, Tflag, wflag; + sflag, tflag, Tflag, wflag, uniflag; extern int format, status; extern int fcase_behave; extern unsigned long long context; From owner-p4-projects@FreeBSD.ORG Sun Jul 6 10:30:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C12221065688; Sun, 6 Jul 2008 10:30:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8508C1065672 for ; Sun, 6 Jul 2008 10:30:30 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6CE338FC1C for ; Sun, 6 Jul 2008 10:30:30 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m66AUUNB099812 for ; Sun, 6 Jul 2008 10:30:30 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m66AUUQs099810 for perforce@freebsd.org; Sun, 6 Jul 2008 10:30:30 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 6 Jul 2008 10:30:30 GMT Message-Id: <200807061030.m66AUUQs099810@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 144771 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, 06 Jul 2008 10:30:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=144771 Change 144771 by pgj@disznohal on 2008/07/06 10:29:36 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#7 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/nwhitehorn.key#1 branch .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#5 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#5 integrate .. //depot/projects/docproj_hu/www/en/developers.sgml#6 integrate .. //depot/projects/docproj_hu/www/en/gnome/docs/develfaq.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/gnome/docs/halfaq.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/gnome/index.xsl#3 integrate .. //depot/projects/docproj_hu/www/hu/docs/webresources.sgml#4 edit .. //depot/projects/docproj_hu/www/share/sgml/news.xml#8 integrate .. //depot/projects/docproj_hu/www/share/sgml/press.xml#4 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#7 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.452 2008/06/23 11:42:41 erik Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.453 2008/07/03 14:50:22 nwhitehorn Exp $ --> aaron@FreeBSD.org"> @@ -780,6 +780,8 @@ nsouch@FreeBSD.org"> +nwhitehorn@FreeBSD.org"> + nyan@FreeBSD.org"> obraun@FreeBSD.org"> ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1338,3 +1338,9 @@ &a.ivoras; &pgpkey.ivoras; + + + &a.nwhitehorn; + &pgpkey.nwhitehorn; + + ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#5 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -202,6 +202,7 @@ + ==== //depot/projects/docproj_hu/www/en/developers.sgml#6 (text+ko) ==== @@ -6,7 +6,7 @@ us to update author names, or the representation of those names (such as adding email addresses), by just editing a single file. -$FreeBSD: www/en/developers.sgml,v 1.197 2008/06/23 11:42:41 erik Exp $ +$FreeBSD: www/en/developers.sgml,v 1.198 2008/07/03 16:43:49 nwhitehorn Exp $ --> @@ -391,6 +391,7 @@ + ==== //depot/projects/docproj_hu/www/en/gnome/docs/develfaq.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -158,8 +158,11 @@

  • What is the current state of development GNOME on FreeBSD?

    -

    GNOME 2.22.0 is now out, and ports and packages are - up-to-date. Keep those bug reports coming.

    +

    GNOME 2.23.4 is the latest development release, and it is + relatively stable. The only obvious known issue is that + some icons are missing. This is part of an initiative to + clean up the deprecated icons. As the &gnomedevelver; + releases continue, this will gradually be fixed.

    • &footer; ==== //depot/projects/docproj_hu/www/en/gnome/docs/halfaq.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -210,7 +210,7 @@ for PolicyKit.conf, see the PolicyKit.conf(5) man page.

    -

    Step 4: If you have fixed volumes you wish to mount, +

    Step 3: If you have fixed volumes you wish to mount, you must also authorize yourself for the org.freedesktop.hal.storage.mount-fixed action. Note: This step is applicable to ALL users @@ -227,7 +227,7 @@ </match> -

    Step 5: While not really part of hal volume +

    Step 4: While not really part of hal volume management, you may also be able to have volumes listed in /etc/fstab automatically mounted. In GNOME, for example, Nautilus will mount volumes listed in ==== //depot/projects/docproj_hu/www/en/gnome/index.xsl#3 (text+ko) ==== @@ -4,7 +4,7 @@ ]> - + State of the port

    GNOME for FreeBSD is currently supported on - 5-STABLE, 6-STABLE, 6.3, 7.X, 8-CURRENT, and 6.2. + 6.3, 6-STABLE, 7.0, 7-STABLE, and 8-CURRENT. Most of GNOME has been ported to FreeBSD, but there is still plenty left to be done!

    ==== //depot/projects/docproj_hu/www/hu/docs/webresources.sgml#4 (text+ko) ==== @@ -2,7 +2,7 @@ - + ]> @@ -19,72 +19,80 @@ -

    Az igazi világban...

    +

    A valós világban...

    -

    FreeBSD a Sajtóban

    +

    &os; a sajtóban

    -

    Cikkek a FreeBSD-rõl a Sajtóban.

    +

    Cikkek a &os;-rõl a sajtóban.

    Hírcsoportok

    -

    A következõ hírcsoportok a FreeBSD-hez kapcsolódó +

    A következõ hírcsoportok a &os;-vel kapcsolatos megbeszéléseket tartalmaznak:

    További források

    -

    Year 2000 Kompatibilitás

    +

    Kétezredik év kompatibilitás

    -

    A FreeBSD Projekt jelenlegi álláspontja a 2000. évi - kompatibilitásról.

    +

    A &os; Projekt jelenlegi álláspontja a + kétezredik évi kompatibilitásról.

    -

    A Forráskód

    +

    A forráskód

    -

    Ha szeret a forráskódban túrkálni, - itt talál egy hypertext verziót a FreeBSD kernel +

    Ha szeretnénk a forráskódban + túrkálni, akkor itt találunk egy hypertext + verziót a &os; rendszermag forráskódjáról, Robert Watson - önkéntes munkájának köszönhetõen.

    + önkéntes munkájának + köszönhetõen.

    Daemon News

    -

    Az ipari vezetõ a BSD hírekben.

    +

    A BSD hírek legjobb forrása.

    -

    Ahogyan a FreeBSD önmaga is, ez a dokumentáció is - önkéntes erõfeszítés eredménye. - A célok is le vannak itt írva, illetve a - javítások és az új anyag - elküldésének módja is.

    +

    Ahogyan a &os; önmaga is, ez a dokumentáció is + önkéntes erõfeszítés + eredménye. Itt megtalálhatjuk a célokat, + valamint a javítások és az új anyagok + beküldésének módjait is.

    -

    A FreeBSD - Diary

    +

    A &os; Diary

    -

    A FreeBSD Diary egy kezdõknek szóló - "hogyan" dokumentumgyûjtemény. A cél egy - raká,s lépésrõl-lépésre - haladó útmutató írása +

    A &os; Diary egy kezdõknek szóló ,,hogyan'' + dokumentumgyûjtemény. Itt a cél + lépésrõl-lépésre haladó + útmutatók írása a különbözõ portok telepítésérõl és konfigurációjáról.

    @@ -92,32 +100,35 @@

    The O'Reilly Network BSD Dev Center

    -

    A BSD Dev Center két állandó oszlopot tart - a FreeBSD-rõl, tippeket és útmutatókat.

    +

    A BSD Dev Centernek két állandó &os; rovata + van, ahol különbözõ tippeket és + útmutatókat olvashatunk.

    BSDnexus

    -

    A BSDnexus aktív fórumokat nyújt a FreeBSD-rõl - és a többi BSD-rõl.

    +

    A BSDnexus a &os;-vel és a többi BSD-vel kapcsolatban + kínál aktív internetes fórumokat.

    BSD Guides

    -

    A BSDGuides.org rengeteg BSD-vel kapcsolatos útmutatót - kínál.

    +

    A BSDGuides.org rengeteg BSD-vel kapcsolatos + útmutatót tartalmaz.

    Egyéb dokumentáció

    -

    4.4BSD Dokumentumok: Ez a 4.4BSD - dokumentumok hypertext verziója, amit a - /usr/share/doc könyvtár - alatt talál egy FreeBSD telepítésen (ha telepítette a - doc disztribúciót).

    +

    4.4BSD dokumentumok: + Ez a 4.4BSD dokumentumok hypertext verziója, amelyet a /usr/share/doc + könyvtárban találhatunk meg minden &os; + rendszeren (amennyiben telepítettük a doc + terjesztést).

    -

    Info Dokumentumok: Ezek az Info - dokumentumok hypertext verziói, amelyeket a - /usr/share/info könyvtár - alatt talál meg egy FreeBSD telepítésen (ha telepítette - az info disztribúciót).

    +

    Info dokumentumok: Ezek + az Info dokumentumok hypertext verziói, amelyeket a /usr/share/info + könyvtár alatt találhatunk meg minden &os; + rendszeren (ha telepítettük az info + terjesztést).

    &footer; ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#8 (text+ko) ==== @@ -20,7 +20,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.170 2008/06/23 11:42:41 erik Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.172 2008/07/03 16:43:48 nwhitehorn Exp $ @@ -28,6 +28,18 @@ 2008 + 7 + + + 3 + +

    New committer: Nathan + Whitehorn (src)

    +     +     +     + + 6 @@ -36,6 +48,14 @@

    New committer: Erik Cederstrand (projects)

    + + + FreeBSD Technologies in Firefox 3 +

    A + press + release describing FreeBSD technologies used by Mozilla + Firefox.

    +     ==== //depot/projects/docproj_hu/www/share/sgml/press.xml#4 (text+ko) ==== @@ -9,7 +9,7 @@ - $FreeBSD: www/share/sgml/press.xml,v 1.62 2008/06/24 15:47:55 brd Exp $ + $FreeBSD: www/share/sgml/press.xml,v 1.65 2008/07/05 15:59:21 jkoshy Exp $ @@ -17,15 +17,29 @@ 2008 + 7 + + Book Review: The Best of FreeBSD Basics + http://www.osnews.com/story/19947/Book_Review:_The_Best_of_FreeBSD_Basics + OS News + http://www.osnews.com/ + 2 July 2008 + Peter Hummers +

    A review of the book ``The Best of FreeBSD Basics''.

    +     +     + + 6 - FreeBSD Technologies in Firefox 3 - http://www.prweb.com/releases/2008/6/prweb1042664.htm - PR Web - http://www.prweb.com/ - 23 June 2008 -

    An article about how Mozilla Firefox uses FreeBSD - Technologies.

    + How FreeBSD makes vulnerability auditing easy: portaudit + http://blogs.techrepublic.com.com/security/?p=477 + Tech Republic + http://www.techrepublic.com.com/ + 24 June 2008 + Chad Perrin +

    An article that highlights the ease with which a FreeBSD + system can be kept upto-date with respect to vulnerabilities.

     From owner-p4-projects@FreeBSD.ORG Sun Jul 6 12:35:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 33EB31065688; Sun, 6 Jul 2008 12:35:37 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EBB50106567F for ; Sun, 6 Jul 2008 12:35:36 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BBF988FC12 for ; Sun, 6 Jul 2008 12:35:36 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m66CZaOD012923 for ; Sun, 6 Jul 2008 12:35:36 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m66CZaK1012921 for perforce@freebsd.org; Sun, 6 Jul 2008 12:35:36 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 6 Jul 2008 12:35:36 GMT Message-Id: <200807061235.m66CZaK1012921@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 144775 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, 06 Jul 2008 12:35:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=144775 Change 144775 by pgj@disznohal on 2008/07/06 12:35:27 A forced submit to remark that a work-in-progress Hungarian source rework got into integrated changes in my last submit Pointhat for: pgj Affected files ... .. //depot/projects/docproj_hu/www/hu/docs/webresources.sgml#5 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/docs/webresources.sgml#5 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Jul 6 12:50:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A8531065670; Sun, 6 Jul 2008 12:50:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E105B1065680 for ; Sun, 6 Jul 2008 12:50:52 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CB25E8FC17 for ; Sun, 6 Jul 2008 12:50:52 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m66CoqW3023410 for ; Sun, 6 Jul 2008 12:50:52 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m66CoqQe023408 for perforce@freebsd.org; Sun, 6 Jul 2008 12:50:52 GMT (envelope-from gabor@freebsd.org) Date: Sun, 6 Jul 2008 12:50:52 GMT Message-Id: <200807061250.m66CoqQe023408@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 144777 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, 06 Jul 2008 12:50:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=144777 Change 144777 by gabor@gabor_server on 2008/07/06 12:50:06 - Readd --exclude and add --include in the same way. Even if these are not GNU compatible as GNU seems to except a shell pattern, I consider this a great feature with extended regexps. Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#56 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#32 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#49 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#56 (text+ko) ==== @@ -70,9 +70,10 @@ /*10*/ "FreeBSD grep 2.5.1\n", /*11*/ "unknown --binary-files option", /*12*/ "Binary file %s matches\n", -/*12*/ "value out of range", -/*13*/ "unknown -d or --directory option", -/*14*/ "unknown --color option" +/*13*/ "value out of range", +/*14*/ "unknown -d or --directory option", +/*15*/ "unknown --color option", +/*16*/ "both --include and --exclude are specified" }; /* Flags passed to regcomp() and regexec() */ @@ -80,10 +81,17 @@ int eflags = REG_STARTEND; int matchall; /* shortcut */ + +/* Searching patterns */ int patterns, pattern_sz; char **pattern; regex_t *r_pattern; +/* Filename exclusion patterns */ +int epatterns, epattern_sz; +char **epattern; +regex_t *er_pattern; + /* For regex errors */ char re_error[RE_ERROR_BUF + 1]; @@ -112,6 +120,8 @@ int xflag; /* -x: pattern must match entire line */ int lbflag; /* --line-buffered */ int nullflag; /* --null */ +int exclflag; /* --exclude */ +int inclflag; /* --include */ char *label; /* --label */ char *color; /* --color */ unsigned long long mcount; /* count for -m */ @@ -128,7 +138,9 @@ MMAP_OPT, LINEBUF_OPT, LABEL_OPT, - NULL_OPT + NULL_OPT, + R_EXCLUDE_OPT, + R_INCLUDE_OPT }; /* Housekeeping */ @@ -162,6 +174,8 @@ {"null", no_argument, NULL, NULL_OPT}, {"color", optional_argument, NULL, COLOR_OPT}, {"colour", optional_argument, NULL, COLOR_OPT}, + {"exclude", required_argument, NULL, R_EXCLUDE_OPT}, + {"include", required_argument, NULL, R_INCLUDE_OPT}, {"after-context", required_argument, NULL, 'A'}, {"text", no_argument, NULL, 'a'}, {"before-context", required_argument, NULL, 'B'}, @@ -239,6 +253,22 @@ } static void +add_epattern(char *pat, size_t len) +{ + if (epatterns == epattern_sz) { + epattern_sz *= 2; + epattern = grep_realloc(epattern, ++epattern_sz * sizeof(*epattern)); + } + if (len > 0 && pat[len - 1] == '\n') + --len; + /* pat may not be NUL-terminated */ + epattern[epatterns] = grep_malloc(len + 1); + memcpy(epattern[epatterns], pat, len); + epattern[epatterns][len] = '\0'; + ++epatterns; +} + +static void read_patterns(const char *fn) { FILE *f; @@ -470,7 +500,7 @@ } else if (strcmp("never", optarg) == 0) color = NULL; else - errx(2, getstr(14)); + errx(2, getstr(15)); break; case LABEL_OPT: label = optarg; @@ -481,6 +511,20 @@ case NULL_OPT: nullflag = 1; break; + case R_INCLUDE_OPT: + if (dirbehave != DIR_RECURSE) + usage(); + inclflag = 1; + exclflag = 0; + add_epattern(optarg, strlen(optarg)); + break; + case R_EXCLUDE_OPT: + if (dirbehave != DIR_RECURSE) + usage(); + inclflag = 0; + exclflag = 1; + add_epattern(optarg, strlen(optarg)); + break; case HELP_OPT: default: usage(); @@ -516,6 +560,15 @@ errx(2, "%s", re_error); } } + er_pattern = grep_calloc(epatterns, sizeof(*er_pattern)); + for (i = 0; i < epatterns; ++i) { + c = regcomp(&er_pattern[i], epattern[i], REG_EXTENDED); + if (c != 0) { + regerror(c, &er_pattern[i], re_error, + RE_ERROR_BUF); + errx(2, "%s", re_error); + } + } if (lbflag) setlinebuf(stdout); ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#32 (text+ko) ==== @@ -82,14 +82,15 @@ /* Command line flags */ extern int Eflag, Fflag, Gflag, Hflag, Jflag, Lflag, Zflag, bflag, cflag, hflag, iflag, lflag, mflag, nflag, oflag, - qflag, sflag, vflag, wflag, xflag, nullflag; + qflag, sflag, vflag, wflag, xflag; +extern int nullflag, exclflag, inclflag; extern unsigned long long Aflag, Bflag, mcount; extern char *color, *label; extern int binbehave, devbehave, dirbehave, linkbehave; -extern int first, prev, matchall, patterns, tail, notfound; -extern char **pattern; -extern regex_t *r_pattern; +extern int first, prev, matchall, patterns, epatterns, tail, notfound; +extern char **pattern, **epattern; +extern regex_t *r_pattern, *er_pattern; /* For regex errors */ #define RE_ERROR_BUF 512 ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#49 (text+ko) ==== @@ -62,7 +62,7 @@ { FTS *fts; FTSENT *p; - int c, fts_flags; + int i, c, ok, fts_flags; c = fts_flags = 0; @@ -92,7 +92,31 @@ p->fts_path); break; default: - c += procfile(p->fts_path); + if (exclflag) { + regmatch_t pmatch; + + ok = 1; + pmatch.rm_so = 0; + pmatch.rm_eo = strlen(p->fts_path); + for (i = 0; i < epatterns; i++) + if (regexec(&er_pattern[i], p->fts_path, 0, &pmatch, eflags) == 0) { + ok = 0; + break; + } + } else if (inclflag) { + regmatch_t pmatch; + ok = 0; + pmatch.rm_so = 0; + pmatch.rm_eo = strlen(p->fts_path); + for (i = 0; i < epatterns; i++) + if (regexec(&er_pattern[i], p->fts_path, 0, &pmatch, eflags) == 0) { + ok = 1; + break; + } + } else + ok = 1; + if (ok) + c += procfile(p->fts_path); break; } } From owner-p4-projects@FreeBSD.ORG Sun Jul 6 13:31:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81DFF1065674; Sun, 6 Jul 2008 13:31:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 45DF01065672 for ; Sun, 6 Jul 2008 13:31:34 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 30ED58FC20 for ; Sun, 6 Jul 2008 13:31:34 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m66DVY21028008 for ; Sun, 6 Jul 2008 13:31:34 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m66DVYbN028006 for perforce@freebsd.org; Sun, 6 Jul 2008 13:31:34 GMT (envelope-from gabor@freebsd.org) Date: Sun, 6 Jul 2008 13:31:34 GMT Message-Id: <200807061331.m66DVYbN028006@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 144780 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, 06 Jul 2008 13:31:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=144780 Change 144780 by gabor@gabor_server on 2008/07/06 13:31:22 - Little change on -V to be more informative and more consistent with GNU grep Requested by: Pedro F. Giffuni Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#57 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#33 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#57 (text+ko) ==== @@ -67,7 +67,7 @@ /* 7*/ "\t[--null] [pattern] [file ...]\n", /* 8*/ "parentheses not balanced", /* 9*/ "context out of range", -/*10*/ "FreeBSD grep 2.5.1\n", +/*10*/ "%s (BSD grep) %s\n", /*11*/ "unknown --binary-files option", /*12*/ "Binary file %s matches\n", /*13*/ "value out of range", @@ -465,7 +465,7 @@ /* noop, compatibility */ break; case 'V': - printf(getstr(10)); + printf(getstr(10), __progname, VERSION); exit(0); case 'v': vflag = 1; ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#33 (text+ko) ==== @@ -44,6 +44,7 @@ extern char *errstr[]; +#define VERSION "2.5.1-FreeBSD" #define BINFILE_BIN 0 #define BINFILE_SKIP 1 From owner-p4-projects@FreeBSD.ORG Sun Jul 6 13:37:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C16DC1065677; Sun, 6 Jul 2008 13:37:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 83E2E1065674 for ; Sun, 6 Jul 2008 13:37:40 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6EE5D8FC12 for ; Sun, 6 Jul 2008 13:37:40 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m66DbeqK028515 for ; Sun, 6 Jul 2008 13:37:40 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m66Dbeve028513 for perforce@freebsd.org; Sun, 6 Jul 2008 13:37:40 GMT (envelope-from gabor@freebsd.org) Date: Sun, 6 Jul 2008 13:37:40 GMT Message-Id: <200807061337.m66Dbeve028513@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 144781 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, 06 Jul 2008 13:37:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=144781 Change 144781 by gabor@gabor_server on 2008/07/06 13:36:59 - Resync catalogues Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#58 edit .. //depot/projects/soc2008/gabor_textproc/grep/nls/C.msg#4 edit .. //depot/projects/soc2008/gabor_textproc/grep/nls/hu_HU.ISO8859-2.msg#3 edit .. //depot/projects/soc2008/gabor_textproc/grep/nls/pt_BR.ISO8859-1.msg#4 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#58 (text+ko) ==== @@ -73,7 +73,6 @@ /*13*/ "value out of range", /*14*/ "unknown -d or --directory option", /*15*/ "unknown --color option", -/*16*/ "both --include and --exclude are specified" }; /* Flags passed to regcomp() and regexec() */ ==== //depot/projects/soc2008/gabor_textproc/grep/nls/C.msg#4 (text+ko) ==== @@ -11,9 +11,9 @@ 7 "\t[--null] [pattern] [file ...]\n" 8 "parentheses not balanced" 9 "context out of range" -10 "FreeBSD grep 2.5.1\n" +10 "%s (BSD grep) %s\n" 11 "unknown --binary-files option" 12 "Binary file %s matches\n" -12 "value out of range" -13 "unknown -d or --directory option" -14 "unknown --color option" +13 "value out of range" +14 "unknown -d or --directory option" +15 "unknown --color option" ==== //depot/projects/soc2008/gabor_textproc/grep/nls/hu_HU.ISO8859-2.msg#3 (text+ko) ==== @@ -11,9 +11,9 @@ 7 "\t[--null] [minta] [fájl ...]\n" 8 "párosítatlan zárójelek" 9 "a kontextus a megengedett tartományon kívül esik" -10 "FreeBSD grep 2.5.1\n" +10 "%s (BSD grep) %s\n" 11 "ismeretlen --binary-files opció" 12 "%s bináris fájl illeszkedik\n" -12 "az érték a megengedett tartományon kívül esik" -13 "ismeretlen -d vagy --directory opció" -14 "ismeretlen --color opció" +13 "az érték a megengedett tartományon kívül esik" +14 "ismeretlen -d vagy --directory opció" +15 "ismeretlen --color opció" ==== //depot/projects/soc2008/gabor_textproc/grep/nls/pt_BR.ISO8859-1.msg#4 (text+ko) ==== @@ -11,9 +11,9 @@ 7 "\t[--null] [padrão] [arquivo ...]\n" 8 "parênteses nâo balanceados" 9 "contexto está fora da escala" -10 "FreeBSD grep 2.5.1\n" +10 "%s (BSD grep) %s\n" 11 "opcão não conhecida de --binary-files" 12 "arquivo binário %s casa com o padrão\n" -12 "el valor está fora da escala" -13 "opcão não conhecida de -d ou --directory" -14 "opcão não conhecida de --color" +13 "el valor está fora da escala" +14 "opcão não conhecida de -d ou --directory" +15 "opcão não conhecida de --color" From owner-p4-projects@FreeBSD.ORG Sun Jul 6 13:50:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 286961065685; Sun, 6 Jul 2008 13:50:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E03EB1065682 for ; Sun, 6 Jul 2008 13:50:53 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CB9CA8FC14 for ; Sun, 6 Jul 2008 13:50:53 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m66Dorrb029558 for ; Sun, 6 Jul 2008 13:50:53 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m66Dor8R029556 for perforce@freebsd.org; Sun, 6 Jul 2008 13:50:53 GMT (envelope-from gabor@freebsd.org) Date: Sun, 6 Jul 2008 13:50:53 GMT Message-Id: <200807061350.m66Dor8R029556@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 144782 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, 06 Jul 2008 13:50:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=144782 Change 144782 by gabor@gabor_server on 2008/07/06 13:50:22 - Add --speed-large-files. At the moment this is a compatibility noop, optimization comes later. Affected files ... .. //depot/projects/soc2008/gabor_textproc/diff/diff.c#11 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/diff/diff.c#11 (text+ko) ==== @@ -61,7 +61,8 @@ FCASE_IGNORE_OPT, FROMFILE_OPT, TOFILE_OPT, - UNIDIR_OPT + UNIDIR_OPT, + SPEEDLF_OPT }; #define OPTIONS "0123456789abC:cdD:efhI:iL:lnNPpqrS:sTtU:uvwX:x:" @@ -82,8 +83,8 @@ { "from-file", required_argument, NULL, FROMFILE_OPT }, { "to-file", required_argument, NULL, TOFILE_OPT }, /* XXX: UNIMPLEMENTED - { "horizon-lines", required_argument, NULL, OPT_HLINES }, - { "speed-large-files", no_argument, NULL, OPT_LFILES }, */ + { "horizon-lines", required_argument, NULL, OPT_HLINES }, */ + { "speed-large-files", no_argument, NULL, SPEEDLF_OPT }, { "help", no_argument, NULL, HELP_OPT }, { "text", no_argument, NULL, 'a' }, /* XXX: UNIMPLEMENTED @@ -276,6 +277,9 @@ case FCASE_IGNORE_OPT: fcase_behave = FCASE_IGNORE; break; + case SPEEDLF_OPT: + /* noop, compatibility */ + break; case NORMAL_OPT: /* compatibility, this is the default */ break; From owner-p4-projects@FreeBSD.ORG Sun Jul 6 15:41:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14F0F1065673; Sun, 6 Jul 2008 15:41:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD96C1065671 for ; Sun, 6 Jul 2008 15:41:45 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9FBD18FC0C for ; Sun, 6 Jul 2008 15:41:45 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m66Ffjra040631 for ; Sun, 6 Jul 2008 15:41:45 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m66FfjDd040629 for perforce@freebsd.org; Sun, 6 Jul 2008 15:41:45 GMT (envelope-from marcel@freebsd.org) Date: Sun, 6 Jul 2008 15:41:45 GMT Message-Id: <200807061541.m66FfjDd040629@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 144784 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, 06 Jul 2008 15:41:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=144784 Change 144784 by marcel@marcel_xcllnt on 2008/07/06 15:41:24 Make ns8250 the default. In other words, assume that people refer to the ns8250 by default. Requested by: nyan Affected files ... .. //depot/projects/uart/dev/uart/uart_cpu_pc98.c#20 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_cpu_pc98.c#20 (text+ko) ==== @@ -77,7 +77,7 @@ struct uart_class *class; unsigned int i, ivar; - class = &uart_i8251_class; + class = &uart_ns8250_class; /* Check the environment. */ if (uart_getenv(devtype, di, class) == 0) From owner-p4-projects@FreeBSD.ORG Sun Jul 6 15:52:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B7181065689; Sun, 6 Jul 2008 15:52:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D55FE1065684 for ; Sun, 6 Jul 2008 15:52:56 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C19C08FC1F for ; Sun, 6 Jul 2008 15:52:56 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m66FqumH041496 for ; Sun, 6 Jul 2008 15:52:56 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m66Fqugh041494 for perforce@freebsd.org; Sun, 6 Jul 2008 15:52:56 GMT (envelope-from marcel@freebsd.org) Date: Sun, 6 Jul 2008 15:52:56 GMT Message-Id: <200807061552.m66Fqugh041494@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 144785 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, 06 Jul 2008 15:52:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=144785 Change 144785 by marcel@marcel_xcllnt on 2008/07/06 15:52:13 The RSA-98III is actually a ns8250 class UART. Affected files ... .. //depot/projects/uart/dev/uart/uart_bus_isa.c#12 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_bus_isa.c#12 (text+ko) ==== @@ -65,6 +65,7 @@ {0x0205d041, "Multiport serial device (non-intelligent 16550)"}, /* PNP0502 */ {0x1005d041, "Generic IRDA-compatible device"}, /* PNP0510 */ {0x1105d041, "Generic IRDA-compatible device"}, /* PNP0511 */ + {0x0100e4a5, "RSA-98III"}, /* Devices that do not have a compatid */ {0x12206804, NULL}, /* ACH2012 - 5634BTS 56K Video Ready Modem */ {0x7602a904, NULL}, /* AEI0276 - 56K v.90 Fax Modem (LKT) */ @@ -159,11 +160,6 @@ {0} }; -static struct isa_pnp_id isa_i8251_ids[] = { - {0x0100e4a5, "RSA-98III"}, - {0} -}; - static int uart_isa_probe(device_t dev) { @@ -179,11 +175,7 @@ return (uart_bus_probe(dev, 0, 0, 0, 0)); } - /* Probe PnP _and_ non-PnP i8251 here. */ - if (ISA_PNP_PROBE(parent, dev, isa_i8251_ids) != ENXIO) { - sc->sc_class = &uart_i8251_class; - return (uart_bus_probe(dev, 0, 0, 0, 0)); - } + /* Add checks for non-ns8250 IDs here. */ #ifdef PC98 sc->sc_class = uart_pc98_getdev(bus_get_resource_start(dev, From owner-p4-projects@FreeBSD.ORG Sun Jul 6 16:06:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B9C71065673; Sun, 6 Jul 2008 16:06:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0DEAE106566C for ; Sun, 6 Jul 2008 16:06:47 +0000 (UTC) (envelope-from xcllnt@mac.com) Received: from smtpoutm.mac.com (smtpoutm.mac.com [17.148.16.68]) by mx1.freebsd.org (Postfix) with ESMTP id E82C28FC17 for ; Sun, 6 Jul 2008 16:06:46 +0000 (UTC) (envelope-from xcllnt@mac.com) Received: from asmtp022-bge351000.mac.com (asmtp022-bge351000 [10.150.69.85]) by smtpoutm.mac.com (Xserve/smtpout005/MantshX 4.0) with ESMTP id m66FoMhf018028; Sun, 6 Jul 2008 08:50:22 -0700 (PDT) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; charset=US-ASCII; format=flowed Received: from [192.168.1.102] (209-128-86-226.bayarea.net [209.128.86.226]) by asmtp022.mac.com (Sun Java(tm) System Messaging Server 6.3-6.03 (built Mar 14 2008; 32bit)) with ESMTPSA id <0K3L00EOKDBX4620@asmtp022.mac.com>; Sun, 06 Jul 2008 08:50:22 -0700 (PDT) Sender: xcllnt@mac.com Message-id: From: Marcel Moolenaar To: Takahashi Yoshihiro In-reply-to: <20080706.110943.226722229.nyan@jp.FreeBSD.org> Date: Sun, 06 Jul 2008 08:50:21 -0700 References: <200807051943.m65JhHZ6066371@repoman.freebsd.org> <20080706.110943.226722229.nyan@jp.FreeBSD.org> X-Mailer: Apple Mail (2.926) Cc: marcel@freebsd.org, perforce@freebsd.org Subject: Re: PERFORCE change 144741 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, 06 Jul 2008 16:06:47 -0000 On Jul 5, 2008, at 7:09 PM, Takahashi Yoshihiro wrote: > In article <200807051943.m65JhHZ6066371@repoman.freebsd.org> > Marcel Moolenaar writes: > >> static struct isa_pnp_id isa_i8251_ids[] = { >> {0x0100e4a5, "RSA-98III"}, >> {0} >> }; > >> /* Probe PnP _and_ non-PnP i8251 here. */ >> if (ISA_PNP_PROBE(parent, dev, isa_i8251_ids) != ENXIO) { >> sc->sc_class = &uart_i8251_class; >> return (uart_bus_probe(dev, 0, 0, 0, 0)); >> } > > These are wrong. RSA98-III is based on ns8250 and has extended FIFO > buffer. So I think that the uart_rsa_class should be added. Oh. In your patch you define it as i8251. I only refactored the code. Also, the ns8250 class already supports extended FIFOs, so we don't need a separate class for that. I'll change it... > FYI, RSA series are not for pc98 only. > RSA-PCI (PCI) and RSA-DVII (ISA) exist but not supported yet. Ok, good to know. With the refactored code there's maximum sharing, so UART will support them on other platforms as well... -- Marcel Moolenaar xcllnt@mac.com From owner-p4-projects@FreeBSD.ORG Sun Jul 6 16:31:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5735C1065674; Sun, 6 Jul 2008 16:31:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1B47F1065684 for ; Sun, 6 Jul 2008 16:31:36 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 07B518FC12 for ; Sun, 6 Jul 2008 16:31:36 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m66GVZdD046007 for ; Sun, 6 Jul 2008 16:31:35 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m66GVZw8046005 for perforce@freebsd.org; Sun, 6 Jul 2008 16:31:35 GMT (envelope-from marcel@freebsd.org) Date: Sun, 6 Jul 2008 16:31:35 GMT Message-Id: <200807061631.m66GVZw8046005@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 144787 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, 06 Jul 2008 16:31:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=144787 Change 144787 by marcel@marcel_xcllnt on 2008/07/06 16:31:06 Add a skeletal implementation for the i8251. Doesn't do anything yet. Affected files ... .. //depot/projects/uart/conf/files#90 edit .. //depot/projects/uart/dev/uart/uart_dev_i8251.c#6 add .. //depot/projects/uart/modules/uart/Makefile#17 edit Differences ... ==== //depot/projects/uart/conf/files#90 (text+ko) ==== @@ -1260,6 +1260,8 @@ dev/uart/uart_bus_scc.c optional uart scc dev/uart/uart_core.c optional uart dev/uart/uart_dbg.c optional uart gdb +dev/uart/uart_dev_i8251.c optional uart uart_i8251 +dev/uart/uart_dev_i8251.c optional uart scc dev/uart/uart_dev_ns8250.c optional uart uart_ns8250 dev/uart/uart_dev_quicc.c optional uart quicc dev/uart/uart_dev_sab82532.c optional uart uart_sab82532 ==== //depot/projects/uart/modules/uart/Makefile#17 (text+ko) ==== @@ -11,7 +11,7 @@ SRCS= uart_bus_acpi.c ${uart_bus_ebus} uart_bus_isa.c uart_bus_pccard.c \ uart_bus_pci.c uart_bus_puc.c uart_bus_scc.c \ uart_core.c uart_dbg.c \ - uart_dev_ns8250.c uart_dev_sab82532.c uart_dev_z8530.c \ + uart_i8251.c uart_dev_ns8250.c uart_dev_sab82532.c uart_dev_z8530.c \ uart_if.c uart_if.h uart_subr.c uart_tty.c .if ${MACHINE} == "sun4v" SRCS+= uart_cpu_sparc64.c From owner-p4-projects@FreeBSD.ORG Sun Jul 6 16:33:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FB01106569A; Sun, 6 Jul 2008 16:33:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 62E6C1065672 for ; Sun, 6 Jul 2008 16:33:38 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3525E8FC18 for ; Sun, 6 Jul 2008 16:33:38 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m66GXcTE046182 for ; Sun, 6 Jul 2008 16:33:38 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m66GXc3X046180 for perforce@freebsd.org; Sun, 6 Jul 2008 16:33:38 GMT (envelope-from marcel@freebsd.org) Date: Sun, 6 Jul 2008 16:33:38 GMT Message-Id: <200807061633.m66GXc3X046180@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 144788 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, 06 Jul 2008 16:33:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=144788 Change 144788 by marcel@marcel_xcllnt on 2008/07/06 16:32:37 Use uart(4), not sio(4). Affected files ... .. //depot/projects/uart/pc98/conf/GENERIC#27 edit Differences ... ==== //depot/projects/uart/pc98/conf/GENERIC#27 (text+ko) ==== @@ -151,9 +151,7 @@ device cardbus # CardBus (32-bit) bus # Serial (COM) ports -options COM_MULTIPORT -#options COM_ESP # ESP98 -device sio # 8250, 16[45]50, 8251 based serial ports +device uart # 8250, 16[45]50, 8251 based serial ports device mse #device joy From owner-p4-projects@FreeBSD.ORG Sun Jul 6 16:39:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E740C1065676; Sun, 6 Jul 2008 16:39:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AB57C106564A for ; Sun, 6 Jul 2008 16:39:44 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 97E4A8FC12 for ; Sun, 6 Jul 2008 16:39:44 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m66Gdi5m046730 for ; Sun, 6 Jul 2008 16:39:44 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m66Gdig0046728 for perforce@freebsd.org; Sun, 6 Jul 2008 16:39:44 GMT (envelope-from marcel@freebsd.org) Date: Sun, 6 Jul 2008 16:39:44 GMT Message-Id: <200807061639.m66Gdig0046728@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 144790 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, 06 Jul 2008 16:39:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=144790 Change 144790 by marcel@marcel_xcllnt on 2008/07/06 16:39:19 Compile... Affected files ... .. //depot/projects/uart/dev/uart/uart_dev_i8251.c#7 edit .. //depot/projects/uart/modules/uart/Makefile#18 edit .. //depot/projects/uart/pc98/conf/DEFAULTS#8 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_dev_i8251.c#7 (text+ko) ==== @@ -217,7 +217,6 @@ { struct uart_bas *bas; struct uart_devinfo *di; - uint16_t st, rb; bas = &sc->sc_bas; if (sc->sc_sysdev != NULL) { @@ -303,7 +302,6 @@ { struct uart_bas *bas; int ipend; - uint16_t scce; bas = &sc->sc_bas; ipend = 0; ==== //depot/projects/uart/modules/uart/Makefile#18 (text+ko) ==== @@ -11,7 +11,8 @@ SRCS= uart_bus_acpi.c ${uart_bus_ebus} uart_bus_isa.c uart_bus_pccard.c \ uart_bus_pci.c uart_bus_puc.c uart_bus_scc.c \ uart_core.c uart_dbg.c \ - uart_i8251.c uart_dev_ns8250.c uart_dev_sab82532.c uart_dev_z8530.c \ + uart_dev_i8251.c uart_dev_ns8250.c uart_dev_sab82532.c \ + uart_dev_z8530.c \ uart_if.c uart_if.h uart_subr.c uart_tty.c .if ${MACHINE} == "sun4v" SRCS+= uart_cpu_sparc64.c ==== //depot/projects/uart/pc98/conf/DEFAULTS#8 (text+ko) ==== @@ -18,8 +18,8 @@ device io # I/O device # UART chips on this platform +device uart_i8251 device uart_ns8250 -#device uart_i8251 # Default partitioning schemes options GEOM_BSD From owner-p4-projects@FreeBSD.ORG Sun Jul 6 16:46:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C6671065675; Sun, 6 Jul 2008 16:46:52 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 40EC6106567E for ; Sun, 6 Jul 2008 16:46:52 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2D9FB8FC14 for ; Sun, 6 Jul 2008 16:46:52 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m66GkqDD047390 for ; Sun, 6 Jul 2008 16:46:52 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m66GkqSV047388 for perforce@freebsd.org; Sun, 6 Jul 2008 16:46:52 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sun, 6 Jul 2008 16:46:52 GMT Message-Id: <200807061646.m66GkqSV047388@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 144793 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, 06 Jul 2008 16:46:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=144793 Change 144793 by rpaulo@rpaulo_epsilon on 2008/07/06 16:45:54 Add a couple more variables and correct the order. Affected files ... .. //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#10 edit Differences ... ==== //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#10 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#9 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#10 $ */ #ifndef _TCPAD_H_ @@ -45,13 +45,17 @@ /* TCP internal variables, from tcpcb */ int t_state; /* TCP FSM state */ tcp_seq snd_una; - tcp_seq snd_max; tcp_seq snd_nxt; + tcp_seq snd_wnd; tcp_seq snd_up; + tcp_seq snd_wl1; + tcp_seq snd_wl2; tcp_seq iss; + + tcp_seq rcv_nxt; + tcp_seq rcv_wnd; + tcp_seq rcv_up; tcp_seq irs; - tcp_seq snd_wnd; - tcp_seq rcv_wnd; int isv6; struct dumppkth *pktshead; From owner-p4-projects@FreeBSD.ORG Sun Jul 6 16:47:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A63D41065679; Sun, 6 Jul 2008 16:47:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6A3961065673 for ; Sun, 6 Jul 2008 16:47:53 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 562BF8FC1F for ; Sun, 6 Jul 2008 16:47:53 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m66GlrpP056735 for ; Sun, 6 Jul 2008 16:47:53 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m66GlrM5056733 for perforce@freebsd.org; Sun, 6 Jul 2008 16:47:53 GMT (envelope-from julian@freebsd.org) Date: Sun, 6 Jul 2008 16:47:53 GMT Message-Id: <200807061647.m66GlrM5056733@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 144794 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, 06 Jul 2008 16:47:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=144794 Change 144794 by julian@julian_trafmon1 on 2008/07/06 16:46:59 A bit more stuff added.. e.g symmap stuff. saving before taking kids on picnic. Affected files ... .. //depot/projects/vimage/porting_to_vimage.txt#3 edit Differences ... ==== //depot/projects/vimage/porting_to_vimage.txt#3 (text+ko) ==== @@ -112,7 +112,38 @@ could rely on the current thread being a good reference for the correct virtual machine. -As an example of virtualising a dummy module named the FOO module +When a new module is defined for virtualisation. The following +structure defining macro is used to define it to the framework. + + +#define VNET_MOD_DECLARE(m_name_uc, m_name_lc, m_iattach, m_idetach, \ + m_dependson, m_symmap) \ + static const struct vnet_modinfo vnet_##m_name_lc##_modinfo = { \ + .vmi_id = VNET_MOD_##m_name_uc, \ + .vmi_dependson = VNET_MOD_##m_dependson, \ + .vmi_name = #m_name_lc, \ + .vmi_iattach = m_iattach, \ + .vmi_idetach = m_idetach, \ + .vmi_struct_size = \ + sizeof(struct vnet_##m_name_lc), \ + .vmi_symmap = m_symmap \ +The ID we allocated in the temporary first step in "Details" is +the first entry here. Eventually this should be automatically done +by module name. The DEPENDSON field tells us the order that modules +should be initialised in a new virtual machine. This may later need +to be changes to a list of text module names for dynamic calculation. +The rest of the fields are self explanatory.. +With the exception of the symmap entry. +The symmap allows us to intercept calls by libkvm to the +linker when it is looking up symbols and to redirect it +dynamically. this allows for example "netstat -r" to find the +routing tables for THIS virtual machine. (cute eh?) +(of course that won't work for core dumps). (XXX *needs thought *) + + + + +As example of virtualising a dummy module named the FOO module the following code might be added to a special vfoo.h or at least to the exisitng foo.h file: @@ -129,7 +160,7 @@ #define VNET_FOO(sym) VSYM(vnet_foo, sym) -#ifdef VIMAGE +#if (defined(VIMAGE) || defined(FUTURE)) struct vnet_foo { int _foo_counter struct foo_bar _foo_barx; @@ -158,16 +189,59 @@ #include [...] +#ifndef VIMAGE + /* initially the globals would have been here, + * and for now we will leave them here when not using VIMAGE. + * In the future we will instead have a static version of the structure. + */ +# if defined(FUTURE) + struct vnet_foo vnet_foo_globals; +# else /* !FUTURE */ + int foo_counter = 0; + struct foo_bar foo_barx = {}; +# endif /* !FUTURE */ +#endif /* !VIMAGE */ + +[...] + +#if (defined(VIMAGE) || defined(FUTURE)) static vnet_attach_fn vnet_foo_iattach; -#ifdef VIMAGE static vnet_detach_fn vnet_foo_idetach; -#endif /* VIMAGE */ +#endif +#ifdef VIMAGE +/* If we have symbols we need to divert for libkvm + * then put them in here. We may net need to do anything if + * the symbols are not used by libkvm. + */ +static struct vnet_symmap vnet_net_symmap[] = { + VNET_SYMMAP(foo, foo_counter), + VNET_SYMMAP(foo, foo_barx), + VNET_SYMMAP_END +}; +/* + * Declare our module and state that we want to be done after the + * loopback interface is initialised for the virtual machine. + */ VNET_MOD_DECLARE(FOO, foo, vnet_foo_iattach, - vnet_foo_idetach, LOIF, NULL) + vnet_foo_idetach, LOIF, vnet_foo_symmap) +#endif /* VIMAGE */ [...] +/* a pre-exisiting 'foo' function that will be converted. */ +void +foo_work(void) +{ + INIT_VNET_FOO(curvnet); /* Add this at the front */ + + V_foo_counter++; /* add "V_" to teh front */ + [...] + V_foo_barx.mumble = V_foo_counter; /* and here too */ + [...] +} + +#if (defined(VIMAGE) || defined(FUTURE)) static int vnet_foo_iattach(const void *unused) { INIT_VNET_FOO(curvnet); @@ -176,6 +250,7 @@ bzero (&V_foo_barx, sizeof (V_foo_barx)); return 0; } +#endif #ifdef VIMAGE static int vnet_foo_idetach(const void *unused) @@ -204,9 +279,13 @@ #ifdef VIMAGE /* This will do the work for each vortual machine. */ vnet_mod_register(&vnet_foo_modinfo); -#else +#else /* !VIMAGE */ +#ifdef FUTURE /* otherwise do the initialisation directly */ vnet_foo_iattach(NULL); +#else /* !FUTURE */ +/* otherwise the intialisation is done statically */ +#endif /* !FUTURE */ #endif /* !VIMAGE */ break; case MOD_UNLOAD: From owner-p4-projects@FreeBSD.ORG Sun Jul 6 21:16:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 469001065673; Sun, 6 Jul 2008 21:16:24 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0A4761065670 for ; Sun, 6 Jul 2008 21:16:24 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E96C58FC19 for ; Sun, 6 Jul 2008 21:16:23 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m66LGNL4094895 for ; Sun, 6 Jul 2008 21:16:23 GMT (envelope-from snb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m66LGNde094893 for perforce@freebsd.org; Sun, 6 Jul 2008 21:16:23 GMT (envelope-from snb@FreeBSD.org) Date: Sun, 6 Jul 2008 21:16:23 GMT Message-Id: <200807062116.m66LGNde094893@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snb@FreeBSD.org using -f From: Nick Barkas To: Perforce Change Reviews Cc: Subject: PERFORCE change 144800 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, 06 Jul 2008 21:16:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=144800 Change 144800 by snb@snb_toro on 2008/07/06 21:16:04 Upon receipt of vm_lowmem() signals, try deleting all dirhashes older than DH_RECLAIMAGE, set here to five seconds for now. If all the dirhashes are newer than this, just fall back to trying to delete the one at the beginning of ufsdirhash_list. DH_RECLAIMAGE probably will need tweaking, and so far dh_lastused is only being updated during calls to ufsdirhash_build(), ufsdirhash_lookup(), and ufsdirhash_add(). It may need to be updated when other functions are called as well. Also, I have not yet tested this code. This is a check point before I lose my network connection. Affected files ... .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/dirhash.h#2 edit .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_dirhash.c#5 edit Differences ... ==== //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/dirhash.h#2 (text+ko) ==== @@ -68,6 +68,12 @@ #define DH_SCOREINIT 8 /* initial dh_score when dirhash built */ #define DH_SCOREMAX 64 /* max dh_score value */ +/* + * If a vm_lowmem signal is received, we will try to free memory by + * deleting all hashes older than DH_RECLAIMAGE seconds. + */ +#define DH_RECLAIMAGE 5 + /* * The main hash table has 2 levels. It is an array of pointers to * blocks of DH_NBLKOFF offsets. @@ -101,6 +107,8 @@ int dh_onlist; /* true if on the ufsdirhash_list chain */ + time_t dh_lastused; /* time the dirhash was last read or written*/ + /* Protected by ufsdirhash_mtx. */ TAILQ_ENTRY(dirhash) dh_list; /* chain of all dirhashes */ }; ==== //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_dirhash.c#5 (text+ko) ==== @@ -49,6 +49,7 @@ #include #include #include +#include #include #include @@ -92,7 +93,8 @@ static int ufsdirhash_findslot(struct dirhash *dh, char *name, int namelen, doff_t offset); static doff_t ufsdirhash_getprev(struct direct *dp, doff_t offset); -static int ufsdirhash_destroy(void); +static int ufsdirhash_destroy(struct dirhash *dh); +static int ufsdirhash_destroy_first(void); static int ufsdirhash_recycle(int wanted); static void ufsdirhash_lowmem(void); static void ufsdirhash_free_locked(struct inode *ip); @@ -330,6 +332,7 @@ dh->dh_seqopt = 0; dh->dh_seqoff = 0; dh->dh_score = DH_SCOREINIT; + dh->dh_lastused = time_second; /* * Use non-blocking mallocs so that we will revert to a linear @@ -500,6 +503,9 @@ /* Update the score. */ if (dh->dh_score < DH_SCOREMAX) dh->dh_score++; + + /* Update last used time. */ + dh->dh_lastused = time_second; DIRHASHLIST_UNLOCK(); vp = ip->i_vnode; @@ -742,6 +748,9 @@ dh->dh_hused++; DH_ENTRY(dh, slot) = offset; + /* Update last used time. */ + dh->dh_lastused = time_second; + /* Update the per-block summary info. */ ufsdirhash_adjfree(dh, offset, -DIRSIZ(0, dirp)); ufsdirhash_release(dh); @@ -1081,34 +1090,17 @@ } /* - * Delete the first dirhash on the list and reclaim its memory. - * Assumes that ufsdirhash_list is locked, and leaves it locked. - * If unable to obtain a lock on the first dirhash, moves down - * the list until it can lock a dirhash and destroys it. Returns - * the amount of memory freed, or -1 if unable to find any - * dirhashes that can be destroyed. + * Delete the given dirhash and reclaim its memory. Assumes that + * ufsdirhash_list is locked, and leaves it locked. Also assumes + * that dh is locked. Returns the amount of memory freed. */ static int -ufsdirhash_destroy() +ufsdirhash_destroy(struct dirhash *dh) { - struct dirhash *dh; doff_t **hash; u_int8_t *blkfree; int i, mem, narrays; - dh = TAILQ_FIRST(&ufsdirhash_list); - if (dh == NULL) - return (-1); - - /* - * If we can't lock it it's in use and we don't want to - * destroy it anyway. Go on to the next in the list. - */ - while (lockmgr(&dh->dh_lock, LK_EXCLUSIVE | LK_NOWAIT, NULL)) { - dh = TAILQ_NEXT(dh, dh_list); - if (dh == NULL) - return (-1); - } KASSERT(dh->dh_hash != NULL, ("dirhash: NULL hash on list")); /* Remove it from the list and detach its memory. */ @@ -1132,7 +1124,7 @@ /* Account for the returned memory. */ DIRHASHLIST_LOCK(); - ufs_dirhashmem -= mem; + ufs_dirhashmem -= mem; return (mem); } @@ -1155,9 +1147,16 @@ return (-1); } - /* Try deleting a dirhash. Give up if we can't delete any. */ - if (ufsdirhash_destroy() < 0) - return (-1); + /* + * If we can't lock it it's in use and we don't want to + * recycle it anyway. + */ + if (lockmgr(&dh->dh_lock, LK_EXCLUSIVE | LK_NOWAIT, NULL)) { + dh = TAILQ_NEXT(dh, dh_list); + continue; + } + + ufsdirhash_destroy(dh); /* Repeat if necessary. */ dh = TAILQ_FIRST(&ufsdirhash_list); @@ -1172,15 +1171,35 @@ static void ufsdirhash_lowmem() { + struct dirhash *dh; + int memfreed = 0; + ufs_dirhashlowmemcount++; DIRHASHLIST_LOCK(); - if (ufs_dirhashmem > 0) - /* - * Try deleting only one dirhash for now, and don't bother - * to check if it worked. - */ - ufsdirhash_destroy(); + /* + * Delete all dirhashes not used for more than DH_RECLAIMAGE seconds. + * If we can't get a lock on the dirhash, it will be skipped. + */ + for (dh = TAILQ_FIRST(&ufsdirhash_list); dh != NULL; dh = + TAILQ_NEXT(dh, dh_list)) { + if (time_second - dh->dh_lastused > DH_RECLAIMAGE && + lockmgr(&dh->dh_lock, LK_EXCLUSIVE | LK_NOWAIT, NULL)) + memfreed += ufsdirhash_destroy(dh); + } + + /* + * If no hashes were old enough, instead try deleting a single dirhash + * from the end of the list. + */ + dh = TAILQ_FIRST(&ufsdirhash_list); + while (memfreed == 0 && dh != NULL) { + if (lockmgr(&dh->dh_lock, LK_EXCLUSIVE | LK_NOWAIT, NULL)) { + dh = TAILQ_NEXT(dh, dh_list); + continue; + } + memfreed += ufsdirhash_destroy(dh); + } DIRHASHLIST_UNLOCK(); } From owner-p4-projects@FreeBSD.ORG Mon Jul 7 02:20:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 93CD61065671; Mon, 7 Jul 2008 02:20:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3FD37106564A for ; Mon, 7 Jul 2008 02:20:31 +0000 (UTC) (envelope-from alepulver@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2AE0B8FC12 for ; Mon, 7 Jul 2008 02:20:31 +0000 (UTC) (envelope-from alepulver@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m672KV7K036452 for ; Mon, 7 Jul 2008 02:20:31 GMT (envelope-from alepulver@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m672KVjW036450 for perforce@freebsd.org; Mon, 7 Jul 2008 02:20:31 GMT (envelope-from alepulver@freebsd.org) Date: Mon, 7 Jul 2008 02:20:31 GMT Message-Id: <200807070220.m672KVjW036450@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alepulver@freebsd.org using -f From: Alejandro Pulver To: Perforce Change Reviews Cc: Subject: PERFORCE change 144806 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, 07 Jul 2008 02:20:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=144806 Change 144806 by alepulver@alepulver_deimos on 2008/07/07 02:20:06 Initial working version plus test port. Affected files ... .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/README#1 add .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.fpc.mk#1 branch .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gcc.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gecko.mk#1 branch .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gnome.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gnustep.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.licenses.mk#1 add .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.port.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.ruby.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.sites.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/test-license-1/Makefile#1 add .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/test-license-1/distinfo#1 add .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/test-license-1/pkg-descr#1 add .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/test-license-1/pkg-plist#1 add Differences ... ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gcc.mk#2 (text+ko) ==== @@ -31,7 +31,7 @@ # If you are wondering what your port exactly does, use "make test-gcc" # to see some debugging. # -# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.16 2008/05/05 23:26:30 gerald Exp $ +# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.17 2008/06/28 16:52:40 gerald Exp $ # GCC_Include_MAINTAINER= gerald@FreeBSD.org @@ -99,7 +99,9 @@ MAKE_ENV+= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" .endif + .if defined(USE_GCC) + # See if we can use a later version _USE_GCC:= ${USE_GCC:S/+//} .if ${USE_GCC} != ${_USE_GCC} @@ -190,21 +192,25 @@ .endfor .undef V - .if defined(_GCC_BUILD_DEPENDS) BUILD_DEPENDS+= ${_GCC_PORT_DEPENDS}:${PORTSDIR}/lang/${_GCC_BUILD_DEPENDS} .endif MAKE_ENV+= CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" +.endif +# defined(USE_GCC) + + test-gcc: @echo USE_GCC=${USE_GCC} + @echo USE_FORTRAN=${USE_FORTRAN} +.if defined(USE_GCC) .if defined(_GCC_ORLATER) @echo Port can use later versions. .else @echo Port cannot use later versions. .endif - @echo USE_FORTRAN=${USE_FORTRAN} .for v in ${GCCVERSIONS} @echo -n "GCC version: ${_GCCVERSION_${v}_V} " .if defined(_GCC_FOUND${v}) @@ -214,7 +220,7 @@ # @echo ${v} - ${_GCC_FOUND${v}} - ${_GCCVERSION_${v}_L} to ${_GCCVERSION_${v}_R} - ${_GCCVERSION_${v}_V} .endfor @echo Using GCC version ${_USE_GCC} +.endif @echo CC=${CC} - CXX=${CXX} - CFLAGS=${CFLAGS} @echo F77=${F77} - FC=${FC} - FFLAGS=${FFLAGS} @echo BUILD_DEPENDS=${BUILD_DEPENDS} -.endif ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gnome.mk#2 (text+ko) ==== @@ -1,9 +1,9 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.147 2008/05/29 16:34:11 mezz Exp $ +# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.148 2008/06/30 20:16:17 mezz Exp $ # $NetBSD: $ -# $MCom: ports/Mk/bsd.gnome.mk,v 1.447 2008/03/12 03:42:31 marcus Exp $ +# $MCom: ports-stable/Mk/bsd.gnome.mk,v 1.8 2008/06/16 21:35:56 mezz Exp $ # # Please view me with 4 column tabs! @@ -645,7 +645,7 @@ # Also, check to see if each component has a desktop requirement. If it does, # and if the user's chosen desktop is not of the same version, mark the # port as IGNORE. -. for component in ${USE_GNOME} +. for component in ${USE_GNOME:C/^([^:]+).*/\1/} . if defined(GNOME_DESKTOP_VERSION) && \ defined(${component}_GNOME_DESKTOP_VERSION) . if ${GNOME_DESKTOP_VERSION}!=${${component}_GNOME_DESKTOP_VERSION} @@ -677,16 +677,21 @@ ${PATCH_WRKSRC}/$$file; \ done; .else -. if ${USE_GNOME:Mltverhack}!="" || ${USE_GNOME:Mltasneededhack}!="" +. if ${USE_GNOME:Mltverhack*}!="" || ${USE_GNOME:Mltasneededhack}!="" IGNORE= cannot install: ${PORTNAME} uses the ltverhack and/or ltasneededhack GNOME components but does not use libtool . endif .endif +.if ${USE_GNOME:Mltverhack\:*:C/^[^:]+:([^:]+).*/\1/}=="" +ltverhack_LIB_VERSION= major=.`expr $$current - $$age` +.else +ltverhack_LIB_VERSION= major=".${USE_GNOME:Mltverhack\:*:C/^[^:]+:([^:]+).*/\1/}" +.endif ltverhack_PATCH_DEPENDS=${LIBTOOL_DEPENDS} ltverhack_PRE_PATCH= for file in gnome-ltmain.sh gnome-libtool; do \ if [ -f ${WRKDIR}/$$file ]; then \ ${REINPLACE_CMD} -e \ - '/freebsd-elf)/,/;;/ s|major="\.$$current"|major=.`expr $$current - $$age`|; \ + '/freebsd-elf)/,/;;/ s|major="\.$$current"|${ltverhack_LIB_VERSION}|; \ /freebsd-elf)/,/;;/ s|versuffix="\.$$current"|versuffix="$$major"|' \ ${WRKDIR}/$$file; \ fi; \ @@ -703,9 +708,9 @@ # Then traverse through all components, check which of them # exist in ${_USE_GNOME} and set variables accordingly .ifdef _USE_GNOME -. if ${USE_GNOME:Mltverhack}!= "" || ${USE_GNOME:Mltasneededhack}!= "" +. if ${USE_GNOME:Mltverhack*}!= "" || ${USE_GNOME:Mltasneededhack}!= "" GNOME_PRE_PATCH+= ${lthacks_PRE_PATCH} -.endif +. endif . for component in ${_USE_GNOME_ALL} . if ${_USE_GNOME:M${component}}!="" PATCH_DEPENDS+= ${${component}_PATCH_DEPENDS} ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gnustep.mk#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.49 2008/05/04 21:13:21 dinoex Exp $ +# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.50 2008/06/20 15:13:50 dinoex Exp $ # # This file contains some variable definitions that are supposed to # make your life easier when dealing with ports related to the GNUstep. @@ -266,7 +266,7 @@ # .if defined(USE_GNUSTEP_BACK) .if defined(WITH_GNUSTEP_DEVEL) -BACKSUFFIX?= -013 +BACKSUFFIX?= -014 .else BACKSUFFIX?= -012 .endif ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.port.mk#2 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.port.mk,v 1.593 2008/05/27 22:12:02 miwi Exp $ +# $FreeBSD: ports/Mk/bsd.port.mk,v 1.595 2008/06/30 20:16:17 mezz Exp $ # $NetBSD: $ # # bsd.port.mk - 940820 Jordan K. Hubbard. @@ -423,6 +423,9 @@ # USE_EFL - If set, this port use EFL libraries. # Implies inclusion of bsd.efl.mk. (Also see # that file for more information on USE_EFL_*). +# USE_FPC - If set, this port relies on the Free Pascal language. +# Implies inclusion of bsd.fpc.mk. (Also see +# that file for more information on WANT_FPC_*). # USE_JAVA - If set, this port relies on the Java language. # Implies inclusion of bsd.java.mk. (Also see # that file for more information on USE_JAVA_*). @@ -441,6 +444,9 @@ # (Also see that file for more information on # USE_GNUSTEP_*). ## +# USE_GECKO - If set, this port uses the Gecko/Mozilla product. +# See bsd.gecko.mk for more details. +## # USE_GNOME - A list of the Gnome dependencies the port has (e.g., # glib12, gtk12). Implies that the port needs Gnome. # Implies inclusion of bsd.gnome.mk. See bsd.gnome.mk @@ -1462,6 +1468,10 @@ .include "${PORTSDIR}/Mk/bsd.efl.mk" .endif +.if defined(USE_FPC) || defined(WANT_FPC_BASE) || defined(WANT_FPC_ALL) +.include "${PORTSDIR}/Mk/bsd.fpc.mk" +.endif + .if defined(USE_JAVA) .include "${PORTSDIR}/Mk/bsd.java.mk" .endif @@ -1490,6 +1500,10 @@ .include "${PORTSDIR}/Mk/bsd.qt.mk" .endif +.if defined(WANT_GECKO) || defined(USE_GECKO) +.include "${PORTSDIR}/Mk/bsd.gecko.mk" +.endif + .if defined(WANT_GNOME) || defined(USE_GNOME) || defined(USE_GTK) .include "${PORTSDIR}/Mk/bsd.gnome.mk" .endif @@ -1999,6 +2013,10 @@ .include "${PORTSDIR}/Mk/bsd.autotools.mk" .endif +.if defined(WANT_GECKO) || defined(USE_GECKO) +.include "${PORTSDIR}/Mk/bsd.gecko.mk" +.endif + .if defined(WANT_GNOME) || defined(USE_GNOME) || defined(USE_GTK) .include "${PORTSDIR}/Mk/bsd.gnome.mk" .endif @@ -2335,6 +2353,9 @@ ALL_TARGET?= all INSTALL_TARGET?= install +# Integrate with the license auditing framework +.include "${PORTSDIR}/Mk/bsd.licenses.mk" + # Popular master sites .include "bsd.sites.mk" @@ -4064,15 +4085,15 @@ .endif _SANITY_SEQ= ${_CHROOT_SEQ} pre-everything check-makefile check-categories \ check-makevars check-desktop-entries check-depends \ - check-deprecated check-vulnerable buildanyway-message \ - options-message + check-deprecated check-vulnerable check-license \ + buildanyway-message options-message _FETCH_DEP= check-sanity _FETCH_SEQ= fetch-depends pre-fetch pre-fetch-script \ do-fetch post-fetch post-fetch-script _EXTRACT_DEP= fetch _EXTRACT_SEQ= extract-message checksum extract-depends pre-extract \ pre-extract-script do-extract \ - post-extract post-extract-script + post-extract post-extract-script ask-license _PATCH_DEP= extract _PATCH_SEQ= patch-message patch-depends patch-dos2unix pre-patch \ pre-patch-script do-patch post-patch post-patch-script @@ -4089,7 +4110,7 @@ pre-install-script generate-plist check-already-installed _INSTALL_SUSEQ= check-umask install-mtree pre-su-install \ pre-su-install-script do-install install-desktop-entries \ - post-install post-install-script add-plist-info \ + install-license post-install post-install-script add-plist-info \ add-plist-docs add-plist-examples add-plist-data \ add-plist-post install-rc-script compress-man \ install-ldconfig-file fake-pkg security-check @@ -5727,6 +5748,9 @@ ${CAT} /tmp/${PKGNAME}-required-by >> ${PKG_DBDIR}/${PKGNAME}/+REQUIRED_BY; \ ${RM} -f /tmp/${PKGNAME}-required-by; \ fi +.if defined(REGISTER_LICENSE) +# XXX concat prepared file to +CONTENTS (or directly use .if exists()) +.endif .else @${DO_NADA} .endif ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.ruby.mk#2 (text+ko) ==== @@ -3,7 +3,7 @@ # # Created by: Akinori MUSHA # -# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.168 2008/04/06 10:29:53 stas Exp $ +# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.170 2008/06/25 23:00:27 stas Exp $ # .if !defined(Ruby_Include) @@ -167,7 +167,7 @@ # Ruby 1.8 # RUBY_RELVERSION= 1.8.6 -RUBY_PORTREVISION= 2 +RUBY_PORTREVISION= 4 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 111 ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.sites.mk#2 (text+ko) ==== @@ -20,7 +20,7 @@ # # Note: all entries should terminate with a slash. # -# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.451 2008/06/02 07:42:56 itetcu Exp $ +# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.453 2008/06/23 12:18:35 tdb Exp $ # # Where to put distfiles that don't have any other master site @@ -1184,9 +1184,9 @@ # List: http://dl.sv.gnu.org/releases/00_MIRRORS.html .if !defined(IGNORE_MASTER_SITE_SAVANNAH) MASTER_SITE_SAVANNAH+= \ - http://download.savannah.nongnu.org/releases/%SUBDIR%/ \ - http://www.de-mirrors.de/nongnu/%SUBDIR%/ \ + http://download.savannah.gnu.org/releases/%SUBDIR%/ \ http://ftp.cc.uoc.gr/mirrors/nongnu.org/%SUBDIR%/ \ + http://www.very-clever.com/download/nongnu/%SUBDIR%/ \ http://ftp.twaren.net/Unix/NonGNU/%SUBDIR%/ \ ftp://ftp.cc.uoc.gr/mirrors/nongnu.org/%SUBDIR%/ \ ftp://ftp.twaren.net/Unix/NonGNU/%SUBDIR%/ @@ -1306,8 +1306,6 @@ http://ftp.isu.edu.tw/pub/Linux/SuSE/%SUBDIR%/ \ ftp://ftp.mirrorservice.org/sites/ftp.suse.com/pub/suse/%SUBDIR%/ \ http://www.mirrorservice.org/sites/ftp.suse.com/pub/suse/%SUBDIR%/ \ - ftp://ftp.mirror.ac.uk/sites/ftp.suse.com/%SUBDIR%/ \ - http://download.mirror.ac.uk/sites/ftp.suse.com/%SUBDIR%/ \ ftp://ftp.kde.org/pub/suse/ftp.suse.com/suse/%SUBDIR%/ \ ftp://ftp.suse.com/pub/suse/%SUBDIR%/ \ ftp://ftp.softnet.tuc.gr/pub/linux/suse/suse/%SUBDIR%/ \ From owner-p4-projects@FreeBSD.ORG Mon Jul 7 08:43:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C09421065684; Mon, 7 Jul 2008 08:43:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8315E106567B; Mon, 7 Jul 2008 08:43:18 +0000 (UTC) (envelope-from nyan@jp.FreeBSD.org) Received: from watery.cc.kogakuin.ac.jp (watery.cc.kogakuin.ac.jp [133.80.152.80]) by mx1.freebsd.org (Postfix) with ESMTP id 37D9E8FC1B; Mon, 7 Jul 2008 08:43:18 +0000 (UTC) (envelope-from nyan@jp.FreeBSD.org) Received: from localhost (localhost [IPv6:::1]) by watery.cc.kogakuin.ac.jp (unknown) with ESMTP id m678hGNq023524; Mon, 7 Jul 2008 17:43:16 +0900 (JST) (envelope-from nyan@jp.FreeBSD.org) Date: Mon, 07 Jul 2008 17:42:08 +0900 (JST) Message-Id: <20080707.174208.94913728.nyan@jp.FreeBSD.org> To: xcllnt@mac.com From: Takahashi Yoshihiro In-Reply-To: References: <200807051943.m65JhHZ6066371@repoman.freebsd.org> <20080706.110943.226722229.nyan@jp.FreeBSD.org> X-Mailer: Mew version 6.1 on Emacs 22.2 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: marcel@freebsd.org, perforce@freebsd.org Subject: Re: PERFORCE change 144741 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, 07 Jul 2008 08:43:19 -0000 In article Marcel Moolenaar writes: > > These are wrong. RSA98-III is based on ns8250 and has extended FIFO > > buffer. So I think that the uart_rsa_class should be added. > > Oh. In your patch you define it as i8251. I only refactored > the code. Also, the ns8250 class already supports extended > FIFOs, so we don't need a separate class for that. I'll > change it... No. My code set sc_class to uart_rsa_class. It's your mistake. And then I found another problem in uart_bus_isa.c. In your code non-PnP devices for pc98 cannot probe. My original code was no problem... And, RSA has extra registers to control its FIFO buffer. So we need additional code to support it. See: sys/dev/ic/rsa.h and sys/pc98/cbus/sio.c --- TAKAHASHI Yoshihiro From owner-p4-projects@FreeBSD.ORG Mon Jul 7 08:44:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 952EF1065678; Mon, 7 Jul 2008 08:44:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3FD661065676 for ; Mon, 7 Jul 2008 08:44:59 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2B1C48FC27 for ; Mon, 7 Jul 2008 08:44:59 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m678ixAr085678 for ; Mon, 7 Jul 2008 08:44:59 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m678iwZT085676 for perforce@freebsd.org; Mon, 7 Jul 2008 08:44:58 GMT (envelope-from jb@freebsd.org) Date: Mon, 7 Jul 2008 08:44:58 GMT Message-Id: <200807070844.m678iwZT085676@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 144809 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, 07 Jul 2008 08:44:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=144809 Change 144809 by jb@freebsd3 on 2008/07/07 08:44:49 IF7 Affected files ... .. //depot/projects/dtrace7/src/contrib/gdtoa/gethex.c#2 integrate .. //depot/projects/dtrace7/src/etc/devd.conf#2 integrate .. //depot/projects/dtrace7/src/etc/periodic/security/800.loginfail#2 integrate .. //depot/projects/dtrace7/src/lib/libc/stdlib/system.3#2 integrate .. //depot/projects/dtrace7/src/lib/libc/sys/mkdir.2#3 integrate .. //depot/projects/dtrace7/src/sbin/devfs/devfs.8#2 integrate .. //depot/projects/dtrace7/src/sbin/mdconfig/mdconfig.8#3 integrate .. //depot/projects/dtrace7/src/sbin/mdconfig/mdconfig.c#3 integrate .. //depot/projects/dtrace7/src/share/man/man4/Makefile#8 integrate .. //depot/projects/dtrace7/src/share/man/man4/auditpipe.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/k8temp.4#1 branch .. //depot/projects/dtrace7/src/share/man/man4/snd_emu10kx.4#2 integrate .. //depot/projects/dtrace7/src/sys/amd64/conf/GENERIC#8 integrate .. //depot/projects/dtrace7/src/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/dtrace7/src/sys/amd64/include/vmparam.h#2 integrate .. //depot/projects/dtrace7/src/sys/conf/NOTES#7 integrate .. //depot/projects/dtrace7/src/sys/conf/files#14 integrate .. //depot/projects/dtrace7/src/sys/conf/files.amd64#6 integrate .. //depot/projects/dtrace7/src/sys/ddb/db_capture.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/aac/aac.c#6 integrate .. //depot/projects/dtrace7/src/sys/dev/aac/aac_disk.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/acpi_support/acpi_asus.c#4 integrate .. //depot/projects/dtrace7/src/sys/dev/et/if_et.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/et/if_etreg.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/et/if_etvar.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/k8temp/k8temp.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/mii/miidevs#5 integrate .. //depot/projects/dtrace7/src/sys/dev/mii/truephy.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/mii/truephyreg.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/dtrace7/src/sys/dev/usb/uscanner.c#3 integrate .. //depot/projects/dtrace7/src/sys/fs/fdescfs/fdesc.h#2 integrate .. //depot/projects/dtrace7/src/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate .. //depot/projects/dtrace7/src/sys/fs/fdescfs/fdesc_vnops.c#2 integrate .. //depot/projects/dtrace7/src/sys/fs/nwfs/nwfs_node.c#2 integrate .. //depot/projects/dtrace7/src/sys/fs/smbfs/smbfs.h#2 integrate .. //depot/projects/dtrace7/src/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/dtrace7/src/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/dtrace7/src/sys/i386/conf/GENERIC#7 integrate .. //depot/projects/dtrace7/src/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/dtrace7/src/sys/modules/Makefile#15 integrate .. //depot/projects/dtrace7/src/sys/modules/et/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/modules/k8temp/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/modules/mii/Makefile#4 integrate .. //depot/projects/dtrace7/src/sys/netinet/ip_dummynet.c#4 integrate .. //depot/projects/dtrace7/src/sys/netinet/raw_ip.c#2 integrate .. //depot/projects/dtrace7/src/sys/netipx/spx_usrreq.c#2 integrate .. //depot/projects/dtrace7/src/sys/pci/viapm.c#2 integrate .. //depot/projects/dtrace7/src/sys/security/audit/audit.h#3 integrate .. //depot/projects/dtrace7/src/sys/security/audit/audit_worker.c#5 integrate .. //depot/projects/dtrace7/src/sys/sparc64/include/in_cksum.h#2 integrate .. //depot/projects/dtrace7/src/sys/sun4v/include/in_cksum.h#2 integrate .. //depot/projects/dtrace7/src/sys/ufs/ufs/extattr.h#2 integrate .. //depot/projects/dtrace7/src/sys/ufs/ufs/ufs_extattr.c#3 integrate .. //depot/projects/dtrace7/src/usr.bin/su/su.1#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/mountd/exports.5#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/wpa/wpa_supplicant/Makefile#5 integrate .. //depot/projects/dtrace7/src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#2 integrate Differences ... ==== //depot/projects/dtrace7/src/contrib/gdtoa/gethex.c#2 (text+ko) ==== @@ -113,8 +113,11 @@ e += e1; } *sp = (char*)s; - if (zret) - return havedig ? STRTOG_Zero : STRTOG_NoNumber; + if (zret) { + if (!havedig) + *sp = s0 - 1; + return STRTOG_Zero; + } n = s1 - s0 - 1; for(k = 0; n > 7; n >>= 1) k++; ==== //depot/projects/dtrace7/src/etc/devd.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.38 2007/06/21 22:50:36 njl Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.38.2.1 2008/07/01 21:36:03 rpaulo Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -252,6 +252,28 @@ action "/etc/rc.resume acpi $notify"; }; +# The next blocks enable volume hotkeys that can be found on the Asus EeePC +notify 0 { + match "system" "ACPI"; + match "subsystem" "ASUS-Eee"; + match "notify" "0x13"; + action "mixer 0"; +}; + +notify 0 { + match "system" "ACPI"; + match "subsystem" "ASUS-Eee"; + match "notify" "0x14"; + action "mixer vol -10"; +}; + +notify 0 { + match "system" "ACPI"; + match "subsystem" "ASUS-Eee"; + match "notify" "0x15"; + action "mixer vol +10"; +}; + /* EXAMPLES TO END OF FILE # The following might be an example of something that a vendor might ==== //depot/projects/dtrace7/src/etc/periodic/security/800.loginfail#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/800.loginfail,v 1.8 2007/02/23 21:42:54 remko Exp $ +# $FreeBSD: src/etc/periodic/security/800.loginfail,v 1.8.2.1 2008/07/06 10:21:12 mtm Exp $ # # Show login failures @@ -59,7 +59,7 @@ [Yy][Ee][Ss]) echo "" echo "${host} login failures:" - n=$(catmsgs | egrep -ia "^$yesterday.*: .* (fail|invalid|bad|illegal)" | + n=$(catmsgs | egrep -ia "^$yesterday.*: .*(fail|invalid|bad|illegal)" | tee /dev/stderr | wc -l) [ $n -gt 0 ] && rc=1 || rc=0;; *) rc=0;; ==== //depot/projects/dtrace7/src/lib/libc/stdlib/system.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)system.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdlib/system.3,v 1.12 2007/01/09 00:28:10 imp Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/system.3,v 1.12.2.1 2008/06/30 09:16:22 danger Exp $ .\" .Dd June 4, 1993 .Dt SYSTEM 3 @@ -70,7 +70,7 @@ will return non-zero if the command interpreter .Xr sh 1 is available, and zero if it is not. -.Pp +.Sh RETURN VALUES The .Fn system function ==== //depot/projects/dtrace7/src/lib/libc/sys/mkdir.2#3 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mkdir.2 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/sys/mkdir.2,v 1.24.2.1 2008/04/30 23:32:12 scf Exp $ +.\" $FreeBSD: src/lib/libc/sys/mkdir.2,v 1.24.2.2 2008/06/30 09:06:19 danger Exp $ .\" -.Dd December 9, 2006 +.Dd June 26, 2008 .Dt MKDIR 2 .Os .Sh NAME @@ -80,6 +80,9 @@ manual page for more information. .It Bq Er EROFS The named directory would reside on a read-only file system. +.It Bq Er EMLINK +The new directory cannot be created because the parent directory contains +too many subdirectories. .It Bq Er EEXIST The named file exists. .It Bq Er ENOSPC ==== //depot/projects/dtrace7/src/sbin/devfs/devfs.8#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/devfs/devfs.8,v 1.18 2006/12/29 22:45:12 danger Exp $ +.\" $FreeBSD: src/sbin/devfs/devfs.8,v 1.18.2.1 2008/07/02 13:03:08 mtm Exp $ .\" -.Dd November 5, 2006 +.Dd July 1, 2008 .Dt DEVFS 8 .Os .Sh NAME @@ -312,7 +312,7 @@ .Xr snp 4 devices. .Pp -.Dl "devfs rule -s 20 add major 53 group games" +.Dl "devfs rule -s 20 add type disk group wheel" .Pp Add a rule to ruleset number 20. Since this ruleset is not the current ruleset for any mount-points, ==== //depot/projects/dtrace7/src/sbin/mdconfig/mdconfig.8#3 (text+ko) ==== @@ -39,9 +39,9 @@ .\" @(#)vnconfig.8 8.1 (Berkeley) 6/5/93 .\" from: src/usr.sbin/vnconfig/vnconfig.8,v 1.19 2000/12/27 15:30:29 .\" -.\" $FreeBSD: src/sbin/mdconfig/mdconfig.8,v 1.37.2.1 2007/12/02 08:47:28 remko Exp $ +.\" $FreeBSD: src/sbin/mdconfig/mdconfig.8,v 1.37.2.2 2008/07/05 08:14:04 marck Exp $ .\" -.Dd November 28, 2007 +.Dd July 5, 2008 .Dt MDCONFIG 8 .Os .Sh NAME @@ -65,6 +65,7 @@ .Nm .Fl l .Op Fl n +.Op Fl v .Op Fl u Ar unit .Sh DESCRIPTION The @@ -119,6 +120,9 @@ If given with .Fl u , display details about that particular device. +If +.Fl v +option specified, show all details. .It Fl n When printing md device names, print only the unit number without the md prefix. ==== //depot/projects/dtrace7/src/sbin/mdconfig/mdconfig.c#3 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sbin/mdconfig/mdconfig.c,v 1.54.2.1 2007/12/06 11:54:36 flz Exp $ + * $FreeBSD: src/sbin/mdconfig/mdconfig.c,v 1.54.2.2 2008/07/05 08:14:04 marck Exp $ * */ #include @@ -59,7 +59,7 @@ " [-s size] [-S sectorsize] [-u unit]\n" " [-x sectors/track] [-y heads/cyl]\n" " mdconfig -d -u unit\n" -" mdconfig -l [-n] [-u unit]\n"); +" mdconfig -l [-v] [-n] [-u unit]\n"); fprintf(stderr, "\t\ttype = {malloc, preload, vnode, swap}\n"); fprintf(stderr, "\t\toption = {cluster, compress, reserve}\n"); fprintf(stderr, "\t\tsize = %%d (512 byte blocks), %%db (B),\n"); @@ -71,7 +71,7 @@ int main(int argc, char **argv) { - int ch, fd, i; + int ch, fd, i, vflag; char *p; int cmdline = 0; char *mdunit; @@ -80,9 +80,10 @@ mdio.md_file = malloc(PATH_MAX); if (mdio.md_file == NULL) err(1, "could not allocate memory"); + vflag = 0; bzero(mdio.md_file, PATH_MAX); for (;;) { - ch = getopt(argc, argv, "ab:df:lno:s:S:t:u:x:y:"); + ch = getopt(argc, argv, "ab:df:lno:s:S:t:u:vx:y:"); if (ch == -1) break; switch (ch) { @@ -237,6 +238,11 @@ mdunit = optarg; mdio.md_options &= ~MD_AUTOUNIT; break; + case 'v': + if (cmdline != 3) + usage(); + vflag = OPT_VERBOSE; + break; case 'x': if (cmdline != 2) usage(); @@ -282,7 +288,7 @@ * Listing all devices. This is why we pass NULL * together with OPT_LIST. */ - md_list(NULL, OPT_LIST); + md_list(NULL, OPT_LIST | vflag); } else { return (md_query(mdunit)); } @@ -373,13 +379,13 @@ } } opt |= OPT_DONE; - if (opt & OPT_LIST) + if ((opt & OPT_LIST) && !(opt & OPT_VERBOSE)) printf(" "); else printf("\n"); } } - if ((opt & OPT_LIST) && (opt & OPT_DONE)) + if ((opt & OPT_LIST) && (opt & OPT_DONE) && !(opt & OPT_VERBOSE)) printf("\n"); /* XXX: Check if it's enough to clean everything. */ geom_stats_snapshot_free(sq); ==== //depot/projects/dtrace7/src/share/man/man4/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.393.2.11 2008/05/09 02:23:11 weongyo Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.393.2.12 2008/07/06 16:24:50 rpaulo Exp $ MAN= aac.4 \ acpi.4 \ @@ -138,6 +138,7 @@ iwi.4 \ ixgb.4 \ joy.4 \ + k8temp.4 \ kbdmux.4 \ keyboard.4 \ kld.4 \ ==== //depot/projects/dtrace7/src/share/man/man4/auditpipe.4#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/auditpipe.4,v 1.5 2006/12/14 16:40:57 mpp Exp $ +.\" $FreeBSD: src/share/man/man4/auditpipe.4,v 1.5.2.1 2008/06/30 18:35:11 rwatson Exp $ .\" .Dd May 5, 2006 .Os @@ -185,7 +185,7 @@ .It Dv AUDITPIPE_GET_PRESELECT_AUID Query the current preselection masks for a specific auid on the pipe. The ioctl argument should be of type -.Vt "struct auditpipe_preselect" . +.Vt "struct auditpipe_ioctl_preselect" . The auid to query is specified via the .Va ap_auid field of type ==== //depot/projects/dtrace7/src/share/man/man4/snd_emu10kx.4#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/snd_emu10kx.4,v 1.5 2007/09/12 07:43:43 ariff Exp $ +.\" $FreeBSD: src/share/man/man4/snd_emu10kx.4,v 1.5.2.1 2008/07/06 11:08:50 danger Exp $ .\" -.Dd July 15, 2007 +.Dd May 28, 2008 .Dt SND_EMU10KX 4 .Os .Sh NAME @@ -61,7 +61,7 @@ .Sx MULTICHANNEL PLAYBACK for details), and MPU401-compatible MIDI I/O controller, which is accessible through the midi device. -Wave table synthesizer is not supported. +Wave table synthesizer support is not available. .Sh HARDWARE The .Nm @@ -90,7 +90,7 @@ .Nm driver does .Em not -support the following sound cards (although they are named +support the following sound cards (although they have names similar to some supported ones): .Pp .Bl -bullet -compact @@ -110,25 +110,29 @@ All Creative X-Fi series sound cards. .El .Sh MULTICHANNEL PLAYBACK -By default driver is loaded with multichannel playback capabilities enabled. +By default the +.Nm +driver is loaded with multichannel playback capabilities enabled. If you do not set the .Dv hint.emu10kx.0.multichannel_disabled option in your .Xr loader.conf 5 -configuration file you will get up to -five DSP devices, one for each sound card output. +configuration file you will get up to five DSP devices, one for each +sound card output. You can use additional software (like .Em audio/pulseaudio from -.Em The Ports Collection -) to do sound stream demultiplexing. +.Em The Ports Collection ) +to do sound stream demultiplexing. Only .Dq FRONT output can play and record sound from external sources (like line or S/PDIF inputs). .Sh MULTICHANNEL RECORDING By default multichannel recording capabilities are not enabled when you load -this driver. +the +.Nm +driver. If you enable the .Dv hint.emu10kx.0.multichannel_recording option in @@ -136,14 +140,14 @@ you will get one more DSP device that is rate-locked to 48kHz/16bit/mono. This is actually 48kHz/16bit/32 channels on SB Live! cards and 48kHz/16bit/64channels on Audigy cards, but the current implementation of -sound subsystem does not support such an amount of PCM channels. +the sound subsystem does not support such an amount of PCM channels. This device can not be opened for read, thus confusing many applications. .Pp -Within multichannel stream first half (0-15 or 0-31) is a copy of all DSP -outputs, second half (15-30 or 32-63) is a copy of some DSP inputs. -On Live! cards the last substream (31) is used as a sync stream and always +Within a multichannel stream, the first half (0-15 or 0-31) is a copy of all DSP +outputs, the second half (15-30 or 32-63) is a copy of some DSP inputs. +On Live! cards the last substream (31) is used as a sync stream and is always set to 0xc0de. -Audigy cards do not need such sync data, because stream always start with +Audigy cards do not need such sync data, because a stream always starts with substream 0. .Ss SB Live! substream map (in byte offsets, each substream is 2 bytes LE) .Bl -tag -width ".Dv +0x00..+0x1E" @@ -183,19 +187,20 @@ some DSP-based mixer controls. .Bl -inset .It Qq vol -mixer control is overall sound volume. +mixer control for the overall sound volume. .It Qq pcm -mixer control is PCM playback volume. +mixer control for the PCM playback volume. It controls only front output volume in multichannel mode and all output volume in single channel mode. .It Qq rec -mixer control acts very different on EMU10K1 and other cards. +mixer control acts very differently on EMU10K1 and other cards. On EMU10K1 cards it controls the AC97 codec recording level. -On non-EMU10K1 cards it controls the amount of AC97 "stereo mix" entering -the DSP. +On non-EMU10K1 cards it controls the amount of AC97 +.Dq stereo mix + entering the DSP. AC97 recording level and AC97 recording source are fixed on CA0100, CA0101, CA0102 and CA0108 cards. -AC97 recording level are always set to maximum and recording source is always +The AC97 recording levels are always set to maximum and recording source is always .Dq Li "stereo mix" . .It Qq dig1 is a CD S/PDIF (on-card) volume control @@ -210,26 +215,27 @@ is AudigyDrive "AUX In 2" volume control .El .Pp -Other OSS mixer controls control inputs of AC97 codec. +Other OSS mixer controls control the inputs of the AC97 codec. .Sh PRIVATE DEVICE CONTROLS -You can control some of EMU10Kx operation and configuration parameters through +You can control some of EMU10Kx's operation and configuration parameters through .Va dev.emu10kx. Ns Aq Ar X sysctls. These .Xr sysctl 8 -values are temporary and should not be relied -upon. +values are temporary and should not be relied upon. .Sh DRIVER CONFIGURATION Loader tunables are used to set driver configuration. Tunables can be set at the .Xr loader 8 prompt before booting the kernel or they can be stored in .Pa /boot/loader.conf . -These tunables can't be changed from a maching +These tunables cannot be changed from a machine .Xr sysctl 8 entry after boot, but you can change them using .Xr kenv 1 -while the driver is not loaded. +before loading the +.Nm +driver. .Bl -tag -width indent .It Va hint.emu10kx. Ns Ao Ar X Ac Ns Va .disabled Disables loading a driver instance. @@ -285,7 +291,7 @@ S/PDIF is not connected and S/PDIF volume is not zero. .Pp The PCM driver cannot detect the presence of Live!Drive or AudigyDrive -breakout boxes and tries to use them (and list their connectors in the +breakout boxes and tries to use them (and list their connectors in the mixer). .Pp The MIDI driver cannot detect the presence of Live!Drive or AudigyDrive ==== //depot/projects/dtrace7/src/sys/amd64/conf/GENERIC#8 (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.484.2.7 2008/04/10 22:09:21 rwatson Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.484.2.8 2008/07/04 01:29:12 delphij Exp $ cpu HAMMER ident GENERIC @@ -197,6 +197,7 @@ device bfe # Broadcom BCM440x 10/100 Ethernet device bge # Broadcom BCM570xx Gigabit Ethernet device dc # DEC/Intel 21143 and various workalikes +device et # Agere ET1310 10/100/Gigabit Ethernet device fxp # Intel EtherExpress PRO/100B (82557, 82558) device lge # Level 1 LXT1001 gigabit Ethernet device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet ==== //depot/projects/dtrace7/src/sys/amd64/conf/NOTES#5 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.69.2.4 2008/02/03 07:28:37 scottl Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.69.2.5 2008/07/06 16:24:50 rpaulo Exp $ # # @@ -455,8 +455,10 @@ # Temperature sensors: # # coretemp: on-die sensor on Intel Core and newer CPUs +# k8temp: on-die sensor on AMD K8 CPUs # device coretemp +device k8temp #--------------------------------------------------------------------------- # ISDN4BSD ==== //depot/projects/dtrace7/src/sys/amd64/include/vmparam.h#2 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.49 2007/09/25 06:25:04 alc Exp $ + * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.49.2.1 2008/07/01 16:42:51 obrien Exp $ */ @@ -134,8 +134,17 @@ /* * Virtual addresses of things. Derived from the page directory and * page table indexes from pmap.h for precision. - * Because of the page that is both a PD and PT, it looks a little - * messy at times, but hey, we'll do anything to save a page :-) + * + * 0x0000000000000000 - 0x00007fffffffffff user map + * 0x0000800000000000 - 0xffff7fffffffffff does not exist (hole) + * 0xffff800000000000 - 0xffff804020100fff recursive page table (512GB slot) + * 0xffff804020101000 - 0xfffffeffffffffff unused + * 0xffffff0000000000 - 0xffffff7fffffffff 512GB direct map mappings + * 0xffffff8000000000 - 0xffffffff7fffffff unused (510GB) + * 0xffffffff80000000 - 0xffffffffffffffff 2GB kernel map + * + * Within the kernel map: + * 0xffffffff80000000 KERNBASE */ #define VM_MAX_KERNEL_ADDRESS KVADDR(KPML4I, NPDPEPG-1, NKPDE-1, NPTEPG-1) ==== //depot/projects/dtrace7/src/sys/conf/NOTES#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1454.2.9 2008/05/19 04:42:40 grog Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1454.2.11 2008/07/04 01:29:12 delphij Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1740,7 +1740,7 @@ # MII bus support is required for some PCI 10/100 ethernet NICs, # namely those which use MII-compliant transceivers or implement # transceiver control interfaces that operate like an MII. Adding -# "device miibus0" to the kernel config pulls in support for +# "device miibus" to the kernel config pulls in support for # the generic miibus API and all of the PHY drivers, including a # generic one for PHYs that aren't specifically handled by an # individual driver. @@ -1895,6 +1895,7 @@ device bge # Broadcom BCM570xx Gigabit Ethernet device cxgb # Chelsio T3 10 Gigabit Ethernet device dc # DEC/Intel 21143 and various workalikes +device et # Agere ET1310 10/100/Gigabit Ethernet device fxp # Intel EtherExpress PRO/100B (82557, 82558) hint.fxp.0.prefer_iomap="0" device gem # Apple GMAC/Sun ERI/Sun GEM ==== //depot/projects/dtrace7/src/sys/conf/files#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1243.2.24 2008/06/27 04:42:19 jhb Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1243.2.26 2008/07/04 01:29:12 delphij Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -636,6 +636,7 @@ compile-with "${NORMAL_C} -I$S/dev/em" dev/em/e1000_osdep.c optional em | igb \ compile-with "${NORMAL_C} -I$S/dev/em" +dev/et/if_et.c optional et dev/en/if_en_pci.c optional en pci dev/en/midway.c optional en dev/ep/if_ep.c optional ep @@ -814,6 +815,7 @@ dev/mii/ruephy.c optional miibus | ruephy dev/mii/tdkphy.c optional miibus | tdkphy dev/mii/tlphy.c optional miibus | tlphy +dev/mii/truephy.c optional miibus | truephy dev/mii/ukphy.c optional miibus | mii dev/mii/ukphy_subr.c optional miibus | mii dev/mii/xmphy.c optional miibus | xmphy @@ -1693,7 +1695,7 @@ netatalk/aarp.c optional netatalk netatalk/at_control.c optional netatalk netatalk/at_proto.c optional netatalk -netatalk/at_rmx.c optional netatalkdebug +netatalk/at_rmx.c optional netatalk netatalk/ddp_input.c optional netatalk netatalk/ddp_output.c optional netatalk netatalk/ddp_pcb.c optional netatalk ==== //depot/projects/dtrace7/src/sys/conf/files.amd64#6 (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.amd64,v 1.107.2.6 2008/04/10 22:09:22 rwatson Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.107.2.7 2008/07/06 16:24:50 rpaulo Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -187,6 +187,7 @@ dev/hwpmc/hwpmc_amd.c optional hwpmc dev/hwpmc/hwpmc_piv.c optional hwpmc dev/hwpmc/hwpmc_x86.c optional hwpmc +dev/k8temp/k8temp.c optional k8temp dev/kbd/kbd.c optional atkbd | sc | ukbd dev/mem/memutil.c optional mem dev/nfe/if_nfe.c optional nfe pci ==== //depot/projects/dtrace7/src/sys/ddb/db_capture.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_capture.c,v 1.5.2.5 2008/04/01 11:31:18 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_capture.c,v 1.5.2.6 2008/07/01 12:15:55 rwatson Exp $"); #include "opt_ddb.h" @@ -83,13 +83,16 @@ static SYSCTL_NODE(_debug_ddb, OID_AUTO, capture, CTLFLAG_RW, 0, "DDB capture options"); -SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, bytes, CTLFLAG_RD, +SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, bufoff, CTLFLAG_RD, &db_capture_bufoff, 0, "Bytes of data in DDB capture buffer"); SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, maxbufsize, CTLFLAG_RD, &db_capture_maxbufsize, 0, "Maximum value for debug.ddb.capture.bufsize"); +SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, inprogress, CTLFLAG_RD, + &db_capture_inprogress, 0, "DDB output capture in progress"); + /* * Boot-time allocation of the DDB capture buffer, if any. Force all buffer * sizes, including the maximum size, to be rounded to block sizes. ==== //depot/projects/dtrace7/src/sys/dev/aac/aac.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.120.2.11 2008/04/07 14:19:57 emaste Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.120.2.12 2008/07/01 22:16:33 emaste Exp $"); /* * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters. @@ -2998,6 +2998,7 @@ aac_poll(struct cdev *dev, int poll_events, d_thread_t *td) { struct aac_softc *sc; + struct aac_fib_context *ctx; int revents; sc = dev->si_drv1; @@ -3005,8 +3006,12 @@ mtx_lock(&sc->aac_aifq_lock); if ((poll_events & (POLLRDNORM | POLLIN)) != 0) { - if (sc->aifq_idx != 0 || sc->aifq_filled) - revents |= poll_events & (POLLIN | POLLRDNORM); + for (ctx = sc->fibctx; ctx; ctx = ctx->next) { + if (ctx->ctx_idx != sc->aifq_idx || ctx->ctx_wrap) { + revents |= poll_events & (POLLIN | POLLRDNORM); + break; + } + } } mtx_unlock(&sc->aac_aifq_lock); ==== //depot/projects/dtrace7/src/sys/dev/aac/aac_disk.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_disk.c,v 1.43.10.2 2008/03/31 19:21:49 emaste Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_disk.c,v 1.43.10.3 2008/07/02 14:17:49 emaste Exp $"); #include "opt_aac.h" @@ -183,9 +183,6 @@ /* * Map the S/G elements for doing a dump. - * - * XXX This does not handle >4GB of RAM. Fixing it is possible except on - * adapters that cannot do 64bit s/g lists. */ static void aac_dump_map_sg(void *arg, bus_dma_segment_t *segs, int nsegs, int error) @@ -212,6 +209,31 @@ } /* + * Map the S/G elements for doing a dump on 64-bit capable devices. + */ +static void +aac_dump_map_sg64(void *arg, bus_dma_segment_t *segs, int nsegs, int error) +{ + struct aac_fib *fib; + struct aac_blockwrite64 *bw; + struct aac_sg_table64 *sg; + int i; + + fib = (struct aac_fib *)arg; + bw = (struct aac_blockwrite64 *)&fib->data[0]; + sg = &bw->SgMap64; + + if (sg != NULL) { + sg->SgCount = nsegs; + for (i = 0; i < nsegs; i++) { + sg->SgEntry64[i].SgAddress = segs[i].ds_addr; + sg->SgEntry64[i].SgByteCount = segs[i].ds_len; + } + fib->Header.Size = nsegs * sizeof(struct aac_sg_entry64); + } +} + +/* * Dump memory out to an array * * Send out one command at a time with up to AAC_MAXIO of data. @@ -222,12 +244,13 @@ struct aac_disk *ad; struct aac_softc *sc; struct aac_fib *fib; - struct aac_blockwrite *bw; size_t len; int size; static bus_dmamap_t dump_datamap; static int first = 0; struct disk *dp; + bus_dmamap_callback_t *callback; + u_int32_t command; dp = arg; ad = dp->d_drv1; @@ -247,15 +270,33 @@ /* Skip aac_alloc_sync_fib(). We don't want to mess with sleep locks */ fib = &sc->aac_common->ac_sync_fib; - bw = (struct aac_blockwrite *)&fib->data[0]; while (length > 0) { len = (length > AAC_MAXIO) ? AAC_MAXIO : length; - bw->Command = VM_CtBlockWrite; - bw->ContainerId = ad->ad_container->co_mntobj.ObjectId; - bw->BlockNumber = offset / AAC_BLOCK_SIZE; - bw->ByteCount = len; - bw->Stable = CUNSTABLE; + if ((sc->flags & AAC_FLAGS_SG_64BIT) == 0) { + struct aac_blockwrite *bw; + bw = (struct aac_blockwrite *)&fib->data[0]; + bw->Command = VM_CtBlockWrite; + bw->ContainerId = ad->ad_container->co_mntobj.ObjectId; + bw->BlockNumber = offset / AAC_BLOCK_SIZE; + bw->ByteCount = len; + bw->Stable = CUNSTABLE; + command = ContainerCommand; + callback = aac_dump_map_sg; + size = sizeof(struct aac_blockwrite); + } else { + struct aac_blockwrite64 *bw; + bw = (struct aac_blockwrite64 *)&fib->data[0]; + bw->Command = VM_CtHostWrite64; + bw->ContainerId = ad->ad_container->co_mntobj.ObjectId; + bw->BlockNumber = offset / AAC_BLOCK_SIZE; + bw->SectorCount = len / AAC_BLOCK_SIZE; + bw->Pad = 0; + bw->Flags = 0; + command = ContainerCommand64; + callback = aac_dump_map_sg64; + size = sizeof(struct aac_blockwrite64); + } /* * There really isn't any way to recover from errors or @@ -264,16 +305,16 @@ * is too much required context. */ if (bus_dmamap_load(sc->aac_buffer_dmat, dump_datamap, virtual, - len, aac_dump_map_sg, fib, BUS_DMA_NOWAIT) != 0) + len, callback, fib, BUS_DMA_NOWAIT) != 0) return (ENOMEM); bus_dmamap_sync(sc->aac_buffer_dmat, dump_datamap, BUS_DMASYNC_PREWRITE); /* fib->Header.Size is set in aac_dump_map_sg */ - size = fib->Header.Size + sizeof(struct aac_blockwrite); + size += fib->Header.Size; - if (aac_sync_fib(sc, ContainerCommand, 0, fib, size)) { + if (aac_sync_fib(sc, command, 0, fib, size)) { printf("Error dumping block 0x%jx\n", (uintmax_t)physical); return (EIO); ==== //depot/projects/dtrace7/src/sys/dev/acpi_support/acpi_asus.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.30.2.2 2008/04/22 12:44:39 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.30.2.3 2008/07/01 21:36:03 rpaulo Exp $"); /* * Driver for extra ACPI-controlled gadgets (hotkeys, leds, etc) found on @@ -55,6 +55,8 @@ #define ACPI_ASUS_METHOD_BRN 1 #define ACPI_ASUS_METHOD_DISP 2 #define ACPI_ASUS_METHOD_LCD 3 +#define ACPI_ASUS_METHOD_CAMERA 4 +#define ACPI_ASUS_METHOD_CARDRD 5 #define _COMPONENT ACPI_OEM ACPI_MODULE_NAME("ASUS") @@ -79,6 +81,14 @@ char *disp_get; char *disp_set; + + char *cam_get; + char *cam_set; + + char *crd_get; + char *crd_set; + + void (*n_func)(ACPI_HANDLE, UINT32, void *); }; struct acpi_asus_led { @@ -114,6 +124,8 @@ int s_brn; int s_disp; int s_lcd; + int s_cam; + int s_crd; }; /* @@ -375,6 +387,8 @@ { .name = NULL } }; +static void acpi_asus_eeepc_notify(ACPI_HANDLE h, UINT32 notify, void *context); + /* * EeePC have an Asus ASUS010 gadget interface, * but they can't be probed quite the same way as Asus laptops. @@ -383,7 +397,12 @@ { .name = "EEE", .brn_get = "\\_SB.ATKD.PBLG", - .brn_set = "\\_SB.ATKD.PBLS" + .brn_set = "\\_SB.ATKD.PBLS", + .cam_get = "\\_SB.ATKD.CAMG", + .cam_set = "\\_SB.ATKD.CAMS", + .crd_set = "\\_SB.ATKD.CRDS", + .crd_get = "\\_SB.ATKD.CRDG", + .n_func = acpi_asus_eeepc_notify }, { .name = NULL } @@ -393,21 +412,37 @@ char *name; char *description; int method; + int flags; } acpi_asus_sysctls[] = { { .name = "lcd_backlight", .method = ACPI_ASUS_METHOD_LCD, - .description = "state of the lcd backlight" + .description = "state of the lcd backlight", + .flags = CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_ANYBODY }, { .name = "lcd_brightness", .method = ACPI_ASUS_METHOD_BRN, - .description = "brightness of the lcd panel" + .description = "brightness of the lcd panel", + .flags = CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_ANYBODY }, { .name = "video_output", .method = ACPI_ASUS_METHOD_DISP, - .description = "display output state" + .description = "display output state", + .flags = CTLTYPE_INT | CTLFLAG_RW + }, + { + .name = "camera", + .method = ACPI_ASUS_METHOD_CAMERA, + .description = "internal camera state", + .flags = CTLTYPE_INT | CTLFLAG_RW + }, + { + .name = "cardreader", + .method = ACPI_ASUS_METHOD_CARDRD, + .description = "internal card reader state", + .flags = CTLTYPE_INT | CTLFLAG_RW }, { .name = NULL } @@ -647,7 +682,7 @@ SYSCTL_ADD_PROC(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, acpi_asus_sysctls[i].name, - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_ANYBODY, + acpi_asus_sysctls[i].flags, sc, i, acpi_asus_sysctl, "I", acpi_asus_sysctls[i].description); } @@ -708,8 +743,11 @@ AcpiEvaluateObject(sc->handle, "BSTS", NULL, NULL); /* Handle notifies */ + if (sc->model->n_func == NULL) + sc->model->n_func = acpi_asus_notify; + AcpiInstallNotifyHandler(sc->handle, ACPI_SYSTEM_NOTIFY, - acpi_asus_notify, dev); + sc->model->n_func, dev); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 7 12:10:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F3551065687; Mon, 7 Jul 2008 12:10:28 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 124DD106569C for ; Mon, 7 Jul 2008 12:10:28 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F34BF8FC22 for ; Mon, 7 Jul 2008 12:10:27 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m67CARHN023220 for ; Mon, 7 Jul 2008 12:10:27 GMT (envelope-from snb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m67CAR63023218 for perforce@freebsd.org; Mon, 7 Jul 2008 12:10:27 GMT (envelope-from snb@FreeBSD.org) Date: Mon, 7 Jul 2008 12:10:27 GMT Message-Id: <200807071210.m67CAR63023218@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snb@FreeBSD.org using -f From: Nick Barkas To: Perforce Change Reviews Cc: Subject: PERFORCE change 144820 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, 07 Jul 2008 12:10:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=144820 Change 144820 by snb@snb_toro on 2008/07/07 12:10:14 Remove unused function declaration. Affected files ... .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_dirhash.c#6 edit Differences ... ==== //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_dirhash.c#6 (text+ko) ==== @@ -94,7 +94,6 @@ doff_t offset); static doff_t ufsdirhash_getprev(struct direct *dp, doff_t offset); static int ufsdirhash_destroy(struct dirhash *dh); -static int ufsdirhash_destroy_first(void); static int ufsdirhash_recycle(int wanted); static void ufsdirhash_lowmem(void); static void ufsdirhash_free_locked(struct inode *ip); From owner-p4-projects@FreeBSD.ORG Mon Jul 7 13:53:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 70B40106566C; Mon, 7 Jul 2008 13:53:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 35528106567B for ; Mon, 7 Jul 2008 13:53:12 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 085798FC21 for ; Mon, 7 Jul 2008 13:53:12 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m67DrBo5043173 for ; Mon, 7 Jul 2008 13:53:11 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m67DrBU5043171 for perforce@freebsd.org; Mon, 7 Jul 2008 13:53:11 GMT (envelope-from trasz@freebsd.org) Date: Mon, 7 Jul 2008 13:53:11 GMT Message-Id: <200807071353.m67DrBU5043171@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 144827 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, 07 Jul 2008 13:53:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=144827 Change 144827 by trasz@trasz_traszkan on 2008/07/07 13:52:43 Fix a mismerge. This makes the p4 version of the kernel actually compilable. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vfsops.c#5 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vfsops.c#5 (text+ko) ==== @@ -170,6 +170,7 @@ */ vfs_deleteopt(mp->mnt_optnew, "snapshot"); vfs_deleteopt(mp->mnt_opt, "snapshot"); + } if (vfs_getopt(mp->mnt_optnew, "nfs4acls", NULL, NULL) == 0) { if (mntorflags & MNT_ACLS) { From owner-p4-projects@FreeBSD.ORG Mon Jul 7 14:45:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F3EC1065672; Mon, 7 Jul 2008 14:45:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 189FA106564A for ; Mon, 7 Jul 2008 14:45:04 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 051DF8FC14 for ; Mon, 7 Jul 2008 14:45:04 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m67Ej3QR048712 for ; Mon, 7 Jul 2008 14:45:03 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m67Ej3XF048710 for perforce@freebsd.org; Mon, 7 Jul 2008 14:45:03 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 7 Jul 2008 14:45:03 GMT Message-Id: <200807071445.m67Ej3XF048710@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 144828 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, 07 Jul 2008 14:45:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=144828 Change 144828 by hselasky@hselasky_laptop001 on 2008/07/07 14:44:04 More patches to add support for LibUSB 1.0 - allow multiple instances when opening an endpoint Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#9 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#11 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.h#6 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#11 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#9 (text+ko) ==== @@ -295,6 +295,8 @@ #define USB_NO_TIMEOUT 0 #define USB_DEFAULT_TIMEOUT 5000 /* 5000 ms = 5 seconds */ + uint32_t max_frame_count; /* initial value of "nframes" after + * setup */ uint32_t nframes; /* number of USB frames to transfer */ uint32_t aframes; /* actual number of USB frames * transferred */ ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#11 (text+ko) ==== @@ -71,7 +71,6 @@ static uint32_t usb2_path_convert_one(const char **pp); static uint32_t usb2_path_convert(const char *path); static uint8_t usb2_match_perm(struct usb2_perm *psystem, struct usb2_perm *puser); -static struct usb2_fifo *usb2_fifo_alloc(uint8_t fifo_index); static int usb2_fifo_open(struct usb2_fifo *f, struct file *fp, struct thread *td, int fflags); static void usb2_fifo_close(struct usb2_fifo *f, struct thread *td, int fflags); static void usb2_dev_init(void *arg); @@ -81,6 +80,8 @@ static void usb2_fifo_wakeup(struct usb2_fifo *f); static void usb2_fifo_check_methods(struct usb2_fifo_methods *pm); static void usb2_clone(void *arg, USB_UCRED char *name, int namelen, struct cdev **dev); +static struct usb2_fifo *usb2_fifo_alloc(void); +static struct usb2_pipe *usb2_dev_get_pipe(struct usb2_device *udev, uint8_t iface_index, uint8_t ep_index, uint8_t dir); static d_fdopen_t usb2_fdopen; static d_close_t usb2_close; @@ -200,7 +201,7 @@ temp = usb2_path_convert_one(&path); - if (temp >= USB_FIFO_MAX) { + if (temp >= ((USB_FIFO_MAX / 2) + (USB_EP_MAX / 2))) { return (0 - 1); } devloc += (temp * USB_IFACE_MAX * USB_DEV_MAX * USB_BUS_MAX); @@ -280,25 +281,32 @@ usb2_error_t usb2_ref_device(struct file *fp, struct usb2_location *ploc, uint32_t devloc) { + struct usb2_fifo **ppf; + struct usb2_fifo *f; int fflags; if (fp) { - /* get the device location */ + /* + * Get the device location which should be valid and + * correct: + */ devloc = USB_P2U(fp->f_data); fflags = fp->f_flag; /* only ref FIFO */ ploc->is_uref = 0; + /* devloc should be valid */ } else { /* only ref device */ fflags = 0; + /* search for FIFO */ ploc->is_uref = 1; + /* check "devloc" */ + if (devloc >= (USB_BUS_MAX * USB_DEV_MAX * + USB_IFACE_MAX * ((USB_EP_MAX / 2) + (USB_FIFO_MAX / 2)))) { + return (USB_ERR_INVAL); + } } - if (devloc > (USB_BUS_MAX * USB_DEV_MAX * - USB_EP_MAX * USB_IFACE_MAX)) { - /* invalid device location */ - return (USB_ERR_INVAL); - } /* store device location */ ploc->devloc = devloc; ploc->bus_index = devloc % USB_BUS_MAX; @@ -306,7 +314,7 @@ ploc->iface_index = (devloc / (USB_BUS_MAX * USB_DEV_MAX)) % USB_IFACE_MAX; ploc->ep_index = (devloc / (USB_BUS_MAX * USB_DEV_MAX * - USB_IFACE_MAX)) % USB_EP_MAX; + USB_IFACE_MAX)); mtx_lock(&usb2_ref_lock); ploc->bus = devclass_get_softc(usb2_devclass_ptr, ploc->bus_index); @@ -339,50 +347,68 @@ goto error; } } - /* check TX FIFO */ - - ploc->txfifo = ploc->udev->fifo[(2 * ploc->ep_index) + USB_FIFO_TX]; - if ((ploc->txfifo != NULL) && - (ploc->txfifo->refcount != USB_FIFO_REF_MAX) && - (ploc->txfifo->curr_file == fp)) { - ploc->is_write = 1; /* ref */ + /* check if we are doing an open */ + if (fp == NULL) { + /* set defaults */ + ploc->txfifo = NULL; + ploc->rxfifo = NULL; + ploc->is_write = 0; + ploc->is_read = 0; } else { + /* check for write */ if (fflags & FWRITE) { - goto error; + ppf = ploc->udev->fifo; + f = ppf[ploc->ep_index + USB_FIFO_TX]; + ploc->txfifo = f; + ploc->is_write = 1; /* ref */ + if ((f == NULL) || + (f->refcount == USB_FIFO_REF_MAX) || + (f->curr_file != fp)) { + goto error; + } + } else { + ploc->txfifo = NULL; + ploc->is_write = 0; /* no ref */ } - ploc->is_write = 0; /* no ref */ - ploc->txfifo = NULL; /* no access */ - } - /* check RX FIFO */ - - ploc->rxfifo = ploc->udev->fifo[(2 * ploc->ep_index) + USB_FIFO_RX]; - if ((ploc->rxfifo != NULL) && - (ploc->rxfifo->refcount != USB_FIFO_REF_MAX) && - (ploc->rxfifo->curr_file == fp)) { - ploc->is_read = 1; /* ref */ - } else { + /* check for read */ if (fflags & FREAD) { - goto error; + ppf = ploc->udev->fifo; + f = ppf[ploc->ep_index + USB_FIFO_RX]; + ploc->rxfifo = f; + ploc->is_read = 1; /* ref */ + if ((f == NULL) || + (f->refcount == USB_FIFO_REF_MAX) || + (f->curr_file != fp)) { + goto error; + } + } else { + ploc->rxfifo = NULL; + ploc->is_read = 0; /* no ref */ } - ploc->is_read = 0; /* no ref */ - ploc->rxfifo = NULL; /* no access */ } /* when everything is OK we increment the refcounts */ - - if (ploc->is_uref) { - DPRINTF(1, "ref udev\n"); - ploc->udev->refcount++; - } if (ploc->is_write) { DPRINTF(1, "ref write\n"); ploc->txfifo->refcount++; + if (ploc->txfifo->flag_no_uref == 0) { + /* we need extra locking */ + ploc->is_uref = 1; + } } if (ploc->is_read) { DPRINTF(1, "ref read\n"); ploc->rxfifo->refcount++; + if (ploc->rxfifo->flag_no_uref == 0) { + /* we need extra locking */ + ploc->is_uref = 1; + } } + if (ploc->is_uref) { + DPRINTF(1, "ref udev\n"); + ploc->udev->refcount++; + } mtx_unlock(&usb2_ref_lock); if (ploc->is_uref) { @@ -435,21 +461,178 @@ } static struct usb2_fifo * -usb2_fifo_alloc(uint8_t fifo_index) +usb2_fifo_alloc(void) { struct usb2_fifo *f; f = malloc(sizeof(*f), M_USBDEV, M_WAITOK | M_ZERO); - if (f) { cv_init(&f->cv_io, "FIFO-IO"); cv_init(&f->cv_drain, "FIFO-DRAIN"); f->refcount = 1; - f->fifo_index = fifo_index; } return (f); } +/*------------------------------------------------------------------------* + * usb2_fifo_create + *------------------------------------------------------------------------*/ +static int +usb2_fifo_create(struct usb2_location *ploc, uint32_t *pdevloc, int fflags) +{ + struct usb2_device *udev = ploc->udev; + struct usb2_fifo *f; + struct usb2_pipe *pipe; + uint8_t iface_index = ploc->iface_index; + uint8_t dev_ep_index = ploc->ep_index; + uint8_t n; + uint8_t is_tx; + uint8_t is_rx; + uint8_t no_null; + uint8_t is_busy; + + is_tx = (fflags & FWRITE) ? 1 : 0; + is_rx = (fflags & FREAD) ? 1 : 0; + no_null = 1; + is_busy = 0; + + /* search for a free FIFO slot */ + + for (n = 0;; n += 2) { + + if (n == USB_FIFO_MAX) { + if (no_null) { + no_null = 0; + n = 0; + } else { + /* end of FIFOs reached */ + return (ENOMEM); + } + } + /* Check for TX FIFO */ + if (is_tx) { + f = udev->fifo[n + USB_FIFO_TX]; + if (f != NULL) { + if (f->dev_ep_index != dev_ep_index) { + /* wrong endpoint index */ + continue; + } + if ((dev_ep_index != 0) && + (f->iface_index != iface_index)) { + /* wrong interface index */ + continue; + } + if (f->curr_file != NULL) { + /* FIFO is opened */ + is_busy = 1; + continue; + } + } else if (no_null) { + continue; + } + } + /* Check for RX FIFO */ + if (is_rx) { + f = udev->fifo[n + USB_FIFO_RX]; + if (f != NULL) { + if (f->dev_ep_index != dev_ep_index) { + /* wrong endpoint index */ + continue; + } + if ((dev_ep_index != 0) && + (f->iface_index != iface_index)) { + /* wrong interface index */ + continue; + } + if (f->curr_file != NULL) { + /* FIFO is opened */ + is_busy = 1; + continue; + } + } else if (no_null) { + continue; + } + } + break; + } + + if (no_null == 0) { + if (dev_ep_index >= (USB_EP_MAX / 2)) { + /* we don't create any endpoints in this range */ + return (is_busy ? EBUSY : EINVAL); + } + } + /* Check TX FIFO */ + if (is_tx && + (udev->fifo[n + USB_FIFO_TX] == NULL)) { + pipe = usb2_dev_get_pipe(udev, + iface_index, dev_ep_index, USB_FIFO_TX); + if (pipe == NULL) { + return (EINVAL); + } + f = usb2_fifo_alloc(); + if (f == NULL) { + return (ENOMEM); + } + /* update some fields */ + f->fifo_index = n + USB_FIFO_TX; + f->dev_ep_index = dev_ep_index; + f->priv_mtx = udev->default_mtx; + f->priv_sc0 = pipe; + f->methods = &usb2_ugen_methods; + f->iface_index = iface_index; + f->udev = udev; + if (dev_ep_index != 0) { + f->flag_no_uref = 1; + } + mtx_lock(&usb2_ref_lock); + udev->fifo[n + USB_FIFO_TX] = f; + mtx_unlock(&usb2_ref_lock); + } + /* Check RX FIFO */ + if (is_rx && + (udev->fifo[n + USB_FIFO_RX] == NULL)) { + + pipe = usb2_dev_get_pipe(udev, + iface_index, dev_ep_index, USB_FIFO_RX); + if (pipe == NULL) { + return (EINVAL); + } + f = usb2_fifo_alloc(); + if (f == NULL) { + return (ENOMEM); + } + /* update some fields */ + f->fifo_index = n + USB_FIFO_RX; + f->dev_ep_index = dev_ep_index; + f->priv_mtx = udev->default_mtx; + f->priv_sc0 = pipe; + f->methods = &usb2_ugen_methods; + f->iface_index = iface_index; + f->udev = udev; + if (dev_ep_index != 0) { + f->flag_no_uref = 1; + } + mtx_lock(&usb2_ref_lock); + udev->fifo[n + USB_FIFO_RX] = f; + mtx_unlock(&usb2_ref_lock); + } + if (is_tx) { + ploc->txfifo = udev->fifo[n + USB_FIFO_TX]; + } + if (is_rx) { + ploc->rxfifo = udev->fifo[n + USB_FIFO_RX]; + } + /* replace endpoint index by FIFO index */ + + (*pdevloc) %= (USB_BUS_MAX * USB_DEV_MAX * USB_IFACE_MAX); + (*pdevloc) += (USB_BUS_MAX * USB_DEV_MAX * USB_IFACE_MAX) * n; + + /* complete */ + + return (0); +} + void usb2_fifo_free(struct usb2_fifo *f) { @@ -470,7 +653,8 @@ /* delink ourselves to stop calls from userland */ if ((f->fifo_index < USB_FIFO_MAX) && - (f->udev != NULL)) { + (f->udev != NULL) && + (f->udev->fifo[f->fifo_index] == f)) { f->udev->fifo[f->fifo_index] = NULL; } else { DPRINTF(-1, "USB FIFO %p has not been linked!\n", f); @@ -505,44 +689,17 @@ return; } -/*------------------------------------------------------------------------* - * usb2_fifo_check - *------------------------------------------------------------------------*/ -static void -usb2_fifo_check(struct usb2_location *ploc, int fflags) +static struct usb2_pipe * +usb2_dev_get_pipe(struct usb2_device *udev, + uint8_t iface_index, uint8_t ep_index, uint8_t dir) { - struct usb2_device *udev; struct usb2_pipe *pipe; - struct usb2_fifo *f; - uint8_t ep_index; uint8_t ep_dir; - udev = ploc->udev; - ep_index = ploc->ep_index; - if (fflags & FREAD) { - f = ploc->rxfifo; - } else if (fflags & FWRITE) { - f = ploc->txfifo; - } else { - /* nothing to do */ - return; - } - - if (f) { - /* nothing do to - we already have a FIFO */ - DPRINTF(1, "has FIFO\n"); - return; - } - if (ep_index >= 16) { - /* nothing to do - these are virtual endpoints */ - DPRINTF(1, "VEP\n"); - return; - } - /* automatically create a generic endpoint */ if (ep_index == 0) { pipe = &(udev->default_pipe); } else { - if (fflags & FREAD) { + if (dir == USB_FIFO_RX) { if (udev->flags.usb2_mode == USB_MODE_HOST) { ep_dir = UE_DIR_IN; } else { @@ -556,53 +713,26 @@ } } pipe = usb2_get_pipe_by_addr(udev, ep_index | ep_dir); - if (pipe == NULL) { - /* if the pipe does not exist then return */ - return; - } - if (pipe->edesc == NULL) { - /* invalid pipe */ - return; - } - if (pipe->iface_index != ploc->iface_index) { + } + + if (pipe == NULL) { + /* if the pipe does not exist then return */ + return (NULL); + } + if (pipe->edesc == NULL) { + /* invalid pipe */ + return (NULL); + } + if (ep_index != 0) { + if (pipe->iface_index != iface_index) { /* * Permissions violation - trying to access a * pipe that does not belong to the interface. */ - return; + return (NULL); } } - if (fflags & FREAD) { - f = usb2_fifo_alloc((2 * ep_index) + USB_FIFO_RX); - } else { - f = usb2_fifo_alloc((2 * ep_index) + USB_FIFO_TX); - } - if (f == NULL) { - /* could not create FIFO */ - return; - } - /* update some fields */ - f->priv_mtx = udev->default_mtx; - f->priv_sc0 = pipe; - f->unit = 0; - f->methods = &usb2_ugen_methods; - f->iface_index = ploc->iface_index; - f->udev = udev; - - /* check the methods */ - usb2_fifo_check_methods(f->methods); - - /* register our FIFO */ - mtx_lock(&usb2_ref_lock); - if (fflags & FREAD) { - udev->fifo[(2 * ep_index) + USB_FIFO_RX] = f; - } else { - udev->fifo[(2 * ep_index) + USB_FIFO_TX] = f; - } - mtx_unlock(&usb2_ref_lock); - - /* we are done */ - return; + return (pipe); /* success */ } /*------------------------------------------------------------------------* @@ -662,7 +792,9 @@ f->async_p = NULL; /* set which file we belong to */ + mtx_lock(&usb2_ref_lock); f->curr_file = fp; + mtx_unlock(&usb2_ref_lock); /* reset queue */ usb2_fifo_reset(f); @@ -841,16 +973,7 @@ mtx_lock(loc.udev->default_mtx); /* scan down the permissions tree */ - - if ((fflags & FWRITE) && (loc.txfifo != NULL) && - (loc.txfifo->iface_index != loc.iface_index)) { - /* the FIFO does not belong to the specified interface */ - err = EPERM; - } else if ((fflags & FREAD) && (loc.rxfifo != NULL) && - (loc.rxfifo->iface_index != loc.iface_index)) { - /* the FIFO does not belong to the specified interface */ - err = EPERM; - } else if ((loc.ep_index != 0) && loc.iface && + if ((loc.ep_index != 0) && loc.iface && usb2_match_perm(&perm, &loc.iface->perm)) { /* we got access through the interface */ err = 0; @@ -875,18 +998,15 @@ usb2_unref_device(&loc); return (err); } - usb2_fifo_check(&loc, fflags & FREAD); - usb2_fifo_check(&loc, fflags & FWRITE); - usb2_unref_device(&loc); - - /* try to refer the device and associated FIFOs again */ - err = usb2_ref_device(NULL, &loc, devloc); + /* create FIFOs, if any */ + err = usb2_fifo_create(&loc, &devloc, fflags); + /* check for error */ if (err) { - return (ENXIO); + usb2_unref_device(&loc); + return (err); } if (fflags & FREAD) { - err = usb2_fifo_open(loc.rxfifo, fp, td, - fflags); + err = usb2_fifo_open(loc.rxfifo, fp, td, fflags); if (err) { DPRINTF(1, "read open failed\n"); usb2_unref_device(&loc); @@ -894,8 +1014,7 @@ } } if (fflags & FWRITE) { - err = usb2_fifo_open(loc.txfifo, fp, td, - fflags); + err = usb2_fifo_open(loc.txfifo, fp, td, fflags); if (err) { DPRINTF(1, "write open failed\n"); if (fflags & FREAD) { @@ -911,7 +1030,7 @@ * directly and don't have to create another device: */ fp->f_ops = &usb2_ops_f; - fp->f_data = ((uint8_t *)0) + loc.devloc; + fp->f_data = ((uint8_t *)0) + devloc; usb2_unref_device(&loc); @@ -968,6 +1087,8 @@ usb2_dev_init(void *arg) { mtx_init(&usb2_ref_lock, "USB ref mutex", NULL, MTX_DEF); + /* check the UGEN methods */ + usb2_fifo_check_methods(&usb2_ugen_methods); return; } @@ -1623,24 +1744,32 @@ if (pm == NULL) return (EINVAL); + /* check the methods */ + usb2_fifo_check_methods(pm); + if (priv_mtx == NULL) priv_mtx = &Giant; /* search for a free FIFO slot */ - - for (n = USB_EP_MAX;; n += 2) { + for (n = 0;; n += 2) { if (n == USB_FIFO_MAX) { + /* end of FIFOs reached */ return (ENOMEM); } - if ((udev->fifo[n + USB_FIFO_TX] == NULL) && - (udev->fifo[n + USB_FIFO_RX] == NULL)) { - break; + /* Check for TX FIFO */ + if (udev->fifo[n + USB_FIFO_TX] != NULL) { + continue; + } + /* Check for RX FIFO */ + if (udev->fifo[n + USB_FIFO_RX] != NULL) { + continue; } + break; } - f_tx = usb2_fifo_alloc(n + USB_FIFO_TX); /* write FIFO */ - f_rx = usb2_fifo_alloc(n + USB_FIFO_RX); /* read FIFO */ + f_tx = usb2_fifo_alloc(); + f_rx = usb2_fifo_alloc(); if ((f_tx == NULL) || (f_rx == NULL)) { usb2_fifo_free(f_tx); @@ -1649,29 +1778,30 @@ } /* initialise FIFO structures */ + f_tx->fifo_index = n + USB_FIFO_TX; + f_tx->dev_ep_index = (n / 2) + (USB_EP_MAX / 2); f_tx->priv_mtx = priv_mtx; f_tx->priv_sc0 = priv_sc; - f_tx->unit = unit; + f_tx->methods = pm; f_tx->iface_index = iface_index; - f_tx->methods = pm; f_tx->udev = udev; + f_tx->flag_no_uref = 1; + f_rx->fifo_index = n + USB_FIFO_RX; + f_rx->dev_ep_index = (n / 2) + (USB_EP_MAX / 2); f_rx->priv_mtx = priv_mtx; f_rx->priv_sc0 = priv_sc; - f_rx->unit = unit; + f_rx->methods = pm; f_rx->iface_index = iface_index; - f_rx->methods = pm; f_rx->udev = udev; - - /* check the methods */ - usb2_fifo_check_methods(pm); + f_rx->flag_no_uref = 1; f_sc->fp[USB_FIFO_TX] = f_tx; f_sc->fp[USB_FIFO_RX] = f_rx; mtx_lock(&usb2_ref_lock); - udev->fifo[n + USB_FIFO_TX] = f_tx; - udev->fifo[n + USB_FIFO_RX] = f_rx; + udev->fifo[f_tx->fifo_index] = f_tx; + udev->fifo[f_rx->fifo_index] = f_rx; mtx_unlock(&usb2_ref_lock); if (snprintf(src, sizeof(src), @@ -1679,7 +1809,7 @@ device_get_unit(udev->bus->bdev), udev->device_index, iface_index, - n / 2)) { + f_tx->dev_ep_index)) { /* ignore */ } for (n = 0; n != 4; n++) { ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.h#6 (text+ko) ==== @@ -83,8 +83,9 @@ void *queue_data; uint32_t timeout; /* timeout in milliseconds */ uint32_t bufsize; /* BULK and INTERRUPT buffer size */ - uint16_t unit; uint16_t nframes; /* for isochronous mode */ + uint16_t dev_ep_index; /* our device endpoint index */ + uint8_t flag_no_uref; /* set if FIFO is not control endpoint */ uint8_t flag_sleeping; /* set if FIFO is sleeping */ uint8_t flag_iserror; /* set if FIFO error happened */ uint8_t flag_isselect; /* set if FIFO is selected */ ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#9 (text+ko) ==== @@ -575,7 +575,7 @@ { DPRINTF(1, "index %u\n", index); - if (f->fifo_index >= 2) { + if (f->flag_no_uref) { /* not the control endpoint - just forget it */ return (EINVAL); } @@ -604,7 +604,7 @@ { DPRINTF(1, "%u, %u\n", iface_index, alt_index); - if (f->fifo_index >= 2) { + if (f->flag_no_uref) { /* not the control endpoint - just forget it */ return (EINVAL); } @@ -640,7 +640,7 @@ DPRINTF(5, "\n"); - if (f->fifo_index >= 2) { + if (f->flag_no_uref) { /* control endpoint only */ return (EINVAL); } @@ -689,7 +689,7 @@ uint16_t size = sizeof(f->udev->bus->scratch[0].data); int error; - if (f->fifo_index >= 2) { + if (f->flag_no_uref) { /* control endpoint only */ return (EINVAL); } @@ -735,7 +735,7 @@ uint8_t i; uint8_t max; - if (f->fifo_index >= 2) { + if (f->flag_no_uref) { /* control endpoint only */ return (EINVAL); } @@ -802,7 +802,7 @@ uint8_t isread; void *data = NULL; - if (f->fifo_index >= 2) { + if (f->flag_no_uref) { /* control endpoint only */ return (EINVAL); } @@ -883,7 +883,7 @@ struct usb2_device *udev = f->udev; int error; - if (f->fifo_index >= 2) { + if (f->flag_no_uref) { /* control endpoint only */ return (EINVAL); } @@ -1122,7 +1122,7 @@ int error; DPRINTF(5, "cmd=%08lx\n", cmd); - if (f->fifo_index >= 2) { + if (f->flag_no_uref) { mtx_lock(f->priv_mtx); error = ugen_iface_ioctl(f, cmd, addr); mtx_unlock(f->priv_mtx); ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#11 (text+ko) ==== @@ -585,6 +585,10 @@ parm->err = USB_ERR_INVAL; goto done; } + /* initialize max frame count */ + + xfer->max_frame_count = xfer->nframes; + /* initialize frame buffers */ if (parm->buf) { @@ -614,6 +618,7 @@ xfer->max_packet_size = 1; xfer->max_data_length = 0; xfer->nframes = 0; + xfer->max_frame_count = 0; } return; } From owner-p4-projects@FreeBSD.ORG Mon Jul 7 15:58:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B1091065670; Mon, 7 Jul 2008 15:58:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C31BA1065680; Mon, 7 Jul 2008 15:58:50 +0000 (UTC) (envelope-from xcllnt@mac.com) Received: from smtpoutm.mac.com (smtpoutm.mac.com [17.148.16.74]) by mx1.freebsd.org (Postfix) with ESMTP id 8D40E8FC1A; Mon, 7 Jul 2008 15:58:50 +0000 (UTC) (envelope-from xcllnt@mac.com) Received: from asmtp017-bge351000.mac.com (asmtp017-bge351000 [10.150.69.80]) by smtpoutm.mac.com (Xserve/smtpout011/MantshX 4.0) with ESMTP id m67Fwonx026618; Mon, 7 Jul 2008 08:58:50 -0700 (PDT) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; charset=US-ASCII; format=flowed Received: from macbook-pro.jnpr.net (natint3.juniper.net [66.129.224.36]) by asmtp017.mac.com (Sun Java(tm) System Messaging Server 6.3-6.03 (built Mar 14 2008; 32bit)) with ESMTPSA id <0K3N00H288E1EDA0@asmtp017.mac.com>; Mon, 07 Jul 2008 08:58:50 -0700 (PDT) Sender: xcllnt@mac.com Message-id: <42CDD177-3EA8-4C87-9A70-1A2F4F1EB42D@mac.com> From: Marcel Moolenaar To: Takahashi Yoshihiro In-reply-to: <20080707.174208.94913728.nyan@jp.FreeBSD.org> Date: Mon, 07 Jul 2008 08:58:48 -0700 References: <200807051943.m65JhHZ6066371@repoman.freebsd.org> <20080706.110943.226722229.nyan@jp.FreeBSD.org> <20080707.174208.94913728.nyan@jp.FreeBSD.org> X-Mailer: Apple Mail (2.926) Cc: marcel@freebsd.org, perforce@freebsd.org Subject: Re: PERFORCE change 144741 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, 07 Jul 2008 15:58:51 -0000 On Jul 7, 2008, at 1:42 AM, Takahashi Yoshihiro wrote: > In article > Marcel Moolenaar writes: > >>> These are wrong. RSA98-III is based on ns8250 and has extended FIFO >>> buffer. So I think that the uart_rsa_class should be added. >> >> Oh. In your patch you define it as i8251. I only refactored >> the code. Also, the ns8250 class already supports extended >> FIFOs, so we don't need a separate class for that. I'll >> change it... > > No. My code set sc_class to uart_rsa_class. It's your mistake. Ah yes, you're right. > And then I found another problem in uart_bus_isa.c. In your code > non-PnP devices for pc98 cannot probe. My original code was no > problem... Could you be a bit more specific? -- Marcel Moolenaar xcllnt@mac.com From owner-p4-projects@FreeBSD.ORG Mon Jul 7 17:09:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67C59106569B; Mon, 7 Jul 2008 17:09:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2DB5C1065694 for ; Mon, 7 Jul 2008 17:09:29 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1B0DC8FC13 for ; Mon, 7 Jul 2008 17:09:29 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m67H9Sj8073713 for ; Mon, 7 Jul 2008 17:09:28 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m67H9Suj073711 for perforce@freebsd.org; Mon, 7 Jul 2008 17:09:28 GMT (envelope-from trasz@freebsd.org) Date: Mon, 7 Jul 2008 17:09:28 GMT Message-Id: <200807071709.m67H9Suj073711@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 144831 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, 07 Jul 2008 17:09:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=144831 Change 144831 by trasz@trasz_traszkan on 2008/07/07 17:09:06 Update TODO. Note that granularity stuff is not yet commited into p4. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/TODO#6 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/TODO#6 (text+ko) ==== @@ -4,9 +4,35 @@ - Add the ability to add ACE at a given position in ACL to setfacl(1), +- Add the ability to parse and print ACLs in verbose form, e.g. instead of + + owner@:rwx:f:allow + + it would be + + owner@:read_data/write_data/execute:file_inherit:allow + - Add error checking to acl_to_text_nfs4.c. -- Make access control more granular. +- Make access control more granular. The following are done: + + ACL_READ_DATA + ACL_EXECUTE + ACL_READ_ATTRIBUTES + ACL_WRITE_ATTRIBUTES + ACL_READ_NAMED_ATTRS (implemented, #ifdefed out for SunOS compatibility) + ACL_WRITE_NAMED_ATTRS (implemented, #ifdefed out for SunOS compatibility) + ACL_READ_ACL + ACL_WRITE_ACL + ACL_WRITE_OWNER + ACL_SYNCHRONIZE (not used) + + The following are left: + + ACL_WRITE_DATA + ACL_APPEND_DATA + ACL_DELETE_CHILD + ACL_DELETE - Attach ZFS to the framework. From owner-p4-projects@FreeBSD.ORG Mon Jul 7 17:15:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE62B1065679; Mon, 7 Jul 2008 17:15:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 71DDC106568D for ; Mon, 7 Jul 2008 17:15:35 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5EA418FC1C for ; Mon, 7 Jul 2008 17:15:35 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m67HFZCL074233 for ; Mon, 7 Jul 2008 17:15:35 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m67HFZOo074231 for perforce@freebsd.org; Mon, 7 Jul 2008 17:15:35 GMT (envelope-from trasz@freebsd.org) Date: Mon, 7 Jul 2008 17:15:35 GMT Message-Id: <200807071715.m67HFZOo074231@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 144832 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, 07 Jul 2008 17:15:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=144832 Change 144832 by trasz@trasz_traszkan on 2008/07/07 17:15:10 Add support for printing out ACLs in verbose form. Useful, if you're not sure if 'R' is read_attribute or read_xattr, for example. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/TODO#7 edit .. //depot/projects/soc2008/trasz_nfs4acl/bin/getfacl/getfacl.c#6 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Symbol.map#5 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_to_text.c#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_to_text_nfs4.c#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#9 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/TODO#7 (text+ko) ==== @@ -4,7 +4,7 @@ - Add the ability to add ACE at a given position in ACL to setfacl(1), -- Add the ability to parse and print ACLs in verbose form, e.g. instead of +- Add the ability to parse ACLs in verbose form, e.g. instead of owner@:rwx:f:allow ==== //depot/projects/soc2008/trasz_nfs4acl/bin/getfacl/getfacl.c#6 (text+ko) ==== @@ -54,7 +54,7 @@ usage(void) { - fprintf(stderr, "getfacl [-dhq] [file ...]\n"); + fprintf(stderr, "getfacl [-dhqv] [file ...]\n"); } static char * @@ -175,7 +175,7 @@ } static int -print_acl(char *path, acl_type_t type, int hflag, int qflag) +print_acl(char *path, acl_type_t type, int hflag, int qflag, int vflag) { struct stat sb; acl_t acl; @@ -222,7 +222,7 @@ } } - acl_text = acl_to_text(acl, 0); + acl_text = acl_to_text_np(acl, 0, vflag); if (!acl_text) { warn("%s", path); return(-1); @@ -237,7 +237,7 @@ } static int -print_acl_from_stdin(acl_type_t type, int hflag, int qflag) +print_acl_from_stdin(acl_type_t type, int hflag, int qflag, int vflag) { char *p, pathname[PATH_MAX]; int carried_error = 0; @@ -245,7 +245,7 @@ while (fgets(pathname, (int)sizeof(pathname), stdin)) { if ((p = strchr(pathname, '\n')) != NULL) *p = '\0'; - if (print_acl(pathname, type, hflag, qflag) == -1) { + if (print_acl(pathname, type, hflag, qflag, vflag) == -1) { carried_error = -1; } } @@ -259,11 +259,12 @@ acl_type_t type = ACL_TYPE_ACCESS; int carried_error = 0; int ch, error, i; - int hflag, qflag; + int hflag, qflag, vflag; hflag = 0; qflag = 0; - while ((ch = getopt(argc, argv, "dhq")) != -1) + vflag = 0; + while ((ch = getopt(argc, argv, "dhqv")) != -1) switch(ch) { case 'd': type = ACL_TYPE_DEFAULT; @@ -274,6 +275,9 @@ case 'q': qflag = 1; break; + case 'v': + vflag = 1; + break; default: usage(); return(-1); @@ -282,17 +286,17 @@ argv += optind; if (argc == 0) { - error = print_acl_from_stdin(type, hflag, qflag); + error = print_acl_from_stdin(type, hflag, qflag, vflag); return(error ? 1 : 0); } for (i = 0; i < argc; i++) { if (!strcmp(argv[i], "-")) { - error = print_acl_from_stdin(type, hflag, qflag); + error = print_acl_from_stdin(type, hflag, qflag, vflag); if (error == -1) carried_error = -1; } else { - error = print_acl(argv[i], type, hflag, qflag); + error = print_acl(argv[i], type, hflag, qflag, vflag); if (error == -1) carried_error = -1; } ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Symbol.map#5 (text) ==== @@ -48,6 +48,7 @@ acl_set_qualifier; acl_set_tag_type; acl_to_text; + acl_to_text_np; acl_valid; acl_valid_file_np; acl_valid_link_np; ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_to_text.c#3 (text+ko) ==== @@ -51,7 +51,7 @@ * a non-POSIX.1e semantics ACL. */ -char *_nfs4_acl_to_text(const acl_t acl, ssize_t *len_p); +char *_nfs4_acl_to_text_np(const acl_t acl, ssize_t *len_p, int verbose); static char * _posix1e_acl_to_text(acl_t acl, ssize_t *len_p) @@ -240,11 +240,17 @@ } char * -acl_to_text(acl_t acl, ssize_t *len_p) +acl_to_text_np(acl_t acl, ssize_t *len_p, int verbose) { if (_acl_is_nfs4(acl)) - return (_nfs4_acl_to_text(acl, len_p)); + return (_nfs4_acl_to_text_np(acl, len_p, verbose)); return (_posix1e_acl_to_text(acl, len_p)); } +char * +acl_to_text(acl_t acl, ssize_t *len_p) +{ + return (acl_to_text_np(acl, len_p, 0)); +} + ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_to_text_nfs4.c#3 (text+ko) ==== @@ -132,7 +132,7 @@ } static int -format_entry_compact(char *str, size_t size, const acl_entry_t entry) +format_entry(char *str, size_t size, const acl_entry_t entry, int verbose) { size_t off = 0, maximum_who_field_length = 18; acl_permset_t permset; @@ -152,9 +152,9 @@ off += add_padding(str, size - off, maximum_who_field_length - off); off += snprintf(str + off, size - off, ":"); - off += _nfs4_format_access_mask(str + off, size - off, *permset, 0); + off += _nfs4_format_access_mask(str + off, size - off, *permset, verbose); off += snprintf(str + off, size - off, ":"); - off += _nfs4_format_flags(str + off, size - off, *flagset, 0); + off += _nfs4_format_flags(str + off, size - off, *flagset, verbose); off += snprintf(str + off, size - off, ":"); off += format_extended(str + off, size - off, entry); @@ -165,7 +165,7 @@ } char * -_nfs4_acl_to_text(const acl_t aclp, ssize_t *len_p) +_nfs4_acl_to_text_np(const acl_t aclp, ssize_t *len_p, int verbose) { int off = 0, size, entry_id = ACL_FIRST_ENTRY; char *str; @@ -184,7 +184,7 @@ assert(off < size); - off += format_entry_compact(str + off, size - off, entry); + off += format_entry(str + off, size - off, entry, verbose); off += snprintf(str + off, size - off, "\n"); } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#9 (text+ko) ==== @@ -344,6 +344,7 @@ int acl_set_tag_type(acl_entry_t _entry_d, acl_tag_t _tag_type); ssize_t acl_size(acl_t _acl); char *acl_to_text(acl_t _acl, ssize_t *_len_p); +char *acl_to_text_np(acl_t _acl, ssize_t *_len_p, int _verbose); int acl_valid(acl_t _acl); int acl_valid_fd_np(int _fd, acl_type_t _type, acl_t _acl); int acl_valid_file_np(const char *_path_p, acl_type_t _type, acl_t _acl); From owner-p4-projects@FreeBSD.ORG Mon Jul 7 17:29:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43BEE1065670; Mon, 7 Jul 2008 17:29:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 06E3E1065671 for ; Mon, 7 Jul 2008 17:29:50 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E88878FC16 for ; Mon, 7 Jul 2008 17:29:49 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m67HTnMW075595 for ; Mon, 7 Jul 2008 17:29:49 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m67HTnQc075593 for perforce@freebsd.org; Mon, 7 Jul 2008 17:29:49 GMT (envelope-from trasz@freebsd.org) Date: Mon, 7 Jul 2008 17:29:49 GMT Message-Id: <200807071729.m67HTnQc075593@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 144834 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, 07 Jul 2008 17:29:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=144834 Change 144834 by trasz@trasz_traszkan on 2008/07/07 17:29:01 Update TODO. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/TODO#8 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/TODO#8 (text+ko) ==== @@ -12,8 +12,16 @@ owner@:read_data/write_data/execute:file_inherit:allow +- Update getfacl(1) and setfacl(1) manual pages. + - Add error checking to acl_to_text_nfs4.c. +- Either add or extend existing manual pages for new API routines: + acl_add_flag_np, acl_clear_flags_np, acl_create_entry_np, acl_delete_entry_np, + acl_delete_flag_np, acl_get_extended_np, acl_get_flag_np, acl_get_flagset_np, + acl_set_extended_np, acl_set_flagset_np, acl_to_text_np, acl_is_trivial_np, + acl_strip_np. + - Make access control more granular. The following are done: ACL_READ_DATA From owner-p4-projects@FreeBSD.ORG Mon Jul 7 17:31:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B6E98106568C; Mon, 7 Jul 2008 17:31:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B4731065674 for ; Mon, 7 Jul 2008 17:31:52 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 68CC68FC2A for ; Mon, 7 Jul 2008 17:31:52 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m67HVqYq075838 for ; Mon, 7 Jul 2008 17:31:52 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m67HVqaS075836 for perforce@freebsd.org; Mon, 7 Jul 2008 17:31:52 GMT (envelope-from trasz@freebsd.org) Date: Mon, 7 Jul 2008 17:31:52 GMT Message-Id: <200807071731.m67HVqaS075836@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 144836 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, 07 Jul 2008 17:31:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=144836 Change 144836 by trasz@trasz_traszkan on 2008/07/07 17:31:45 Remove declaration of acl_compute_trivial_np(), it was never implemented. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#10 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#10 (text+ko) ==== @@ -350,7 +350,6 @@ int acl_valid_file_np(const char *_path_p, acl_type_t _type, acl_t _acl); int acl_valid_link_np(const char *_path_p, acl_type_t _type, acl_t _acl); int acl_is_trivial_np(const acl_t _acl); -acl_t acl_compute_trivial_np(const acl_t _acl); acl_t acl_strip_np(const acl_t _acl, int recalculate_mask); __END_DECLS From owner-p4-projects@FreeBSD.ORG Mon Jul 7 17:53:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2AB88106567E; Mon, 7 Jul 2008 17:53:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E1219106564A for ; Mon, 7 Jul 2008 17:53:14 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CCB578FC22 for ; Mon, 7 Jul 2008 17:53:14 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m67HrExG077741 for ; Mon, 7 Jul 2008 17:53:14 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m67HrDsO077739 for perforce@freebsd.org; Mon, 7 Jul 2008 17:53:13 GMT (envelope-from sam@freebsd.org) Date: Mon, 7 Jul 2008 17:53:13 GMT Message-Id: <200807071753.m67HrDsO077739@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 144839 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, 07 Jul 2008 17:53:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=144839 Change 144839 by sam@sam_ebb on 2008/07/07 17:52:24 IFC @ 144838 Affected files ... .. //depot/projects/vap/Makefile.inc1#13 integrate .. //depot/projects/vap/ObsoleteFiles.inc#13 integrate .. //depot/projects/vap/UPDATING#14 integrate .. //depot/projects/vap/bin/setfacl/setfacl.1#3 integrate .. //depot/projects/vap/contrib/gcc/config/i386/freebsd.h#3 integrate .. //depot/projects/vap/etc/devd.conf#5 integrate .. //depot/projects/vap/etc/periodic/security/800.loginfail#3 integrate .. //depot/projects/vap/etc/rc.d/ipfw#4 integrate .. //depot/projects/vap/etc/rc.d/lockd#5 integrate .. //depot/projects/vap/etc/rc.d/mountcritlocal#5 integrate .. //depot/projects/vap/etc/rc.d/nfsclient#3 integrate .. //depot/projects/vap/etc/rc.d/savecore#5 integrate .. //depot/projects/vap/etc/rc.d/statd#5 integrate .. //depot/projects/vap/etc/rc.d/syscons#3 integrate .. //depot/projects/vap/games/fortune/datfiles/fortunes#10 integrate .. //depot/projects/vap/gnu/lib/Makefile#3 integrate .. //depot/projects/vap/gnu/lib/csu/Makefile#4 integrate .. //depot/projects/vap/gnu/lib/libssp/Makefile#3 integrate .. //depot/projects/vap/gnu/usr.bin/cvs/contrib/Makefile#5 integrate .. //depot/projects/vap/lib/csu/Makefile.inc#1 branch .. //depot/projects/vap/lib/libarchive/archive.h#2 integrate .. //depot/projects/vap/lib/libarchive/archive_read_support_format_zip.c#7 integrate .. //depot/projects/vap/lib/libarchive/archive_write_disk.c#10 integrate .. //depot/projects/vap/lib/libarchive/config_freebsd.h#7 integrate .. //depot/projects/vap/lib/libarchive/test/Makefile#10 integrate .. //depot/projects/vap/lib/libarchive/test/test_compat_gtar_1.tgz.uu#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_compat_zip_1.zip.uu#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_pax_filename_encoding.tar.gz.uu#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_tar_empty_filename.tar.uu#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_zip.c#4 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_zip.zip.uu#1 branch .. //depot/projects/vap/lib/libc/Makefile#3 integrate .. //depot/projects/vap/lib/libc/amd64/gen/_setjmp.S#3 integrate .. //depot/projects/vap/lib/libc/amd64/gen/setjmp.S#3 integrate .. //depot/projects/vap/lib/libc/gen/glob.c#3 integrate .. //depot/projects/vap/lib/libc/i386/gen/_setjmp.S#3 integrate .. //depot/projects/vap/lib/libc/i386/gen/setjmp.S#3 integrate .. //depot/projects/vap/lib/libc/net/getaddrinfo.3#3 integrate .. //depot/projects/vap/lib/libc/stdio/Makefile.inc#4 integrate .. //depot/projects/vap/lib/libc/stdio/printf-pos.c#1 branch .. //depot/projects/vap/lib/libc/stdio/printflocal.h#1 branch .. //depot/projects/vap/lib/libc/stdio/vfprintf.c#4 integrate .. //depot/projects/vap/lib/libc/stdio/vfwprintf.c#5 integrate .. //depot/projects/vap/lib/libc/stdlib/hcreate.3#3 integrate .. //depot/projects/vap/lib/libc/stdlib/hcreate.c#3 integrate .. //depot/projects/vap/lib/libc/stdlib/system.3#3 integrate .. //depot/projects/vap/lib/libc/sys/mkdir.2#5 integrate .. //depot/projects/vap/lib/libc/sys/socket.2#3 integrate .. //depot/projects/vap/lib/libstand/Makefile#4 integrate .. //depot/projects/vap/lib/libthr/Makefile#7 integrate .. //depot/projects/vap/lib/libthr/thread/thr_mutex.c#9 integrate .. //depot/projects/vap/lib/libthr/thread/thr_umtx.c#5 integrate .. //depot/projects/vap/lib/libthr/thread/thr_umtx.h#5 integrate .. //depot/projects/vap/lib/libutil/Makefile#4 integrate .. //depot/projects/vap/lib/libutil/expand_number.c#3 integrate .. //depot/projects/vap/lib/libutil/hexdump.3#1 branch .. //depot/projects/vap/lib/libutil/hexdump.c#1 branch .. //depot/projects/vap/lib/libutil/libutil.h#4 integrate .. //depot/projects/vap/lib/msun/man/cos.3#4 integrate .. //depot/projects/vap/libexec/rtld-elf/Makefile#3 integrate .. //depot/projects/vap/release/Makefile#5 integrate .. //depot/projects/vap/release/doc/en_US.ISO8859-1/hardware/article.sgml#6 integrate .. //depot/projects/vap/release/picobsd/build/picobsd#3 integrate .. //depot/projects/vap/release/scripts/src-install.sh#3 integrate .. //depot/projects/vap/rescue/librescue/Makefile#3 integrate .. //depot/projects/vap/rescue/rescue/Makefile#6 integrate .. //depot/projects/vap/sbin/Makefile#5 integrate .. //depot/projects/vap/sbin/atacontrol/atacontrol.8#4 integrate .. //depot/projects/vap/sbin/devfs/devfs.8#3 integrate .. //depot/projects/vap/sbin/dhclient/dhclient.c#8 integrate .. //depot/projects/vap/sbin/geom/Makefile#5 integrate .. //depot/projects/vap/sbin/ggate/ggated/ggated.c#4 integrate .. //depot/projects/vap/sbin/quotacheck/preen.c#4 integrate .. //depot/projects/vap/sbin/quotacheck/quotacheck.c#5 integrate .. //depot/projects/vap/sbin/sconfig/sconfig.c#4 integrate .. //depot/projects/vap/secure/usr.bin/bdes/bdes.ps#3 integrate .. //depot/projects/vap/share/man/man4/Makefile#15 integrate .. //depot/projects/vap/share/man/man4/aac.4#4 integrate .. //depot/projects/vap/share/man/man4/bpf.4#5 integrate .. //depot/projects/vap/share/man/man4/cnw.4#4 delete .. //depot/projects/vap/share/man/man4/ed.4#6 integrate .. //depot/projects/vap/share/man/man4/malo.4#5 integrate .. //depot/projects/vap/share/man/man4/man4.i386/Makefile#3 integrate .. //depot/projects/vap/share/man/man4/man4.i386/arl.4#3 delete .. //depot/projects/vap/share/man/man4/man4.i386/oltr.4#3 delete .. //depot/projects/vap/share/man/man4/man4.i386/sbni.4#3 delete .. //depot/projects/vap/share/man/man4/man4.powerpc/Makefile#3 integrate .. //depot/projects/vap/share/man/man4/man4.powerpc/bm.4#1 branch .. //depot/projects/vap/share/man/man4/sbsh.4#3 delete .. //depot/projects/vap/share/man/man4/snd_emu10kx.4#4 integrate .. //depot/projects/vap/share/man/man4/uftdi.4#3 integrate .. //depot/projects/vap/share/man/man5/src.conf.5#8 integrate .. //depot/projects/vap/share/misc/committers-doc.dot#7 integrate .. //depot/projects/vap/share/misc/committers-ports.dot#7 integrate .. //depot/projects/vap/share/misc/committers-src.dot#7 integrate .. //depot/projects/vap/share/mk/bsd.cpu.mk#6 integrate .. //depot/projects/vap/share/mk/bsd.sys.mk#3 integrate .. //depot/projects/vap/sys/amd64/amd64/bpf_jit_machdep.c#4 integrate .. //depot/projects/vap/sys/amd64/amd64/bpf_jit_machdep.h#4 integrate .. //depot/projects/vap/sys/amd64/amd64/mp_machdep.c#8 integrate .. //depot/projects/vap/sys/amd64/amd64/pmap.c#20 integrate .. //depot/projects/vap/sys/amd64/include/iodev.h#3 integrate .. //depot/projects/vap/sys/amd64/include/memdev.h#3 integrate .. //depot/projects/vap/sys/amd64/include/pmap.h#7 integrate .. //depot/projects/vap/sys/amd64/include/vmparam.h#7 integrate .. //depot/projects/vap/sys/arm/include/memdev.h#3 integrate .. //depot/projects/vap/sys/boot/Makefile.inc#1 branch .. //depot/projects/vap/sys/boot/arm/Makefile.inc#1 branch .. //depot/projects/vap/sys/boot/arm/at91/Makefile.inc#3 integrate .. //depot/projects/vap/sys/boot/efi/Makefile.inc#3 integrate .. //depot/projects/vap/sys/boot/forth/loader.conf#9 integrate .. //depot/projects/vap/sys/boot/i386/Makefile.inc#6 integrate .. //depot/projects/vap/sys/boot/i386/boot2/boot2.c#6 integrate .. //depot/projects/vap/sys/boot/i386/loader/Makefile#5 integrate .. //depot/projects/vap/sys/boot/ia64/Makefile.inc#3 integrate .. //depot/projects/vap/sys/boot/ia64/common/Makefile#3 integrate .. //depot/projects/vap/sys/boot/ia64/efi/Makefile#5 integrate .. //depot/projects/vap/sys/boot/ia64/ski/Makefile#5 integrate .. //depot/projects/vap/sys/boot/ofw/Makefile.inc#1 branch .. //depot/projects/vap/sys/boot/pc98/Makefile.inc#5 integrate .. //depot/projects/vap/sys/boot/pc98/boot2/Makefile#6 integrate .. //depot/projects/vap/sys/boot/pc98/boot2/README.serial.98#3 delete .. //depot/projects/vap/sys/boot/pc98/loader/Makefile#5 integrate .. //depot/projects/vap/sys/boot/powerpc/Makefile.inc#1 branch .. //depot/projects/vap/sys/boot/powerpc/ofw/Makefile#4 integrate .. //depot/projects/vap/sys/boot/sparc64/Makefile.inc#3 integrate .. //depot/projects/vap/sys/boot/sparc64/loader/Makefile#5 integrate .. //depot/projects/vap/sys/boot/uboot/Makefile.inc#1 branch .. //depot/projects/vap/sys/compat/linux/linux_misc.c#12 integrate .. //depot/projects/vap/sys/compat/pecoff/imgact_pecoff.c#8 delete .. //depot/projects/vap/sys/compat/pecoff/imgact_pecoff.h#3 delete .. //depot/projects/vap/sys/compat/svr4/svr4_stat.c#6 integrate .. //depot/projects/vap/sys/conf/NOTES#23 integrate .. //depot/projects/vap/sys/conf/files.i386#13 integrate .. //depot/projects/vap/sys/conf/files.pc98#12 integrate .. //depot/projects/vap/sys/conf/kern.mk#8 integrate .. //depot/projects/vap/sys/conf/kern.post.mk#8 integrate .. //depot/projects/vap/sys/contrib/dev/oltr/COPYRIGHT#3 delete .. //depot/projects/vap/sys/contrib/dev/oltr/i386-elf.trlld.o.uu#3 delete .. //depot/projects/vap/sys/contrib/dev/oltr/if_oltr.c#6 delete .. //depot/projects/vap/sys/contrib/dev/oltr/if_oltr_isa.c#3 delete .. //depot/projects/vap/sys/contrib/dev/oltr/if_oltr_pci.c#5 delete .. //depot/projects/vap/sys/contrib/dev/oltr/if_oltrvar.h#5 delete .. //depot/projects/vap/sys/contrib/dev/oltr/trlld.h#3 delete .. //depot/projects/vap/sys/contrib/dev/oltr/trlldbm.c#3 delete .. //depot/projects/vap/sys/contrib/dev/oltr/trlldhm.c#3 delete .. //depot/projects/vap/sys/contrib/dev/oltr/trlldmac.c#3 delete .. //depot/projects/vap/sys/dev/aac/aac.c#12 integrate .. //depot/projects/vap/sys/dev/aac/aac_pci.c#8 integrate .. //depot/projects/vap/sys/dev/acpi_support/acpi_asus.c#8 integrate .. //depot/projects/vap/sys/dev/arl/if_arl.c#5 delete .. //depot/projects/vap/sys/dev/arl/if_arl_isa.c#5 delete .. //depot/projects/vap/sys/dev/arl/if_arlreg.h#5 delete .. //depot/projects/vap/sys/dev/bm/if_bm.c#2 integrate .. //depot/projects/vap/sys/dev/bm/if_bmreg.h#2 integrate .. //depot/projects/vap/sys/dev/bm/if_bmvar.h#2 integrate .. //depot/projects/vap/sys/dev/ce/ceddk.h#3 integrate .. //depot/projects/vap/sys/dev/ce/if_ce.c#3 integrate .. //depot/projects/vap/sys/dev/cnw/if_cnw.c#6 delete .. //depot/projects/vap/sys/dev/cnw/if_cnwioctl.h#3 delete .. //depot/projects/vap/sys/dev/cnw/if_cnwreg.h#3 delete .. //depot/projects/vap/sys/dev/cp/cpddk.h#3 integrate .. //depot/projects/vap/sys/dev/cp/if_cp.c#6 integrate .. //depot/projects/vap/sys/dev/ctau/ctddk.h#3 integrate .. //depot/projects/vap/sys/dev/ctau/if_ct.c#6 integrate .. //depot/projects/vap/sys/dev/cx/cxddk.h#3 integrate .. //depot/projects/vap/sys/dev/cx/if_cx.c#5 integrate .. //depot/projects/vap/sys/dev/ed/if_ed_pccard.c#6 integrate .. //depot/projects/vap/sys/dev/io/iodev.c#3 integrate .. //depot/projects/vap/sys/dev/k8temp/k8temp.c#6 integrate .. //depot/projects/vap/sys/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/vap/sys/dev/lmc/if_lmc.h#3 integrate .. //depot/projects/vap/sys/dev/mfi/mfi.c#9 integrate .. //depot/projects/vap/sys/dev/mii/rgephy.c#6 integrate .. //depot/projects/vap/sys/dev/mii/rgephyreg.h#5 integrate .. //depot/projects/vap/sys/dev/mpt/mpt_pci.c#7 integrate .. //depot/projects/vap/sys/dev/mpt/mpt_user.c#2 integrate .. //depot/projects/vap/sys/dev/pccard/pccarddevs#7 integrate .. //depot/projects/vap/sys/dev/re/if_re.c#12 integrate .. //depot/projects/vap/sys/dev/sbni/if_sbni.c#5 delete .. //depot/projects/vap/sys/dev/sbni/if_sbni_isa.c#5 delete .. //depot/projects/vap/sys/dev/sbni/if_sbni_pci.c#5 delete .. //depot/projects/vap/sys/dev/sbni/if_sbnireg.h#3 delete .. //depot/projects/vap/sys/dev/sbni/if_sbnivar.h#5 delete .. //depot/projects/vap/sys/dev/sbsh/if_sbsh.c#6 delete .. //depot/projects/vap/sys/dev/sbsh/if_sbshreg.h#3 delete .. //depot/projects/vap/sys/dev/sound/pci/atiixp.h#3 integrate .. //depot/projects/vap/sys/dev/syscons/daemon/daemon_saver.c#6 integrate .. //depot/projects/vap/sys/dev/usb/usb_ethersubr.c#6 integrate .. //depot/projects/vap/sys/dev/usb/usbdevs#22 integrate .. //depot/projects/vap/sys/dev/usb/uscanner.c#8 integrate .. //depot/projects/vap/sys/fs/cd9660/cd9660_rrip.c#3 integrate .. //depot/projects/vap/sys/fs/msdosfs/msdosfs_vnops.c#9 integrate .. //depot/projects/vap/sys/fs/smbfs/smbfs_node.c#10 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum_drive.c#7 integrate .. //depot/projects/vap/sys/geom/virstor/g_virstor.c#3 integrate .. //depot/projects/vap/sys/i386/conf/NOTES#13 integrate .. //depot/projects/vap/sys/i386/i386/bpf_jit_machdep.c#4 integrate .. //depot/projects/vap/sys/i386/i386/bpf_jit_machdep.h#4 integrate .. //depot/projects/vap/sys/i386/i386/mp_machdep.c#10 integrate .. //depot/projects/vap/sys/i386/i386/pmap.c#16 integrate .. //depot/projects/vap/sys/i386/ibcs2/ibcs2_socksys.c#5 integrate .. //depot/projects/vap/sys/i386/include/iodev.h#3 integrate .. //depot/projects/vap/sys/i386/include/memdev.h#3 integrate .. //depot/projects/vap/sys/ia64/ia64/machdep.c#16 integrate .. //depot/projects/vap/sys/ia64/include/ia64_cpu.h#5 integrate .. //depot/projects/vap/sys/ia64/include/memdev.h#3 integrate .. //depot/projects/vap/sys/kern/kern_alq.c#8 integrate .. //depot/projects/vap/sys/kern/kern_cpuset.c#8 integrate .. //depot/projects/vap/sys/kern/kern_descrip.c#16 integrate .. //depot/projects/vap/sys/kern/kern_event.c#10 integrate .. //depot/projects/vap/sys/kern/kern_fork.c#9 integrate .. //depot/projects/vap/sys/kern/kern_intr.c#12 integrate .. //depot/projects/vap/sys/kern/kern_jail.c#11 integrate .. //depot/projects/vap/sys/kern/kern_lockf.c#10 integrate .. //depot/projects/vap/sys/kern/kern_malloc.c#9 integrate .. //depot/projects/vap/sys/kern/kern_mib.c#9 integrate .. //depot/projects/vap/sys/kern/kern_poll.c#7 integrate .. //depot/projects/vap/sys/kern/kern_umtx.c#10 integrate .. //depot/projects/vap/sys/kern/kern_xxx.c#5 integrate .. //depot/projects/vap/sys/kern/stack_protector.c#1 branch .. //depot/projects/vap/sys/kern/subr_param.c#7 integrate .. //depot/projects/vap/sys/kern/uipc_debug.c#4 integrate .. //depot/projects/vap/sys/kern/uipc_sem.c#10 integrate .. //depot/projects/vap/sys/kern/uipc_shm.c#5 integrate .. //depot/projects/vap/sys/kern/uipc_socket.c#12 integrate .. //depot/projects/vap/sys/kern/uipc_usrreq.c#8 integrate .. //depot/projects/vap/sys/mips/adm5120/adm5120_machdep.c#1 branch .. //depot/projects/vap/sys/mips/adm5120/adm5120reg.h#1 branch .. //depot/projects/vap/sys/mips/adm5120/admpci.c#1 branch .. //depot/projects/vap/sys/mips/adm5120/console.c#1 branch .. //depot/projects/vap/sys/mips/adm5120/files.adm5120#1 branch .. //depot/projects/vap/sys/mips/adm5120/if_admsw.c#1 branch .. //depot/projects/vap/sys/mips/adm5120/if_admswreg.h#1 branch .. //depot/projects/vap/sys/mips/adm5120/if_admswvar.h#1 branch .. //depot/projects/vap/sys/mips/adm5120/obio.c#1 branch .. //depot/projects/vap/sys/mips/adm5120/obiovar.h#1 branch .. //depot/projects/vap/sys/mips/adm5120/std.adm5120#1 branch .. //depot/projects/vap/sys/mips/adm5120/uart_bus_adm5120.c#1 branch .. //depot/projects/vap/sys/mips/adm5120/uart_cpu_adm5120.c#1 branch .. //depot/projects/vap/sys/mips/adm5120/uart_dev_adm5120.c#1 branch .. //depot/projects/vap/sys/mips/adm5120/uart_dev_adm5120.h#1 branch .. //depot/projects/vap/sys/mips/idt/files.idt#1 branch .. //depot/projects/vap/sys/mips/idt/idt_machdep.c#1 branch .. //depot/projects/vap/sys/mips/idt/idtpci.c#1 branch .. //depot/projects/vap/sys/mips/idt/idtreg.h#1 branch .. //depot/projects/vap/sys/mips/idt/if_kr.c#1 branch .. //depot/projects/vap/sys/mips/idt/if_krreg.h#1 branch .. //depot/projects/vap/sys/mips/idt/obio.c#1 branch .. //depot/projects/vap/sys/mips/idt/obiovar.h#1 branch .. //depot/projects/vap/sys/mips/idt/std.idt#1 branch .. //depot/projects/vap/sys/mips/idt/uart_bus_rc32434.c#1 branch .. //depot/projects/vap/sys/mips/idt/uart_cpu_rc32434.c#1 branch .. //depot/projects/vap/sys/mips/include/iodev.h#2 integrate .. //depot/projects/vap/sys/mips/include/memdev.h#2 integrate .. //depot/projects/vap/sys/mips/malta/files.malta#1 branch .. //depot/projects/vap/sys/mips/malta/gt.c#1 branch .. //depot/projects/vap/sys/mips/malta/gt_pci.c#1 branch .. //depot/projects/vap/sys/mips/malta/gtreg.h#1 branch .. //depot/projects/vap/sys/mips/malta/gtvar.h#1 branch .. //depot/projects/vap/sys/mips/malta/malta_machdep.c#1 branch .. //depot/projects/vap/sys/mips/malta/maltareg.h#1 branch .. //depot/projects/vap/sys/mips/malta/obio.c#1 branch .. //depot/projects/vap/sys/mips/malta/obiovar.h#1 branch .. //depot/projects/vap/sys/mips/malta/std.malta#1 branch .. //depot/projects/vap/sys/mips/malta/uart_bus_maltausart.c#1 branch .. //depot/projects/vap/sys/mips/malta/uart_cpu_maltausart.c#1 branch .. //depot/projects/vap/sys/mips/malta/yamon.c#1 branch .. //depot/projects/vap/sys/mips/malta/yamon.h#1 branch .. //depot/projects/vap/sys/mips/mips/pmap.c#5 integrate .. //depot/projects/vap/sys/mips/mips32/adm5120/adm5120_machdep.c#2 delete .. //depot/projects/vap/sys/mips/mips32/adm5120/adm5120reg.h#2 delete .. //depot/projects/vap/sys/mips/mips32/adm5120/admpci.c#2 delete .. //depot/projects/vap/sys/mips/mips32/adm5120/console.c#2 delete .. //depot/projects/vap/sys/mips/mips32/adm5120/files.adm5120#2 delete .. //depot/projects/vap/sys/mips/mips32/adm5120/if_admsw.c#2 delete .. //depot/projects/vap/sys/mips/mips32/adm5120/if_admswreg.h#2 delete .. //depot/projects/vap/sys/mips/mips32/adm5120/if_admswvar.h#2 delete .. //depot/projects/vap/sys/mips/mips32/adm5120/obio.c#2 delete .. //depot/projects/vap/sys/mips/mips32/adm5120/obiovar.h#2 delete .. //depot/projects/vap/sys/mips/mips32/adm5120/std.adm5120#2 delete .. //depot/projects/vap/sys/mips/mips32/adm5120/uart_bus_adm5120.c#2 delete .. //depot/projects/vap/sys/mips/mips32/adm5120/uart_cpu_adm5120.c#2 delete .. //depot/projects/vap/sys/mips/mips32/adm5120/uart_dev_adm5120.c#2 delete .. //depot/projects/vap/sys/mips/mips32/adm5120/uart_dev_adm5120.h#2 delete .. //depot/projects/vap/sys/mips/mips32/idt/files.idt#2 delete .. //depot/projects/vap/sys/mips/mips32/idt/idt_machdep.c#2 delete .. //depot/projects/vap/sys/mips/mips32/idt/idtpci.c#2 delete .. //depot/projects/vap/sys/mips/mips32/idt/idtreg.h#2 delete .. //depot/projects/vap/sys/mips/mips32/idt/if_kr.c#2 delete .. //depot/projects/vap/sys/mips/mips32/idt/if_krreg.h#2 delete .. //depot/projects/vap/sys/mips/mips32/idt/obio.c#2 delete .. //depot/projects/vap/sys/mips/mips32/idt/obiovar.h#2 delete .. //depot/projects/vap/sys/mips/mips32/idt/std.idt#2 delete .. //depot/projects/vap/sys/mips/mips32/idt/uart_bus_rc32434.c#2 delete .. //depot/projects/vap/sys/mips/mips32/idt/uart_cpu_rc32434.c#2 delete .. //depot/projects/vap/sys/mips/mips32/malta/files.malta#2 delete .. //depot/projects/vap/sys/mips/mips32/malta/gt.c#2 delete .. //depot/projects/vap/sys/mips/mips32/malta/gt_pci.c#2 delete .. //depot/projects/vap/sys/mips/mips32/malta/gtreg.h#2 delete .. //depot/projects/vap/sys/mips/mips32/malta/gtvar.h#2 delete .. //depot/projects/vap/sys/mips/mips32/malta/malta_machdep.c#2 delete .. //depot/projects/vap/sys/mips/mips32/malta/maltareg.h#2 delete .. //depot/projects/vap/sys/mips/mips32/malta/obio.c#2 delete .. //depot/projects/vap/sys/mips/mips32/malta/obiovar.h#2 delete .. //depot/projects/vap/sys/mips/mips32/malta/std.malta#2 delete .. //depot/projects/vap/sys/mips/mips32/malta/uart_bus_maltausart.c#2 delete .. //depot/projects/vap/sys/mips/mips32/malta/uart_cpu_maltausart.c#2 delete .. //depot/projects/vap/sys/mips/mips32/malta/yamon.c#2 delete .. //depot/projects/vap/sys/mips/mips32/malta/yamon.h#2 delete .. //depot/projects/vap/sys/mips/mips32/sentry5/files.sentry5#2 delete .. //depot/projects/vap/sys/mips/mips32/sentry5/obio.c#2 delete .. //depot/projects/vap/sys/mips/mips32/sentry5/obiovar.h#2 delete .. //depot/projects/vap/sys/mips/mips32/sentry5/s5_machdep.c#2 delete .. //depot/projects/vap/sys/mips/mips32/sentry5/s5reg.h#2 delete .. //depot/projects/vap/sys/mips/mips32/sentry5/siba_cc.c#2 delete .. //depot/projects/vap/sys/mips/mips32/sentry5/siba_mips.c#2 delete .. //depot/projects/vap/sys/mips/mips32/sentry5/siba_sdram.c#2 delete .. //depot/projects/vap/sys/mips/mips32/sentry5/uart_bus_sbusart.c#2 delete .. //depot/projects/vap/sys/mips/mips32/sentry5/uart_cpu_sbusart.c#2 delete .. //depot/projects/vap/sys/mips/sentry5/files.sentry5#1 branch .. //depot/projects/vap/sys/mips/sentry5/obio.c#1 branch .. //depot/projects/vap/sys/mips/sentry5/obiovar.h#1 branch .. //depot/projects/vap/sys/mips/sentry5/s5_machdep.c#1 branch .. //depot/projects/vap/sys/mips/sentry5/s5reg.h#1 branch .. //depot/projects/vap/sys/mips/sentry5/siba_cc.c#1 branch .. //depot/projects/vap/sys/mips/sentry5/siba_mips.c#1 branch .. //depot/projects/vap/sys/mips/sentry5/siba_sdram.c#1 branch .. //depot/projects/vap/sys/mips/sentry5/uart_bus_sbusart.c#1 branch .. //depot/projects/vap/sys/mips/sentry5/uart_cpu_sbusart.c#1 branch .. //depot/projects/vap/sys/modules/Makefile#33 integrate .. //depot/projects/vap/sys/modules/arl/Makefile#6 delete .. //depot/projects/vap/sys/modules/cnw/Makefile#2 delete .. //depot/projects/vap/sys/modules/nfslockd/Makefile#2 integrate .. //depot/projects/vap/sys/modules/oltr/Makefile#4 delete .. //depot/projects/vap/sys/modules/pecoff/Makefile#5 delete .. //depot/projects/vap/sys/modules/ralfw/Makefile#6 integrate .. //depot/projects/vap/sys/modules/sbni/Makefile#3 delete .. //depot/projects/vap/sys/modules/sbsh/Makefile#3 delete .. //depot/projects/vap/sys/modules/sem/Makefile#5 integrate .. //depot/projects/vap/sys/net/bpf.c#16 integrate .. //depot/projects/vap/sys/net/bpf.h#7 integrate .. //depot/projects/vap/sys/net/bpf_zerocopy.c#5 integrate .. //depot/projects/vap/sys/net/bpf_zerocopy.h#3 integrate .. //depot/projects/vap/sys/net/if.c#14 integrate .. //depot/projects/vap/sys/net/if_bridge.c#5 integrate .. //depot/projects/vap/sys/net/if_gre.c#9 integrate .. //depot/projects/vap/sys/net/if_lagg.c#5 integrate .. //depot/projects/vap/sys/net/if_loop.c#10 integrate .. //depot/projects/vap/sys/net/if_ppp.c#6 integrate .. //depot/projects/vap/sys/net/if_var.h#10 integrate .. //depot/projects/vap/sys/net/netisr.c#6 integrate .. //depot/projects/vap/sys/net/netisr.h#4 integrate .. //depot/projects/vap/sys/net/raw_cb.c#7 integrate .. //depot/projects/vap/sys/net/raw_cb.h#3 integrate .. //depot/projects/vap/sys/net/raw_usrreq.c#5 integrate .. //depot/projects/vap/sys/net/rtsock.c#9 integrate .. //depot/projects/vap/sys/net80211/ieee80211_ht.c#24 integrate .. //depot/projects/vap/sys/net80211/ieee80211_output.c#52 integrate .. //depot/projects/vap/sys/netatalk/ddp_usrreq.c#6 integrate .. //depot/projects/vap/sys/netgraph/netgraph.h#9 integrate .. //depot/projects/vap/sys/netgraph/ng_base.c#19 integrate .. //depot/projects/vap/sys/netinet/if_ether.c#8 integrate .. //depot/projects/vap/sys/netinet/in.c#7 integrate .. //depot/projects/vap/sys/netinet/ip_gre.c#5 integrate .. //depot/projects/vap/sys/netinet/ip_input.c#9 integrate .. //depot/projects/vap/sys/netinet/raw_ip.c#10 integrate .. //depot/projects/vap/sys/netinet/udp_usrreq.c#8 integrate .. //depot/projects/vap/sys/netinet6/frag6.c#6 integrate .. //depot/projects/vap/sys/netinet6/icmp6.c#9 integrate .. //depot/projects/vap/sys/netinet6/in6.c#9 integrate .. //depot/projects/vap/sys/netinet6/in6_ifattach.c#8 integrate .. //depot/projects/vap/sys/netinet6/in6_rmx.c#7 integrate .. //depot/projects/vap/sys/netinet6/ip6_forward.c#6 integrate .. //depot/projects/vap/sys/netinet6/ip6_input.c#8 integrate .. //depot/projects/vap/sys/netinet6/ip6_ipsec.c#5 integrate .. //depot/projects/vap/sys/netinet6/raw_ip6.c#10 integrate .. //depot/projects/vap/sys/netinet6/udp6_usrreq.c#10 integrate .. //depot/projects/vap/sys/netipsec/key.c#8 integrate .. //depot/projects/vap/sys/netipx/ipx_input.c#6 integrate .. //depot/projects/vap/sys/netnatm/natm_proto.c#6 integrate .. //depot/projects/vap/sys/nfsclient/bootp_subr.c#8 integrate .. //depot/projects/vap/sys/nfsclient/nfs.h#6 integrate .. //depot/projects/vap/sys/nfsclient/nfs_node.c#8 integrate .. //depot/projects/vap/sys/nfsclient/nfs_vfsops.c#13 integrate .. //depot/projects/vap/sys/nfsclient/nfs_vnops.c#13 integrate .. //depot/projects/vap/sys/nfsclient/nfsmount.h#5 integrate .. //depot/projects/vap/sys/nfsclient/nfsnode.h#8 integrate .. //depot/projects/vap/sys/nfsserver/nfs_syscalls.c#7 integrate .. //depot/projects/vap/sys/nlm/nlm.h#2 integrate .. //depot/projects/vap/sys/nlm/nlm_advlock.c#1 branch .. //depot/projects/vap/sys/nlm/nlm_prot.h#2 integrate .. //depot/projects/vap/sys/nlm/nlm_prot_clnt.c#2 integrate .. //depot/projects/vap/sys/nlm/nlm_prot_impl.c#6 integrate .. //depot/projects/vap/sys/nlm/nlm_prot_server.c#2 integrate .. //depot/projects/vap/sys/pc98/conf/NOTES#10 integrate .. //depot/projects/vap/sys/pc98/include/bus.h#5 integrate .. //depot/projects/vap/sys/pc98/pc98/busiosubr.c#3 integrate .. //depot/projects/vap/sys/pci/if_rlreg.h#11 integrate .. //depot/projects/vap/sys/powerpc/include/memdev.h#3 integrate .. //depot/projects/vap/sys/rpc/auth_unix.c#2 integrate .. //depot/projects/vap/sys/rpc/authunix_prot.c#2 integrate .. //depot/projects/vap/sys/rpc/clnt.h#2 integrate .. //depot/projects/vap/sys/rpc/clnt_dg.c#2 integrate .. //depot/projects/vap/sys/rpc/clnt_rc.c#3 integrate .. //depot/projects/vap/sys/rpc/clnt_vc.c#2 integrate .. //depot/projects/vap/sys/rpc/rpcb_clnt.c#2 integrate .. //depot/projects/vap/sys/rpc/svc_vc.c#2 integrate .. //depot/projects/vap/sys/security/mac/mac_framework.h#7 integrate .. //depot/projects/vap/sys/security/mac/mac_policy.h#7 integrate .. //depot/projects/vap/sys/security/mac/mac_posix_sem.c#5 integrate .. //depot/projects/vap/sys/security/mac_biba/mac_biba.c#8 integrate .. //depot/projects/vap/sys/security/mac_mls/mac_mls.c#9 integrate .. //depot/projects/vap/sys/security/mac_stub/mac_stub.c#9 integrate .. //depot/projects/vap/sys/security/mac_test/mac_test.c#9 integrate .. //depot/projects/vap/sys/sparc64/include/in_cksum.h#5 integrate .. //depot/projects/vap/sys/sparc64/include/memdev.h#3 integrate .. //depot/projects/vap/sys/sparc64/sparc64/in_cksum.c#3 integrate .. //depot/projects/vap/sys/sun4v/include/in_cksum.h#3 integrate .. //depot/projects/vap/sys/sun4v/include/memdev.h#3 integrate .. //depot/projects/vap/sys/sys/event.h#7 integrate .. //depot/projects/vap/sys/sys/fcntl.h#6 integrate .. //depot/projects/vap/sys/sys/file.h#8 integrate .. //depot/projects/vap/sys/sys/kernel.h#11 integrate .. //depot/projects/vap/sys/sys/ksem.h#3 integrate .. //depot/projects/vap/sys/sys/lockf.h#8 integrate .. //depot/projects/vap/sys/sys/param.h#24 integrate .. //depot/projects/vap/sys/sys/priv.h#6 integrate .. //depot/projects/vap/sys/sys/semaphore.h#3 integrate .. //depot/projects/vap/sys/sys/socketvar.h#11 integrate .. //depot/projects/vap/sys/sys/umtx.h#8 integrate .. //depot/projects/vap/sys/sys/user.h#10 integrate .. //depot/projects/vap/sys/vm/vm_kern.h#5 integrate .. //depot/projects/vap/tools/build/options/WITHOUT_SSP#3 integrate .. //depot/projects/vap/tools/regression/file/flock/flock.c#2 integrate .. //depot/projects/vap/tools/regression/lib/libc/stdio/Makefile#3 integrate .. //depot/projects/vap/tools/regression/lib/libc/stdio/test-print-positional.c#1 branch .. //depot/projects/vap/tools/regression/lib/msun/Makefile#7 integrate .. //depot/projects/vap/tools/regression/lib/msun/test-fmaxmin.c#1 branch .. //depot/projects/vap/tools/regression/lib/msun/test-fmaxmin.t#1 branch .. //depot/projects/vap/tools/regression/posixsem/Makefile#1 branch .. //depot/projects/vap/tools/regression/posixsem/posixsem.c#1 branch .. //depot/projects/vap/tools/regression/posixsem/posixsem.t#1 branch .. //depot/projects/vap/tools/regression/posixsem/test.c#1 branch .. //depot/projects/vap/tools/regression/posixsem/test.h#1 branch .. //depot/projects/vap/tools/regression/posixshm/test.c#2 integrate .. //depot/projects/vap/usr.bin/cpio/Makefile#3 integrate .. //depot/projects/vap/usr.bin/cpio/config_freebsd.h#2 integrate .. //depot/projects/vap/usr.bin/cpio/cpio.c#3 integrate .. //depot/projects/vap/usr.bin/gzip/gzip.1#3 integrate .. //depot/projects/vap/usr.bin/gzip/unbzip2.c#3 integrate .. //depot/projects/vap/usr.bin/gzip/znew#4 integrate .. //depot/projects/vap/usr.bin/ldd/ldd.1#4 integrate .. //depot/projects/vap/usr.bin/ldd/ldd.c#3 integrate .. //depot/projects/vap/usr.bin/make/make.1#6 integrate .. //depot/projects/vap/usr.bin/procstat/procstat_files.c#4 integrate .. //depot/projects/vap/usr.bin/su/su.1#3 integrate .. //depot/projects/vap/usr.bin/tar/Makefile#7 integrate .. //depot/projects/vap/usr.bin/tar/bsdtar.h#7 integrate .. //depot/projects/vap/usr.bin/tar/config_freebsd.h#6 integrate .. //depot/projects/vap/usr.bin/tar/read.c#7 integrate .. //depot/projects/vap/usr.bin/tar/write.c#8 integrate .. //depot/projects/vap/usr.bin/unzip/unzip.1#2 integrate .. //depot/projects/vap/usr.bin/unzip/unzip.c#2 integrate .. //depot/projects/vap/usr.sbin/Makefile#9 integrate .. //depot/projects/vap/usr.sbin/arlcontrol/Makefile#3 delete .. //depot/projects/vap/usr.sbin/arlcontrol/arlcontrol.8#3 delete .. //depot/projects/vap/usr.sbin/arlcontrol/arlcontrol.c#3 delete .. //depot/projects/vap/usr.sbin/config/mkmakefile.c#5 integrate .. //depot/projects/vap/usr.sbin/cron/cron/cron.8#3 integrate .. //depot/projects/vap/usr.sbin/cron/cron/cron.c#3 integrate .. //depot/projects/vap/usr.sbin/cron/cron/cron.h#3 integrate .. //depot/projects/vap/usr.sbin/cron/cron/do_command.c#3 integrate .. //depot/projects/vap/usr.sbin/edquota/edquota.c#3 integrate .. //depot/projects/vap/usr.sbin/mountd/exports.5#3 integrate .. //depot/projects/vap/usr.sbin/newsyslog/newsyslog.conf.5#3 integrate .. //depot/projects/vap/usr.sbin/ngctl/main.c#3 integrate .. //depot/projects/vap/usr.sbin/pmcstat/pmcstat.8#4 integrate .. //depot/projects/vap/usr.sbin/pmcstat/pmcstat.c#4 integrate .. //depot/projects/vap/usr.sbin/quot/quot.c#3 integrate .. //depot/projects/vap/usr.sbin/quotaon/quotaon.c#3 integrate .. //depot/projects/vap/usr.sbin/repquota/repquota.c#3 integrate .. //depot/projects/vap/usr.sbin/rpc.lockd/lockd.c#7 integrate .. //depot/projects/vap/usr.sbin/rpc.statd/file.c#3 integrate .. //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/Makefile#6 integrate .. //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#3 integrate Differences ... ==== //depot/projects/vap/Makefile.inc1#13 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.606 2008/06/18 13:52:58 obrien Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.607 2008/06/25 21:33:28 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -225,6 +225,7 @@ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} \ + -DWITHOUT_SSP \ -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \ -DWITHOUT_NLS -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF @@ -235,7 +236,7 @@ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS \ - -DNO_WARNS -DNO_CTF + -DNO_WARNS -DNO_CTF -DWITHOUT_SSP # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ @@ -452,7 +453,7 @@ .if ${MK_KERBEROS} != "no" .for _t in obj depend all cd ${.CURDIR}/kerberos5/tools; \ - MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} DESTDIR= ${_t} + MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} -DWITHOUT_SSP DESTDIR= ${_t} .endfor .endif .for _t in obj includes @@ -474,7 +475,7 @@ .endfor .for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic cd ${.CURDIR}/${_dir}; \ - MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} DESTDIR= build-tools + MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} -DWITHOUT_SSP DESTDIR= build-tools .endfor cd ${.CURDIR}; \ ${LIB32WMAKE} -f Makefile.inc1 libraries @@ -760,14 +761,14 @@ @echo "--------------------------------------------------------------" cd ${KRNLOBJDIR}/${_kernel}; \ MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \ - ${MAKE} -DNO_CPU_CFLAGS -DNO_CTF \ + ${MAKE} -DWITHOUT_SSP -DNO_CPU_CFLAGS -DNO_CTF \ -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile # XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case. .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules) .for target in obj depend all cd ${KERNSRCDIR}/modules/aic7xxx/aicasm; \ MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \ - ${MAKE} -DNO_CPU_CFLAGS -DNO_CTF ${target} + ${MAKE} -DWITHOUT_SSP -DNO_CPU_CFLAGS -DNO_CTF ${target} .endfor .endif .if !defined(NO_KERNELDEPEND) ==== //depot/projects/vap/ObsoleteFiles.inc#13 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.143 2008/06/14 10:42:18 ed Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.151 2008/07/06 20:57:35 marcel 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,49 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080706: bsdlabel(8) removed on powerpc +.if ${TARGET_ARCH} == "powerpc" +OLD_FILES+=sbin/bsdlabel +OLD_FILES+=usr/share/man/man8/bsdlabel.8.gz +.endif +# 20080704: sbsh(4) removed +OLD_FILES+=usr/share/man/man4/if_sbsh.4.gz +OLD_FILES+=usr/share/man/man4/sbsh.4.gz +# 20080704: sbni(4) removed +.if ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/share/man/man4/i386/if_sbni.4.gz +OLD_FILES+=usr/share/man/man4/i386/sbni.4.gz +.endif +# 20080704: cnw(4) removed +OLD_FILES+=usr/share/man/man4/if_cnw.4.gz +OLD_FILES+=usr/share/man/man4/cnw.4.gz +# 20080704: oltr(4) removed +.if ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/share/man/man4/i386/if_oltr.4.gz +OLD_FILES+=usr/share/man/man4/i386/oltr.4.gz +.endif +# 20080704: arl(4) removed +.if ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/sbin/arlcontrol +OLD_FILES+=usr/share/man/man4/i386/arl.4.gz +OLD_FILES+=usr/share/man/man8/arlcontrol.8.gz +.endif +# 20080703: sunlabel only for sparc64 +.if ${TARGET_ARCH} != "sparc64" +OLD_FILES+=sbin/sunlabel +OLD_FILES+=usr/share/man/man8/sunlabel.8.gz +.endif +# 20080703: bsdlabel & fdisk removed on ia64 +.if ${TARGET_ARCH} == "ia64" +OLD_FILES+=sbin/bsdlabel +OLD_FILES+=usr/share/man/man8/bsdlabel.8.gz +OLD_FILES+=usr/share/man/man8/disklabel.8.gz +OLD_FILES+=sbin/fdisk +OLD_FILES+=usr/share/man/man8/fdisk.8.gz +.endif +# 20080701: wpa_supplicant.conf moved to share/examples/etc/ +OLD_FILES+=usr/share/examples/wpa_supplicant/wpa_supplicant.conf +OLD_DIRS+=usr/share/examples/wpa_supplicant # 20080614: sgtty removed OLD_FILES+=usr/include/sys/ttychars.h OLD_FILES+=usr/include/sys/ttydev.h ==== //depot/projects/vap/UPDATING#14 (text+ko) ==== @@ -413,6 +413,20 @@ This does not affect those who are using "/dev/dsp". 20061122: + geom(4)'s gmirror(8) class metadata structure has been + rev'd from v3 to v4. If you update across this point and + your metadata is converted for you, you will not be easily + able to downgrade since the /boot/kernel.old/geom_mirror.ko + kernel module will be unable to read the v4 metadata. You + can resolve this by doing from the loader(8) prompt: + + set vfs.root.mountfrom="ufs:/dev/XXX" + + where XXX is the root slice of one of the disks that composed + the mirror (i.e.: /dev/ad0s1a). You can then rebuild + the array the same way you built it originally. + +20061122: The following binaries have been disconnected from the build: mount_devfs, mount_ext2fs, mount_fdescfs, mount_procfs, mount_linprocfs, and mount_std. The functionality of these programs has been @@ -1053,4 +1067,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.532 2008/06/09 21:33:57 marcel Exp $ +$FreeBSD: src/UPDATING,v 1.534 2008/07/07 13:08:30 remko Exp $ ==== //depot/projects/vap/bin/setfacl/setfacl.1#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.17 2006/09/17 17:40:07 ru Exp $ +.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.19 2008/07/06 22:47:10 csjp Exp $ .\" .Dd January 7, 2001 .Dt SETFACL 1 @@ -234,9 +234,27 @@ .Pp Multiple ACL entries specified on the command line are separated by commas. +.Pp +It is possible for files and directories to inherit ACL entries from their +parent directory. +This is accomplished through the use of the default ACL. +It should be noted that before you can specify a default ACL, the mandatory +ACL entries for user, group, other and mask must be set. +For more details see the examples below. +Default ACLs can be created by using +.Fl d . .Sh EXIT STATUS .Ex -std .Sh EXAMPLES +.Dl setfacl -d -m u::rwx,g::rx,o::rx,mask::rwx dir +.Dl setfacl -d -m g:admins:rwx dir +.Pp +The first command sets the mandatory elements of the default ACL. +The second command specifies that users in group admins can have read, write, and execute +permissions for directory named "dir". +It should be noted that any files or directories created underneath "dir" will +inherit these default ACLs upon creation. +.Pp .Dl setfacl -m u::rwx,g:mail:rw file .Pp Sets read, write, and execute permissions for the ==== //depot/projects/vap/contrib/gcc/config/i386/freebsd.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.73 2007/05/19 02:30:20 kan Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.75 2008/06/28 15:28:17 obrien Exp $ */ #undef CC1_SPEC #define CC1_SPEC "%(cc1_cpu) %{profile:-p}" @@ -54,7 +54,7 @@ /* Reset our STARTFILE_SPEC which was properly set in config/freebsd.h but trashed by config//. */ -#undef STARTFILE_SPEC +#undef STARTFILE_SPEC #define STARTFILE_SPEC FBSD_STARTFILE_SPEC /* Provide an ENDFILE_SPEC appropriate for FreeBSD/i386. */ @@ -78,13 +78,13 @@ #undef WCHAR_TYPE_SIZE #define WCHAR_TYPE_SIZE (TARGET_64BIT ? 32 : BITS_PER_WORD) -#undef SUBTARGET_EXTRA_SPECS /* i386.h bogusly defines it. */ +#undef SUBTARGET_EXTRA_SPECS /* i386.h bogusly defines it. */ #define SUBTARGET_EXTRA_SPECS \ { "fbsd_dynamic_linker", FBSD_DYNAMIC_LINKER } #define TARGET_VERSION fprintf (stderr, " (i386 FreeBSD/ELF)"); -#define TARGET_ELF 1 +#define TARGET_ELF 1 /* This goes away when the math emulator is fixed. */ #undef TARGET_SUBTARGET_DEFAULT @@ -101,7 +101,7 @@ /* FreeBSD sets the rounding precision of the FPU to 53 bits. Let the compiler get the contents of and std::numeric_limits correct. */ -#undef TARGET_96_ROUND_53_LONG_DOUBLE +#undef TARGET_96_ROUND_53_LONG_DOUBLE #define TARGET_96_ROUND_53_LONG_DOUBLE (!TARGET_64BIT) /* Tell final.c that we don't need a label passed to mcount. */ @@ -110,7 +110,7 @@ /* Output assembler code to FILE to begin profiling of the current function. LABELNO is an optional label. */ -#undef MCOUNT_NAME +#undef MCOUNT_NAME #define MCOUNT_NAME ".mcount" /* Output assembler code to FILE to end profiling of the current function. */ @@ -145,7 +145,7 @@ else \ fprintf ((FILE), "%s", xname); \ } \ - else \ + else \ { \ if (xname[0] == '%') \ xname += 2; \ @@ -191,7 +191,7 @@ uninitialized global data will be output in the data section if `-fno-common' is passed, otherwise `ASM_OUTPUT_COMMON' will be used. */ -#undef BSS_SECTION_ASM_OP +#undef BSS_SECTION_ASM_OP #define BSS_SECTION_ASM_OP "\t.section\t.bss" /* Like `ASM_OUTPUT_BSS' except takes the required alignment as a @@ -202,7 +202,7 @@ Try to use function `asm_output_aligned_bss' defined in file `varasm.c' when defining this macro. */ -#undef ASM_OUTPUT_ALIGNED_BSS +#undef ASM_OUTPUT_ALIGNED_BSS #define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \ asm_output_aligned_bss (FILE, DECL, NAME, SIZE, ALIGN) @@ -230,7 +230,7 @@ assemble_name (asm_out_file, NAME); \ fputc ('-', asm_out_file); \ assemble_name (asm_out_file, \ - XSTR (XEXP (DECL_RTL (current_function_decl), 0), 0)); \ + XSTR (XEXP (DECL_RTL (current_function_decl), 0), 0)); \ fprintf (asm_out_file, "\n"); \ } while (0) ==== //depot/projects/vap/etc/devd.conf#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.41 2008/06/15 13:26:25 kmacy Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.42 2008/06/27 12:04:36 rpaulo Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -255,6 +255,28 @@ action "/etc/rc.resume acpi $notify"; }; +# The next blocks enable volume hotkeys that can be found on the Asus EeePC +notify 0 { + match "system" "ACPI"; + match "subsystem" "ASUS-Eee"; + match "notify" "0x13"; + action "mixer 0"; +}; + +notify 0 { + match "system" "ACPI"; + match "subsystem" "ASUS-Eee"; + match "notify" "0x14"; + action "mixer vol -10"; +}; + +notify 0 { + match "system" "ACPI"; + match "subsystem" "ASUS-Eee"; + match "notify" "0x15"; + action "mixer vol +10"; +}; + /* EXAMPLES TO END OF FILE # The following might be an example of something that a vendor might ==== //depot/projects/vap/etc/periodic/security/800.loginfail#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/800.loginfail,v 1.8 2007/02/23 21:42:54 remko Exp $ +# $FreeBSD: src/etc/periodic/security/800.loginfail,v 1.9 2008/06/30 08:01:47 mtm Exp $ # # Show login failures @@ -59,7 +59,7 @@ [Yy][Ee][Ss]) echo "" echo "${host} login failures:" - n=$(catmsgs | egrep -ia "^$yesterday.*: .* (fail|invalid|bad|illegal)" | + n=$(catmsgs | egrep -ia "^$yesterday.*: .*(fail|invalid|bad|illegal)" | tee /dev/stderr | wc -l) [ $n -gt 0 ] && rc=1 || rc=0;; *) rc=0;; ==== //depot/projects/vap/etc/rc.d/ipfw#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ipfw,v 1.17 2008/01/27 15:15:12 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipfw,v 1.18 2008/07/05 15:27:39 mtm Exp $ # # PROVIDE: ipfw @@ -51,7 +51,9 @@ # Enable the firewall # - ${SYSCTL_W} net.inet.ip.fw.enable=1 + if ! ${SYSCTL_W} net.inet.ip.fw.enable=1 1>/dev/null 2>&1; then + warn "failed to enable firewall" + fi } ipfw_stop() ==== //depot/projects/vap/etc/rc.d/lockd#5 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm -# $FreeBSD: src/etc/rc.d/lockd,v 1.20 2008/06/23 04:05:39 mtm Exp $ +# $FreeBSD: src/etc/rc.d/lockd,v 1.21 2008/06/27 15:45:17 mtm Exp $ # # PROVIDE: lockd @@ -15,7 +15,7 @@ rcvar=rpc_lockd_enable command="/usr/sbin/rpc.${name}" start_precmd='lockd_precmd' -stop_precmd='checkyesno nfs_server_enable || checkyesno nfsclient_enable' +stop_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable' status_precmd=$stop_precmd # Make sure that we are either an NFS client or server, and that we get @@ -26,7 +26,7 @@ local ret ret=0 - if ! checkyesno nfs_server_enable && ! checkyesno nfsclient_enable + if ! checkyesno nfs_server_enable && ! checkyesno nfs_client_enable then ret=1 fi ==== //depot/projects/vap/etc/rc.d/mountcritlocal#5 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.16 2008/03/06 14:39:33 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.17 2008/07/05 15:19:58 mtm Exp $ # # PROVIDE: mountcritlocal @@ -28,7 +28,7 @@ esac # Mount everything except nfs filesystems. - echo -n 'Mounting local file systems:' + [ -z "${rc_quiet}" ] && echo -n 'Mounting local file systems:' mount_excludes='no' for i in ${netfs_types}; do fstype=${i%:*} @@ -37,7 +37,7 @@ mount_excludes=${mount_excludes%,} mount -a -t ${mount_excludes} err=$? - echo '.' + [ -z "${rc_quiet}" ] && echo '.' case ${err} in 0) ==== //depot/projects/vap/etc/rc.d/nfsclient#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/nfsclient,v 1.6 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/nfsclient,v 1.7 2008/07/05 15:13:21 mtm Exp $ # # PROVIDE: nfsclient @@ -22,11 +22,15 @@ # if [ -n "${nfs_access_cache}" ]; then - echo "NFS access cache time=${nfs_access_cache}" - sysctl vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null + [ -z "${rc_quiet}" ] && echo "NFS access cache time=${nfs_access_cache}" + if ! sysctl vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null; then + warn "failed to set access cache timeout" + fi fi if [ -n "${nfs_bufpackets}" ]; then - sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null + if ! sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null; then + warn "failed to set vfs.nfs.bufpackets" + fi fi unmount_all ==== //depot/projects/vap/etc/rc.d/savecore#5 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/savecore,v 1.13 2008/06/23 20:54:32 mtm Exp $ +# $FreeBSD: src/etc/rc.d/savecore,v 1.15 2008/07/06 08:31:29 mtm Exp $ # # PROVIDE: savecore @@ -17,11 +17,6 @@ savecore_prestart() { - # ${DUMPDIR} should be a directory or a symbolic link - # to the crash directory if core dumps are to be saved. - # - DUMPDIR="${dumpdir:-/var/crash}" - # Quit if we have no dump device case ${dumpdev} in [Nn][Oo] | '') @@ -57,8 +52,19 @@ savecore_start() { - if savecore -C >/dev/null; then - savecore ${savecore_flags} ${DUMPDIR} ${dumpdev} + local dev + + case "${dumpdev}" in + [Aa][Uu][Tt][Oo]) + dev= + ;; + *) + dev="${dumpdev}" + ;; + esac + + if savecore -C "${dumpdir}" "${dev}" >/dev/null; then + savecore ${savecore_flags} ${dumpdir} ${dumpdev} else [ -z "${rc_quiet}" ] && echo "No core dumps found" fi ==== //depot/projects/vap/etc/rc.d/statd#5 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 7 17:55:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8EDB01065673; Mon, 7 Jul 2008 17:55:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 52EDB106566C for ; Mon, 7 Jul 2008 17:55:17 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 407CB8FC16 for ; Mon, 7 Jul 2008 17:55:17 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m67HtGO6077947 for ; Mon, 7 Jul 2008 17:55:16 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m67HtGGY077945 for perforce@freebsd.org; Mon, 7 Jul 2008 17:55:16 GMT (envelope-from sam@freebsd.org) Date: Mon, 7 Jul 2008 17:55:16 GMT Message-Id: <200807071755.m67HtGGY077945@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 144840 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, 07 Jul 2008 17:55:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=144840 Change 144840 by sam@sam_ebb on 2008/07/07 17:54:39 IFC @ 144838 Affected files ... .. //depot/projects/vap/sys/conf/files#44 integrate .. //depot/projects/vap/sys/conf/kern.pre.mk#9 integrate Differences ... ==== //depot/projects/vap/sys/conf/files#44 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1310 2008/06/20 19:28:33 delphij Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1314 2008/07/04 21:24:35 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -514,7 +514,6 @@ dev/cm/smc90cx6.c optional cm dev/cmx/cmx.c optional cmx dev/cmx/cmx_pccard.c optional cmx pccard -dev/cnw/if_cnw.c optional cnw pccard dev/cpufreq/ichss.c optional cpufreq dev/cs/if_cs.c optional cs dev/cs/if_cs_isa.c optional cs isa @@ -1093,7 +1092,6 @@ dev/rp/rp_isa.c optional rp isa dev/rp/rp_pci.c optional rp pci dev/safe/safe.c optional safe -dev/sbsh/if_sbsh.c optional sbsh dev/scc/scc_if.m optional scc dev/scc/scc_bfe_ebus.c optional scc ebus dev/scc/scc_bfe_quicc.c optional scc quicc @@ -1618,6 +1616,8 @@ kern/sched_4bsd.c optional sched_4bsd kern/sched_ule.c optional sched_ule kern/serdev_if.m standard +kern/stack_protector.c standard \ + compile-with "${NORMAL_C:N-fstack-protector*}" kern/subr_acl_posix1e.c standard kern/subr_autoconf.c standard kern/subr_blist.c standard @@ -2067,6 +2067,7 @@ nfsserver/nfs_srvcache.c optional nfsserver nfsserver/nfs_srvsubs.c optional nfsserver nfsserver/nfs_syscalls.c optional nfsserver +nlm/nlm_advlock.c optional nfslockd nlm/nlm_prot_clnt.c optional nfslockd nlm/nlm_prot_impl.c optional nfslockd nlm/nlm_prot_server.c optional nfslockd ==== //depot/projects/vap/sys/conf/kern.pre.mk#9 (text+ko) ==== @@ -1,12 +1,9 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.99 2008/06/09 06:31:17 jb Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.100 2008/06/25 21:33:28 ru Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. -SRCCONF?= /etc/src.conf -.if exists(${SRCCONF}) -.include "${SRCCONF}" -.endif +.include # Can be overridden by makeoptions or /etc/make.conf KERNEL_KO?= kernel From owner-p4-projects@FreeBSD.ORG Mon Jul 7 18:55:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0645D1065673; Mon, 7 Jul 2008 18:55:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BE5D91065671 for ; Mon, 7 Jul 2008 18:55:17 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AC3D88FC19 for ; Mon, 7 Jul 2008 18:55:17 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m67ItH9U084709 for ; Mon, 7 Jul 2008 18:55:17 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m67ItHQp084707 for perforce@freebsd.org; Mon, 7 Jul 2008 18:55:17 GMT (envelope-from marcel@freebsd.org) Date: Mon, 7 Jul 2008 18:55:17 GMT Message-Id: <200807071855.m67ItHQp084707@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 144842 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, 07 Jul 2008 18:55:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=144842 Change 144842 by marcel@marcel_xcllnt on 2008/07/07 18:55:11 ISA_PNP_PROBE() can also return ENOENT. So, assume a match when the error is 0, not != ENXIO. Affected files ... .. //depot/projects/uart/dev/uart/uart_bus_isa.c#13 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_bus_isa.c#13 (text+ko) ==== @@ -170,7 +170,7 @@ sc = device_get_softc(dev); /* Probe PnP _and_ non-PnP ns8250 here. */ - if (ISA_PNP_PROBE(parent, dev, isa_ns8250_ids) != ENXIO) { + if (ISA_PNP_PROBE(parent, dev, isa_ns8250_ids) == 0) { sc->sc_class = &uart_ns8250_class; return (uart_bus_probe(dev, 0, 0, 0, 0)); } From owner-p4-projects@FreeBSD.ORG Mon Jul 7 19:53:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CCB51065676; Mon, 7 Jul 2008 19:53:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C310D1065673 for ; Mon, 7 Jul 2008 19:53:21 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 362878FC27 for ; Mon, 7 Jul 2008 19:53:16 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m67JrGOE093549 for ; Mon, 7 Jul 2008 19:53:16 GMT (envelope-from strauss@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m67JrGhL093547 for perforce@freebsd.org; Mon, 7 Jul 2008 19:53:16 GMT (envelope-from strauss@FreeBSD.org) Date: Mon, 7 Jul 2008 19:53:16 GMT Message-Id: <200807071953.m67JrGhL093547@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to strauss@FreeBSD.org using -f From: Anselm Strauss To: Perforce Change Reviews Cc: Subject: PERFORCE change 144845 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, 07 Jul 2008 19:53:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=144845 Change 144845 by strauss@strauss_marvelman on 2008/07/07 19:52:47 Added ZIP writer, non-functional at all Affected files ... .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jul 7 20:25:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 407EB106566C; Mon, 7 Jul 2008 20:25:54 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 04CBB106567A for ; Mon, 7 Jul 2008 20:25:54 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E684E8FC21 for ; Mon, 7 Jul 2008 20:25:53 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m67KPrie097800 for ; Mon, 7 Jul 2008 20:25:53 GMT (envelope-from strauss@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m67KPrsO097798 for perforce@freebsd.org; Mon, 7 Jul 2008 20:25:53 GMT (envelope-from strauss@FreeBSD.org) Date: Mon, 7 Jul 2008 20:25:53 GMT Message-Id: <200807072025.m67KPrsO097798@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to strauss@FreeBSD.org using -f From: Anselm Strauss To: Perforce Change Reviews Cc: Subject: PERFORCE change 144846 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, 07 Jul 2008 20:25:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=144846 Change 144846 by strauss@strauss_marvelman on 2008/07/07 20:25:22 - Now I know why to use format_octal() - Added ZIP writer to Makefile (the good thing about place holder methods is that they compile easily ;-) Affected files ... .. //depot/projects/soc2008/strauss_libarchive/Makefile.am#5 edit .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#2 edit Differences ... ==== //depot/projects/soc2008/strauss_libarchive/Makefile.am#5 (text+ko) ==== @@ -133,6 +133,7 @@ libarchive/archive_write_set_format_pax.c \ libarchive/archive_write_set_format_shar.c \ libarchive/archive_write_set_format_ustar.c \ + libarchive/archive_write_set_format_zip.c \ libarchive/config_freebsd.h \ libarchive/config_windows.h \ libarchive/filter_fork.c \ ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#2 (text+ko) ==== @@ -104,23 +104,23 @@ memset(&h, 0, sizeof(h)); - h.signature = 0x04034b50; - h.version = 0x0200; /* TODO: Set individually for each file entry. */ - h.flags = 0x0008; /* Flagging bit 3 for using data descriptor. */ - h.compression = 0x0000; /* No compression. */ - h.timedate = 0x0000; /* TODO: Using zero (means standard input) for now. */ + format_octal(0x04034b50, &h.signature, sizeof(h.signature)); + format_octal(0x0200, &h.version, sizeof(h.version)); /* TODO: Set individually for each file entry. */ + format_octal(8, &h.flags, sizeof(h.flags)); /* Flagging bit 3 for using data descriptor. */ + format_octal(0, &h.compression, sizeof(h.compression)); /* No compression. */ + format_octal(0, &h.timedate, sizeof(h.timedate)); /* TODO: Using zero (means standard input) for now. */ /* Next 3 fields are specified in the data descriptor after writing file data. * Can't compute them before having seen the data stream. */ - h.crc32 = h.compressed_size = h.uncompressed_size = 0x00000000; - h.filename_length = sizeof(archive_entry_pathname(entry)); - h.extra_length = 0x0000; + format_octal(0, &h.crc32, sizeof(h.crc32)); + format_octal(0, &h.compressed_size, sizeof(h.compressed_size)); + format_octal(0, &h.uncompressed_size, sizeof(h.uncompressed_size)); + format_octal(sizeof(archive_entry_pathname(entry)), &h.filename_length, sizeof(h.filename_length)); + format_octal(0x0000, &h.extra_length, sizeof(h.extra_length)); /* Not using. */ ret = (a->compressor.write)(a, &h, sizeof(h)); if (ret != ARCHIVE_OK) return (ARCHIVE_FATAL); - zip->entry_bytes_remaining = archive_entry_size(entry); - return (ret); } From owner-p4-projects@FreeBSD.ORG Mon Jul 7 22:14:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6FD071065673; Mon, 7 Jul 2008 22:14:44 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1A038106567D for ; Mon, 7 Jul 2008 22:14:44 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0737D8FC13 for ; Mon, 7 Jul 2008 22:14:44 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m67MEi56018170 for ; Mon, 7 Jul 2008 22:14:44 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m67MEhnD018168 for perforce@freebsd.org; Mon, 7 Jul 2008 22:14:43 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 7 Jul 2008 22:14:43 GMT Message-Id: <200807072214.m67MEhnD018168@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 144851 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, 07 Jul 2008 22:14:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=144851 Change 144851 by hselasky@hselasky_laptop001 on 2008/07/07 22:13:49 More patches to support LibUSB 1.0. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#12 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.h#7 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#7 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#12 (text+ko) ==== @@ -77,7 +77,6 @@ static void usb2_dev_init_post(void *arg); static void usb2_dev_uninit(void *arg); static int usb2_fifo_uiomove(struct usb2_fifo *f, void *cp, int n, struct uio *uio); -static void usb2_fifo_wakeup(struct usb2_fifo *f); static void usb2_fifo_check_methods(struct usb2_fifo_methods *pm); static void usb2_clone(void *arg, USB_UCRED char *name, int namelen, struct cdev **dev); static struct usb2_fifo *usb2_fifo_alloc(void); @@ -907,21 +906,77 @@ } /*------------------------------------------------------------------------* + * usb2_check_thread_perm + * + * Returns: + * 0: Has permission. + * Else: No permission. + *------------------------------------------------------------------------*/ +int +usb2_check_thread_perm(struct usb2_device *udev, struct thread *td, + int fflags, uint8_t iface_index, uint8_t ep_index) +{ + struct usb2_perm perm; + struct usb2_interface *iface; + int err; + + iface = usb2_get_iface(udev, iface_index); + if (iface == NULL) { + return (EINVAL); + } + if (iface->idesc == NULL) { + return (EINVAL); + } + /* set default value */ + bzero(&perm, sizeof(perm)); + + /* create a permissions mask */ + perm.uid = td->td_ucred->cr_ruid; + perm.gid = td->td_ucred->cr_rgid; + perm.mode = 0; + if (fflags & FREAD) + perm.mode |= 0444; + if (fflags & FWRITE) + perm.mode |= 0222; + perm.active = 1; + + mtx_lock(udev->default_mtx); + + /* scan down the permissions tree */ + if ((ep_index != 0) && iface && + usb2_match_perm(&perm, &iface->perm)) { + /* we got access through the interface */ + err = 0; + } else if (udev && usb2_match_perm(&perm, &udev->perm)) { + /* we got access through the device */ + err = 0; + } else if (udev->bus && usb2_match_perm(&perm, &(udev->bus->perm))) { + /* we got access through the USB bus */ + err = 0; + } else if (usb2_match_perm(&perm, &usb2_perm)) { + /* we got general access */ + err = 0; + } else { + /* no access */ + err = EPERM; + } + mtx_unlock(udev->default_mtx); + return (err); +} + +/*------------------------------------------------------------------------* * usb2_fdopen - cdev callback *------------------------------------------------------------------------*/ static int usb2_fdopen(struct cdev *dev, int xxx_oflags, struct thread *td, struct file *fp) { struct usb2_location loc; - struct usb2_perm perm; uint32_t devloc; int err; int fflags; DPRINTF(1, "oflags=0x%08x\n", xxx_oflags); - bzero(&perm, sizeof(perm)); - devloc = usb2_last_devloc; usb2_last_devloc = (0 - 1); /* reset "usb2_devloc" */ @@ -960,39 +1015,9 @@ DPRINTF(1, "cannot ref device\n"); return (ENXIO); } - /* create a permissions mask */ - perm.uid = td->td_ucred->cr_ruid; - perm.gid = td->td_ucred->cr_rgid; - perm.mode = 0; - if (fflags & FREAD) - perm.mode |= 0444; - if (fflags & FWRITE) - perm.mode |= 0222; - perm.active = 1; - - mtx_lock(loc.udev->default_mtx); + err = usb2_check_thread_perm(loc.udev, td, fflags, + loc.iface_index, loc.ep_index); - /* scan down the permissions tree */ - if ((loc.ep_index != 0) && loc.iface && - usb2_match_perm(&perm, &loc.iface->perm)) { - /* we got access through the interface */ - err = 0; - } else if (loc.udev && usb2_match_perm(&perm, &loc.udev->perm)) { - /* we got access through the device */ - err = 0; - } else if (loc.bus && usb2_match_perm(&perm, &loc.bus->perm)) { - /* we got access through the USB bus */ - err = 0; - } else if (usb2_match_perm(&perm, &usb2_perm)) { - /* we got general access */ - err = 0; - } else { - /* no access */ - err = EPERM; - } - - mtx_unlock(loc.udev->default_mtx); - /* check for error */ if (err) { usb2_unref_device(&loc); @@ -1281,7 +1306,6 @@ return (ENXIO); } - /* ARGSUSED */ static int usb2_poll_f(struct file *fp, int events, struct ucred *cred, struct thread *td) @@ -1297,17 +1321,18 @@ return (POLLHUP); } fflags = fp->f_flag; - f = loc.txfifo; if ((events & (POLLOUT | POLLWRNORM)) && (fflags & FWRITE)) { + f = loc.txfifo; + mtx_lock(f->priv_mtx); /* check if any packets are available */ USB_IF_POLL(&(f->free_q), m); - if (f->flag_iserror || m) { + if (f->flag_iserror || f->flag_iscomplete || m) { revents |= events & (POLLOUT | POLLWRNORM); } else { f->flag_isselect = 1; @@ -1316,17 +1341,17 @@ mtx_unlock(f->priv_mtx); } - f = loc.rxfifo; - if ((events & (POLLIN | POLLRDNORM)) && (fflags & FREAD)) { + f = loc.rxfifo; + mtx_lock(f->priv_mtx); /* check if any packets are available */ USB_IF_POLL(&(f->used_q), m); - if (f->flag_iserror || m) { + if (f->flag_iserror || f->flag_iscomplete || m) { revents |= events & (POLLIN | POLLRDNORM); } else { f->flag_isselect = 1; @@ -1381,8 +1406,6 @@ err = EIO; goto done; } - /* XXX TODO: support IO-vectors */ - while (uio->uio_resid > 0) { USB_IF_DEQUEUE(&(f->used_q), m); @@ -1505,8 +1528,6 @@ err = EIO; goto done; } - /* XXX TODO: support IO-vectors */ - while (uio->uio_resid > 0) { USB_IF_DEQUEUE(&(f->free_q), m); @@ -1613,7 +1634,7 @@ return; } -static void +void usb2_fifo_wakeup(struct usb2_fifo *f) { usb2_fifo_signal(f); ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.h#7 (text+ko) ==== @@ -74,8 +74,10 @@ struct usb2_fifo_methods *methods; struct cdev *symlink[2]; /* our symlinks */ struct proc *async_p; /* process that wants SIGIO */ + struct usb2_fs_endpoint *fs_ep_ptr; struct usb2_device *udev; struct usb2_xfer *xfer[2]; + struct usb2_xfer **fs_xfer; struct mtx *priv_mtx; /* client data */ struct file *curr_file; /* set if FIFO is opened by a FILE */ void *priv_sc0; /* client data */ @@ -87,6 +89,7 @@ uint16_t dev_ep_index; /* our device endpoint index */ uint8_t flag_no_uref; /* set if FIFO is not control endpoint */ uint8_t flag_sleeping; /* set if FIFO is sleeping */ + uint8_t flag_iscomplete; /* set if a USB transfer is complete */ uint8_t flag_iserror; /* set if FIFO error happened */ uint8_t flag_isselect; /* set if FIFO is selected */ uint8_t flag_flushing; /* set if FIFO is flushing data */ @@ -96,6 +99,7 @@ uint8_t iface_index; /* set to the interface we belong to */ uint8_t fifo_index; /* set to the FIFO index in "struct * usb2_device" */ + uint8_t fs_ep_max; uint8_t fifo_zlp; /* zero length packet count */ uint8_t refcount; #define USB_FIFO_REF_MAX 0xFF @@ -121,5 +125,7 @@ uint8_t usb2_fifo_opened(struct usb2_fifo *fifo); void usb2_fifo_free(struct usb2_fifo *f); void usb2_fifo_reset(struct usb2_fifo *f); +int usb2_check_thread_perm(struct usb2_device *udev, struct thread *td, int fflags, uint8_t iface_index, uint8_t ep_index); +void usb2_fifo_wakeup(struct usb2_fifo *f); #endif /* _USB2_DEV_H_ */ ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#10 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include #include +#include #include #include @@ -61,6 +62,7 @@ static usb2_callback_t ugen_default_write_callback; static usb2_callback_t ugen_isoc_read_callback; static usb2_callback_t ugen_isoc_write_callback; +static usb2_callback_t ugen_default_fs_callback; static usb2_fifo_open_t ugen_open; static usb2_fifo_close_t ugen_close; @@ -78,8 +80,11 @@ static int ugen_get_sdesc(struct usb2_fifo *f, struct usb2_gen_descriptor *ugd); static int usb2_gen_fill_deviceinfo(struct usb2_fifo *f, struct usb2_device_info *di); static int ugen_re_enumerate(struct usb2_fifo *f); -static int ugen_iface_ioctl(struct usb2_fifo *f, u_long cmd, void *addr); +static int ugen_iface_ioctl(struct usb2_fifo *f, u_long cmd, void *addr, int fflags); static int ugen_ctrl_ioctl(struct usb2_fifo *f, u_long cmd, void *addr, int fflags); +static int ugen_fs_uninit(struct usb2_fifo *f); +static uint8_t ugen_fs_get_complete(struct usb2_fifo *f, uint8_t *pindex); + /* structures */ @@ -184,6 +189,10 @@ usb2_transfer_unsetup(f->xfer, 2); usb2_fifo_free_buffer(f); + + if (ugen_fs_uninit(f)) { + /* ignore any errors - we are closing */ + } return; } @@ -200,6 +209,10 @@ /* transfers are already opened */ return (0); } + if (f->fs_xfer) { + /* should not happen */ + return (EINVAL); + } bzero(usb2_config, sizeof(usb2_config)); usb2_config[1].type = UE_CONTROL; @@ -230,8 +243,8 @@ if (ugen_transfer_setup(f, usb2_config, 2)) { return (EIO); } - /* first transfer clears stall */ - f->flag_stall = 1; + /* first transfer does not clear stall */ + f->flag_stall = 0; break; case UE_ISOCHRONOUS: @@ -269,6 +282,10 @@ /* transfers are already opened */ return (0); } + if (f->fs_xfer) { + /* should not happen */ + return (EINVAL); + } bzero(usb2_config, sizeof(usb2_config)); usb2_config[1].type = UE_CONTROL; @@ -300,8 +317,8 @@ if (ugen_transfer_setup(f, usb2_config, 2)) { return (EIO); } - /* first transfer clears stall */ - f->flag_stall = 1; + /* first transfer does not clear stall */ + f->flag_stall = 0; break; case UE_ISOCHRONOUS: @@ -793,26 +810,25 @@ return (0); } -int -ugen_do_request(struct usb2_fifo *f, struct usb2_ctl_request *ur) +/*------------------------------------------------------------------------* + * ugen_check_request + * + * Return values: + * 0: Access allowed + * Else: No access + *------------------------------------------------------------------------*/ +static int +ugen_check_request(struct usb2_device_request *req) { - int error; - uint16_t len; - uint16_t actlen; - uint8_t isread; - void *data = NULL; - - if (f->flag_no_uref) { - /* control endpoint only */ - return (EINVAL); - } - /* avoid requests that would damage the bus integrity */ - if (((ur->ucr_request.bmRequestType == UT_WRITE_DEVICE) && - (ur->ucr_request.bRequest == UR_SET_ADDRESS)) || - ((ur->ucr_request.bmRequestType == UT_WRITE_DEVICE) && - (ur->ucr_request.bRequest == UR_SET_CONFIG)) || - ((ur->ucr_request.bmRequestType == UT_WRITE_INTERFACE) && - (ur->ucr_request.bRequest == UR_SET_INTERFACE))) { + /* + * Avoid requests that would damage the bus integrity: + */ + if (((req->bmRequestType == UT_WRITE_DEVICE) && + (req->bRequest == UR_SET_ADDRESS)) || + ((req->bmRequestType == UT_WRITE_DEVICE) && + (req->bRequest == UR_SET_CONFIG)) || + ((req->bmRequestType == UT_WRITE_INTERFACE) && + (req->bRequest == UR_SET_INTERFACE))) { if (suser(curthread)) { return (EPERM); } @@ -821,13 +837,32 @@ * Clearing the stall this way is not allowed, hence it does * not update the data toggle value in "struct usb2_pipe" ! */ - if (ur->ucr_request.bmRequestType == UT_WRITE_ENDPOINT) { + if (req->bmRequestType == UT_WRITE_ENDPOINT) { if (suser(curthread)) { return (EPERM); } } /* TODO: add more checks to verify the interface index */ + return (0); +} + +int +ugen_do_request(struct usb2_fifo *f, struct usb2_ctl_request *ur) +{ + int error; + uint16_t len; + uint16_t actlen; + uint8_t isread; + void *data = NULL; + + if (f->flag_no_uref) { + /* control endpoint only */ + return (EINVAL); + } + if (ugen_check_request(&ur->ucr_request)) { + return (EPERM); + } len = UGETW(ur->ucr_request.wLength); isread = (ur->ucr_request.bmRequestType & UT_READ) ? 1 : 0; @@ -901,7 +936,648 @@ } static int -ugen_iface_ioctl(struct usb2_fifo *f, u_long cmd, void *addr) +ugen_fs_uninit(struct usb2_fifo *f) +{ + if (f->fs_xfer == NULL) { + return (EINVAL); + } + usb2_transfer_unsetup(f->fs_xfer, f->fs_ep_max); + free(f->fs_xfer, M_USB); + f->fs_xfer = NULL; + f->fs_ep_max = 0; + f->fs_ep_ptr = NULL; + f->flag_iscomplete = 0; + usb2_fifo_free_buffer(f); + return (0); +} + +static uint8_t +ugen_fs_get_complete(struct usb2_fifo *f, uint8_t *pindex) +{ + struct usb2_mbuf *m; + + USB_IF_DEQUEUE(&(f->used_q), m); + + if (m) { + *pindex = *((uint8_t *)(m->cur_data_ptr)); + + USB_IF_ENQUEUE(&(f->free_q), m); + + return (0); /* success */ + } else { + f->flag_iscomplete = 0; + } + return (1); /* failure */ +} + +static void +ugen_fs_set_complete(struct usb2_fifo *f, uint8_t index) +{ + struct usb2_mbuf *m; + + USB_IF_DEQUEUE(&(f->free_q), m); + + USB_MBUF_RESET(m); + + *((uint8_t *)(m->cur_data_ptr)) = index; + + USB_IF_ENQUEUE(&(f->used_q), m); + + f->flag_iscomplete = 1; + + usb2_fifo_wakeup(f); + + return; +} + +static int +ugen_fs_copy_in(struct usb2_fifo *f, uint8_t ep_index) +{ + struct usb2_device_request *req; + struct usb2_xfer *xfer; + struct usb2_fs_endpoint fs_ep; + void *uaddr; + uint32_t offset; + uint32_t length; + uint32_t n; + uint32_t rem; + int error; + uint8_t isread; + + if (ep_index >= f->fs_ep_max) { + return (EINVAL); + } + xfer = f->fs_xfer[ep_index]; + if (xfer == NULL) { + return (EINVAL); + } + mtx_lock(f->priv_mtx); + if (usb2_transfer_pending(xfer)) { + mtx_unlock(f->priv_mtx); + return (EBUSY); /* should not happen */ + } + mtx_unlock(f->priv_mtx); + + /* security checks */ + + if (fs_ep.nFrames > xfer->max_frame_count) { + return (EINVAL); + } + if (fs_ep.nFrames == 0) { + return (EINVAL); + } + error = copyin(f->fs_ep_ptr + + ep_index, &fs_ep, sizeof(fs_ep)); + if (error) { + return (error); + } + error = copyin(fs_ep.ppBuffer, + &uaddr, sizeof(uaddr)); + if (error) { + return (error); + } + /* reset first frame */ + usb2_set_frame_offset(xfer, 0, 0); + + if (xfer->flags_int.control_xfr) { + + req = xfer->frbuffers[0].buffer; + + error = copyin(fs_ep.pLength, + &length, sizeof(length)); + if (error) { + return (error); + } + if (length >= sizeof(*req)) { + return (EINVAL); + } + if (length) { + error = copyin(uaddr, req, length); + if (error) { + return (error); + } + } + if (ugen_check_request(req)) { + return (EPERM); + } + xfer->frlengths[0] = length; + + /* Host mode only ! */ + if ((req->bmRequestType & + (UT_READ | UT_WRITE)) == UT_READ) { + isread = 1; + } else { + isread = 0; + } + n = 1; + offset = sizeof(*req); + + } else { + /* Device and Host mode */ + if (USB_GET_DATA_ISREAD(xfer)) { + isread = 1; + } else { + isread = 0; + } + n = 0; + offset = 0; + } + + rem = xfer->max_data_length; + xfer->nframes = fs_ep.nFrames; + xfer->timeout = fs_ep.timeout; + if (xfer->timeout > 65535) { + xfer->timeout = 65535; + } + if (fs_ep.flags & USB2_FS_FLAG_SINGLE_SHORT_OK) + xfer->flags.short_xfer_ok = 1; + else + xfer->flags.short_xfer_ok = 0; + + if (fs_ep.flags & USB2_FS_FLAG_MULTI_SHORT_OK) + xfer->flags.short_frames_ok = 1; + else + xfer->flags.short_frames_ok = 0; + + if (fs_ep.flags & USB2_FS_FLAG_FORCE_SHORT) + xfer->flags.force_short_xfer = 1; + else + xfer->flags.force_short_xfer = 0; + + if (fs_ep.flags & USB2_FS_FLAG_CLEAR_STALL) + xfer->flags.stall_pipe = 1; + else + xfer->flags.stall_pipe = 0; + + for (; n != xfer->nframes; n++) { + + error = copyin(fs_ep.pLength + n, + &length, sizeof(length)); + if (error) { + return (error); + } + xfer->frlengths[n] = length; + + if (length > rem) { + return (EINVAL); + } + rem -= length; + + if (!isread) { + + if (xfer->flags_int.isochronous_xfr) { + + /* move data */ + error = copyin(USB_ADD_BYTES(uaddr, offset), + USB_ADD_BYTES(xfer->frbuffers[0].buffer, + offset), length); + if (error) { + return (error); + } + } else { + /* we need to know the source buffer */ + error = copyin(fs_ep.ppBuffer + n, + &uaddr, sizeof(uaddr)); + if (error) { + return (error); + } + /* set current frame offset */ + usb2_set_frame_offset(xfer, offset, n); + + /* move data */ + error = copyin(uaddr, xfer->frbuffers[n].buffer, + length); + if (error) { + return (error); + } + } + } + offset += length; + } + return (error); +} + +static int +ugen_fs_copy_out(struct usb2_fifo *f, uint8_t ep_index) +{ + struct usb2_device_request *req; + struct usb2_xfer *xfer; + struct usb2_fs_endpoint fs_ep; + void *uaddr; + uint32_t offset; + uint32_t length; + uint32_t temp; + uint32_t n; + uint32_t rem; + int error; + + if (ep_index >= f->fs_ep_max) { + return (EINVAL); + } + xfer = f->fs_xfer[ep_index]; + if (xfer == NULL) { + return (EINVAL); + } + mtx_lock(f->priv_mtx); + if (usb2_transfer_pending(xfer)) { + mtx_unlock(f->priv_mtx); + return (EBUSY); /* should not happen */ + } + mtx_unlock(f->priv_mtx); + + error = copyin(f->fs_ep_ptr + + ep_index, &fs_ep, sizeof(fs_ep)); + if (error) { + return (error); + } + fs_ep.status = xfer->error; + fs_ep.aFrames = xfer->aframes; + if (xfer->error) { + goto complete; + } + error = copyin(fs_ep.ppBuffer, + &uaddr, sizeof(uaddr)); + if (error) { + return (error); + } + if (xfer->flags_int.control_xfr) { + req = xfer->frbuffers[0].buffer; + + /* Host mode only ! */ + if ((req->bmRequestType & (UT_READ | UT_WRITE)) == UT_WRITE) { + goto complete; + } + n = 1; + } else { + /* Device and Host mode */ + if (!USB_GET_DATA_ISREAD(xfer)) { + goto complete; + } + n = 0; + } + + rem = xfer->max_data_length; + + for (; n != xfer->nframes; n++) { + + if (xfer->flags_int.isochronous_xfr) { + + /* we need to know the initial length */ + error = copyin(fs_ep.pLength + n, + &length, sizeof(length)); + if (error) { + return (error); + } + /* range check */ + if (length > rem) { + return (EINVAL); + } + rem -= length; + temp = offset + length; + + /* limit */ + if (length > xfer->frlengths[n]) { + length = xfer->frlengths[n]; + } + /* move data */ + error = copyout(USB_ADD_BYTES(xfer->frbuffers[0].buffer, + offset), USB_ADD_BYTES(uaddr, offset), length); + if (error) { + return (error); + } + offset = temp; + } else { + + length = xfer->frlengths[n]; + + /* we need to know the destination buffer */ + error = copyin(fs_ep.ppBuffer + n, + &uaddr, sizeof(uaddr)); + if (error) { + return (error); + } + /* move data */ + error = copyout(xfer->frbuffers[n].buffer, + uaddr, length); + if (error) { + return (error); + } + } + + /* update length */ + error = copyout(&length, + fs_ep.pLength + n, sizeof(length)); + if (error) { + return (error); + } + } + +complete: + /* update "aFrames" */ + error = copyout(&fs_ep.aFrames, &(f->fs_ep_ptr + + ep_index)->aFrames, sizeof(fs_ep.aFrames)); + + if (error) { + return (error); + } + /* update "status" */ + error = copyout(&fs_ep.status, &(f->fs_ep_ptr + + ep_index)->status, sizeof(fs_ep.status)); + return (error); +} + +static uint8_t +ugen_fifo_in_use(struct usb2_fifo *f, int fflags) +{ + struct usb2_fifo *f_rx; + struct usb2_fifo *f_tx; + + f_rx = f->udev->fifo[(f->fifo_index & ~1) + USB_FIFO_RX]; + f_tx = f->udev->fifo[(f->fifo_index & ~1) + USB_FIFO_TX]; + + if ((fflags & FREAD) && f_rx && + (f_rx->xfer[0] || f_rx->xfer[1])) { + return (1); /* RX FIFO in use */ + } + if ((fflags & FWRITE) && f_tx && + (f_tx->xfer[0] || f_tx->xfer[1])) { + return (1); /* TX FIFO in use */ + } + return (0); /* not in use */ +} + +static int +ugen_fs_ioctl(struct usb2_fifo *f, u_long cmd, void *addr, int fflags) +{ + int error = 0; + + switch (cmd) { + case USB_FS_COMPLETE:{ + struct usb2_fs_complete *pd = addr; + uint8_t ep_index; + + mtx_lock(f->priv_mtx); + error = ugen_fs_get_complete(f, &ep_index); + mtx_unlock(f->priv_mtx); + + if (error) { + error = EBUSY; + break; + } + pd->ep_index = ep_index; + error = ugen_fs_copy_out(f, pd->ep_index); + break; + } + + case USB_FS_START:{ + struct usb2_fs_start *pd = addr; + + error = ugen_fs_copy_in(f, pd->ep_index); + if (error) { + break; + } + mtx_lock(f->priv_mtx); + usb2_transfer_start(f->fs_xfer[pd->ep_index]); + mtx_lock(f->priv_mtx); + break; + } + case USB_FS_STOP:{ + struct usb2_fs_stop *pd = addr; + + if (pd->ep_index >= f->fs_ep_max) { + error = EINVAL; + break; + } + mtx_lock(f->priv_mtx); + usb2_transfer_stop(f->fs_xfer[pd->ep_index]); + mtx_unlock(f->priv_mtx); + break; + } + case USB_FS_INIT:{ + struct usb2_fs_init *pd = addr; + + /* verify input parameters */ + if (pd->pEndpoints == NULL) { + error = EINVAL; + break; + } + if (pd->ep_index_max > 127) { + error = EINVAL; + break; + } + if (pd->ep_index_max == 0) { + error = EINVAL; + break; + } + if (f->fs_xfer != NULL) { + error = EBUSY; + break; + } + if (f->dev_ep_index != 0) { + error = EINVAL; + break; + } + if (ugen_fifo_in_use(f, fflags)) { + error = EBUSY; + break; + } + error = usb2_fifo_alloc_buffer(f, 1, pd->ep_index_max); + if (error) { + break; + } + f->fs_xfer = malloc(sizeof(f->fs_xfer[0]) * + pd->ep_index_max, M_USB, M_WAITOK | M_ZERO); + if (f->fs_xfer == NULL) { + usb2_fifo_free_buffer(f); + error = ENOMEM; + break; + } + f->fs_ep_max = pd->ep_index_max; + f->fs_ep_ptr = pd->pEndpoints; + f->flag_no_uref = 1; /* drop locks we don't need */ + break; + } + + case USB_FS_UNINIT:{ + struct usb2_fs_uninit *pd = addr; + + if (pd->dummy != 0) { + error = EINVAL; + break; + } + error = ugen_fs_uninit(f); + if (error == 0) { + f->flag_no_uref = 0; /* restore operation */ + } + break; + } + + case USB_FS_OPEN:{ + struct usb2_config usb2_config[1]; + struct usb2_fs_open *pd = addr; + struct usb2_pipe *pipe; + struct usb2_endpoint_descriptor *ed; + uint8_t iface_index; + uint8_t isread; + + if (pd->ep_index >= f->fs_ep_max) { + error = EINVAL; + break; + } + if (f->fs_xfer[pd->ep_index] != NULL) { + error = EBUSY; + break; + } + if (pd->max_bufsize > USB_FS_MAX_BUFSIZE) { + error = EINVAL; + break; + } + if (pd->max_frames > USB_FS_MAX_FRAMES) { + error = EINVAL; + break; + } + if (pd->max_frames == 0) { + error = EINVAL; + break; + } + pipe = usb2_get_pipe_by_addr(f->udev, pd->ep_no); + if (pipe == NULL) { + error = EINVAL; + break; + } + ed = pipe->edesc; + if (ed == NULL) { + error = ENXIO; + break; + } + iface_index = pipe->iface_index; + + error = usb2_check_thread_perm(f->udev, curthread, fflags, + iface_index, pd->ep_no); + if (error) { + break; + } + bzero(usb2_config, sizeof(usb2_config)); + + usb2_config[0].type = ed->bmAttributes & UE_XFERTYPE; + usb2_config[0].endpoint = ed->bEndpointAddress & UE_ADDR; + usb2_config[0].direction = ed->bEndpointAddress & (UE_DIR_OUT | UE_DIR_IN); + usb2_config[0].mh.interval = USB_DEFAULT_INTERVAL; + usb2_config[0].mh.flags.proxy_buffer = 1; + usb2_config[0].mh.callback = &ugen_default_fs_callback; + usb2_config[0].mh.timeout = 0; /* no timeout */ + usb2_config[0].mh.frames = pd->max_frames; + usb2_config[0].mh.bufsize = pd->max_bufsize; + usb2_config[0].md = usb2_config[0].mh; /* symmetric config */ + + if (usb2_config[0].type == UE_CONTROL) { + if (f->udev->flags.usb2_mode != USB_MODE_HOST) { + error = EINVAL; + break; + } + } else { + + isread = ((usb2_config[0].endpoint & + (UE_DIR_IN | UE_DIR_OUT)) == UE_DIR_IN); + + if (f->udev->flags.usb2_mode != USB_MODE_HOST) { + isread = !isread; + } + /* check permissions */ + if (isread) { + if (!(fflags & FREAD)) { + error = EPERM; + break; + } + } else { + if (!(fflags & FWRITE)) { + error = EPERM; + break; + } + } + } + error = usb2_transfer_setup(f->udev, &iface_index, + f->fs_xfer + pd->ep_index, usb2_config, 1, + f, f->priv_mtx); + if (error == 0) { + /* update maximum buffer size */ + pd->max_bufsize = >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jul 8 01:27:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84AA8106567E; Tue, 8 Jul 2008 01:27:58 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2F4561065675 for ; Tue, 8 Jul 2008 01:27:58 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1E1198FC1F for ; Tue, 8 Jul 2008 01:27:58 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m681RwO5047711 for ; Tue, 8 Jul 2008 01:27:58 GMT (envelope-from rfrench@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m681Rw2a047709 for perforce@freebsd.org; Tue, 8 Jul 2008 01:27:58 GMT (envelope-from rfrench@FreeBSD.org) Date: Tue, 8 Jul 2008 01:27:58 GMT Message-Id: <200807080127.m681Rw2a047709@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rfrench@FreeBSD.org using -f From: Ryan French To: Perforce Change Reviews Cc: Subject: PERFORCE change 144854 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, 08 Jul 2008 01:27:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=144854 Change 144854 by rfrench@rfrench_mpls on 2008/07/08 01:27:50 Initial import from OpenBSDs currently 'in progress' implementation of MPLS, which is based on the original AYAME project for NetBSD. I havent tested it to make sure it works yet. Affected files ... .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls.h#2 edit .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#2 edit .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_proto.c#2 edit .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_raw.c#2 edit .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_shim.c#2 edit Differences ... ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls.h#2 (text+ko) ==== @@ -1,1 +1,173 @@ - + +/* + * Copyright (C) 1999, 2000 and 2001 AYAME Project, WIDE Project. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULARPURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ORCONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _NETMPLS_MPLS_H_ +#define _NETMPLS_MPLS_H_ + +#include +#include +#include +#include + +#include +#include + +/* + * Structure of a SHIM header. + */ +#define MPLS_LABEL_MAX ((1 << 20) - 1) + +struct shim_hdr { + u_int32_t shim_label; /* 20 bit label, 4 bit exp & BoS, 8 bit TTL */ +}; + +/* + * By byte-swapping the constants, we avoid ever having to byte-swap IP + * addresses inside the kernel. Unfortunately, user-level programs rely + * on these macros not doing byte-swapping. + */ + +#ifdef _KERNEL +#define __MADDR(x) ((u_int32_t)htonl((u_int32_t)(x))) +#else +#define __MADDR(x) ((u_int32_t)(x)) +#endif + +#define MPLS_LABEL_MASK __MADDR(0xfffff000U) +#define MPLS_LABEL_OFFSET 12 +#define MPLS_EXP_MASK __MADDR(0x00000e00U) +#define MPLS_EXP_OFFSET 9 +#define MPLS_BOS_MASK __MADDR(0x00000100U) +#define MPLS_BOS_OFFSET 8 +#define MPLS_TTL_MASK __MADDR(0x000000ffU) + +#define MPLS_BOS_ISSET(l) (((l) & MPLS_BOS_MASK) == MPLS_BOS_MASK) + +/* Reserved lavel values (RFC3032) */ +#define MPLS_LABEL_IPV4NULL 0 /* IPv4 Explicit NULL Label */ +#define MPLS_LABEL_RTALERT 1 /* Router Alert Label */ +#define MPLS_LABEL_IPV6NULL 2 /* IPv6 Explicit NULL Label */ +#define MPLS_LABEL_IMPLNULL 3 /* Implicit NULL Label */ +/* MPLS_LABEL_RESERVED 4-15 */ /* Values 4-15 are reserved */ +#define MPLS_LABEL_RESERVED_MAX 15 + +/* + * Socket address + */ + +struct sockaddr_mpls { + u_int8_t smpls_len; /* length */ + u_int8_t smpls_family; /* AF_MPLS */ + u_int8_t smpls_operation; + u_int8_t smpls_out_exp; /* outgoing exp value */ + u_int32_t smpls_out_label; /* outgoing MPLS label */ + u_int16_t smpls_out_ifindex; + u_int16_t smpls_in_ifindex; + u_int32_t smpls_in_label; /* MPLS label 20 bits*/ +#if MPLS_MCAST + u_int8_t smpls_mcexp; + u_int8_t smpls_pad2[2]; + u_int32_t smpls_mclabel; +#endif +}; + +#define MPLS_OP_POP 1 +#define MPLS_OP_PUSH 2 +#define MPLS_OP_SWAP 3 + +#define MPLS_INKERNEL_LOOP_MAX 16 + +#define satosmpls(sa) ((struct sockaddr_mpls *)(sa)) +#define smplstosa(smpls) ((struct sockaddr *)(smpls)) + +/* + * Names for MPLS sysctl objects + */ +#define MPLSCTL_ENABLE 1 +#define MPLSCTL_DEFTTL 2 +#define MPLSCTL_IFQUEUE 3 +#define MPLSCTL_MAXINKLOOP 4 +#define MPLSCTL_MAXID 5 + +#define MPLSCTL_NAMES { \ + { 0, 0 }, \ + { "enable", CTLTYPE_INT }, \ + { "ttl", CTLTYPE_INT }, \ + { "ifq", CTLTYPE_NODE },\ + { "maxloop_inkernel", CTLTYPE_INT }, \ +} + +#define MPLSCTL_VARS { \ + 0, \ + &mpls_enable, \ + &mpls_defttl, \ + 0, \ + &mpls_inkloop, \ +} + +#endif + +#ifdef _KERNEL + +struct mpe_softc { + struct ifnet sc_if; /* the interface */ + int sc_unit; + struct shim_hdr sc_shim; + LIST_ENTRY(mpe_softc) sc_list; +}; + +#define MPE_HDRLEN sizeof(struct shim_hdr) +#define MPE_MTU 1500 +#define MPE_MTU_MIN 256 +#define MPE_MTU_MAX 8192 + +void mpe_input(struct mbuf *, struct ifnet *, struct sockaddr_mpls *, + u_int32_t); + +extern int mpls_raw_usrreq(struct socket *, int, struct mbuf *, + struct mbuf *, struct mbuf *, struct proc *); + +extern struct ifqueue mplsintrq; /* MPLS input queue */ +extern int mplsqmaxlen; /* MPLS input queue length */ +extern int mpls_enable; +extern int mpls_defttl; + +void mpls_init(void); +void mplsintr(void); + +struct mbuf *mpls_shim_pop(struct mbuf *); +struct mbuf *mpls_shim_swap(struct mbuf *, struct sockaddr_mpls *); +struct mbuf *mpls_shim_push(struct mbuf *, struct sockaddr_mpls *); + +int mpls_sysctl(int *, u_int, void *, size_t *, void *, size_t); +void mpls_input(struct mbuf *); + +#endif /* _KERNEL */ ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#2 (text+ko) ==== @@ -1,23 +1,209 @@ -#include + +/* + * Copyright (c) 2008 Claudio Jeker + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include "mpe.h" #include +#include #include -#include -#include +#include + +#include +#include +#include + +#include + +struct ifqueue mplsintrq; +int mplsqmaxlen = IFQ_MAXLEN; +extern int mpls_inkloop; -#include +#ifdef MPLS_DEBUG +#define MPLS_LABEL_GET(l) ((ntohl((l) & MPLS_LABEL_MASK)) >> MPLS_LABEL_OFFSET) +#define MPLS_TTL_GET(l) (ntohl((l) & MPLS_TTL_MASK)) +#endif -struct ifqueue mplsintrq; +void +mpls_init(void) +{ + mplsintrq.ifq_maxlen = mplsqmaxlen; +} void -mpls_init() +mplsintr(void) { - printf("MPLS packet received, netisr_register called"); - netisr_register(NETISR_MPLS, mpls_input, &mplsintrq, NETISR_MPSAFE); -} + struct mbuf *m; + int s; + + for (;;) { + /* Get next datagram of input queue */ + s = splnet(); + IF_DEQUEUE(&mplsintrq, m); + splx(s); + if (m == NULL) + return; +#ifdef DIAGNOSTIC + if ((m->m_flags & M_PKTHDR) == 0) + panic("ipintr no HDR"); +#endif + mpls_input(m); + } +} void mpls_input(struct mbuf *m) { - printf("MPLS input called"); -} + struct ifnet *ifp = m->m_pkthdr.rcvif; + struct sockaddr_mpls *smpls; + struct sockaddr_mpls sa_mpls; + struct shim_hdr *shim; + struct rtentry *rt = NULL; + u_int32_t ttl; + int i, hasbos; + + if (!mpls_enable) { + m_freem(m); + return; + } + + /* drop all broadcast and multicast packets */ + if (m->m_flags & (M_BCAST | M_MCAST)) { + m_freem(m); + return; + } + + if (m->m_len < sizeof(*shim)) + if ((m = m_pullup(m, sizeof(*shim))) == NULL) + return; + + shim = mtod(m, struct shim_hdr *); + +#ifdef MPLS_DEBUG + printf("mpls_input: iface %s label=%d, ttl=%d BoS %d\n", + ifp->if_xname, MPLS_LABEL_GET(shim->shim_label), + MPLS_TTL_GET(shim->shim_label), + MPLS_BOS_ISSET(shim->shim_label)); +#endif /* MPLS_DEBUG */ + + /* check and decrement TTL */ + ttl = ntohl(shim->shim_label & MPLS_TTL_MASK); + if (ttl <= 1) { + /* TTL exceeded */ + /* + * XXX if possible hand packet up to network layer so that an + * ICMP TTL exceeded can be sent back. + */ + m_freem(m); + return; + } + ttl = htonl(ttl - 1); + + for (i = 0; i < mpls_inkloop; i++) { + bzero(&sa_mpls, sizeof(sa_mpls)); + smpls = &sa_mpls; + smpls->smpls_family = AF_MPLS; + smpls->smpls_len = sizeof(*smpls); + smpls->smpls_in_ifindex = ifp->if_index; + smpls->smpls_in_label = shim->shim_label & MPLS_LABEL_MASK; + +#ifdef MPLS_DEBUG + printf("smpls af %d len %d in_label %d in_ifindex %d\n", + smpls->smpls_family, smpls->smpls_len, + MPLS_LABEL_GET(smpls->smpls_in_label), + smpls->smpls_in_ifindex); +#endif + + rt = rtalloc1(smplstosa(smpls),1, 0); + + if (rt == NULL) { + /* no entry for this label */ +#ifdef MPLS_DEBUG + printf("MPLS_DEBUG: label not found\n"); +#endif + m_freem(m); + goto done; + } + + rt->rt_use++; + smpls = satosmpls(rt_key(rt)); +#ifdef MPLS_DEBUG + printf("route af %d len %d in_label %d in_ifindex %d\n", + smpls->smpls_family, smpls->smpls_len, + MPLS_LABEL_GET(smpls->smpls_in_label), + smpls->smpls_in_ifindex); + printf("\top %d out_label %d out_ifindex %d\n", + smpls->smpls_operation, + MPLS_LABEL_GET(smpls->smpls_out_label), + smpls->smpls_out_ifindex); +#endif + + switch (smpls->smpls_operation) { + case MPLS_OP_POP: + hasbos = MPLS_BOS_ISSET(shim->shim_label); + m = mpls_shim_pop(m); + if (hasbos) { +#if NMPE > 0 + if (rt->rt_ifp->if_type == IFT_MPLS) { + mpe_input(m, rt->rt_ifp, smpls, ttl); + goto done; + } +#endif + /* last label but we have no clue so drop */ + m_freem(m); + goto done; + } + break; + case MPLS_OP_PUSH: + m = mpls_shim_push(m, smpls); + break; + case MPLS_OP_SWAP: + m = mpls_shim_swap(m, smpls); + break; + default: + m_freem(m); + goto done; + } + + if (m == NULL) + goto done; + + /* refetch label */ + shim = mtod(m, struct shim_hdr *); + ifp = rt->rt_ifp; + + if (smpls->smpls_out_ifindex) + break; + + RTFREE(rt); + rt = NULL; + } + + /* write back TTL */ + shim->shim_label = (shim->shim_label & ~MPLS_TTL_MASK) | ttl; + +#ifdef MPLS_DEBUG + printf("MPLS: sending on %s outlabel %x dst af %d in %d out %d\n", + ifp->if_xname, ntohl(shim->shim_label), smpls->smpls_family, + MPLS_LABEL_GET(smpls->smpls_in_label), + MPLS_LABEL_GET(smpls->smpls_out_label)); +#endif + + (*ifp->if_output)(ifp, m, smplstosa(smpls), rt); +done: + if (rt) + RTFREE(rt); +} ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_proto.c#2 (text+ko) ==== @@ -1,1 +1,74 @@ - + +/* + * Copyright (C) 1999, 2000 and 2001 AYAME Project, WIDE Project. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include + +#include +#include + +#include + +/* + * MPLS protocol family: + */ + +extern struct domain mplsdomain; + +struct protosw mplssw[] = { +{ 0, &mplsdomain, 0, 0, + 0, 0, 0, 0, + 0, + mpls_init, 0, 0, 0, mpls_sysctl +}, +{ SOCK_DGRAM, &mplsdomain, 0, PR_ATOMIC|PR_ADDR, + 0, 0, 0, 0, + mpls_raw_usrreq, + 0, 0, 0, 0, mpls_sysctl, +}, +/* raw wildcard */ +{ SOCK_RAW, &mplsdomain, 0, PR_ATOMIC|PR_ADDR, + 0, 0, 0, 0, + mpls_raw_usrreq, + 0, 0, 0, 0, mpls_sysctl, +}, +}; + +struct domain mplsdomain = { + AF_MPLS, "mpls", mpls_init, 0, 0, + mplssw, + &mplssw[sizeof(mplssw)/sizeof(mplssw[0])], 0, + rn_inithead, + offsetof(struct sockaddr_mpls, smpls_in_ifindex) << 3, + sizeof(struct sockaddr_mpls) +}; ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_raw.c#2 (text+ko) ==== @@ -1,1 +1,145 @@ - + +/* + * Copyright (C) 1999, 2000 and 2001 AYAME Project, WIDE Project. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include + +#define MPLS_RAW_SNDQ 8192 +#define MPLS_RAW_RCVQ 8192 + +u_long mpls_raw_sendspace = MPLS_RAW_SNDQ; +u_long mpls_raw_recvspace = MPLS_RAW_RCVQ; + +int mpls_enable = 0; +int mpls_defttl = 255; +int mpls_inkloop = 16; +int mpls_push_expnull_ip = 0; +int mpls_push_expnull_ip6 = 0; +int mpls_mapttl_ip = 1; +int mpls_mapttl_ip6 = 0; + +int *mplsctl_vars[MPLSCTL_MAXID] = MPLSCTL_VARS; + +int mpls_control(struct socket *, u_long, caddr_t, struct ifnet *); + +/* + * Generic MPLS control operations (ioctl's). + * Ifp is 0 if not an interface-specific ioctl. + */ +/* ARGSUSED */ +int +mpls_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp) +{ + return (EOPNOTSUPP); +} + +int +mpls_raw_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam, + struct mbuf *control, struct proc *p) +{ + int error = 0; + +#ifdef MPLS_DEBUG + printf("mpls_raw_usrreq: called! (reqid=%d).\n", req); +#endif /* MPLS_DEBUG */ + + if (req == PRU_CONTROL) + return (mpls_control(so, (u_long)m, (caddr_t)nam, + (struct ifnet *)control)); + + switch (req) { + case PRU_ATTACH: + if (so->so_snd.sb_hiwat == 0 || so->so_rcv.sb_hiwat == 0) { + error = soreserve(so, mpls_raw_sendspace, + mpls_raw_recvspace); + if (error) + break; + } + break; + + case PRU_DETACH: + case PRU_BIND: + case PRU_LISTEN: + case PRU_CONNECT: + case PRU_CONNECT2: + case PRU_DISCONNECT: + case PRU_SHUTDOWN: + case PRU_RCVD: + case PRU_SEND: + case PRU_SENSE: + case PRU_RCVOOB: + case PRU_SENDOOB: + case PRU_SOCKADDR: + case PRU_PEERADDR: + error = EOPNOTSUPP; + break; + + default: + panic("rip_usrreq"); + } + + return (error); +} + +int +mpls_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, + size_t newlen) +{ + if (name[0] >= MPLSCTL_MAXID) + return EOPNOTSUPP; + + /* Almost all sysctl names at this level are terminal. */ + if (namelen != 1 && name[0] != MPLSCTL_IFQUEUE) + return (ENOTDIR); + + switch (name[0]) { + case MPLSCTL_IFQUEUE: + return (sysctl_ifq(name + 1, namelen - 1, + oldp, oldlenp, newp, newlen, &mplsintrq)); + default: + return sysctl_int_arr(mplsctl_vars, name, namelen, + oldp, oldlenp, newp, newlen); + } +} ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_shim.c#2 (text+ko) ==== @@ -1,1 +1,99 @@ +/* + * Copyright (C) 1999, 2000 and 2001 AYAME Project, WIDE Project. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include + +#include +#include + +#include + +struct mbuf * +mpls_shim_pop(struct mbuf *m) +{ + /* shaves off top shim header from mbuf */ + m_adj(m, sizeof(struct shim_hdr)); + + /* catch-up next shim_hdr */ + if (m->m_len < sizeof(struct shim_hdr)) + if ((m = m_pullup(m, sizeof(struct shim_hdr))) == 0) + return (NULL); + + /* return mbuf */ + return (m); +} + +struct mbuf * +mpls_shim_swap(struct mbuf *m, struct sockaddr_mpls *smplsp) +{ + struct shim_hdr *shim; + + /* pullup shim_hdr */ + if (m->m_len < sizeof(struct shim_hdr)) + if ((m = m_pullup(m, sizeof(struct shim_hdr))) == 0) + return (NULL); + shim = mtod(m, struct shim_hdr *); + + /* swap label */ + shim->shim_label &= ~MPLS_LABEL_MASK; + shim->shim_label |= smplsp->smpls_out_label & MPLS_LABEL_MASK; + + /* swap exp : XXX exp override */ + { + u_int32_t t; + + shim->shim_label &= ~MPLS_EXP_MASK; + t = smplsp->smpls_out_exp << MPLS_EXP_OFFSET; + shim->shim_label |= htonl(t) & MPLS_EXP_MASK; + } + + return (m); +} + +struct mbuf * +mpls_shim_push(struct mbuf *m, struct sockaddr_mpls *smplsp) +{ + struct shim_hdr *shim; + + M_PREPEND(m, sizeof(struct shim_hdr), M_DONTWAIT); + if (m == 0) + return (NULL); + + shim = mtod(m, struct shim_hdr *); + bzero((caddr_t)shim, sizeof(*shim)); + + return (mpls_shim_swap(m, smplsp)); +} From owner-p4-projects@FreeBSD.ORG Tue Jul 8 05:29:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB8F41065681; Tue, 8 Jul 2008 05:29:00 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E95F106567B for ; Tue, 8 Jul 2008 05:29:00 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6CFF58FC0A for ; Tue, 8 Jul 2008 05:29:00 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m685T0e1081008 for ; Tue, 8 Jul 2008 05:29:00 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m685T0i8081006 for perforce@freebsd.org; Tue, 8 Jul 2008 05:29:00 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 8 Jul 2008 05:29:00 GMT Message-Id: <200807080529.m685T0i8081006@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 144860 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, 08 Jul 2008 05:29:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=144860 Change 144860 by pgj@disznohal on 2008/07/08 05:28:34 Finish rework in www/hu/docs Affected files ... .. //depot/projects/docproj_hu/www/hu/docs/books.sgml#7 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/docs/books.sgml#7 (text+ko) ==== @@ -2,7 +2,8 @@ - + @@ -21,156 +22,165 @@ &header; -

    Ezen az oldalon

    +

    Ezen az oldalon

    -

    Minden itt található dokumentum letölthetõ - több különbözõ formátumban - (HTML, PostScript, PDF, stb.) és - tömörítéssel (bzip2, zip) a FreeBSD Minden itt található dokumentum + letölthetõ több különbözõ + formátumban (HTML, PostScript, PDF, stb), akár + tömörítve (bzip2, zip) a &os; FTP oldaláról.

    -

    A &os; dokumentáció archivált másolatai - (cikkek, könyvek és textinfo dokumentumok) szintén - elérhetõek a - http://docs.FreeBSD.org/doc/ +

    A &os; dokumentáció archivált + másolatai (cikkek, könyvek és textinfo + dokumentumok) szintén elérhetõek a http://docs.FreeBSD.org/doc/ címen.

    -

    Ezeket a dokumentumokat a FreeBSD - Dokumentációs Projekt biztosítja és - tartja karban, de mindig szükségünk van új - emberekre új dokumentációk - írásához és a meglévõek +

    Ezeket a dokumentumokat a &os; Dokumentációs Projekt + készíti és tartja karban, de mindig + szükségünk van új emberekre új + dokumentációk írásához + és a meglévõek karbantartásához.

    Könyvek

    -

    A FreeBSD - Projekt modellje (dev-model)
    - Egy tanulmány a FreeBSD Projekt szervezeti +

    A &os; Projekt modellje + (dev-model)
    Egy tanulmány a &os; Projekt szervezeti felépítésérõl.

    -

    A FreeBSD GYIK (faq)
    - Gyakran Ismételt Kérdések és a - a rájuk adott válaszok minden - a FreeBSD-t - érintõ - témáról.

    +

    A FreeBSD GYIK + (faq)
    Gyakran Ismételt Kérdések és + a a rájuk adott válaszok minden — a &os;-t + érintõ — témáról.

    -

    A FreeBSD - kézikönyv (handbook)
    - Egy folyamatosan fejlõdõ, átfogó - információforrás FreeBSD +

    A &os; kézikönyv + (handbook)
    Egy folyamatosan fejlõdõ, + átfogó információforrás &os; felhasználóknak.

    -

    A FreeBSD - Fejlesztõk Kézikönyve (developers-handbook)
    - Azoknak, akik a FreeBSD-hez akarnak szoftvereket fejleszteni - (,és nem csak azoknak, akik magát, a FreeBSD-t - fejlesztik).

    +

    A &os; fejlesztõk kézikönyve + (developers-handbook)
    Azoknak, akik a &os;-hez akarnak + szoftvereket fejleszteni (nem csak azoknak, akik magát a + rendszert fejlesztik).

    -

    A FreeBSD - Architektúra Kézikönyv (arch-handbook)
    - FreeBSD rendszerfejlesztõknek. Ez a könyv - részletesen tárgyalja sok fontos - kernel alrendszer architekturális +

    A &os; architektúra kézikönyv + (arch-handbook)
    &os; rendszerfejlesztõknek. Ez a + könyv részletesen tárgyalja sok fontos + rendszermagbeli alrendszer architekturális felépítését.

    -

    A Porterek - Kézikönyve (porters-handbook)
    - Alapvetõ olvasmány, ha kívülálló - szoftvert szeretne FreeBSD-re portolni.

    +

    A porterek kézikönyve + (porters-handbook)
    Alapvetõ olvasmány, ha + külsõ szoftvert szeretnénk &os;-re + portolni.

    -

    A PMake - Kézikönyv (pmake)
    - Kézikönyv a make segédprogramhoz. - Alapvetõ olvasmány mindenkinek, aki részleteiben - is meg szeretné érteni a make - használatát Makefile-ok olvasásához - és írásához.

    +

    A PMake kézikönyv + (pmake)
    Kézikönyv a make + segédprogramhoz. Alapvetõ olvasmány + mindenkinek, aki részleteiben is meg szeretné + érteni a make használatát, a + Makefile állományok olvasását + és írását.

    -

    A 4.4BSD - Operációs Rendszer Tervezése - és Implementációja, 2. Fejezet - (design-44bsd)
    - Az Addison-Wesley Kiadó adománya, a 4.4BSD - operációs rendszer technikai - megvalósítását mutatja be. - A FreeBSD ennek az operációs rendszernek - az alapjaira épül.

    +

    A 4.4BSD operációs rendszer tervezése és implementációja, 2. fejezet + (design-44bsd)
    Az Addison-Wesley Kiadó + adománya, a 4.4BSD operációs rendszer + technikai megvalósítását mutatja be. + A &os; ennek az alapjaira épül.

    -

    Vállalati - FreeBSD Rendszergazdák Útmutatója, - 8. Fejezet (corp-net-guide)
    - Az Addison-Wesley Kiadó adománya, - mélyreható áttekintést nyújt - arról, hogyan üzemeltessünk nyomtatási - szolgáltatásokat a FreeBSD +

    Vállalati &os; rendszergazdák útmutatója, 8. fejezet + (corp-net-guide)
    Az Addison-Wesley Kiadó + adománya, amely mélyreható + áttekintést nyújt arról, hogyan + üzemeltessünk nyomtatási + szolgáltatásokat a &os; segítségével Windows NT és Novell kliensek számára.

    -

    A FreeBSD - Dokumentációs Projekt Irányelvei - Kezdõknek - (fdp-primer)
    - Minden amit tudnia kell, hogy a FreeBSD Dokumentációs - projekten dolgozhasson.

    +

    A &os; Dokumentációs Projekt irányelvei kezdõknek + (fdp-primer)
    Minden, amit ahhoz kell tudnunk, hogy a &os; + Dokumentációs Projektben dolgozhassunk.

    Cikkek

    -

    Miért - érdemes BSD licenszet használnia - nyílt forrású alkalmazás - fejlesztésekor? (bsdl-gpl)
    +

    Miért érdemes BSD licencet használni nyílt forrású alkalmazások fejlesztésekor? + (bsdl-gpl)
    Leírja, milyen elõnyökkel jár a - forráskód kiadása BSD licensz alatt.

    + forráskód kiadása a BSD licenc alatt.

    -

    Fejlesztés - FreeBSD-vel (building-products)
    - Hogyan segíthet a FreeBSD jobb alkalmazásokat +

    Fejlesztés &os;-vel + (building-products)
    + Hogyan segíthet a &os; jobb alkalmazásokat fejleszteni.

    -

    Argentina.com: - Egy esettanulmány (casestudy-argentina.com)
    - Hogyan segített a FreeBSD egy nagy latin-amerikai +

    Argentina.com: Egy esettanulmány + (casestudy-argentina.com)
    + Hogyan segített a &os; egy nagy latin-amerikai internetszolgáltatónak.

    -

    A Checkpoint - VPN-1/Firewall-1 és a FreeBSD IPSec integrációja +

    A Checkpoint VPN-1/Firewall-1 és a &os; IPSec integrációja (checkpoint)
    Hogyan konfiguráljunk Checkpoint VPN-1/Firewall-1-et a - FreeBSD IPSec implementációjával együtt.

    + &os; IPSec implementációjával + együtt.

    -

    A Committerek - Útmutatója (committers-guide)
    - Fontos bevezetõ a commit jogot nyert FreeBSD - fejlesztõknek a munkájuk megkezdéséhez.

    +

    A committerek útmutatója + (committers-guide)
    + Fontos bevezetõ a commit jogot nyert &os; + fejlesztõknek a munkájuk + megkezdéséhez.

    -

    A Compiz Fusion - telepítése és használata +

    A Compiz Fusion telepítése és használata (compiz-fusion)
    Hogyan telepítsük és használjuk a - Compiz Fusion kompozit ablakkezelõt FreeBSD alatt.

    + Compiz Fusion kompozit ablakkezelõt &os; alatt.

    -

    Konzol Szerver - Hogyan (console-server)
    - Hogyan állítsunk be egy FreeBSD alapú - konzol szervert egy olcsó soros vezérlõkártya +

    Konzol szerver Hogyan + (console-server)
    + Hogyan állítsunk be egy &os; alapú konzol + szervert egy olcsó soros vonali + vezérlõkártya segítségével.

    -

    Hozzájárulás - a FreeBSD Projekthez (contributing)
    - Hogyan segítsen munkájával a FreeBSD - Projekt fejlõdésében.

    +

    Hozzájárulás a &os; Projekthez + (contributing)
    + Hogyan segítsük munkánkkal a &os; Projekt + fejlõdésében.

    -

    Hozzájárulás - a FreeBSD Ports Collection-höz (contributing-ports)
    - Hogyan segítsen karban tartani a FreeBSD Ports - Collectiont.

    +

    Hozzájárulás a &os; Portgyûjteményéhez + (contributing-ports)
    + Hogyan segítsünk a &os; + Portgyûjteményének + karbantartásában.

    -

    A FreeBSD - fejlesztõk listája (contributors)
    +

    A &os; fejlesztõk listája + (contributors)
    Azon szervezetek és személyek listája, akik - segítettek a FreeBSD fejlõdésében.

    + segítettek a &os; fejlõdésében.

    A CUPS használata &os; alatt @@ -178,79 +188,93 @@ Hogyan állítsuk be a CUPS rendszert &os; rendszereken.

    -

    CVS Repository - létrehozása - A FreeBSD módszer +

    CVS repository létrehozása — A FreeBSD módszere (cvs-freebsd)
    - Hogyan hozzunk létre egy CVS Repositryt, amely ugyanazt a + Hogyan hozzunk létre egy CVS repositryt, amely ugyanazt a CVSROOT infrastruktúrát használja, mint a - FreeBSD.

    + &os;.

    -

    A CVSup - Haladó Felhasználása (cvsup-advanced)
    +

    A CVSup haladóknak + (cvsup-advanced)
    Néhány tipp, hogyan használjuk ki a CVSup bonyolultabb funkcióit.

    -

    Tûzfal - létrehozása betárcsázós - kapcsolatokhoz FreeBSD-vel (dialup-firewall)
    +

    Tûzfal létrehozása betárcsázós kapcsolatokhoz &os;-vel + (dialup-firewall)
    Hogyan állítsunk be egy tûzfalat a PPP és az ipfw használatával dinamikusan kiosztott IP címek esetén.

    -

    Lemez - Nélküli X Szerver Hogyan (diskless-x)
    - Hogyan hozzunk lére lemez nélküli - X szervert.

    +

    Lemez nélküli X szerver használata + (diskless-x)
    + Hogyan hozzunk létre lemez nélküli X + szervert.

    -

    Az Euró - Szimbólum a FreeBSD-ben (euro)
    - Hogyan konfiguráljuk a FreeBSD-t és a hozzá - kapcsolódó alkalmazásokat az Euró - szimbólum megjelenítéséhez.

    +

    Az euró szimbólum használata a &os;-ben + (euro)
    + Hogyan konfiguráljuk a &os;-t és a hozzá + kapcsolódó alkalmazásokat az euró + szimbólumának + megjelenítéséhez.

    -

    A BSD - Bemutatása (explaining-bsd)
    - A válasz arra a kérdésre, hogy mi az a BSD?

    +

    A BSD bemutatása + (explaining-bsd)
    + A válasz arra a kérdésre, hogy mi az a + BSD.

    -

    A FreeBSD - Testreszabott Telepítése (fbsd-from-scratch)
    - Hogyan fordísa le, telepítse és - konfigurálja automatikusan a rendszert, beleértve - kedvenc portjait.

    +

    A &os; önálló telepítése + (fbsd-from-scratch)
    + Egy üres állományrendszertõl indulva + hogyan fordítsuk le, telepítsük és + konfiguráljuk automatikusan a rendszert, beleértve + kedvenc portjainkat.

    -

    Szûrés - Bridge-dzsel (filtering-bridges)
    +

    Szûrés hálózati hidakkal + (filtering-bridges)
    Tûzfalak beállítása és - szûrés FreeBSD rendszereken, amelyek bridge-ként - és nem routerként mûködnek.

    + szûrése olyan &os; rendszereken, amelyek nem + útválasztóként, hanem + hálózati hídként + mûködnek.

    -

    A Fontok és a - FreeBSD (fonts)
    - Leírás a FreeBSD-ben található - különbözõ font technológiákról - és használatukról.

    +

    A &os; és a különbözõ betûtípusok + (fonts)
    + Leírás a &os;-ben található + különbözõ, betûtípusokhoz + tartozó technológiákról és + azok használatáról.

    -

    A - médiák formázása FreeBSD alatt +

    Adathordozók formázása &os; alatt (formatting-media)
    - Hogyan osszuk szeletekre és partíciókra - a fix, vagy cserélhetõ médiát, és - hogyan formázzuk azt a FreeBSD operációs - rendszerben.

    + Hogyan osszuk fel slice-okra és partíciókra + a fix vagy éppen cserélhetõ lemezt, és + hogyan formázzuk meg azokat a &os; + operációs rendszerben.

    -

    Hogyan - használjuk hatékonyan a FreeBSD-questions - levelezési listát? (freebsd-questions)
    - Tippek és trükkök, hogy eredményesen - szerezzünk használható információt - a FreeBSD-questions levelezési lista - használatával.

    +

    Hogyan használjuk hatékonyan a &os;-questions levelezési listát? + (freebsd-questions)
    + Tippek és trükkök arra, hogyan szerezzünk + eredményesen használható + információt a &os;-questions levelezési + lista használatával.

    -

    GEOM osztály - létrehozása (geom-class)
    +

    GEOM osztályok készítése + (geom-class)
    Egy útmutató a GEOM belsõ - felépítésérõl, hogyan írhat - saját GEOM osztályt.

    + felépítésérõl, hogyan + írhatunk saját GEOM-osztályt.

    Az UFS naplózásának használata asztali PC-ken @@ -260,320 +284,345 @@ otthoni környezetben bemutató leírás.

    -

    Munka Kitüntetett - Szerepekkel (hats)
    +

    Munka kitüntetett szerepekkel + (hats)
    A committerek útmutatója, hogyan dolgozzanak - kitüntetett szerepekben, fennhatósággal a FreeBSD - bizonyos területei felett.

    + kitüntetett szerepekben, fennhatósággal a + &os; bizonyos területei felett.

    -

    A FreeBSD - Tükrözése (hubs)
    - Útmutató a FreeBSD weboldala, CVSup szervere, - FTP szerver, stb. tükrözéséhez.

    +

    A &os; tükrözése + (hubs)
    + Útmutató a &os; honlapjának, CVSup + szerverének, FTP szerverének, stb. + tükrözéséhez.

    -

    Az IPsec - Funkcionalitás Független Ellenõrzése - a FreeBSD-ben (ipsec-must)
    +

    Az IPsec mûködõképességének független ellenõrzése a &os;-ben + (ipsec-must)
    Egy módszer az IPsec funkcionalitásának ellenõrzésére.

    -

    FreeBSD - Laptopon (laptop)
    - Hogyan használjunk FreeBSD-t egy laptopon.

    +

    &os; Laptopon + (laptop)
    + Hogyan használjunk &os;-t egy laptopon.

    -

    LDAP hitelesítés +

    LDAP hitelesítés (ldap-auth)
    Egy praktikus útmutató, amely bemutatja miként állítsunk &os; rendszereken LDAP szervereket és segítségükkel hogyan - hitelesítsün felhasználókat

    + hitelesítsün felhasználókat.

    -

    FreeBSD: - Egy nyílt forrású alternatíva a - Linux mellett (linux-comparison)
    - Elmagyarázza a Linux és a FreeBSD közti +

    &os;: Egy nyílt forrású alternatíva a Linux mellett + (linux-comparison)
    + Elmagyarázza a Linux és a &os; közti különbségeket.

    -

    Linux - emuláció a FreeBSD-ben (linux-emulation)
    - Egy technikai leírás a FreeBSD Linux +

    Linux emuláció a &os;-ben + (linux-emulation)
    + Egy technikai leírás a &os; Linux emulációs rétegének belsõ mûködésérõl.

    -

    FreeBSD - gyorstalpaló Linux felhasználóknak +

    &os; gyorstalpaló Linux felhasználóknak (linux-users)
    - Egy bevezetõ jellegû úmutató a - Linux felhasználói számára.

    + Egy bevezetõ jellegû úmutató a Linux + felhasználói számára.

    -

    Gyakran - Ismételt Kérdések a Levelezési - Listákról (mailig-list-faq)
    +

    Gyakran Ismételt Kérdések a levelezési listákról + (mailig-list-faq)
    Hogyan használjuk megfelelõen a levelezési - listákat, hogy elkerüljük az olyan jelenségeket, - mint a gyakran elõkerülõ viták.

    + listákat, hogy óvakodjunk az olyan + jelenségeket, mint a gyakran elõkerülõ + viták.

    -

    MH Bevezetõ +

    MH Bevezetõ (mh)
    Bevezetés az MH e-mail olvasó szoftver - használatába FreeBSD alatt.

    + használatába &os; alatt.

    -

    A FreeBSD - telepítése és használata más - operációs rendszerekkel együtt (multi-os)
    - Hogyan telepítsük a FreeBSD-t más - operációs rendszer mellé, ugyanarra - a számítógépre.

    +

    A &os; telepítése és használata más operációs rendszerekkel együtt + (multi-os)
    + Hogyan telepítsük a &os;-t más + operációs rendszer mellé, ugyanarra a + számítógépre.

    -

    Bevezetés - a NanoBSD-be (nanobsd)
    - Néhány információ a NanoBSD - eszközökrõl, amelyek FreeBSD rendszerek - beágyazott rendszerekre történ&245; - telepítéséhez - használhatóak.

    +

    A NanoBSD bemutatása (nanobsd)
    + A NanoBSD eszközeinek bemutatása, amelyek + segítségével a &os; beágyazott + rendszereken is telepíthetõ és + használható, különös tekintettel a + Compact Flash kártyákra, valamint egyéb + tárolóeszközökre.

    -

    FreeBSD: - Kezdõ Lépések (new-users)
    - A FreeBSD és a &unix; használatáról +

    &os;: Az elsõ lépések + (new-users)
    + A &os; és a &unix; használatáról kezdõknek.

    -

    Perforce a FreeBSD - Fejlesztésében (p4-primer)
    +

    Perforce a &os; fejlesztésében + (p4-primer)
    Útmutató a Perforce verziókezelõ - rendszerhez. Szintén tárgyalja, hogyan - bánjunk a kísérleti projektekkel - a FreeBSD Perforce Szerver használatával.

    + rendszerhez. Továbbá azt is tárgyalja, + hogyan dolgozzunk kísérleti projektekkel a &os; + Perforce szerverének használatán + keresztül.

    -

    Pluggable Authentication - Modules (pam)
    - Útmutató a PAM rendszer és moduljainak - FreeBSD alatti használatához.

    +

    PAM, Pluggable Authentication Modules + (pam)
    + Útmutató a PAM alrendszer és moduljainak + &os; alatti használatához.

    -

    Csomagok - Létrehozása (portbuild)
    - Leírja, hogy a FreeBSD portoló csapata, hogyan +

    Csomagok létrehozása + (portbuild)
    + Leírja, hogy a &os; portoló csapata hogyan készít rendszeresen csomagokat a portokból. Ír a csomagkészítõ klaszterrõl - és a felhasznált eszközökrõl is, - amelyek használata szükséges az - inkrementális, kísérleti, vagy - hivatalos kiadások - csomagkészítésénél.

    + és azokról a felhasznált + eszközökrõl is, amelyek használata + szükséges az inkrementális, + kísérleti, vagy hivatalos kiadások + csomagjainak + elkészítésénél.

    -

    Irányelvek - a FreeBSD Probléma-jelentések - Kezeléséhez (pr-guidelines)
    - Ajánlott gyakorlatok a FreeBSD probléma-jelentések - kezeléséhez.

    +

    Irányelvek &os; hibajelentések kezeléséhez + (pr-guidelines)
    + A &os; hibajelentések kezelésének + ajánlott módszerei.

    -

    FreeBSD - Probléma-jelentések Írása +

    &os; hibajelentések írása (problem-reports)
    - Hogyan küldjünk probléma-jelentést a FreeBSD + Hogyan küldjünk hibajelentést a &os; Projektnek.

    -

    PXE boot FreeBSD-vel +

    PXE rendszerindítás &os;-vel (pxe)
    - Hogyan csináljunk FreeBSD-s PXE szervert, és - hogyan konfiguráljunk klienseket, hogy errõl - bootoljanak.

    + Hogyan csináljunk &os; alapú PXE szervert, + és hogyan állítsunk be úgy + klienseket, hogy innen induljanak.

    -

    Praktikus - rc.d scriptelés a BSD-ben (rc-scripting)
    - Egy útmutató hogy írjunk új rc.d - scripteket és hogyan értsük meg a már +

    Az rc.d szkriptek praktikus olvasása és írása a BSD-ben + (rc-scripting)
    + Egy útmutató arról szól, hogyan írjunk új rc.d + szkripteket és hogyan értsük meg a már létezõeket.

    -

    FreeBSD Mail - Szerver Feketelistával (relaydelay)
    - Feketelistás mail szerver létrehozása - a FreeBSD, a Sendmail, a Perl és a relaydelay - szoftver segítségével. Ez egy - kiváló módszer a kéretlen - reklámlevelek elleni küzdelemben.

    +

    Szürkelistás &os; levelezõ szerverek + (relaydelay)
    + Szürkelistás levelezõ szerver + létrehozása &os; rendszereken a sendmail, MySQL, + Perl ,,relaydelay'' stílusú + használatával. Remek kombináció a + kéretlen reklámlevelek elleni harcban.

    -

    A FreeBSD Kiadások - Tervezése (releng)
    - Leírja a megközelítést, amelyet a FreeBSD - kiadások tervezésénél - használnak, hogy minõségi kiadások - készüljenek. Leírja, hogy milyen - eszközök állnak azok rendelkezésére, - akik testreszabott kiadást szeretnének - készíteni vállalati használatra, - vagy kereskedelmi termékek +

    A &os; kiadások tervezése + (releng)
    + Leírja azt a megközelítést, amelyet a + FreeBSD kiadások tervezésénél + használnak a minél jobb minõségû + kiadások elkészítéséhez. + Innen megtudhatjuk, hogy milyen eszközök állnak + azok rendelkezésére, akik testreszabott + kiadást szeretnének készíteni + vállalati használatra, vagy kereskedelmi + termékek elõállításához.

    -

    A Küsõ - Csomagok Kiadási Tervezése (releng-packages)
    +

    A külsõ csomagok kiadásának tervezése + (releng-packages)
    Ismerteti azt a megközelítést, amellyel a - FreeBSD Ports Management csapata biztosítja, hogy a - csomagok megfeleljenek a hivatalos kiadások által + &os; Ports Management csapata biztosítja, hogy a csomagok + megfeleljenek a hivatalos kiadások által támasztott magas követelményeknek. Ennek a dokumentumnak a fejlesztése még folyik, de végül ismertetni fogja a csomagok készítésének folyamatát, - amelyet a FreeBSD "Ports Cluster" is használ. - Ezen kívül tárgyalni fogja, hogyan - konfiguráljunk számítógépeket, - hogy ports clusterként mûkõdjenek, hogyan - osszuk fel a csomagokat a médiához és - hogyan ellenõrizzük a csomagok + amelyet a &os; "Ports Cluster" is használ. Ezen + kívül tárgyalni fogja, hogyan + állítsuk be + számítógépeket ilyen + klaszterként, hogyan osszuk fel a csomagokat a + telepítõeszközökhöz és hogyan + ellenõrizzük a csomagok épségét.

    -

    A &os; - operációs rendszer távoli - telepítése távoli konzol használata - nélkül (remote-install)
    A &os; - operációs rendszer +

    A &os; operációs rendszer távoli telepítése távoli konzol használata nélkül + (remote-install)
    + A &os; operációs rendszer telepítését mutatja be abban az esetben, amikor a távoli rendszer konzolja nem elérhetõ.

    -

    Soros - és UART eszközök (serial-uart)
    - Részletes leírás a soros portok FreeBSD - alatti használatáról, beleértve - több multi-portos soros +

    Soros vonali és UART eszközök + (serial-uart)
    + Részletes leírás a soros portok &os; alatti + használatáról, beleértve több + többportos soros vonali vezérlõkártyát.

    -

    Solid State - Eszközök és a FreeBSD (solid-state)
    +

    Solid state eszközök és a &os; + (solid-state)
    Solid state lemezeszközök használata a - FreeBSD-ben.

    + &os;-ben.

    -

    Háttértárak +

    Háttértárak (storage-devices)
    Részletes információk a - háttértárak használatáról - a FreeBSD-ben, beleértve az ESDI és SCSI - eszközöket, szalagos tárakat és - CD-ROM olvasókat.

    + háttértárak + használatáról a &os;-ben, beleértve + az ESDI és SCSI eszközöket, szalagos + tárakat és CD-ROM olvasókat.

    -

    Válasszuk - ki a nekünk igazán megfelelõ FreeBSD - verziót! (version-guide)
    - Hogyan válassza ki az igényeinek megfelelõ FreeBSD - verziót. Elmagyarázza a kiadások és a - branch-ek rendszerét, és leírja a -CURRENT - és -STABLE közti különbségeket, illetve - a projekt jelenlegi fejlesztési - ütemezését.

    +

    Válasszuk ki a nekünk igazán megfelelõ &os; verziót! + (version-guide)
    + Hogyan válasszuk ki az igényeinek megfelelõ + FreeBSD verziót. Elmagyarázza a kiadások + és a fejlesztési ágak rendszerét, + és leírja a -CURRENT és -STABLE közti + különbségeket, illetve a projekt jelenlegi + fejlesztési ütemezését.

    -

    Bootolás a - Vinum-mal: Egy Találmány a Megbízható - Szerverekért (vinum)
    - Egy remek bevezetés a hibatûrõ szerverekrõl - és egy lépésrõl-lépésre - haladó útmutató amely bemutatja, hogyan - hozhatunk létre egyet a Vinum-mal.

    +

    Rendszerindítás Vinummal: A megbízható szerverek alapja + (vinum)
    + Egy remek bevezetés a hibatûrõ + szerverekrõl és egy + lépésrõl-lépésre haladó + útmutató, amely bemutatja, hogyan hozhatunk + létre ilyet Vinummal.

    -

    A FreeBSD - VM rendszer elemeinek felépítése +

    A &os; VM alrendszer elemeinek felépítése (vm-design)
    - Egy könnyen érthetõ leírás a - FreeBSD virtuális memória rendszerérõl.

    + Egy könnyen érthetõ leírás a &os; + virtuális memóriát kezelõ + alrendszerérõl.

    -

    Zip meghajtók - és a FreeBSD (zip-drive)
    - Hogyan formázzon, mountoljon és használjon - egy Iomega Zip (SCSI, IDE, vagy párhuzamos) meghajtót a - FreeBSD-n.

    +

    Zip meghajtók és a &os; + (zip-drive)
    + Hogyan formázzunk, csatlakoztassunk és + használjunk Iomega Zip (SCSI, IDE, vagy + párhuzamos) meghajtókat a &os;-n.

    -

    Egyéb weboldalakon

    +

    Egyéb oldalakon

    -

    Számos önálló erõfeszítés - is hozzájárult ahhoz, hogy hasznos - információk álljanak rendelkezésre a - FreeBSD-rõl.

    +

    Számos önálló + erõfeszítés is hozzájárult ahhoz, + hogy hasznos információk álljanak + rendelkezésre a &os;-rõl.

    Cikkek

    From owner-p4-projects@FreeBSD.ORG Tue Jul 8 07:52:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B833106567E; Tue, 8 Jul 2008 07:52:27 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1E3B41065675 for ; Tue, 8 Jul 2008 07:52:27 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0AB008FC1A for ; Tue, 8 Jul 2008 07:52:27 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m687qQLF095393 for ; Tue, 8 Jul 2008 07:52:26 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m687qQWB095391 for perforce@freebsd.org; Tue, 8 Jul 2008 07:52:26 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 8 Jul 2008 07:52:26 GMT Message-Id: <200807080752.m687qQWB095391@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 144864 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, 08 Jul 2008 07:52:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=144864 Change 144864 by hselasky@hselasky_laptop001 on 2008/07/08 07:52:06 IFC @ 144862 Affected files ... .. //depot/projects/usb/src/sys/amd64/amd64/minidump_machdep.c#5 integrate .. //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#10 integrate .. //depot/projects/usb/src/sys/amd64/amd64/pmap.c#11 integrate .. //depot/projects/usb/src/sys/amd64/conf/GENERIC#12 integrate .. //depot/projects/usb/src/sys/amd64/include/pmap.h#6 integrate .. //depot/projects/usb/src/sys/amd64/include/vmparam.h#8 integrate .. //depot/projects/usb/src/sys/boot/forth/loader.conf#9 integrate .. //depot/projects/usb/src/sys/boot/pc98/boot2/README.serial.98#2 delete .. //depot/projects/usb/src/sys/compat/linux/linux_misc.c#10 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_stat.c#3 integrate .. //depot/projects/usb/src/sys/conf/NOTES#16 integrate .. //depot/projects/usb/src/sys/conf/files#32 integrate .. //depot/projects/usb/src/sys/conf/files.i386#10 integrate .. //depot/projects/usb/src/sys/conf/files.pc98#10 integrate .. //depot/projects/usb/src/sys/conf/kern.post.mk#7 integrate .. //depot/projects/usb/src/sys/contrib/dev/oltr/COPYRIGHT#2 delete .. //depot/projects/usb/src/sys/contrib/dev/oltr/i386-elf.trlld.o.uu#2 delete .. //depot/projects/usb/src/sys/contrib/dev/oltr/if_oltr.c#3 delete .. //depot/projects/usb/src/sys/contrib/dev/oltr/if_oltr_isa.c#2 delete .. //depot/projects/usb/src/sys/contrib/dev/oltr/if_oltr_pci.c#2 delete .. //depot/projects/usb/src/sys/contrib/dev/oltr/if_oltrvar.h#2 delete .. //depot/projects/usb/src/sys/contrib/dev/oltr/trlld.h#2 delete .. //depot/projects/usb/src/sys/contrib/dev/oltr/trlldbm.c#2 delete .. //depot/projects/usb/src/sys/contrib/dev/oltr/trlldhm.c#2 delete .. //depot/projects/usb/src/sys/contrib/dev/oltr/trlldmac.c#2 delete .. //depot/projects/usb/src/sys/dev/acpi_support/acpi_asus.c#6 integrate .. //depot/projects/usb/src/sys/dev/arl/if_arl.c#3 delete .. //depot/projects/usb/src/sys/dev/arl/if_arl_isa.c#3 delete .. //depot/projects/usb/src/sys/dev/arl/if_arlreg.h#3 delete .. //depot/projects/usb/src/sys/dev/bm/if_bm.c#2 integrate .. //depot/projects/usb/src/sys/dev/bm/if_bmreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/bm/if_bmvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/cnw/if_cnw.c#5 delete .. //depot/projects/usb/src/sys/dev/cnw/if_cnwioctl.h#2 delete .. //depot/projects/usb/src/sys/dev/cnw/if_cnwreg.h#2 delete .. //depot/projects/usb/src/sys/dev/ed/if_ed_pccard.c#4 integrate .. //depot/projects/usb/src/sys/dev/k8temp/k8temp.c#3 integrate .. //depot/projects/usb/src/sys/dev/lmc/if_lmc.c#6 integrate .. //depot/projects/usb/src/sys/dev/lmc/if_lmc.h#4 integrate .. //depot/projects/usb/src/sys/dev/pccard/pccarddevs#7 integrate .. //depot/projects/usb/src/sys/dev/sbni/if_sbni.c#4 delete .. //depot/projects/usb/src/sys/dev/sbni/if_sbni_isa.c#3 delete .. //depot/projects/usb/src/sys/dev/sbni/if_sbni_pci.c#3 delete .. //depot/projects/usb/src/sys/dev/sbni/if_sbnireg.h#2 delete .. //depot/projects/usb/src/sys/dev/sbni/if_sbnivar.h#2 delete .. //depot/projects/usb/src/sys/dev/sbsh/if_sbsh.c#5 delete .. //depot/projects/usb/src/sys/dev/sbsh/if_sbshreg.h#2 delete .. //depot/projects/usb/src/sys/dev/syscons/daemon/daemon_saver.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_ethersubr.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#13 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.h#8 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#11 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.h#4 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#8 edit .. //depot/projects/usb/src/sys/fs/cd9660/cd9660_rrip.c#2 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_vnops.c#7 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_drive.c#4 integrate .. //depot/projects/usb/src/sys/i386/conf/GENERIC#11 integrate .. //depot/projects/usb/src/sys/i386/conf/NOTES#11 integrate .. //depot/projects/usb/src/sys/i386/i386/mp_machdep.c#9 integrate .. //depot/projects/usb/src/sys/i386/i386/pmap.c#10 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_socksys.c#3 integrate .. //depot/projects/usb/src/sys/ia64/conf/GENERIC#8 integrate .. //depot/projects/usb/src/sys/ia64/ia64/machdep.c#9 integrate .. //depot/projects/usb/src/sys/ia64/include/ia64_cpu.h#4 integrate .. //depot/projects/usb/src/sys/kern/kern_cpuset.c#4 integrate .. //depot/projects/usb/src/sys/kern/kern_event.c#8 integrate .. //depot/projects/usb/src/sys/kern/kern_fork.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_jail.c#7 integrate .. //depot/projects/usb/src/sys/kern/kern_malloc.c#9 integrate .. //depot/projects/usb/src/sys/kern/kern_mib.c#7 integrate .. //depot/projects/usb/src/sys/kern/kern_poll.c#6 integrate .. //depot/projects/usb/src/sys/kern/kern_xxx.c#5 integrate .. //depot/projects/usb/src/sys/kern/subr_param.c#4 integrate .. //depot/projects/usb/src/sys/kern/uipc_usrreq.c#9 integrate .. //depot/projects/usb/src/sys/mips/adm5120/adm5120_machdep.c#1 branch .. //depot/projects/usb/src/sys/mips/adm5120/adm5120reg.h#1 branch .. //depot/projects/usb/src/sys/mips/adm5120/admpci.c#1 branch .. //depot/projects/usb/src/sys/mips/adm5120/console.c#1 branch .. //depot/projects/usb/src/sys/mips/adm5120/files.adm5120#1 branch .. //depot/projects/usb/src/sys/mips/adm5120/if_admsw.c#1 branch .. //depot/projects/usb/src/sys/mips/adm5120/if_admswreg.h#1 branch .. //depot/projects/usb/src/sys/mips/adm5120/if_admswvar.h#1 branch .. //depot/projects/usb/src/sys/mips/adm5120/obio.c#1 branch .. //depot/projects/usb/src/sys/mips/adm5120/obiovar.h#1 branch .. //depot/projects/usb/src/sys/mips/adm5120/std.adm5120#1 branch .. //depot/projects/usb/src/sys/mips/adm5120/uart_bus_adm5120.c#1 branch .. //depot/projects/usb/src/sys/mips/adm5120/uart_cpu_adm5120.c#1 branch .. //depot/projects/usb/src/sys/mips/adm5120/uart_dev_adm5120.c#1 branch .. //depot/projects/usb/src/sys/mips/adm5120/uart_dev_adm5120.h#1 branch .. //depot/projects/usb/src/sys/mips/idt/files.idt#1 branch .. //depot/projects/usb/src/sys/mips/idt/idt_machdep.c#1 branch .. //depot/projects/usb/src/sys/mips/idt/idtpci.c#1 branch .. //depot/projects/usb/src/sys/mips/idt/idtreg.h#1 branch .. //depot/projects/usb/src/sys/mips/idt/if_kr.c#1 branch .. //depot/projects/usb/src/sys/mips/idt/if_krreg.h#1 branch .. //depot/projects/usb/src/sys/mips/idt/obio.c#1 branch .. //depot/projects/usb/src/sys/mips/idt/obiovar.h#1 branch .. //depot/projects/usb/src/sys/mips/idt/std.idt#1 branch .. //depot/projects/usb/src/sys/mips/idt/uart_bus_rc32434.c#1 branch .. //depot/projects/usb/src/sys/mips/idt/uart_cpu_rc32434.c#1 branch .. //depot/projects/usb/src/sys/mips/malta/files.malta#1 branch .. //depot/projects/usb/src/sys/mips/malta/gt.c#1 branch .. //depot/projects/usb/src/sys/mips/malta/gt_pci.c#1 branch .. //depot/projects/usb/src/sys/mips/malta/gtreg.h#1 branch .. //depot/projects/usb/src/sys/mips/malta/gtvar.h#1 branch .. //depot/projects/usb/src/sys/mips/malta/malta_machdep.c#1 branch .. //depot/projects/usb/src/sys/mips/malta/maltareg.h#1 branch .. //depot/projects/usb/src/sys/mips/malta/obio.c#1 branch .. //depot/projects/usb/src/sys/mips/malta/obiovar.h#1 branch .. //depot/projects/usb/src/sys/mips/malta/std.malta#1 branch .. //depot/projects/usb/src/sys/mips/malta/uart_bus_maltausart.c#1 branch .. //depot/projects/usb/src/sys/mips/malta/uart_cpu_maltausart.c#1 branch .. //depot/projects/usb/src/sys/mips/malta/yamon.c#1 branch .. //depot/projects/usb/src/sys/mips/malta/yamon.h#1 branch .. //depot/projects/usb/src/sys/mips/mips/pmap.c#3 integrate .. //depot/projects/usb/src/sys/mips/mips32/adm5120/adm5120_machdep.c#2 delete .. //depot/projects/usb/src/sys/mips/mips32/adm5120/adm5120reg.h#2 delete .. //depot/projects/usb/src/sys/mips/mips32/adm5120/admpci.c#2 delete .. //depot/projects/usb/src/sys/mips/mips32/adm5120/console.c#2 delete .. //depot/projects/usb/src/sys/mips/mips32/adm5120/files.adm5120#2 delete .. //depot/projects/usb/src/sys/mips/mips32/adm5120/if_admsw.c#2 delete .. //depot/projects/usb/src/sys/mips/mips32/adm5120/if_admswreg.h#2 delete .. //depot/projects/usb/src/sys/mips/mips32/adm5120/if_admswvar.h#2 delete .. //depot/projects/usb/src/sys/mips/mips32/adm5120/obio.c#2 delete .. //depot/projects/usb/src/sys/mips/mips32/adm5120/obiovar.h#2 delete .. //depot/projects/usb/src/sys/mips/mips32/adm5120/std.adm5120#2 delete .. //depot/projects/usb/src/sys/mips/mips32/adm5120/uart_bus_adm5120.c#2 delete .. //depot/projects/usb/src/sys/mips/mips32/adm5120/uart_cpu_adm5120.c#2 delete .. //depot/projects/usb/src/sys/mips/mips32/adm5120/uart_dev_adm5120.c#2 delete .. //depot/projects/usb/src/sys/mips/mips32/adm5120/uart_dev_adm5120.h#2 delete .. //depot/projects/usb/src/sys/mips/mips32/idt/files.idt#2 delete .. //depot/projects/usb/src/sys/mips/mips32/idt/idt_machdep.c#2 delete .. //depot/projects/usb/src/sys/mips/mips32/idt/idtpci.c#2 delete .. //depot/projects/usb/src/sys/mips/mips32/idt/idtreg.h#2 delete .. //depot/projects/usb/src/sys/mips/mips32/idt/if_kr.c#2 delete .. //depot/projects/usb/src/sys/mips/mips32/idt/if_krreg.h#2 delete .. //depot/projects/usb/src/sys/mips/mips32/idt/obio.c#2 delete .. //depot/projects/usb/src/sys/mips/mips32/idt/obiovar.h#2 delete .. //depot/projects/usb/src/sys/mips/mips32/idt/std.idt#2 delete .. //depot/projects/usb/src/sys/mips/mips32/idt/uart_bus_rc32434.c#2 delete .. //depot/projects/usb/src/sys/mips/mips32/idt/uart_cpu_rc32434.c#2 delete .. //depot/projects/usb/src/sys/mips/mips32/malta/files.malta#2 delete .. //depot/projects/usb/src/sys/mips/mips32/malta/gt.c#2 delete .. //depot/projects/usb/src/sys/mips/mips32/malta/gt_pci.c#2 delete .. //depot/projects/usb/src/sys/mips/mips32/malta/gtreg.h#2 delete .. //depot/projects/usb/src/sys/mips/mips32/malta/gtvar.h#2 delete .. //depot/projects/usb/src/sys/mips/mips32/malta/malta_machdep.c#2 delete .. //depot/projects/usb/src/sys/mips/mips32/malta/maltareg.h#2 delete .. //depot/projects/usb/src/sys/mips/mips32/malta/obio.c#2 delete .. //depot/projects/usb/src/sys/mips/mips32/malta/obiovar.h#2 delete .. //depot/projects/usb/src/sys/mips/mips32/malta/std.malta#2 delete .. //depot/projects/usb/src/sys/mips/mips32/malta/uart_bus_maltausart.c#2 delete .. //depot/projects/usb/src/sys/mips/mips32/malta/uart_cpu_maltausart.c#2 delete .. //depot/projects/usb/src/sys/mips/mips32/malta/yamon.c#2 delete .. //depot/projects/usb/src/sys/mips/mips32/malta/yamon.h#2 delete .. //depot/projects/usb/src/sys/mips/mips32/sentry5/files.sentry5#2 delete .. //depot/projects/usb/src/sys/mips/mips32/sentry5/obio.c#2 delete .. //depot/projects/usb/src/sys/mips/mips32/sentry5/obiovar.h#2 delete .. //depot/projects/usb/src/sys/mips/mips32/sentry5/s5_machdep.c#2 delete .. //depot/projects/usb/src/sys/mips/mips32/sentry5/s5reg.h#2 delete .. //depot/projects/usb/src/sys/mips/mips32/sentry5/siba_cc.c#2 delete .. //depot/projects/usb/src/sys/mips/mips32/sentry5/siba_mips.c#2 delete .. //depot/projects/usb/src/sys/mips/mips32/sentry5/siba_sdram.c#2 delete .. //depot/projects/usb/src/sys/mips/mips32/sentry5/uart_bus_sbusart.c#2 delete .. //depot/projects/usb/src/sys/mips/mips32/sentry5/uart_cpu_sbusart.c#2 delete .. //depot/projects/usb/src/sys/mips/sentry5/files.sentry5#1 branch .. //depot/projects/usb/src/sys/mips/sentry5/obio.c#1 branch .. //depot/projects/usb/src/sys/mips/sentry5/obiovar.h#1 branch .. //depot/projects/usb/src/sys/mips/sentry5/s5_machdep.c#1 branch .. //depot/projects/usb/src/sys/mips/sentry5/s5reg.h#1 branch .. //depot/projects/usb/src/sys/mips/sentry5/siba_cc.c#1 branch .. //depot/projects/usb/src/sys/mips/sentry5/siba_mips.c#1 branch .. //depot/projects/usb/src/sys/mips/sentry5/siba_sdram.c#1 branch .. //depot/projects/usb/src/sys/mips/sentry5/uart_bus_sbusart.c#1 branch .. //depot/projects/usb/src/sys/mips/sentry5/uart_cpu_sbusart.c#1 branch .. //depot/projects/usb/src/sys/modules/Makefile#18 integrate .. //depot/projects/usb/src/sys/modules/arl/Makefile#2 delete .. //depot/projects/usb/src/sys/modules/cnw/Makefile#2 delete .. //depot/projects/usb/src/sys/modules/oltr/Makefile#2 delete .. //depot/projects/usb/src/sys/modules/sbni/Makefile#2 delete .. //depot/projects/usb/src/sys/modules/sbsh/Makefile#2 delete .. //depot/projects/usb/src/sys/net/bpf.c#9 integrate .. //depot/projects/usb/src/sys/net/bpf.h#6 integrate .. //depot/projects/usb/src/sys/net/bpf_zerocopy.c#2 integrate .. //depot/projects/usb/src/sys/net/bpf_zerocopy.h#2 integrate .. //depot/projects/usb/src/sys/net/if_lagg.c#7 integrate .. //depot/projects/usb/src/sys/net/if_ppp.c#7 integrate .. //depot/projects/usb/src/sys/net/netisr.c#5 integrate .. //depot/projects/usb/src/sys/net/netisr.h#3 integrate .. //depot/projects/usb/src/sys/net/raw_cb.c#4 integrate .. //depot/projects/usb/src/sys/net/raw_cb.h#2 integrate .. //depot/projects/usb/src/sys/net/raw_usrreq.c#4 integrate .. //depot/projects/usb/src/sys/net/rtsock.c#8 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ht.c#5 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_output.c#9 integrate .. //depot/projects/usb/src/sys/netatalk/ddp_usrreq.c#5 integrate .. //depot/projects/usb/src/sys/netgraph/ng_base.c#9 integrate .. //depot/projects/usb/src/sys/netinet/if_ether.c#9 integrate .. //depot/projects/usb/src/sys/netinet/ip_gre.c#4 integrate .. //depot/projects/usb/src/sys/netinet/ip_input.c#11 integrate .. //depot/projects/usb/src/sys/netinet/raw_ip.c#9 integrate .. //depot/projects/usb/src/sys/netinet/udp_usrreq.c#10 integrate .. //depot/projects/usb/src/sys/netinet6/icmp6.c#9 integrate .. //depot/projects/usb/src/sys/netinet6/in6.c#8 integrate .. //depot/projects/usb/src/sys/netinet6/in6_ifattach.c#7 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_input.c#10 integrate .. //depot/projects/usb/src/sys/netinet6/raw_ip6.c#8 integrate .. //depot/projects/usb/src/sys/netinet6/udp6_usrreq.c#9 integrate .. //depot/projects/usb/src/sys/netipx/ipx_input.c#4 integrate .. //depot/projects/usb/src/sys/netnatm/natm_proto.c#3 integrate .. //depot/projects/usb/src/sys/nfsclient/bootp_subr.c#7 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vfsops.c#9 integrate .. //depot/projects/usb/src/sys/nlm/nlm_advlock.c#2 integrate .. //depot/projects/usb/src/sys/pc98/conf/GENERIC#11 integrate .. //depot/projects/usb/src/sys/pc98/conf/NOTES#10 integrate .. //depot/projects/usb/src/sys/pc98/include/bus.h#2 integrate .. //depot/projects/usb/src/sys/pc98/pc98/busiosubr.c#2 integrate .. //depot/projects/usb/src/sys/powerpc/conf/GENERIC#10 integrate .. //depot/projects/usb/src/sys/rpc/authunix_prot.c#3 integrate .. //depot/projects/usb/src/sys/sparc64/conf/GENERIC#9 integrate .. //depot/projects/usb/src/sys/sparc64/include/in_cksum.h#3 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/in_cksum.c#2 integrate .. //depot/projects/usb/src/sys/sun4v/conf/GENERIC#7 integrate .. //depot/projects/usb/src/sys/sys/event.h#4 integrate .. //depot/projects/usb/src/sys/sys/kernel.h#8 integrate .. //depot/projects/usb/src/sys/vm/vm_kern.h#3 integrate Differences ... ==== //depot/projects/usb/src/sys/amd64/amd64/minidump_machdep.c#5 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.5 2008/06/20 20:59:31 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.6 2008/07/08 04:00:22 alc Exp $"); #include #include @@ -206,7 +206,8 @@ /* Walk page table pages, set bits in vm_page_dump */ ptesize = 0; pdp = (uint64_t *)PHYS_TO_DMAP(KPDPphys); - for (va = VM_MIN_KERNEL_ADDRESS; va < kernel_vm_end; va += NBPDR) { + for (va = VM_MIN_KERNEL_ADDRESS; va < MAX(KERNBASE + NKPT * NBPDR, + kernel_vm_end); va += NBPDR) { i = (va >> PDPSHIFT) & ((1ul << NPDPEPGSHIFT) - 1); /* * We always write a page, even if it is zero. Each @@ -312,7 +313,8 @@ /* Dump kernel page table pages */ pdp = (uint64_t *)PHYS_TO_DMAP(KPDPphys); - for (va = VM_MIN_KERNEL_ADDRESS; va < kernel_vm_end; va += NBPDR) { + for (va = VM_MIN_KERNEL_ADDRESS; va < MAX(KERNBASE + NKPT * NBPDR, + kernel_vm_end); va += NBPDR) { i = (va >> PDPSHIFT) & ((1ul << NPDPEPGSHIFT) - 1); /* We always write a page, even if it is zero */ if ((pdp[i] & PG_V) == 0) { ==== //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.289 2008/03/10 01:32:48 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.290 2008/07/04 17:36:12 alc Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -79,7 +79,6 @@ int mp_naps; /* # of Applications processors */ int boot_cpu_id = -1; /* designated BSP */ -extern int nkpt; extern struct pcpu __pcpu[]; ==== //depot/projects/usb/src/sys/amd64/amd64/pmap.c#11 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.624 2008/07/02 05:41:23 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.626 2008/07/07 17:25:09 alc Exp $"); /* * Manages physical address maps. @@ -440,16 +440,16 @@ /* Read-only from zero to physfree */ /* XXX not fully used, underneath 2M pages */ for (i = 0; (i << PAGE_SHIFT) < *firstaddr; i++) { - ((pt_entry_t *)KPTphys)[(KERNBASE - VM_MIN_KERNEL_ADDRESS) / - PAGE_SIZE + i] = i << PAGE_SHIFT; - ((pt_entry_t *)KPTphys)[(KERNBASE - VM_MIN_KERNEL_ADDRESS) / - PAGE_SIZE + i] |= PG_RW | PG_V | PG_G; + ((pt_entry_t *)KPTphys)[i] = i << PAGE_SHIFT; + ((pt_entry_t *)KPTphys)[i] |= PG_RW | PG_V | PG_G; } /* Now map the page tables at their location within PTmap */ for (i = 0; i < NKPT; i++) { - ((pd_entry_t *)KPDphys)[i] = KPTphys + (i << PAGE_SHIFT); - ((pd_entry_t *)KPDphys)[i] |= PG_RW | PG_V; + ((pd_entry_t *)KPDphys)[(KERNBASE - VM_MIN_KERNEL_ADDRESS) / + NBPDR + i] = KPTphys + (i << PAGE_SHIFT); + ((pd_entry_t *)KPDphys)[(KERNBASE - VM_MIN_KERNEL_ADDRESS) / + NBPDR + i] |= PG_RW | PG_V; } /* Map from zero to end of allocations under 2M pages */ @@ -647,15 +647,17 @@ * Initialize the vm page array entries for the kernel pmap's * page table pages. */ - pd = pmap_pde(kernel_pmap, VM_MIN_KERNEL_ADDRESS); + pd = pmap_pde(kernel_pmap, KERNBASE); for (i = 0; i < NKPT; i++) { if ((pd[i] & (PG_PS | PG_V)) == (PG_PS | PG_V)) continue; + KASSERT((pd[i] & PG_V) != 0, + ("pmap_init: page table page is missing")); mpte = PHYS_TO_VM_PAGE(pd[i] & PG_FRAME); KASSERT(mpte >= vm_page_array && mpte < &vm_page_array[vm_page_array_size], ("pmap_init: page table page is out of range")); - mpte->pindex = pmap_pde_pindex(VM_MIN_KERNEL_ADDRESS) + i; + mpte->pindex = pmap_pde_pindex(KERNBASE) + i; mpte->phys_addr = pd[i] & PG_FRAME; } @@ -1722,10 +1724,12 @@ if (pde == NULL) { /* We need a new PDP entry */ nkpg = vm_page_alloc(NULL, kernel_vm_end >> PDPSHIFT, - VM_ALLOC_NOOBJ | VM_ALLOC_SYSTEM | VM_ALLOC_WIRED); + VM_ALLOC_INTERRUPT | VM_ALLOC_NOOBJ | + VM_ALLOC_WIRED | VM_ALLOC_ZERO); if (nkpg == NULL) panic("pmap_growkernel: no memory to grow kernel"); - pmap_zero_page(nkpg); + if ((nkpg->flags & PG_ZERO) == 0) + pmap_zero_page(nkpg); paddr = VM_PAGE_TO_PHYS(nkpg); newpdp = (pdp_entry_t) (paddr | PG_V | PG_RW | PG_A | PG_M); @@ -1742,10 +1746,12 @@ } nkpg = vm_page_alloc(NULL, pmap_pde_pindex(kernel_vm_end), - VM_ALLOC_NOOBJ | VM_ALLOC_SYSTEM | VM_ALLOC_WIRED); + VM_ALLOC_INTERRUPT | VM_ALLOC_NOOBJ | VM_ALLOC_WIRED | + VM_ALLOC_ZERO); if (nkpg == NULL) panic("pmap_growkernel: no memory to grow kernel"); - pmap_zero_page(nkpg); + if ((nkpg->flags & PG_ZERO) == 0) + pmap_zero_page(nkpg); paddr = VM_PAGE_TO_PHYS(nkpg); newpdir = (pd_entry_t) (paddr | PG_V | PG_RW | PG_A | PG_M); *pmap_pde(kernel_pmap, kernel_vm_end) = newpdir; ==== //depot/projects/usb/src/sys/amd64/conf/GENERIC#12 (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.502 2008/06/20 19:28:33 delphij Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.503 2008/07/07 22:55:11 delphij Exp $ cpu HAMMER ident GENERIC @@ -64,6 +64,7 @@ options KBD_INSTALL_CDEV # install a CDEV entry in /dev options STOP_NMI # Stop CPUS using NMI instead of IPI options AUDIT # Security event auditing +options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) # Debugging for use in -current options KDB # Enable kernel debugger support. ==== //depot/projects/usb/src/sys/amd64/include/pmap.h#6 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.143 2008/06/30 02:35:55 alc Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.145 2008/07/06 22:36:28 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -111,11 +111,11 @@ /* Initial number of kernel page tables. */ #ifndef NKPT -#define NKPT 2288 +#define NKPT 32 #endif #define NKPML4E 1 /* number of kernel PML4 slots */ -#define NKPDPE howmany(NKPT, NPDEPG)/* number of kernel PDP slots */ +#define NKPDPE 6 /* number of kernel PDP slots */ #define NUPML4E (NPML4EPG/2) /* number of userland PML4 pages */ #define NUPDPE (NUPML4E*NPDPEPG)/* number of userland PDP pages */ @@ -131,7 +131,7 @@ #define KPML4I (NPML4EPG-1) /* Top 512GB for KVM */ #define DMPML4I (KPML4I-1) /* Next 512GB down for direct map */ -#define KPDPI (NPDPEPG-6) /* kernel map starts at -6GB */ +#define KPDPI (NPDPEPG-7) /* kernel map starts at -7GB */ /* * XXX doesn't really belong here I guess... ==== //depot/projects/usb/src/sys/amd64/include/vmparam.h#8 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.54 2008/07/03 04:53:14 alc Exp $ + * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.55 2008/07/05 20:44:55 alc Exp $ */ @@ -154,8 +154,8 @@ * 0xffff800000000000 - 0xffff804020100fff recursive page table (512GB slot) * 0xffff804020101000 - 0xfffffeffffffffff unused * 0xffffff0000000000 - 0xffffff7fffffffff 512GB direct map mappings - * 0xffffff8000000000 - 0xfffffffe7fffffff unused (506GB) - * 0xfffffffe80000000 - 0xffffffffffffffff 6GB kernel map + * 0xffffff8000000000 - 0xfffffffe3fffffff unused (505GB) + * 0xfffffffe40000000 - 0xffffffffffffffff 7GB kernel map * * Within the kernel map: * ==== //depot/projects/usb/src/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.126 2008/05/27 02:13:25 yongari Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.128 2008/07/04 21:06:57 jhb Exp $ ############################################################## ### Basic configuration options ############################ @@ -210,7 +210,6 @@ if_age_load="NO" # Attansic/Atheros L1 Gigabit Ethernet if_an_load="NO" # Aironet 4500/4800 802.11 wireless NICs if_ar_load="NO" # Digi SYNC/570i -if_arl_load="NO" # Aironet Arlan 655 wireless network adapter if_ath_load="NO" # Atheros IEEE 802.11 wireless NICs if_aue_load="NO" # ADMtek AN986 Pegasus USB Ethernet if_awi_load="NO" # AMD PCnetMobile IEEE 802.11 wireless NICs @@ -254,14 +253,12 @@ if_nge_load="NO" # National Semiconductor PCI Gigabit Ethernet if_nve_load="NO" # NVIDIA nForce MCP Networking Adapter if_nxge_load="NO" # Neterion Xframe 10Gb Ethernet -if_oltr_load="NO" # Olicom if_pcn_load="NO" # AMD PCnet PCI if_ral_load="NO" # Ralink Technology wireless if_ray_load="NO" # Raytheon Raylink/Webgear Aviator PCCard if_re_load="NO" # RealTek 8139C+/8169/8169S/8110S if_rl_load="NO" # RealTek 8129/8139 if_rue_load="NO" # RealTek RTL8150 USB to Fast Ethernet -if_sbni_load="NO" # Granch SBNI12 leased line adapters if_sf_load="NO" # Adaptec Duralink PCI (AIC-6915 "starfire") if_sis_load="NO" # Silicon Integrated Systems SiS 900/7016 if_sk_load="NO" # SysKonnect SK-984x series PCI Gigabit Ethernet ==== //depot/projects/usb/src/sys/compat/linux/linux_misc.c#10 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.221 2008/05/13 20:01:27 rdivacky Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.222 2008/07/05 13:10:10 rwatson Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -761,7 +761,9 @@ #else /* something other than i386 or amd64 - assume we and Linux agree */ strlcpy(utsname.machine, machine, LINUX_MAX_UTSNAME); #endif /* __i386__ */ + mtx_lock(&hostname_mtx); strlcpy(utsname.domainname, domainname, LINUX_MAX_UTSNAME); + mtx_unlock(&hostname_mtx); return (copyout(&utsname, args->buf, sizeof(utsname))); } ==== //depot/projects/usb/src/sys/compat/svr4/svr4_stat.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.23 2006/09/02 08:18:22 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.24 2008/07/05 13:10:10 rwatson Exp $"); #include #include @@ -454,6 +454,7 @@ break; case SVR4_SI_SRPC_DOMAIN: + /* XXXRW: locking? */ str = domainname; break; ==== //depot/projects/usb/src/sys/conf/NOTES#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1496 2008/06/28 13:38:53 philip Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1498 2008/07/04 21:24:35 jhb Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1737,7 +1737,6 @@ # the embedded gigE NICs on Dell PowerEdge 2550 servers. # cm: Arcnet SMC COM90c26 / SMC COM90c56 # (and SMC COM90c66 in '56 compatibility mode) adapters. -# cnw: Xircom CNW/Netware Airsurfer PC Card adapter # dc: Support for PCI fast ethernet adapters based on the DEC/Intel 21143 # and various workalikes including: # the ADMtek AL981 Comet and AN985 Centaur, the ASIX Electronics @@ -1800,7 +1799,6 @@ # card which is 32-bit. # sis: Support for NICs based on the Silicon Integrated Systems SiS 900, # SiS 7016 and NS DP83815 PCI fast ethernet controller chips. -# sbsh: Support for Granch SBNI16 SHDSL modem PCI adapters # sk: Support for the SysKonnect SK-984x series PCI gigabit ethernet NICs. # This includes the SK-9841 and SK-9842 single port cards (single mode # and multimode fiber) and the SK-9843 and SK-9844 dual port cards @@ -1864,7 +1862,6 @@ hint.sn.0.port="0x300" hint.sn.0.irq="10" device an -device cnw device wi device xe @@ -1887,7 +1884,6 @@ device rl # RealTek 8129/8139 device pcn # AMD Am79C97x PCI 10/100 NICs device sf # Adaptec AIC-6915 (``Starfire'') -device sbsh # Granch SBNI16 SHDSL modem device sis # Silicon Integrated Systems SiS 900/SiS 7016 device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet device ste # Sundance ST201 (D-Link DFE-550TX) ==== //depot/projects/usb/src/sys/conf/files#32 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1312 2008/06/26 10:21:54 dfr Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1314 2008/07/04 21:24:35 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -509,7 +509,6 @@ dev/cm/smc90cx6.c optional cm dev/cmx/cmx.c optional cmx dev/cmx/cmx_pccard.c optional cmx pccard -dev/cnw/if_cnw.c optional cnw pccard dev/cpufreq/ichss.c optional cpufreq dev/cs/if_cs.c optional cs dev/cs/if_cs_isa.c optional cs isa @@ -1084,7 +1083,6 @@ dev/rp/rp_isa.c optional rp isa dev/rp/rp_pci.c optional rp pci dev/safe/safe.c optional safe -dev/sbsh/if_sbsh.c optional sbsh dev/scc/scc_if.m optional scc dev/scc/scc_bfe_ebus.c optional scc ebus dev/scc/scc_bfe_quicc.c optional scc quicc ==== //depot/projects/usb/src/sys/conf/files.i386#10 (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.i386,v 1.597 2008/06/14 12:51:44 wkoszek Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.600 2008/07/04 21:06:57 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -46,11 +46,6 @@ no-obj no-implicit-rule before-depend \ clean "ukbdmap.h" # -trlld.o optional oltr \ - dependency "$S/contrib/dev/oltr/i386-elf.trlld.o.uu" \ - compile-with "uudecode < $S/contrib/dev/oltr/i386-elf.trlld.o.uu" \ - no-implicit-rule -# hal.o optional ath_hal \ dependency "$S/contrib/dev/ath/public/i386-elf.hal.o.uu" \ compile-with "uudecode < $S/contrib/dev/ath/public/i386-elf.hal.o.uu" \ @@ -124,12 +119,6 @@ compat/svr4/svr4_sysvec.c optional compat_svr4 compat/svr4/svr4_termios.c optional compat_svr4 compat/svr4/svr4_ttold.c optional compat_svr4 -contrib/dev/oltr/if_oltr.c optional oltr -contrib/dev/oltr/if_oltr_isa.c optional oltr isa -contrib/dev/oltr/if_oltr_pci.c optional oltr pci -contrib/dev/oltr/trlldbm.c optional oltr -contrib/dev/oltr/trlldhm.c optional oltr -contrib/dev/oltr/trlldmac.c optional oltr bf_enc.o optional crypto | ipsec \ dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \ compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \ @@ -153,8 +142,6 @@ dev/ar/if_ar.c optional ar dev/ar/if_ar_isa.c optional ar isa dev/ar/if_ar_pci.c optional ar pci -dev/arl/if_arl.c optional arl -dev/arl/if_arl_isa.c optional arl isa dev/asmc/asmc.c optional asmc isa dev/atkbdc/atkbd.c optional atkbd atkbdc dev/atkbdc/atkbd_atkbdc.c optional atkbd atkbdc @@ -225,9 +212,6 @@ dev/nvram/nvram.c optional nvram isa dev/pcf/pcf_isa.c optional pcf dev/random/nehemiah.c optional random -dev/sbni/if_sbni.c optional sbni -dev/sbni/if_sbni_isa.c optional sbni isa -dev/sbni/if_sbni_pci.c optional sbni pci dev/sio/sio.c optional sio dev/sio/sio_isa.c optional sio isa dev/sio/sio_pccard.c optional sio pccard ==== //depot/projects/usb/src/sys/conf/files.pc98#10 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.364 2008/06/14 12:51:44 wkoszek Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.366 2008/07/04 21:06:57 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -38,11 +38,6 @@ no-obj no-implicit-rule before-depend \ clean "ukbdmap.h" # -trlld.o optional oltr \ - dependency "$S/contrib/dev/oltr/i386-elf.trlld.o.uu" \ - compile-with "uudecode < $S/contrib/dev/oltr/i386-elf.trlld.o.uu" \ - no-implicit-rule -# hal.o optional ath_hal \ dependency "$S/contrib/dev/ath/public/i386-elf.hal.o.uu" \ compile-with "uudecode < $S/contrib/dev/ath/public/i386-elf.hal.o.uu" \ @@ -87,11 +82,6 @@ compat/svr4/svr4_sysvec.c optional compat_svr4 compat/svr4/svr4_termios.c optional compat_svr4 compat/svr4/svr4_ttold.c optional compat_svr4 -contrib/dev/oltr/if_oltr.c optional oltr -contrib/dev/oltr/if_oltr_pci.c optional oltr pci -contrib/dev/oltr/trlldbm.c optional oltr -contrib/dev/oltr/trlldhm.c optional oltr -contrib/dev/oltr/trlldmac.c optional oltr bf_enc.o optional crypto | ipsec \ dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \ compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \ @@ -130,8 +120,6 @@ dev/mem/memutil.c optional mem dev/mse/mse.c optional mse dev/mse/mse_cbus.c optional mse isa -dev/sbni/if_sbni.c optional sbni -dev/sbni/if_sbni_pci.c optional sbni pci dev/sio/sio_pccard.c optional sio pccard dev/sio/sio_pci.c optional sio pci dev/sio/sio_puc.c optional sio puc ==== //depot/projects/usb/src/sys/conf/kern.post.mk#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.102 2008/05/23 03:53:49 jb Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.103 2008/07/05 06:12:14 jb Exp $ # Part of a unified Makefile for building kernels. This part includes all # the definitions that need to be after all the % directives except %RULES @@ -236,6 +236,9 @@ config.o env.o hints.o vers.o vnode_if.o: ${NORMAL_C} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif config.ln env.ln hints.ln vers.ln vnode_if.ln: ${NORMAL_LINT} ==== //depot/projects/usb/src/sys/dev/acpi_support/acpi_asus.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.35 2008/06/28 08:36:47 remko Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.36 2008/07/04 23:40:53 rpaulo Exp $"); /* * Driver for extra ACPI-controlled gadgets (hotkeys, leds, etc) found on @@ -57,6 +57,7 @@ #define ACPI_ASUS_METHOD_LCD 3 #define ACPI_ASUS_METHOD_CAMERA 4 #define ACPI_ASUS_METHOD_CARDRD 5 +#define ACPI_ASUS_METHOD_WLAN 6 #define _COMPONENT ACPI_OEM ACPI_MODULE_NAME("ASUS") @@ -88,6 +89,9 @@ char *crd_get; char *crd_set; + char *wlan_get; + char *wlan_set; + void (*n_func)(ACPI_HANDLE, UINT32, void *); }; @@ -126,6 +130,7 @@ int s_lcd; int s_cam; int s_crd; + int s_wlan; }; /* @@ -402,6 +407,8 @@ .cam_set = "\\_SB.ATKD.CAMS", .crd_set = "\\_SB.ATKD.CRDS", .crd_get = "\\_SB.ATKD.CRDG", + .wlan_get = "\\_SB.ATKD.WLDG", + .wlan_set = "\\_SB.ATKD.WLDS", .n_func = acpi_asus_eeepc_notify }, @@ -444,6 +451,12 @@ .description = "internal card reader state", .flags = CTLTYPE_INT | CTLFLAG_RW }, + { + .name = "wlan", + .method = ACPI_ASUS_METHOD_WLAN, + .description = "wireless lan state", + .flags = CTLTYPE_INT | CTLFLAG_RW + }, { .name = NULL } }; @@ -906,6 +919,9 @@ case ACPI_ASUS_METHOD_CARDRD: val = sc->s_crd; break; + case ACPI_ASUS_METHOD_WLAN: + val = sc->s_wlan; + break; } return (val); @@ -914,11 +930,18 @@ static int acpi_asus_sysctl_set(struct acpi_asus_softc *sc, int method, int arg) { - ACPI_STATUS status = AE_OK; + ACPI_STATUS status = AE_OK; + ACPI_OBJECT_LIST acpiargs; + ACPI_OBJECT acpiarg[0]; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_SERIAL_ASSERT(asus); + acpiargs.Count = 1; + acpiargs.Pointer = acpiarg; + acpiarg[0].Type = ACPI_TYPE_INTEGER; + acpiarg[0].Integer.Value = arg; + switch (method) { case ACPI_ASUS_METHOD_BRN: if (arg < 0 || arg > 15) @@ -971,7 +994,7 @@ return (EINVAL); status = AcpiEvaluateObject(sc->handle, - sc->model->cam_set, NULL, NULL); + sc->model->cam_set, &acpiargs, NULL); if (ACPI_SUCCESS(status)) sc->s_cam = arg; @@ -981,11 +1004,21 @@ return (EINVAL); status = AcpiEvaluateObject(sc->handle, - sc->model->crd_set, NULL, NULL); + sc->model->crd_set, &acpiargs, NULL); if (ACPI_SUCCESS(status)) sc->s_crd = arg; break; + case ACPI_ASUS_METHOD_WLAN: + if (arg < 0 || arg > 1) + return (EINVAL); + + status = AcpiEvaluateObject(sc->handle, + sc->model->wlan_set, &acpiargs, NULL); + + if (ACPI_SUCCESS(status)) + sc->s_wlan = arg; + break; } return (0); @@ -1096,6 +1129,14 @@ return (TRUE); } return (FALSE); + case ACPI_ASUS_METHOD_WLAN: + if (sc->model->wlan_get) { + status = acpi_GetInteger(sc->handle, + sc->model->wlan_get, &sc->s_wlan); + if (ACPI_SUCCESS(status)) + return (TRUE); + } + return (FALSE); } return (FALSE); } ==== //depot/projects/usb/src/sys/dev/bm/if_bm.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bm/if_bm.c,v 1.1 2008/06/07 22:58:32 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bm/if_bm.c,v 1.2 2008/07/03 21:51:30 nwhitehorn Exp $"); #include #include @@ -101,7 +101,6 @@ static void bm_enable_interrupts (struct bm_softc *sc); static void bm_disable_interrupts (struct bm_softc *sc); static void bm_tick (void *xsc); -static int bm_watchdog (struct bm_softc *sc); static int bm_ifmedia_upd (struct ifnet *); static void bm_ifmedia_sts (struct ifnet *, struct ifmediareq *); @@ -240,8 +239,6 @@ { int i, ack, bit; - BM_LOCK(sc); - /* * Set up frame for RX. */ @@ -284,8 +281,6 @@ bm_mii_writebit(sc, 0); bm_mii_writebit(sc, 0); - BM_UNLOCK(sc); - return ((ack) ? 1 : 0); } @@ -295,8 +290,6 @@ static int bm_mii_writereg(struct bm_softc *sc, struct bm_mii_frame *frame) { - BM_LOCK(sc); - /* * Set up frame for tx */ @@ -321,8 +314,6 @@ */ bm_mii_writebit(sc, 0); - BM_UNLOCK(sc); - return (0); } @@ -464,7 +455,7 @@ error = 0; mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, - MTX_DEF | MTX_RECURSE); + MTX_DEF); callout_init_mtx(&sc->sc_tick_ch, &sc->sc_mtx, 0); /* Check for an improved version of Paddington */ @@ -484,9 +475,6 @@ return (ENXIO); } - sc->sc_btag = rman_get_bustag(sc->sc_memr); - sc->sc_bhandle = rman_get_bushandle(sc->sc_memr); - sc->sc_txdmarid = BM_TXDMA_REGISTERS; sc->sc_rxdmarid = BM_RXDMA_REGISTERS; @@ -627,8 +615,6 @@ /* Attach the interface. */ ether_ifattach(ifp, sc->sc_enaddr); - - ifp->if_data.ifi_hdrlen = sizeof(struct ether_header); ifp->if_hwassist = 0; return (0); @@ -639,11 +625,15 @@ { struct bm_softc *sc = device_get_softc(dev); - callout_drain(&sc->sc_tick_ch); - BM_LOCK(sc); bm_stop(sc); + BM_UNLOCK(sc); + callout_drain(&sc->sc_tick_ch); + ether_ifdetach(sc->sc_ifp); + bus_teardown_intr(dev, sc->sc_txdmairq, sc->sc_txihtx); + bus_teardown_intr(dev, sc->sc_rxdmairq, sc->sc_rxih); + dbdma_free_channel(sc->sc_txdma); dbdma_free_channel(sc->sc_rxdma); @@ -653,15 +643,13 @@ bus_release_resource(dev, SYS_RES_MEMORY, sc->sc_rxdmarid, sc->sc_rxdmar); - bus_teardown_intr(dev, sc->sc_txdmairq, sc->sc_txihtx); - bus_teardown_intr(dev, sc->sc_rxdmairq, sc->sc_rxih); bus_release_resource(dev, SYS_RES_IRQ, sc->sc_txdmairqid, sc->sc_txdmairq); bus_release_resource(dev, SYS_RES_IRQ, sc->sc_rxdmairqid, sc->sc_rxdmairq); - BM_UNLOCK(sc); mtx_destroy(&sc->sc_mtx); + if_free(sc->sc_ifp); return (0); } @@ -669,7 +657,13 @@ static void bm_shutdown(device_t dev) { - bm_stop(device_get_softc(dev)); + struct bm_softc *sc; + + sc = device_get_softc(dev); + + BM_LOCK(sc); + bm_stop(sc); + BM_UNLOCK(sc); } static void @@ -1205,6 +1199,7 @@ /* And we're down */ sc->sc_ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); sc->sc_wdog_timer = 0; + callout_stop(&sc->sc_tick_ch); } static void @@ -1370,22 +1365,15 @@ mii_tick(sc->sc_mii); bm_miibus_statchg(sc->sc_dev); - if (bm_watchdog(sc) == EJUSTRETURN) + if (sc->sc_wdog_timer == 0 || --sc->sc_wdog_timer != 0) { + callout_reset(&sc->sc_tick_ch, hz, bm_tick, sc); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jul 8 08:18:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0441C1065674; Tue, 8 Jul 2008 08:18:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BBC2D1065670 for ; Tue, 8 Jul 2008 08:18:53 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AA4FE8FC1D for ; Tue, 8 Jul 2008 08:18:53 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m688Irv3098602 for ; Tue, 8 Jul 2008 08:18:53 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m688Ir3Y098600 for perforce@freebsd.org; Tue, 8 Jul 2008 08:18:53 GMT (envelope-from gabor@freebsd.org) Date: Tue, 8 Jul 2008 08:18:53 GMT Message-Id: <200807080818.m688Ir3Y098600@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 144865 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, 08 Jul 2008 08:18:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=144865 Change 144865 by gabor@gabor_server on 2008/07/08 08:17:55 - Remove superfluous headers Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#59 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#34 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#50 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#59 (text+ko) ==== @@ -43,7 +43,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#34 (text+ko) ==== @@ -31,7 +31,6 @@ #include #include -#include #ifdef WITHOUT_NLS #define getstr(n) errstr[n] ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#50 (text+ko) ==== @@ -41,12 +41,10 @@ #include #include #include -#include #include #include #include #include -#include #include "grep.h" From owner-p4-projects@FreeBSD.ORG Tue Jul 8 08:52:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D2AB81065679; Tue, 8 Jul 2008 08:52:27 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 966B8106564A for ; Tue, 8 Jul 2008 08:52:27 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 84B488FC14 for ; Tue, 8 Jul 2008 08:52:27 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m688qRo6010622 for ; Tue, 8 Jul 2008 08:52:27 GMT (envelope-from rfrench@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m688qRUd010620 for perforce@freebsd.org; Tue, 8 Jul 2008 08:52:27 GMT (envelope-from rfrench@FreeBSD.org) Date: Tue, 8 Jul 2008 08:52:27 GMT Message-Id: <200807080852.m688qRUd010620@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rfrench@FreeBSD.org using -f From: Ryan French To: Perforce Change Reviews Cc: Subject: PERFORCE change 144866 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, 08 Jul 2008 08:52:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=144866 Change 144866 by rfrench@rfrench_mpls on 2008/07/08 08:52:13 Imported the switch cases for the MPLS protocol from the OpenBSD implementation. Affected files ... .. //depot/projects/soc2008/rfrench_mpls/net/if_ethersubr.c#2 edit Differences ... ==== //depot/projects/soc2008/rfrench_mpls/net/if_ethersubr.c#2 (text+ko) ==== @@ -97,6 +97,10 @@ extern u_char aarp_org_code[3]; #endif /* NETATALK */ +#ifdef MPLS +#include +#endif /* MPLS */ + #include /* netgraph node hooks for ng_ether(4) */ @@ -767,11 +771,6 @@ */ switch (ether_type) { - /* MPLS switch case */ - case ETHERTYPE_MPLS: - isr = NETISR_MPLS; - break; - #ifdef INET case ETHERTYPE_IP: if ((m = ip_fastforward(m)) == NULL) @@ -808,6 +807,36 @@ isr = NETISR_AARP; break; #endif /* NETATALK */ +#ifdef MPLS + case AF_MPLS: + printf("mpls packet received\n"); + if (rt) + dst = rt_key(rt); + else + senderr(EHOSTUNREACH); + + switch (dst->sa_family) { + case AF_LINK: + if (((struct sockaddr_dl *) dst)->sdl_alen < + sizeof(edst)) + senderr(EHOSTUNREACH); + bcopy(LLADDR(((struct sockaddr_dl *)dst)), edst, + sizeof(edst)); + break; + case AF_INET: + if (!arpresolve(ac, rt, m, dst, edst)) + return (0); /* if not yet resolved */ + break; + default: + senderr(EHOSTUNREACH); + } + /* XXX handling for simplex devices in case of M/BCAST ?? */ + if (m->m_flags & (M_BCAST | M_MCAST)) + etype = htons(ETHERTYPE_MPLS_MCAST); + else + etype = htons(ETHERTYPE_MPLS); + break; +#endif /* MPLS */ default: #ifdef IPX if (ef_inputp && ef_inputp(ifp, eh, m) == 0) From owner-p4-projects@FreeBSD.ORG Tue Jul 8 09:45:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 590D41065678; Tue, 8 Jul 2008 09:45:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1DA53106564A for ; Tue, 8 Jul 2008 09:45:21 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0BA1E8FC21 for ; Tue, 8 Jul 2008 09:45:21 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m689jKf8016002 for ; Tue, 8 Jul 2008 09:45:20 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m689jKss016000 for perforce@freebsd.org; Tue, 8 Jul 2008 09:45:20 GMT (envelope-from trasz@freebsd.org) Date: Tue, 8 Jul 2008 09:45:20 GMT Message-Id: <200807080945.m689jKss016000@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 144868 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, 08 Jul 2008 09:45:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=144868 Change 144868 by trasz@trasz_traszkan on 2008/07/08 09:44:29 Update TODO. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/TODO#9 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/TODO#9 (text+ko) ==== @@ -16,6 +16,10 @@ - Add error checking to acl_to_text_nfs4.c. +- Remove the ae_acl field from "struct acl_entry". Instead, allocate + "struct acl" so that it's page aligned and find the header address + by stripping low order bits from the entry adress. + - Either add or extend existing manual pages for new API routines: acl_add_flag_np, acl_clear_flags_np, acl_create_entry_np, acl_delete_entry_np, acl_delete_flag_np, acl_get_extended_np, acl_get_flag_np, acl_get_flagset_np, From owner-p4-projects@FreeBSD.ORG Tue Jul 8 10:06:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 234301065675; Tue, 8 Jul 2008 10:06:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DA7721065671 for ; Tue, 8 Jul 2008 10:06:42 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C62B18FC0C for ; Tue, 8 Jul 2008 10:06:42 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m68A6ggu018739 for ; Tue, 8 Jul 2008 10:06:42 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m68A6gXr018737 for perforce@freebsd.org; Tue, 8 Jul 2008 10:06:42 GMT (envelope-from trasz@freebsd.org) Date: Tue, 8 Jul 2008 10:06:42 GMT Message-Id: <200807081006.m68A6gXr018737@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 144869 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, 08 Jul 2008 10:06:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=144869 Change 144869 by trasz@trasz_traszkan on 2008/07/08 10:05:57 IFC Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/savecore#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/games/fortune/datfiles/fortunes#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/unistd.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/hcreate.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/hcreate.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/expand_number.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/en_US.ISO8859-1/hardware/article.sgml#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/bpf.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ddb.4#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ed.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/malo.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/minidump_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/pmap.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/vmparam.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ed/if_ed_pccard.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/k8temp/k8temp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/include/ia64_cpu.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_cpuset.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_event.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_fork.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_jail.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_malloc.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/adm5120_machdep.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/adm5120reg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/admpci.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/console.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/files.adm5120#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/if_admsw.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/if_admswreg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/if_admswvar.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/obio.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/obiovar.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/std.adm5120#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/uart_bus_adm5120.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/uart_cpu_adm5120.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/uart_dev_adm5120.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/uart_dev_adm5120.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/idt/files.idt#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/idt/idt_machdep.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/idt/idtpci.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/idt/idtreg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/idt/if_kr.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/idt/if_krreg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/idt/obio.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/idt/obiovar.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/idt/std.idt#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/idt/uart_bus_rc32434.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/idt/uart_cpu_rc32434.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/files.malta#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/gt.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/gt_pci.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/gtreg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/gtvar.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/malta_machdep.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/maltareg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/obio.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/obiovar.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/std.malta#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/uart_bus_maltausart.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/uart_cpu_maltausart.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/yamon.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/yamon.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/pmap.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/adm5120/adm5120_machdep.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/adm5120/adm5120reg.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/adm5120/admpci.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/adm5120/console.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/adm5120/files.adm5120#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/adm5120/if_admsw.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/adm5120/if_admswreg.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/adm5120/if_admswvar.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/adm5120/obio.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/adm5120/obiovar.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/adm5120/std.adm5120#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/adm5120/uart_bus_adm5120.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/adm5120/uart_cpu_adm5120.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/adm5120/uart_dev_adm5120.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/adm5120/uart_dev_adm5120.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/idt/files.idt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/idt/idt_machdep.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/idt/idtpci.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/idt/idtreg.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/idt/if_kr.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/idt/if_krreg.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/idt/obio.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/idt/obiovar.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/idt/std.idt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/idt/uart_bus_rc32434.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/idt/uart_cpu_rc32434.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/malta/files.malta#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/malta/gt.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/malta/gt_pci.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/malta/gtreg.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/malta/gtvar.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/malta/malta_machdep.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/malta/maltareg.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/malta/obio.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/malta/obiovar.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/malta/std.malta#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/malta/uart_bus_maltausart.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/malta/uart_cpu_maltausart.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/malta/yamon.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/malta/yamon.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/sentry5/files.sentry5#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/sentry5/obio.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/sentry5/obiovar.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/sentry5/s5_machdep.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/sentry5/s5reg.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/sentry5/siba_cc.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/sentry5/siba_mips.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/sentry5/siba_sdram.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/sentry5/uart_bus_sbusart.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/sentry5/uart_cpu_sbusart.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/sentry5/files.sentry5#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/sentry5/obio.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/sentry5/obiovar.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/sentry5/s5_machdep.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/sentry5/s5reg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/sentry5/siba_cc.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/sentry5/siba_mips.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/sentry5/siba_sdram.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/sentry5/uart_bus_sbusart.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/sentry5/uart_cpu_sbusart.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/bpf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/bpf.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/bpf_zerocopy.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/bpf_zerocopy.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/raw_cb.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/raw_cb.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/raw_usrreq.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ht.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/raw_ip.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/udp_usrreq.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/conf/GENERIC#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/conf/GENERIC#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/event.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_kern.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/cpio/cpio.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/create/main.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/lib/lib.h#3 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.150 2008/07/04 21:24:35 jhb Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.151 2008/07/06 20:57:35 marcel 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,11 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080706: bsdlabel(8) removed on powerpc +.if ${TARGET_ARCH} == "powerpc" +OLD_FILES+=sbin/bsdlabel +OLD_FILES+=usr/share/man/man8/bsdlabel.8.gz +.endif # 20080704: sbsh(4) removed OLD_FILES+=usr/share/man/man4/if_sbsh.4.gz OLD_FILES+=usr/share/man/man4/sbsh.4.gz ==== //depot/projects/soc2008/trasz_nfs4acl/UPDATING#3 (text+ko) ==== @@ -413,6 +413,20 @@ This does not affect those who are using "/dev/dsp". 20061122: + geom(4)'s gmirror(8) class metadata structure has been + rev'd from v3 to v4. If you update across this point and + your metadata is converted for you, you will not be easily + able to downgrade since the /boot/kernel.old/geom_mirror.ko + kernel module will be unable to read the v4 metadata. You + can resolve this by doing from the loader(8) prompt: + + set vfs.root.mountfrom="ufs:/dev/XXX" + + where XXX is the root slice of one of the disks that composed + the mirror (i.e.: /dev/ad0s1a). You can then rebuild + the array the same way you built it originally. + +20061122: The following binaries have been disconnected from the build: mount_devfs, mount_ext2fs, mount_fdescfs, mount_procfs, mount_linprocfs, and mount_std. The functionality of these programs has been @@ -1053,4 +1067,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.532 2008/06/09 21:33:57 marcel Exp $ +$FreeBSD: src/UPDATING,v 1.534 2008/07/07 13:08:30 remko Exp $ ==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.1#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.17 2006/09/17 17:40:07 ru Exp $ +.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.19 2008/07/06 22:47:10 csjp Exp $ .\" .Dd January 7, 2001 .Dt SETFACL 1 @@ -234,9 +234,27 @@ .Pp Multiple ACL entries specified on the command line are separated by commas. +.Pp +It is possible for files and directories to inherit ACL entries from their +parent directory. +This is accomplished through the use of the default ACL. +It should be noted that before you can specify a default ACL, the mandatory +ACL entries for user, group, other and mask must be set. +For more details see the examples below. +Default ACLs can be created by using +.Fl d . .Sh EXIT STATUS .Ex -std .Sh EXAMPLES +.Dl setfacl -d -m u::rwx,g::rx,o::rx,mask::rwx dir +.Dl setfacl -d -m g:admins:rwx dir +.Pp +The first command sets the mandatory elements of the default ACL. +The second command specifies that users in group admins can have read, write, and execute +permissions for directory named "dir". +It should be noted that any files or directories created underneath "dir" will +inherit these default ACLs upon creation. +.Pp .Dl setfacl -m u::rwx,g:mail:rw file .Pp Sets read, write, and execute permissions for the ==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/savecore#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/savecore,v 1.13 2008/06/23 20:54:32 mtm Exp $ +# $FreeBSD: src/etc/rc.d/savecore,v 1.15 2008/07/06 08:31:29 mtm Exp $ # # PROVIDE: savecore @@ -17,11 +17,6 @@ savecore_prestart() { - # ${DUMPDIR} should be a directory or a symbolic link - # to the crash directory if core dumps are to be saved. - # - DUMPDIR="${dumpdir:-/var/crash}" - # Quit if we have no dump device case ${dumpdev} in [Nn][Oo] | '') @@ -57,8 +52,19 @@ savecore_start() { - if savecore -C >/dev/null; then - savecore ${savecore_flags} ${DUMPDIR} ${dumpdev} + local dev + + case "${dumpdev}" in + [Aa][Uu][Tt][Oo]) + dev= + ;; + *) + dev="${dumpdev}" + ;; + esac + + if savecore -C "${dumpdir}" "${dev}" >/dev/null; then + savecore ${savecore_flags} ${dumpdir} ${dumpdev} else [ -z "${rc_quiet}" ] && echo "No core dumps found" fi ==== //depot/projects/soc2008/trasz_nfs4acl/games/fortune/datfiles/fortunes#4 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.266 2008/07/05 08:54:58 phk Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.267 2008/07/07 10:04:16 phk Exp $ % ======================================================================= || || @@ -52177,7 +52177,7 @@ the affair," and of course be sadly disappointed thereby. -- Sacramento Daily Union, November 29, 1861 % -Too many of his [Mozarts] works sound like interoffice memos. +Too many of his [Mozart's] works sound like interoffice memos. -- Glenn Gould % Too many people are thinking of security instead of opportunity. ==== //depot/projects/soc2008/trasz_nfs4acl/include/unistd.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.89 2008/06/23 05:22:06 ed Exp $ + * $FreeBSD: src/include/unistd.h,v 1.90 2008/07/08 03:08:32 davidxu Exp $ */ #ifndef _UNISTD_H_ @@ -107,7 +107,7 @@ #define _POSIX_READER_WRITER_LOCKS 200112L #define _POSIX_REGEXP 1 #define _POSIX_SHELL 1 -#define _POSIX_SPAWN -1 +#define _POSIX_SPAWN 200112L #define _POSIX_SPIN_LOCKS 200112L #define _POSIX_THREAD_ATTR_STACKADDR 200112L #define _POSIX_THREAD_ATTR_STACKSIZE 200112L ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/hcreate.3#2 (text+ko) ==== @@ -1,6 +1,34 @@ -.\" $FreeBSD: src/lib/libc/stdlib/hcreate.3,v 1.5 2005/01/20 09:17:04 ru Exp $ +.\"- +.\" Copyright (c) 1999 The NetBSD Foundation, Inc. +.\" All rights reserved. +.\" +.\" This code is derived from software contributed to The NetBSD Foundation +.\" by Klaus Klein. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +.\" POSSIBILITY OF SUCH DAMAGE. +.\" +.\" $FreeBSD: src/lib/libc/stdlib/hcreate.3,v 1.7 2008/07/06 17:03:37 danger Exp $ .\" -.Dd May 8, 2001 +.Dd July 6, 2008 .Os .Dt HCREATE 3 .Sh NAME @@ -111,8 +139,10 @@ .Sh RETURN VALUES The .Fn hcreate -function returns 0 if it cannot allocate sufficient space for the table; -otherwise, it returns non-zero. +function returns 0 if the table creation failed and the global variable +.Va errno +is set to indicate the error; +otherwise, a non-zero value is returned. .Pp The .Fn hdestroy @@ -199,6 +229,8 @@ .Bl -tag -width Er .It Bq Er ENOMEM Insufficient storage space is available. +.It Bq Er EINVAL +A table already exists. .El .Sh SEE ALSO .Xr bsearch 3 , ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/hcreate.c#2 (text+ko) ==== @@ -52,7 +52,7 @@ __RCSID("$NetBSD: hcreate.c,v 1.2 2001/02/19 21:26:04 ross Exp $"); #endif /* LIBC_SCCS and not lint */ #endif -__FBSDID("$FreeBSD: src/lib/libc/stdlib/hcreate.c,v 1.3 2002/06/27 13:18:27 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/hcreate.c,v 1.4 2008/07/06 11:31:20 danger Exp $"); #include #include @@ -93,7 +93,7 @@ size_t idx; unsigned int p2; - /* Make sure this this isn't called when a table already exists. */ + /* Make sure this is not called when a table already exists. */ if (htable != NULL) { errno = EINVAL; return 0; @@ -103,11 +103,11 @@ if (nel < MIN_BUCKETS) nel = MIN_BUCKETS; - /* If it's too large, cap it. */ + /* If it is too large, cap it. */ if (nel > MAX_BUCKETS) nel = MAX_BUCKETS; - /* If it's is not a power of two in size, round up. */ + /* If it is not a power of two in size, round up. */ if ((nel & (nel - 1)) != 0) { for (p2 = 0; nel != 0; p2++) nel >>= 1; ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/expand_number.c#2 (text+ko) ==== @@ -26,11 +26,12 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libutil/expand_number.c,v 1.3 2007/11/18 02:20:02 jb Exp $"); +__FBSDID("$FreeBSD: src/lib/libutil/expand_number.c,v 1.4 2008/07/07 12:20:34 kib Exp $"); #include #include #include +#include #include #include ==== //depot/projects/soc2008/trasz_nfs4acl/release/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.932 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/release/Makefile,v 1.933 2008/07/07 16:23:04 marcel Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -128,7 +128,7 @@ .if defined(NOPORTS) && !defined(NODOC) DOMINIMALDOCPORTS= YES .include "Makefile.inc.docports" -RELEASEPORTSMODULE= ${MINIMALDOCPORTS} +RELEASEPORTSMODULE= ${MINIMALDOCPORTS} ports/sysutils/cdrtools .endif # Helper variable ==== //depot/projects/soc2008/trasz_nfs4acl/release/doc/en_US.ISO8859-1/hardware/article.sgml#2 (text+ko) ==== @@ -18,7 +18,7 @@ The &os; Documentation Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.330 2008/04/21 05:43:07 brueffer Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.332 2008/07/06 10:57:58 danger Exp $ 2000 @@ -724,13 +724,6 @@ - - Token Ring Interfaces - - &hwlist.oltr; - - - FDDI Interfaces [&arch.i386, &arch.pc98;] DEC DEFPA PCI (&man.fpa.4; driver) @@ -764,8 +757,6 @@ &hwlist.ath; - &hwlist.cnw; - [&arch.i386;, &arch.amd64;] Intel PRO/Wireless 2100 MiniPCI network adapter (&man.ipw.4; driver) @@ -809,13 +800,6 @@ &hwlist.ctau; - [&arch.i386;] Granch SBNI12 point-to-point communications - adapters (&man.sbni.4; driver) - - - [&arch.i386;] Granch SBNI16 SHDSL modems (&man.sbsh.4; - driver) - &hwlist.cm; ==== //depot/projects/soc2008/trasz_nfs4acl/sbin/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.172 2008/07/04 04:33:33 marcel Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.173 2008/07/06 20:57:35 marcel Exp $ .include @@ -113,7 +113,7 @@ _rtsol= rtsol .endif -.if ${MACHINE_ARCH} != "ia64" +.if ${MACHINE_ARCH} != "ia64" && ${MACHINE_ARCH} != "powerpc" _bsdlabel= bsdlabel .endif ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/bpf.4#2 (text+ko) ==== @@ -47,7 +47,7 @@ .\" This document is derived in part from the enet man page (enet.4) .\" distributed with 4.3BSD Unix. .\" -.\" $FreeBSD: src/share/man/man4/bpf.4,v 1.50 2008/04/07 02:51:00 rwatson Exp $ +.\" $FreeBSD: src/share/man/man4/bpf.4,v 1.51 2008/07/07 09:27:02 dwmalone Exp $ .\" .Dd February 26, 2007 .Dt BPF 4 @@ -403,6 +403,7 @@ which must respond to messages in real time. The default for a new file is off. .It Dv BIOCSETF +.It Dv BIOCSETFNR .Pq Li "struct bpf_program" Sets the read filter program used by the kernel to discard uninteresting packets. @@ -422,12 +423,20 @@ is given by the .Li bf_len field. -Also, the actions of -.Dv BIOCFLUSH -are performed. See section .Sx "FILTER MACHINE" for an explanation of the filter language. +The only difference between +.Dv BIOCSETF +and +.Dv BIOCSETFNR +is +.Dv BIOCSETF +performs the actions of +.Dv BIOCFLUSH +while +.Dv BIOCSETFNR +does not. .It Dv BIOCSETWF .Pq Li "struct bpf_program" Sets the write filter program used by the kernel to control what type of ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ddb.4#3 (text+ko) ==== @@ -58,9 +58,9 @@ .\" Created. .\" [90/08/30 dbg] .\" -.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.53 2008/06/08 21:08:20 wkoszek Exp $ +.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.54 2008/07/07 21:32:02 bz Exp $ .\" -.Dd June 8, 2008 +.Dd July 7, 2008 .Dt DDB 4 .Os .Sh NAME @@ -584,6 +584,13 @@ Show brief information about the TTY subsystem. .\" .Pp +.It Ic show Cm cpusets +Print numbered root and assigned CPU affinity sets. +See +.Xr cpuset 2 +for more details. +.\" +.Pp .It Ic show Cm cyrixreg Show registers specific to the Cyrix processor. .\" ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ed.4#2 (text+ko) ==== @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ed.4,v 1.57 2008/01/29 00:13:20 trhodes Exp $ +.\" $FreeBSD: src/share/man/man4/ed.4,v 1.58 2008/07/06 06:24:02 imp Exp $ .\" .Dd January 27, 2008 .Dt ED 4 @@ -171,7 +171,7 @@ .It Corega Ether98-T (flags 0x000000) (PC-98) .It -Corega Ether PCC-T/EtherII PCC-T/FEther PCC-TXF/PCC-TXD +Corega Ether PCC-T/EtherII PCC-T/FEther PCC-TXF/PCC-TXD PCC-T/Fether II TXD .It Corega LAPCCTXD (TC5299J) .It @@ -283,7 +283,7 @@ .It SMC WD8003E/WD8003EBT/WD8003S/WD8003SBT/WD8003W/WD8013EBT/WD8013W and clones .It -SMC EZCard PC Card, 8040-TX, 8041-TX, 8041-TX V.2 +SMC EZCard PC Card, 8040-TX, 8041-TX (AX88x90), 8041-TX V.2 (TC5299J) .It Socket LP-E, ES-1000 Ethernet/Serial, LP-E CF, LP-FE CF .It ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/malo.4#2 (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 DAMAGES. .\" -.\" $FreeBSD: src/share/man/man4/malo.4,v 1.4 2008/05/10 06:46:58 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/malo.4,v 1.6 2008/07/08 04:15:07 weongyo Exp $ .\"/ .Dd April 13, 2008 .Dt MALO 4 @@ -61,8 +61,7 @@ and Cardbus network adapters. .Nm supports -.Cm station , -.Cm adhoc , +.Cm station and .Cm monitor mode operation. @@ -95,29 +94,22 @@ Join an existing BSS network (i.e., connect to an access point): .Pp .Bd -literal -offset indent -ifconfig wlan create wlandev iwn0 inet 192.168.0.20 \e +ifconfig wlan create wlandev malo0 inet 192.168.0.20 \e netmask 0xffffff00 .Ed .Pp Join a specific BSS network with network name .Dq Li my_net : .Pp -.Dl "ifconfig wlan create wlandev iwn0 ssid my_net up" +.Dl "ifconfig wlan create wlandev malo0 ssid my_net up" .Pp Join a specific BSS network with 64-bit WEP encryption: .Bd -literal -offset indent -ifconfig wlan create wlandev iwn0 ssid my_net \e +ifconfig wlan create wlandev malo0 ssid my_net \e wepmode on wepkey 0x1234567890 weptxkey 1 up .Ed -.Pp -Join a specific BSS network with 128-bit WEP encryption: -.Bd -literal -offset indent -ifconfig wlan create wlandev iwn0 wlanmode adhoc ssid my_net \e - wepmode on wepkey 0x01020304050607080910111213 weptxkey 1 -.Ed .Sh SEE ALSO .Xr cardbus 4 , -.Xr malofw 4 , .Xr pci 4 , .Xr wlan 4 , .Xr wlan_ccmp 4 , ==== //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/minidump_machdep.c#3 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.5 2008/06/20 20:59:31 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.6 2008/07/08 04:00:22 alc Exp $"); #include #include @@ -206,7 +206,8 @@ /* Walk page table pages, set bits in vm_page_dump */ ptesize = 0; pdp = (uint64_t *)PHYS_TO_DMAP(KPDPphys); - for (va = VM_MIN_KERNEL_ADDRESS; va < kernel_vm_end; va += NBPDR) { + for (va = VM_MIN_KERNEL_ADDRESS; va < MAX(KERNBASE + NKPT * NBPDR, + kernel_vm_end); va += NBPDR) { i = (va >> PDPSHIFT) & ((1ul << NPDPEPGSHIFT) - 1); /* * We always write a page, even if it is zero. Each @@ -312,7 +313,8 @@ /* Dump kernel page table pages */ pdp = (uint64_t *)PHYS_TO_DMAP(KPDPphys); - for (va = VM_MIN_KERNEL_ADDRESS; va < kernel_vm_end; va += NBPDR) { + for (va = VM_MIN_KERNEL_ADDRESS; va < MAX(KERNBASE + NKPT * NBPDR, + kernel_vm_end); va += NBPDR) { i = (va >> PDPSHIFT) & ((1ul << NPDPEPGSHIFT) - 1); /* We always write a page, even if it is zero */ if ((pdp[i] & PG_V) == 0) { ==== //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/pmap.c#5 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.624 2008/07/02 05:41:23 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.626 2008/07/07 17:25:09 alc Exp $"); /* * Manages physical address maps. @@ -440,16 +440,16 @@ /* Read-only from zero to physfree */ /* XXX not fully used, underneath 2M pages */ for (i = 0; (i << PAGE_SHIFT) < *firstaddr; i++) { - ((pt_entry_t *)KPTphys)[(KERNBASE - VM_MIN_KERNEL_ADDRESS) / - PAGE_SIZE + i] = i << PAGE_SHIFT; - ((pt_entry_t *)KPTphys)[(KERNBASE - VM_MIN_KERNEL_ADDRESS) / - PAGE_SIZE + i] |= PG_RW | PG_V | PG_G; + ((pt_entry_t *)KPTphys)[i] = i << PAGE_SHIFT; + ((pt_entry_t *)KPTphys)[i] |= PG_RW | PG_V | PG_G; } /* Now map the page tables at their location within PTmap */ for (i = 0; i < NKPT; i++) { - ((pd_entry_t *)KPDphys)[i] = KPTphys + (i << PAGE_SHIFT); - ((pd_entry_t *)KPDphys)[i] |= PG_RW | PG_V; + ((pd_entry_t *)KPDphys)[(KERNBASE - VM_MIN_KERNEL_ADDRESS) / + NBPDR + i] = KPTphys + (i << PAGE_SHIFT); + ((pd_entry_t *)KPDphys)[(KERNBASE - VM_MIN_KERNEL_ADDRESS) / + NBPDR + i] |= PG_RW | PG_V; } /* Map from zero to end of allocations under 2M pages */ @@ -647,15 +647,17 @@ * Initialize the vm page array entries for the kernel pmap's * page table pages. */ - pd = pmap_pde(kernel_pmap, VM_MIN_KERNEL_ADDRESS); + pd = pmap_pde(kernel_pmap, KERNBASE); for (i = 0; i < NKPT; i++) { if ((pd[i] & (PG_PS | PG_V)) == (PG_PS | PG_V)) continue; + KASSERT((pd[i] & PG_V) != 0, + ("pmap_init: page table page is missing")); mpte = PHYS_TO_VM_PAGE(pd[i] & PG_FRAME); KASSERT(mpte >= vm_page_array && mpte < &vm_page_array[vm_page_array_size], ("pmap_init: page table page is out of range")); - mpte->pindex = pmap_pde_pindex(VM_MIN_KERNEL_ADDRESS) + i; + mpte->pindex = pmap_pde_pindex(KERNBASE) + i; mpte->phys_addr = pd[i] & PG_FRAME; } @@ -1722,10 +1724,12 @@ if (pde == NULL) { /* We need a new PDP entry */ nkpg = vm_page_alloc(NULL, kernel_vm_end >> PDPSHIFT, - VM_ALLOC_NOOBJ | VM_ALLOC_SYSTEM | VM_ALLOC_WIRED); + VM_ALLOC_INTERRUPT | VM_ALLOC_NOOBJ | + VM_ALLOC_WIRED | VM_ALLOC_ZERO); if (nkpg == NULL) panic("pmap_growkernel: no memory to grow kernel"); - pmap_zero_page(nkpg); + if ((nkpg->flags & PG_ZERO) == 0) + pmap_zero_page(nkpg); paddr = VM_PAGE_TO_PHYS(nkpg); newpdp = (pdp_entry_t) (paddr | PG_V | PG_RW | PG_A | PG_M); @@ -1742,10 +1746,12 @@ } nkpg = vm_page_alloc(NULL, pmap_pde_pindex(kernel_vm_end), - VM_ALLOC_NOOBJ | VM_ALLOC_SYSTEM | VM_ALLOC_WIRED); + VM_ALLOC_INTERRUPT | VM_ALLOC_NOOBJ | VM_ALLOC_WIRED | + VM_ALLOC_ZERO); if (nkpg == NULL) panic("pmap_growkernel: no memory to grow kernel"); - pmap_zero_page(nkpg); + if ((nkpg->flags & PG_ZERO) == 0) + pmap_zero_page(nkpg); paddr = VM_PAGE_TO_PHYS(nkpg); newpdir = (pd_entry_t) (paddr | PG_V | PG_RW | PG_A | PG_M); *pmap_pde(kernel_pmap, kernel_vm_end) = newpdir; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/GENERIC#4 (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.502 2008/06/20 19:28:33 delphij Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.503 2008/07/07 22:55:11 delphij Exp $ cpu HAMMER ident GENERIC @@ -64,6 +64,7 @@ options KBD_INSTALL_CDEV # install a CDEV entry in /dev options STOP_NMI # Stop CPUS using NMI instead of IPI options AUDIT # Security event auditing +options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) # Debugging for use in -current options KDB # Enable kernel debugger support. ==== //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/pmap.h#3 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.143 2008/06/30 02:35:55 alc Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.145 2008/07/06 22:36:28 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -111,11 +111,11 @@ /* Initial number of kernel page tables. */ #ifndef NKPT -#define NKPT 2288 +#define NKPT 32 #endif #define NKPML4E 1 /* number of kernel PML4 slots */ -#define NKPDPE howmany(NKPT, NPDEPG)/* number of kernel PDP slots */ +#define NKPDPE 6 /* number of kernel PDP slots */ #define NUPML4E (NPML4EPG/2) /* number of userland PML4 pages */ #define NUPDPE (NUPML4E*NPDPEPG)/* number of userland PDP pages */ @@ -131,7 +131,7 @@ #define KPML4I (NPML4EPG-1) /* Top 512GB for KVM */ #define DMPML4I (KPML4I-1) /* Next 512GB down for direct map */ -#define KPDPI (NPDPEPG-6) /* kernel map starts at -6GB */ +#define KPDPI (NPDPEPG-7) /* kernel map starts at -7GB */ /* * XXX doesn't really belong here I guess... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/vmparam.h#5 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.54 2008/07/03 04:53:14 alc Exp $ + * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.55 2008/07/05 20:44:55 alc Exp $ */ @@ -154,8 +154,8 @@ * 0xffff800000000000 - 0xffff804020100fff recursive page table (512GB slot) * 0xffff804020101000 - 0xfffffeffffffffff unused * 0xffffff0000000000 - 0xffffff7fffffffff 512GB direct map mappings - * 0xffffff8000000000 - 0xfffffffe7fffffff unused (506GB) - * 0xfffffffe80000000 - 0xffffffffffffffff 6GB kernel map + * 0xffffff8000000000 - 0xfffffffe3fffffff unused (505GB) + * 0xfffffffe40000000 - 0xffffffffffffffff 7GB kernel map * * Within the kernel map: * ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ed/if_ed_pccard.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.113 2007/07/11 04:14:40 imp Exp $ + * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.114 2008/07/06 06:19:19 imp Exp $ */ /* @@ -157,6 +157,8 @@ { PCMCIA_CARD(COREGA, FAST_ETHER_PCC_TX), NE2000DVF_DL100XX}, { PCMCIA_CARD(COREGA, FETHER_PCC_TXD), NE2000DVF_AX88X90}, { PCMCIA_CARD(COREGA, FETHER_PCC_TXF), NE2000DVF_DL100XX}, + { PCMCIA_CARD(COREGA, FETHER_II_PCC_TXD), NE2000DVF_AX88X90}, + { PCMCIA_CARD(COREGA, LAPCCTXD), 0}, { PCMCIA_CARD(DAYNA, COMMUNICARD_E_1), 0}, { PCMCIA_CARD(DAYNA, COMMUNICARD_E_2), 0}, { PCMCIA_CARD(DLINK, DE650), 0 }, ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/k8temp/k8temp.c#2 (text) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/k8temp/k8temp.c,v 1.4 2008/05/14 09:57:21 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/k8temp/k8temp.c,v 1.7 2008/07/06 16:18:58 rpaulo Exp $"); #include #include @@ -54,6 +54,7 @@ int sc_ntemps; struct sysctl_oid *sc_oid; struct sysctl_oid *sc_sysctl_cpu[2]; + struct intr_config_hook sc_ich; }; #define VENDORID_AMD 0x1022 @@ -91,6 +92,7 @@ static void k8temp_identify(driver_t *driver, device_t parent); static int k8temp_probe(device_t dev); static int k8temp_attach(device_t dev); +static void k8temp_intrhook(void *arg); static int k8temp_detach(device_t dev); static int k8temp_match(device_t dev); static int32_t k8temp_gettemp(device_t dev, k8sensor_t sensor); @@ -173,32 +175,20 @@ static int k8temp_attach(device_t dev) { - device_t nexus, acpi, cpu; struct k8temp_softc *sc = device_get_softc(dev); - int i; struct sysctl_ctx_list *sysctlctx; struct sysctl_oid *sysctlnode; + /* - * dev.cpu.N.temperature. + * Setup intrhook function to create dev.cpu sysctl entries. This is + * needed because the cpu driver may be loaded late on boot, after + * us. */ - nexus = device_find_child(root_bus, "nexus", 0); - acpi = device_find_child(nexus, "acpi", 0); - - for (i = 0; i < 2; i++) { - cpu = device_find_child(acpi, "cpu", - device_get_unit(dev) * 2 + i); - if (cpu) { - sysctlctx = device_get_sysctl_ctx(cpu); - - sc->sc_sysctl_cpu[i] = SYSCTL_ADD_PROC(sysctlctx, - SYSCTL_CHILDREN(device_get_sysctl_tree(cpu)), - OID_AUTO, "temperature", CTLTYPE_INT | CTLFLAG_RD, - dev, CORE0, k8temp_sysctl, "I", - "Max of sensor 0 / 1"); - } - } - + sc->sc_ich.ich_func = k8temp_intrhook; + sc->sc_ich.ich_arg = dev; + config_intrhook_establish(&sc->sc_ich); + /* * dev.k8temp.N tree. */ @@ -238,6 +228,39 @@ return (0); } +void +k8temp_intrhook(void *arg) +{ + int i; + device_t nexus, acpi, cpu; + device_t dev = (device_t) arg; + struct k8temp_softc *sc; + struct sysctl_ctx_list *sysctlctx; + + sc = device_get_softc(dev); + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jul 8 12:15:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D2791065671; Tue, 8 Jul 2008 12:15:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 510E8106566C for ; Tue, 8 Jul 2008 12:15:54 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3EA338FC1F for ; Tue, 8 Jul 2008 12:15:54 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m68CFsXG035430 for ; Tue, 8 Jul 2008 12:15:54 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m68CFsPR035428 for perforce@freebsd.org; Tue, 8 Jul 2008 12:15:54 GMT (envelope-from gabor@freebsd.org) Date: Tue, 8 Jul 2008 12:15:54 GMT Message-Id: <200807081215.m68CFsPR035428@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 144876 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, 08 Jul 2008 12:15:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=144876 Change 144876 by gabor@gabor_server on 2008/07/08 12:15:14 - Make -w respect wide characters Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/util.c#51 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#51 (text+ko) ==== @@ -45,6 +45,8 @@ #include #include #include +#include +#include #include "grep.h" @@ -218,7 +220,7 @@ return (c); } -#define isword(x) (isalnum((unsigned char)(x)) || (x) == '_') +#define iswword(x) (iswalnum((x)) || (x) == L'_') static int procline(struct str *l, int nottext) @@ -242,10 +244,37 @@ if (r == 0 && xflag) if (pmatch.rm_so != 0 || pmatch.rm_eo != l->len) r = REG_NOMATCH; - if (r == 0 && wflag) - if ((pmatch.rm_so != 0 && isword((unsigned char)l->dat[pmatch.rm_so - 1])) - || (pmatch.rm_eo != l->len && isword((unsigned char)l->dat[pmatch.rm_eo]))) + if (r == 0 && wflag) { + char *begin, *end; + wchar_t *wbegin, *wend; + size_t size; + + begin = grep_malloc(sizeof(char) * (pmatch.rm_so + 1)); + end = grep_malloc(sizeof(char) * (strlen(l->dat) - pmatch.rm_eo)); + strlcpy(begin, l->dat, pmatch.rm_so); + strlcpy(end, &(l->dat[pmatch.rm_eo]), (strlen(l->dat) - pmatch.rm_eo)); + + size = mbstowcs(NULL, begin, 0); + wbegin = grep_malloc(sizeof(wint_t) * size); + if (mbstowcs(wbegin, begin, size) == -1) { + r = REG_NOMATCH; + continue; + } + free(begin); + size = mbstowcs(NULL, end, 0); + wend = grep_malloc(sizeof(wint_t) * size); + if (mbstowcs(wend, end, size) == -1) { + r = REG_NOMATCH; + continue; + } + free(end); + + if ((pmatch.rm_so != 0 && iswword(wbegin[wcslen(wbegin -1)])) + || (pmatch.rm_eo != l->len && iswword(wend[0]))) r = REG_NOMATCH; + free(wbegin); + free(wend); + } if (r == t) { if (m == 0) c++; From owner-p4-projects@FreeBSD.ORG Tue Jul 8 12:19:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B6E44106567E; Tue, 8 Jul 2008 12:19:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 791BC106564A for ; Tue, 8 Jul 2008 12:19:58 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6508E8FC0A for ; Tue, 8 Jul 2008 12:19:58 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m68CJwkK035702 for ; Tue, 8 Jul 2008 12:19:58 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m68CJwCT035698 for perforce@freebsd.org; Tue, 8 Jul 2008 12:19:58 GMT (envelope-from trasz@freebsd.org) Date: Tue, 8 Jul 2008 12:19:58 GMT Message-Id: <200807081219.m68CJwCT035698@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 144877 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, 08 Jul 2008 12:19:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=144877 Change 144877 by trasz@trasz_traszkan on 2008/07/08 12:19:26 First part of granular permission checking. VOP_GRANULAR is supposed to be temporary. Also, some cleanup. Merging this by hand is getting ugly. ;-/ Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_flags_nfs4.c#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#6 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_posix1e.c#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_default.c#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_vnops.c#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vnode_if.src#4 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#11 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vnops.c#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_acl.c#6 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_extattr.c#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#6 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_flags_nfs4.c#2 (text+ko) ==== @@ -42,8 +42,8 @@ { ACL_ENTRY_DIRECTORY_INHERIT, "dir_inherit", 'd'}, { ACL_ENTRY_ONLY_INHERIT, "inherit_only", 'i'}, { ACL_ENTRY_LIMIT_INHERIT, "no_propagate", 'n'}, - { ACL_FLAG_SUCCESSFUL_ACCESS, "successfull_access", 'S'}, - { ACL_FLAG_FAILED_ACCESS, "failed_access", 'F'}, + { ACL_ENTRY_SUCCESSFUL_ACCESS, "successfull_access", 'S'}, + { ACL_ENTRY_FAILED_ACCESS, "failed_access", 'F'}, /* * There is no ACE_IDENTIFIER_GROUP here - SunOS does not show it * in the "flags" field. There is no ACE_OWNER, ACE_GROUP or ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#6 (text+ko) ==== @@ -52,6 +52,48 @@ #ifdef _KERNEL static int +_access_mask_from_mode(mode_t mode) +{ + int access_mask = 0; + + /* XXX: VSTAT? */ + + if (mode & VREAD) + access_mask |= ACL_READ_DATA; + + if (mode & VWRITE) + access_mask |= ACL_WRITE_DATA; + + if (mode & VAPPEND) { + /* + * Translate from open(2) semantics to NFSv4 one. + * In order to open file for writing, one needs + * to specify both O_WRONLY and O_APPEND. With NFSv4, + * permission to write is not required to append, + * permission to append is sufficient. + */ + access_mask |= ACL_APPEND_DATA; + access_mask &= ~ACL_WRITE_DATA; + } + + if (mode & VEXEC) + access_mask |= ACL_EXECUTE; + + if (mode & VADMIN) + access_mask |= (ACL_WRITE_NAMED_ATTRS | + ACL_WRITE_ATTRIBUTES | ACL_WRITE_ACL | + ACL_WRITE_OWNER); + + return (access_mask); +} + +/* + * Remove bits that are set in entry->ae_perm from *needed_bits. + * Return -1 if entry type is "deny" and bits match, 0 otherwise. + * + * XXX: Find a better name. + */ +static int _match_bits(const struct acl_entry *entry, int *needed_bits) { if (entry->ae_extended == ACL_EXTENDED_DENY) { @@ -64,32 +106,18 @@ return (0); } -int -vaccess_acl_nfs4(enum vtype type, uid_t file_uid, gid_t file_gid, - struct acl *aclp, mode_t acc_mode, struct ucred *cred, int *privused) +/* + * Return 1, if access is explicitly denied, -1, if its implicitly + * denied (not allowed), or 0, if allowed. + * + * XXX: There just cannot be a worse name than this one. + */ +static int +_match_acl(const struct acl *aclp, int needed_bits, struct ucred *cred, + int file_uid, int file_gid) { - int i, needed_bits = 0; - struct acl_entry *entry; - mode_t priv_granted = 0; - - if (privused != NULL) - *privused = 0; - - if (acc_mode & VREAD) - needed_bits |= ACL_READ_DATA; - - if (acc_mode & VWRITE) - needed_bits |= ACL_WRITE_DATA; - - if (acc_mode & VAPPEND) - needed_bits |= ACL_APPEND_DATA; - - if (acc_mode & VEXEC) - needed_bits |= ACL_EXECUTE; - - if (acc_mode & VADMIN) - needed_bits |= (ACL_WRITE_NAMED_ATTRS | ACL_WRITE_ATTRIBUTES | - ACL_WRITE_ACL | ACL_WRITE_OWNER); + int i; + const struct acl_entry *entry; for (i = 0; i < aclp->acl_cnt; i++) { entry = &(aclp->acl_entry[i]); @@ -104,7 +132,7 @@ continue; if (_match_bits(entry, &needed_bits)) - goto explicitly_denied; + return (1); if (needed_bits == 0) return (0); @@ -115,7 +143,7 @@ continue; if (_match_bits(entry, &needed_bits)) - goto explicitly_denied; + return (1); if (needed_bits == 0) return (0); @@ -126,7 +154,7 @@ continue; if (_match_bits(entry, &needed_bits)) - goto explicitly_denied; + return (1); if (needed_bits == 0) return (0); @@ -137,7 +165,7 @@ continue; if (_match_bits(entry, &needed_bits)) - goto explicitly_denied; + return (1); if (needed_bits == 0) return (0); @@ -148,19 +176,63 @@ "entry->ae_tag == ACL_EVERYONE"); if (_match_bits(entry, &needed_bits)) - goto explicitly_denied; + return (1); if (needed_bits == 0) return (0); } } -explicitly_denied: + return (-1); +} + +int +vaccess_acl_nfs4(enum vtype type, uid_t file_uid, gid_t file_gid, + struct acl *aclp, mode_t acc_mode, int needed_bits, struct ucred *cred, + int *privused) +{ + mode_t priv_granted = 0; + int denied, is_directory; + + if (privused != NULL) + *privused = 0; + + if (needed_bits == 0) + needed_bits = _access_mask_from_mode(acc_mode); + + if (type == VDIR) + is_directory = 1; + else + is_directory = 0; + + /* + * File owner is always allowed to read and write the ACL. + */ + if (file_uid == cred->cr_uid) + needed_bits &= ~(ACL_READ_ACL | ACL_WRITE_ACL); + + denied = _match_acl(aclp, needed_bits, cred, file_uid, file_gid); + if (!denied) + return (0); + + /* + * If we want to append data to the file, either one of ACL_APPEND_DATA + * or ACL_WRITE_DATA is sufficient. We just tested for the former + * and we were denied access. Let's try with the latter. + */ + if ((needed_bits & ACL_APPEND_DATA) && !is_directory) { + needed_bits |= ACL_WRITE_DATA; + needed_bits &= ~ACL_APPEND_DATA; + + denied = _match_acl(aclp, needed_bits, cred, file_uid, file_gid); + if (!denied) + return (0); + } /* * No match. Try to use privileges, if there are any. * Taken from kern/subr_acl_posix1e.c. */ - if (type == VDIR) { + if (is_directory) { if ((acc_mode & VEXEC) && !priv_check_cred(cred, PRIV_VFS_LOOKUP, 0)) priv_granted |= VEXEC; @@ -180,6 +252,9 @@ if ((acc_mode & VADMIN) && !priv_check_cred(cred, PRIV_VFS_ADMIN, 0)) priv_granted |= VADMIN; + if (priv_granted != 0) + priv_granted |= VSTAT; + if ((acc_mode & priv_granted) == acc_mode) { if (privused != NULL) *privused = 1; @@ -297,7 +372,8 @@ (ACL_ENTRY_FILE_INHERIT | ACL_ENTRY_DIRECTORY_INHERIT)) { /* * 1.3.1. A copy of the current ACE is made, and placed - * in the ACL immediately following the current ACE. + * in the ACL immediately following the current + * ACE. */ copy = _acl_duplicate_entry(aclp, i); /* XXX: Is EPERM a good choice here? */ @@ -305,13 +381,16 @@ return (EPERM); /* - * 1.3.2. In the first ACE, the flag ACL_ENTRY_ONLY_INHERIT is set. + * 1.3.2. In the first ACE, the flag + * ACL_ENTRY_ONLY_INHERIT is set. */ entry->ae_flags |= ACL_ENTRY_ONLY_INHERIT; /* - * 1.3.3. In the second ACE, the following flags are cleared: - * ACL_ENTRY_FILE_INHERIT, ACL_ENTRY_DIRECTORY_INHERIT, + * 1.3.3. In the second ACE, the following flags + * are cleared: + * ACL_ENTRY_FILE_INHERIT, + * ACL_ENTRY_DIRECTORY_INHERIT, * ACL_ENTRY_LIMIT_INHERIT. */ copy->ae_flags &= ~(ACL_ENTRY_FILE_INHERIT | @@ -325,11 +404,12 @@ } /* - * 1.4. If it's owner@, group@ or everyone@ entry, clear ACL_READ_DATA, - * ACL_WRITE_DATA, ACL_APPEND_DATA and ACL_EXECUTE. Continue - * to the next entry. + * 1.4. If it's owner@, group@ or everyone@ entry, clear + * ACL_READ_DATA, ACL_WRITE_DATA, ACL_APPEND_DATA + * and ACL_EXECUTE. Continue to the next entry. */ - if (entry->ae_tag == ACL_USER_OBJ || entry->ae_tag == ACL_GROUP_OBJ || + if (entry->ae_tag == ACL_USER_OBJ || + entry->ae_tag == ACL_GROUP_OBJ || entry->ae_tag == ACL_EVERYONE) { entry->ae_perm &= ~(ACL_READ_DATA | ACL_WRITE_DATA | ACL_APPEND_DATA | ACL_EXECUTE); @@ -337,11 +417,11 @@ } /* - * 1.5. Otherwise, if the "who" field did not match one of OWNER@, - * GROUP@, EVERYONE@: + * 1.5. Otherwise, if the "who" field did not match one + * of OWNER@, GROUP@, EVERYONE@: * - * 1.5.1. If the type is ALLOW, check the preceding ACE. If it does - * not meet all of the following criteria: + * 1.5.1. If the type is ALLOW, check the preceding ACE. + * If it does not meet all of the following criteria: */ if (entry->ae_extended != ACL_EXTENDED_ALLOW) continue; @@ -358,16 +438,17 @@ meets = 0; /* - * 1.5.1.2. The "who" field is the same as the current ACE, + * 1.5.1.2. The "who" field is the same as the current + * ACE, */ if (previous->ae_id != entry->ae_id || previous->ae_tag != entry->ae_tag) meets = 0; /* - * 1.5.1.3. The flag bit ACE4_IDENTIFIER_GROUP is the same - * as it is in the current ACE, and no other flag - * bits are set, + * 1.5.1.3. The flag bit ACE4_IDENTIFIER_GROUP + * is the same as it is in the current ACE, + * and no other flag bits are set, */ if ((previous->ae_tag == ACL_GROUP) != (entry->ae_tag == ACL_GROUP)) @@ -379,23 +460,23 @@ /* * 1.5.1.4. The mask bits are a subset of the mask bits * of the current ACE, and are also subset of - * the following: ACL_READ_DATA, ACL_WRITE_DATA, - * ACL_APPEND_DATA, ACL_EXECUTE + * the following: ACL_READ_DATA, + * ACL_WRITE_DATA, ACL_APPEND_DATA, ACL_EXECUTE */ if (previous->ae_perm & ~(entry->ae_perm)) meets = 0; - if (previous->ae_perm & ~(ACL_READ_DATA | ACL_WRITE_DATA | - ACL_APPEND_DATA | ACL_EXECUTE)) + if (previous->ae_perm & ~(ACL_READ_DATA | + ACL_WRITE_DATA | ACL_APPEND_DATA | ACL_EXECUTE)) meets = 0; } if (!meets) { /* - * Then the ACE of type DENY, with a who equal to the current - * ACE, flag bits equal to - * ( & & ) + * and no mask bits, is prepended. */ previous = entry; entry = _acl_duplicate_entry(aclp, i); @@ -460,6 +541,8 @@ /* * 1.5.3. If ACE4_IDENTIFIER_GROUP is set in the flags * of the ALLOW ace: + * + * XXX: This point is not there in the Falkner's draft. */ if (entry->ae_tag == ACL_GROUP && entry->ae_extended == ACL_EXTENDED_ALLOW) { @@ -514,20 +597,22 @@ ACL_EXTENDED_DENY)) must_append = 1; if (_entry_does_not_match(a2, ACL_USER_OBJ, ACL_WRITE_ACL | - ACL_WRITE_OWNER | ACL_WRITE_ATTRIBUTES | ACL_WRITE_NAMED_ATTRS, - ACL_EXTENDED_ALLOW)) + ACL_WRITE_OWNER | ACL_WRITE_ATTRIBUTES | + ACL_WRITE_NAMED_ATTRS, ACL_EXTENDED_ALLOW)) must_append = 1; - if (_entry_does_not_match(a3, ACL_GROUP_OBJ, 0, ACL_EXTENDED_DENY)) + if (_entry_does_not_match(a3, ACL_GROUP_OBJ, 0, + ACL_EXTENDED_DENY)) must_append = 1; - if (_entry_does_not_match(a4, ACL_GROUP_OBJ, 0, ACL_EXTENDED_ALLOW)) + if (_entry_does_not_match(a4, ACL_GROUP_OBJ, 0, + ACL_EXTENDED_ALLOW)) must_append = 1; if (_entry_does_not_match(a5, ACL_EVERYONE, ACL_WRITE_ACL | - ACL_WRITE_OWNER | ACL_WRITE_ATTRIBUTES | ACL_WRITE_NAMED_ATTRS, - ACL_EXTENDED_DENY)) + ACL_WRITE_OWNER | ACL_WRITE_ATTRIBUTES | + ACL_WRITE_NAMED_ATTRS, ACL_EXTENDED_DENY)) must_append = 1; if (_entry_does_not_match(a6, ACL_EVERYONE, ACL_READ_ACL | - ACL_READ_ATTRIBUTES | ACL_READ_NAMED_ATTRS | ACL_SYNCHRONIZE, - ACL_EXTENDED_ALLOW)) + ACL_READ_ATTRIBUTES | ACL_READ_NAMED_ATTRS | + ACL_SYNCHRONIZE, ACL_EXTENDED_ALLOW)) must_append = 1; } @@ -536,15 +621,17 @@ return (EPERM); a1 = _acl_append(aclp, ACL_USER_OBJ, 0, ACL_EXTENDED_DENY); - a2 = _acl_append(aclp, ACL_USER_OBJ, ACL_WRITE_ACL | ACL_WRITE_OWNER | - ACL_WRITE_ATTRIBUTES | ACL_WRITE_NAMED_ATTRS, ACL_EXTENDED_ALLOW); + a2 = _acl_append(aclp, ACL_USER_OBJ, ACL_WRITE_ACL | + ACL_WRITE_OWNER | ACL_WRITE_ATTRIBUTES | + ACL_WRITE_NAMED_ATTRS, ACL_EXTENDED_ALLOW); a3 = _acl_append(aclp, ACL_GROUP_OBJ, 0, ACL_EXTENDED_DENY); a4 = _acl_append(aclp, ACL_GROUP_OBJ, 0, ACL_EXTENDED_ALLOW); - a5 = _acl_append(aclp, ACL_EVERYONE, ACL_WRITE_ACL | ACL_WRITE_OWNER | - ACL_WRITE_ATTRIBUTES | ACL_WRITE_NAMED_ATTRS, ACL_EXTENDED_DENY); + a5 = _acl_append(aclp, ACL_EVERYONE, ACL_WRITE_ACL | + ACL_WRITE_OWNER | ACL_WRITE_ATTRIBUTES | + ACL_WRITE_NAMED_ATTRS, ACL_EXTENDED_DENY); a6 = _acl_append(aclp, ACL_EVERYONE, ACL_READ_ACL | - ACL_READ_ATTRIBUTES | ACL_READ_NAMED_ATTRS | ACL_SYNCHRONIZE, - ACL_EXTENDED_ALLOW); + ACL_READ_ATTRIBUTES | ACL_READ_NAMED_ATTRS | + ACL_SYNCHRONIZE, ACL_EXTENDED_ALLOW); KASSERT(a1 != NULL && a2 != NULL && a3 != NULL && a4 != NULL && a5 != NULL && a6 != NULL, "couldn't append to ACL."); @@ -768,7 +855,7 @@ } /* - * 2. For each entry in the new ACL, adjust it's flags, possibly + * 2. For each entry in the new ACL, adjust its flags, possibly * creating two entries in place of one. */ for (i = 0; i < child_aclp->acl_cnt; i++) { @@ -781,7 +868,8 @@ * ACL_ENTRY_FILE_INHERIT, ACL_ENTRY_DIRECTORY_INHERIT, * ACL_ENTRY_ONLY_INHERIT. */ - if (entry->ae_flags & ACL_ENTRY_LIMIT_INHERIT || !is_directory) { + if (entry->ae_flags & ACL_ENTRY_LIMIT_INHERIT || + !is_directory) { entry->ae_flags &= ~(ACL_ENTRY_LIMIT_INHERIT | ACL_ENTRY_FILE_INHERIT | ACL_ENTRY_DIRECTORY_INHERIT | ACL_ENTRY_ONLY_INHERIT); @@ -802,7 +890,8 @@ * XXX: Read it again and make sure what does the "otherwise" * apply to. */ - if (is_directory && (entry->ae_flags & ACL_ENTRY_FILE_INHERIT) && + if (is_directory && + (entry->ae_flags & ACL_ENTRY_FILE_INHERIT) && ((entry->ae_flags & ACL_ENTRY_DIRECTORY_INHERIT) == 0)) { entry->ae_flags |= ACL_ENTRY_ONLY_INHERIT; continue; @@ -927,6 +1016,11 @@ if ((entry->ae_flags | ACL_FLAGS_BITS) != ACL_FLAGS_BITS) return (EINVAL); + /* Disallow unimplemented flags. */ + if (entry->ae_flags & (ACL_ENTRY_SUCCESSFUL_ACCESS | + ACL_ENTRY_FAILED_ACCESS | ACL_ENTRY_INHERITED)) + return (EINVAL); + /* Disallow flags not allowed for ordinary files. */ if (!is_directory) { if (entry->ae_flags & (ACL_ENTRY_FILE_INHERIT | ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_posix1e.c#3 (text+ko) ==== @@ -71,6 +71,9 @@ if (privused != NULL) *privused = 0; + if (acc_mode == VSTAT) + return (0); + /* * Determine privileges now, but don't apply until we've found a DAC * entry that matches but has failed to allow access. ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_default.c#2 (text+ko) ==== @@ -83,6 +83,7 @@ .vop_fsync = VOP_NULL, .vop_getpages = vop_stdgetpages, .vop_getwritemount = vop_stdgetwritemount, + .vop_granular = vop_stdgranular, .vop_inactive = VOP_NULL, .vop_ioctl = VOP_ENOTTY, .vop_kqfilter = vop_stdkqfilter, @@ -509,6 +510,19 @@ return (error); } + +int +vop_stdgranular(ap) + struct vop_granular_args /* { + struct vnode *a_vp; + int a_mode; + int a_access_mask; + struct ucred *a_cred; + struct thread *a_td; + } */ *ap; +{ + return (VOP_ACCESS(ap->a_vp, ap->a_mode, ap->a_cred, ap->a_td)); +} /* XXX Needs good comment and more info in the manpage (VOP_GETPAGES(9)). */ int ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#3 (text+ko) ==== @@ -3458,6 +3458,9 @@ dac_granted = 0; + if (acc_mode == VSTAT) + return (0); + /* Check the owner. */ if (cred->cr_uid == file_uid) { dac_granted |= VADMIN; @@ -3568,6 +3571,15 @@ /* Potentially should be: return (EPERM); */ return (priv_check_cred(cred, PRIV_VFS_EXTATTR_SYSTEM, 0)); case EXTATTR_NAMESPACE_USER: +#ifdef SunOS_doesnt_do_that + if (access == VREAD) + return (VOP_GRANULAR(vp, access, ACL_READ_NAMED_ATTRS, + cred, td)); + if (access == VWRITE) + return (VOP_GRANULAR(vp, access, ACL_WRITE_NAMED_ATTRS, + cred, td)); +#endif + /* XXX: Is this possible for "access" to not be any of the two above? */ return (VOP_ACCESS(vp, access, cred, td)); default: return (EPERM); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_vnops.c#2 (text+ko) ==== @@ -701,6 +701,9 @@ if (error) return (error); #endif + error = VOP_GRANULAR(vp, VSTAT, ACL_READ_ATTRIBUTES, active_cred, td); + if (error) + return (error); vap = &vattr; error = VOP_GETATTR(vp, vap, active_cred, td); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vnode_if.src#4 (text+ko) ==== @@ -153,6 +153,17 @@ }; +%% granular vp L L L + +vop_granular { + IN struct vnode *vp; + IN int mode; + IN int access_mask; + IN struct ucred *cred; + IN struct thread *td; +}; + + %% getattr vp L L L vop_getattr { ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#11 (text+ko) ==== @@ -175,10 +175,8 @@ #define ACL_WRITE_EXTATTRIBUTES ACL_WRITE_NAMED_ATTRS /* Darwin compatibility. */ #ifdef XXX_conflicting_defines #define ACL_EXECUTE 0x00200000 +#endif #define ACL_SEARCH ACL_EXECUTE /* Darwin compatibility. */ -#else -#define ACL_SEARCH 0x00200000 -#endif #define ACL_DELETE_CHILD 0x00400000 #define ACL_READ_ATTRIBUTES 0x00800000 #define ACL_WRITE_ATTRIBUTES 0x01000000 @@ -205,18 +203,23 @@ /* * Possible values in ae_flags field; valid only for NFSv4 ACLs. */ -/* #define ACL_FLAG_DEFER_INHERIT - this doesn't seem to be used in Darwin. */ -/* #define ACL_ENTRY_INHERITED - this seems to be used in Darwin, but how does it translate into rfc3530? */ -#define ACL_ENTRY_FILE_INHERIT 0x00000001 /* ACE4_FILE_INHERIT_ACE */ -#define ACL_ENTRY_DIRECTORY_INHERIT 0x00000002 /* ACE4_DIRECTORY_INHERIT_ACE */ -#define ACL_ENTRY_LIMIT_INHERIT 0x00000004 /* ACE4_NO_PROPAGATE_INHERIT_ACE */ -#define ACL_ENTRY_ONLY_INHERIT 0x00000008 /* ACE4_INHERIT_ONLY_ACE */ -#define ACL_FLAG_SUCCESSFUL_ACCESS 0x00000010 /* Valid only for ACL_EXTENDED_ALARM and ACL_EXTENDED_AUDIT. */ -#define ACL_FLAG_FAILED_ACCESS 0x00000020 /* s/a */ +/* + * ACL_FLAG_DEFER_INHERIT does not seem to be used anywhere in Darwin, + * and there is no such flag in NFSv4 spec. + * + * #define ACL_FLAG_DEFER_INHERIT + */ +#define ACL_ENTRY_FILE_INHERIT 0x00000001 +#define ACL_ENTRY_DIRECTORY_INHERIT 0x00000002 +#define ACL_ENTRY_LIMIT_INHERIT 0x00000004 /* NO_PROPAGATE_INHERIT */ +#define ACL_ENTRY_ONLY_INHERIT 0x00000008 /* INHERIT_ONLY */ +#define ACL_ENTRY_SUCCESSFUL_ACCESS 0x00000010 +#define ACL_ENTRY_FAILED_ACCESS 0x00000020 +#define ACL_ENTRY_INHERITED 0x00000080 /* Currently unused. */ #define ACL_FLAGS_BITS (ACL_ENTRY_FILE_INHERIT | ACL_ENTRY_DIRECTORY_INHERIT | \ - ACL_ENTRY_LIMIT_INHERIT | ACL_ENTRY_ONLY_INHERIT | ACL_FLAG_SUCCESSFUL_ACCESS | \ - ACL_FLAG_FAILED_ACCESS) + ACL_ENTRY_LIMIT_INHERIT | ACL_ENTRY_ONLY_INHERIT | ACL_ENTRY_SUCCESSFUL_ACCESS | \ + ACL_ENTRY_FAILED_ACCESS) /* * Undefined value in ae_id field ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#3 (text+ko) ==== @@ -591,7 +591,7 @@ struct ucred *cred, int *privused); int vaccess_acl_nfs4(enum vtype type, uid_t file_uid, gid_t file_gid, struct acl *acl, mode_t acc_mode, - struct ucred *cred, int *privused); + int access_mask, struct ucred *cred, int *privused); void vattr_null(struct vattr *vap); int vcount(struct vnode *vp); void vdrop(struct vnode *); @@ -648,6 +648,7 @@ int vop_stdbmap(struct vop_bmap_args *); int vop_stdfsync(struct vop_fsync_args *); int vop_stdgetwritemount(struct vop_getwritemount_args *); +int vop_stdgranular(struct vop_granular_args *); int vop_stdgetpages(struct vop_getpages_args *); int vop_stdinactive(struct vop_inactive_args *); int vop_stdislocked(struct vop_islocked_args *); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vnops.c#2 (text+ko) ==== @@ -1409,7 +1409,7 @@ return (EROFS); error = extattr_check_cred(ap->a_vp, ap->a_attrnamespace, - ap->a_cred, ap->a_td, IWRITE); + ap->a_cred, ap->a_td, VWRITE); if (error) { if (ip->i_ea_area != NULL && ip->i_ea_error == 0) ip->i_ea_error = error; @@ -1493,7 +1493,7 @@ return (EOPNOTSUPP); error = extattr_check_cred(ap->a_vp, ap->a_attrnamespace, - ap->a_cred, ap->a_td, IREAD); + ap->a_cred, ap->a_td, VREAD); if (error) return (error); @@ -1553,7 +1553,7 @@ return (EOPNOTSUPP); error = extattr_check_cred(ap->a_vp, ap->a_attrnamespace, - ap->a_cred, ap->a_td, IREAD); + ap->a_cred, ap->a_td, VREAD); if (error) return (error); @@ -1633,7 +1633,7 @@ return (EROFS); error = extattr_check_cred(ap->a_vp, ap->a_attrnamespace, - ap->a_cred, ap->a_td, IWRITE); + ap->a_cred, ap->a_td, VWRITE); if (error) { if (ip->i_ea_area != NULL && ip->i_ea_error == 0) ip->i_ea_error = error; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_acl.c#6 (text+ko) ==== @@ -380,7 +380,7 @@ /* * Must hold VADMIN (be file owner) or have appropriate privilege. */ - if ((error = VOP_ACCESS(ap->a_vp, VADMIN, ap->a_cred, ap->a_td))) + if ((error = VOP_GRANULAR(ap->a_vp, VADMIN, ACL_WRITE_ACL, ap->a_cred, ap->a_td))) return (error); if (acl_nfs4_is_trivial(ap->a_aclp)) { ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_extattr.c#2 (text+ko) ==== @@ -847,7 +847,7 @@ if (strlen(name) == 0) return (EINVAL); - error = extattr_check_cred(vp, attrnamespace, cred, td, IREAD); + error = extattr_check_cred(vp, attrnamespace, cred, td, VREAD); if (error) return (error); @@ -1054,7 +1054,7 @@ if (!ufs_extattr_valid_attrname(attrnamespace, name)) return (EINVAL); - error = extattr_check_cred(vp, attrnamespace, cred, td, IWRITE); + error = extattr_check_cred(vp, attrnamespace, cred, td, VWRITE); if (error) return (error); @@ -1162,7 +1162,7 @@ if (!ufs_extattr_valid_attrname(attrnamespace, name)) return (EINVAL); - error = extattr_check_cred(vp, attrnamespace, cred, td, IWRITE); + error = extattr_check_cred(vp, attrnamespace, cred, td, VWRITE); if (error) return (error); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#6 (text+ko) ==== @@ -96,6 +96,7 @@ static vop_close_t ufs_close; static vop_create_t ufs_create; static vop_getattr_t ufs_getattr; +static vop_granular_t ufs_granular; static vop_link_t ufs_link; static int ufs_makeinode(int mode, struct vnode *, struct vnode **, struct componentname *); static vop_mkdir_t ufs_mkdir; @@ -298,10 +299,11 @@ } static int -ufs_access(ap) - struct vop_access_args /* { +ufs_granular(ap) + struct vop_granular_args /* { struct vnode *a_vp; int a_mode; + int a_access_mask; struct ucred *a_cred; struct thread *a_td; } */ *ap; @@ -355,7 +357,8 @@ case 0: if (type == ACL_TYPE_NFS4) { error = vaccess_acl_nfs4(vp->v_type, ip->i_uid, - ip->i_gid, acl, ap->a_mode, ap->a_cred, NULL); + ip->i_gid, acl, ap->a_mode, + ap->a_access_mask, ap->a_cred, NULL); } else { error = vaccess_acl_posix1e(vp->v_type, ip->i_uid, ip->i_gid, acl, ap->a_mode, ap->a_cred, NULL); @@ -381,6 +384,18 @@ return (error); } +static int +ufs_access(ap) + struct vop_access_args /* { + struct vnode *a_vp; + int a_mode; + struct ucred *a_cred; + struct thread *a_td; + } */ *ap; +{ + return (VOP_GRANULAR(ap->a_vp, ap->a_mode, 0, ap->a_cred, ap->a_td)); +} + /* ARGSUSED */ static int ufs_getattr(ap) @@ -598,11 +613,24 @@ * check succeeds. */ if (vap->va_vaflags & VA_UTIMES_NULL) { - error = VOP_ACCESS(vp, VADMIN, cred, td); + /* + * NFSv4.1, draft 21, 6.2.1.3.1, Discussion of Mask Attributes + * + * "A user having ACL_WRITE_DATA or ACL_WRITE_ATTRIBUTES + * will be allowed to set the times [..] to the current + * server time." + * + * XXX: Calling it four times seems a little excessive. + */ + error = VOP_GRANULAR(vp, VADMIN, ACL_WRITE_DATA, cred, td); + if (error) + error = VOP_GRANULAR(vp, VADMIN, ACL_WRITE_ATTRIBUTES, cred, td); + if (error) + error = VOP_GRANULAR(vp, VWRITE, ACL_WRITE_DATA, cred, td); if (error) - error = VOP_ACCESS(vp, VWRITE, cred, td); + error = VOP_GRANULAR(vp, VWRITE, ACL_WRITE_ATTRIBUTES, cred, td); } else - error = VOP_ACCESS(vp, VADMIN, cred, td); + error = VOP_GRANULAR(vp, VADMIN, ACL_WRITE_ATTRIBUTES, cred, td); if (error) return (error); if (vap->va_atime.tv_sec != VNOVAL) @@ -691,7 +719,7 @@ * To modify the permissions on a file, must possess VADMIN * for that file. */ - if ((error = VOP_ACCESS(vp, VADMIN, cred, td))) + if ((error = VOP_GRANULAR(vp, VADMIN, ACL_WRITE_ACL, cred, td))) return (error); /* * Privileged processes may set the sticky bit on non-directories, @@ -748,7 +776,7 @@ * To modify the ownership of a file, must possess VADMIN for that * file. */ - if ((error = VOP_ACCESS(vp, VADMIN, cred, td))) + if ((error = VOP_GRANULAR(vp, VADMIN, ACL_WRITE_OWNER, cred, td))) return (error); /* * To change the owner of a file, or change the group of a file to a @@ -2538,6 +2566,7 @@ .vop_close = ufs_close, .vop_create = ufs_create, .vop_getattr = ufs_getattr, + .vop_granular = ufs_granular, .vop_inactive = ufs_inactive, .vop_link = ufs_link, .vop_lookup = vfs_cache_lookup, @@ -2578,6 +2607,7 @@ .vop_access = ufs_access, .vop_close = ufsfifo_close, .vop_getattr = ufs_getattr, + .vop_granular = ufs_granular, .vop_inactive = ufs_inactive, .vop_kqfilter = ufsfifo_kqfilter, .vop_print = ufs_print, From owner-p4-projects@FreeBSD.ORG Tue Jul 8 12:48:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 823111065675; Tue, 8 Jul 2008 12:48:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 46030106566B for ; Tue, 8 Jul 2008 12:48:27 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 334AC8FC12 for ; Tue, 8 Jul 2008 12:48:27 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m68CmRca047599 for ; Tue, 8 Jul 2008 12:48:27 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m68CmRee047597 for perforce@freebsd.org; Tue, 8 Jul 2008 12:48:27 GMT (envelope-from gabor@freebsd.org) Date: Tue, 8 Jul 2008 12:48:27 GMT Message-Id: <200807081248.m68CmRee047597@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 144879 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, 08 Jul 2008 12:48:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=144879 Change 144879 by gabor@gabor_server on 2008/07/08 12:47:41 - Add some code for an upcoming optional Perl regexp support - Rename -P (skip links) to -p because the Perl regexp support should be -P - Better code for the regexp type - Fix comment - Remove some unnecessary header inclusions Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/Makefile#11 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.1#12 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#60 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#35 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/Makefile#11 (text+ko) ==== @@ -20,6 +20,12 @@ LDADD= -lz -lbz2 DPADD= ${LIBZ} ${LIBBZ2} +.if defined(WITH_PCRE) +CFLAGS+= WITH_PCRE=yes +LDADD+= -lpcre +DPADD= /usr/local/lib/libpcre.a +.endif + .if !defined(WITHOUT_NLS) NLS= hu_HU.ISO8859-2 NLS+= pt_BR.ISO8859-1 ==== //depot/projects/soc2008/gabor_textproc/grep/grep.1#12 (text+ko) ==== @@ -29,7 +29,7 @@ .\" .\" @(#)grep.1 8.3 (Berkeley) 4/18/94 .\" -.Dd 16 Jun, 2008 +.Dd 8 Jul, 2008 .Dt GREP 1 .Os .Sh NAME @@ -39,7 +39,7 @@ .Sh SYNOPSIS .Nm grep .Bk -words -.Op Fl abcdDEFGHhIiJLlmnOoPqRSsUVvwxZ +.Op Fl abcdDEFGHhIiJLlmnOopqRSsUVvwxZ .Op Fl A Ar num .Op Fl B Ar num .Op Fl C Ns Op Ar num @@ -281,7 +281,7 @@ The default is not to follow symbolic links. .It Fl o, Fl Fl only-matching Prints only the matching part of the lines. -.It Fl P +.It Fl p If .Fl R is specified, no symbolic links are followed. ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#60 (text+ko) ==== @@ -85,7 +85,7 @@ char **pattern; regex_t *r_pattern; -/* Filename exclusion patterns */ +/* Filename exclusion/inclusion patterns */ int epatterns, epattern_sz; char **epattern; regex_t *er_pattern; @@ -96,9 +96,6 @@ /* Command-line flags */ unsigned long long Aflag; /* -A x: print x lines trailing each match */ unsigned long long Bflag; /* -B x: print x lines leading each match */ -int Eflag; /* -E: interpret pattern as extended regexp */ -int Fflag; /* -F: interpret pattern as list of fixed strings */ -int Gflag; /* -G: interpret pattern as basic regexp */ int Hflag; /* -H: always print file name */ int Jflag; /* -J: grep in bzipped file */ int Lflag; /* -L: only show names of files with no matches */ @@ -124,6 +121,7 @@ char *color; /* --color */ unsigned long long mcount; /* count for -m */ +int grepbehave = GREP_BASIC; int binbehave = BINFILE_BIN; int devbehave = DEV_GREP; int dirbehave = DIR_GREP; @@ -160,7 +158,7 @@ exit(2); } -static char *optstr = "0123456789A:B:C:D:EFGHIJLOPSRUVZabcd:e:f:hilm:noqrsuvwxy"; +static char *optstr = "0123456789A:B:C:D:EFGHIJLOPSRUVZabcd:e:f:hilm:nopqrsuvwxy"; struct option long_options[] = { @@ -196,6 +194,7 @@ {"max-count", required_argument, NULL, 'm'}, {"line-number", no_argument, NULL, 'n'}, {"only-matching", no_argument, NULL, 'o'}, + {"perl-regexp", no_argument, NULL, 'P'}, {"quiet", no_argument, NULL, 'q'}, {"silent", no_argument, NULL, 'q'}, {"recursive", no_argument, NULL, 'r'}, @@ -226,20 +225,20 @@ if (len > 0 && pat[len - 1] == '\n') --len; /* pat may not be NUL-terminated */ - if (wflag && !Fflag) { + if (wflag && !(grepbehave == GREP_FIXED)) { int bol = 0, eol = 0, extra; if (pat[0] == '^') bol = 1; if (len > 0 && pat[len - 1] == '$') eol = 1; - extra = Eflag ? 2 : 4; + extra = (grepbehave == GREP_EXTENDED) ? 2 : 4; pattern[patterns] = grep_malloc(len + 15 + extra); snprintf(pattern[patterns], len + 15 + extra, "%s[[:<:]]%s%.*s%s[[:>:]]%s", bol ? "^" : "", - Eflag ? "(" : "\\(", + (grepbehave == GREP_EXTENDED) ? "(" : "\\(", (int)len - bol - eol, pat + bol, - Eflag ? ")" : "\\)", + (grepbehave == GREP_EXTENDED) ? ")" : "\\)", eol ? "$" : ""); len += 14 + extra; } else { @@ -297,25 +296,25 @@ switch (__progname[0]) { case 'e': - Eflag++; + grepbehave = GREP_EXTENDED; break; case 'f': - Fflag++; + grepbehave = GREP_FIXED; break; case 'g': - Gflag++; + grepbehave = GREP_BASIC; break; case 'z': Zflag++; switch(__progname[1]) { case 'e': - Eflag++; + grepbehave = GREP_EXTENDED; break; case 'f': - Fflag++; + grepbehave = GREP_FIXED; break; case 'g': - Gflag++; + grepbehave = GREP_BASIC; break; } break; @@ -377,24 +376,21 @@ errx(2, getstr(13)); break; case 'E': - Fflag = Gflag = 0; - Eflag++; + grepbehave = GREP_EXTENDED; break; case 'e': add_pattern(optarg, strlen(optarg)); needpattern = 0; break; case 'F': - Eflag = Gflag = 0; - Fflag++; + grepbehave = GREP_FIXED; break; case 'f': read_patterns(optarg); needpattern = 0; break; case 'G': - Eflag = Fflag = 0; - Gflag++; + grepbehave = GREP_BASIC; break; case 'H': Hflag++; @@ -439,6 +435,9 @@ oflag++; break; case 'P': + grepbehave = GREP_PERL; + break; + case 'p': linkbehave = LINK_SKIP; break; case 'q': @@ -543,12 +542,23 @@ ++argv; } - if (Fflag) - cflags |= REG_NOSPEC; - else if (Gflag) - cflags |= REG_BASIC; - else if (Eflag) - cflags |= REG_EXTENDED; + switch (grepbehave) { + case GREP_FIXED: + cflags |= REG_NOSPEC; + break; + case GREP_BASIC: + cflags |= REG_BASIC; + break; + case GREP_EXTENDED: + cflags |= REG_EXTENDED; + break; + case GREP_PERL: + errx(2, "Not yet implemented"); + break; + default: + /* NOTREACHED */ + usage(); + } r_pattern = grep_calloc(patterns, sizeof(*r_pattern)); for (i = 0; i < patterns; ++i) { c = regcomp(&r_pattern[i], pattern[i], cflags); ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#35 (text+ko) ==== @@ -26,12 +26,13 @@ * SUCH DAMAGE. */ -#include -#include - #include #include +#if defined(WITH_PCRE) +#include +#endif + #ifdef WITHOUT_NLS #define getstr(n) errstr[n] #else @@ -45,6 +46,11 @@ #define VERSION "2.5.1-FreeBSD" +#define GREP_FIXED 0 +#define GREP_BASIC 1 +#define GREP_EXTENDED 2 +#define GREP_PERL 3 + #define BINFILE_BIN 0 #define BINFILE_SKIP 1 #define BINFILE_TEXT 2 From owner-p4-projects@FreeBSD.ORG Tue Jul 8 12:55:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C4A9B106567E; Tue, 8 Jul 2008 12:55:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 87D4D106567B for ; Tue, 8 Jul 2008 12:55:34 +0000 (UTC) (envelope-from remko@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 73A768FC1A for ; Tue, 8 Jul 2008 12:55:34 +0000 (UTC) (envelope-from remko@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m68CtYNc048190 for ; Tue, 8 Jul 2008 12:55:34 GMT (envelope-from remko@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m68CtYKQ048188 for perforce@freebsd.org; Tue, 8 Jul 2008 12:55:34 GMT (envelope-from remko@freebsd.org) Date: Tue, 8 Jul 2008 12:55:34 GMT Message-Id: <200807081255.m68CtYKQ048188@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to remko@freebsd.org using -f From: Remko Lodder To: Perforce Change Reviews Cc: Subject: PERFORCE change 144880 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, 08 Jul 2008 12:55:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=144880 Change 144880 by remko@remko_nakur on 2008/07/08 12:54:50 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/security/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#3 integrate .. //depot/projects/docproj_nl/share/pgpkeys/nwhitehorn.key#1 branch .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#3 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#3 integrate .. //depot/projects/docproj_nl/www/en/developers.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/gnome/docs/develfaq.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/gnome/docs/halfaq.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/gnome/index.xsl#2 integrate .. //depot/projects/docproj_nl/www/share/sgml/events.xml#2 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#2 integrate .. //depot/projects/docproj_nl/www/share/sgml/press.xml#2 integrate .. //depot/projects/docproj_nl/www/share/sgml/templates.events.xsl#2 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#3 (text+ko) ==== @@ -1,4 +1,4 @@ - +

    Daemon Forums: - Aktív online fórumok és közösségi - hírek a FreeBSD és a többi BSD - számára

    + Aktív internetes fórumok és + közösségi hírek a &os; és a + többi BSD számára

  • BSD Freak: Egy oldal, amely a BSD-vel kapcsolatos cikkeket és útmutatókat a felhasználó - szemszögébõl nézve kínálja

    + szemszögébõl nézve + kínálja

    • @@ -84,34 +88,35 @@ - Havonta megjelenõ cikkek és mindennapos - megbeszélések minden BSD-t érintõ - dologról

    + Havonta megjelenõ cikkek és minden BSD-t + érintõ dolog rendszeres napi + megbeszélése

  • -

    FreeBSD Diary: - Egy ember FreeBSD-vel kapcsolatos - megpróbáltatásairól és +

    &os; Diary: + Egy ember &os;-vel kapcsolatos + megpróbáltatásairól és sikereirõl szóló beszámoló

  • Kerneltrap: - Naponta megjelenõ cikkek és aktuális kernel - hírek a BSD és Linux kernelekrõl

    + Naponta megjelenõ cikkek és aktuális + hírek a BSD és Linux rendszermagjairól

  • OSNews: - Naponta megjelenõ cikkek a Linux, BSD és egyéb - operációs rendszerekrõl

    + Naponta megjelenõ cikkek a Linux, BSD és + egyéb operációs rendszerekrõl

  • -

    A Slashdot BSD - rovata: Linkek és megbeszélések a - BSD hírekrõl, nem csak a FreeBSD-rõl

    +

    A Slashdot BSD rovata: + Linkek és a BSD hírek fórumai, nem csak a + &os;-rõl

    • ==== //depot/projects/docproj_hu/www/hu/news/pressreleases.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ - + ]> @@ -16,75 +16,62 @@
    -
    2005. November 25.
    +
    2005. november 25.
    - A Hewlett-Packard blade - fürtöt adományozott a FreeBSD-nek + A Hewlett-Packard egy Blade klasztert adományozott a &os;-nek

    -
    2005. November 4.
    +
    2005. november 4.
    - A FreeBSD Projekt - útjára indította a FreeBSD 6.0-t + A &os; Projekt útjára indította a &os; 6.0-t

    -
    2003. Január 6.
    +
    2003. január 6.
    - A FreeBSD Projekt bejelentette - a FreeBSD 5.0-t + A &os; Projekt bejelentette a &os; 5.0-t

    -
    2002. Október 31.
    +
    2002. október 31.
    - Az Opera démona: Az Opera - kiadta a szoftverét FreeBSD-re + Az Opera démona: Az Opera kiadta a szoftverét &os;-re

    -
    2000. Október 18.: Új Core
    +
    2000. október 18.: Új vezetés
    - Az elsõ FreeBSD Core - Team választás + Az elsõ &os; Core Team választás

    -
    2000. Március 9.
    +
    2000. március 9.
    - A BSD - árusítói egyesülnek, hogy a világ - legnépszerûbb internetes operációs - rendszerét nyújtsák + A BSD kereskedõk egyesülnek, hogy a világ legnépszerûbb internetes operációs rendszerét nyújtsák

    -
    1999. Június 7.
    +
    1999. június 7.
    - A BSD közösség - üdvözli az Apple új nyílt forrású - operációs rendszerét + A BSD közösség üdvözli az Apple új nyílt forrású operációs rendszerét

    -
    1999. Április 29.
    +
    1999. április 29.
    - Teljes XML - fejlesztõkörnyezet a FreeBSD-be integrálva + Teljes XML fejlesztõkörnyezetet integráltak a &os;-be

    -
    1999. Április 22.: A Mátrix
    +
    1999. április 22.: A Mátrix
    - A FreeBSD-t használta - a Warner Bros A Márix címû - filmjének látványos effektjeihez + A &os;-t használta a Warner Bros. A Mátrix címû filmjének látványos effektjeihez

    From owner-p4-projects@FreeBSD.ORG Wed Jul 9 07:51:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0EFA01065677; Wed, 9 Jul 2008 07:51:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C74631065673 for ; Wed, 9 Jul 2008 07:51:10 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B774D8FC29 for ; Wed, 9 Jul 2008 07:51:10 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m697pAid012489 for ; Wed, 9 Jul 2008 07:51:10 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m697pAmZ012487 for perforce@freebsd.org; Wed, 9 Jul 2008 07:51:10 GMT (envelope-from trasz@freebsd.org) Date: Wed, 9 Jul 2008 07:51:10 GMT Message-Id: <200807090751.m697pAmZ012487@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 144929 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, 09 Jul 2008 07:51:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=144929 Change 144929 by trasz@trasz_traszkan on 2008/07/09 07:50:25 Make ACL_WRITE_DATA and ACL_APPEND_DATA work wrt creating files and directories. For writing and appending to ordinary files, these flags worked already before this commit. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/TODO#10 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_lookup.c#3 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/TODO#10 (text+ko) ==== @@ -29,6 +29,8 @@ - Make access control more granular. The following are done: ACL_READ_DATA + ACL_WRITE_DATA + ACL_APPEND_DATA ACL_EXECUTE ACL_READ_ATTRIBUTES ACL_WRITE_ATTRIBUTES @@ -41,8 +43,6 @@ The following are left: - ACL_WRITE_DATA - ACL_APPEND_DATA ACL_DELETE_CHILD ACL_DELETE ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_lookup.c#3 (text+ko) ==== @@ -407,8 +407,13 @@ /* * Access for write is interpreted as allowing * creation of files in the directory. + * + * XXX: Fix the comment above. */ - error = VOP_ACCESS(vdp, VWRITE, cred, cnp->cn_thread); + if (flags & WILLBEDIR) + error = VOP_GRANULAR(vdp, VWRITE, ACL_APPEND_DATA, cred, cnp->cn_thread); + else + error = VOP_GRANULAR(vdp, VWRITE, ACL_WRITE_DATA, cred, cnp->cn_thread); if (error) return (error); /* From owner-p4-projects@FreeBSD.ORG Wed Jul 9 09:07:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9752F106566C; Wed, 9 Jul 2008 09:07:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5A915106564A for ; Wed, 9 Jul 2008 09:07:28 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4C0858FC1D for ; Wed, 9 Jul 2008 09:07:28 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m6997S5k031203 for ; Wed, 9 Jul 2008 09:07:28 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6997SrQ031201 for perforce@freebsd.org; Wed, 9 Jul 2008 09:07:28 GMT (envelope-from gabor@freebsd.org) Date: Wed, 9 Jul 2008 09:07:28 GMT Message-Id: <200807090907.m6997SrQ031201@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 144933 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, 09 Jul 2008 09:07:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=144933 Change 144933 by gabor@gabor_server on 2008/07/09 09:07:04 - Add my Copyright to the files, which I contributed to Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/file.c#14 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#62 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#53 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/file.c#14 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav + * Copyright (C) 2008 Gabor Kovesdan * All rights reserved. * * Redistribution and use in source and binary forms, with or without ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#62 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav + * Copyright (C) 2008 Gabor Kovesdan * All rights reserved. * * Redistribution and use in source and binary forms, with or without ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#53 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav + * Copyright (C) 2008 Gabor Kovesdan * All rights reserved. * * Redistribution and use in source and binary forms, with or without From owner-p4-projects@FreeBSD.ORG Wed Jul 9 09:50:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B84A71065675; Wed, 9 Jul 2008 09:50:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B145106566C for ; Wed, 9 Jul 2008 09:50:11 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6CA048FC15 for ; Wed, 9 Jul 2008 09:50:11 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m699oB2c034699 for ; Wed, 9 Jul 2008 09:50:11 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m699oBQm034697 for perforce@freebsd.org; Wed, 9 Jul 2008 09:50:11 GMT (envelope-from gabor@freebsd.org) Date: Wed, 9 Jul 2008 09:50:11 GMT Message-Id: <200807090950.m699oBQm034697@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 144934 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, 09 Jul 2008 09:50:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=144934 Change 144934 by gabor@gabor_server on 2008/07/09 09:50:00 - Clean up the wflag part Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/util.c#54 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#54 (text+ko) ==== @@ -240,35 +240,18 @@ if (pmatch.rm_so != 0 || pmatch.rm_eo != l->len) r = REG_NOMATCH; if (r == 0 && wflag) { - char *begin, *end; - wchar_t *wbegin, *wend; - size_t size; + wchar_t *wbegin; + wint_t wend; - begin = grep_malloc(sizeof(char) * (pmatch.rm_so + 1)); - end = grep_malloc(sizeof(char) * (strlen(l->dat) - pmatch.rm_eo)); - strlcpy(begin, l->dat, pmatch.rm_so); - strlcpy(end, &(l->dat[pmatch.rm_eo]), (strlen(l->dat) - pmatch.rm_eo)); - - size = mbstowcs(NULL, begin, 0); - wbegin = grep_malloc(sizeof(wint_t) * size); - if (mbstowcs(wbegin, begin, size) == -1) { + wbegin = grep_malloc(mbstowcs(NULL, l->dat, pmatch.rm_so)); + if (mbstowcs(wbegin, l->dat, pmatch.rm_so) == -1) r = REG_NOMATCH; - continue; - } - free(begin); - size = mbstowcs(NULL, end, 0); - wend = grep_malloc(sizeof(wint_t) * size); - if (mbstowcs(wend, end, size) == -1) { - r = REG_NOMATCH; - continue; - } - free(end); - if ((pmatch.rm_so != 0 && iswword(wbegin[wcslen(wbegin -1)])) - || (pmatch.rm_eo != l->len && iswword(wend[0]))) + wend = sscanf(&l->dat[pmatch.rm_eo], "%lc", &wend); + if ((pmatch.rm_so != 0 && iswword(wbegin[wcslen(wbegin)])) + || (pmatch.rm_eo != l->len && iswword(wend))) r = REG_NOMATCH; free(wbegin); - free(wend); } if (r == t) { if (m == 0) From owner-p4-projects@FreeBSD.ORG Wed Jul 9 09:52:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E435A1065679; Wed, 9 Jul 2008 09:52:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A812C106566B for ; Wed, 9 Jul 2008 09:52:13 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 99CC18FC16 for ; Wed, 9 Jul 2008 09:52:13 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m699qD1k034848 for ; Wed, 9 Jul 2008 09:52:13 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m699qDJf034846 for perforce@freebsd.org; Wed, 9 Jul 2008 09:52:13 GMT (envelope-from gabor@freebsd.org) Date: Wed, 9 Jul 2008 09:52:13 GMT Message-Id: <200807090952.m699qDJf034846@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 144935 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, 09 Jul 2008 09:52:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=144935 Change 144935 by gabor@gabor_server on 2008/07/09 09:51:23 - style(9) Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#63 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#63 (text+ko) ==== @@ -541,21 +541,21 @@ } switch (grepbehave) { - case GREP_FIXED: - cflags |= REG_NOSPEC; - break; - case GREP_BASIC: - cflags |= REG_BASIC; - break; - case GREP_EXTENDED: - cflags |= REG_EXTENDED; - break; - case GREP_PERL: - errx(2, "Not yet implemented"); - break; - default: - /* NOTREACHED */ - usage(); + case GREP_FIXED: + cflags |= REG_NOSPEC; + break; + case GREP_BASIC: + cflags |= REG_BASIC; + break; + case GREP_EXTENDED: + cflags |= REG_EXTENDED; + break; + case GREP_PERL: + errx(2, "Not yet implemented"); + break; + default: + /* NOTREACHED */ + usage(); } r_pattern = grep_calloc(patterns, sizeof(*r_pattern)); for (i = 0; i < patterns; ++i) { From owner-p4-projects@FreeBSD.ORG Wed Jul 9 09:55:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 243571065673; Wed, 9 Jul 2008 09:55:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DA4EC1065683 for ; Wed, 9 Jul 2008 09:55:16 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CBD1E8FC0C for ; Wed, 9 Jul 2008 09:55:16 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m699tGJJ035125 for ; Wed, 9 Jul 2008 09:55:16 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m699tGl6035123 for perforce@freebsd.org; Wed, 9 Jul 2008 09:55:16 GMT (envelope-from gabor@freebsd.org) Date: Wed, 9 Jul 2008 09:55:16 GMT Message-Id: <200807090955.m699tGl6035123@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 144936 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, 09 Jul 2008 09:55:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=144936 Change 144936 by gabor@gabor_server on 2008/07/09 09:54:33 - Optimize the wflag part Suggested by: fjoe Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/util.c#55 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#55 (text+ko) ==== @@ -243,15 +243,16 @@ wchar_t *wbegin; wint_t wend; - wbegin = grep_malloc(mbstowcs(NULL, l->dat, pmatch.rm_so)); - if (mbstowcs(wbegin, l->dat, pmatch.rm_so) == -1) - r = REG_NOMATCH; + if (pmatch.rm_so != 0 && pmatch.rm_eo != l->len) { + wbegin = grep_malloc(mbstowcs(NULL, l->dat, pmatch.rm_so)); + if (mbstowcs(wbegin, l->dat, pmatch.rm_so) == -1) + r = REG_NOMATCH; - wend = sscanf(&l->dat[pmatch.rm_eo], "%lc", &wend); - if ((pmatch.rm_so != 0 && iswword(wbegin[wcslen(wbegin)])) - || (pmatch.rm_eo != l->len && iswword(wend))) - r = REG_NOMATCH; - free(wbegin); + wend = sscanf(&l->dat[pmatch.rm_eo], "%lc", &wend); + if (iswword(wbegin[wcslen(wbegin)]) ||iswword(wend)) + r = REG_NOMATCH; + free(wbegin); + } } if (r == t) { if (m == 0) From owner-p4-projects@FreeBSD.ORG Wed Jul 9 11:46:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DFA0C106568B; Wed, 9 Jul 2008 11:46:08 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A1CF3106567D for ; Wed, 9 Jul 2008 11:46:08 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 907538FC1A for ; Wed, 9 Jul 2008 11:46:08 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m69Bk8YK048201 for ; Wed, 9 Jul 2008 11:46:08 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m69Bk8v8048199 for perforce@freebsd.org; Wed, 9 Jul 2008 11:46:08 GMT (envelope-from sson@FreeBSD.org) Date: Wed, 9 Jul 2008 11:46:08 GMT Message-Id: <200807091146.m69Bk8v8048199@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 144938 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, 09 Jul 2008 11:46:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=144938 Change 144938 by sson@sson_amd64 on 2008/07/09 11:45:55 Fixed copyright and license information. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/auditctl.2#9 edit .. //depot/projects/trustedbsd/openbsm/man/getaudit.2#9 edit .. //depot/projects/trustedbsd/openbsm/man/getauid.2#9 edit .. //depot/projects/trustedbsd/openbsm/man/setaudit.2#10 edit .. //depot/projects/trustedbsd/openbsm/man/setauid.2#9 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/auditctl.2#9 (text+ko) ==== @@ -1,24 +1,30 @@ +.\"- +.\" Copyright (c) 2005-2006 Robert N. M. Watson +.\" Copyright (c) 2008 Apple Inc. +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. .\" -.\" Copyright (c) 2008 Apple Inc. All rights reserved. +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. .\" -.\" @APPLE_LICENSE_HEADER_START@ -.\" -.\" This file contains Original Code and/or Modifications of Original Code -.\" as defined in and that are subject to the Apple Public Source License -.\" Version 2.0 (the 'License'). You may not use this file except in -.\" compliance with the License. Please obtain a copy of the License at -.\" http://www.opensource.apple.com/apsl/ and read it before using this -.\" file. -.\" -.\" The Original Code and all software distributed under the License are -.\" distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER -.\" EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, -.\" INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, -.\" FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. -.\" Please see the License for the specific language governing rights and -.\" limitations under the License. -.\" -.\" @APPLE_LICENSE_HEADER_END@ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditctl.2#9 $ .\" .Dd April 19, 2005 .Dt AUDITCTL 2 ==== //depot/projects/trustedbsd/openbsm/man/getaudit.2#9 (text+ko) ==== @@ -1,29 +1,30 @@ +.\"- +.\" Copyright (c) 2005 Robert N. M. Watson +.\" Copyright (c) 2008 Apple Inc. +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. .\" -.\" Copyright (c) 2008 Apple Inc. All rights reserved. +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. .\" -.\" @APPLE_OSREFERENCE_LICENSE_HEADER_START@ -.\" -.\" This file contains Original Code and/or Modifications of Original Code -.\" as defined in and that are subject to the Apple Public Source License -.\" Version 2.0 (the 'License'). You may not use this file except in -.\" compliance with the License. The rights granted to you under the License -.\" may not be used to create, or enable the creation or redistribution of, -.\" unlawful or unlicensed copies of an Apple operating system, or to -.\" circumvent, violate, or enable the circumvention or violation of, any -.\" terms of an Apple operating system software license agreement. -.\" -.\" Please obtain a copy of the License at -.\" http://www.opensource.apple.com/apsl/ and read it before using this file. -.\" -.\" The Original Code and all software distributed under the License are -.\" distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER -.\" EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, -.\" INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, -.\" FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. -.\" Please see the License for the specific language governing rights and -.\" limitations under the License. -.\" -.\" @APPLE_OSREFERENCE_LICENSE_HEADER_END@ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/getaudit.2#9 $ .\" .Dd April 19, 2005 .Dt GETAUDIT 2 ==== //depot/projects/trustedbsd/openbsm/man/getauid.2#9 (text+ko) ==== @@ -1,24 +1,30 @@ +.\"- +.\" Copyright (c) 2005 Robert N. M. Watson +.\" Copyright (c) 2008 Apple Inc. +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. .\" -.\" Copyright (c) 2008 Apple Inc. All rights reserved. +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. .\" -.\" @APPLE_LICENSE_HEADER_START@ -.\" -.\" This file contains Original Code and/or Modifications of Original Code -.\" as defined in and that are subject to the Apple Public Source License -.\" Version 2.0 (the 'License'). You may not use this file except in -.\" compliance with the License. Please obtain a copy of the License at -.\" http://www.opensource.apple.com/apsl/ and read it before using this -.\" file. -.\" -.\" The Original Code and all software distributed under the License are -.\" distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER -.\" EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, -.\" INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, -.\" FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. -.\" Please see the License for the specific language governing rights and -.\" limitations under the License. -.\" -.\" @APPLE_LICENSE_HEADER_END@ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/getauid.2#9 $ .\" .Dd April 19, 2005 .Dt GETAUID 2 ==== //depot/projects/trustedbsd/openbsm/man/setaudit.2#10 (text+ko) ==== @@ -1,24 +1,30 @@ +.\"- +.\" Copyright (c) 2005 Robert N. M. Watson +.\" Copyright (c) 2008 Apple Inc. +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. .\" -.\" Copyright (c) 2008 Apple Inc. All rights reserved. +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. .\" -.\" @APPLE_LICENSE_HEADER_START@ -.\" -.\" This file contains Original Code and/or Modifications of Original Code -.\" as defined in and that are subject to the Apple Public Source License -.\" Version 2.0 (the 'License'). You may not use this file except in -.\" compliance with the License. Please obtain a copy of the License at -.\" http://www.opensource.apple.com/apsl/ and read it before using this -.\" file. -.\" -.\" The Original Code and all software distributed under the License are -.\" distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER -.\" EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, -.\" INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, -.\" FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. -.\" Please see the License for the specific language governing rights and -.\" limitations under the License. -.\" -.\" @APPLE_LICENSE_HEADER_END@ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/setaudit.2#10 $ .\" .Dd April 19, 2005 .Dt SETAUDIT 2 ==== //depot/projects/trustedbsd/openbsm/man/setauid.2#9 (text+ko) ==== @@ -1,24 +1,30 @@ +.\"- +.\" Copyright (c) 2005 Robert N. M. Watson +.\" Copyright (c) 2008 Apple Inc. +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. .\" -.\" Copyright (c) 2008 Apple Inc. All rights reserved. +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. .\" -.\" @APPLE_LICENSE_HEADER_START@ -.\" -.\" This file contains Original Code and/or Modifications of Original Code -.\" as defined in and that are subject to the Apple Public Source License -.\" Version 2.0 (the 'License'). You may not use this file except in -.\" compliance with the License. Please obtain a copy of the License at -.\" http://www.opensource.apple.com/apsl/ and read it before using this -.\" file. -.\" -.\" The Original Code and all software distributed under the License are -.\" distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER -.\" EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, -.\" INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, -.\" FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. -.\" Please see the License for the specific language governing rights and -.\" limitations under the License. -.\" -.\" @APPLE_LICENSE_HEADER_END@ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/setauid.2#9 $ .\" .Dd April 19, 2005 .Dt SETAUID 2 From owner-p4-projects@FreeBSD.ORG Wed Jul 9 12:33:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E1EC11065688; Wed, 9 Jul 2008 12:33:56 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9ED47106567D for ; Wed, 9 Jul 2008 12:33:56 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8FA578FC17 for ; Wed, 9 Jul 2008 12:33:56 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m69CXuc6055192 for ; Wed, 9 Jul 2008 12:33:56 GMT (envelope-from strauss@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m69CXuRG055190 for perforce@freebsd.org; Wed, 9 Jul 2008 12:33:56 GMT (envelope-from strauss@FreeBSD.org) Date: Wed, 9 Jul 2008 12:33:56 GMT Message-Id: <200807091233.m69CXuRG055190@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to strauss@FreeBSD.org using -f From: Anselm Strauss To: Perforce Change Reviews Cc: Subject: PERFORCE change 144939 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, 09 Jul 2008 12:33:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=144939 Change 144939 by strauss@strauss_marvelman on 2008/07/09 12:32:59 Eliminated some compile warnings Affected files ... .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive.h#3 edit .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#4 edit Differences ... ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive.h#3 (ktext) ==== @@ -22,7 +22,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. * - * $Id$ $Change: 143014 $ $DateTime$ $Author$ + * $Id$ $Change: 144939 $ $DateTime$ $Author$ */ #ifndef ARCHIVE_H_INCLUDED @@ -471,6 +471,7 @@ __LA_DECL int archive_write_set_format_shar(struct archive *); __LA_DECL int archive_write_set_format_shar_dump(struct archive *); __LA_DECL int archive_write_set_format_ustar(struct archive *); +__LA_DECL int archive_write_set_format_zip(struct archive *); __LA_DECL int archive_write_open(struct archive *, void *, archive_open_callback *, archive_write_callback *, archive_close_callback *); ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#4 (text+ko) ==== @@ -36,7 +36,6 @@ #include "archive_private.h" #include "archive_write_private.h" -int archive_write_set_format_zip(struct archive *); static ssize_t archive_write_zip_data(struct archive_write *, const void *buff, size_t s); static int archive_write_zip_finish(struct archive_write *); static int archive_write_zip_destroy(struct archive_write *); @@ -171,12 +170,14 @@ archive_write_zip_finish_entry(struct archive_write *a) { /* TODO: Write data descriptor. */ + return 0; } static int archive_write_zip_finish(struct archive_write *a) { /* TODO: Write central directory. */ + return 0; } static int @@ -200,4 +201,4 @@ *p = (value >>= i) & 0xff; p++; } -}+} From owner-p4-projects@FreeBSD.ORG Wed Jul 9 12:37:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17A43106567E; Wed, 9 Jul 2008 12:37:00 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D00D11065679 for ; Wed, 9 Jul 2008 12:36:59 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C1A8D8FC2F for ; Wed, 9 Jul 2008 12:36:59 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m69CaxWq055538 for ; Wed, 9 Jul 2008 12:36:59 GMT (envelope-from strauss@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m69Cax8C055536 for perforce@freebsd.org; Wed, 9 Jul 2008 12:36:59 GMT (envelope-from strauss@FreeBSD.org) Date: Wed, 9 Jul 2008 12:36:59 GMT Message-Id: <200807091236.m69Cax8C055536@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to strauss@FreeBSD.org using -f From: Anselm Strauss To: Perforce Change Reviews Cc: Subject: PERFORCE change 144940 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, 09 Jul 2008 12:37:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=144940 Change 144940 by strauss@strauss_marvelman on 2008/07/09 12:36:43 Todos ... Affected files ... .. //depot/projects/soc2008/strauss_libarchive/TODO#6 edit .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#5 edit Differences ... ==== //depot/projects/soc2008/strauss_libarchive/TODO#6 (text+ko) ==== @@ -4,12 +4,13 @@ - About the keywords: of course they always change when integrating ... - Not all P4 keywords do expand (tested on OS X and FreeBSD) - Integrate libarchive 2.5.5 -- Update ZIP writer in: docs, headers? +- Update ZIP writer in docs Already Done ============ +- Update ZIP writer in headers - Build does not work outside source dir - Enable P4 keyword expansion and adapt all source files - What version will this branch carry, how to update? ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#5 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Jul 9 12:49:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 72DCE106568A; Wed, 9 Jul 2008 12:49:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 36B0A1065678 for ; Wed, 9 Jul 2008 12:49:12 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 27C318FC0A for ; Wed, 9 Jul 2008 12:49:12 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m69CnC3O065842 for ; Wed, 9 Jul 2008 12:49:12 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m69CnCUM065840 for perforce@freebsd.org; Wed, 9 Jul 2008 12:49:12 GMT (envelope-from trasz@freebsd.org) Date: Wed, 9 Jul 2008 12:49:12 GMT Message-Id: <200807091249.m69CnCUM065840@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 144941 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, 09 Jul 2008 12:49:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=144941 Change 144941 by trasz@trasz_traszkan on 2008/07/09 12:48:43 Properly handle the case when we are renaming one {file,directory} over another. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_lookup.c#4 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_lookup.c#4 (text+ko) ==== @@ -542,7 +542,13 @@ * regular file, or empty directory. */ if (nameiop == RENAME && (flags & ISLASTCN)) { - if ((error = VOP_ACCESS(vdp, VWRITE, cred, cnp->cn_thread))) + if (flags & WILLBEDIR) + error = VOP_GRANULAR(vdp, VWRITE, ACL_APPEND_DATA, + cred, cnp->cn_thread); + else + error = VOP_GRANULAR(vdp, VWRITE, ACL_WRITE_DATA, + cred, cnp->cn_thread); + if (error) return (error); /* * Careful about locking second inode. @@ -553,6 +559,27 @@ if ((error = VFS_VGET(vdp->v_mount, ino, LK_EXCLUSIVE, &tdp)) != 0) return (error); + + /* + * The only purpose of this check is to return the correct + * error. Assume that we want to rename directory "a" + * to a file "b", and that we have no ACL_WRITE_DATA on + * a containing directory, but we _do_ have ACL_APPEND_DATA. + * In that case, the VOP_GRANULAR check above will return 0, + * and the operation will fail with ENOTDIR instead + * of EACCESS. + */ + if (tdp->v_type == VDIR) + error = VOP_GRANULAR(vdp, VWRITE, ACL_APPEND_DATA, + cred, cnp->cn_thread); + else + error = VOP_GRANULAR(vdp, VWRITE, ACL_WRITE_DATA, + cred, cnp->cn_thread); + if (error) { + vput(tdp); + return (error); + } + *vpp = tdp; cnp->cn_flags |= SAVENAME; return (0); From owner-p4-projects@FreeBSD.ORG Wed Jul 9 13:06:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E8AF7106567E; Wed, 9 Jul 2008 13:06:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A9542106567B for ; Wed, 9 Jul 2008 13:06:29 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9A6D38FC12 for ; Wed, 9 Jul 2008 13:06:29 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m69D6Tvg068341 for ; Wed, 9 Jul 2008 13:06:29 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m69D6TrU068339 for perforce@freebsd.org; Wed, 9 Jul 2008 13:06:29 GMT (envelope-from trasz@freebsd.org) Date: Wed, 9 Jul 2008 13:06:29 GMT Message-Id: <200807091306.m69D6TrU068339@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 144942 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, 09 Jul 2008 13:06:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=144942 Change 144942 by trasz@trasz_traszkan on 2008/07/09 13:05:30 Make the behaviour match SunOS. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_lookup.c#5 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_lookup.c#5 (text+ko) ==== @@ -560,6 +560,7 @@ LK_EXCLUSIVE, &tdp)) != 0) return (error); +#ifdef SunOS_doesnt_do_that /* * The only purpose of this check is to return the correct * error. Assume that we want to rename directory "a" @@ -579,6 +580,7 @@ vput(tdp); return (error); } +#endif *vpp = tdp; cnp->cn_flags |= SAVENAME; From owner-p4-projects@FreeBSD.ORG Wed Jul 9 14:21:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3E311065674; Wed, 9 Jul 2008 14:21:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 287EC106564A for ; Wed, 9 Jul 2008 14:21:45 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 192338FC1D for ; Wed, 9 Jul 2008 14:21:45 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m69ELin4077195 for ; Wed, 9 Jul 2008 14:21:44 GMT (envelope-from strauss@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m69ELie4077193 for perforce@freebsd.org; Wed, 9 Jul 2008 14:21:44 GMT (envelope-from strauss@FreeBSD.org) Date: Wed, 9 Jul 2008 14:21:44 GMT Message-Id: <200807091421.m69ELie4077193@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to strauss@FreeBSD.org using -f From: Anselm Strauss To: Perforce Change Reviews Cc: Subject: PERFORCE change 144943 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, 09 Jul 2008 14:21:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=144943 Change 144943 by strauss@strauss_marvelman on 2008/07/09 14:21:09 Data descriptor stuff Affected files ... .. //depot/projects/soc2008/strauss_libarchive/TODO#7 edit .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#6 edit Differences ... ==== //depot/projects/soc2008/strauss_libarchive/TODO#7 (text+ko) ==== @@ -1,10 +1,11 @@ To Be Done ========== +- Exception handling in ZIP writer +- Update ZIP writer in docs +- Integrate Libarchive 2.5.5 - About the keywords: of course they always change when integrating ... - Not all P4 keywords do expand (tested on OS X and FreeBSD) -- Integrate libarchive 2.5.5 -- Update ZIP writer in docs Already Done ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#6 (text+ko) ==== @@ -118,10 +118,12 @@ return ARCHIVE_FAILED; struct zip *zip; + struct zip_local_file_header h; + struct zip_data_descriptor *d; int ret; - struct zip_local_file_header h; - - zip = (struct zip *)a->format_data; + + zip = (struct zip *) a->format_data; + d = (struct zip_data_descriptor *) &zip->data_descriptor; ret = 0; memset(&h, 0, sizeof(h)); @@ -152,6 +154,9 @@ /* TODO: Append entry to central directory. */ + encode(archive_entry_size(entry), &d->compressed_size, sizeof(d->compressed_size)); + encode(archive_entry_size(entry), &d->uncompressed_size, sizeof(d->uncompressed_size)); + ret = (a->compressor.write)(a, &h, sizeof(h)); if (ret != ARCHIVE_OK) return (ARCHIVE_FATAL); @@ -162,15 +167,25 @@ static ssize_t archive_write_zip_data(struct archive_write *a, const void *buff, size_t s) { - return (a->compressor.write)(a, buff, s); - /* TODO: Compute data descriptor fields. */ + int ret; + ret = (a->compressor.write)(a, buff, s); + if (ret != ARCHIVE_OK) + return (ARCHIVE_FATAL); + return (ret); + + /* TODO: Compute data descriptor CRC. */ } static int archive_write_zip_finish_entry(struct archive_write *a) { - /* TODO: Write data descriptor. */ - return 0; + int ret; + struct zip *zip = (struct zip *) a->format_data; + struct zip_data_descriptor *d = (struct zip_data_descriptor *) &zip->data_descriptor; + ret = (a->compressor.write)(a, d, sizeof(d)); + if (ret != ARCHIVE_OK) + return (ARCHIVE_FATAL); + return (ret); } static int From owner-p4-projects@FreeBSD.ORG Wed Jul 9 14:52:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75BE1106567A; Wed, 9 Jul 2008 14:52:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 39A141065675 for ; Wed, 9 Jul 2008 14:52:16 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 29D508FC1F for ; Wed, 9 Jul 2008 14:52:16 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m69EqFFJ079611 for ; Wed, 9 Jul 2008 14:52:15 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m69EqFuP079609 for perforce@freebsd.org; Wed, 9 Jul 2008 14:52:15 GMT (envelope-from gabor@freebsd.org) Date: Wed, 9 Jul 2008 14:52:15 GMT Message-Id: <200807091452.m69EqFuP079609@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 144945 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, 09 Jul 2008 14:52:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=144945 Change 144945 by gabor@gabor_server on 2008/07/09 14:51:53 - Merge two if's Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/util.c#56 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#56 (text+ko) ==== @@ -239,20 +239,17 @@ if (r == 0 && xflag) if (pmatch.rm_so != 0 || pmatch.rm_eo != l->len) r = REG_NOMATCH; - if (r == 0 && wflag) { + if (r == 0 && wflag && pmatch.rm_so != 0 && pmatch.rm_eo != l->len) { wchar_t *wbegin; wint_t wend; - if (pmatch.rm_so != 0 && pmatch.rm_eo != l->len) { - wbegin = grep_malloc(mbstowcs(NULL, l->dat, pmatch.rm_so)); - if (mbstowcs(wbegin, l->dat, pmatch.rm_so) == -1) - r = REG_NOMATCH; - - wend = sscanf(&l->dat[pmatch.rm_eo], "%lc", &wend); - if (iswword(wbegin[wcslen(wbegin)]) ||iswword(wend)) - r = REG_NOMATCH; - free(wbegin); - } + wbegin = grep_malloc(mbstowcs(NULL, l->dat, pmatch.rm_so)); + if (mbstowcs(wbegin, l->dat, pmatch.rm_so) == -1) + r = REG_NOMATCH; + wend = sscanf(&l->dat[pmatch.rm_eo], "%lc", &wend); + if (iswword(wbegin[wcslen(wbegin)]) ||iswword(wend)) + r = REG_NOMATCH; + free(wbegin); } if (r == t) { if (m == 0) From owner-p4-projects@FreeBSD.ORG Wed Jul 9 15:05:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A599B106567E; Wed, 9 Jul 2008 15:05:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6958D106567B for ; Wed, 9 Jul 2008 15:05:29 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 59ADC8FC16 for ; Wed, 9 Jul 2008 15:05:29 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m69F5TRB081879 for ; Wed, 9 Jul 2008 15:05:29 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m69F5Thu081877 for perforce@freebsd.org; Wed, 9 Jul 2008 15:05:29 GMT (envelope-from gabor@freebsd.org) Date: Wed, 9 Jul 2008 15:05:29 GMT Message-Id: <200807091505.m69F5Thu081877@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 144946 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, 09 Jul 2008 15:05:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=144946 Change 144946 by gabor@gabor_server on 2008/07/09 15:05:16 - Fix --exclude and --include with proper basename() calls Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#64 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#57 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#64 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -260,6 +261,7 @@ --len; epattern[epatterns] = grep_malloc(len + 1); memcpy(epattern[epatterns], pat, len); + epattern[epatterns][len] = '\0'; ++epatterns; } @@ -511,14 +513,14 @@ usage(); inclflag = 1; exclflag = 0; - add_epattern(optarg, strlen(optarg)); + add_epattern(basename(optarg), strlen(basename(optarg))); break; case R_EXCLUDE_OPT: if (dirbehave != DIR_RECURSE) usage(); inclflag = 0; exclflag = 1; - add_epattern(optarg, strlen(optarg)); + add_epattern(basename(optarg), strlen(basename(optarg))); break; case HELP_OPT: default: ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#57 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -97,14 +98,14 @@ if (exclflag) { ok = 1; for (i = 0; i < epatterns; ++i) - if (fnmatch(epattern[i], p->fts_path, 0) == 0) { + if (fnmatch(epattern[i], basename(p->fts_path), 0) == 0) { ok = 0; break; } } else if (inclflag) { ok = 0; for (i = 0; i < epatterns; i++) - if (fnmatch(epattern[i], p->fts_path, 0) == 0) { + if (fnmatch(epattern[i], basename(p->fts_path), 0) == 0) { ok = 1; break; } From owner-p4-projects@FreeBSD.ORG Wed Jul 9 16:46:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 53CE9106567E; Wed, 9 Jul 2008 16:46:12 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 182AC1065679 for ; Wed, 9 Jul 2008 16:46:12 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 055CF8FC21 for ; Wed, 9 Jul 2008 16:46:12 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m69GkB80092492 for ; Wed, 9 Jul 2008 16:46:11 GMT (envelope-from strauss@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m69GkBlI092490 for perforce@freebsd.org; Wed, 9 Jul 2008 16:46:11 GMT (envelope-from strauss@FreeBSD.org) Date: Wed, 9 Jul 2008 16:46:11 GMT Message-Id: <200807091646.m69GkBlI092490@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to strauss@FreeBSD.org using -f From: Anselm Strauss To: Perforce Change Reviews Cc: Subject: PERFORCE change 144955 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, 09 Jul 2008 16:46:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=144955 Change 144955 by strauss@strauss_marvelman on 2008/07/09 16:45:50 Forgot to write filename after header ... Affected files ... .. //depot/projects/soc2008/strauss_libarchive/TODO#8 edit .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#7 edit Differences ... ==== //depot/projects/soc2008/strauss_libarchive/TODO#8 (text+ko) ==== @@ -1,6 +1,7 @@ To Be Done ========== +- How to enable '-Wall' in gcc when calling make? - Exception handling in ZIP writer - Update ZIP writer in docs - Integrate Libarchive 2.5.5 ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#7 (text+ko) ==== @@ -154,13 +154,21 @@ /* TODO: Append entry to central directory. */ - encode(archive_entry_size(entry), &d->compressed_size, sizeof(d->compressed_size)); - encode(archive_entry_size(entry), &d->uncompressed_size, sizeof(d->uncompressed_size)); + int64_t size = archive_entry_size(entry); + encode(size, &d->compressed_size, sizeof(d->compressed_size)); + encode(size, &d->uncompressed_size, sizeof(d->uncompressed_size)); ret = (a->compressor.write)(a, &h, sizeof(h)); if (ret != ARCHIVE_OK) return (ARCHIVE_FATAL); - + + /* Write filename and extra field (extra field is currently null). + * These are not included in the header structure due to variable size. */ + const char *path = archive_entry_pathname(entry); + ret = (a->compressor.write)(a, path, sizeof(*path)); + if (ret != ARCHIVE_OK) + return (ARCHIVE_FATAL); + return (ret); } @@ -179,6 +187,7 @@ static int archive_write_zip_finish_entry(struct archive_write *a) { + /* Write the data descripter after file data has been written. */ int ret; struct zip *zip = (struct zip *) a->format_data; struct zip_data_descriptor *d = (struct zip_data_descriptor *) &zip->data_descriptor; From owner-p4-projects@FreeBSD.ORG Wed Jul 9 18:36:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84DBA1065675; Wed, 9 Jul 2008 18:36:03 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 48F69106567D for ; Wed, 9 Jul 2008 18:36:03 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3346F8FC16 for ; Wed, 9 Jul 2008 18:36:03 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m69Ia3j2020512 for ; Wed, 9 Jul 2008 18:36:03 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m69Ia3qB020510 for perforce@freebsd.org; Wed, 9 Jul 2008 18:36:03 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 9 Jul 2008 18:36:03 GMT Message-Id: <200807091836.m69Ia3qB020510@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 144960 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, 09 Jul 2008 18:36:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=144960 Change 144960 by pgj@disznohal on 2008/07/09 18:35:10 Fix unconverted literal characters in www/hu/news Spotted by: gabor Affected files ... .. //depot/projects/docproj_hu/www/hu/news/news.sgml#6 edit .. //depot/projects/docproj_hu/www/hu/news/pressreleases.sgml#5 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/news/news.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ - + ]> @@ -14,10 +14,10 @@ &header; - FreeBSD Hírek -

    Helyi hírek

    +

    Helyi hírek

    -

    Egyéb oldalak

    +

    Egyéb oldalak

    • ==== //depot/projects/docproj_hu/www/hu/news/pressreleases.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ - + ]> @@ -15,8 +15,8 @@ &header; From owner-p4-projects@FreeBSD.ORG Wed Jul 9 18:40:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA10F106567E; Wed, 9 Jul 2008 18:40:07 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9E11F106564A for ; Wed, 9 Jul 2008 18:40:07 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6984B8FC24 for ; Wed, 9 Jul 2008 18:40:07 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m69Ie7EV020856 for ; Wed, 9 Jul 2008 18:40:07 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m69Ie7ZH020854 for perforce@freebsd.org; Wed, 9 Jul 2008 18:40:07 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 9 Jul 2008 18:40:07 GMT Message-Id: <200807091840.m69Ie7ZH020854@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 144961 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, 09 Jul 2008 18:40:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=144961 Change 144961 by pgj@disznohal on 2008/07/09 18:39:30 Replace "weekly" with "periodic" to generalize Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/tools/checkupdate/notify#3 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/tools/checkupdate/notify#3 (text+ko) ==== @@ -1,6 +1,5 @@ # $FreeBSD$ # # Add your address (relative to FreeBSD.org) here if you want to receive -# weekly translation checks for this language +# periodic translation checks for this language pgj - From owner-p4-projects@FreeBSD.ORG Wed Jul 9 20:42:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60E9B1065673; Wed, 9 Jul 2008 20:42:11 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 251A41065670 for ; Wed, 9 Jul 2008 20:42:11 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0B6DF8FC16 for ; Wed, 9 Jul 2008 20:42:11 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m69KgAXl037325 for ; Wed, 9 Jul 2008 20:42:10 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m69KgAB7037323 for perforce@freebsd.org; Wed, 9 Jul 2008 20:42:10 GMT (envelope-from sson@FreeBSD.org) Date: Wed, 9 Jul 2008 20:42:10 GMT Message-Id: <200807092042.m69KgAB7037323@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 144969 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, 09 Jul 2008 20:42:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=144969 Change 144969 by sson@sson_amd64 on 2008/07/09 20:41:51 Added missing info on A_GETPINFO_ADDR, AUDIT_ARGV, AUDIT_ARGE, and AUC_DISABLED. Added more detail. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/auditon.2#12 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/auditon.2#12 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditon.2#11 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditon.2#12 $ .\" .Dd April 19, 2005 .Dt AUDITON 2 @@ -63,14 +63,12 @@ argument must point to a .Vt long -value set to one of the audit -policy control values defined in -.In bsm/audit.h . -Currently, only +value set to one of the following audit +policy control values: +either .Dv AUDIT_CNT -and -.Dv AUDIT_AHLT -are implemented. +or +.Dv AUDIT_AHLT . In the .Dv AUDIT_CNT case, the action will continue regardless if @@ -80,10 +78,21 @@ case, a .Xr panic 9 will result if an event will not be written to the -audit log file. +audit log file. In addition to one of the audit policy control values +defined above, the argument may also include +.Dv AUDIT_ARGV +or +.Dv AUDIT_ARGE +or both. +These flags will audit the argument list and environment variables +passed to the +.Xr execve +system call and are added by bitwise OR'ing to the audit control policy +argument. .It Dv A_SETKAUDIT Return .Er ENOSYS . +(Not implemented.) .It Dv A_SETKMASK Set the kernel preselection masks (success and failure). The @@ -91,8 +100,19 @@ argument must point to a .Vt au_mask_t -structure containing the mask values. -These masks are used for non-attributable audit event preselection. +structure containing the mask values as defined in +.In bsm/audit.h . +These masks are used for non-attributable audit event preselection. +The field +.Fa am_success +specifies which classes of successful audit events are to be logged to the +audit trail. The field +.Fa am_failure +specifies which classes of failed audit events are to be logged. The value of +both fields is the bitwise OR'ing of the audit event classes specified in +.Fa bsm/audit.h . +The various audit classes are described more fully in +.Xr audit_class 5 . .It Dv A_SETQCTRL Set kernel audit queue parameters. The @@ -100,24 +120,49 @@ argument must point to a .Vt au_qctrl_t -structure containing the -kernel audit queue control settings: -.Dq "high water" , -.Dq "low water" , -.Dq "output buffer size" , -.Dq "percent min free disk space" , +structure (defined in +.In bsm/audit.h ) +containing the kernel audit queue control settings: +.Fa aq_hiwater , +.Fa aq_lowater , +.Fa aq_bufsz , +.Fa aq_delay , and -.Dq delay -(not currently used). +.Fa aq_minfree . +The field +.Fa aq_hiwater +defines the maximum number of audit record entries in the queue used to store +the audit records ready for delivery to disk. New records are inserted at the +tail of the queue and removed from the head. New records which would exceed the +high water mark, the calling thread is inserted into the a wait queue, waiting +for the audit queue to have enough space available as defined with the field +.Fa aq_lowater . +The field +.Fa aq_bufsz +defines the maximum length of the audit record that can be supplied with +.Xr audit 2 . +The field +.Fa aq_delay +is unused. +The field +.Fa aq_minfree +specifies the minimum amount of free blocks on the disk device used to store +audit records. If the value of free blocks falls below the configured +minimum amount, the kernel informs the audit daemon about low disk space. The +value is to be specified in percent of free filesystem blocks. A value of 0 +results in a disabling of the check. .It Dv A_SETSTAT Return .Er ENOSYS . +(Not implemented.) .It Dv A_SETUMASK Return .Er ENOSYS . +(Not implemented.) .It Dv A_SETSMASK Return .Er ENOSYS . +(Not implemented.) .It Dv A_SETCOND Set the current auditing condition. The @@ -131,6 +176,14 @@ .Dv AUC_NOAUDIT , or .Dv AUC_DISABLED . +If +.Dv AUC_NOAUDIT +is set, then auditing is temporarily suspended. If +.Dv AUC_AUDITING +is set, auditing is resumed. If +.Dv AUC_DISABLED +is set, the auditing system will +shutdown, draining all audit records and closing out the audit trail file. .It Dv A_SETCLASS Set the event class preselection mask for an audit event. The @@ -139,6 +192,13 @@ must point to a .Vt au_evclass_map_t structure containing the audit event and mask. +The field +.Fa ec_number +is the audit event and +.Fa ec_class +is the audit class mask. See +.Xr audit_event 5 +for more information on audit event to class mapping. .It Dv A_SETPMASK Set the preselection masks for a process. The @@ -147,7 +207,15 @@ must point to a .Vt auditpinfo_t structure that contains the given process's audit -preselection masks for both success and failure. +preselection masks for both success and failure. The field +.Fa ap_pid +is the process id of the target process. The field +.Fa ap_mask +must point to a +.Fa au_mask_t +structure which holds the preselection masks as described in the +.Da A_SETKMASK +section above. .It Dv A_SETFSIZE Set the maximum size of the audit log file. The @@ -163,6 +231,7 @@ .It Dv A_SETKAUDIT Return .Er ENOSYS . +(Not implemented.) .It Dv A_GETCLASS Return the event to class mapping for the designated audit event. The @@ -170,10 +239,13 @@ argument must point to a .Vt au_evclass_map_t -structure. +structure. See the +.Dv A_SETCLASS +section above for more information. .It Dv A_GETKAUDIT Return .Er ENOSYS . +(Not implemented.) .It Dv A_GETPINFO Return the audit settings for a process. The @@ -182,11 +254,44 @@ must point to a .Vt auditpinfo_t structure which will be set to contain -the audit ID, preselection mask, terminal ID, and audit session -ID of the given process. +.Fa ap_auid +(the audit ID), +.Fa ap_mask +(the preselection mask), +.Fa ap_termid +(the terminal ID), and +.Fa ap_asid +(the audit session ID) +of the given target process. The process ID of the target process is passed +into the kernel using the +.Fa ap_pid +field. See the section +.Dv A_SETPMASK +above and +.Xr getaudit 2 +for more information. .It Dv A_GETPINFO_ADDR -Return -.Er ENOSYS . +Return the extended audit settings for a process. +The +.Fa data +argument +must point to a +.Vt auditpinfo_addr_t +structure which is similar to the +.Vt auditpinfo_addr_t +structure described above. +The exception is the +.Fa ap_termid +(the terminal ID) field which points to a +.Vt au_tid_addr_t +structure can hold much a larger terminal address and an address type. +The process ID of the target process is passed into the kernel using the +.Fa ap_pid +field. See the section +.Dv A_SETPMASK +above and +.Xr getaudit 2 +for more information. .It Dv A_GETKMASK Return the current kernel preselection masks. The @@ -204,12 +309,10 @@ must point to a .Vt long value which will be set to -one of the current audit policy flags. -Currently, only -.Dv AUDIT_CNT -and -.Dv AUDIT_AHLT -are implemented. +one of the current audit policy flags. The audit policy flags are +described in the +.Dv A_SETPOLICY +section above. .It Dv A_GETQCTRL Return the current kernel audit queue control parameters. The @@ -218,7 +321,9 @@ must point to a .Vt au_qctrl_t structure which will be set to the current -kernel audit queue control parameters. +kernel audit queue control parameters. See the +.Dv A_SETQCTL +section above for more information. .It Dv A_GETFSIZE Returns the maximum size of the audit log file. The @@ -240,17 +345,20 @@ .\" Return the current working directory as stored in the audit subsystem. Return .Er ENOSYS . +(Not implemented.) .It Dv A_GETCAR .\" [COMMENTED OUT]: Valid description, not yet implemented. .\"Stores and returns the current active root as stored in the audit .\"subsystem. Return .Er ENOSYS . +(Not implemented.) .It Dv A_GETSTAT .\" [COMMENTED OUT]: Valid description, not yet implemented. .\"Return the statistics stored in the audit system. Return .Er ENOSYS . +(Not implemented.) .It Dv A_GETCOND Return the current auditing condition. The @@ -259,10 +367,14 @@ must point to a .Vt long value which will be set to -the current audit condition, either -.Dv AUC_AUDITING +the current audit condition, one of +.Dv AUC_AUDITING , +.Dv AUC_NOAUDIT or -.Dv AUC_NOAUDIT . +.Dv AUC_DISABLED . +See the +.Dv A_SETCOND +section above for more information. .It Dv A_SENDTRIGGER Send a trigger to the audit daemon. The From owner-p4-projects@FreeBSD.ORG Wed Jul 9 21:36:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8CE371065681; Wed, 9 Jul 2008 21:36:06 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 502761065675 for ; Wed, 9 Jul 2008 21:36:06 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 004FD8FC1B for ; Wed, 9 Jul 2008 21:36:06 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m69La588063307 for ; Wed, 9 Jul 2008 21:36:06 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m69La5ji063305 for perforce@freebsd.org; Wed, 9 Jul 2008 21:36:05 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 9 Jul 2008 21:36:05 GMT Message-Id: <200807092136.m69La5ji063305@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 144971 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, 09 Jul 2008 21:36:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=144971 Change 144971 by hselasky@hselasky_laptop001 on 2008/07/09 21:35:16 More changes related to LibUSB support. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#4 edit .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#3 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#4 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#4 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_atmelarm.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_pccard.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_compat_linux.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#10 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#12 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#12 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#11 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#12 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#9 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_revision.h#2 edit .. //depot/projects/usb/src/sys/dev/usb2/misc/udbp2.c#3 edit .. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/storage/ata-usb2.c#4 edit .. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#3 edit .. //depot/projects/usb/src/sys/dev/usb2/storage/ustorage2_fs.c#4 edit .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template.c#3 edit .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_cdce.c#3 edit .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_msc.c#3 edit .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_mtp.c#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#4 (text+ko) ==== @@ -35,7 +35,6 @@ #include #include #include -#include #define USB_DEBUG_VAR usb2_debug ==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#3 (text+ko) ==== @@ -35,7 +35,6 @@ #include #include #include -#include #include #define USB_DEBUG_VAR usb2_debug ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#4 (text+ko) ==== @@ -46,7 +46,6 @@ #include #include -#include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#5 (text+ko) ==== @@ -28,7 +28,6 @@ #include -#include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#6 (text+ko) ==== @@ -48,7 +48,6 @@ #include #include -#include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#5 (text+ko) ==== @@ -53,7 +53,6 @@ */ #include -#include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#4 (text+ko) ==== @@ -37,7 +37,6 @@ #include #include -#include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_atmelarm.c#5 (text) ==== @@ -26,7 +26,6 @@ __FBSDID("$FreeBSD: src/sys/arm/at91/ohci_atmelarm.c,v 1.4 2007/10/29 21:01:50 imp Exp $"); #include -#include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#5 (text+ko) ==== @@ -51,7 +51,6 @@ #include #include -#include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#5 (text+ko) ==== @@ -40,7 +40,6 @@ #include #include -#include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#5 (text+ko) ==== @@ -49,7 +49,6 @@ */ #include -#include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#6 (text+ko) ==== @@ -25,7 +25,6 @@ #include #include -#include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_pccard.c#5 (text+ko) ==== @@ -28,7 +28,6 @@ */ #include -#include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_compat_linux.c#5 (text+ko) ==== @@ -28,7 +28,6 @@ #include #include #include -#include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#10 (text+ko) ==== @@ -51,6 +51,9 @@ #include #include +#include +#include + #include "usb2_if.h" #include "opt_usb.h" @@ -81,12 +84,6 @@ #define USB_HUB_MAX_DEPTH 5 -/* USB modes */ - -#define USB_MODE_HOST 0 /* default */ -#define USB_MODE_DEVICE 1 -#define USB_MODE_MAX 2 - /* USB transfer states */ #define USB_ST_SETUP 0 ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#12 (text+ko) ==== @@ -27,7 +27,6 @@ #include #include #include -#include #include #define USB_DEBUG_VAR usb2_debug ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#12 (text+ko) ==== @@ -28,7 +28,6 @@ #include #include #include -#include #define USB_DEBUG_VAR ugen_debug @@ -730,6 +729,75 @@ } /*------------------------------------------------------------------------* + * usb2_gen_fill_devicenames + * + * This function dumps information about an USB device names to + * userland. + * + * Returns: + * 0: Success + * Else: Failure + *------------------------------------------------------------------------*/ +static int +usb2_gen_fill_devicenames(struct usb2_fifo *f, struct usb2_device_names *dn) +{ + struct usb2_interface *iface; + const char *ptr; + char *dst; + char buf[32]; + int error = 0; + int len; + int max_len; + uint8_t i; + uint8_t first = 1; + + if (f->flag_no_uref) { + /* control endpoint only */ + return (EINVAL); + } + max_len = dn->udn_devnames_len; + dst = dn->udn_devnames_ptr; + + if (max_len == 0) { + return (EINVAL); + } + /* put a zero there */ + error = copyout("", dst, 1); + if (error) { + return (error); + } + for (i = 0;; i++) { + iface = usb2_get_iface(f->udev, i); + if (iface == NULL) { + break; + } + if ((iface->subdev != NULL) && + device_is_attached(iface->subdev)) { + ptr = device_get_nameunit(iface->subdev); + if (!first) { + strlcpy(buf, ", ", sizeof(buf)); + } else { + buf[0] = 0; + } + strlcat(buf, ptr, sizeof(buf)); + len = strlen(buf) + 1; + if (len > max_len) { + break; + } + error = copyout(buf, dst, len); + if (error) { + return (error); + } + len--; + dst += len; + max_len -= len; + first = 0; + } + } + return (0); +} + +/*------------------------------------------------------------------------* * usb2_gen_fill_deviceinfo * * This function dumps information about an USB device to the @@ -742,15 +810,8 @@ static int usb2_gen_fill_deviceinfo(struct usb2_fifo *f, struct usb2_device_info *di) { - enum { - MAX_PORT = (sizeof(di->udi_ports) / sizeof(di->udi_ports[0])), - }; - struct usb2_port *p; - struct usb2_interface *iface; - struct usb2_device *child; struct usb2_device *udev; - uint8_t i; - uint8_t max; + struct usb2_device *hub; if (f->flag_no_uref) { /* control endpoint only */ @@ -762,6 +823,9 @@ di->udi_bus = device_get_unit(udev->bus->bdev); di->udi_addr = udev->address; + di->udi_index = udev->device_index; + strlcpy(di->udi_serial, udev->serial, + sizeof(di->udi_serial)); strlcpy(di->udi_vendor, udev->manufacturer, sizeof(di->udi_vendor)); strlcpy(di->udi_product, udev->product, @@ -774,38 +838,22 @@ di->udi_class = udev->ddesc.bDeviceClass; di->udi_subclass = udev->ddesc.bDeviceSubClass; di->udi_protocol = udev->ddesc.bDeviceProtocol; - di->udi_config = udev->curr_config_no; + di->udi_config_no = udev->curr_config_no; + di->udi_config_index = udev->curr_config_index; di->udi_power = udev->flags.self_powered ? 0 : udev->power; di->udi_speed = udev->speed; - - for (i = 0; i != MIN(USB_MAX_DEVNAMES, USB_IFACE_MAX); i++) { - iface = usb2_get_iface(udev, i); - if (iface && (iface->subdev != NULL) && - device_is_attached(iface->subdev)) { - strlcpy(di->udi_devnames[i], - device_get_nameunit(iface->subdev), - USB_MAX_DEVNAMELEN); - } + di->udi_mode = udev->flags.usb2_mode; + if (udev->flags.suspended) { + di->udi_devstate = USB_DEVSTATE_SUSPENDED; + } else { + di->udi_devstate = USB_DEVSTATE_ENABLED; } - if (udev->hub) { - - max = udev->hub->nports; - if (max > MAX_PORT) { - max = MAX_PORT; - } - di->udi_nports = max; - p = udev->hub->ports; - for (i = 0; i != max; i++, p++) { - - child = usb2_bus_port_get_device(udev->bus, p); - - if (child) { - di->udi_ports[i] = p->device_index; - } else { - di->udi_ports[i] = USB_PORT_POWERED; - } - } + hub = udev->parent_hub; + if (hub) { + di->udi_hubaddr = hub->address; + di->udi_hubindex = hub->device_index; + di->udi_hubport = udev->port_no; } return (0); } @@ -1021,10 +1069,12 @@ /* security checks */ if (fs_ep.nFrames > xfer->max_frame_count) { - return (EINVAL); + xfer->error = USB_ERR_INVAL; + goto complete; } if (fs_ep.nFrames == 0) { - return (EINVAL); + xfer->error = USB_ERR_INVAL; + goto complete; } error = copyin(f->fs_ep_ptr + ep_index, &fs_ep, sizeof(fs_ep)); @@ -1049,7 +1099,8 @@ return (error); } if (length >= sizeof(*req)) { - return (EINVAL); + xfer->error = USB_ERR_INVAL; + goto complete; } if (length) { error = copyin(uaddr, req, length); @@ -1058,7 +1109,8 @@ } } if (ugen_check_request(req)) { - return (EPERM); + xfer->error = USB_ERR_INVAL; + goto complete; } xfer->frlengths[0] = length; @@ -1089,22 +1141,22 @@ if (xfer->timeout > 65535) { xfer->timeout = 65535; } - if (fs_ep.flags & USB2_FS_FLAG_SINGLE_SHORT_OK) + if (fs_ep.flags & USB_FS_FLAG_SINGLE_SHORT_OK) xfer->flags.short_xfer_ok = 1; else xfer->flags.short_xfer_ok = 0; - if (fs_ep.flags & USB2_FS_FLAG_MULTI_SHORT_OK) + if (fs_ep.flags & USB_FS_FLAG_MULTI_SHORT_OK) xfer->flags.short_frames_ok = 1; else xfer->flags.short_frames_ok = 0; - if (fs_ep.flags & USB2_FS_FLAG_FORCE_SHORT) + if (fs_ep.flags & USB_FS_FLAG_FORCE_SHORT) xfer->flags.force_short_xfer = 1; else xfer->flags.force_short_xfer = 0; - if (fs_ep.flags & USB2_FS_FLAG_CLEAR_STALL) + if (fs_ep.flags & USB_FS_FLAG_CLEAR_STALL) xfer->flags.stall_pipe = 1; else xfer->flags.stall_pipe = 0; @@ -1114,33 +1166,34 @@ error = copyin(fs_ep.pLength + n, &length, sizeof(length)); if (error) { - return (error); + break; } xfer->frlengths[n] = length; if (length > rem) { - return (EINVAL); + xfer->error = USB_ERR_INVAL; + goto complete; } rem -= length; if (!isread) { + /* we need to know the source buffer */ + error = copyin(fs_ep.ppBuffer + n, + &uaddr, sizeof(uaddr)); + if (error) { + break; + } if (xfer->flags_int.isochronous_xfr) { /* move data */ - error = copyin(USB_ADD_BYTES(uaddr, offset), - USB_ADD_BYTES(xfer->frbuffers[0].buffer, + error = copyin(uaddr, USB_ADD_BYTES( + xfer->frbuffers[0].buffer, offset), length); if (error) { - return (error); + break; } } else { - /* we need to know the source buffer */ - error = copyin(fs_ep.ppBuffer + n, - &uaddr, sizeof(uaddr)); - if (error) { - return (error); - } /* set current frame offset */ usb2_set_frame_offset(xfer, offset, n); @@ -1148,13 +1201,19 @@ error = copyin(uaddr, xfer->frbuffers[n].buffer, length); if (error) { - return (error); + break; } } } offset += length; } return (error); + +complete: + mtx_lock(f->priv_mtx); + ugen_fs_set_complete(f, ep_index); + mtx_unlock(f->priv_mtx); + return (0); } static int @@ -1195,11 +1254,6 @@ if (xfer->error) { goto complete; } - error = copyin(fs_ep.ppBuffer, - &uaddr, sizeof(uaddr)); - if (error) { - return (error); - } if (xfer->flags_int.control_xfr) { req = xfer->frbuffers[0].buffer; @@ -1220,6 +1274,12 @@ for (; n != xfer->nframes; n++) { + /* we need to know the destination buffer */ + error = copyin(fs_ep.ppBuffer + n, + &uaddr, sizeof(uaddr)); + if (error) { + return (error); + } if (xfer->flags_int.isochronous_xfr) { /* we need to know the initial length */ @@ -1230,7 +1290,8 @@ } /* range check */ if (length > rem) { - return (EINVAL); + fs_ep.status = USB_ERR_INVAL; + goto complete; } rem -= length; temp = offset + length; @@ -1241,7 +1302,7 @@ } /* move data */ error = copyout(USB_ADD_BYTES(xfer->frbuffers[0].buffer, - offset), USB_ADD_BYTES(uaddr, offset), length); + offset), uaddr, length); if (error) { return (error); } @@ -1250,12 +1311,6 @@ length = xfer->frlengths[n]; - /* we need to know the destination buffer */ - error = copyin(fs_ep.ppBuffer + n, - &uaddr, sizeof(uaddr)); - if (error) { - return (error); - } /* move data */ error = copyout(xfer->frbuffers[n].buffer, uaddr, length); @@ -1276,7 +1331,6 @@ /* update "aFrames" */ error = copyout(&fs_ep.aFrames, &(f->fs_ep_ptr + ep_index)->aFrames, sizeof(fs_ep.aFrames)); - if (error) { return (error); } @@ -1394,7 +1448,6 @@ } f->fs_ep_max = pd->ep_index_max; f->fs_ep_ptr = pd->pEndpoints; - f->flag_no_uref = 1; /* drop locks we don't need */ break; } @@ -1429,11 +1482,10 @@ break; } if (pd->max_bufsize > USB_FS_MAX_BUFSIZE) { - error = EINVAL; - break; + pd->max_bufsize = USB_FS_MAX_BUFSIZE; } if (pd->max_frames > USB_FS_MAX_FRAMES) { - error = EINVAL; + pd->max_frames = USB_FS_MAX_FRAMES; break; } if (pd->max_frames == 0) { @@ -1500,11 +1552,18 @@ f->fs_xfer + pd->ep_index, usb2_config, 1, f, f->priv_mtx); if (error == 0) { - /* update maximum buffer size */ + /* update maximums */ + pd->max_packet_length = + f->fs_xfer[pd->ep_index]->max_frame_size; pd->max_bufsize = - f->fs_xfer[pd->ep_index]->max_frame_size; + f->fs_xfer[pd->ep_index]->max_data_length; f->fs_xfer[pd->ep_index]->priv_fifo = ((uint8_t *)0) + pd->ep_index; + /* + * Increase performance by dropping locks we + * don't need: + */ + f->flag_no_uref = 1; } else { error = ENOMEM; } @@ -1784,6 +1843,10 @@ error = usb2_gen_fill_deviceinfo(f, addr); break; + case USB_GET_DEVICENAMES: + error = usb2_gen_fill_devicenames(f, addr); + break; + case USB_DEVICESTATS:{ struct usb2_device_stats *ustat = addr; ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#11 (text+ko) ==== @@ -33,7 +33,6 @@ #include #include #include -#include #define USB_DEBUG_VAR uhub_debug ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#8 (text+ko) ==== @@ -790,6 +790,10 @@ } /* get full descriptor */ len = UGETW(cd.wTotalLength); + if (len < sizeof(*cdesc)) { + /* corrupt descriptor */ + return (USB_ERR_INVAL); + } cdesc = malloc(len, mtype, M_WAITOK); if (cdesc == NULL) { return (USB_ERR_NOMEM); ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#12 (text+ko) ==== @@ -26,7 +26,6 @@ #include #include #include -#include #include #define USB_DEBUG_VAR usb2_debug ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#9 (text+ko) ==== @@ -63,8 +63,12 @@ uint8_t reserved[8]; }; -#define USB_MAX_DEVNAMES 4 -#define USB_MAX_DEVNAMELEN 16 +struct usb2_device_names { + char *udn_devnames_ptr; /* userland pointer to comma separated + * list of device names */ + uint16_t udn_devnames_len; /* maximum string length including + * terminating zero */ +}; struct usb2_device_info { uint16_t udi_productNo; @@ -74,23 +78,27 @@ * selfpowered */ uint8_t udi_bus; uint8_t udi_addr; /* device address */ + uint8_t udi_index; /* device index */ uint8_t udi_class; uint8_t udi_subclass; uint8_t udi_protocol; - uint8_t udi_config; - uint8_t udi_speed; + uint8_t udi_config_no; /* current config number */ + uint8_t udi_config_index; /* current config index */ + uint8_t udi_speed; /* see "USB_SPEED_XXX" */ + uint8_t udi_mode; /* see "USB_MODE_XXX" */ uint8_t udi_nports; - uint8_t udi_ports[16]; /* HUB only: addresses of devices on - * ports */ -#define USB_PORT_ENABLED 0xff -#define USB_PORT_SUSPENDED 0xfe -#define USB_PORT_POWERED 0xfd -#define USB_PORT_DISABLED 0xfc - + uint8_t udi_hubaddr; /* parent HUB address */ + uint8_t udi_hubindex; /* parent HUB device index */ + uint8_t udi_hubport; /* parent HUB port */ + uint8_t udi_devstate; +#define USB_DEVSTATE_ENABLED 0x0 +#define USB_DEVSTATE_SUSPENDED 0x1 +#define USB_DEVSTATE_POWERED 0x2 +#define USB_DEVSTATE_DISABLED 0x3 char udi_product[128]; char udi_vendor[128]; + char udi_serial[64]; char udi_release[8]; - char udi_devnames[USB_MAX_DEVNAMES][USB_MAX_DEVNAMELEN]; }; struct usb2_device_stats { @@ -98,10 +106,6 @@ uint32_t uds_requests_fail[4]; /* Indexed by transfer type UE_XXX */ }; -struct usb2_device_enumerate { - uint8_t ude_addr; /* not used */ -}; - struct usb2_fs_start { uint8_t ep_index; }; @@ -116,8 +120,6 @@ /* This structure is used for all endpoint types */ struct usb2_fs_endpoint { - void *priv_sc0; /* private client data */ - void *priv_sc1; /* private client data */ /* * NOTE: isochronous USB transfer only use one buffer, but can have * multiple frame lengths ! @@ -129,16 +131,16 @@ uint32_t aFrames; /* actual number of frames */ uint16_t flags; /* a single short frame will terminate */ -#define USB2_FS_FLAG_SINGLE_SHORT_OK 0x0001 +#define USB_FS_FLAG_SINGLE_SHORT_OK 0x0001 /* multiple short frames are allowed */ -#define USB2_FS_FLAG_MULTI_SHORT_OK 0x0002 +#define USB_FS_FLAG_MULTI_SHORT_OK 0x0002 /* all frame(s) transmitted are short terminated */ -#define USB2_FS_FLAG_FORCE_SHORT 0x0004 +#define USB_FS_FLAG_FORCE_SHORT 0x0004 /* will do a clear-stall before xfer */ -#define USB2_FS_FLAG_CLEAR_STALL 0x0008 +#define USB_FS_FLAG_CLEAR_STALL 0x0008 uint16_t timeout; /* in milliseconds */ /* timeout value for no timeout */ -#define USB2_FS_TIMEOUT_NONE 0 +#define USB_FS_TIMEOUT_NONE 0 uint8_t status; /* see USB_ERR_XXX */ }; @@ -158,6 +160,7 @@ uint32_t max_bufsize; #define USB_FS_MAX_FRAMES (1 << 12) uint32_t max_frames; + uint16_t max_packet_length; /* read only */ uint8_t dev_index; /* currently unused */ uint8_t ep_index; uint8_t ep_no; /* bEndpointNumber */ @@ -177,7 +180,7 @@ #define USB_DISCOVER _IO ('U', 3) #define USB_DEVICEINFO _IOWR('U', 4, struct usb2_device_info) #define USB_DEVICESTATS _IOR ('U', 5, struct usb2_device_stats) -#define USB_DEVICEENUMERATE _IOW ('U', 6, struct usb2_device_enumerate) +#define USB_DEVICEENUMERATE _IOW ('U', 6, int) /* Generic HID device */ #define USB_GET_REPORT_DESC _IOR ('U', 21, struct usb2_gen_descriptor) @@ -206,6 +209,11 @@ #define USB_SET_BUFFER_SIZE _IOW ('U', 118, uint32_t) #define USB_SET_RX_STALL_FLAG _IOW ('U', 119, int) #define USB_SET_TX_STALL_FLAG _IOW ('U', 120, int) +#define USB_GET_DEVICENAMES _IOW ('U', 121, struct usb2_device_names) +#define USB_CLAIM_INTERFACE _IOW ('U', 122, int) +#define USB_RELEASE_INTERFACE _IOW ('U', 123, int) +#define USB_IFACE_DRIVER_ACTIVE _IOW ('U', 124, int) +#define USB_IFACE_DRIVER_DETACH _IOW ('U', 125, int) /* Modem device */ #define USB_GET_CM_OVER_DATA _IOR ('U', 130, int) ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_revision.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -53,4 +53,13 @@ USB_MAKE_ENUM(USB_REV); +/* + * The "USB_MODE" macro defines all the supported USB modes. + */ +#define USB_MODE(m,n)\ +m(n, USB_MODE_HOST)\ +m(n, USB_MODE_DEVICE)\ + +USB_MAKE_ENUM(USB_MODE); + #endif /* _USB2_REVISION_H_ */ ==== //depot/projects/usb/src/sys/dev/usb2/misc/udbp2.c#3 (text+ko) ==== @@ -61,7 +61,6 @@ #include #include #include -#include #define USB_DEBUG_VAR udbp_debug ==== //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#5 (text+ko) ==== @@ -56,7 +56,6 @@ #include #include #include -#include #define USB_DEBUG_VAR uaudio_debug ==== //depot/projects/usb/src/sys/dev/usb2/storage/ata-usb2.c#4 (text) ==== @@ -34,7 +34,6 @@ #include #include #include -#include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#3 (text+ko) ==== @@ -106,7 +106,6 @@ #include #include #include -#include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/storage/ustorage2_fs.c#4 (text+ko) ==== @@ -38,7 +38,6 @@ #include #include #include -#include #include #define USB_DEBUG_VAR ustorage_fs_debug ==== //depot/projects/usb/src/sys/dev/usb2/template/usb2_template.c#3 (text+ko) ==== @@ -31,7 +31,6 @@ #include #include #include -#include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_cdce.c#3 (text+ko) ==== @@ -34,7 +34,6 @@ #include #include #include -#include #include ==== //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_msc.c#3 (text+ko) ==== @@ -33,7 +33,6 @@ #include #include -#include #include ==== //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_mtp.c#3 (text+ko) ==== @@ -34,7 +34,6 @@ #include #include -#include #include From owner-p4-projects@FreeBSD.ORG Wed Jul 9 22:10:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 601061065675; Wed, 9 Jul 2008 22:10:44 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 235101065672 for ; Wed, 9 Jul 2008 22:10:44 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 06A048FC13 for ; Wed, 9 Jul 2008 22:10:44 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m69MAiIR080124 for ; Wed, 9 Jul 2008 22:10:44 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m69MAhn0080122 for perforce@freebsd.org; Wed, 9 Jul 2008 22:10:43 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 9 Jul 2008 22:10:43 GMT Message-Id: <200807092210.m69MAhn0080122@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 144973 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, 09 Jul 2008 22:10:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=144973 Change 144973 by pgj@disznohal on 2008/07/09 22:10:29 Rework in www/hu/platforms Affected files ... .. //depot/projects/docproj_hu/www/hu/platforms/alpha.sgml#5 edit .. //depot/projects/docproj_hu/www/hu/platforms/amd64.sgml#5 edit .. //depot/projects/docproj_hu/www/hu/platforms/arm.sgml#5 edit .. //depot/projects/docproj_hu/www/hu/platforms/i386.sgml#4 edit .. //depot/projects/docproj_hu/www/hu/platforms/ia64/index.xsl#4 edit .. //depot/projects/docproj_hu/www/hu/platforms/ia64/machines.sgml#5 edit .. //depot/projects/docproj_hu/www/hu/platforms/ia64/refs.sgml#4 edit .. //depot/projects/docproj_hu/www/hu/platforms/ia64/todo.xsl#4 edit .. //depot/projects/docproj_hu/www/hu/platforms/index.sgml#4 edit .. //depot/projects/docproj_hu/www/hu/platforms/mips.sgml#5 edit .. //depot/projects/docproj_hu/www/hu/platforms/pc98.sgml#5 edit .. //depot/projects/docproj_hu/www/hu/platforms/ppc.sgml#7 edit .. //depot/projects/docproj_hu/www/hu/platforms/sparc.sgml#5 edit .. //depot/projects/docproj_hu/www/hu/platforms/sun4v.sgml#5 edit .. //depot/projects/docproj_hu/www/hu/platforms/xbox.sgml#5 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/platforms/alpha.sgml#5 (text+ko) ==== @@ -2,7 +2,7 @@ - + ]> @@ -16,7 +16,7 @@ &header; -

      Ez az oldal a FreeBSD HP/Compaq Alpha portjáról +

      Ez az oldal a &os; HP/Compaq Alpha portjáról tartalmaz információkat. Az Alpha porttal kapcsolatos megbeszélések általában a freebsd-alpha @@ -24,30 +24,31 @@

      Helyzet

      -

      A FreeBSD 7.0 verziójától kezdõdõen - az Alpha támogatás megszûnt. Az új Alpha - rendszerek terjesztésével a gyártó - felhagyott. Ennek, és a 64 bites rendszerek, mint pl. az - AMD64 és az EM64T architektúrák, - széleskörû elterjedésének - köszönhetõen az Alpha felhasználóinak - száma jelentõsen visszaesett, a fejlesztõi - közösség egyre kevésbé - érdekelt ennek a portnak a karbantartásában. A - FreeBSD/alpha a FreeBSD 6.X kiadásokban még - elérhetõ lesz.

      +

      A &os; 7.0 verziójától + kezdõdõen az Alpha támogatás megszûnt. + Az új Alpha rendszerek terjesztését a + gyártó abbahagyta. Ennek, és a 64 bites + rendszerek, mint amelyek például az AMD64 és az + EM64T architektúrák, széleskörû + elterjedésének következtében az Alpha + felhasználóinak száma jelentõsen + visszaesett, ezért a fejlesztõi + közösség egyre kevésbé vált + érdekeltté ennek a portnak a + karbantartásában. A &os;/alpha a &os; 6.X + kiadásokban természetesen még továbbra + is elérhetõ lesz.

      -

      FreeBSD/alpha levelezési lista

      +

      A &os;/alpha levelezési lista

      Ha fel szeretnénk iratkozni erre a listára, akkor küldjünk egy e-mailt a címre, vagy látogassunk el a hozzátartozó mailman felületre - .

      + href="http://lists.FreeBSD.org/mailman/listinfo/freebsd-alpha">mailman felületre.

      -

      Egyéb Érdekes Linkek

      +

      Egyéb érdekes linkek a témában

      Hardver

      ==== //depot/projects/docproj_hu/www/hu/platforms/amd64.sgml#5 (text+ko) ==== @@ -2,7 +2,7 @@ - + ]> @@ -16,70 +16,79 @@ &header; - BSD Démon egy kalapácsot lenget + BSD Démon egy kalapácsot lenget

      Ez az oldal az AMD64 és az - Intel® - 64 (Extended Memory 64-bit Technology) architektúrák - FreeBSD portjáról tartalmaz információkat. - Az AMD64 architektúra korábban x86-64 vagy "Hammer", az Intel - 64 architektúra pedig Yamhill, Clackamas Technology (CT), IA-32e - és EM64T neveken volt ismert.

      + Intel® 64 + (Extended Memory 64-bit Technology) architektúrák &os; + portjával kapcsolatban tartalmaz információkat. + Az AMD64 architektúra korábban x86-64 vagy "Hammer", + az Intel 64 architektúra pedig Yamhill, Clackamas Technology + (CT), IA-32e és EM64T neveken volt ismert.

      -

      Az AMD Opteron™, AMD Athlon™64, AMD Turion™64 és - az újabb AMD Sempron&trade, processzorok az AMD64 - architektúrába tartoznak.

      +

      Az AMD Opteron™, AMD Athlon™64, + AMD Turion™64 és az újabb + AMD Sempron™ processzorok már az AMD64 + architektúrához sorolhatóak.

      -

      Az Intel vPro™, Intel Celeron D (néhány modell a - "Prescott" óta), Intel Centrino® Duo, Intel Centrino® Pro, - Intel Viiv™, Intel Core™2 Extreme, Intel Core™2 Quad, - Intel Core™2 Duo, Intel Xeon (3000-sequence, 5000-sequence, és - 7000-sequence) processzorok az Intel®64 architektúrába +

      Az Intel vPro™, Intel Celeron D + (néhány modell a "Prescott" óta), + Intel Centrino® Duo, + Intel Centrino® Pro, Intel Viiv™, + Intel Core™2 Extreme, + Intel Core™2 Quad, Intel Core™2 Duo, + Intel Xeon (3000-es, 5000-es, és 7000-es sorozat) + processzorok az Intel®64 architektúrához tartoznak.

      Helyzet

      -

      A FreeBSD/amd64 64 bites többfelhasználós - módban fut, egyprocesszoros és többprocesszoros - módban is.

      +

      A &os;/amd64 64 bites többfelhasználós + üzemmódban képes futni, egyprocesszoros és + többprocesszoros változatban is.

      Az AMD64 platform jelenleg egy Tier - 1 FreeBSD platform.

      + href="&enbase;/doc/en_US.ISO8859-1/articles/committers-guide/archs.html">Tier 1 + szintû &os; platform.

      + +

      A &os;/amd64 porthoz kapcsolódó források

      -

      FreeBSD/amd64 Specifikus Források

      -

      Egyéb Érdekes Linkek

      +

      Egyéb érdekes linkek

      + +

      AMD64 dokumentáció

      -

      AMD64 Dokumentáció

      Szoftvereszközök

      + -

      Kapcsolódó Projektek

      +

      Kapcsolódó projektek

      + ==== //depot/projects/docproj_hu/www/hu/platforms/arm.sgml#5 (text+ko) ==== @@ -2,7 +2,7 @@ - + %developers; @@ -17,11 +17,11 @@ &header; -

      Bevezetés

      +

      Bevezetés

      Ezen az oldalon találhatunk információkat a - &os; ARM architektúrán és -hardveren futó - változatáról. Az ezzel kapcsolatos + &os; ARM architektúrán és -hardveren + futó változatáról. Az ezzel kapcsolatos megbeszélések a freebsd-arm levelezési listán folynak.

      @@ -42,7 +42,7 @@

      Az ARM hivatalosan egy Tier 2 szintû architektúra, tehát a &os; Projekt ehhez nem készít + href="&base;">&os; Projekt ehhez nem készít hivatalos kiadásokat vagy elõre fordított csomagokat, mivel ez elsõsorban a beágyazott rendszereket veszi célba. Ettõl függetlenül a @@ -55,32 +55,32 @@

      Támogatott hardverek

      A &os; általában elindul az IQ31244 és IQ80321 - chipeket tartalmazó, i80321 alapú Intel XScale® - fejlesztõi kártyákon. A támogatása - jelenleg csak minimális, kizárólag a - processzort, a PCI-X buszt, az em(4) típusú Ethernet - kártyákat, az UART és idõzítõ - eszközöket ismeri.

      + chipeket tartalmazó, i80321 alapú + Intel XScale® fejlesztõi kártyákon. A + támogatása jelenleg csak minimális, + kizárólag a processzort, a PCI-X buszt, az em(4) + típusú Ethernet kártyákat, az UART + és idõzítõ eszközöket ismeri.

      Az EP80219 fejlesztõi kártyákon - található i80219 XScale processzorok is + található i80219 XScale processzorok is támogatottak.

      -

      Az Avila GW2348-4 fejlesztõi kártyákon +

      Az Avila GW2348-4 fejlesztõi kártyákon található IXP425 is támogatott.

      -

      A StrongARM 1100 CPU minimálisan támogatott, de csak - a Simics emuláció keretein belül: CPU, UART +

      A StrongARM 1100 CPU minimálisan támogatott, de + csak a Simics emuláció keretein belül: CPU, UART és órajel. Elméletileg indítható a Simics által emulált kártyákon, de errõl eddig még nem érkezett sikeres vagy sikertelen visszajelzés.

      -

      Ezeken kívül még a Technologic Systems TS-7200 - típusú fejlesztõi kártyáin - található Atmel AT91SAM926x processzorok, a Marvell - Orion ARM SoC, a Samsung S3C2XX0 sorozat és a Cirrus Logic - EP93XX processzorok is támogatottak.

      +

      Ezeken kívül még a Technologic Systems + TS-7200 típusú fejlesztõi kártyáin + található Atmel AT91SAM926x processzorok, a + Marvell Orion ARM SoC, a Samsung S3C2XX0 sorozat és a + Cirrus Logic EP93XX processzorok is támogatottak.

      További teendõk

      @@ -88,8 +88,8 @@
    • SATA támogatás
    • Egyéb eszközök, mint például - watchdog, i2c és bus támogatását be kell - olvasztani a NetBSD-bõl
      • + watchdog, i2c és bus támogatását be + kell olvasztani a NetBSD-bõl

    &os;/ARM linkek

    @@ -97,32 +97,33 @@

    Rövid telepítési útmutató

    &a.cognet; (cognet@FreeBSD.org) írt egy rövid - telepítési útmutatót a jelenlegi FreeBSD - forráskódhoz. Az útmutató elérhetõ - itt.

    + telepítési útmutatót a jelenlegi &os; + forráskódhoz. Az útmutató + elérhetõ itt.

    -

    FreeBSD/ARM levelezési lista

    +

    A &os;/ARM levelezési lista

    -

    Hogy feliratkozzon erre a listára, küldjön egy levelet a - címre, vagy használja a - mailman - felületet.

    +

    Úgy tudunk feliratkozni erre a listára, ha + küldünk egy levelet a + címre, vagy használjuk a mailman felületét.

    +

    A zenészek ezt mondják a &os;/ARM + portról

    -

    Amit a zenészek mondanak a FreeBSD/ARM-ról

    - -

    A FreeBSD/ARM segítségével élvezheti - a (beágyazott) rendszerébõl áradó - csendet. A Depeche Mode-nak is van egy "Enjoy The Silence" - címû dala:

    +

    A &os;/ARM segítségével élvezheti a + (beágyazott) rendszerébõl áradó + csendet. A Depeche Mode-nak is errõl szól az "Enjoy The + Silence" címû dala:

    All I ever wanted
 All I ever needed

==== //depot/projects/docproj_hu/www/hu/platforms/i386.sgml#4 (text+ko) ====

@@ -2,7 +2,7 @@
 
 
 
-
+
 
 ]>
 
@@ -17,50 +17,55 @@
 
   
    Bevezetés
    
 
-  
    Ez az oldal a FreeBSD/i386 platformról tartalmaz
-    néhány információt.  Ez az architektúra
-    támogatja a legtöbb processzort, hiszen a legtöbb otthoni
-    felhasználó ilyen számítógéppel
-    rendelkezik.  Ha Ön egy nagyobb PC gyártótól
-    (mint pl. Dell™, HP, vagy eMachines®) vásárolt
-    számítógépet, nagy az esély
-    rá, hogy számítógépe AMD™ vagy
+  
    Ez az oldal a &os;/i386 platformról tartalmaz
+    néhány információt.  Ez az
+    architektúra támogatja a legtöbb processzort,
+    hiszen a legtöbb otthoni felhasználó ilyen
+    számítógéppel rendelkezik.  Ha egy
+    nagyobb PC gyártótól (mint
+    például a Dell™, HP vagy eMachines®)
+    vásároltunk számítógépet,
+    nagy az esély rá, hogy a
+    számítógépünk AMD™ vagy
     Intel® processzorral rendelkezik, és így ebbe a
     kategóriába tartozik.
    
 
-  
    Tartalom
    
+  
    Tartalomjegyzék
    
 
   
 
+  
    Friss hírek
    
 
-  
    Friss Hírek
    
-
   
      
-    
    • A FreeBSD a 6.0 verziótól nem támogatja az
-      eredeti Intel 80386 processzort.  Ezek a processzorok több, mint
-      hét évesek és csak a FreeBSD 5.X és
-      korábbi verziói által támogatottak.
-      A GENERIC kernel csak 80386 processzorokat támogat a
-      FreeBSD 4.X és korábbi verzióiban.
      • 
+    
    • 
+      
      A &os; a 6.0 verziótól nem támogatja az
+	eredeti Intel 80386 processzort.  Ezek a processzorok több,
+	mint hét évesek és csak a &os; 5.X
+	és az azelõtti változatai
+	támogatták.  A &os; 4.X és korábbi
+	verziókban a GENERIC rendszermag csak 80386
+	processzorokat támogat.
      
+    
      • 
   
    
 
   
    Hardverlista
    
 
   
    A támogatott processzorok listája a FreeBSD/i386
-      Hardverjegyzetekben található.
    
+    href="&enbase;/releases/&rel.current;R/hardware.html#PROC-I386">&os;/i386 Hardverjegyzékében található.
    
 
-  
    Kapcsolódó Linkek
    
+  
    Kapcsolódó linkek
    
 
   
 
   &footer;

==== //depot/projects/docproj_hu/www/hu/platforms/ia64/index.xsl#4 (text+ko) ====

@@ -3,7 +3,7 @@
 
 
 
-
+
 
 ]>
 
@@ -39,7 +39,8 @@
 
 		McKinley die
 
-		
    Az ia64 levelezési lista archívumok keresése:
    
+		
    Keresés az ia64 levelezési lista
+		  archívumában:
    
 
 		
    
 		  
@@ -48,53 +49,57 @@
 		  
 		
    
 
-		
    Tartalom
    
+		
    Tartalomjegyzék
    
 
 		
 
 		
    Bevezetés
    
 
-		
    Ez az oldal az Intel IA-64 architektúrán -
-		  hivatalosan Intel Itanium® Processor Family (IPF) -
-		  futó FreeBSD portról tartalmaz
-		  információkat.  Ahogyan a port
-		  is, ezek az oldalak is fejlesztés alatt
-		  állnak.
    
+		
    Ez az oldal az Intel IA-64
+		  architektúrán — hivatalosan Intel
+		  Itanium® Processor Family (IPF) —
+		  futó &os; portról tartalmaz
+		  információkat.  Ahogyan a port is,
+		  úgy ez az oldal is folyamatos fejlesztés
+		  alatt áll.
    
 
-		
    Jelenlegi állapot
    
+		
    Helyzet
    
 
-		
    Az ia64 port még egy Tier 2 platformnak
-		  minõsül.  Ez azt jelenti, hogy nem teljesen
-		  támogatott a Security Officer, Release Engineer
-		  csapatok é a toolchain karbantartók
-		  által.  A gyakorlatban azonban a  Tier 1
-		  (teljesen támogatott) és Tier 2 platformok
-		  közt nem olyan nagy a különbség,
-		  amekkorának tûnik.  Sok szempontból az
-		  ia64 port egy Tier 1 platform.
-		  
    
-		  A fejlesztõk szemszögébõl azonban
-		  elõnyös, hogy az ia64 port hosszabb ideig marad
-		  Tier 2 platform.  Sok, az ABI-t érintõ
-		  változtatás van folyamatban, és a
-		  kompatibilitás megtartása nem ideális
-		  ebben a kezdeti szakaszban.
    
+		
    Az ia64 port jelenleg még Tier 2 platformnak
+		  minõsül.  Ez azt jelenti, hogy még
+		  nem támogatják teljes
+		  mértékben a Security Officer, Release
+		  Engineer csapatok és a toolchainek
+		  karbantartói sem.  A gyakorlatban azonban a
+		  Tier 1 (teljesen támogatott) és Tier 2
+		  szintû platformok közt nem olyan nagy a
+		  különbség, mint amekkorának
+		  elsõre tûnik.  Sok szempontból az
+		  ia64 port lényegében egy Tier 1
+		  szintû platform.  
    
+		  A fejlesztõk szemszögébõl
+		  azonban elõnyös, hogy az ia64 port hosszabb
+		  ideig marad Tier 2 platform.  Sok, az ABI-t
+		  érintõ változtatás van
+		  folyamatban, és a kompatibilitás
+		  feltétlen megtartása még nem
+		  célszerû ebben a kezdeti szakaszban.
    
 	       
 
 	      
    

==== //depot/projects/docproj_hu/www/hu/platforms/ia64/machines.sgml#5 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
-
+
 
 
 ]>
@@ -15,7 +15,7 @@
 
   &header;
 
-    
    Piacon lévõ
+    
    Forgalomban levõ
       számítógépek
    
 
     
    Ezen az oldalon megpróbáltuk

==== //depot/projects/docproj_hu/www/hu/platforms/ia64/refs.sgml#4 (text+ko) ====

@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 ]>
@@ -25,15 +25,16 @@
         Google
         
-        
+        
     
   
 
   
    
 
-  
    Referenciák
    
+  
    Hivatkozások
    
 
-  
    Ez az oldal fontos referenciaanyagok linkjeit gyûjti össze.
    
+  
    Ezen az oldalon a fontosabb refencia anyagok linkjeit
+    gyûjtöttük össze.
    
 
   
    Architektúra
    
 
@@ -55,7 +56,7 @@
     
   
 
-  
    Processzor Implementációk
    
+  
    Processzorimplementációk
    
 
   
      
     
    • Itanium (Merced)
@@ -70,7 +71,7 @@
     
      • 
   
    
 
-  
    Chipset
    
+  
    Chipkészletek
    
 
   
 
-  
    Futásidejû tudnivalók
    
+  
    Szoftveres tudnivalók