From owner-p4-projects@FreeBSD.ORG Sun Oct 21 00:01:47 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0C4316A421; Sun, 21 Oct 2007 00:01: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 5E9D516A417 for ; Sun, 21 Oct 2007 00:01:46 +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 14B2513C46B for ; Sun, 21 Oct 2007 00:01:46 +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 l9L01dU2075946 for ; Sun, 21 Oct 2007 00:01:39 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9L01dPf075943 for perforce@freebsd.org; Sun, 21 Oct 2007 00:01:39 GMT (envelope-from jb@freebsd.org) Date: Sun, 21 Oct 2007 00:01:39 GMT Message-Id: <200710210001.l9L01dPf075943@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 127865 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, 21 Oct 2007 00:01:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=127865 Change 127865 by jb@jb_freebsd8 on 2007/10/21 00:01:28 Remove some gcc4-isms that crept in. Affected files ... .. //depot/projects/dtrace6/src/share/mk/bsd.sys.mk#3 edit .. //depot/projects/dtrace6/src/share/mk/sys.mk#3 edit Differences ... ==== //depot/projects/dtrace6/src/share/mk/bsd.sys.mk#3 (text+ko) ==== @@ -51,9 +51,6 @@ # XXX always get it right. CWARNFLAGS += -Wno-uninitialized . endif -. if !defined(WITH_GCC3) -CWARNFLAGS += -Wno-pointer-sign -. endif . endif . if defined(FORMAT_AUDIT) ==== //depot/projects/dtrace6/src/share/mk/sys.mk#3 (text+ko) ==== @@ -57,7 +57,7 @@ .endif CXX ?= c++ -CXXFLAGS ?= ${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes:N-Wno-pointer-sign} +CXXFLAGS ?= ${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes} CPP ?= cpp From owner-p4-projects@FreeBSD.ORG Sun Oct 21 00:21:04 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 253EA16A421; Sun, 21 Oct 2007 00:21: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 ABCBD16A417 for ; Sun, 21 Oct 2007 00:21:03 +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 4F0CE13C468 for ; Sun, 21 Oct 2007 00:21:03 +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 l9L0L1wv078001 for ; Sun, 21 Oct 2007 00:21:01 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9L0L1Xf077998 for perforce@freebsd.org; Sun, 21 Oct 2007 00:21:01 GMT (envelope-from jb@freebsd.org) Date: Sun, 21 Oct 2007 00:21:01 GMT Message-Id: <200710210021.l9L0L1Xf077998@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 127866 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, 21 Oct 2007 00:21:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=127866 Change 127866 by jb@jb_freebsd8 on 2007/10/21 00:20:43 Reduce warns level. This version of GCC complains about setjmp/longjmp clobbering variables. NO_MAN instead of MK_MAN on RELENG_6. Affected files ... .. //depot/projects/dtrace6/src/cddl/usr.bin/ctfconvert/Makefile#2 edit Differences ... ==== //depot/projects/dtrace6/src/cddl/usr.bin/ctfconvert/Makefile#2 (text+ko) ==== @@ -29,7 +29,7 @@ traverse.c \ util.c -WARNS?= 6 +WARNS?= 3 CFLAGS+= -I${.CURDIR}/../../../contrib/libdwarf \ -I${.CURDIR}/../../../contrib \ @@ -48,6 +48,6 @@ .PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common .PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt -MK_MAN= no +NO_MAN= .include From owner-p4-projects@FreeBSD.ORG Sun Oct 21 00:22:03 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9211216A421; Sun, 21 Oct 2007 00:22: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 57FAB16A418 for ; Sun, 21 Oct 2007 00:22:03 +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 426DB13C455 for ; Sun, 21 Oct 2007 00:22:03 +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 l9L0M3NY078171 for ; Sun, 21 Oct 2007 00:22:03 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9L0M3sU078168 for perforce@freebsd.org; Sun, 21 Oct 2007 00:22:03 GMT (envelope-from jb@freebsd.org) Date: Sun, 21 Oct 2007 00:22:03 GMT Message-Id: <200710210022.l9L0M3sU078168@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 127867 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, 21 Oct 2007 00:22:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=127867 Change 127867 by jb@jb_freebsd8 on 2007/10/21 00:21:36 Fix a printf warning. Affected files ... .. //depot/projects/dtrace6/src/contrib/opensolaris/tools/ctf/dump/dump.c#2 edit Differences ... ==== //depot/projects/dtrace6/src/contrib/opensolaris/tools/ctf/dump/dump.c#2 (text+ko) ==== @@ -533,10 +533,10 @@ if (size >= CTF_LSTRUCT_THRESH) { for (i = 0; i < n; i++, u.lmp++) { (void) printf( - "\t%s type=%u off=%lu\n", + "\t%s type=%u off=%llu\n", ref_to_str(u.lmp->ctlm_name, hp, cd), u.lmp->ctlm_type, - CTF_LMEM_OFFSET(u.lmp)); + (unsigned long long) CTF_LMEM_OFFSET(u.lmp)); } } else { for (i = 0; i < n; i++, u.mp++) { From owner-p4-projects@FreeBSD.ORG Sun Oct 21 00:22:04 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0863A16A522; Sun, 21 Oct 2007 00:22: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 BA9FF16A4CF for ; Sun, 21 Oct 2007 00:22:03 +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 6A58913C459 for ; Sun, 21 Oct 2007 00:22:03 +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 l9L0M3tb078178 for ; Sun, 21 Oct 2007 00:22:03 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9L0M3F3078175 for perforce@freebsd.org; Sun, 21 Oct 2007 00:22:03 GMT (envelope-from jb@freebsd.org) Date: Sun, 21 Oct 2007 00:22:03 GMT Message-Id: <200710210022.l9L0M3F3078175@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 127868 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, 21 Oct 2007 00:22:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=127868 Change 127868 by jb@jb_freebsd8 on 2007/10/21 00:21:57 NO_MAN instead of MK_MAN on RELENG_6. Affected files ... .. //depot/projects/dtrace6/src/cddl/usr.bin/ctfmerge/Makefile#2 edit Differences ... ==== //depot/projects/dtrace6/src/cddl/usr.bin/ctfmerge/Makefile#2 (text+ko) ==== @@ -44,6 +44,6 @@ .PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common .PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt -MK_MAN= no +NO_MAN= .include From owner-p4-projects@FreeBSD.ORG Sun Oct 21 00:35:02 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3C7716A46C; Sun, 21 Oct 2007 00:35:01 +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 8782A16A417 for ; Sun, 21 Oct 2007 00:35:01 +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 2336013C465 for ; Sun, 21 Oct 2007 00:34:01 +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 l9L0WE0S078694 for ; Sun, 21 Oct 2007 00:32:14 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9L0WEaV078691 for perforce@freebsd.org; Sun, 21 Oct 2007 00:32:14 GMT (envelope-from jb@freebsd.org) Date: Sun, 21 Oct 2007 00:32:14 GMT Message-Id: <200710210032.l9L0WEaV078691@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 127869 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, 21 Oct 2007 00:35:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=127869 Change 127869 by jb@jb_freebsd1 on 2007/10/21 00:31:49 Fix the printf format warning here too. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/dump/dump.c#7 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/dump/dump.c#7 (text) ==== @@ -533,9 +533,10 @@ if (size >= CTF_LSTRUCT_THRESH) { for (i = 0; i < n; i++, u.lmp++) { (void) printf( - "\t%s type=%u off=%lu\n", + "\t%s type=%u off=%llu\n", ref_to_str(u.lmp->ctlm_name, hp, cd), u.lmp->ctlm_type, + (unsigned long long) CTF_LMEM_OFFSET(u.lmp)); } } else { From owner-p4-projects@FreeBSD.ORG Sun Oct 21 00:52:43 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22A6416A419; Sun, 21 Oct 2007 00:52: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 D16BE16A417 for ; Sun, 21 Oct 2007 00:52:42 +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 A36E413C43E for ; Sun, 21 Oct 2007 00:52:42 +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 l9L0qggI088539 for ; Sun, 21 Oct 2007 00:52:42 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9L0qfSa088534 for perforce@freebsd.org; Sun, 21 Oct 2007 00:52:41 GMT (envelope-from jb@freebsd.org) Date: Sun, 21 Oct 2007 00:52:41 GMT Message-Id: <200710210052.l9L0qfSa088534@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 127871 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, 21 Oct 2007 00:52:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=127871 Change 127871 by jb@jb_freebsd1 on 2007/10/21 00:51:57 Remove an unnecessary include. Affected files ... .. //depot/projects/dtrace/src/sys/kern/init_main.c#15 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/init_main.c#15 (text+ko) ==== @@ -60,7 +60,6 @@ #include #include #include -#include #include #include #include From owner-p4-projects@FreeBSD.ORG Sun Oct 21 00:53:44 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A483316A421; Sun, 21 Oct 2007 00:53: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 5F81216A41B for ; Sun, 21 Oct 2007 00:53:44 +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 0338313C455 for ; Sun, 21 Oct 2007 00:53:44 +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 l9L0rhbB088558 for ; Sun, 21 Oct 2007 00:53:43 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9L0rh4Q088555 for perforce@freebsd.org; Sun, 21 Oct 2007 00:53:43 GMT (envelope-from jb@freebsd.org) Date: Sun, 21 Oct 2007 00:53:43 GMT Message-Id: <200710210053.l9L0rh4Q088555@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 127872 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, 21 Oct 2007 00:53:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=127872 Change 127872 by jb@jb_freebsd1 on 2007/10/21 00:52:58 Comment out a probe until I have a BSD implementation. Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_fork.c#16 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_fork.c#16 (text+ko) ==== @@ -65,7 +65,6 @@ #include #include #include -#include #include #include @@ -688,7 +687,9 @@ p2->p_state = PRS_NORMAL; PROC_SUNLOCK(p2); +#ifdef DOODAD DTRACE_PROBE1(__proc_create, proc *, p2); +#endif /* * If RFSTOPPED not requested, make child runnable and add to From owner-p4-projects@FreeBSD.ORG Sun Oct 21 04:00:12 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2876C16A41B; Sun, 21 Oct 2007 04:00: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 AD9FA16A418 for ; Sun, 21 Oct 2007 04:00:09 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9FBB813C459 for ; Sun, 21 Oct 2007 04:00:09 +0000 (UTC) (envelope-from kmacy@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 l9L409Kn002607 for ; Sun, 21 Oct 2007 04:00:09 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9L409ai002604 for perforce@freebsd.org; Sun, 21 Oct 2007 04:00:09 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 21 Oct 2007 04:00:09 GMT Message-Id: <200710210400.l9L409ai002604@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127877 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, 21 Oct 2007 04:00:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=127877 Change 127877 by kmacy@kmacy_home:ethng on 2007/10/21 04:00:00 add remaining iw_cxgb3 driver bits and shim in genalloc api Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_osdep.h#16 edit .. //depot/projects/ethng/src/sys/dev/cxgb/sys/cxgb_support.c#5 edit .. //depot/projects/ethng/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_dbg.c#1 add .. //depot/projects/ethng/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_hal.h#4 edit .. //depot/projects/ethng/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_resource.c#1 add .. //depot/projects/ethng/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cq.c#1 add .. //depot/projects/ethng/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_ev.c#1 add .. //depot/projects/ethng/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_mem.c#1 add .. //depot/projects/ethng/src/sys/modules/cxgb/iw_cxgb/Makefile#6 edit Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_osdep.h#16 (text+ko) ==== @@ -169,6 +169,9 @@ struct mtx mr_lock; }; +struct buf_ring *buf_ring_alloc(int count, int flags); +void buf_ring_free(struct buf_ring *); + static __inline int buf_ring_count(struct buf_ring *mr) { ==== //depot/projects/ethng/src/sys/dev/cxgb/sys/cxgb_support.c#5 (text+ko) ==== @@ -299,3 +299,26 @@ uma_zfree(zone, vec[i]); } +struct buf_ring * +buf_ring_alloc(int count, int flags) +{ + struct buf_ring *br; + + KASSERT(powerof2(count), ("buf ring must be size power of 2")); + + br = malloc(sizeof(struct buf_ring), M_DEVBUF, flags|M_ZERO); + if (br == NULL) + return (NULL); + + br->mr_ring = malloc(sizeof(caddr_t)*count, M_DEVBUF, flags|M_ZERO); + if (br->mr_ring == NULL) { + free(br, M_DEVBUF); + return (NULL); + } + + mtx_init(&br->mr_lock, "buf ring", NULL, MTX_DUPOK|MTX_DEF); + br->br_size = count; + br->br_prod = br->br_cons = 0; + + return (br); +} ==== //depot/projects/ethng/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_hal.h#4 (text+ko) ==== @@ -36,14 +36,14 @@ }; struct cxio_hal_resource { - struct kfifo *tpt_fifo; - spinlock_t tpt_fifo_lock; - struct kfifo *qpid_fifo; - spinlock_t qpid_fifo_lock; - struct kfifo *cqid_fifo; - spinlock_t cqid_fifo_lock; - struct kfifo *pdid_fifo; - spinlock_t pdid_fifo_lock; + struct buf_ring *tpt_fifo; + struct mtx tpt_fifo_lock; + struct buf_ring *qpid_fifo; + struct mtx qpid_fifo_lock; + struct buf_ring *cqid_fifo; + struct mtx cqid_fifo_lock; + struct buf_ring *pdid_fifo; + struct mtx pdid_fifo_lock; }; struct cxio_qpid { @@ -214,4 +214,64 @@ #define PAGE_ALIGN(x) roundup2((x), PAGE_SIZE) +#include +struct gen_pool { + blist_t gen_list; + daddr_t gen_base; + int gen_chunk_shift; +}; + +static __inline struct gen_pool * +gen_pool_create(daddr_t base, u_int chunk_shift, u_int len) +{ + struct gen_pool *gp; + + gp = malloc(sizeof(struct gen_pool), M_DEVBUF, M_NOWAIT); + if (gp == NULL) + return (NULL); + + gp->gen_list = blist_create(len >> chunk_shift); + if (gp->gen_list == NULL) { + free(gp, M_DEVBUF); + return (NULL); + } + gp->gen_base = base; + gp->gen_chunk_shift = chunk_shift; + + return (gp); +} + +static __inline unsigned long +gen_pool_alloc(struct gen_pool *gp, int size) +{ + int chunks; + daddr_t blkno; + + chunks = size >> gp->gen_chunk_shift; + blkno = blist_alloc(gp->gen_list, chunks); + + if (blkno == SWAPBLK_NONE) + return (0); + + return (gp->gen_base + blkno); +} + +static __inline void +gen_pool_free(struct gen_pool *gp, daddr_t address, int size) +{ + int chunks; + daddr_t blkno; + + chunks = size >> gp->gen_chunk_shift; + blkno = address - gp->gen_base; + blist_free(gp->gen_list, blkno, chunks); +} + +static __inline void +gen_pool_destroy(struct gen_pool *gp) +{ + blist_destroy(gp->gen_list); + free(gp, M_DEVBUF); +} + #endif ==== //depot/projects/ethng/src/sys/modules/cxgb/iw_cxgb/Makefile#6 (text+ko) ==== @@ -5,7 +5,8 @@ KMOD= iw_cxgb SRCS= iw_cxgb_iwch.c iw_cxgb_iwch_cm.c iw_cxgb_cxio_hal.c -SRCS+= iw_cxgb_iwch_provider.c iw_cxgb_iwch_qp.c +SRCS+= iw_cxgb_iwch_provider.c iw_cxgb_iwch_qp.c iw_cxgb_cxio_resource.c +SRCS+= iw_cxgb_iwch_ev.c iw_cxgb_iwch_mem.c iw_cxgb_cxio_dbg.c iw_cxgb_iwch_cq.c SRCS+= bus_if.h device_if.h opt_sched.h pci_if.h pcib_if.h CFLAGS+= -DCONFIG_CHELSIO_T3_CORE -g -DCONFIG_DEFINED -I${CXGB} -DSMP From owner-p4-projects@FreeBSD.ORG Sun Oct 21 04:29:45 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24C3416A420; Sun, 21 Oct 2007 04:29: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 95D0216A418 for ; Sun, 21 Oct 2007 04:29:43 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5402B13C447 for ; Sun, 21 Oct 2007 04:29:43 +0000 (UTC) (envelope-from kmacy@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 l9L4Th6W005464 for ; Sun, 21 Oct 2007 04:29:43 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9L4Tgka005461 for perforce@freebsd.org; Sun, 21 Oct 2007 04:29:42 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 21 Oct 2007 04:29:42 GMT Message-Id: <200710210429.l9L4Tgka005461@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127880 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, 21 Oct 2007 04:29:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=127880 Change 127880 by kmacy@kmacy_home:ethng on 2007/10/21 04:29:30 change buf_ring member names to be prefixed by br_ Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_multiq.c#26 edit .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_osdep.h#17 edit .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_sge.c#35 edit .. //depot/projects/ethng/src/sys/dev/cxgb/sys/cxgb_support.c#6 edit .. //depot/projects/ethng/src/sys/dev/cxgb/t3cdev.h#2 edit Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_multiq.c#26 (text+ko) ==== @@ -128,19 +128,19 @@ txq = &qs->txq[TXQ_ETH]; mr = &txq->txq_mr; - mtx_lock(&mr->mr_lock); - cons = mr->mr_cons; - prod = mr->mr_prod; - mask = mr->mr_size - 1; + mtx_lock(&mr->br_lock); + cons = mr->br_cons; + prod = mr->br_prod; + mask = mr->br_size - 1; if (((prod + 1) & mask) != cons) { - mr->mr_ring[prod] = (caddr_t)m; + mr->br_ring[prod] = (caddr_t)m; mb(); - mr->mr_prod = (prod + 1) & mask; + mr->br_prod = (prod + 1) & mask; } else { txq->txq_drops++; err = ENOBUFS; } - mtx_unlock(&mr->mr_lock); + mtx_unlock(&mr->br_lock); if ((qs->txq[TXQ_ETH].flags & TXQ_TRANSMITTING) == 0) wakeup(qs); if (err) @@ -613,8 +613,8 @@ if ((!buf_ring_empty(&txq->txq_mr)) && err == 0) { if (cxgb_debug) printf("head=%p cons=%d prod=%d\n", - txq->sendq.head, txq->txq_mr.mr_cons, - txq->txq_mr.mr_prod); + txq->sendq.head, txq->txq_mr.br_cons, + txq->txq_mr.br_prod); continue; } done: ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_osdep.h#17 (text+ko) ==== @@ -162,11 +162,11 @@ #endif struct buf_ring { - caddr_t *mr_ring; - volatile uint32_t mr_cons; - volatile uint32_t mr_prod; - int mr_size; - struct mtx mr_lock; + caddr_t *br_ring; + volatile uint32_t br_cons; + volatile uint32_t br_prod; + int br_size; + struct mtx br_lock; }; struct buf_ring *buf_ring_alloc(int count, int flags); @@ -175,16 +175,16 @@ static __inline int buf_ring_count(struct buf_ring *mr) { - int size = mr->mr_size; + int size = mr->br_size; int mask = size - 1; - return ((size + mr->mr_prod - mr->mr_cons) & mask); + return ((size + mr->br_prod - mr->br_cons) & mask); } static __inline int buf_ring_empty(struct buf_ring *mr) { - return (mr->mr_cons == mr->mr_prod); + return (mr->br_cons == mr->br_prod); } /* @@ -198,14 +198,14 @@ int prod, cons, mask; caddr_t *ring, m; - ring = (caddr_t *)mr->mr_ring; - mask = mr->mr_size - 1; - cons = mr->mr_cons; - prod = mr->mr_prod; + ring = (caddr_t *)mr->br_ring; + mask = mr->br_size - 1; + cons = mr->br_cons; + prod = mr->br_prod; m = NULL; if (cons != prod) { m = ring[cons]; - mr->mr_cons = (cons + 1) & mask; + mr->br_cons = (cons + 1) & mask; mb(); } return (m); @@ -218,13 +218,13 @@ int prod, cons, mask, err; - cons = mr->mr_cons; - prod = mr->mr_prod; - mask = mr->mr_size - 1; + cons = mr->br_cons; + prod = mr->br_prod; + mask = mr->br_size - 1; if (((prod + 1) & mask) != cons) { - mr->mr_ring[prod] = m; + mr->br_ring[prod] = m; mb(); - mr->mr_prod = (prod + 1) & mask; + mr->br_prod = (prod + 1) & mask; err = 0; } else err = ENOBUFS; @@ -237,9 +237,9 @@ { int err; - mtx_lock(&mr->mr_lock); + mtx_lock(&mr->br_lock); err = __buf_ring_enqueue(mr, m); - mtx_unlock(&mr->mr_lock); + mtx_unlock(&mr->br_lock); return (err); } @@ -250,10 +250,10 @@ int prod, cons, mask; caddr_t *ring, m; - ring = (caddr_t *)mr->mr_ring; - mask = mr->mr_size - 1; - cons = mr->mr_cons; - prod = mr->mr_prod; + ring = (caddr_t *)mr->br_ring; + mask = mr->br_size - 1; + cons = mr->br_cons; + prod = mr->br_prod; m = NULL; if (cons != prod) m = ring[cons]; ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_sge.c#35 (text+ko) ==== @@ -1707,9 +1707,9 @@ t3_free_tx_desc_all(&q->txq[TXQ_ETH]); for (i = 0; i < SGE_TXQ_PER_SET; i++) - if (q->txq[i].txq_mr.mr_ring != NULL) { - free(q->txq[i].txq_mr.mr_ring, M_DEVBUF); - mtx_destroy(&q->txq[i].txq_mr.mr_lock); + if (q->txq[i].txq_mr.br_ring != NULL) { + free(q->txq[i].txq_mr.br_ring, M_DEVBUF); + mtx_destroy(&q->txq[i].txq_mr.br_lock); } for (i = 0; i < SGE_RXQ_PER_SET; ++i) { if (q->fl[i].desc) { @@ -2259,14 +2259,14 @@ int i, ret = 0; for (i = 0; i < SGE_TXQ_PER_SET; i++) { - if ((q->txq[i].txq_mr.mr_ring = malloc(cxgb_txq_buf_ring_size*sizeof(struct mbuf *), + if ((q->txq[i].txq_mr.br_ring = malloc(cxgb_txq_buf_ring_size*sizeof(struct mbuf *), M_DEVBUF, M_WAITOK|M_ZERO)) == NULL) { device_printf(sc->dev, "failed to allocate mbuf ring\n"); goto err; } - q->txq[i].txq_mr.mr_prod = q->txq[i].txq_mr.mr_cons = 0; - q->txq[i].txq_mr.mr_size = cxgb_txq_buf_ring_size; - mtx_init(&q->txq[i].txq_mr.mr_lock, "txq mbuf ring", NULL, MTX_DEF); + q->txq[i].txq_mr.br_prod = q->txq[i].txq_mr.br_cons = 0; + q->txq[i].txq_mr.br_size = cxgb_txq_buf_ring_size; + mtx_init(&q->txq[i].txq_mr.br_lock, "txq mbuf ring", NULL, MTX_DEF); } init_qset_cntxt(q, id); @@ -3160,10 +3160,10 @@ CTLFLAG_RD, &qs->txq[TXQ_ETH].sendq.qlen, 0, "#tunneled packets waiting to be sent"); SYSCTL_ADD_UINT(ctx, qspoidlist, OID_AUTO, "queue_pidx", - CTLFLAG_RD, (uint32_t *)(uintptr_t)&qs->txq[TXQ_ETH].txq_mr.mr_prod, + CTLFLAG_RD, (uint32_t *)(uintptr_t)&qs->txq[TXQ_ETH].txq_mr.br_prod, 0, "#tunneled packets queue producer index"); SYSCTL_ADD_UINT(ctx, qspoidlist, OID_AUTO, "queue_cidx", - CTLFLAG_RD, (uint32_t *)(uintptr_t)&qs->txq[TXQ_ETH].txq_mr.mr_cons, + CTLFLAG_RD, (uint32_t *)(uintptr_t)&qs->txq[TXQ_ETH].txq_mr.br_cons, 0, "#tunneled packets queue consumer index"); SYSCTL_ADD_INT(ctx, qspoidlist, OID_AUTO, "processed", CTLFLAG_RD, &qs->txq[TXQ_ETH].processed, ==== //depot/projects/ethng/src/sys/dev/cxgb/sys/cxgb_support.c#6 (text+ko) ==== @@ -310,13 +310,13 @@ if (br == NULL) return (NULL); - br->mr_ring = malloc(sizeof(caddr_t)*count, M_DEVBUF, flags|M_ZERO); - if (br->mr_ring == NULL) { + br->br_ring = malloc(sizeof(caddr_t)*count, M_DEVBUF, flags|M_ZERO); + if (br->br_ring == NULL) { free(br, M_DEVBUF); return (NULL); } - mtx_init(&br->mr_lock, "buf ring", NULL, MTX_DUPOK|MTX_DEF); + mtx_init(&br->br_lock, "buf ring", NULL, MTX_DUPOK|MTX_DEF); br->br_size = count; br->br_prod = br->br_cons = 0; ==== //depot/projects/ethng/src/sys/dev/cxgb/t3cdev.h#2 (text+ko) ==== @@ -17,8 +17,8 @@ char name[T3CNAMSIZ]; /* T3C device name */ enum t3ctype type; TAILQ_ENTRY(t3cdev) ofld_entry; /* for list linking */ - struct ifnet *lldev; /* LL dev associated with T3C messages */ - struct adapter *adapter; + struct ifnet *lldev; /* LL dev associated with T3C messages */ + struct adapter *adapter; int (*send)(struct t3cdev *dev, struct mbuf *m); int (*recv)(struct t3cdev *dev, struct mbuf **m, int n); int (*ctl)(struct t3cdev *dev, unsigned int req, void *data); From owner-p4-projects@FreeBSD.ORG Sun Oct 21 11:56:14 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F09916A468; Sun, 21 Oct 2007 11:56:14 +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 C2EEE16A418 for ; Sun, 21 Oct 2007 11:56:13 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A619813C49D for ; Sun, 21 Oct 2007 11:56:13 +0000 (UTC) (envelope-from zec@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 l9LBuDod055955 for ; Sun, 21 Oct 2007 11:56:13 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9LBuDMd055952 for perforce@freebsd.org; Sun, 21 Oct 2007 11:56:13 GMT (envelope-from zec@FreeBSD.org) Date: Sun, 21 Oct 2007 11:56:13 GMT Message-Id: <200710211156.l9LBuDMd055952@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 127888 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, 21 Oct 2007 11:56:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=127888 Change 127888 by zec@zec_tca51 on 2007/10/21 11:55:17 Attempt to fix per-procgroup system load average accounting and computation, for options VIMAGE + options SCHED_ULE + options SMP builds. So far this seems to work OK on a hyperthreaded CPU with a single core (a Pentium 4), but needs yet to be tested on true multicore / multiprocessor systems. NB per-procgroup system load avg accounting works OK with SCHED_4BSD on both UP and SMP builds. Affected files ... .. //depot/projects/vimage/src/sys/kern/sched_ule.c#17 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#46 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/sched_ule.c#17 (text+ko) ==== @@ -483,12 +483,15 @@ (ts->ts_thread->td_proc->p_flag & P_NOLOAD) == 0) { #ifdef SMP tdq->tdq_group->tdg_load++; -#else +#ifdef VIMAGE + V_tdq_sysload[TDG_ID(tdq->tdq_group)]++; +#endif +#else /* !SMP */ tdq->tdq_sysload++; -#endif #ifdef VIMAGE - V_tdq_load[curcpu]++; + V_tdq_sysload[0]++; #endif +#endif /* SMP */ } } @@ -512,12 +515,15 @@ (ts->ts_thread->td_proc->p_flag & P_NOLOAD) == 0) { #ifdef SMP tdq->tdq_group->tdg_load--; -#else +#ifdef VIMAGE + V_tdq_sysload[TDG_ID(tdq->tdq_group)]--; +#endif +#else /* !SMP */ tdq->tdq_sysload--; -#endif #ifdef VIMAGE - V_tdq_load[curcpu]--; + V_tdq_sysload[0]--; #endif +#endif /* SMP */ } KASSERT(tdq->tdq_load != 0, ("tdq_load_rem: Removing with 0 load on queue %d", TDQ_ID(tdq))); @@ -2613,26 +2619,34 @@ #ifndef VIMAGE total += TDQ_GROUP(i)->tdg_load; #else - total += V_tdg_load[i]; + total += V_tdq_sysload[i]; #endif return (total); -#else +#else /* !SMP */ #ifndef VIMAGE return (TDQ_SELF()->tdq_sysload); #else - return (V_tdq_load[0]); + return (V_tdq_sysload[0]); #endif -#endif +#endif /* SMP */ } #ifdef VIMAGE void sched_load_reassign(struct vprocg *old, struct vprocg *new) { +#ifdef SMP + int tdg_id; + critical_enter(); - old->_tdq_load[curcpu]--; - new->_tdq_load[curcpu]++; + tdg_id = TDG_ID(tdq_cpu[curcpu].tdq_group); + old->_tdq_sysload[tdg_id]--; + new->_tdq_sysload[tdg_id]++; critical_exit(); +#else + old->_tdq_sysload[0]--; + new->_tdq_sysload[0]++; +#endif } #endif ==== //depot/projects/vimage/src/sys/sys/vimage.h#46 (text+ko) ==== @@ -324,7 +324,7 @@ #define V_morphing_symlinks VPROCG(morphing_symlinks) #define V_averunnable VPROCG(averunnable) #define V_sched_tdcnt VPROCG(sched_tdcnt) -#define V_tdq_load VPROCG(tdq_load) +#define V_tdq_sysload VPROCG(tdq_sysload) #define V_acc_statcalls VCPU(acc_statcalls) #define V_avg1_fixp VCPU(avg1_fixp) @@ -407,7 +407,7 @@ struct loadavg _averunnable; /* from kern/kern_synch.c */ int _sched_tdcnt; /* from kern/sched_4bsd.c */ - int _tdq_load[32]; /* XXX MAXCPUS from kern/sched_ule.c (SMP) */ + int _tdq_sysload[32]; /* XXX MAXCPUS from kern/sched_ule.c (SMP) */ #if 0 u_int proc_limit; /* max. number of processes */ From owner-p4-projects@FreeBSD.ORG Sun Oct 21 13:06:31 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 098AF16A418; Sun, 21 Oct 2007 13:06: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 79C0116A420 for ; Sun, 21 Oct 2007 13:06:30 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 47A1613C48D for ; Sun, 21 Oct 2007 13:06:30 +0000 (UTC) (envelope-from zec@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 l9LD6U4g072668 for ; Sun, 21 Oct 2007 13:06:30 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9LD6U2m072665 for perforce@freebsd.org; Sun, 21 Oct 2007 13:06:30 GMT (envelope-from zec@FreeBSD.org) Date: Sun, 21 Oct 2007 13:06:30 GMT Message-Id: <200710211306.l9LD6U2m072665@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 127889 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, 21 Oct 2007 13:06:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=127889 Change 127889 by zec@zec_tpx32 on 2007/10/21 13:05:36 Prevent benign yet annoying vnet stacking messages from being printed on console on 802.11 ifnet state changes. Affected files ... .. //depot/projects/vimage/src/sys/net/rtsock.c#10 edit .. //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.c#5 edit Differences ... ==== //depot/projects/vimage/src/sys/net/rtsock.c#10 (text+ko) ==== @@ -1036,9 +1036,7 @@ if (m->m_flags & M_PKTHDR) m->m_pkthdr.len += data_len; mtod(m, struct if_announcemsghdr *)->ifan_msglen += data_len; - CURVNET_SET(ifp->if_vnet); rt_dispatch(m, NULL); - CURVNET_RESTORE(); } } ==== //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.c#5 (text+ko) ==== @@ -26,6 +26,8 @@ #include __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_freebsd.c,v 1.16 2007/08/26 11:32:56 sephe Exp $"); +#include "opt_vimage.h" + /* * IEEE 802.11 support (FreeBSD-specific code) */ @@ -37,8 +39,8 @@ #include #include #include - #include +#include #include #include @@ -275,6 +277,7 @@ struct ifnet *ifp = ic->ic_ifp; struct ieee80211_join_event iev; + CURVNET_SET(ifp->if_vnet); memset(&iev, 0, sizeof(iev)); if (ni == ic->ic_bss) { IEEE80211_ADDR_COPY(iev.iev_addr, ni->ni_bssid); @@ -288,6 +291,7 @@ RTM_IEEE80211_JOIN : RTM_IEEE80211_REJOIN, &iev, sizeof(iev)); } + CURVNET_RESTORE(); } void @@ -296,6 +300,7 @@ struct ifnet *ifp = ic->ic_ifp; struct ieee80211_leave_event iev; + CURVNET_SET_QUIET(ifp->if_vnet); if (ni == ic->ic_bss) { rt_ieee80211msg(ifp, RTM_IEEE80211_DISASSOC, NULL, 0); if_link_state_change(ifp, LINK_STATE_DOWN); @@ -305,6 +310,7 @@ IEEE80211_ADDR_COPY(iev.iev_addr, ni->ni_macaddr); rt_ieee80211msg(ifp, RTM_IEEE80211_LEAVE, &iev, sizeof(iev)); } + CURVNET_RESTORE(); } void @@ -315,7 +321,9 @@ IEEE80211_DPRINTF(ic, IEEE80211_MSG_SCAN, "%s\n", "notify scan done"); /* dispatch wireless event indicating scan completed */ + CURVNET_SET(ifp->if_vnet); rt_ieee80211msg(ifp, RTM_IEEE80211_SCAN, NULL, 0); + CURVNET_RESTORE(); } void @@ -343,7 +351,9 @@ iev.iev_keyix = k->wk_keyix; iev.iev_keyrsc = k->wk_keyrsc; iev.iev_rsc = rsc; + CURVNET_SET(ifp->if_vnet); rt_ieee80211msg(ifp, RTM_IEEE80211_REPLAY, &iev, sizeof(iev)); + CURVNET_RESTORE(); } } @@ -365,7 +375,9 @@ IEEE80211_ADDR_COPY(iev.iev_src, wh->i_addr2); iev.iev_cipher = IEEE80211_CIPHER_TKIP; iev.iev_keyix = keyix; + CURVNET_SET(ifp->if_vnet); rt_ieee80211msg(ifp, RTM_IEEE80211_MICHAEL, &iev, sizeof(iev)); + CURVNET_RESTORE(); } } From owner-p4-projects@FreeBSD.ORG Sun Oct 21 20:30:06 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5411116A421; Sun, 21 Oct 2007 20:30: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 0210416A419 for ; Sun, 21 Oct 2007 20:30:06 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 02CB313C481 for ; Sun, 21 Oct 2007 20:30:06 +0000 (UTC) (envelope-from kmacy@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 l9LKU5Eg035121 for ; Sun, 21 Oct 2007 20:30:05 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9LKU1No035067 for perforce@freebsd.org; Sun, 21 Oct 2007 20:30:01 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 21 Oct 2007 20:30:01 GMT Message-Id: <200710212030.l9LKU1No035067@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127902 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, 21 Oct 2007 20:30:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=127902 Change 127902 by kmacy@kmacy_home:ethng on 2007/10/21 20:29:39 IFC 127901 Affected files ... .. //depot/projects/ethng/src/Makefile#2 integrate .. //depot/projects/ethng/src/UPDATING#5 integrate .. //depot/projects/ethng/src/contrib/ipfilter/BSD/Makefile#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/BSD/kupgrade#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/HISTORY#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/Makefile#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/ip_fil.c#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/iplang/Makefile#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/ipsend/iptests.c#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/ipsend/sock.c#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/l4check/Makefile#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/l4check/l4check.c#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/lib/Makefile#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/lib/alist_new.c#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/lib/ipft_tx.c#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/lib/printnat.c#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/lib/printpacket.c#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/lib/printpool_live.c#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/lib/printstate.c#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/man/ippool.5#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/md5.h#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/radix.c#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/radix_ipf.h#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/test/Makefile#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/test/dotest#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/test/expected/Makefile#1 branch .. //depot/projects/ethng/src/contrib/ipfilter/test/expected/f11#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/test/expected/f24#1 branch .. //depot/projects/ethng/src/contrib/ipfilter/test/expected/i19.dist#1 branch .. //depot/projects/ethng/src/contrib/ipfilter/test/expected/i21#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/test/expected/in1#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/test/expected/in6#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/test/expected/ipv6.6#1 branch .. //depot/projects/ethng/src/contrib/ipfilter/test/expected/n16#1 branch .. //depot/projects/ethng/src/contrib/ipfilter/test/input/f11#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/test/input/f24#1 branch .. //depot/projects/ethng/src/contrib/ipfilter/test/input/ipv6.6#1 branch .. //depot/projects/ethng/src/contrib/ipfilter/test/input/l1#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/test/input/n16#1 branch .. //depot/projects/ethng/src/contrib/ipfilter/test/nattest#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/test/regress/f24#1 branch .. //depot/projects/ethng/src/contrib/ipfilter/test/regress/i21#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/test/regress/i3#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/test/regress/in1#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/test/regress/in6#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/test/regress/ipv6.6#1 branch .. //depot/projects/ethng/src/contrib/ipfilter/test/regress/n16#1 branch .. //depot/projects/ethng/src/contrib/ipfilter/test/test.format#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/tools/ipf_y.y#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/tools/ipfstat.c#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/tools/ipmon.c#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/tools/ipnat.c#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/tools/ipnat_y.y#2 integrate .. //depot/projects/ethng/src/contrib/ipfilter/tools/lexer.c#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/pcap.h#3 integrate .. //depot/projects/ethng/src/crypto/heimdal/appl/su/Makefile.am#2 integrate .. //depot/projects/ethng/src/crypto/heimdal/appl/su/su.c#2 integrate .. //depot/projects/ethng/src/crypto/openssl/ssl/d1_both.c#2 integrate .. //depot/projects/ethng/src/crypto/openssl/ssl/dtls1.h#2 integrate .. //depot/projects/ethng/src/crypto/openssl/ssl/ssl.h#2 integrate .. //depot/projects/ethng/src/crypto/openssl/ssl/ssl_err.c#2 integrate .. //depot/projects/ethng/src/etc/Makefile#4 integrate .. //depot/projects/ethng/src/etc/cached.conf#2 delete .. //depot/projects/ethng/src/etc/nscd.conf#1 branch .. //depot/projects/ethng/src/etc/rc.d/amd#2 integrate .. //depot/projects/ethng/src/etc/rc.d/kerberos#2 integrate .. //depot/projects/ethng/src/etc/rc.d/ppp#3 integrate .. //depot/projects/ethng/src/games/fortune/datfiles/fortunes#2 integrate .. //depot/projects/ethng/src/games/fortune/datfiles/fortunes-o.real#2 integrate .. //depot/projects/ethng/src/games/fortune/datfiles/limerick#2 integrate .. //depot/projects/ethng/src/kerberos5/usr.bin/ksu/Makefile#2 integrate .. //depot/projects/ethng/src/lib/libbsm/Makefile#2 integrate .. //depot/projects/ethng/src/lib/libc/arm/Symbol.map#2 integrate .. //depot/projects/ethng/src/lib/libc/ia64/Symbol.map#2 integrate .. //depot/projects/ethng/src/lib/libc/net/nscache.c#2 integrate .. //depot/projects/ethng/src/lib/libc/powerpc/Symbol.map#2 integrate .. //depot/projects/ethng/src/lib/libc/stdlib/atoi.3#2 integrate .. //depot/projects/ethng/src/lib/libelf/elf.3#2 integrate .. //depot/projects/ethng/src/lib/libelf/gelf_getphdr.3#2 integrate .. //depot/projects/ethng/src/lib/libelf/gelf_newphdr.3#2 integrate .. //depot/projects/ethng/src/lib/libpam/modules/pam_unix/Makefile#2 integrate .. //depot/projects/ethng/src/lib/libstand/tftp.c#2 integrate .. //depot/projects/ethng/src/lib/ncurses/ncurses/Makefile#2 integrate .. //depot/projects/ethng/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#8 integrate .. //depot/projects/ethng/src/sbin/geom/class/part/geom_part.c#2 integrate .. //depot/projects/ethng/src/sbin/geom/class/part/gpart.8#2 integrate .. //depot/projects/ethng/src/sbin/ipfw/ipfw.8#3 integrate .. //depot/projects/ethng/src/sbin/ipfw/ipfw2.c#4 integrate .. //depot/projects/ethng/src/sbin/mount/mount.8#2 integrate .. //depot/projects/ethng/src/share/man/man5/nsswitch.conf.5#2 integrate .. //depot/projects/ethng/src/share/man/man5/src.conf.5#4 integrate .. //depot/projects/ethng/src/share/man/man9/kproc.9#1 branch .. //depot/projects/ethng/src/share/man/man9/kthread.9#2 integrate .. //depot/projects/ethng/src/share/mk/bsd.compat.mk#3 integrate .. //depot/projects/ethng/src/share/mk/bsd.lib.mk#2 integrate .. //depot/projects/ethng/src/share/mk/bsd.own.mk#3 integrate .. //depot/projects/ethng/src/share/mk/bsd.symver.mk#2 integrate .. //depot/projects/ethng/src/share/mk/version_gen.awk#2 integrate .. //depot/projects/ethng/src/share/termcap/termcap.src#2 integrate .. //depot/projects/ethng/src/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/ethng/src/sys/arm/arm/cpufunc.c#3 integrate .. //depot/projects/ethng/src/sys/arm/arm/cpufunc_asm_arm11.S#1 branch .. //depot/projects/ethng/src/sys/arm/arm/cpufunc_asm_armv5.S#1 branch .. //depot/projects/ethng/src/sys/arm/arm/cpufunc_asm_armv5_ec.S#1 branch .. //depot/projects/ethng/src/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/ethng/src/sys/arm/at91/at91_mcireg.h#2 integrate .. //depot/projects/ethng/src/sys/arm/include/armreg.h#2 integrate .. //depot/projects/ethng/src/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/ethng/src/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/ethng/src/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/ethng/src/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/ethng/src/sys/compat/opensolaris/sys/proc.h#3 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_htable.c#2 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_lookup.c#2 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_lookup.h#2 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_pool.c#2 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_pool.h#2 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate .. //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate .. //depot/projects/ethng/src/sys/contrib/pf/net/pf.c#3 integrate .. //depot/projects/ethng/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/ethng/src/sys/dev/aac/aac.c#3 integrate .. //depot/projects/ethng/src/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/ethng/src/sys/dev/aic7xxx/aic_osm_lib.c#2 integrate .. //depot/projects/ethng/src/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate .. //depot/projects/ethng/src/sys/dev/bktr/msp34xx.c#2 integrate .. //depot/projects/ethng/src/sys/dev/ciss/ciss.c#4 integrate .. //depot/projects/ethng/src/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/ethng/src/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/ethng/src/sys/dev/flash/at45d.c#2 integrate .. //depot/projects/ethng/src/sys/dev/hptmv/entry.c#2 integrate .. //depot/projects/ethng/src/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/ethng/src/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/ethng/src/sys/dev/ipmi/ipmi_kcs.c#2 integrate .. //depot/projects/ethng/src/sys/dev/ipmi/ipmi_smic.c#2 integrate .. //depot/projects/ethng/src/sys/dev/ipmi/ipmi_ssif.c#2 integrate .. //depot/projects/ethng/src/sys/dev/iscsi/initiator/isc_sm.c#2 integrate .. //depot/projects/ethng/src/sys/dev/iscsi/initiator/isc_soc.c#2 integrate .. //depot/projects/ethng/src/sys/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/ethng/src/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/ethng/src/sys/dev/md/md.c#2 integrate .. //depot/projects/ethng/src/sys/dev/mmc/mmcsd.c#2 integrate .. //depot/projects/ethng/src/sys/dev/mpt/mpt.h#3 integrate .. //depot/projects/ethng/src/sys/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/ethng/src/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/ethng/src/sys/dev/ofw/ofw_disk.c#2 integrate .. //depot/projects/ethng/src/sys/dev/pccbb/pccbb.c#3 integrate .. //depot/projects/ethng/src/sys/dev/pccbb/pccbb_pci.c#3 integrate .. //depot/projects/ethng/src/sys/dev/random/harvest.c#2 integrate .. //depot/projects/ethng/src/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/ethng/src/sys/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/ethng/src/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/ethng/src/sys/dev/usb/if_zyd.c#6 integrate .. //depot/projects/ethng/src/sys/dev/usb/uchcom.c#1 branch .. //depot/projects/ethng/src/sys/dev/usb/usb.c#2 integrate .. //depot/projects/ethng/src/sys/dev/usb/usb_port.h#2 integrate .. //depot/projects/ethng/src/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/ethng/src/sys/dev/utopia/utopia.c#2 integrate .. //depot/projects/ethng/src/sys/fs/msdosfs/msdosfs_denode.c#3 integrate .. //depot/projects/ethng/src/sys/fs/msdosfs/msdosfs_lookup.c#4 integrate .. //depot/projects/ethng/src/sys/fs/msdosfs/msdosfs_vfsops.c#5 integrate .. //depot/projects/ethng/src/sys/fs/msdosfs/msdosfs_vnops.c#4 integrate .. //depot/projects/ethng/src/sys/geom/bde/g_bde.c#2 integrate .. //depot/projects/ethng/src/sys/geom/bde/g_bde_work.c#2 integrate .. //depot/projects/ethng/src/sys/geom/eli/g_eli.c#2 integrate .. //depot/projects/ethng/src/sys/geom/journal/g_journal.c#2 integrate .. //depot/projects/ethng/src/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/ethng/src/sys/geom/multipath/g_multipath.c#2 integrate .. //depot/projects/ethng/src/sys/geom/part/g_part.c#2 integrate .. //depot/projects/ethng/src/sys/geom/part/g_part.h#2 integrate .. //depot/projects/ethng/src/sys/geom/part/g_part_apm.c#2 integrate .. //depot/projects/ethng/src/sys/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/ethng/src/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/ethng/src/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/ethng/src/sys/geom/vinum/geom_vinum_init.c#2 integrate .. //depot/projects/ethng/src/sys/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/projects/ethng/src/sys/geom/vinum/geom_vinum_volume.c#2 integrate .. //depot/projects/ethng/src/sys/i386/bios/apm.c#2 integrate .. //depot/projects/ethng/src/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/ethng/src/sys/i386/i386/in_cksum.c#2 integrate .. //depot/projects/ethng/src/sys/i386/include/in_cksum.h#2 integrate .. //depot/projects/ethng/src/sys/kern/init_main.c#4 integrate .. //depot/projects/ethng/src/sys/kern/kern_acct.c#3 integrate .. //depot/projects/ethng/src/sys/kern/kern_fork.c#3 integrate .. //depot/projects/ethng/src/sys/kern/kern_idle.c#2 integrate .. //depot/projects/ethng/src/sys/kern/kern_intr.c#3 integrate .. //depot/projects/ethng/src/sys/kern/kern_kthread.c#2 integrate .. //depot/projects/ethng/src/sys/kern/kern_shutdown.c#2 integrate .. //depot/projects/ethng/src/sys/kern/subr_taskqueue.c#2 integrate .. //depot/projects/ethng/src/sys/kern/syscalls.master#3 integrate .. //depot/projects/ethng/src/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/ethng/src/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/ethng/src/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/ethng/src/sys/modules/uchcom/Makefile#1 branch .. //depot/projects/ethng/src/sys/net/bpf.h#2 integrate .. //depot/projects/ethng/src/sys/net/ethernet.h#2 integrate .. //depot/projects/ethng/src/sys/net/if_bridge.c#3 integrate .. //depot/projects/ethng/src/sys/net/if_ethersubr.c#4 integrate .. //depot/projects/ethng/src/sys/net/if_lagg.c#4 integrate .. //depot/projects/ethng/src/sys/net/if_vlan.c#2 integrate .. //depot/projects/ethng/src/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/ethng/src/sys/netgraph/ng_base.c#3 integrate .. //depot/projects/ethng/src/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/ip.h#2 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_bsd_addr.c#3 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/ethng/src/sys/netsmb/smb_iod.c#2 integrate .. //depot/projects/ethng/src/sys/nfs4client/nfs4_vfsops.c#3 integrate .. //depot/projects/ethng/src/sys/nfsclient/nfs_nfsiod.c#3 integrate .. //depot/projects/ethng/src/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/ethng/src/sys/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/ethng/src/sys/opencrypto/crypto.c#2 integrate .. //depot/projects/ethng/src/sys/security/audit/audit_worker.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_framework.h#3 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_policy.h#3 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_posix_sem.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/ethng/src/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/ethng/src/sys/security/mac_stub/mac_stub.c#3 integrate .. //depot/projects/ethng/src/sys/security/mac_test/mac_test.c#3 integrate .. //depot/projects/ethng/src/sys/sun4v/sun4v/simdisk.c#2 integrate .. //depot/projects/ethng/src/sys/sys/apm.h#2 integrate .. //depot/projects/ethng/src/sys/sys/gpt.h#2 integrate .. //depot/projects/ethng/src/sys/sys/kthread.h#2 integrate .. //depot/projects/ethng/src/sys/sys/param.h#6 integrate .. //depot/projects/ethng/src/sys/sys/vnode.h#2 integrate .. //depot/projects/ethng/src/sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/ethng/src/sys/vm/vm_mmap.c#3 integrate .. //depot/projects/ethng/src/sys/vm/vm_object.c#3 integrate .. //depot/projects/ethng/src/sys/vm/vm_zeroidle.c#2 integrate .. //depot/projects/ethng/src/tools/build/options/WITHOUT_NS_CACHING#2 integrate .. //depot/projects/ethng/src/usr.bin/fmt/fmt.c#2 integrate .. //depot/projects/ethng/src/usr.bin/lex/lib/Makefile#2 integrate .. //depot/projects/ethng/src/usr.bin/locate/locate/locate.rc#2 integrate .. //depot/projects/ethng/src/usr.bin/locate/locate/updatedb.sh#3 integrate .. //depot/projects/ethng/src/usr.bin/makewhatis/makewhatis.c#2 integrate .. //depot/projects/ethng/src/usr.bin/netstat/sctp.c#4 integrate .. //depot/projects/ethng/src/usr.bin/nfsstat/nfsstat.1#2 integrate .. //depot/projects/ethng/src/usr.bin/nfsstat/nfsstat.c#2 integrate .. //depot/projects/ethng/src/usr.bin/su/su.c#2 integrate .. //depot/projects/ethng/src/usr.bin/tail/read.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/adduser/adduser.8#2 integrate .. //depot/projects/ethng/src/usr.sbin/adduser/adduser.sh#2 integrate .. //depot/projects/ethng/src/usr.sbin/adduser/rmuser.sh#2 integrate .. //depot/projects/ethng/src/usr.sbin/mountd/mountd.8#2 integrate .. //depot/projects/ethng/src/usr.sbin/mountd/mountd.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pkg_install/lib/lib.h#2 integrate Differences ... ==== //depot/projects/ethng/src/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.341 2007/05/16 08:46:35 des Exp $ +# $FreeBSD: src/Makefile,v 1.342 2007/10/18 08:41:52 delphij Exp $ # # The user-driven targets are: # @@ -147,14 +147,14 @@ .if ${.CURDIR} == ${.OBJDIR} || ${.CURDIR}/obj == ${.OBJDIR} .if exists(${BW_CANONICALOBJDIR}/) -rm -rf ${BW_CANONICALOBJDIR}/* - chflags -R 0 ${BW_CANONICALOBJDIR} + -chflags -R 0 ${BW_CANONICALOBJDIR} rm -rf ${BW_CANONICALOBJDIR}/* .endif # To be safe in this case, fall back to a 'make cleandir' ${_+_}@cd ${.CURDIR}; ${_MAKE} cleandir .else -rm -rf ${.OBJDIR}/* - chflags -R 0 ${.OBJDIR} + -chflags -R 0 ${.OBJDIR} rm -rf ${.OBJDIR}/* .endif ==== //depot/projects/ethng/src/UPDATING#5 (text+ko) ==== @@ -21,6 +21,14 @@ developers choose to disable these features on build machines to maximize performance. +20071020: + The misnamed kthread_create() and friends have been renamed + to kproc_create() etc. Many of the callers already + used kproc_start().. + I will return kthread_create() and friends in a while + with implementations that actually create threads, not procs. + Renaming corresponds with version 800002. + 20071010: RELENG_7 branched. @@ -913,4 +921,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.509 2007/10/12 04:48:58 kevlo Exp $ +$FreeBSD: src/UPDATING,v 1.510 2007/10/21 04:27:07 julian Exp $ ==== //depot/projects/ethng/src/contrib/ipfilter/BSD/Makefile#2 (text+ko) ==== @@ -485,13 +485,21 @@ cp if_ipl.o /lkm; \ fi -if [ -d /modules -a -f ipf.ko ] ; then \ - cp ipf.ko /modules; \ + if [ -f /modules/ipl.ko ] ; then \ + cp ipf.ko /modules/ipl.ko; \ + else \ + cp ipf.ko /modules; \ + fi \ fi -if [ -d /modules -a -f ipfrule.ko ] ; then \ cp ipfrule.ko /modules; \ fi -if [ -d /boot/kernel -a -f ipf.ko ] ; then \ - cp ipf.ko /boot/kernel; \ + if [ -f /boot/kernel/ipl.ko ] ; then \ + cp ipf.ko /boot/kernel/ipl.ko; \ + else \ + cp ipf.ko /boot/kernel; \ + fi \ fi -if [ -d /boot/kernel -a -f ipfrule.ko ] ; then \ cp ipfrule.ko /boot/kernel; \ ==== //depot/projects/ethng/src/contrib/ipfilter/BSD/kupgrade#2 (text+ko) ==== @@ -32,11 +32,15 @@ fi if [ ! -f ip_rules.c -o ! -f ip_rules.h ] ; then - echo "Please do a build of ipfilter and then run the following" - echo "command to build extra files:" - echo - echo "make ip_rules.c" - exit 1 + echo "Trying to build ip_rules.c and ip_rules.h" + make ip_rules.c + if [ ! -f ip_rules.c -o ! -f ip_rules.h ] ; then + echo "Please do a build of ipfilter and then run the following" + echo "command to build extra files:" + echo + echo "make ip_rules.c" + exit 1 + fi fi echo -n "Installing " ==== //depot/projects/ethng/src/contrib/ipfilter/HISTORY#2 (text+ko) ==== @@ -10,12 +10,110 @@ # and especially those who have found the time to port IP Filter to new # platforms. # +4.1.28 - Release 16 October 2007 + +backout changes (B1) & (B2) as they've caused NAT entries to persist for +too long and possibly other side effects. + +Still need to compile in our own radix.c for Solaris as the one in S10U4 +has a different alignment of structure members (causes panic) + +keep state doesn't work with multicast/broadcast packets (makes UPnP easier) + +ippool -l may only lists every 2nd pool's contents + +4.1.27 - Released 29 September 2007 + +SunOS5/replace script does not deal with i386 systems that have the +i86/amd64 directory pair. + +make BSD/kupgrade try to build ip_rules.[ch] before complaining + +Need to look for ipl.ko LKM on FreeBSD, not just ipf.ko + +Cleanup SunOS5 Makefile pieces, removing CPU, sunos5x86; buildsunos needs +to drive 32bit cc builds differently for sparc/i386 now. + +Update instructions for rebuilding FreeBSD kernels + +Make the target "freebsd" work for building ipfilter + +destroying NAT entries for blocked packets can lead to NAT table entry leak, +provide a counter of orphan'd NAT entries to track this problem. + +4.1.26 - Released 24 September 2007 + +Fix build problem for Solaris prior to S10U4 + +4.1.25 - Released 20 September 2007 + +stepping through structures with ioctls can lead to the wrong things +being free'd and panics + +if a NAT entry (such as an rdr) is created but the packet ends up being +blocked, tear down the NAT entry. + +fix fragment cache preventing keep state from functioning + +fix handling of \ to indicate a continued line in .conf files + +include port ranges in the allowed input for ipf when using "port = ()" + +only advance TCP state for packets on the leading edge of the window. (B1) + +using ipnat -l can lead to memory corruption in high stress situations + +track TCP sequence numbers with NAT so that it can do timeout advances +correctly inline with state + +ICMP checksums for some redirect'd packets are not adjusted correctly. + +IPv6 address components need to be explicitly cast to a 32bit pointer +boundary so that compilers don't try to access them as two 64bit +pieces (no guarantee is made that an Ipv6 address is on a 64bit +aligned address) + +filling up the ipauth packet queue can lead to no more packets being +processed. + +locking used to deref a nat entry causes a significant performance hit + +m_pulldown isn't properly handled, leading to possible panics with ICMPv6 +packets + +IPv6 fragment handling doesn't allow for "keep frag" to work + +build on Solaris10 Update4 with pfhooks in the kernel + +logging of Ipv6 packets with extension headers fix - Miroslaw Luc + +4.1.24 - Released 8 July 2007 + +patch from Stuart Remphrey to address recursive mutex lock with TCP state + +add hash table bucket stats display to ipnat -s + +give ASSERT some teeth for user compiles + +initialising ipf_global, ipf_frcache, ipf_mutex should all be done very +early on + +do some caddr_t cleanup, where possible + +fr_ref no longer tracks the number of children rules in a group for head rules + +make sure all BCOPY* have a value assigned to something + +fix possible use of icmp pointer after pullup makes it invalid + +resolve compile problems related to FreeBSD tree + 4.1.23 - Released 31 May 2007 NAT was not always correctly fixing ICMP headers for errors some TCP state steps when closing do not update timeouts, leading to -them being removed prematurely. +them being removed prematurely. (B2) fix compilation problems for netbsd 4.99 ==== //depot/projects/ethng/src/contrib/ipfilter/Makefile#2 (text+ko) ==== @@ -5,8 +5,8 @@ # provided that this notice is preserved and due credit is given # to the original author and the contributors. # -# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.7 2007/06/04 02:54:31 darrenr Exp $ -# Id: Makefile,v 2.76.2.19 2006/03/17 10:38:38 darrenr Exp $ +# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.8 2007/10/18 21:52:11 darrenr Exp $ +# Id: Makefile,v 2.76.2.24 2007/09/26 10:04:03 darrenr Exp $ # SHELL=/bin/sh BINDEST=/usr/local/bin @@ -132,10 +132,7 @@ @echo "openbsd - compile for OpenBSD" @echo "freebsd20 - compile for FreeBSD 2.0, 2.1 or earlier" @echo "freebsd22 - compile for FreeBSD-2.2 or greater" - @echo "freebsd3 - compile for FreeBSD-3.x" - @echo "freebsd4 - compile for FreeBSD-4.x" - @echo "freebsd5 - compile for FreeBSD-5.x" - @echo "freebsd6 - compile for FreeBSD-6.x" + @echo "freebsd - compile for all other versions of FreeBSD" @echo "bsd - compile for generic 4.4BSD systems" @echo "bsdi - compile for BSD/OS" @echo "irix - compile for SGI IRIX" @@ -152,6 +149,7 @@ else echo test directory not present, sorry; fi include: + -mkdir -p net netinet if [ ! -f netinet/done ] ; then \ (cd netinet; ln -s ../*.h .; ln -s ../ip_*_pxy.c .;); \ (cd netinet; ln -s ../ipsend/tcpip.h tcpip.h); \ @@ -167,6 +165,9 @@ MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" BPFILTER=$(BPFILTER) \ CC="$(CC)" DEBUG="$(DEBUG)" ./buildsunos +freebsd: + make freebsd`uname -r|cut -c1` + freebsd22: include make setup "TARGOS=BSD" "CPUDIR=$(CPUDIR)" -rm -f BSD/$(CPUDIR)/ioconf.h @@ -351,13 +352,9 @@ (cd SunOS4; make -f Makefile.ipsend build "CC=$(CC)" TOP=.. $(DEST) $(MFLAGS); cd ..) sunos5 solaris2: null - (cd SunOS5/$(CPUDIR); $(MAKE) build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS) "SOLARIS2=$(SOLARIS2)" "CPU=-Dsparc -D__sparc__"; cd ..) + (cd SunOS5/$(CPUDIR); $(MAKE) build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS) "SOLARIS2=$(SOLARIS2)"; cd ..) (cd SunOS5/$(CPUDIR); $(MAKE) -f Makefile.ipsend build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS); cd ..) -sunos5x86 solaris2x86: null - (cd SunOS5/$(CPUDIR); make build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS) "SOLARIS2=$(SOLARIS2)" "CPU=-Di86pc -Di386 -D__i386__"; cd ..) - (cd SunOS5/$(CPUDIR); make -f Makefile.ipsend build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS); cd ..) - linux: include (cd Linux; make build LINUX=$(LINUX) TOP=.. "DEBUG=-g" "CC=$(CC)" $(MFLAGS) OBJ=$(CPUDIR) LINUXKERNEL=$(LINUXKERNEL); cd ..) (cd Linux; make ipflkm LINUX=$(LINUX) TOP=.. "DEBUG=-g" "CC=$(CC)" $(MFLAGS) OBJ=$(CPUDIR) LINUXKERNEL=$(LINUXKERNEL) WORKDIR=`pwd`; cd ..) @@ -374,7 +371,7 @@ (cd SunOS4; $(MAKE) CPU=$(CPU) TOP=.. install) install-sunos5: solaris null - (cd SunOS5; $(MAKE) CPU=$(CPU) TOP=.. install) + (cd SunOS5; $(MAKE) TOP=.. install) install-aix: (cd AIX/`AIX/cpurev`; make install "TOP=../.." $(MFLAGS); cd ..) ==== //depot/projects/ethng/src/contrib/ipfilter/ip_fil.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/ip_fil.c,v 1.5 2007/06/04 02:54:31 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/ip_fil.c,v 1.6 2007/10/18 21:52:11 darrenr Exp $ */ /* * Copyright (C) 1993-2001 by Darren Reed. @@ -7,7 +7,7 @@ */ #if !defined(lint) static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed"; -static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.133.2.16 2007/05/28 11:56:22 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.133.2.18 2007/09/09 11:32:05 darrenr Exp $"; #endif #ifndef SOLARIS @@ -81,7 +81,7 @@ #include # endif #endif -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(SOLARIS2) # include "radix_ipf.h" #endif #ifndef __osf__ @@ -390,7 +390,7 @@ *addr++ = '\0'; for (ifpp = ifneta; ifpp && (ifp = *ifpp); ifpp++) { - COPYIFNAME(ifp, ifname); + COPYIFNAME(v, ifp, ifname); if (!strcmp(name, ifname)) { if (addr != NULL) fr_setifpaddr(ifp, addr); @@ -429,6 +429,9 @@ } ifp = ifneta[nifs - 1]; +#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) + TAILQ_INIT(&ifp->if_addrlist); +#endif #if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) || \ (defined(OpenBSD) && (OpenBSD >= 199603)) || defined(linux) || \ (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) ==== //depot/projects/ethng/src/contrib/ipfilter/iplang/Makefile#2 (text+ko) ==== @@ -3,20 +3,21 @@ # #CC=gcc -Wuninitialized -Wstrict-prototypes -Werror -O CFLAGS=-I.. +CCARGS=$(DEBUG) -I. -I.. $(CFLAGS) -I$(DESTDIR) -I$(DESTDIR)/.. -I../ipsend all: $(DESTDIR)/iplang_y.o $(DESTDIR)/iplang_l.o $(DESTDIR)/iplang_y.o: $(DESTDIR)/iplang_y.c - $(CC) $(DEBUG) -I. -I.. -I$(DESTDIR) -I../ipsend $(CFLAGS) $(LINUX) -c $(DESTDIR)/iplang_y.c -o $@ + $(CC) $(CCARGS) $(LINUX) -c $(DESTDIR)/iplang_y.c -o $@ $(DESTDIR)/iplang_l.o: $(DESTDIR)/iplang_l.c - $(CC) $(DEBUG) -I. -I.. -I$(DESTDIR) -I../ipsend $(CFLAGS) $(LINUX) -c $(DESTDIR)/iplang_l.c -o $@ + $(CC) $(CCARGS) $(LINUX) -c $(DESTDIR)/iplang_l.c -o $@ iplang_y.o: iplang_y.c - $(CC) $(DEBUG) -I. -I.. -I../ipsend $(CFLAGS) $(LINUX) -c $< -o $@ + $(CC) $(CCARGS) $< -o $@ iplang_l.o: iplang_l.c - $(CC) $(DEBUG) -I. -I.. -I../ipsend $(CFLAGS) $(LINUX) -c $< -o $@ + $(CC) $(CCARGS) $< -o $@ $(DESTDIR)/iplang_l.c: iplang_l.l $(DESTDIR)/iplang_y.h lex iplang_l.l ==== //depot/projects/ethng/src/contrib/ipfilter/ipsend/iptests.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/ipsend/iptests.c,v 1.13 2007/06/04 02:54:31 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/ipsend/iptests.c,v 1.14 2007/10/18 21:52:12 darrenr Exp $ */ /* * Copyright (C) 1993-1998 by Darren Reed. @@ -8,7 +8,7 @@ */ #if !defined(lint) static const char sccsid[] = "%W% %G% (C)1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id: iptests.c,v 2.8.2.8 2007/02/17 12:41:51 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: iptests.c,v 2.8.2.9 2007/09/13 07:19:34 darrenr Exp $"; #endif #include #include @@ -22,6 +22,9 @@ #endif #include #if !defined(__osf__) +# ifdef __NetBSD__ +# include +# endif # define _KERNEL # define KERNEL # if !defined(solaris) && !defined(linux) && !defined(__sgi) && !defined(hpux) @@ -1097,7 +1100,8 @@ struct tcpcb *tcbp, tcb; struct tcpiphdr ti; struct sockaddr_in sin; - int fd, slen; + int fd; + socklen_t slen; bzero((char *)&sin, sizeof(sin)); ==== //depot/projects/ethng/src/contrib/ipfilter/ipsend/sock.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/ipsend/sock.c,v 1.18 2007/06/04 02:54:31 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/ipsend/sock.c,v 1.19 2007/10/18 21:52:12 darrenr Exp $ */ /* * sock.c (C) 1995-1998 Darren Reed * @@ -7,7 +7,7 @@ */ #if !defined(lint) static const char sccsid[] = "@(#)sock.c 1.2 1/11/96 (C)1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id: sock.c,v 2.8.4.6 2007/02/17 12:41:51 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: sock.c,v 2.8.4.7 2007/09/13 07:19:34 darrenr Exp $"; #endif #include #include @@ -30,6 +30,9 @@ # include #endif #if !defined(__osf__) +# ifdef __NetBSD__ +# include +# endif # define _KERNEL # define KERNEL # ifdef ultrix @@ -385,7 +388,8 @@ { struct sockaddr_in rsin, lsin; struct tcpcb *t, tcb; - int fd, nfd, len; + int fd, nfd; + socklen_t len; printf("Dest. Port: %d\n", ti->ti_dport); ==== //depot/projects/ethng/src/contrib/ipfilter/l4check/Makefile#2 (text+ko) ==== @@ -4,7 +4,7 @@ all: l4check l4check: l4check.c - $(CC) -g -I.. $(CFLAGS) $(LIBS) l4check.c -o $@ + $(CC) -g -I.. -Wall $(CFLAGS) $(LIBS) l4check.c -o $@ clean: /bin/rm -f l4check ==== //depot/projects/ethng/src/contrib/ipfilter/l4check/l4check.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/l4check/l4check.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/l4check/l4check.c,v 1.3 2007/10/18 21:52:12 darrenr Exp $ */ /* * (C)Copyright March, 2000 - Darren Reed. @@ -27,6 +27,7 @@ #include "ip_compat.h" #include "ip_fil.h" #include "ip_nat.h" +#include "ipl.h" #include "ipf.h" @@ -98,13 +99,21 @@ void addnat(l4) l4cfg_t *l4; { + ipnat_t *ipn = &l4->l4_nat; - printf("Add NAT rule for %s/%#x,%u -> ", inet_ntoa(ipn->in_out[0]), + printf("Add NAT rule for %s/%#x,%u -> ", inet_ntoa(ipn->in_out[0].in4), ipn->in_outmsk, ntohs(ipn->in_pmin)); - printf("%s,%u\n", inet_ntoa(ipn->in_in[0]), ntohs(ipn->in_pnext)); + printf("%s,%u\n", inet_ntoa(ipn->in_in[0].in4), ntohs(ipn->in_pnext)); if (!(opts & OPT_DONOTHING)) { - if (ioctl(natfd, SIOCADNAT, &ipn) == -1) + ipfobj_t obj; + + bzero(&obj, sizeof(obj)); + obj.ipfo_rev = IPFILTER_VERSION; + obj.ipfo_size = sizeof(*ipn); + obj.ipfo_ptr = ipn; + + if (ioctl(natfd, SIOCADNAT, &obj) == -1) perror("ioctl(SIOCADNAT)"); } } @@ -116,9 +125,16 @@ ipnat_t *ipn = &l4->l4_nat; printf("Remove NAT rule for %s/%#x,%u -> ", - inet_ntoa(ipn->in_out[0]), ipn->in_outmsk, ipn->in_pmin); - printf("%s,%u\n", inet_ntoa(ipn->in_in[0]), ipn->in_pnext); + inet_ntoa(ipn->in_out[0].in4), ipn->in_outmsk, ipn->in_pmin); + printf("%s,%u\n", inet_ntoa(ipn->in_in[0].in4), ipn->in_pnext); if (!(opts & OPT_DONOTHING)) { + ipfobj_t obj; + + bzero(&obj, sizeof(obj)); + obj.ipfo_rev = IPFILTER_VERSION; + obj.ipfo_size = sizeof(*ipn); + obj.ipfo_ptr = ipn; + if (ioctl(natfd, SIOCRMNAT, &ipn) == -1) perror("ioctl(SIOCRMNAT)"); } @@ -178,7 +194,6 @@ void writefd(l4) l4cfg_t *l4; { - char buf[80], *ptr; int n, i, fd; fd = l4->l4_fd; @@ -410,7 +425,6 @@ struct servent *sp; struct hostent *hp; char *host, *port; - struct in_addr ip; host = str; port = strchr(host, ','); @@ -555,7 +569,8 @@ break; } - strncpy(ipn->in_ifname, s, sizeof(ipn->in_ifname)); + strncpy(ipn->in_ifnames[0], s, LIFNAMSIZ); + strncpy(ipn->in_ifnames[1], s, LIFNAMSIZ); if (!gethostport(t, num, &ipn->in_outip, &ipn->in_pmin)) { errtxt = line; @@ -567,11 +582,11 @@ if (opts & OPT_VERBOSE) fprintf(stderr, "Interface %s %s/%#x port %u\n", - ipn->in_ifname, - inet_ntoa(ipn->in_out[0]), + ipn->in_ifnames[0], + inet_ntoa(ipn->in_out[0].in4), ipn->in_outmsk, ipn->in_pmin); } else if (!strcasecmp(t, "remote")) { - if (!*ipn->in_ifname) { + if (!*ipn->in_ifnames[0]) { fprintf(stderr, "%d: ifname not set prior to remote\n", num); @@ -606,7 +621,7 @@ break; } bcopy((char *)&template, (char *)l4, sizeof(*l4)); - l4->l4_sin.sin_addr = ipn->in_in[0]; + l4->l4_sin.sin_addr = ipn->in_in[0].in4; l4->l4_sin.sin_port = ipn->in_pnext; l4->l4_next = l4list; l4list = l4; @@ -793,7 +808,7 @@ } if (!(opts & OPT_DONOTHING)) { - natfd = open(IPL_NAT, O_RDWR); + natfd = open(IPNAT_NAME, O_RDWR); if (natfd == -1) { perror("open(IPL_NAT)"); exit(1); @@ -804,4 +819,6 @@ fprintf(stderr, "Starting...\n"); while (runconfig() == 0) ; + + exit(1); } ==== //depot/projects/ethng/src/contrib/ipfilter/lib/Makefile#2 (text+ko) ==== @@ -3,7 +3,7 @@ # # See the IPFILTER.LICENCE file for details on licencing. # -# $Id: Makefile,v 1.41.2.13 2007/05/10 06:02:19 darrenr Exp $ +# $Id: Makefile,v 1.41.2.14 2007/09/21 08:30:43 darrenr Exp $ # INCDEP=$(TOP)/ip_compat.h $(TOP)/ip_fil.h $(TOP)/ipf.h @@ -135,8 +135,6 @@ $(CC) $(CCARGS) -c $(LIBSRC)/fill6bits.c -o $@ $(DEST)/flags.o: $(LIBSRC)/flags.c $(INCDEP) $(CC) $(CCARGS) -c $(LIBSRC)/flags.c -o $@ -$(DEST)/getline.o: $(LIBSRC)/getline.c $(INCDEP) - $(CC) $(CCARGS) -c $(LIBSRC)/getline.c -o $@ $(DEST)/gethost.o: $(LIBSRC)/gethost.c $(INCDEP) $(CC) $(CCARGS) -c $(LIBSRC)/gethost.c -o $@ $(DEST)/getifname.o: $(LIBSRC)/getifname.c $(INCDEP) @@ -218,10 +216,6 @@ $(CC) $(CCARGS) -c $(LIBSRC)/optvalue.c -o $@ $(DEST)/portname.o: $(LIBSRC)/portname.c $(INCDEP) $(CC) $(CCARGS) -c $(LIBSRC)/portname.c -o $@ -$(DEST)/portnum.o: $(LIBSRC)/portnum.c $(INCDEP) - $(CC) $(CCARGS) -c $(LIBSRC)/portnum.c -o $@ -$(DEST)/ports.o: $(LIBSRC)/ports.c $(INCDEP) - $(CC) $(CCARGS) -c $(LIBSRC)/ports.c -o $@ $(DEST)/print_toif.o: $(LIBSRC)/print_toif.c $(INCDEP) $(CC) $(CCARGS) -c $(LIBSRC)/print_toif.c -o $@ $(DEST)/printactivenat.o: $(LIBSRC)/printactivenat.c $(INCDEP) ==== //depot/projects/ethng/src/contrib/ipfilter/lib/alist_new.c#2 (text+ko) ==== @@ -3,7 +3,7 @@ * * See the IPFILTER.LICENCE file for details on licencing. * - * $Id: alist_new.c,v 1.1.2.2 2006/08/25 22:43:21 darrenr Exp $ + * $Id: alist_new.c,v 1.1.2.3 2007/06/06 08:05:33 darrenr Exp $ */ #include "ipf.h" @@ -53,12 +53,14 @@ } if (gethost(host, &al->al_addr) == -1) { - *slash = '/'; + if (slash != NULL) + *slash = '/'; fprintf(stderr, "Cannot parse hostname\n"); free(al); return NULL; } al->al_mask = htonl(mask); - *slash = '/'; + if (slash != NULL) + *slash = '/'; return al; } ==== //depot/projects/ethng/src/contrib/ipfilter/lib/ipft_tx.c#2 (text+ko) ==== @@ -1,15 +1,15 @@ -/* $FreeBSD: src/contrib/ipfilter/lib/ipft_tx.c,v 1.6 2007/06/04 02:54:32 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/lib/ipft_tx.c,v 1.7 2007/10/18 21:52:12 darrenr Exp $ */ /* * Copyright (C) 2000-2006 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. * - * $Id: ipft_tx.c,v 1.15.2.9 2006/06/16 17:21:04 darrenr Exp $ + * $Id: ipft_tx.c,v 1.15.2.10 2007/09/03 21:54:44 darrenr Exp $ */ #if !defined(lint) static const char sccsid[] = "@(#)ipft_tx.c 1.7 6/5/96 (C) 1993 Darren Reed"; -static const char rcsid[] = "@(#)$Id: ipft_tx.c,v 1.15.2.9 2006/06/16 17:21:04 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: ipft_tx.c,v 1.15.2.10 2007/09/03 21:54:44 darrenr Exp $"; #endif #include @@ -259,19 +259,30 @@ } ip->ip_dst.s_addr = tx_hostnum(*cpp, &r); cpp++; - if (*cpp && ip->ip_p == IPPROTO_TCP) { - char *s, *t; + if (ip->ip_p == IPPROTO_TCP) { + if (*cpp != NULL) { + char *s, *t; + + tcp->th_flags = 0; + for (s = *cpp; *s; s++) + if ((t = strchr(myflagset, *s))) + tcp->th_flags |= myflags[t-myflagset]; + if (tcp->th_flags) + cpp++; + } - tcp->th_flags = 0; - for (s = *cpp; *s; s++) - if ((t = strchr(myflagset, *s))) - tcp->th_flags |= myflags[t - myflagset]; - if (tcp->th_flags) - cpp++; - if (tcp->th_flags == 0) - abort(); if (tcp->th_flags & TH_URG) tcp->th_urp = htons(1); + + if (*cpp && !strncasecmp(*cpp, "seq=", 4)) { + tcp->th_seq = htonl(atoi(*cpp + 4)); + cpp++; + } + + if (*cpp && !strncasecmp(*cpp, "ack=", 4)) { + tcp->th_ack = htonl(atoi(*cpp + 4)); + cpp++; + } } else if (*cpp && ip->ip_p == IPPROTO_ICMP) { extern char *tx_icmptypes[]; char **s, *t; ==== //depot/projects/ethng/src/contrib/ipfilter/lib/printnat.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/lib/printnat.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/lib/printnat.c,v 1.5 2007/10/18 21:52:12 darrenr Exp $ */ /* * Copyright (C) 2002-2005 by Darren Reed. @@ -13,7 +13,7 @@ #if !defined(lint) -static const char rcsid[] = "@(#)$Id: printnat.c,v 1.22.2.13 2006/12/09 10:37:47 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: printnat.c,v 1.22.2.14 2007/09/06 16:40:11 darrenr Exp $"; #endif /* @@ -136,6 +136,8 @@ if (opts & OPT_DEBUG) printf("\tpmax %u\n", np->in_pmax); } else { + int protoprinted = 0; + if (!(np->in_flags & IPN_FILTER)) { printf("%s/", inet_ntoa(np->in_in[0].in4)); bits = count4bits(np->in_inmsk); @@ -172,6 +174,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 21 21:11:55 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 480A716A419; Sun, 21 Oct 2007 21:11:55 +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 CABE416A468 for ; Sun, 21 Oct 2007 21:11:54 +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 CDB5213C4A3 for ; Sun, 21 Oct 2007 21:11:54 +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 l9LLBsW9061485 for ; Sun, 21 Oct 2007 21:11:54 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9LLBpjo061458 for perforce@freebsd.org; Sun, 21 Oct 2007 21:11:51 GMT (envelope-from jb@freebsd.org) Date: Sun, 21 Oct 2007 21:11:51 GMT Message-Id: <200710212111.l9LLBpjo061458@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 127904 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, 21 Oct 2007 21:11:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=127904 Change 127904 by jb@jb_freebsd1 on 2007/10/21 21:11:28 IFC Affected files ... .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/contributing-ports/article.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/version-guide/article.sgml#4 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#10 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/firewalls/chapter.sgml#8 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#10 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/porters-handbook/book.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#47 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#41 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/Makefile#2 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/firewalls/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/jails/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/virtualization/chapter.sgml#2 integrate .. //depot/projects/dtrace/ports/MOVED#47 integrate .. //depot/projects/dtrace/ports/UPDATING#37 integrate .. //depot/projects/dtrace/src/UPDATING#18 integrate .. //depot/projects/dtrace/src/contrib/libpcap/pcap.h#6 integrate .. //depot/projects/dtrace/src/etc/rc.d/amd#6 integrate .. //depot/projects/dtrace/src/etc/rc.d/kerberos#5 integrate .. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#20 integrate .. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes-o.real#6 integrate .. //depot/projects/dtrace/src/games/fortune/datfiles/limerick#5 integrate .. //depot/projects/dtrace/src/lib/libbsm/Makefile#6 integrate .. //depot/projects/dtrace/src/lib/libc/stdlib/atoi.3#5 integrate .. //depot/projects/dtrace/src/lib/libelf/elf.3#8 integrate .. //depot/projects/dtrace/src/lib/libelf/gelf_getphdr.3#6 integrate .. //depot/projects/dtrace/src/lib/libelf/gelf_newphdr.3#6 integrate .. //depot/projects/dtrace/src/lib/libpam/modules/pam_unix/Makefile#4 integrate .. //depot/projects/dtrace/src/lib/libstand/tftp.c#4 integrate .. //depot/projects/dtrace/src/lib/ncurses/ncurses/Makefile#3 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#10 integrate .. //depot/projects/dtrace/src/sbin/geom/class/part/geom_part.c#2 integrate .. //depot/projects/dtrace/src/sbin/geom/class/part/gpart.8#2 integrate .. //depot/projects/dtrace/src/sbin/ipfw/ipfw.8#14 integrate .. //depot/projects/dtrace/src/sbin/ipfw/ipfw2.c#12 integrate .. //depot/projects/dtrace/src/share/man/man5/src.conf.5#10 integrate .. //depot/projects/dtrace/src/share/man/man9/kproc.9#1 branch .. //depot/projects/dtrace/src/share/man/man9/kthread.9#4 integrate .. //depot/projects/dtrace/src/share/mk/bsd.compat.mk#6 integrate .. //depot/projects/dtrace/src/share/mk/bsd.lib.mk#12 integrate .. //depot/projects/dtrace/src/share/mk/bsd.own.mk#16 integrate .. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#23 integrate .. //depot/projects/dtrace/src/sys/cam/cam_xpt.c#14 integrate .. //depot/projects/dtrace/src/sys/compat/ndis/subr_ntoskrnl.c#7 integrate .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/proc.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/pf/net/pf.c#8 integrate .. //depot/projects/dtrace/src/sys/contrib/pf/net/pf_ioctl.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/aac/aac.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/acpica/acpi_thermal.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/aic7xxx/aic_osm_lib.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/aic7xxx/aic_osm_lib.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/bktr/msp34xx.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/ciss/ciss.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/fdc/fdc.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/firewire/firewire.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/flash/at45d.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/hptmv/entry.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_logging.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/if_ndis/if_ndis.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/ipmi/ipmi_kcs.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/ipmi/ipmi_smic.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/ipmi/ipmi_ssif.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/iscsi/initiator/isc_sm.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/iscsi/initiator/isc_soc.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/isp/isp_freebsd.c#18 integrate .. //depot/projects/dtrace/src/sys/dev/iwi/if_iwi.c#13 integrate .. //depot/projects/dtrace/src/sys/dev/md/md.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/mmc/mmcsd.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt.h#21 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_cam.c#27 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_raid.c#12 integrate .. //depot/projects/dtrace/src/sys/dev/ofw/ofw_disk.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/pccbb/pccbb.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/pccbb/pccbb_pci.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/random/harvest.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/random/randomdev_soft.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/sound/midi/sequencer.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/hda/hdac.c#12 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_zyd.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usb.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usb_port.h#7 integrate .. //depot/projects/dtrace/src/sys/dev/utopia/utopia.c#4 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_denode.c#6 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_lookup.c#5 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vfsops.c#13 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vnops.c#9 integrate .. //depot/projects/dtrace/src/sys/geom/bde/g_bde.c#4 integrate .. //depot/projects/dtrace/src/sys/geom/bde/g_bde_work.c#5 integrate .. //depot/projects/dtrace/src/sys/geom/eli/g_eli.c#13 integrate .. //depot/projects/dtrace/src/sys/geom/journal/g_journal.c#6 integrate .. //depot/projects/dtrace/src/sys/geom/mirror/g_mirror.c#15 integrate .. //depot/projects/dtrace/src/sys/geom/multipath/g_multipath.c#2 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part.c#2 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part.h#2 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part_apm.c#2 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/dtrace/src/sys/geom/raid3/g_raid3.c#19 integrate .. //depot/projects/dtrace/src/sys/geom/vinum/geom_vinum_drive.c#4 integrate .. //depot/projects/dtrace/src/sys/geom/vinum/geom_vinum_init.c#4 integrate .. //depot/projects/dtrace/src/sys/geom/vinum/geom_vinum_plex.c#4 integrate .. //depot/projects/dtrace/src/sys/geom/vinum/geom_vinum_volume.c#4 integrate .. //depot/projects/dtrace/src/sys/i386/bios/apm.c#5 integrate .. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#22 integrate .. //depot/projects/dtrace/src/sys/i386/i386/in_cksum.c#4 integrate .. //depot/projects/dtrace/src/sys/i386/include/in_cksum.h#4 integrate .. //depot/projects/dtrace/src/sys/kern/init_main.c#16 integrate .. //depot/projects/dtrace/src/sys/kern/kern_acct.c#9 integrate .. //depot/projects/dtrace/src/sys/kern/kern_fork.c#17 integrate .. //depot/projects/dtrace/src/sys/kern/kern_idle.c#9 integrate .. //depot/projects/dtrace/src/sys/kern/kern_intr.c#13 integrate .. //depot/projects/dtrace/src/sys/kern/kern_kthread.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/kern_shutdown.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/subr_taskqueue.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/syscalls.master#15 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_aio.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_bio.c#12 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#21 integrate .. //depot/projects/dtrace/src/sys/net/bpf.h#8 integrate .. //depot/projects/dtrace/src/sys/net/if_bridge.c#24 integrate .. //depot/projects/dtrace/src/sys/net/if_lagg.c#3 integrate .. //depot/projects/dtrace/src/sys/netgraph/netgraph.h#6 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_base.c#7 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_socket.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/ip.h#6 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_bsd_addr.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_syncache.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_usrreq.c#11 integrate .. //depot/projects/dtrace/src/sys/netsmb/smb_iod.c#5 integrate .. //depot/projects/dtrace/src/sys/nfs4client/nfs4_vfsops.c#8 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_nfsiod.c#6 integrate .. //depot/projects/dtrace/src/sys/opencrypto/crypto.c#8 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_worker.c#7 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_framework.h#10 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_policy.h#3 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_posix_sem.c#9 integrate .. //depot/projects/dtrace/src/sys/security/mac_biba/mac_biba.c#11 integrate .. //depot/projects/dtrace/src/sys/security/mac_mls/mac_mls.c#10 integrate .. //depot/projects/dtrace/src/sys/security/mac_stub/mac_stub.c#8 integrate .. //depot/projects/dtrace/src/sys/security/mac_test/mac_test.c#7 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/simdisk.c#6 integrate .. //depot/projects/dtrace/src/sys/sys/apm.h#2 integrate .. //depot/projects/dtrace/src/sys/sys/gpt.h#4 integrate .. //depot/projects/dtrace/src/sys/sys/kthread.h#4 integrate .. //depot/projects/dtrace/src/sys/sys/param.h#21 integrate .. //depot/projects/dtrace/src/sys/sys/vnode.h#9 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_softdep.c#10 integrate .. //depot/projects/dtrace/src/sys/vm/vm_zeroidle.c#10 integrate .. //depot/projects/dtrace/src/tools/build/options/WITHOUT_NS_CACHING#3 integrate .. //depot/projects/dtrace/src/usr.bin/lex/lib/Makefile#4 integrate .. //depot/projects/dtrace/src/usr.sbin/adduser/adduser.8#6 integrate .. //depot/projects/dtrace/src/usr.sbin/adduser/adduser.sh#5 integrate .. //depot/projects/dtrace/src/usr.sbin/adduser/rmuser.sh#4 integrate .. //depot/projects/dtrace/src/usr.sbin/mountd/mountd.8#6 integrate .. //depot/projects/dtrace/src/usr.sbin/mountd/mountd.c#11 integrate .. //depot/projects/dtrace/www/de/administration.sgml#3 integrate .. //depot/projects/dtrace/www/de/developers.sgml#4 integrate .. //depot/projects/dtrace/www/de/ports/Makefile#2 integrate .. //depot/projects/dtrace/www/de/security/security.sgml#11 integrate .. //depot/projects/dtrace/www/de/share/sgml/news.xml#13 integrate .. //depot/projects/dtrace/www/de/share/sgml/press.xml#11 integrate .. //depot/projects/dtrace/www/en/projects/ideas/ideas.xml#3 integrate .. //depot/projects/dtrace/www/share/sgml/events.xml#12 integrate .. //depot/projects/dtrace/www/share/sgml/press.xml#15 integrate Differences ... ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/contributing-ports/article.sgml#2 (text+ko) ==== @@ -1,8 +1,8 @@ @@ -16,7 +16,7 @@ Zur FreeBSD Ports-Sammlung beitragen - $FreeBSD: doc/de_DE.ISO8859-1/articles/contributing-ports/article.sgml,v 1.2 2007/08/21 19:09:00 jkois Exp $ + $FreeBSD: doc/de_DE.ISO8859-1/articles/contributing-ports/article.sgml,v 1.3 2007/10/19 09:56:47 jkois Exp $ Dieser Artikel beschreibt, wie man zur FreeBSD Ports-Sammlung @@ -108,7 +108,7 @@ Es gibt ein eigenes Handbuch, das beim Erstellen (und Aktualisieren) von Ports hilft. Es heißt Porter-Handbuch. + url="&url.books.porters-handbook;">Porter-Handbuch. Das Porter-Handbuch ist die beste Referenz, um mit dem Ports-System zu arbeiten. Es enthält Details darüber, wie das Ports-System funktioniert und wie @@ -159,7 +159,7 @@ Bitte vergewissern Sie sich, dass Sie die Aufgaben eines Maintainers verstanden haben. Lesen Sie bitte auch das - Porter-Handbuch. + Porter-Handbuch. Übernehmen Sie nicht mehr Aufgaben, als Sie bewältigen können. @@ -314,7 +314,7 @@ Dieser Abschnitt bietet einen kurzen Überblick zu diesem Thema. Ausführliche Informationen zur Aktualisierung von Ports finden Sie im Porter-Handbuch. + url="&url.books.porters-handbook;">Porter-Handbuch. @@ -430,7 +430,7 @@ welche Änderungen vorgenommen wurden. Das Porter-Handbuch enthält viele nützliche Informationen zum Upgrading + url="&url.books.porters-handbook;/port-upgrading.html">Upgrading eines Ports. @@ -438,7 +438,7 @@ Warten - Es kann nur sehr wenig Zeit vergehen, bis sich ein + Es kann nur sehr wenig Zeit vergehen, bis sich ein Committer mit Ihrem PR befasst. Es kann aber auch mehrere Wochen dauern, bis eine Reaktion erfolgt - haben Sie bitte Geduld. @@ -854,7 +854,7 @@ Ressourcen für Ports-Maintainer und Committer Das Porter-Handbuch + url="&url.books.porters-handbook;">Porter-Handbuch ist Ihr Ratgeber zum Ports-System und sollte stets in Ihrer Reichweite sein! @@ -910,7 +910,7 @@ einen Ratgeber verwenden. Wenn portlint zu umfangreiche Änderungen vorschlägt, lesen Sie nochmal das Porter-Handbuch + url="&url.books.porters-handbook;">Porter-Handbuch oder bitten Sie jemanden um Rat. Die Mailingliste &a.ports; ist für allgemeine Diskussionen ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/version-guide/article.sgml#4 (text+ko) ==== @@ -1,9 +1,9 @@ - $FreeBSD: doc/de_DE.ISO8859-1/articles/version-guide/article.sgml,v 1.3 2006/10/26 15:01:44 jkois Exp $ + $FreeBSD: doc/de_DE.ISO8859-1/articles/version-guide/article.sgml,v 1.4 2007/10/19 09:56:47 jkois Exp $ &tm-attrib.freebsd; @@ -333,18 +333,12 @@ - Für die jeweils aktuellste Unterversion jeder - Hauptversion sollen vorkompilierte Pakete angeboten + Für das jeweils aktuellste Unterversion-Release + jeder Hauptversion sollen vorkompilierte Pakete angeboten werden. - Zusätzlich sollen für das jeweils aktuellste - Unterversions-Release jeder Hauptversion vorkompilierte - Pakete angeboten werden. - - - Sicherheitslücken und andere kritische Probleme sollen für die aktuellsten Unterversionen jeder Hauptversion angeboten werden (in sogenannten ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#6 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.37 2007/08/01 08:05:04 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/advanced-networking/chapter.sgml,v 1.165 2007/08/01 07:30:25 jkois Exp $ - basiert auf: 1.397 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.38 2007/10/19 09:56:47 jkois Exp $ + $FreeBSDde: de-docproj/books/handbook/advanced-networking/chapter.sgml,v 1.166 2007/08/28 16:43:35 jkois Exp $ + basiert auf: 1.399 --> @@ -2739,8 +2739,8 @@ - Steve - Peterson + Andrew + Thompson Geschrieben von @@ -2763,10 +2763,11 @@ mit zwei Netzkarten kann als Bridge fungieren. Die Bridge arbeitet, indem sie die MAC Layeradressen - (Ethernet Adressen) der Geräte in ihren Netzsegmenten - lernt. Der Verkehr wird nur dann zwischen zwei Netzsegmenten - weitergeleitet, wenn sich Sender und Empfänger in - verschiedenen Netzsegmenten befinden. + (Ethernet Adressen) der Geräte in ihren + Netzwerksegmenten lernt. Der Verkehr wird nur dann zwischen + zwei Segmenten weitergeleitet, wenn sich Sender und + Empfänger in verschiedenen Netzwerksegmenten + befinden. In vielerlei Hinsicht entspricht eine Bridge daher einem Ethernet-Switch mit sehr wenigen Ports. @@ -2776,34 +2777,30 @@ Situationen, in denen <emphasis>Bridging</emphasis> angebracht ist - Eine Bridge wird vor allem in folgenden zwei Situationen - verwendet: + Es gibt zahlreiche Situationen, in denen der Einsatz + einer Bridge sinnvoll ist: - Hohes Datenaufkommen in einem Segment + Verbinden von Netzwerken - In der ersten Situation wird Ihr physisches Netz - mit Datenverkehr überschwemmt. Aus irgendwelchen - Gründen wollen Sie allerdings keine Subnetze verwenden, - die über einen Router miteinander verbunden sind. - - Stellen Sie sich einen Zeitungsverlag vor, in dem sich die - Redaktions- und Produktionsabteilungen in verschiedenen - Subnetzen befinden. Die Redaktionsrechner verwenden den - Server A für Dateioperationen, und die - Produktionsrechner verwenden den Server B. - Alle Benutzer sind über ein gemeinsames Ethernet-LAN - miteinander verbunden. Durch das hohe Datenaufkommen sinkt - die Geschwindigkeit des gesamten Netzwerks. - - Würde man die Redaktionsrechner und die - Produktionsrechner in separate Netzsegmente auslagern, - könnte man diese beiden Segmente über eine Bridge - verbinden. Nur der für Rechner im jeweils - anderen Segment bestimmte Verkehr wird - dann über die Brigde in das andere Netzsegment geleitet. - Dadurch verringert sich das Gesamtdatenaufkommen in beiden - Segmenten. + Die Hauptaufgabe einer Bridge ist die Verbindung von zwei + oder mehreren Netzwerksegmenten zu einem gemeinsamen Netzwerk. + Es ist oft sinnvoller, eine hostbasierte Bridge anstelle + normaler Netzwerkkomponenten (wie Kabelverbindungen), + Firewalls oder Pseudonetzwerken über die + Schnittstelle einer virtuellen Maschine einzusetzen. + + + + Eine Bridge kann außerdem ein drahtloses Gerät mit + einem Kabelnetzwerk verbinden. Diese Fähigkeit der + Bridge wird als HostAP-Modus + bezeichnet. Die Bridge agiert in diesem Fall als + Access Point für das drahtlose Gerät. @@ -2812,16 +2809,16 @@ Firewall NAT - Die zweite häufig anzutreffende Situation tritt auf, - wenn Firewallfunktionen benötigt werden, ohne dass + Häufig kommt es vor, dass Firewallfunktionen + benötigt werden, ohne dass Routing oder Network Adress Translation - (NAT) verwendet wird. + (NAT) verwendet werden soll. Ein Beispiel dafür wäre ein kleines Unternehmen, das über DSL oder ISDN an seinen ISP angebunden ist. Es verfügt über 13 weltweit erreichbare IP-Adressen, sein Netzwerk besteht aus 10 Rechnern. In dieser Situation - ist die Verwendung von Subnetzen sowie einer routerbasierten + ist der Einsatz von Subnetzen sowie einer routerbasierten Firewall schwierig. Router @@ -2830,139 +2827,467 @@ Eine brigdebasierte Firewall kann konfiguriert und in den ISDN/DSL-Downstreampfad ihres Routers eingebunden werden, ohne - sich um IP-Adressen kümmern zu müssen. + dass Sie sich um IP-Adressen kümmern müssen. - + + + Netzwerküberwachung - - Die LAN-Kopplung konfigurieren + Eine Bridge kann zwei Netzwerksegmente miteinander + verbinden und danach alle Ethernet-Rahmen überprüfen, + die zwischen den beiden Netzwerksegmenten ausgetauscht werden. + Dazu verwendet man entweder &man.bpf.4;/&man.tcpdump.1; auf + dem Netzgerät der Bridge oder schickt Kopien aller + Rahmen an ein zusätzliches Netzgerät (den sogenannten + Span Port). + - Auswahl der Netzkarten + Layer 2-VPN + + Zwei Ethernetnetzwerke können über einen IP-Link + miteinander verbunden werden, indem Sie die beiden Netzwerke + über einen EtherIP-Tunnel koppeln oder eine + &man.tap.4;-basierte Lösung wie OpenVPN einsetzen. + - Eine Bridge benötigt mindestens zwei Netzkarten. - Leider sind unter FreeBSD nicht alle verfügbaren - Netzkarten dafür geeignet. Lesen Sie &man.bridge.4; - für Informationen zu unterstützten Karten. + + Layer 2-Redundanz - Installieren und testen Sie beide Netzkarten, bevor Sie - fortfahren. + Die Systeme eines Netzwerks können redundant + miteinander verbunden sein. In diesem Fall verwenden Sie das + Spanning Tree Protocol, um + redundante Pfade zu blockieren. Damit ein Ethernetnetzwerk + korrekt arbeitet, darf immer nur ein aktiver Pfad zwischen + zwei Geräten des Netzwerks existieren. Aufgabe des + Spanning Tree Protocols ist es daher, Schleifen zu entdecken + und redundante Links in den Status + blockiert zu versetzen. Fällt ein + aktiver Link aus, so berechnet das Protokoll einen neuen + Pfad. Dazu wird ein blockierter Pfad in den Status + aktiv versetzt, damit alle Systeme des + Netzwerks wieder miteinander kommunizieren können. + - - Anpassen der Kernelkonfiguration + + Kernelkonfiguration + + Dieser Abschnitt beschreibt nur die + &man.if.bridge.4;-Bridge-Implementierung. Ein + Netgraph-Bridge-Treiber ist ebenfalls verfügbar, wird + hier aber nicht behandelt. Lesen Sie die Manualpage + &man.ng.bridge.4;, wenn Sie diesen Treiber einsetzen + wollen. - - Kerneloptionen - BRIDGE - + Bei diesem Treiber handelt es sich um ein + Kernelmodul, das von &man.ifconfig.8; automatisch geladen + wird, wenn ein Bridge-Interface erzeugt wird. Alternativ ist + es aber auch möglich, die Unterstützung für + den Treiber in Ihren Kernel zu kompilieren. Dazu fügen + Sie die Zeile device if_bridge in Ihre + Kernelkonfigurationsdatei ein und bauen danach den Kernel + neu. - Um die Kernelunterstützung für die LAN-Kopplung - zu aktivieren, fügen Sie + Paketfilter können mit allen Firewallpaketen verwendet + werden, die das &man.pfil.9;-Framework benutzen. Die Firewall + kann dabei entweder als Kernelmodul geladen oder in den Kernel + kompiliert werden. - options BRIDGE + Eine Bridge kann auch als Traffic + Shaper verwendet werden, wenn Sie + &man.altq.4; oder &man.dummynet.4; einsetzen. + - in Ihre Kernelkonfigurationsdatei ein, und erzeugen einen - neuen Kernel. - + + Die LAN-Kopplung aktivieren - - Firewallunterstützung + Eine Bridge wird durch das Klonen von Schnittstellen + erzeugt. Um eine Bridge zu erzeugen, verwenden Sie den Befehl + &man.ifconfig.8;. Ist der Bridge-Treiber nicht in Ihren Kernel + kompiliert, wird er automatisch geladen. - Firewall + &prompt.root; ifconfig bridge create +bridge0 +&prompt.root; ifconfig bridge0 +bridge0: flags=8802<BROADCAST,SIMPLEX,MULTICAST> metric 0 mtu 1500 + ether 96:3d:4b:f1:79:7a + id 00:00:00:00:00:00 priority 32768 hellotime 2 fwddelay 15 + maxage 20 holdcnt 6 proto rstp maxaddr 100 timeout 1200 + root id 00:00:00:00:00:00 priority 0 ifcost 0 port 0 - Wenn Sie die Bridge als Firewall verwenden wollen, - müssen Sie zusätzlich die Option - IPFIREWALL einfügen. Die - Konfiguration einer Firewall wird in - des Handbuchs beschrieben. + Im obigen Beispiel wird die Bridge erzeugt und erhält + automatisch eine zufällig generierte Ethernet-Adresse + zugewiesen. Die Parameter maxaddr sowie + timeout legen fest, wie viele MAC-Adressen + die Bridge in ihrer Forward-Tabelle halten kann beziehungsweise + wie viele Sekunden jeder Eintrag erhalten bleiben soll, nachdem + er zuletzt verwendet wurde. Die restlichen Parameter sind + für die Konfiguration von Spanning Tree notwendig. - Wenn Sie Nicht-IP-Pakete (wie ARP-Pakete) durch Ihre - Bridge leiten wollen, haben Sie drei Möglichkeiten. - Eine Mögleichkeit wäre es, die folgende Option - in Ihre Kernelkonfigurationsdatei aufzunehmen und den - Kernel neu zu bauen: + Im nächsten Schritt werden die Schnittstellen, die + die Bridge verbinden soll, zugewiesen. Damit die Bridge + Datenpakete weiterleiten kann, müssen sowohl die Bridge + als auch die Schnittstellen (der zu verbindenden + Netzwerksegmente) aktiviert sein: - option IPFIREWALL_DEFAULT_TO_ACCEPT + &prompt.root; ifconfig bridge0 addm fxp0 addm fxp1 up +&prompt.root; ifconfig fxp0 up +&prompt.root; ifconfig fxp1 up - Alternativ können Sie den Firewall-Typ in der Datei - rc.conf auf "open" setzen: + Danach ist die Bridge in der Lage, Ethernet-Rahmen zwischen + den Schnittstellen fxp0 und + fxp1 weiterzuleiten. Um diese + Konfiguration beim Systemstart automatisch zu aktivieren, + müssen Sie folgende Einträge in die Datei + /etc/rc.conf aufnehmen: - firewall_type="open" + cloned_interfaces="bridge0" +ifconfig_bridge0="addm fxp0 addm fxp1 up" +ifconfig_fxp0="up" +ifconfig_fxp1="up" - Beachten Sie aber, dass Ihre Firewall durch diese Optionen - per Voreinstellung alle Pakete und Verbindungen akzeptiert! - Der Einsatz dieser Optionen erfordert also umfangreiche - Anpassungen Ihrer Firewallregeln. + Benötigen Sie für die Bridge eine IP-Adresse, + müssen Sie diese der Schnittstelle der Bridge zuweisen + (und nicht einer der Schnittstellen der gekoppelten + Netzwerksegmente). Dabei können Sie die IP-Adresse + sowohl statisch als auch dynamisch über DHCP + zuweisen: - Die dritte Möglichkeit ist der Einsatz der folgenden - &man.ipfw.8;-Regel: + &prompt.root; ifconfig bridge0 inet 192.168.0.1/24 - &prompt.root; ipfw add allow mac-type arp layer2 + Sie können der Bridge-Schnittstelle auch eine + IPv6-Adresse zuweisen. + - Diese Regel können Sie auch in Ihren bereits - existierenden Regelsatz aufnehmen. Da diese Regel - &man.arp.8;-Pakete durchlassen soll, muss Sie am Beginn - Ihrer Firewallregeln platziert werden. - + + Firewalls + firewall - - Unterstützung für Traffic Shaping + Nachdem ein Paketfilter aktiviert wurde, können + Datenpakete, die von den Schnittstellen der gekoppelten + Netzwerksegmente gesendet und empfangen werden, über + die Bridge weitergeleitet oder nach bestimmten Regeln + gefiltert oder auch komplett geblockt werden. Ist die + Richtung des Paketflusses wichtig, ist es am besten, eine + Firewall auf den Schnittstellen der einzelnen + Netzwerksegmente einzurichten und nicht auf der Bridge + selbst. - Wenn Sie die Bridge als Traffic-Shaper verwenden wollen, - müssen Sie die Option DUMMYNET in - Ihre Kernelkonfigurationsdatei einfügen. Lesen Sie - &man.dummynet.4;, um weitere Informationen zu erhalten. - + Eine Bridge verfügt über verschiedene Optionen, + über die Sie die Weiterleitung von Nicht-IP- und + ARP-Paketen sowie den Einsatz von Layer 2-Firewalls + (mit IPFW) steuern können. Lesen Sie die Manualpage + &man.if.bridge.4;, wenn Sie diese Funktionen + benötigen. - Die LAN-Kopplung aktivieren + Spanning Tree + + Der Bridge-Treiber implementiert das Rapid + Spanning Tree Protocol (RSTP oder 802.1w), das + abwärtskompatibel zum veralteten Spanning + Tree Protocol (STP) ist. Spanning Tree + dient dazu, Schleifen in einer Netzwerktopologie zu entdecken + und zu entfernen. RSTP arbeitet dabei schneller als das + veraltete STP. RSTP tauscht Informationen mit + benachbarten Switchen aus, um Pakete korrekt weiterzuleiten + und eine Schleifenbildung zu verhindern. + + Die folgende Tabelle listet die von den verschiedenen + &os;-Versionen unterstützten Betriebsmodi auf: + + + + + + &os;-Version + STP-Modus + Standardmodus + + + + + + &os; 5.4—&os; 6.2 + STP + STP + - Fügen Sie die Zeile + + &os; 6.3+ + RSTP oder STP + STP + - net.link.ether.bridge.enable=1 + + &os; 7.0+ + RSTP oder STP + RSTP + + + + - in /etc/sysctl.conf ein, um die Bridge - zur Laufzeit zu aktivieren, sowie die Zeile + Spanning Tree kann auf den Schnittstellen der + durch die Bridge verbundenen Netzwerksegmente über die + Option stp aktiviert werden. Für eine + Bridge, die die Schnittstellen fxp0 und + fxp1 verbindet, aktivieren Sie STP wie + folgt: - net.link.ether.bridge.config=if1,if2 + &prompt.root; ifconfig bridge0 stp fxp0 stp fxp1 +bridge0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 + ether d6:cf:d5:a0:94:6d + id 00:01:02:4b:d4:50 priority 32768 hellotime 2 fwddelay 15 + maxage 20 holdcnt 6 proto rstp maxaddr 100 timeout 1200 + root id 00:01:02:4b:d4:50 priority 32768 ifcost 0 port 0 + member: fxp0 flags=1c7<LEARNING,DISCOVER,STP,AUTOEDGE,PTP,AUTOPTP> + port 3 priority 128 path cost 200000 proto rstp + role designated state forwarding + member: fxp1 flags=1c7<LEARNING,DISCOVER,STP,AUTOEDGE,PTP,AUTOPTP> + port 4 priority 128 path cost 200000 proto rstp + role designated state forwarding - um die LAN-Kopplung für die festgelegten Geräte - zu ermöglichen (ersetzen Sie dazu - if1 und - if2 durch die Namen Ihrer - Netzkarten). Wenn Sie die Datenpakete via &man.ipfw.8; filtern - wollen, sollten Sie zusätzlich folgende Zeile - einfügen: + Diese Bridge hat die Spanning-Tree-ID + 00:01:02:4b:d4:50 und die Priorität + 32768. Da diese ID mit der + Root-ID identisch ist, handelt es sich um die + Root-Bridge dieses Netzwerks. - net.link.ether.bridge.ipfw=1 + Auf einer anderen Bridge des Netzwerks ist Spanning Tree + ebenfalls aktiviert: - Vor &os; 5.2-RELEASE verwenden Sie die - folgenden Zeilen: + bridge0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 + ether 96:3d:4b:f1:79:7a + id 00:13:d4:9a:06:7a priority 32768 hellotime 2 fwddelay 15 + maxage 20 holdcnt 6 proto rstp maxaddr 100 timeout 1200 + root id 00:01:02:4b:d4:50 priority 32768 ifcost 400000 port 4 + member: fxp0 flags=1c7<LEARNING,DISCOVER,STP,AUTOEDGE,PTP,AUTOPTP> + port 4 priority 128 path cost 200000 proto rstp + role root state forwarding + member: fxp1 flags=1c7<LEARNING,DISCOVER,STP,AUTOEDGE,PTP,AUTOPTP> + port 5 priority 128 path cost 200000 proto rstp + role designated state forwarding - net.link.ether.bridge=1 -net.link.ether.bridge_cfg=if1,if2 -net.link.ether.bridge_ipfw=1 + Die Zeile root id 00:01:02:4b:d4:50 priority 32768 + ifcost 400000 port 4 zeigt an, dass die Root-Bridge wie + im obigen Beispiel die ID 00:01:02:4b:d4:50 + hat. Die Pfadkosten hin zur Root-Bridge betragen + 400000, wobei der Pfad zur Root-Bridge + über Port 4 geht (der wiederum + der Schnittstelle fxp0 + entspricht). - Sonstige Informationen + Fortgeschrittene Funktionen + + + Den Datenfluss rekonstruieren + + Die Bridge unterstützt den Monitormodus. Dabei + werden alle Pakete verworfen, nachdem sie von &man.bpf.4; + verarbeitet wurden. In diesem Modus erfolgt keine weitere + Bearbeitung und auch keine Weiterleitung von Datenpaketen. + Es ist daher möglich, die Eingabe von zwei oder mehr + Netzwerkschnittstellen in einen einzigen gemeinsamen + &man.bpf.4;-Stream zu vereinen. Ein solcher Datenstrom + ist beispielsweise nützlich, um den Datenverkehr für + ""network taps"" zu rekonstruieren, die ihre RX/TX-Signale + über verschiedene Schnittstellen senden. + + Um die Eingabe von vier Netzwerkschnittstellen in einzigen + gemeinsamen Datenstrom zu vereinen, geben Sie Folgendes + ein: + + &prompt.root; ifconfig bridge0 addm fxp0 addm fxp1 addm fxp2 addm fxp3 monitor up +&prompt.root; tcpdump -i bridge0 + + + + Span Ports + + Eine Kopie jedes Ethernet-Rahmens, der an der Bridge + ankommt, wird über einen festgelegten + Span Port verschickt. + Auf einer Bridge können + beliebig viele Span Ports festgelegt werden. Wird + eine Schnittstelle als Span Port konfiguriert, kann + sie nicht mehr als normaler Bridge-Port verwendet werden. + Eine derartige Konfiguration ist beispielsweise sinnvoll, + um den Datenverkehr, der in einem Netzwerk über die + Bridge läuft, auf einen Rechner zu übertragen, + der mit einem Span Port der Bridge verbunden + ist. + + Um eine Kopie aller Ethernet-Rahmen über die + Schnittstelle fxp4 zu verschicken, + geben Sie Folgendes ein: + + &prompt.root; ifconfig bridge0 span fxp4 + + + + Private Schnittstellen + + Eine private Schnittstelle leitet keine Daten an einen + Port weiter, bei dem es sich ebenfalls um eine private + Schnittstelle handelt. Der Datenverkehr wird dabei komplett + blockiert, auch Ethernet-Rahmen und ARP-Pakete werden nicht + weitergeleitet. Wollen Sie hingegen nur spezifische + Datenpakete blockieren, sollten Sie eine Firewall + einsetzen. + + + + Schnittstellen als <foreignphrase>sticky</foreignphrase> + kennzeichnen + + Wenn die Schnittstelle eines über eine Bridge + verbundenen Netzwerksegments als + sticky gekennzeichnet wird, + werden alle dynamisch gelernten Adressen als statische Adressen + behandelt, sobald sie in den Forward-Cache der Bridge + aufgenommen wurden. Sticky-Einträge werden niemals aus + dem Cache entfernt oder ersetzt. Selbst dann nicht, wenn die + Adresse von einer anderen Schnittstelle verwendet wird. Sie + können dadurch die Vorteile statischer Adresseinträge + nutzen, ohne die Forward-Tabelle vor dem Einsatz der Bridge + mit statischen Einträgen füllen zu müssen. + Clients, die sich in einem bestimmten von der Bridge + verwalteten Segmente befinden, können dabei nicht in ein + anderes Segment wechseln. + + Ein weiteres Beispiel für den Einsatz von + Sticky-Adressen wäre die Kombination einer Bridge mit + mehreren VLANs, um einen Router zu konfigurieren, der in + in der Lage ist, einzelne Kundennetzwerke voneinander zu + trennen, ohne IP-Adressbereiche zu verschwenden. Für das + folgende Beispiel nehmen wir an, dass sich der Client + CustomerA im VLAN + vlan100 und der Client + CustomerB im VLAN + vlan101 befinden. Die Bridge hat die + IP-Adresse 192.168.0.1 und ist + als Internet-Router konfiguriert. + + &prompt.root; ifconfig bridge0 addm vlan100 sticky vlan100 addm vlan101 sticky vlan101 +&prompt.root; ifconfig bridge0 inet 192.168.0.1/24 + + Beide Clients sehen 192.168.0.1 als Ihr Default-Gateway. + Da der Brücken-Cache sticky ist, + sind Sie nicht dazu in der Lage, die MAC-Adresse des + anderen Kunden zu spoofen und dessen Datenverkehr + abzufangen. + + Sie können die Kommunikation zwischen den VLANs + vollständig unterbinden, wenn Sie private Schnittstellen + (oder eine Firewall) einsetzen: + + &prompt.root; ifconfig bridge0 private vlan100 private vlan101 + + Die Kunden sind nun komplett voneinander isoliert und + der komplette /24-Adressbereich + kann zugewiesen werden, ohne dass Sie Subnetze einsetzen + müssen. + + + + SNMP-Monitoring + + Die Schnittstelle der Bridge sowie die STP-Parameter + können durch den bereits im Basissystem enthaltenen + SNMP-Daemon überwacht werden. Die exportierten + Bridge-MIBs entsprechen den IETF-Standards, daher können + Sie einen beliebigen SNMP-Client oder ein beliebiges + Monitoring-Werkzeug einsetzen, um die benötigten Daten + zu erhalten. + + Auf dem Rechner, auf dem die Bridge konfiguriert ist, + aktivieren Sie die Zeile + begemotSnmpdModulePath."bridge" = "/usr/lib/snmp_bridge.so" + in der Datei /etc/snmp.config und starten + danach den bsnmpd-Daemon. + Eventuell benötigen Sie noch weitere + Konfigurationsparameter wie Community-Namen und + Zugriffslisten. Die Konfiguration dieser Parameter wird + in den Manualpages &man.bsnmpd.1; sowie &man.snmp.bridge.3; + beschrieben. + + Die folgenden Beispiele verwenden das Softwarepaket + Net-SNMP (net-mgmt/net-snmp), um die Bridge + abzufragen. Alternativ können Sie dafür auch den + Port net-mgmt/bsnmptools + einsetzen. Auf dem SNMP-Client fügen Sie danach die + folgenden Zeilen in die Datei + $HOME/.snmp/snmp.conf ein, um die + MIB-Definitionen der Bridge in + Net-SNMP zu importieren: + + mibdirs +/usr/share/snmp/mibs +mibs +BRIDGE-MIB:RSTP-MIB:BEGEMOT-MIB:BEGEMOT-BRIDGE-MIB + + Um eine einzelne Bridge über den IETF BRIDGE-MIB + (RFC4188) zu überwachen, geben Sie Folgendes ein: + + &prompt.user; snmpwalk -v 2c -c public bridge1.example.com mib-2.dot1dBridge +BRIDGE-MIB::dot1dBaseBridgeAddress.0 = STRING: 66:fb:9b:6e:5c:44 +BRIDGE-MIB::dot1dBaseNumPorts.0 = INTEGER: 1 ports +BRIDGE-MIB::dot1dStpTimeSinceTopologyChange.0 = Timeticks: (189959) 0:31:39.59 centi-seconds +BRIDGE-MIB::dot1dStpTopChanges.0 = Counter32: 2 +BRIDGE-MIB::dot1dStpDesignatedRoot.0 = Hex-STRING: 80 00 00 01 02 4B D4 50 +... +BRIDGE-MIB::dot1dStpPortState.3 = INTEGER: forwarding(5) +BRIDGE-MIB::dot1dStpPortEnable.3 = INTEGER: enabled(1) +BRIDGE-MIB::dot1dStpPortPathCost.3 = INTEGER: 200000 +BRIDGE-MIB::dot1dStpPortDesignatedRoot.3 = Hex-STRING: 80 00 00 01 02 4B D4 50 +BRIDGE-MIB::dot1dStpPortDesignatedCost.3 = INTEGER: 0 +BRIDGE-MIB::dot1dStpPortDesignatedBridge.3 = Hex-STRING: 80 00 00 01 02 4B D4 50 +BRIDGE-MIB::dot1dStpPortDesignatedPort.3 = Hex-STRING: 03 80 +BRIDGE-MIB::dot1dStpPortForwardTransitions.3 = Counter32: 1 +RSTP-MIB::dot1dStpVersion.0 = INTEGER: rstp(2) + + Der Wert der Variable + dot1dStpTopChanges.0 ist hier 2, die + STP-Topologie der Bridge wurde also bereits zweimal + geändert. Unter einer Änderung versteht man dabei + die Anpassung eines oder mehrerer Links und die Kalkulation + eines neuen Baums. Der Wert der Variable + dot1dStpTimeSinceTopologyChange.0 gibt an, + wann dies zuletzt geschah. + + Um mehrere Bridge-Schnittstellen zu überwachen, + können Sie den privaten BEGEMOT-BRIDGE-MIB + einsetzen: - Wenn Sie via &man.ssh.1; auf die Bridge zugreifen wollen, - können Sie einer der Netzkarten eine IP-Adresse zuzuweisen. - Es besteht Einigkeit darüber, dass es eine schlechte Idee - ist, beiden Karten eine IP-Adresse zuzuweisen. - + &prompt.user; snmpwalk -v 2c -c public bridge1.example.com +enterprises.fokus.begemot.begemotBridge +BEGEMOT-BRIDGE-MIB::begemotBridgeBaseName."bridge0" = STRING: bridge0 +BEGEMOT-BRIDGE-MIB::begemotBridgeBaseName."bridge2" = STRING: bridge2 +BEGEMOT-BRIDGE-MIB::begemotBridgeBaseAddress."bridge0" = STRING: e:ce:3b:5a:9e:13 +BEGEMOT-BRIDGE-MIB::begemotBridgeBaseAddress."bridge2" = STRING: 12:5e:4d:74:d:fc +BEGEMOT-BRIDGE-MIB::begemotBridgeBaseNumPorts."bridge0" = INTEGER: 1 +BEGEMOT-BRIDGE-MIB::begemotBridgeBaseNumPorts."bridge2" = INTEGER: 1 +... +BEGEMOT-BRIDGE-MIB::begemotBridgeStpTimeSinceTopologyChange."bridge0" = Timeticks: (116927) 0:19:29.27 centi-seconds +BEGEMOT-BRIDGE-MIB::begemotBridgeStpTimeSinceTopologyChange."bridge2" = Timeticks: (82773) 0:13:47.73 centi-seconds +BEGEMOT-BRIDGE-MIB::begemotBridgeStpTopChanges."bridge0" = Counter32: 1 +BEGEMOT-BRIDGE-MIB::begemotBridgeStpTopChanges."bridge2" = Counter32: 1 +BEGEMOT-BRIDGE-MIB::begemotBridgeStpDesignatedRoot."bridge0" = Hex-STRING: 80 00 00 40 95 30 5E 31 +BEGEMOT-BRIDGE-MIB::begemotBridgeStpDesignatedRoot."bridge2" = Hex-STRING: 80 00 00 50 8B B8 C6 A9 - Wenn Sie verschiedene Bridges in Ihrem Netzwerk haben, kann - es dennoch nicht mehr als einen Weg zwischen zwei - Arbeitsplätzen geben. Das heißt, - Spanning tree link Management - wird nicht unterstützt. + Um die über den + mib-2.dot1dBridge-Subtree überwachte + Bridge-Schnittstelle zu ändern, geben Sie Folgendes + ein: - Eine Bridge kann, besonders für Verkehr über - Segmente, die Laufzeiten von Paketen erhöhen. + &prompt.user; snmpset -v 2c -c private bridge1.example.com +BEGEMOT-BRIDGE-MIB::begemotBridgeDefaultBridgeIf.0 s bridge2 + ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#6 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.45 2007/07/10 18:38:26 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/basics/chapter.sgml,v 1.102 2007/07/09 12:27:29 jkois Exp $ - basiert auf: 1.148 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.46 2007/10/19 09:56:47 jkois Exp $ + $FreeBSDde: de-docproj/books/handbook/basics/chapter.sgml,v 1.103 2007/09/03 17:22:40 as Exp $ + basiert auf: 1.149 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 21 21:16:00 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 687D716A420; Sun, 21 Oct 2007 21:16: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 12B1016A41A for ; Sun, 21 Oct 2007 21:16:00 +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 16BDB13C494 for ; Sun, 21 Oct 2007 21:16:00 +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 l9LLFxaN062723 for ; Sun, 21 Oct 2007 21:15:59 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9LLFx4A062720 for perforce@freebsd.org; Sun, 21 Oct 2007 21:15:59 GMT (envelope-from jb@freebsd.org) Date: Sun, 21 Oct 2007 21:15:59 GMT Message-Id: <200710212115.l9LLFx4A062720@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 127905 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, 21 Oct 2007 21:16:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=127905 Change 127905 by jb@jb_freebsd1 on 2007/10/21 21:15:09 IF6 Affected files ... .. //depot/projects/dtrace6/src/UPDATING#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_read_support_format_zip.c#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_write_set_format_cpio.c#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_write_set_format_cpio_newc.c#2 integrate .. //depot/projects/dtrace6/src/share/zoneinfo/Makefile#3 integrate .. //depot/projects/dtrace6/src/share/zoneinfo/africa#2 integrate .. //depot/projects/dtrace6/src/share/zoneinfo/asia#2 integrate .. //depot/projects/dtrace6/src/share/zoneinfo/southamerica#2 integrate .. //depot/projects/dtrace6/src/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/dtrace6/src/sys/arm/xscale/i80321/std.iq31244#2 integrate .. //depot/projects/dtrace6/src/sys/conf/options.arm#2 integrate .. //depot/projects/dtrace6/src/sys/ddb/db_command.c#2 integrate .. //depot/projects/dtrace6/src/sys/nfsclient/nfs_subs.c#2 integrate .. //depot/projects/dtrace6/src/sys/powerpc/powerpc/db_interface.c#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/sparc64/db_interface.c#2 integrate .. //depot/projects/dtrace6/src/sys/vm/uma_core.c#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/adduser/adduser.8#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/adduser/rmuser.8#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/adduser/rmuser.sh#2 integrate Differences ... ==== //depot/projects/dtrace6/src/UPDATING#2 (text+ko) ==== @@ -534,4 +534,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.416.2.33 2007/08/06 10:16:01 thompsa Exp $ +$FreeBSD: src/UPDATING,v 1.416.2.35 2007/10/21 04:22:46 julian Exp $ ==== //depot/projects/dtrace6/src/lib/libarchive/archive_read_support_format_zip.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.5.2.4 2007/07/19 14:31:52 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.5.2.5 2007/10/18 05:19:44 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -335,6 +335,10 @@ zip->entry_bytes_remaining = zip->compressed_size; zip->entry_offset = 0; + /* If there's no body, force read_data() to return EOF immediately. */ + if (zip->entry_bytes_remaining < 1) + zip->end_of_entry = 1; + /* Set up a more descriptive format name. */ sprintf(zip->format_name, "ZIP %d.%d (%s)", zip->version / 10, zip->version % 10, @@ -422,6 +426,9 @@ /* End-of-entry cleanup done. */ zip->end_of_entry_cleanup = 1; } + *offset = zip->entry_uncompressed_bytes_read; + *size = 0; + *buff = NULL; return (ARCHIVE_EOF); } ==== //depot/projects/dtrace6/src/lib/libarchive/archive_write_set_format_cpio.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_cpio.c,v 1.5.2.3 2007/07/05 01:56:40 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_cpio.c,v 1.5.2.4 2007/10/19 03:50:48 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -142,12 +142,17 @@ format_octal(archive_entry_mtime(entry), &h.c_mtime, sizeof(h.c_mtime)); format_octal(pathlength, &h.c_namesize, sizeof(h.c_namesize)); + /* Non-regular files don't store bodies. */ + if (archive_entry_filetype(entry) != AE_IFREG) + archive_entry_set_size(entry, 0); + /* Symlinks get the link written as the body of the entry. */ p = archive_entry_symlink(entry); if (p != NULL && *p != '\0') format_octal(strlen(p), &h.c_filesize, sizeof(h.c_filesize)); else - format_octal(archive_entry_size(entry), &h.c_filesize, sizeof(h.c_filesize)); + format_octal(archive_entry_size(entry), + &h.c_filesize, sizeof(h.c_filesize)); ret = (a->compressor.write)(a, &h, sizeof(h)); if (ret != ARCHIVE_OK) ==== //depot/projects/dtrace6/src/lib/libarchive/archive_write_set_format_cpio_newc.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_cpio_newc.c,v 1.1.2.1 2007/07/05 01:56:40 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_cpio_newc.c,v 1.1.2.2 2007/10/19 03:50:48 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -148,12 +148,17 @@ format_hex(pathlength, &h.c_namesize, sizeof(h.c_namesize)); format_hex(0, &h.c_checksum, sizeof(h.c_checksum)); + /* Non-regular files don't store bodies. */ + if (archive_entry_filetype(entry) != AE_IFREG) + archive_entry_set_size(entry, 0); + /* Symlinks get the link written as the body of the entry. */ p = archive_entry_symlink(entry); if (p != NULL && *p != '\0') format_hex(strlen(p), &h.c_filesize, sizeof(h.c_filesize)); else - format_hex(archive_entry_size(entry), &h.c_filesize, sizeof(h.c_filesize)); + format_hex(archive_entry_size(entry), + &h.c_filesize, sizeof(h.c_filesize)); ret = (a->compressor.write)(a, &h, sizeof(h)); if (ret != ARCHIVE_OK) ==== //depot/projects/dtrace6/src/share/zoneinfo/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/zoneinfo/Makefile,v 1.20.2.3 2007/10/10 00:09:08 edwin Exp $ +# $FreeBSD: src/share/zoneinfo/Makefile,v 1.20.2.4 2007/10/18 13:02:54 edwin Exp $ # # HOW TO UPDATE THE ZONEINFO DATA ==== //depot/projects/dtrace6/src/share/zoneinfo/africa#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# @(#)africa 8.9 +# @(#)africa 8.10 # 
 
 # This data is by no means authoritative; if you think you know better,
@@ -224,9 +224,19 @@
 # From Jesper Norgaard Welen (2007-08-15): [The following agree:]
 # http://www.nentjes.info/Bill/bill5.htm 
 # http://www.timeanddate.com/worldclock/city.html?n=53
+# From Steffen Thorsen (2007-09-04): The official information...:
+# http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/000002/0207000000000000001580.htm
+Rule	Egypt	2007	only	-	Sep	Thu>=1	23:00s	0	-
+# From Abdelrahman Hassan (2007-09-06):
+# Due to the Hijri (lunar Islamic calendar) year being 11 days shorter
+# than the year of the Gregorian calendar, Ramadan shifts earlier each
+# year. This year it will be observed September 13 (September is quite
+# hot in Egypt), and the idea is to make fasting easier for workers by
+# shifting business hours one hour out of daytime heat. Consequently,
+# unless discontinued, next DST may end Thursday 28 August 2008.
 # From Paul Eggert (2007-08-17):
-# For lack of better info, assume the new rule is first Thursday.
-Rule	Egypt	2007	max	-	Sep	Thu>=1	23:00s	0	-
+# For lack of better info, assume the new rule is last Thursday in August.
+Rule	Egypt	2008	max	-	Aug	lastThu	23:00s	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Cairo	2:05:00 -	LMT	1900 Oct

==== //depot/projects/dtrace6/src/share/zoneinfo/asia#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# @(#)asia	8.11
+# @(#)asia	8.12
 # 
 
 # This data is by no means authoritative; if you think you know better,
@@ -568,14 +568,15 @@
 # Reingold's/Dershowitz' calculator gives correctly the Gregorian date
 # 2058-03-21 for 1 Farvardin 1437 (astronomical).
 #
-# From Paul Eggert (2006-03-22):
-# The above comments about post-2006 transitions may become relevant again,
-# if Iran ever resuscitates DST, so we'll leave the comments in.
-#
 # From Steffen Thorsen (2006-03-22):
 # Several of my users have reported that Iran will not observe DST anymore:
 # http://www.irna.ir/en/news/view/line-17/0603193812164948.htm
 #
+# From Reuters (2007-09-16), with a heads-up from Jesper Norgaard Welen:
+# ... the Guardian Council ... approved a law on Sunday to re-introduce
+# daylight saving time ...
+# http://uk.reuters.com/article/oilRpt/idUKBLA65048420070916
+#
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Iran	1978	1980	-	Mar	21	0:00	1:00	D
 Rule	Iran	1978	only	-	Oct	21	0:00	0	S
@@ -596,6 +597,36 @@
 Rule	Iran	2004	only	-	Sep	21	0:00	0	S
 Rule	Iran	2005	only	-	Mar	22	0:00	1:00	D
 Rule	Iran	2005	only	-	Sep	22	0:00	0	S
+Rule	Iran	2008	only	-	Mar	21	0:00	1:00	D
+Rule	Iran	2008	only	-	Sep	21	0:00	0	S
+Rule	Iran	2009	2011	-	Mar	22	0:00	1:00	D
+Rule	Iran	2009	2011	-	Sep	22	0:00	0	S
+Rule	Iran	2012	only	-	Mar	21	0:00	1:00	D
+Rule	Iran	2012	only	-	Sep	21	0:00	0	S
+Rule	Iran	2013	2015	-	Mar	22	0:00	1:00	D
+Rule	Iran	2013	2015	-	Sep	22	0:00	0	S
+Rule	Iran	2016	only	-	Mar	21	0:00	1:00	D
+Rule	Iran	2016	only	-	Sep	21	0:00	0	S
+Rule	Iran	2017	2019	-	Mar	22	0:00	1:00	D
+Rule	Iran	2017	2019	-	Sep	22	0:00	0	S
+Rule	Iran	2020	only	-	Mar	21	0:00	1:00	D
+Rule	Iran	2020	only	-	Sep	21	0:00	0	S
+Rule	Iran	2021	2023	-	Mar	22	0:00	1:00	D
+Rule	Iran	2021	2023	-	Sep	22	0:00	0	S
+Rule	Iran	2024	only	-	Mar	21	0:00	1:00	D
+Rule	Iran	2024	only	-	Sep	21	0:00	0	S
+Rule	Iran	2025	2027	-	Mar	22	0:00	1:00	D
+Rule	Iran	2025	2027	-	Sep	22	0:00	0	S
+Rule	Iran	2028	2029	-	Mar	21	0:00	1:00	D
+Rule	Iran	2028	2029	-	Sep	21	0:00	0	S
+Rule	Iran	2030	2031	-	Mar	22	0:00	1:00	D
+Rule	Iran	2030	2031	-	Sep	22	0:00	0	S
+Rule	Iran	2032	2033	-	Mar	21	0:00	1:00	D
+Rule	Iran	2032	2033	-	Sep	21	0:00	0	S
+Rule	Iran	2034	2035	-	Mar	22	0:00	1:00	D
+Rule	Iran	2034	2035	-	Sep	22	0:00	0	S
+Rule	Iran	2036	2037	-	Mar	21	0:00	1:00	D
+Rule	Iran	2036	2037	-	Sep	21	0:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Tehran	3:25:44	-	LMT	1916
 			3:25:44	-	TMT	1946	# Tehran Mean Time
@@ -1518,6 +1549,17 @@
 # I guess it is likely that next year's date will be moved as well,
 # because of the Ramadan.
 
+# From Jesper Norgaard Welen (2007-09-18):
+# According to Steffen Thorsen's web site the Gaza Strip and the rest of the
+# Palestinian territories left DST early on 13.th. of September at 2:00.
+
+# From Paul Eggert (2007-09-20):
+# My understanding is that Gaza and the West Bank disagree even over when
+# the weekend is (Thursday+Friday versus Friday+Saturday), so I'd be a bit
+# surprised if they agreed about DST.  But for now, assume they agree.
+# For lack of better information, predict that future changes will be
+# the 2nd Thursday of September at 02:00.
+
 # The rules for Egypt are stolen from the `africa' file.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
@@ -1533,7 +1575,7 @@
 Rule Palestine	2005	only	-	Oct	 4	2:00	0	-
 Rule Palestine	2006	max	-	Apr	 1	0:00	1:00	S
 Rule Palestine	2006	only	-	Sep	22	0:00	0	-
-Rule Palestine	2007	max	-	Oct	Fri>=15	0:00	0	-
+Rule Palestine	2007	max	-	Sep	Thu>=8	2:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct

==== //depot/projects/dtrace6/src/share/zoneinfo/southamerica#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# @(#)southamerica	8.11
+# @(#)southamerica	8.12
 # 
 
 # This data is by no means authoritative; if you think you know better,
@@ -424,6 +424,10 @@
 # modern Brazilian eletronic voting machines which, apparently, can't deal
 # with a time change between the first and the second rounds of the elections.
 
+# From Steffen Thorsen (2007-09-20):
+# Brazil will start DST on 2007-10-14 00:00 and end on 2008-02-17 00:00:
+# http://www.mme.gov.br/site/news/detail.do;jsessionid=BBA06811AFCAAC28F0285210913513DA?newsId=13975
+
 # From Paul Eggert (2002-10-10):
 # The official decrees referenced below are mostly taken from
 # 
@@ -557,13 +561,18 @@
 # Decree 5,539 (2005-09-19),
 # adopted by the same states as before.
 Rule	Brazil	2005	only	-	Oct	16	 0:00	1:00	S
-# Decree 5,920
-# (2006-10-03), adopted by the same states as before.
-Rule	Brazil	2006	max	-	Nov	Sun>=1	 0:00	1:00	S
-Rule	Brazil	2007	max	-	Feb	lastSun	 0:00	0	-
+# Decree 5,920 (2006-10-03),
+# adopted by the same states as before.
+Rule	Brazil	2006	only	-	Nov	 5	 0:00	1:00	S
+Rule	Brazil	2007	only	-	Feb	25	 0:00	0	-
+# (Decree number not yet known)
+# http://www.brasil.gov.br/noticias/ultimas_noticias/horario_verao070920/
+# (2007-09-20) after a heads-up from Steffen Thorsen:
+Rule	Brazil	2007	max	-	Oct	Sun>=8	 0:00	1:00	S
+Rule	Brazil	2008	max	-	Feb	Sun>=15	 0:00	0	-
 # The latest ruleset listed above says that the following states observe DST:
 # DF, ES, GO, MG, MS, MT, PR, RJ, RS, SC, SP.
-# For dates after mid-2007, the above rules with TO="max" are guesses
+# For dates after mid-2008, the above rules with TO="max" are guesses
 # and are quite possibly wrong, but are more likely than no DST at all.
 
 
@@ -1097,8 +1106,20 @@
 			-3:00	Uruguay	UY%sT
 
 # Venezuela
+#
+# From Kiraz Janicke (2007-09-25), in
+# http://www.venezuelanalysis.com/analysis/2645:
+# The proposal ... involves turning the clock back half an hour from
+# +4.00 Greenwich Mean Time (GMT), to +4.30GMT, the time zone
+# Venezuela had until December 31, 1964, when the current time zone
+# was adopted. The change was due to take place on September 17 and
+# then on September 24, but has since been postponed until December
+# 31, to allow for compliance with international organizations, such
+# as the International Office of Weights and Measures.
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Caracas	-4:27:44 -	LMT	1890
 			-4:27:40 -	CMT	1912 Feb 12 # Caracas Mean Time?
 			-4:30	-	VET	1965	     # Venezuela Time
-			-4:00	-	VET
+			-4:00	-	VET	2008
+			-4:30	-	VET

==== //depot/projects/dtrace6/src/sys/arm/xscale/i80321/i80321_timer.c#2 (text+ko) ====

@@ -40,7 +40,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_timer.c,v 1.5 2005/02/13 18:05:36 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_timer.c,v 1.5.2.1 2007/10/17 23:29:02 cognet Exp $");
 
 #include 
 #include 
@@ -61,6 +61,8 @@
 
 #include 
 
+#include "opt_timer.h"
+
 void (*i80321_hardclock_hook)(void) = NULL;
 struct i80321_timer_softc {
 	device_t	dev;
@@ -76,7 +78,9 @@
 static int32_t last = -1;
 static int ticked = 0;
 
+#ifndef COUNTS_PER_SEC
 #define	COUNTS_PER_SEC		200000000	/* 200MHz */
+#endif
 #define	COUNTS_PER_USEC		(COUNTS_PER_SEC / 1000000)
 
 static struct timecounter i80321_timer_timecounter = {

==== //depot/projects/dtrace6/src/sys/arm/xscale/i80321/std.iq31244#2 (text+ko) ====

@@ -1,6 +1,7 @@
 #IQ31244 board configuration
-#$FreeBSD: src/sys/arm/xscale/i80321/std.iq31244,v 1.2 2004/11/18 00:05:09 cognet Exp $
+#$FreeBSD: src/sys/arm/xscale/i80321/std.iq31244,v 1.2.2.1 2007/10/17 23:29:02 cognet Exp $
 include		"../xscale/i80321/std.i80321"
 files		"../xscale/i80321/files.iq31244"
 makeoptions	KERNPHYSADDR=0xa0200000
 makeoptions	KERNVIRTADDR=0xc0200000
+options		COUNTS_PER_SEC=198000000

==== //depot/projects/dtrace6/src/sys/conf/options.arm#2 (text+ko) ====

@@ -1,9 +1,11 @@
-#$FreeBSD: src/sys/conf/options.arm,v 1.5.2.3 2007/02/27 00:27:50 cognet Exp $
+#$FreeBSD: src/sys/conf/options.arm,v 1.5.2.4 2007/10/17 23:29:01 cognet Exp $
 ARM32_NEW_VM_LAYOUT	opt_vm.h
 ARM9_CACHE_WRITE_THROUGH	opt_global.h
 ARM_CACHE_LOCK_ENABLE	opt_global.h
 ARMFPE			opt_global.h
+ARM_KERN_DIRECTMAP	opt_vm.h
 ARM_USE_SMALL_ALLOC	opt_global.h
+COUNTS_PER_SEC		opt_timer.h
 CPU_SA1100		opt_global.h
 CPU_SA1110		opt_global.h
 CPU_ARM9		opt_global.h

==== //depot/projects/dtrace6/src/sys/ddb/db_command.c#2 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/ddb/db_command.c,v 1.60.2.2 2005/10/25 20:10:56 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/ddb/db_command.c,v 1.60.2.3 2007/10/19 16:48:43 obrien Exp $");
 
 #include 
 #include 
@@ -68,6 +68,7 @@
 
 static db_cmdfcn_t	db_fncall;
 static db_cmdfcn_t	db_gdb;
+static db_cmdfcn_t	db_halt;
 static db_cmdfcn_t	db_kill;
 static db_cmdfcn_t	db_reset;
 static db_cmdfcn_t	db_stack_trace;
@@ -420,6 +421,8 @@
 	{ "show",	0,			0,	db_show_cmds },
 	{ "ps",		db_ps,			0,	0 },
 	{ "gdb",	db_gdb,			0,	0 },
+	{ "halt",	db_halt,		0,	0 },
+	{ "reboot",	db_reset,		0,	0 },
 	{ "reset",	db_reset,		0,	0 },
 	{ "kill",	db_kill,		CS_OWN,	0 },
 	{ "watchdog",	db_watchdog,		0,	0 },
@@ -545,6 +548,13 @@
 }
 
 static void
+db_halt(db_expr_t dummy, boolean_t dummy2, db_expr_t dummy3, char *dummy4)
+{
+
+	cpu_halt();
+}
+
+static void
 db_kill(dummy1, dummy2, dummy3, dummy4)
 	db_expr_t	dummy1;
 	boolean_t	dummy2;

==== //depot/projects/dtrace6/src/sys/nfsclient/nfs_subs.c#2 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_subs.c,v 1.140.2.2 2007/02/11 03:07:46 mohans Exp $");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_subs.c,v 1.140.2.3 2007/10/17 16:07:10 jhb Exp $");
 
 /*
  * These functions support the macros and help fiddle mbuf chains for
@@ -478,7 +478,7 @@
 	struct mbuf *md;
 	enum vtype vtyp;
 	u_short vmode;
-	struct timespec mtime;
+	struct timespec mtime, mtime_save;
 	int v3 = NFS_ISV3(vp);
 
 	md = *mdp;
@@ -545,6 +545,7 @@
 	vap->va_type = vtyp;
 	vap->va_mode = (vmode & 07777);
 	vap->va_rdev = rdev;
+	mtime_save = vap->va_mtime;
 	vap->va_mtime = mtime;
 	vap->va_fsid = vp->v_mount->mnt_stat.f_fsid.val[0];
 	if (v3) {
@@ -608,6 +609,21 @@
 			np->n_size = vap->va_size;
 		}
 	}
+	/*
+	 * The following checks are added to prevent a race between (say)
+	 * a READDIR+ and a WRITE. 
+	 * READDIR+, WRITE requests sent out.
+	 * READDIR+ resp, WRITE resp received on client.
+	 * However, the WRITE resp was handled before the READDIR+ resp
+	 * causing the post op attrs from the write to be loaded first
+	 * and the attrs from the READDIR+ to be loaded later. If this 
+	 * happens, we have stale attrs loaded into the attrcache.
+	 * We detect this by for the mtime moving back. We invalidate the 
+	 * attrcache when this happens.
+	 */
+	if (timespeccmp(&mtime_save, &vap->va_mtime, >))
+		/* Size changed or mtime went backwards */
+		np->n_attrstamp = 0;
 	if (vaper != NULL) {
 		bcopy((caddr_t)vap, (caddr_t)vaper, sizeof(*vap));
 		if (np->n_flag & NCHG) {

==== //depot/projects/dtrace6/src/sys/powerpc/powerpc/db_interface.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/sys/powerpc/powerpc/db_interface.c,v 1.5 2004/07/27 07:04:58 grehan Exp $ */
+/*	$FreeBSD: src/sys/powerpc/powerpc/db_interface.c,v 1.5.2.1 2007/10/19 16:48:43 obrien Exp $ */
 /*	$NetBSD: db_interface.c,v 1.20 2002/05/13 20:30:09 matt Exp $ */
 /*	$OpenBSD: db_interface.c,v 1.2 1996/12/28 06:21:50 rahnds Exp $	*/
 
@@ -8,7 +8,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -84,16 +83,3 @@
 db_show_mdpcpu(struct pcpu *pc)
 {
 }
-
-/*
- * PowerPC-specific ddb commands:
- */
-DB_COMMAND(reboot, db_reboot)
-{
-	cpu_reset();
-}
-
-DB_COMMAND(halt, db_halt)
-{
-	cpu_halt();
-}

==== //depot/projects/dtrace6/src/sys/sparc64/sparc64/db_interface.c#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/sparc64/sparc64/db_interface.c,v 1.10 2004/07/10 23:47:20 marcel Exp $
+ * $FreeBSD: src/sys/sparc64/sparc64/db_interface.c,v 1.10.8.1 2007/10/19 16:48:43 obrien Exp $
  */
 
 #include  
@@ -32,7 +32,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -94,13 +93,3 @@
 db_show_mdpcpu(struct pcpu *pc)
 {
 }
-
-DB_COMMAND(reboot, db_reboot)
-{
-	cpu_reset();
-}
-
-DB_COMMAND(halt, db_halt)
-{
-	cpu_halt();
-}

==== //depot/projects/dtrace6/src/sys/vm/uma_core.c#2 (text+ko) ====

@@ -48,7 +48,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/vm/uma_core.c,v 1.119.2.19 2007/02/11 03:31:19 mohans Exp $");
+__FBSDID("$FreeBSD: src/sys/vm/uma_core.c,v 1.119.2.20 2007/10/18 18:45:53 jhb Exp $");
 
 /* I should really use ktr.. */
 /*
@@ -1980,7 +1980,7 @@
 	 * caller can't handle that. 
 	 */
 	if (keg->uk_flags & UMA_ZFLAG_INTERNAL && keg->uk_recurse != 0)
-		if ((zone != slabzone) && (zone != slabrefzone))
+		if (zone != slabzone && zone != slabrefzone && zone != zones)
 			return (NULL);
 
 	slab = NULL;

==== //depot/projects/dtrace6/src/usr.sbin/adduser/adduser.8#2 (text+ko) ====

@@ -24,9 +24,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/adduser/adduser.8,v 1.55 2004/06/06 17:55:55 mtm Exp $
+.\" $FreeBSD: src/usr.sbin/adduser/adduser.8,v 1.55.8.1 2007/10/19 08:16:30 mtm Exp $
 .\"
-.Dd March 30, 2004
+.Dd October 19, 2007
 .Dt ADDUSER 8
 .Os
 .Sh NAME
@@ -66,7 +66,9 @@
 .Xr pw 8
 will accept.
 Generally this means it
-may contain only lowercase characters or digits.
+may contain only lowercase characters or digits but cannot begin with the
+.Ql -
+character.
 Maximum length
 is 16 characters.
 The reasons for this limit are historical.
@@ -81,7 +83,7 @@
 and recompile the
 world; people have done this and it works, but you will have problems
 with any precompiled programs, or source that assumes the 8-character
-name limit and NIS.
+name limit, such as NIS.
 The NIS protocol mandates an 8-character username.
 If you need a longer login name for e-mail addresses,
 you can define an alias in
@@ -203,7 +205,7 @@
 The format
 of the input file is described below.
 .It Fl g Ar login_group
-Normaly,
+Normally,
 if no login group is specified,
 it is assumed to be the same as the username.
 This option makes
@@ -431,6 +433,7 @@
 .Xr login.conf 5 ,
 .Xr passwd 5 ,
 .Xr shells 5 ,
+.Xr adding_user 8 ,
 .Xr pw 8 ,
 .Xr pwd_mkdb 8 ,
 .Xr rmuser 8 ,
@@ -462,12 +465,12 @@
 The
 .Nm
 utility attempts to mitigate the possibility of an attacker using this
-feature by refusing to evaluate the file if it is not owned and writeable
+feature by refusing to evaluate the file if it is not owned and writable
 only by the root user.
 In addition, shell special characters and operators will have to be
 escaped when used in the message file.
 .Pp
-Also, password ageing and account expiry times are currently setable
+Also, password ageing and account expiry times are currently settable
 only in batch mode or when specified in
 .Pa /etc/adduser.conf .
 The user should be able to set them in interactive mode as well.

==== //depot/projects/dtrace6/src/usr.sbin/adduser/rmuser.8#2 (text+ko) ====

@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/adduser/rmuser.8,v 1.23 2004/06/08 14:52:55 csjp Exp $
+.\" $FreeBSD: src/usr.sbin/adduser/rmuser.8,v 1.23.8.1 2007/10/19 08:16:30 mtm Exp $
 .\"
 .Dd May 10, 2002
 .Dt RMUSER 8
@@ -129,7 +129,7 @@
 including the hash mark itself, is considered a comment and will not
 be processed.
 If the file is owned by anyone other than a user with
-UID 0, or is writeable by anyone other than the owner,
+UID 0, or is writable by anyone other than the owner,
 .Nm
 will refuse to continue.
 .It Fl y
@@ -146,7 +146,7 @@
 .It Fl v
 Enable verbose mode.
 Normally,
-the output inlcudes one line per removed user;
+the output includes one line per removed user;
 however,
 with this option
 .Nm

==== //depot/projects/dtrace6/src/usr.sbin/adduser/rmuser.sh#2 (text+ko) ====

@@ -24,7 +24,7 @@
 #
 #	Email: Mike Makonnen 
 #
-# $FreeBSD: src/usr.sbin/adduser/rmuser.sh,v 1.9 2005/05/24 04:50:07 adamw Exp $
+# $FreeBSD: src/usr.sbin/adduser/rmuser.sh,v 1.9.2.1 2007/10/19 07:53:14 mtm Exp $
 #
 
 ATJOBDIR="/var/at/jobs"
@@ -86,10 +86,10 @@
 		    echo -n " mailspool"
 		rm ${MAILSPOOL}/$login
 	fi
-	if [ -f ${MAILSPOOL}/${login}.pop ]; then
-		verbose && echo -n " ${MAILSPOOL}/${login}.pop" ||
+	if [ -f ${MAILSPOOL}/.${login}.pop ]; then
+		verbose && echo -n " ${MAILSPOOL}/.${login}.pop" ||
 		    echo -n " pop3"
-		rm ${MAILSPOOL}/${login}.pop
+		rm ${MAILSPOOL}/.${login}.pop
 	fi
 	verbose && echo '.'
 }

From owner-p4-projects@FreeBSD.ORG  Sun Oct 21 21:31:17 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4AFE616A420; Sun, 21 Oct 2007 21:31: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 9009C16A417
	for ; Sun, 21 Oct 2007 21:31:16 +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 9595813C4AA
	for ; Sun, 21 Oct 2007 21:31:16 +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 l9LLVG3e067993
	for ; Sun, 21 Oct 2007 21:31:16 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9LLVFNY067990
	for perforce@freebsd.org; Sun, 21 Oct 2007 21:31:15 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 21 Oct 2007 21:31:15 GMT
Message-Id: <200710212131.l9LLVFNY067990@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 127906 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, 21 Oct 2007 21:31:17 -0000

http://perforce.freebsd.org/chv.cgi?CH=127906

Change 127906 by jb@jb_freebsd1 on 2007/10/21 21:30:20

	Update the kldstat(2) man page to reflect version 2 of
	kld_file_stat.

Affected files ...

.. //depot/projects/dtrace/src/lib/libc/sys/kldstat.2#4 edit
.. //depot/projects/dtrace6/src/lib/libc/sys/kldstat.2#2 edit

Differences ...

==== //depot/projects/dtrace/src/lib/libc/sys/kldstat.2#4 (text+ko) ====

@@ -53,6 +53,7 @@
 	int         id;
 	caddr_t     address;        /* load address */
 	size_t      size;           /* size in bytes */
+	char        pathname[MAXPATHLEN];
 };
 .Ed
 .Pp
@@ -77,6 +78,10 @@
 The load address of the kld file.
 .It size
 The size of the file.
+.It pathname
+The full name of the file referred to by
+.Fa fileid ,
+including the path.
 .El
 .Sh RETURN VALUES
 .Rv -std kldstat

==== //depot/projects/dtrace6/src/lib/libc/sys/kldstat.2#2 (text+ko) ====

@@ -53,6 +53,7 @@
 	int         id;
 	caddr_t     address;        /* load address */
 	size_t      size;           /* size in bytes */
+	char        pathname[MAXPATHLEN];
 };
 .Ed
 .Pp
@@ -77,6 +78,10 @@
 The load address of the kld file.
 .It size
 The size of the file.
+.It pathname
+The full name of the file referred to by
+.Fa fileid ,
+including the path.
 .El
 .Sh RETURN VALUES
 .Rv -std kldstat

From owner-p4-projects@FreeBSD.ORG  Sun Oct 21 23:17:24 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2DDCE16A420; Sun, 21 Oct 2007 23:17: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 60DFB16A419
	for ; Sun, 21 Oct 2007 23:17:23 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6157C13C48D
	for ; Sun, 21 Oct 2007 23:17:23 +0000 (UTC)
	(envelope-from kmacy@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 l9LNHM4W079514
	for ; Sun, 21 Oct 2007 23:17:22 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9LNHCS9079511
	for perforce@freebsd.org; Sun, 21 Oct 2007 23:17:12 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sun, 21 Oct 2007 23:17:12 GMT
Message-Id: <200710212317.l9LNHCS9079511@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 127908 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, 21 Oct 2007 23:17:24 -0000

http://perforce.freebsd.org/chv.cgi?CH=127908

Change 127908 by kmacy@kmacy:storage:toestack on 2007/10/21 23:16:25

	IFethng 127902

Affected files ...

.. //depot/projects/toestack/Makefile#2 integrate
.. //depot/projects/toestack/Makefile.inc1#4 integrate
.. //depot/projects/toestack/UPDATING#5 integrate
.. //depot/projects/toestack/contrib/ipfilter/BSD/Makefile#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/BSD/kupgrade#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/HISTORY#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/Makefile#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/ip_fil.c#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/iplang/Makefile#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/ipsend/iptests.c#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/ipsend/sock.c#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/l4check/Makefile#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/l4check/l4check.c#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/lib/Makefile#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/lib/alist_new.c#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/lib/ipft_tx.c#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/lib/printnat.c#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/lib/printpacket.c#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/lib/printpool_live.c#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/lib/printstate.c#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/man/ippool.5#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/md5.h#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/radix.c#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/radix_ipf.h#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/test/Makefile#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/test/dotest#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/test/expected/Makefile#1 branch
.. //depot/projects/toestack/contrib/ipfilter/test/expected/f11#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/test/expected/f24#1 branch
.. //depot/projects/toestack/contrib/ipfilter/test/expected/i19.dist#1 branch
.. //depot/projects/toestack/contrib/ipfilter/test/expected/i21#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/test/expected/in1#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/test/expected/in6#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/test/expected/ipv6.6#1 branch
.. //depot/projects/toestack/contrib/ipfilter/test/expected/n16#1 branch
.. //depot/projects/toestack/contrib/ipfilter/test/input/f11#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/test/input/f24#1 branch
.. //depot/projects/toestack/contrib/ipfilter/test/input/ipv6.6#1 branch
.. //depot/projects/toestack/contrib/ipfilter/test/input/l1#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/test/input/n16#1 branch
.. //depot/projects/toestack/contrib/ipfilter/test/nattest#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/test/regress/f24#1 branch
.. //depot/projects/toestack/contrib/ipfilter/test/regress/i21#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/test/regress/i3#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/test/regress/in1#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/test/regress/in6#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/test/regress/ipv6.6#1 branch
.. //depot/projects/toestack/contrib/ipfilter/test/regress/n16#1 branch
.. //depot/projects/toestack/contrib/ipfilter/test/test.format#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/tools/ipf_y.y#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/tools/ipfstat.c#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/tools/ipmon.c#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/tools/ipnat.c#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/tools/ipnat_y.y#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/tools/lexer.c#2 integrate
.. //depot/projects/toestack/contrib/libpcap/CHANGES#2 integrate
.. //depot/projects/toestack/contrib/libpcap/CREDITS#2 integrate
.. //depot/projects/toestack/contrib/libpcap/FILES#2 integrate
.. //depot/projects/toestack/contrib/libpcap/INSTALL#2 delete
.. //depot/projects/toestack/contrib/libpcap/INSTALL.txt#2 integrate
.. //depot/projects/toestack/contrib/libpcap/Makefile.in#2 integrate
.. //depot/projects/toestack/contrib/libpcap/README.dag#2 integrate
.. //depot/projects/toestack/contrib/libpcap/TODO#2 integrate
.. //depot/projects/toestack/contrib/libpcap/VERSION#2 integrate
.. //depot/projects/toestack/contrib/libpcap/bpf_image.c#2 integrate
.. //depot/projects/toestack/contrib/libpcap/config.h.in#2 integrate
.. //depot/projects/toestack/contrib/libpcap/configure#2 integrate
.. //depot/projects/toestack/contrib/libpcap/configure.in#2 integrate
.. //depot/projects/toestack/contrib/libpcap/fad-getad.c#2 integrate
.. //depot/projects/toestack/contrib/libpcap/fad-win32.c#2 integrate
.. //depot/projects/toestack/contrib/libpcap/gencode.c#2 integrate
.. //depot/projects/toestack/contrib/libpcap/gencode.h#2 integrate
.. //depot/projects/toestack/contrib/libpcap/grammar.y#2 integrate
.. //depot/projects/toestack/contrib/libpcap/inet.c#2 integrate
.. //depot/projects/toestack/contrib/libpcap/lbl/gnuc.h#2 delete
.. //depot/projects/toestack/contrib/libpcap/nametoaddr.c#2 integrate
.. //depot/projects/toestack/contrib/libpcap/optimize.c#2 integrate
.. //depot/projects/toestack/contrib/libpcap/packaging/pcap.spec.in#1 branch
.. //depot/projects/toestack/contrib/libpcap/pcap-bpf.c#2 integrate
.. //depot/projects/toestack/contrib/libpcap/pcap-bpf.h#2 integrate
.. //depot/projects/toestack/contrib/libpcap/pcap-dag.c#2 integrate
.. //depot/projects/toestack/contrib/libpcap/pcap-dlpi.c#2 integrate
.. //depot/projects/toestack/contrib/libpcap/pcap-int.h#2 integrate
.. //depot/projects/toestack/contrib/libpcap/pcap-linux.c#2 integrate
.. //depot/projects/toestack/contrib/libpcap/pcap-win32.c#2 integrate
.. //depot/projects/toestack/contrib/libpcap/pcap.3#2 integrate
.. //depot/projects/toestack/contrib/libpcap/pcap.c#2 integrate
.. //depot/projects/toestack/contrib/libpcap/pcap.h#2 integrate
.. //depot/projects/toestack/contrib/libpcap/pf.h#2 delete
.. //depot/projects/toestack/contrib/libpcap/savefile.c#2 integrate
.. //depot/projects/toestack/contrib/libpcap/scanner.l#2 integrate
.. //depot/projects/toestack/contrib/pf/pflogd/pflogd.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/CHANGES#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/CREDITS#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/FILES#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/INSTALL#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/Makefile.in#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/README#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/VERSION#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/addrtoname.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/af.c#1 branch
.. //depot/projects/toestack/contrib/tcpdump/af.h#1 branch
.. //depot/projects/toestack/contrib/tcpdump/bootp.h#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/config.h.in#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/configure#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/configure.in#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/dccp.h#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/ieee802_11.h#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/ieee802_11_radio.h#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/interface.h#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/ip.h#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/llc.h#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/nameser.h#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/netdissect.h#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/ospf.h#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/parsenfsfh.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/pf.h#2 delete
.. //depot/projects/toestack/contrib/tcpdump/print-802_11.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-atm.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-bfd.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-bgp.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-bootp.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-chdlc.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-dccp.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-dhcp6.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-domain.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-ether.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-fddi.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-fr.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-icmp.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-ip.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-ip6.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-ipfc.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-isoclns.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-juniper.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-l2tp.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-lane.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-ldp.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-llc.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-lmp.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-lspping.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-nfs.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-null.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-olsr.c#1 branch
.. //depot/projects/toestack/contrib/tcpdump/print-ospf.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-pflog.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-pim.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-ppp.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-pptp.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-rsvp.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-rx.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-sctp.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-sll.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-smb.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-tcp.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-tftp.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-token.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-udp.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/smbutil.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/tcp.h#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/tcpdump-stdinc.h#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/tcpdump.1#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/tcpdump.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/tests/print-capX.out#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/tests/print-capXX.out#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/tftp.h#1 branch
.. //depot/projects/toestack/contrib/tcpdump/udp.h#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/util.c#2 integrate
.. //depot/projects/toestack/contrib/tcsh/sh.c#2 integrate
.. //depot/projects/toestack/contrib/tcsh/sh.lex.c#2 integrate
.. //depot/projects/toestack/contrib/tcsh/sh.proc.c#2 integrate
.. //depot/projects/toestack/contrib/tcsh/tc.const.c#2 integrate
.. //depot/projects/toestack/crypto/heimdal/appl/su/Makefile.am#2 integrate
.. //depot/projects/toestack/crypto/heimdal/appl/su/su.c#2 integrate
.. //depot/projects/toestack/crypto/openssl/ssl/d1_both.c#2 integrate
.. //depot/projects/toestack/crypto/openssl/ssl/dtls1.h#2 integrate
.. //depot/projects/toestack/crypto/openssl/ssl/ssl.h#2 integrate
.. //depot/projects/toestack/crypto/openssl/ssl/ssl_err.c#2 integrate
.. //depot/projects/toestack/etc/Makefile#3 integrate
.. //depot/projects/toestack/etc/cached.conf#2 delete
.. //depot/projects/toestack/etc/defaults/rc.conf#6 integrate
.. //depot/projects/toestack/etc/nscd.conf#1 branch
.. //depot/projects/toestack/etc/rc.d/Makefile#5 integrate
.. //depot/projects/toestack/etc/rc.d/amd#2 integrate
.. //depot/projects/toestack/etc/rc.d/kerberos#2 integrate
.. //depot/projects/toestack/etc/rc.d/ppp#3 integrate
.. //depot/projects/toestack/etc/rc.d/sensorsd#2 delete
.. //depot/projects/toestack/etc/sensorsd.conf#2 delete
.. //depot/projects/toestack/games/fortune/datfiles/fortunes#2 integrate
.. //depot/projects/toestack/games/fortune/datfiles/fortunes-o.real#2 integrate
.. //depot/projects/toestack/games/fortune/datfiles/limerick#2 integrate
.. //depot/projects/toestack/gnu/usr.bin/groff/tmac/mdoc.local#3 integrate
.. //depot/projects/toestack/kerberos5/usr.bin/ksu/Makefile#2 integrate
.. //depot/projects/toestack/lib/libbsm/Makefile#2 integrate
.. //depot/projects/toestack/lib/libc/arm/Symbol.map#2 integrate
.. //depot/projects/toestack/lib/libc/gen/sysctl.3#3 integrate
.. //depot/projects/toestack/lib/libc/ia64/Symbol.map#2 integrate
.. //depot/projects/toestack/lib/libc/locale/utf8.c#3 integrate
.. //depot/projects/toestack/lib/libc/net/nscache.c#2 integrate
.. //depot/projects/toestack/lib/libc/powerpc/Symbol.map#2 integrate
.. //depot/projects/toestack/lib/libc/stdlib/atoi.3#2 integrate
.. //depot/projects/toestack/lib/libelf/elf.3#2 integrate
.. //depot/projects/toestack/lib/libelf/gelf_getphdr.3#2 integrate
.. //depot/projects/toestack/lib/libelf/gelf_newphdr.3#2 integrate
.. //depot/projects/toestack/lib/libpam/modules/pam_unix/Makefile#2 integrate
.. //depot/projects/toestack/lib/libpcap/Makefile#2 integrate
.. //depot/projects/toestack/lib/libpcap/config.h#2 integrate
.. //depot/projects/toestack/lib/libstand/Makefile#2 integrate
.. //depot/projects/toestack/lib/libstand/tftp.c#2 integrate
.. //depot/projects/toestack/lib/libthr/thread/thr_once.c#2 integrate
.. //depot/projects/toestack/lib/libthr/thread/thr_pspinlock.c#2 integrate
.. //depot/projects/toestack/lib/ncurses/ncurses/Makefile#2 integrate
.. //depot/projects/toestack/libexec/rtld-elf/sparc64/reloc.c#2 integrate
.. //depot/projects/toestack/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 integrate
.. //depot/projects/toestack/sbin/geom/class/part/geom_part.c#2 integrate
.. //depot/projects/toestack/sbin/geom/class/part/gpart.8#2 integrate
.. //depot/projects/toestack/sbin/ipfw/ipfw.8#3 integrate
.. //depot/projects/toestack/sbin/ipfw/ipfw2.c#3 integrate
.. //depot/projects/toestack/sbin/mount/mount.8#2 integrate
.. //depot/projects/toestack/sbin/sysctl/sysctl.8#3 integrate
.. //depot/projects/toestack/sbin/sysctl/sysctl.c#3 integrate
.. //depot/projects/toestack/share/man/man4/Makefile#3 integrate
.. //depot/projects/toestack/share/man/man4/coretemp.4#3 integrate
.. //depot/projects/toestack/share/man/man4/it.4#2 delete
.. //depot/projects/toestack/share/man/man4/lm.4#2 delete
.. //depot/projects/toestack/share/man/man5/nsswitch.conf.5#2 integrate
.. //depot/projects/toestack/share/man/man5/rc.conf.5#4 integrate
.. //depot/projects/toestack/share/man/man5/src.conf.5#3 integrate
.. //depot/projects/toestack/share/man/man9/Makefile#5 integrate
.. //depot/projects/toestack/share/man/man9/kproc.9#1 branch
.. //depot/projects/toestack/share/man/man9/kthread.9#2 integrate
.. //depot/projects/toestack/share/man/man9/sensor_attach.9#2 delete
.. //depot/projects/toestack/share/mk/bsd.compat.mk#3 integrate
.. //depot/projects/toestack/share/mk/bsd.cpu.mk#2 integrate
.. //depot/projects/toestack/share/mk/bsd.lib.mk#2 integrate
.. //depot/projects/toestack/share/mk/bsd.own.mk#3 integrate
.. //depot/projects/toestack/share/mk/bsd.symver.mk#2 integrate
.. //depot/projects/toestack/share/mk/version_gen.awk#2 integrate
.. //depot/projects/toestack/share/termcap/termcap.src#2 integrate
.. //depot/projects/toestack/sys/amd64/conf/GENERIC#3 integrate
.. //depot/projects/toestack/sys/amd64/conf/GENERIC.hints#3 integrate
.. //depot/projects/toestack/sys/arm/arm/cpufunc.c#2 integrate
.. //depot/projects/toestack/sys/arm/arm/cpufunc_asm_arm11.S#1 branch
.. //depot/projects/toestack/sys/arm/arm/cpufunc_asm_armv5.S#1 branch
.. //depot/projects/toestack/sys/arm/arm/cpufunc_asm_armv5_ec.S#1 branch
.. //depot/projects/toestack/sys/arm/arm/identcpu.c#2 integrate
.. //depot/projects/toestack/sys/arm/arm/pmap.c#3 integrate
.. //depot/projects/toestack/sys/arm/at91/at91_mcireg.h#2 integrate
.. //depot/projects/toestack/sys/arm/include/armreg.h#2 integrate
.. //depot/projects/toestack/sys/arm/include/cpuconf.h#2 integrate
.. //depot/projects/toestack/sys/arm/include/cpufunc.h#2 integrate
.. //depot/projects/toestack/sys/boot/ficl/Makefile#2 integrate
.. //depot/projects/toestack/sys/boot/pc98/Makefile.inc#2 integrate
.. //depot/projects/toestack/sys/cam/cam_xpt.c#2 integrate
.. //depot/projects/toestack/sys/compat/ndis/subr_ntoskrnl.c#2 integrate
.. //depot/projects/toestack/sys/compat/opensolaris/sys/proc.h#2 integrate
.. //depot/projects/toestack/sys/conf/files#5 integrate
.. //depot/projects/toestack/sys/conf/files.amd64#4 integrate
.. //depot/projects/toestack/sys/conf/files.i386#3 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/fil.c#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_htable.c#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_lookup.c#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_lookup.h#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_pool.c#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_pool.h#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ipl.h#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate
.. //depot/projects/toestack/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate
.. //depot/projects/toestack/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate
.. //depot/projects/toestack/sys/contrib/pf/net/pf.c#2 integrate
.. //depot/projects/toestack/sys/contrib/pf/net/pf_ioctl.c#2 integrate
.. //depot/projects/toestack/sys/contrib/rdma/ib_umem.h#2 integrate
.. //depot/projects/toestack/sys/contrib/rdma/ib_user_verbs.h#2 integrate
.. //depot/projects/toestack/sys/contrib/rdma/ib_verbs.h#2 integrate
.. //depot/projects/toestack/sys/ddb/db_ps.c#3 integrate
.. //depot/projects/toestack/sys/dev/aac/aac.c#2 integrate
.. //depot/projects/toestack/sys/dev/acpica/acpi_thermal.c#2 integrate
.. //depot/projects/toestack/sys/dev/aic7xxx/aic_osm_lib.c#2 integrate
.. //depot/projects/toestack/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate
.. //depot/projects/toestack/sys/dev/bktr/msp34xx.c#2 integrate
.. //depot/projects/toestack/sys/dev/ciss/ciss.c#4 integrate
.. //depot/projects/toestack/sys/dev/coretemp/coretemp.c#3 integrate
.. //depot/projects/toestack/sys/dev/cxgb/common/cxgb_ctl_defs.h#3 integrate
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_adapter.h#8 integrate
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.c#3 integrate
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.h#3 integrate
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_main.c#10 integrate
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_multiq.c#6 integrate
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#6 integrate
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.h#4 integrate
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_osdep.h#7 integrate
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_sge.c#7 integrate
.. //depot/projects/toestack/sys/dev/cxgb/sys/cxgb_support.c#2 integrate
.. //depot/projects/toestack/sys/dev/cxgb/t3cdev.h#1 branch
.. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_dbg.c#1 branch
.. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_hal.c#1 branch
.. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_hal.h#2 integrate
.. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_resource.c#1 branch
.. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_resource.h#1 branch
.. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch.h#2 integrate
.. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.c#1 branch
.. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.h#2 integrate
.. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cq.c#1 branch
.. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_ev.c#1 branch
.. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_mem.c#1 branch
.. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_provider.c#1 branch
.. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_provider.h#2 integrate
.. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_qp.c#1 branch
.. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_user.h#1 branch
.. //depot/projects/toestack/sys/dev/fdc/fdc.c#2 integrate
.. //depot/projects/toestack/sys/dev/firewire/firewire.c#2 integrate
.. //depot/projects/toestack/sys/dev/flash/at45d.c#2 integrate
.. //depot/projects/toestack/sys/dev/hptmv/entry.c#2 integrate
.. //depot/projects/toestack/sys/dev/hwpmc/hwpmc_logging.c#2 integrate
.. //depot/projects/toestack/sys/dev/if_ndis/if_ndis.c#2 integrate
.. //depot/projects/toestack/sys/dev/ipmi/ipmi_kcs.c#2 integrate
.. //depot/projects/toestack/sys/dev/ipmi/ipmi_smic.c#2 integrate
.. //depot/projects/toestack/sys/dev/ipmi/ipmi_ssif.c#2 integrate
.. //depot/projects/toestack/sys/dev/iscsi/initiator/isc_sm.c#2 integrate
.. //depot/projects/toestack/sys/dev/iscsi/initiator/isc_soc.c#2 integrate
.. //depot/projects/toestack/sys/dev/isp/isp_freebsd.c#2 integrate
.. //depot/projects/toestack/sys/dev/it/it.c#2 delete
.. //depot/projects/toestack/sys/dev/it/itvar.h#2 delete
.. //depot/projects/toestack/sys/dev/iwi/if_iwi.c#3 integrate
.. //depot/projects/toestack/sys/dev/lm/lm78.c#2 delete
.. //depot/projects/toestack/sys/dev/lm/lm78_isa.c#2 delete
.. //depot/projects/toestack/sys/dev/lm/lm78var.h#2 delete
.. //depot/projects/toestack/sys/dev/md/md.c#2 integrate
.. //depot/projects/toestack/sys/dev/mmc/mmcsd.c#2 integrate
.. //depot/projects/toestack/sys/dev/mpt/mpt.h#2 integrate
.. //depot/projects/toestack/sys/dev/mpt/mpt_cam.c#3 integrate
.. //depot/projects/toestack/sys/dev/mpt/mpt_raid.c#2 integrate
.. //depot/projects/toestack/sys/dev/ofw/ofw_disk.c#2 integrate
.. //depot/projects/toestack/sys/dev/pccbb/pccbb.c#3 integrate
.. //depot/projects/toestack/sys/dev/pccbb/pccbb_pci.c#3 integrate
.. //depot/projects/toestack/sys/dev/random/harvest.c#2 integrate
.. //depot/projects/toestack/sys/dev/random/randomdev_soft.c#2 integrate
.. //depot/projects/toestack/sys/dev/sound/midi/sequencer.c#2 integrate
.. //depot/projects/toestack/sys/dev/sound/pci/hda/hdac.c#2 integrate
.. //depot/projects/toestack/sys/dev/usb/if_zyd.c#6 integrate
.. //depot/projects/toestack/sys/dev/usb/if_zydreg.h#2 integrate
.. //depot/projects/toestack/sys/dev/usb/uchcom.c#1 branch
.. //depot/projects/toestack/sys/dev/usb/ukbd.c#3 integrate
.. //depot/projects/toestack/sys/dev/usb/usb.c#2 integrate
.. //depot/projects/toestack/sys/dev/usb/usb_port.h#2 integrate
.. //depot/projects/toestack/sys/dev/usb/usbdevs#3 integrate
.. //depot/projects/toestack/sys/dev/utopia/utopia.c#2 integrate
.. //depot/projects/toestack/sys/fs/cd9660/cd9660_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/fs/coda/coda_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/fs/hpfs/hpfs_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/fs/msdosfs/msdosfs_denode.c#2 integrate
.. //depot/projects/toestack/sys/fs/msdosfs/msdosfs_lookup.c#2 integrate
.. //depot/projects/toestack/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate
.. //depot/projects/toestack/sys/fs/ntfs/ntfs_vfsops.c#3 integrate
.. //depot/projects/toestack/sys/fs/nullfs/null_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/fs/nwfs/nwfs_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/fs/portalfs/portal_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/fs/pseudofs/pseudofs.c#2 integrate
.. //depot/projects/toestack/sys/fs/smbfs/smbfs_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/fs/udf/udf_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/fs/unionfs/union_vfsops.c#3 integrate
.. //depot/projects/toestack/sys/geom/bde/g_bde.c#2 integrate
.. //depot/projects/toestack/sys/geom/bde/g_bde_work.c#2 integrate
.. //depot/projects/toestack/sys/geom/eli/g_eli.c#2 integrate
.. //depot/projects/toestack/sys/geom/journal/g_journal.c#2 integrate
.. //depot/projects/toestack/sys/geom/mirror/g_mirror.c#2 integrate
.. //depot/projects/toestack/sys/geom/multipath/g_multipath.c#2 integrate
.. //depot/projects/toestack/sys/geom/part/g_part.c#2 integrate
.. //depot/projects/toestack/sys/geom/part/g_part.h#2 integrate
.. //depot/projects/toestack/sys/geom/part/g_part_apm.c#2 integrate
.. //depot/projects/toestack/sys/geom/part/g_part_gpt.c#2 integrate
.. //depot/projects/toestack/sys/geom/raid3/g_raid3.c#2 integrate
.. //depot/projects/toestack/sys/geom/vinum/geom_vinum_drive.c#2 integrate
.. //depot/projects/toestack/sys/geom/vinum/geom_vinum_init.c#2 integrate
.. //depot/projects/toestack/sys/geom/vinum/geom_vinum_plex.c#2 integrate
.. //depot/projects/toestack/sys/geom/vinum/geom_vinum_volume.c#2 integrate
.. //depot/projects/toestack/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#2 integrate
.. //depot/projects/toestack/sys/i386/bios/apm.c#2 integrate
.. //depot/projects/toestack/sys/i386/conf/GENERIC#4 integrate
.. //depot/projects/toestack/sys/i386/conf/GENERIC.hints#3 integrate
.. //depot/projects/toestack/sys/i386/i386/in_cksum.c#2 integrate
.. //depot/projects/toestack/sys/i386/include/in_cksum.h#2 integrate
.. //depot/projects/toestack/sys/ia64/disasm/disasm.h#2 integrate
.. //depot/projects/toestack/sys/ia64/ia64/db_machdep.c#2 integrate
.. //depot/projects/toestack/sys/ia64/ia64/exception.S#2 integrate
.. //depot/projects/toestack/sys/ia64/ia64/support.S#2 integrate
.. //depot/projects/toestack/sys/kern/init_main.c#4 integrate
.. //depot/projects/toestack/sys/kern/kern_acct.c#2 integrate
.. //depot/projects/toestack/sys/kern/kern_fork.c#3 integrate
.. //depot/projects/toestack/sys/kern/kern_idle.c#2 integrate
.. //depot/projects/toestack/sys/kern/kern_intr.c#2 integrate
.. //depot/projects/toestack/sys/kern/kern_kthread.c#2 integrate
.. //depot/projects/toestack/sys/kern/kern_sensors.c#2 delete
.. //depot/projects/toestack/sys/kern/kern_shutdown.c#2 integrate
.. //depot/projects/toestack/sys/kern/sched_ule.c#5 integrate
.. //depot/projects/toestack/sys/kern/subr_param.c#2 integrate
.. //depot/projects/toestack/sys/kern/subr_taskqueue.c#2 integrate
.. //depot/projects/toestack/sys/kern/syscalls.master#2 integrate
.. //depot/projects/toestack/sys/kern/vfs_aio.c#2 integrate
.. //depot/projects/toestack/sys/kern/vfs_bio.c#3 integrate
.. //depot/projects/toestack/sys/kern/vfs_subr.c#3 integrate
.. //depot/projects/toestack/sys/modules/Makefile#4 integrate
.. //depot/projects/toestack/sys/modules/cxgb/iw_cxgb/Makefile#2 integrate
.. //depot/projects/toestack/sys/modules/it/Makefile#2 delete
.. //depot/projects/toestack/sys/modules/lm/Makefile#2 delete
.. //depot/projects/toestack/sys/modules/uchcom/Makefile#1 branch
.. //depot/projects/toestack/sys/net/bpf.h#2 integrate
.. //depot/projects/toestack/sys/net/ethernet.h#2 integrate
.. //depot/projects/toestack/sys/net/if_bridge.c#3 integrate
.. //depot/projects/toestack/sys/net/if_ethersubr.c#4 integrate
.. //depot/projects/toestack/sys/net/if_lagg.c#3 integrate
.. //depot/projects/toestack/sys/net/if_vlan.c#2 integrate
.. //depot/projects/toestack/sys/netgraph/netgraph.h#2 integrate
.. //depot/projects/toestack/sys/netgraph/ng_base.c#2 integrate
.. //depot/projects/toestack/sys/netgraph/ng_socket.c#2 integrate
.. //depot/projects/toestack/sys/netinet/ip.h#2 integrate
.. //depot/projects/toestack/sys/netinet/sctp_bsd_addr.c#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_constants.h#5 integrate
.. //depot/projects/toestack/sys/netinet/sctp_indata.c#5 integrate
.. //depot/projects/toestack/sys/netinet/sctp_input.c#6 integrate
.. //depot/projects/toestack/sys/netinet/sctp_output.c#6 integrate
.. //depot/projects/toestack/sys/netinet/sctp_pcb.c#6 integrate
.. //depot/projects/toestack/sys/netinet/sctp_structs.h#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_timer.c#5 integrate
.. //depot/projects/toestack/sys/netinet/sctp_usrreq.c#5 integrate
.. //depot/projects/toestack/sys/netinet/sctp_var.h#4 integrate
.. //depot/projects/toestack/sys/netinet/sctputil.c#6 integrate
.. //depot/projects/toestack/sys/netinet/tcp_syncache.c#3 integrate
.. //depot/projects/toestack/sys/netinet/tcp_usrreq.c#6 integrate
.. //depot/projects/toestack/sys/netsmb/smb_iod.c#2 integrate
.. //depot/projects/toestack/sys/nfs4client/nfs4_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/nfsclient/nfs_nfsiod.c#3 integrate
.. //depot/projects/toestack/sys/nfsclient/nfs_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/nfsserver/nfs_serv.c#2 integrate
.. //depot/projects/toestack/sys/opencrypto/crypto.c#2 integrate
.. //depot/projects/toestack/sys/pci/intpm.c#2 integrate
.. //depot/projects/toestack/sys/security/audit/audit_worker.c#2 integrate
.. //depot/projects/toestack/sys/security/mac/mac_framework.h#3 integrate
.. //depot/projects/toestack/sys/security/mac/mac_policy.h#3 integrate
.. //depot/projects/toestack/sys/security/mac/mac_posix_sem.c#2 integrate
.. //depot/projects/toestack/sys/security/mac_biba/mac_biba.c#3 integrate
.. //depot/projects/toestack/sys/security/mac_mls/mac_mls.c#3 integrate
.. //depot/projects/toestack/sys/security/mac_stub/mac_stub.c#3 integrate
.. //depot/projects/toestack/sys/security/mac_test/mac_test.c#3 integrate
.. //depot/projects/toestack/sys/sparc64/sparc64/elf_machdep.c#2 integrate
.. //depot/projects/toestack/sys/sun4v/sun4v/simdisk.c#2 integrate
.. //depot/projects/toestack/sys/sys/apm.h#2 integrate
.. //depot/projects/toestack/sys/sys/gpt.h#2 integrate
.. //depot/projects/toestack/sys/sys/kthread.h#2 integrate
.. //depot/projects/toestack/sys/sys/linux_atomic.h#1 branch
.. //depot/projects/toestack/sys/sys/linux_compat.h#2 integrate
.. //depot/projects/toestack/sys/sys/linux_pci.h#1 branch
.. //depot/projects/toestack/sys/sys/param.h#5 integrate
.. //depot/projects/toestack/sys/sys/sensors.h#2 delete
.. //depot/projects/toestack/sys/sys/sysctl.h#3 integrate
.. //depot/projects/toestack/sys/sys/vnode.h#2 integrate
.. //depot/projects/toestack/sys/ufs/ffs/ffs_softdep.c#2 integrate
.. //depot/projects/toestack/sys/ufs/ffs/ffs_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/vm/vm_mmap.c#2 integrate
.. //depot/projects/toestack/sys/vm/vm_object.c#3 integrate
.. //depot/projects/toestack/sys/vm/vm_param.h#2 integrate
.. //depot/projects/toestack/sys/vm/vm_zeroidle.c#2 integrate
.. //depot/projects/toestack/tools/build/options/WITHOUT_NS_CACHING#2 integrate
.. //depot/projects/toestack/usr.bin/fmt/fmt.c#2 integrate
.. //depot/projects/toestack/usr.bin/lex/lib/Makefile#2 integrate
.. //depot/projects/toestack/usr.bin/locate/locate/locate.rc#2 integrate
.. //depot/projects/toestack/usr.bin/locate/locate/updatedb.sh#2 integrate
.. //depot/projects/toestack/usr.bin/makewhatis/makewhatis.c#2 integrate
.. //depot/projects/toestack/usr.bin/netstat/sctp.c#3 integrate
.. //depot/projects/toestack/usr.bin/nfsstat/nfsstat.1#2 integrate
.. //depot/projects/toestack/usr.bin/nfsstat/nfsstat.c#2 integrate
.. //depot/projects/toestack/usr.bin/su/su.c#2 integrate
.. //depot/projects/toestack/usr.bin/systat/Makefile#3 integrate
.. //depot/projects/toestack/usr.bin/systat/cmdtab.c#3 integrate
.. //depot/projects/toestack/usr.bin/systat/extern.h#3 integrate
.. //depot/projects/toestack/usr.bin/systat/sensors.c#2 delete
.. //depot/projects/toestack/usr.bin/systat/systat.1#3 integrate
.. //depot/projects/toestack/usr.bin/tail/read.c#2 integrate
.. //depot/projects/toestack/usr.sbin/Makefile#6 integrate
.. //depot/projects/toestack/usr.sbin/adduser/adduser.8#2 integrate
.. //depot/projects/toestack/usr.sbin/adduser/adduser.sh#2 integrate
.. //depot/projects/toestack/usr.sbin/adduser/rmuser.sh#2 integrate
.. //depot/projects/toestack/usr.sbin/mountd/mountd.8#2 integrate
.. //depot/projects/toestack/usr.sbin/mountd/mountd.c#2 integrate
.. //depot/projects/toestack/usr.sbin/pkg_install/lib/lib.h#2 integrate
.. //depot/projects/toestack/usr.sbin/sensorsd/Makefile#2 delete
.. //depot/projects/toestack/usr.sbin/sensorsd/sensorsd.8#2 delete
.. //depot/projects/toestack/usr.sbin/sensorsd/sensorsd.c#2 delete
.. //depot/projects/toestack/usr.sbin/sensorsd/sensorsd.conf.5#2 delete
.. //depot/projects/toestack/usr.sbin/tcpdump/tcpdump/Makefile#2 integrate
.. //depot/projects/toestack/usr.sbin/tcpdump/tcpdump/config.h#2 integrate
.. //depot/projects/toestack/usr.sbin/wpa/l2_packet.c#2 integrate

Differences ...

==== //depot/projects/toestack/Makefile#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile,v 1.341 2007/05/16 08:46:35 des Exp $
+# $FreeBSD: src/Makefile,v 1.342 2007/10/18 08:41:52 delphij Exp $
 #
 # The user-driven targets are:
 #
@@ -147,14 +147,14 @@
 .if ${.CURDIR} == ${.OBJDIR} || ${.CURDIR}/obj == ${.OBJDIR}
 .if exists(${BW_CANONICALOBJDIR}/)
 	-rm -rf ${BW_CANONICALOBJDIR}/*
-	chflags -R 0 ${BW_CANONICALOBJDIR}
+	-chflags -R 0 ${BW_CANONICALOBJDIR}
 	rm -rf ${BW_CANONICALOBJDIR}/*
 .endif
 	#   To be safe in this case, fall back to a 'make cleandir'
 	${_+_}@cd ${.CURDIR}; ${_MAKE} cleandir
 .else
 	-rm -rf ${.OBJDIR}/*
-	chflags -R 0 ${.OBJDIR}
+	-chflags -R 0 ${.OBJDIR}
 	rm -rf ${.OBJDIR}/*
 .endif
 

==== //depot/projects/toestack/Makefile.inc1#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.588 2007/10/09 23:31:09 obrien Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.589 2007/10/15 13:50:46 emaste Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -578,7 +578,12 @@
 	    date echo egrep find grep install-info \
 	    ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
 	    test true uname wc zic; do \
-		cp `which $$prog` ${INSTALLTMP}; \
+		if progpath=`which $$prog`; then \
+			cp $$progpath ${INSTALLTMP}; \
+		else \
+			echo "Required install tool $$prog not found" >&2; \
+			exit 1; \
+		fi; \
 	done
 	${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}
 	rm -rf ${INSTALLTMP}

==== //depot/projects/toestack/UPDATING#5 (text+ko) ====

@@ -21,6 +21,14 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20071020:
+	The misnamed kthread_create() and friends have been renamed
+	to kproc_create() etc. Many of the callers already
+	used kproc_start()..
+	I will return kthread_create() and friends in a while
+	with implementations that actually create threads, not procs.
+	Renaming corresponds with version 800002.
+
 20071010:
 	RELENG_7 branched.
 
@@ -913,4 +921,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.509 2007/10/12 04:48:58 kevlo Exp $
+$FreeBSD: src/UPDATING,v 1.510 2007/10/21 04:27:07 julian Exp $

==== //depot/projects/toestack/contrib/ipfilter/BSD/Makefile#2 (text+ko) ====

@@ -485,13 +485,21 @@
 		cp if_ipl.o /lkm; \
 	fi
 	-if [ -d /modules -a -f ipf.ko ] ; then \
-		cp ipf.ko /modules; \
+		if [ -f /modules/ipl.ko ] ; then \
+			cp ipf.ko /modules/ipl.ko; \
+		else \
+			cp ipf.ko /modules; \
+		fi \
 	fi
 	-if [ -d /modules -a -f ipfrule.ko ] ; then \
 		cp ipfrule.ko /modules; \
 	fi
 	-if [ -d /boot/kernel -a -f ipf.ko ] ; then \
-		cp ipf.ko /boot/kernel; \
+		if [ -f /boot/kernel/ipl.ko ] ; then \
+			cp ipf.ko /boot/kernel/ipl.ko; \
+		else \
+			cp ipf.ko /boot/kernel; \
+		fi \
 	fi
 	-if [ -d /boot/kernel -a -f ipfrule.ko ] ; then \
 		cp ipfrule.ko /boot/kernel; \

==== //depot/projects/toestack/contrib/ipfilter/BSD/kupgrade#2 (text+ko) ====

@@ -32,11 +32,15 @@
 fi
  
 if [ ! -f ip_rules.c -o ! -f ip_rules.h ] ; then
-	echo "Please do a build of ipfilter and then run the following"
-	echo "command to build extra files:"
-	echo
-	echo "make ip_rules.c"
-	exit 1
+	echo "Trying to build ip_rules.c and ip_rules.h"
+	make ip_rules.c
+	if [ ! -f ip_rules.c -o ! -f ip_rules.h ] ; then
+		echo "Please do a build of ipfilter and then run the following"
+		echo "command to build extra files:"
+		echo
+		echo "make ip_rules.c"
+		exit 1
+	fi
 fi
 
 echo -n "Installing "

==== //depot/projects/toestack/contrib/ipfilter/HISTORY#2 (text+ko) ====

@@ -10,12 +10,110 @@
 # and especially those who have found the time to port IP Filter to new
 # platforms.
 #
+4.1.28 - Release 16 October 2007
+
+backout changes (B1) & (B2) as they've caused NAT entries to persist for
+too long and possibly other side effects.
+
+Still need to compile in our own radix.c for Solaris as the one in S10U4
+has a different alignment of structure members (causes panic)
+
+keep state doesn't work with multicast/broadcast packets (makes UPnP easier)
+
+ippool -l may only lists every 2nd pool's contents
+
+4.1.27 - Released 29 September 2007
+
+SunOS5/replace script does not deal with i386 systems that have the
+i86/amd64 directory pair.
+
+make BSD/kupgrade try to build ip_rules.[ch] before complaining
+
+Need to look for ipl.ko LKM on FreeBSD, not just ipf.ko
+
+Cleanup SunOS5 Makefile pieces, removing CPU, sunos5x86; buildsunos needs
+to drive 32bit cc builds differently for sparc/i386 now.
+
+Update instructions for rebuilding FreeBSD kernels
+
+Make the target "freebsd" work for building ipfilter
+
+destroying NAT entries for blocked packets can lead to NAT table entry leak,
+provide a counter of orphan'd NAT entries to track this problem.
+
+4.1.26 - Released 24 September 2007
+
+Fix build problem for Solaris prior to S10U4
+
+4.1.25 - Released 20 September 2007
+
+stepping through structures with ioctls can lead to the wrong things
+being free'd and panics
+
+if a NAT entry (such as an rdr) is created but the packet ends up being
+blocked, tear down the NAT entry.
+
+fix fragment cache preventing keep state from functioning
+
+fix handling of \ to indicate a continued line in .conf files
+
+include port ranges in the allowed input for ipf when using "port = ()"
+
+only advance TCP state for packets on the leading edge of the window. (B1)
+
+using ipnat -l can lead to memory corruption in high stress situations
+
+track TCP sequence numbers with NAT so that it can do timeout advances
+correctly inline with state
+
+ICMP checksums for some redirect'd packets are not adjusted correctly.
+
+IPv6 address components need to be explicitly cast to a 32bit pointer
+boundary so that compilers don't try to access them as two 64bit
+pieces (no guarantee is made that an Ipv6 address is on a 64bit
+aligned address)
+
+filling up the ipauth packet queue can lead to no more packets being
+processed.
+
+locking used to deref a nat entry causes a significant performance hit
+
+m_pulldown isn't properly handled, leading to possible panics with ICMPv6
+packets
+
+IPv6 fragment handling doesn't allow for "keep frag" to work
+
+build on Solaris10 Update4 with pfhooks in the kernel
+
+logging of Ipv6 packets with extension headers fix - Miroslaw Luc
+
+4.1.24 - Released 8 July 2007
+
+patch from Stuart Remphrey to address recursive mutex lock with TCP state
+
+add hash table bucket stats display to ipnat -s
+
+give ASSERT some teeth for user compiles
+
+initialising ipf_global, ipf_frcache, ipf_mutex should all be done very
+early on
+
+do some caddr_t cleanup, where possible
+
+fr_ref no longer tracks the number of children rules in a group for head rules
+
+make sure all BCOPY* have a value assigned to something
+
+fix possible use of icmp pointer after pullup makes it invalid
+
+resolve compile problems related to FreeBSD tree
+
 4.1.23 - Released 31 May 2007
 
 NAT was not always correctly fixing ICMP headers for errors
 
 some TCP state steps when closing do not update timeouts, leading to
-them being removed prematurely.
+them being removed prematurely. (B2)
 
 fix compilation problems for netbsd 4.99
 

==== //depot/projects/toestack/contrib/ipfilter/Makefile#2 (text+ko) ====

@@ -5,8 +5,8 @@
 # provided that this notice is preserved and due credit is given
 # to the original author and the contributors.
 #
-# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.7 2007/06/04 02:54:31 darrenr Exp $
-# Id: Makefile,v 2.76.2.19 2006/03/17 10:38:38 darrenr Exp $
+# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.8 2007/10/18 21:52:11 darrenr Exp $
+# Id: Makefile,v 2.76.2.24 2007/09/26 10:04:03 darrenr Exp $
 #
 SHELL=/bin/sh
 BINDEST=/usr/local/bin
@@ -132,10 +132,7 @@
 	@echo "openbsd	- compile for OpenBSD"
 	@echo "freebsd20	- compile for FreeBSD 2.0, 2.1 or earlier"
 	@echo "freebsd22	- compile for FreeBSD-2.2 or greater"
-	@echo "freebsd3	- compile for FreeBSD-3.x"
-	@echo "freebsd4	- compile for FreeBSD-4.x"
-	@echo "freebsd5 - compile for FreeBSD-5.x"
-	@echo "freebsd6 - compile for FreeBSD-6.x"
+	@echo "freebsd  - compile for all other versions of FreeBSD"
 	@echo "bsd	- compile for generic 4.4BSD systems"
 	@echo "bsdi	- compile for BSD/OS"
 	@echo "irix	- compile for SGI IRIX"
@@ -152,6 +149,7 @@
 	else echo test directory not present, sorry; fi
 
 include:
+	-mkdir -p net netinet
 	if [ ! -f netinet/done ] ; then \
 		(cd netinet; ln -s ../*.h .; ln -s ../ip_*_pxy.c .;); \
 		(cd netinet; ln -s ../ipsend/tcpip.h tcpip.h); \
@@ -167,6 +165,9 @@
 	MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" BPFILTER=$(BPFILTER) \
 		CC="$(CC)" DEBUG="$(DEBUG)" ./buildsunos
 
+freebsd:
+	make freebsd`uname -r|cut -c1`
+
 freebsd22: include
 	make setup "TARGOS=BSD" "CPUDIR=$(CPUDIR)"
 	-rm -f BSD/$(CPUDIR)/ioconf.h
@@ -351,13 +352,9 @@
 	(cd SunOS4; make -f Makefile.ipsend build "CC=$(CC)" TOP=.. $(DEST) $(MFLAGS); cd ..)
 
 sunos5 solaris2: null
-	(cd SunOS5/$(CPUDIR); $(MAKE) build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS) "SOLARIS2=$(SOLARIS2)" "CPU=-Dsparc -D__sparc__"; cd ..)
+	(cd SunOS5/$(CPUDIR); $(MAKE) build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS) "SOLARIS2=$(SOLARIS2)"; cd ..)
 	(cd SunOS5/$(CPUDIR); $(MAKE) -f Makefile.ipsend build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS); cd ..)
 
-sunos5x86 solaris2x86: null
-	(cd SunOS5/$(CPUDIR); make build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS) "SOLARIS2=$(SOLARIS2)" "CPU=-Di86pc -Di386 -D__i386__"; cd ..)
-	(cd SunOS5/$(CPUDIR); make -f Makefile.ipsend build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS); cd ..)
-
 linux: include
 	(cd Linux; make build LINUX=$(LINUX) TOP=.. "DEBUG=-g" "CC=$(CC)" $(MFLAGS) OBJ=$(CPUDIR) LINUXKERNEL=$(LINUXKERNEL); cd ..)
 	(cd Linux; make ipflkm LINUX=$(LINUX) TOP=.. "DEBUG=-g" "CC=$(CC)" $(MFLAGS) OBJ=$(CPUDIR) LINUXKERNEL=$(LINUXKERNEL) WORKDIR=`pwd`; cd ..)
@@ -374,7 +371,7 @@
 	(cd SunOS4; $(MAKE) CPU=$(CPU) TOP=.. install)
 
 install-sunos5: solaris null
-	(cd SunOS5; $(MAKE) CPU=$(CPU) TOP=.. install)
+	(cd SunOS5; $(MAKE) TOP=.. install)
 
 install-aix:
 	(cd AIX/`AIX/cpurev`; make install "TOP=../.." $(MFLAGS); cd ..)

==== //depot/projects/toestack/contrib/ipfilter/ip_fil.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/contrib/ipfilter/ip_fil.c,v 1.5 2007/06/04 02:54:31 darrenr Exp $	*/
+/*	$FreeBSD: src/contrib/ipfilter/ip_fil.c,v 1.6 2007/10/18 21:52:11 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
@@ -7,7 +7,7 @@
  */
 #if !defined(lint)
 static const char sccsid[] = "@(#)ip_fil.c	2.41 6/5/96 (C) 1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.133.2.16 2007/05/28 11:56:22 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.133.2.18 2007/09/09 11:32:05 darrenr Exp $";
 #endif
 
 #ifndef	SOLARIS
@@ -81,7 +81,7 @@
 #include 
 # endif
 #endif
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(SOLARIS2)
 # include "radix_ipf.h"
 #endif
 #ifndef __osf__
@@ -390,7 +390,7 @@
 		*addr++ = '\0';
 
 	for (ifpp = ifneta; ifpp && (ifp = *ifpp); ifpp++) {
-		COPYIFNAME(ifp, ifname);
+		COPYIFNAME(v, ifp, ifname);
 		if (!strcmp(name, ifname)) {
 			if (addr != NULL)
 				fr_setifpaddr(ifp, addr);
@@ -429,6 +429,9 @@
 	}
 	ifp = ifneta[nifs - 1];
 
+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
+	TAILQ_INIT(&ifp->if_addrlist);
+#endif
 #if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) || \
     (defined(OpenBSD) && (OpenBSD >= 199603)) || defined(linux) || \
     (defined(__FreeBSD__) && (__FreeBSD_version >= 501113))

==== //depot/projects/toestack/contrib/ipfilter/iplang/Makefile#2 (text+ko) ====

@@ -3,20 +3,21 @@
 #
 #CC=gcc -Wuninitialized -Wstrict-prototypes -Werror -O
 CFLAGS=-I..
+CCARGS=$(DEBUG) -I. -I.. $(CFLAGS) -I$(DESTDIR) -I$(DESTDIR)/.. -I../ipsend
 
 all: $(DESTDIR)/iplang_y.o $(DESTDIR)/iplang_l.o
 
 $(DESTDIR)/iplang_y.o: $(DESTDIR)/iplang_y.c
-	$(CC) $(DEBUG) -I. -I.. -I$(DESTDIR) -I../ipsend $(CFLAGS) $(LINUX) -c $(DESTDIR)/iplang_y.c -o $@
+	$(CC) $(CCARGS) $(LINUX) -c $(DESTDIR)/iplang_y.c -o $@
 
 $(DESTDIR)/iplang_l.o: $(DESTDIR)/iplang_l.c
-	$(CC) $(DEBUG) -I. -I.. -I$(DESTDIR) -I../ipsend $(CFLAGS) $(LINUX) -c $(DESTDIR)/iplang_l.c -o $@
+	$(CC) $(CCARGS) $(LINUX) -c $(DESTDIR)/iplang_l.c -o $@
 
 iplang_y.o: iplang_y.c
-	$(CC) $(DEBUG) -I. -I.. -I../ipsend $(CFLAGS) $(LINUX) -c $< -o $@
+	$(CC) $(CCARGS) $< -o $@
 
 iplang_l.o: iplang_l.c
-	$(CC) $(DEBUG) -I. -I.. -I../ipsend $(CFLAGS) $(LINUX) -c $< -o $@
+	$(CC) $(CCARGS) $< -o $@
 
 $(DESTDIR)/iplang_l.c: iplang_l.l $(DESTDIR)/iplang_y.h
 	lex iplang_l.l

==== //depot/projects/toestack/contrib/ipfilter/ipsend/iptests.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/contrib/ipfilter/ipsend/iptests.c,v 1.13 2007/06/04 02:54:31 darrenr Exp $	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/iptests.c,v 1.14 2007/10/18 21:52:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-1998 by Darren Reed.
@@ -8,7 +8,7 @@
  */
 #if !defined(lint)
 static const char sccsid[] = "%W% %G% (C)1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id: iptests.c,v 2.8.2.8 2007/02/17 12:41:51 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id: iptests.c,v 2.8.2.9 2007/09/13 07:19:34 darrenr Exp $";
 #endif
 #include 
 #include 
@@ -22,6 +22,9 @@
 #endif
 #include 
 #if !defined(__osf__)
+# ifdef __NetBSD__ 
+#  include 
+# endif
 # define _KERNEL
 # define KERNEL
 # if !defined(solaris) && !defined(linux) && !defined(__sgi) && !defined(hpux)
@@ -1097,7 +1100,8 @@
 	struct tcpcb *tcbp, tcb;
 	struct tcpiphdr ti;
 	struct sockaddr_in sin;
-	int fd, slen;
+	int fd;
+	socklen_t slen;
 
 	bzero((char *)&sin, sizeof(sin));
 

==== //depot/projects/toestack/contrib/ipfilter/ipsend/sock.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/ipfilter/ipsend/sock.c,v 1.18 2007/06/04 02:54:31 darrenr Exp $ */
+/* $FreeBSD: src/contrib/ipfilter/ipsend/sock.c,v 1.19 2007/10/18 21:52:12 darrenr Exp $ */
 /*
  * sock.c (C) 1995-1998 Darren Reed
  *
@@ -7,7 +7,7 @@
  */
 #if !defined(lint)
 static const char sccsid[] = "@(#)sock.c	1.2 1/11/96 (C)1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id: sock.c,v 2.8.4.6 2007/02/17 12:41:51 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id: sock.c,v 2.8.4.7 2007/09/13 07:19:34 darrenr Exp $";
 #endif
 #include 
 #include 
@@ -30,6 +30,9 @@
 # include 
 #endif
 #if !defined(__osf__)
+# ifdef __NetBSD__ 
+#  include 
+# endif
 # define _KERNEL
 # define	KERNEL
 # ifdef	ultrix
@@ -385,7 +388,8 @@
 {
 	struct	sockaddr_in	rsin, lsin;
 	struct	tcpcb	*t, tcb;
-	int	fd, nfd, len;
+	int	fd, nfd;
+	socklen_t len;
 
 	printf("Dest. Port: %d\n", ti->ti_dport);
 

==== //depot/projects/toestack/contrib/ipfilter/l4check/Makefile#2 (text+ko) ====

@@ -4,7 +4,7 @@
 all: l4check
 
 l4check: l4check.c
-	$(CC) -g -I.. $(CFLAGS) $(LIBS) l4check.c -o $@
+	$(CC) -g -I.. -Wall $(CFLAGS) $(LIBS) l4check.c -o $@
 
 clean:
 	/bin/rm -f l4check

==== //depot/projects/toestack/contrib/ipfilter/l4check/l4check.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/contrib/ipfilter/l4check/l4check.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
+/*	$FreeBSD: src/contrib/ipfilter/l4check/l4check.c,v 1.3 2007/10/18 21:52:12 darrenr Exp $	*/
 
 /*
  * (C)Copyright March, 2000 - Darren Reed.
@@ -27,6 +27,7 @@

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Mon Oct 22 00:53:07 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3AF3216A468; Mon, 22 Oct 2007 00:53: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 D201616A417
	for ; Mon, 22 Oct 2007 00:53:06 +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 B9E1513C48A
	for ; Mon, 22 Oct 2007 00:53:06 +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 l9M0r6eS095780
	for ; Mon, 22 Oct 2007 00:53:06 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9M0r6g6095777
	for perforce@freebsd.org; Mon, 22 Oct 2007 00:53:06 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 22 Oct 2007 00:53:06 GMT
Message-Id: <200710220053.l9M0r6g6095777@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 127909 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, 22 Oct 2007 00:53:07 -0000

http://perforce.freebsd.org/chv.cgi?CH=127909

Change 127909 by jb@jb_freebsd8 on 2007/10/22 00:52:49

	Add the CDDL libs to generic libs too.

Affected files ...

.. //depot/projects/dtrace6/src/Makefile.inc1#4 edit

Differences ...

==== //depot/projects/dtrace6/src/Makefile.inc1#4 (text+ko) ====

@@ -1037,7 +1037,7 @@
 
 lib/libopie__L lib/libtacplus__L: lib/libmd__L
 
-_generic_libs+=	lib
+_generic_libs+=	${_cddl_lib} lib
 
 .if !defined(NO_CDDL)
 _cddl_lib= cddl/lib

From owner-p4-projects@FreeBSD.ORG  Mon Oct 22 01:20:39 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1CB5116A46B; Mon, 22 Oct 2007 01:20:39 +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 BC8B516A417
	for ; Mon, 22 Oct 2007 01:20:38 +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 BB1BD13C4B2
	for ; Mon, 22 Oct 2007 01:20:38 +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 l9M1Kc8s098192
	for ; Mon, 22 Oct 2007 01:20:38 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9M1KcUL098189
	for perforce@freebsd.org; Mon, 22 Oct 2007 01:20:38 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 22 Oct 2007 01:20:38 GMT
Message-Id: <200710220120.l9M1KcUL098189@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 127910 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, 22 Oct 2007 01:20:39 -0000

http://perforce.freebsd.org/chv.cgi?CH=127910

Change 127910 by jb@jb_freebsd1 on 2007/10/22 01:19:46

	Implement version 2 of kld_file_stat which contains the
	full path name to the module loaded. DTrace needs to get
	to this to read the CTF data. Solaris uses a module
	file system instead. I am not allowed to say that I don't
	like that.

Affected files ...

.. //depot/projects/dtrace6/src/sys/kern/kern_linker.c#2 edit

Differences ...

==== //depot/projects/dtrace6/src/sys/kern/kern_linker.c#2 (text+ko) ====

@@ -492,6 +492,7 @@
 	lf->userrefs = 0;
 	lf->flags = 0;
 	lf->filename = linker_strdup(filename);
+	lf->pathname = linker_strdup(pathname);
 	LINKER_GET_NEXT_FILE_ID(lf->id);
 	lf->ndeps = 0;
 	lf->deps = NULL;
@@ -590,6 +591,10 @@
 		free(file->filename, M_LINKER);
 		file->filename = NULL;
 	}
+	if (file->pathname) {
+		free(file->pathname, M_LINKER);
+		file->pathname = NULL;
+	}
 	kobj_delete((kobj_t) file, M_LINKER);
 out:
 	return (error);
@@ -972,7 +977,7 @@
 {
 	linker_file_t lf;
 	int error = 0;
-	int namelen, version;
+	int namelen, version, version_num;
 	struct kld_file_stat *stat;
 
 #ifdef MAC
@@ -995,10 +1000,16 @@
 	 */
 	if ((error = copyin(&stat->version, &version, sizeof(version))) != 0)
 		goto out;
-	if (version != sizeof(struct kld_file_stat)) {
+	if (version == sizeof(struct kld_file_stat_1))
+		version_num = 1;
+	else if (version == sizeof(struct kld_file_stat))
+		version_num = 2;
+	else {
 		error = EINVAL;
 		goto out;
 	}
+
+	/* Version 1 fields: */
 	namelen = strlen(lf->filename) + 1;
 	if (namelen > MAXPATHLEN)
 		namelen = MAXPATHLEN;
@@ -1013,6 +1024,15 @@
 		goto out;
 	if ((error = copyout(&lf->size, &stat->size, sizeof(size_t))) != 0)
 		goto out;
+	if (version_num > 1) {
+		/* Version 2 fields: */
+		namelen = strlen(lf->pathname) + 1;
+		if (namelen > MAXPATHLEN)
+			namelen = MAXPATHLEN;
+		if ((error = copyout(lf->pathname, &stat->pathname[0],
+		    namelen)) != 0)
+			goto out;
+	}
 
 	td->td_retval[0] = 0;
 out:

From owner-p4-projects@FreeBSD.ORG  Mon Oct 22 02:48:37 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D910716A418; Mon, 22 Oct 2007 02:48: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 D089616A41A
	for ; Mon, 22 Oct 2007 02:48:35 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C410113C491
	for ; Mon, 22 Oct 2007 02:48:35 +0000 (UTC)
	(envelope-from kmacy@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 l9M2mZTh008874
	for ; Mon, 22 Oct 2007 02:48:35 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9M2mZBG008859
	for perforce@freebsd.org; Mon, 22 Oct 2007 02:48:35 GMT
	(envelope-from kmacy@freebsd.org)
Date: Mon, 22 Oct 2007 02:48:35 GMT
Message-Id: <200710220248.l9M2mZBG008859@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 127911 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, 22 Oct 2007 02:48:37 -0000

http://perforce.freebsd.org/chv.cgi?CH=127911

Change 127911 by kmacy@freefall_kmacy_xen31 on 2007/10/22 02:48:28

	initial branch create at 127907

Affected files ...

.. //depot/projects/xen31/COPYRIGHT#1 branch
.. //depot/projects/xen31/LOCKS#1 branch
.. //depot/projects/xen31/MAINTAINERS#1 branch
.. //depot/projects/xen31/Makefile#1 branch
.. //depot/projects/xen31/Makefile.inc1#1 branch
.. //depot/projects/xen31/ObsoleteFiles.inc#1 branch
.. //depot/projects/xen31/README#1 branch
.. //depot/projects/xen31/UPDATING#1 branch
.. //depot/projects/xen31/bin/Makefile#1 branch
.. //depot/projects/xen31/bin/Makefile.inc#1 branch
.. //depot/projects/xen31/bin/cat/Makefile#1 branch
.. //depot/projects/xen31/bin/cat/cat.1#1 branch
.. //depot/projects/xen31/bin/cat/cat.c#1 branch
.. //depot/projects/xen31/bin/chflags/Makefile#1 branch
.. //depot/projects/xen31/bin/chflags/chflags.1#1 branch
.. //depot/projects/xen31/bin/chflags/chflags.c#1 branch
.. //depot/projects/xen31/bin/chio/Makefile#1 branch
.. //depot/projects/xen31/bin/chio/chio.1#1 branch
.. //depot/projects/xen31/bin/chio/chio.c#1 branch
.. //depot/projects/xen31/bin/chio/defs.h#1 branch
.. //depot/projects/xen31/bin/chio/pathnames.h#1 branch
.. //depot/projects/xen31/bin/chmod/Makefile#1 branch
.. //depot/projects/xen31/bin/chmod/chmod.1#1 branch
.. //depot/projects/xen31/bin/chmod/chmod.c#1 branch
.. //depot/projects/xen31/bin/cp/Makefile#1 branch
.. //depot/projects/xen31/bin/cp/cp.1#1 branch
.. //depot/projects/xen31/bin/cp/cp.c#1 branch
.. //depot/projects/xen31/bin/cp/extern.h#1 branch
.. //depot/projects/xen31/bin/cp/utils.c#1 branch
.. //depot/projects/xen31/bin/csh/Makefile#1 branch
.. //depot/projects/xen31/bin/csh/USD.doc/csh.1#1 branch
.. //depot/projects/xen31/bin/csh/USD.doc/csh.2#1 branch
.. //depot/projects/xen31/bin/csh/USD.doc/csh.3#1 branch
.. //depot/projects/xen31/bin/csh/USD.doc/csh.4#1 branch
.. //depot/projects/xen31/bin/csh/USD.doc/csh.a#1 branch
.. //depot/projects/xen31/bin/csh/USD.doc/csh.g#1 branch
.. //depot/projects/xen31/bin/csh/USD.doc/tabs#1 branch
.. //depot/projects/xen31/bin/csh/config.h#1 branch
.. //depot/projects/xen31/bin/csh/config_p.h#1 branch
.. //depot/projects/xen31/bin/csh/host.defs#1 branch
.. //depot/projects/xen31/bin/csh/iconv.h#1 branch
.. //depot/projects/xen31/bin/csh/iconv_stub.c#1 branch
.. //depot/projects/xen31/bin/date/Makefile#1 branch
.. //depot/projects/xen31/bin/date/date.1#1 branch
.. //depot/projects/xen31/bin/date/date.c#1 branch
.. //depot/projects/xen31/bin/date/extern.h#1 branch
.. //depot/projects/xen31/bin/date/netdate.c#1 branch
.. //depot/projects/xen31/bin/date/vary.c#1 branch
.. //depot/projects/xen31/bin/date/vary.h#1 branch
.. //depot/projects/xen31/bin/dd/Makefile#1 branch
.. //depot/projects/xen31/bin/dd/args.c#1 branch
.. //depot/projects/xen31/bin/dd/conv.c#1 branch
.. //depot/projects/xen31/bin/dd/conv_tab.c#1 branch
.. //depot/projects/xen31/bin/dd/dd.1#1 branch
.. //depot/projects/xen31/bin/dd/dd.c#1 branch
.. //depot/projects/xen31/bin/dd/dd.h#1 branch
.. //depot/projects/xen31/bin/dd/extern.h#1 branch
.. //depot/projects/xen31/bin/dd/gen.c#1 branch
.. //depot/projects/xen31/bin/dd/misc.c#1 branch
.. //depot/projects/xen31/bin/dd/position.c#1 branch
.. //depot/projects/xen31/bin/dd/ref.ascii#1 branch
.. //depot/projects/xen31/bin/dd/ref.ebcdic#1 branch
.. //depot/projects/xen31/bin/dd/ref.ibm#1 branch
.. //depot/projects/xen31/bin/dd/ref.lcase#1 branch
.. //depot/projects/xen31/bin/dd/ref.oldascii#1 branch
.. //depot/projects/xen31/bin/dd/ref.oldebcdic#1 branch
.. //depot/projects/xen31/bin/dd/ref.oldibm#1 branch
.. //depot/projects/xen31/bin/dd/ref.pareven#1 branch
.. //depot/projects/xen31/bin/dd/ref.parnone#1 branch
.. //depot/projects/xen31/bin/dd/ref.parodd#1 branch
.. //depot/projects/xen31/bin/dd/ref.parset#1 branch
.. //depot/projects/xen31/bin/dd/ref.swab#1 branch
.. //depot/projects/xen31/bin/dd/ref.ucase#1 branch
.. //depot/projects/xen31/bin/df/Makefile#1 branch
.. //depot/projects/xen31/bin/df/df.1#1 branch
.. //depot/projects/xen31/bin/df/df.c#1 branch
.. //depot/projects/xen31/bin/domainname/Makefile#1 branch
.. //depot/projects/xen31/bin/domainname/domainname.1#1 branch
.. //depot/projects/xen31/bin/domainname/domainname.c#1 branch
.. //depot/projects/xen31/bin/echo/Makefile#1 branch
.. //depot/projects/xen31/bin/echo/echo.1#1 branch
.. //depot/projects/xen31/bin/echo/echo.c#1 branch
.. //depot/projects/xen31/bin/ed/Makefile#1 branch
.. //depot/projects/xen31/bin/ed/POSIX#1 branch
.. //depot/projects/xen31/bin/ed/README#1 branch
.. //depot/projects/xen31/bin/ed/buf.c#1 branch
.. //depot/projects/xen31/bin/ed/cbc.c#1 branch
.. //depot/projects/xen31/bin/ed/ed.1#1 branch
.. //depot/projects/xen31/bin/ed/ed.h#1 branch
.. //depot/projects/xen31/bin/ed/glbl.c#1 branch
.. //depot/projects/xen31/bin/ed/io.c#1 branch
.. //depot/projects/xen31/bin/ed/main.c#1 branch
.. //depot/projects/xen31/bin/ed/re.c#1 branch
.. //depot/projects/xen31/bin/ed/sub.c#1 branch
.. //depot/projects/xen31/bin/ed/test/=.err#1 branch
.. //depot/projects/xen31/bin/ed/test/Makefile#1 branch
.. //depot/projects/xen31/bin/ed/test/README#1 branch
.. //depot/projects/xen31/bin/ed/test/TODO#1 branch
.. //depot/projects/xen31/bin/ed/test/a.d#1 branch
.. //depot/projects/xen31/bin/ed/test/a.r#1 branch
.. //depot/projects/xen31/bin/ed/test/a.t#1 branch
.. //depot/projects/xen31/bin/ed/test/a1.err#1 branch
.. //depot/projects/xen31/bin/ed/test/a2.err#1 branch
.. //depot/projects/xen31/bin/ed/test/addr.d#1 branch
.. //depot/projects/xen31/bin/ed/test/addr.r#1 branch
.. //depot/projects/xen31/bin/ed/test/addr.t#1 branch
.. //depot/projects/xen31/bin/ed/test/addr1.err#1 branch
.. //depot/projects/xen31/bin/ed/test/addr2.err#1 branch
.. //depot/projects/xen31/bin/ed/test/ascii.d.uu#1 branch
.. //depot/projects/xen31/bin/ed/test/ascii.r.uu#1 branch
.. //depot/projects/xen31/bin/ed/test/ascii.t#1 branch
.. //depot/projects/xen31/bin/ed/test/bang1.d#1 branch
.. //depot/projects/xen31/bin/ed/test/bang1.err#1 branch
.. //depot/projects/xen31/bin/ed/test/bang1.r#1 branch
.. //depot/projects/xen31/bin/ed/test/bang1.t#1 branch
.. //depot/projects/xen31/bin/ed/test/bang2.err#1 branch
.. //depot/projects/xen31/bin/ed/test/c.d#1 branch
.. //depot/projects/xen31/bin/ed/test/c.r#1 branch
.. //depot/projects/xen31/bin/ed/test/c.t#1 branch
.. //depot/projects/xen31/bin/ed/test/c1.err#1 branch
.. //depot/projects/xen31/bin/ed/test/c2.err#1 branch
.. //depot/projects/xen31/bin/ed/test/ckscripts.sh#1 branch
.. //depot/projects/xen31/bin/ed/test/d.d#1 branch
.. //depot/projects/xen31/bin/ed/test/d.err#1 branch
.. //depot/projects/xen31/bin/ed/test/d.r#1 branch
.. //depot/projects/xen31/bin/ed/test/d.t#1 branch
.. //depot/projects/xen31/bin/ed/test/e1.d#1 branch
.. //depot/projects/xen31/bin/ed/test/e1.err#1 branch
.. //depot/projects/xen31/bin/ed/test/e1.r#1 branch
.. //depot/projects/xen31/bin/ed/test/e1.t#1 branch
.. //depot/projects/xen31/bin/ed/test/e2.d#1 branch
.. //depot/projects/xen31/bin/ed/test/e2.err#1 branch
.. //depot/projects/xen31/bin/ed/test/e2.r#1 branch
.. //depot/projects/xen31/bin/ed/test/e2.t#1 branch
.. //depot/projects/xen31/bin/ed/test/e3.d#1 branch
.. //depot/projects/xen31/bin/ed/test/e3.err#1 branch
.. //depot/projects/xen31/bin/ed/test/e3.r#1 branch
.. //depot/projects/xen31/bin/ed/test/e3.t#1 branch
.. //depot/projects/xen31/bin/ed/test/e4.d#1 branch
.. //depot/projects/xen31/bin/ed/test/e4.r#1 branch
.. //depot/projects/xen31/bin/ed/test/e4.t#1 branch
.. //depot/projects/xen31/bin/ed/test/f1.err#1 branch
.. //depot/projects/xen31/bin/ed/test/f2.err#1 branch
.. //depot/projects/xen31/bin/ed/test/g1.d#1 branch
.. //depot/projects/xen31/bin/ed/test/g1.err#1 branch
.. //depot/projects/xen31/bin/ed/test/g1.r#1 branch
.. //depot/projects/xen31/bin/ed/test/g1.t#1 branch
.. //depot/projects/xen31/bin/ed/test/g2.d#1 branch
.. //depot/projects/xen31/bin/ed/test/g2.err#1 branch
.. //depot/projects/xen31/bin/ed/test/g2.r#1 branch
.. //depot/projects/xen31/bin/ed/test/g2.t#1 branch
.. //depot/projects/xen31/bin/ed/test/g3.d#1 branch
.. //depot/projects/xen31/bin/ed/test/g3.err#1 branch
.. //depot/projects/xen31/bin/ed/test/g3.r#1 branch
.. //depot/projects/xen31/bin/ed/test/g3.t#1 branch
.. //depot/projects/xen31/bin/ed/test/g4.d#1 branch
.. //depot/projects/xen31/bin/ed/test/g4.r#1 branch
.. //depot/projects/xen31/bin/ed/test/g4.t#1 branch
.. //depot/projects/xen31/bin/ed/test/g5.d#1 branch
.. //depot/projects/xen31/bin/ed/test/g5.r#1 branch
.. //depot/projects/xen31/bin/ed/test/g5.t#1 branch
.. //depot/projects/xen31/bin/ed/test/h.err#1 branch
.. //depot/projects/xen31/bin/ed/test/i.d#1 branch
.. //depot/projects/xen31/bin/ed/test/i.r#1 branch
.. //depot/projects/xen31/bin/ed/test/i.t#1 branch
.. //depot/projects/xen31/bin/ed/test/i1.err#1 branch
.. //depot/projects/xen31/bin/ed/test/i2.err#1 branch
.. //depot/projects/xen31/bin/ed/test/i3.err#1 branch
.. //depot/projects/xen31/bin/ed/test/j.d#1 branch
.. //depot/projects/xen31/bin/ed/test/j.r#1 branch
.. //depot/projects/xen31/bin/ed/test/j.t#1 branch
.. //depot/projects/xen31/bin/ed/test/k.d#1 branch
.. //depot/projects/xen31/bin/ed/test/k.r#1 branch
.. //depot/projects/xen31/bin/ed/test/k.t#1 branch
.. //depot/projects/xen31/bin/ed/test/k1.err#1 branch
.. //depot/projects/xen31/bin/ed/test/k2.err#1 branch
.. //depot/projects/xen31/bin/ed/test/k3.err#1 branch
.. //depot/projects/xen31/bin/ed/test/k4.err#1 branch
.. //depot/projects/xen31/bin/ed/test/l.d#1 branch
.. //depot/projects/xen31/bin/ed/test/l.r#1 branch
.. //depot/projects/xen31/bin/ed/test/l.t#1 branch
.. //depot/projects/xen31/bin/ed/test/m.d#1 branch
.. //depot/projects/xen31/bin/ed/test/m.err#1 branch
.. //depot/projects/xen31/bin/ed/test/m.r#1 branch
.. //depot/projects/xen31/bin/ed/test/m.t#1 branch
.. //depot/projects/xen31/bin/ed/test/mkscripts.sh#1 branch
.. //depot/projects/xen31/bin/ed/test/n.d#1 branch
.. //depot/projects/xen31/bin/ed/test/n.r#1 branch
.. //depot/projects/xen31/bin/ed/test/n.t#1 branch
.. //depot/projects/xen31/bin/ed/test/nl.err#1 branch
.. //depot/projects/xen31/bin/ed/test/nl1.d#1 branch
.. //depot/projects/xen31/bin/ed/test/nl1.r#1 branch
.. //depot/projects/xen31/bin/ed/test/nl1.t#1 branch
.. //depot/projects/xen31/bin/ed/test/nl2.d#1 branch
.. //depot/projects/xen31/bin/ed/test/nl2.r#1 branch
.. //depot/projects/xen31/bin/ed/test/nl2.t#1 branch
.. //depot/projects/xen31/bin/ed/test/p.d#1 branch
.. //depot/projects/xen31/bin/ed/test/p.r#1 branch
.. //depot/projects/xen31/bin/ed/test/p.t#1 branch
.. //depot/projects/xen31/bin/ed/test/q.d#1 branch
.. //depot/projects/xen31/bin/ed/test/q.r#1 branch
.. //depot/projects/xen31/bin/ed/test/q.t#1 branch
.. //depot/projects/xen31/bin/ed/test/q1.err#1 branch
.. //depot/projects/xen31/bin/ed/test/r1.d#1 branch
.. //depot/projects/xen31/bin/ed/test/r1.err#1 branch
.. //depot/projects/xen31/bin/ed/test/r1.r#1 branch
.. //depot/projects/xen31/bin/ed/test/r1.t#1 branch
.. //depot/projects/xen31/bin/ed/test/r2.d#1 branch
.. //depot/projects/xen31/bin/ed/test/r2.err#1 branch
.. //depot/projects/xen31/bin/ed/test/r2.r#1 branch
.. //depot/projects/xen31/bin/ed/test/r2.t#1 branch
.. //depot/projects/xen31/bin/ed/test/r3.d#1 branch
.. //depot/projects/xen31/bin/ed/test/r3.r#1 branch
.. //depot/projects/xen31/bin/ed/test/r3.t#1 branch
.. //depot/projects/xen31/bin/ed/test/s1.d#1 branch
.. //depot/projects/xen31/bin/ed/test/s1.err#1 branch
.. //depot/projects/xen31/bin/ed/test/s1.r#1 branch
.. //depot/projects/xen31/bin/ed/test/s1.t#1 branch
.. //depot/projects/xen31/bin/ed/test/s10.err#1 branch
.. //depot/projects/xen31/bin/ed/test/s2.d#1 branch
.. //depot/projects/xen31/bin/ed/test/s2.err#1 branch
.. //depot/projects/xen31/bin/ed/test/s2.r#1 branch
.. //depot/projects/xen31/bin/ed/test/s2.t#1 branch
.. //depot/projects/xen31/bin/ed/test/s3.d#1 branch
.. //depot/projects/xen31/bin/ed/test/s3.err#1 branch
.. //depot/projects/xen31/bin/ed/test/s3.r#1 branch
.. //depot/projects/xen31/bin/ed/test/s3.t#1 branch
.. //depot/projects/xen31/bin/ed/test/s4.err#1 branch
.. //depot/projects/xen31/bin/ed/test/s5.err#1 branch
.. //depot/projects/xen31/bin/ed/test/s6.err#1 branch
.. //depot/projects/xen31/bin/ed/test/s7.err#1 branch
.. //depot/projects/xen31/bin/ed/test/s8.err#1 branch
.. //depot/projects/xen31/bin/ed/test/s9.err#1 branch
.. //depot/projects/xen31/bin/ed/test/t.d#1 branch
.. //depot/projects/xen31/bin/ed/test/t.r#1 branch
.. //depot/projects/xen31/bin/ed/test/t1.d#1 branch
.. //depot/projects/xen31/bin/ed/test/t1.err#1 branch
.. //depot/projects/xen31/bin/ed/test/t1.r#1 branch
.. //depot/projects/xen31/bin/ed/test/t1.t#1 branch
.. //depot/projects/xen31/bin/ed/test/t2.d#1 branch
.. //depot/projects/xen31/bin/ed/test/t2.err#1 branch
.. //depot/projects/xen31/bin/ed/test/t2.r#1 branch
.. //depot/projects/xen31/bin/ed/test/t2.t#1 branch
.. //depot/projects/xen31/bin/ed/test/u.d#1 branch
.. //depot/projects/xen31/bin/ed/test/u.err#1 branch
.. //depot/projects/xen31/bin/ed/test/u.r#1 branch
.. //depot/projects/xen31/bin/ed/test/u.t#1 branch
.. //depot/projects/xen31/bin/ed/test/v.d#1 branch
.. //depot/projects/xen31/bin/ed/test/v.r#1 branch
.. //depot/projects/xen31/bin/ed/test/v.t#1 branch
.. //depot/projects/xen31/bin/ed/test/w.d#1 branch
.. //depot/projects/xen31/bin/ed/test/w.r#1 branch
.. //depot/projects/xen31/bin/ed/test/w.t#1 branch
.. //depot/projects/xen31/bin/ed/test/w1.err#1 branch
.. //depot/projects/xen31/bin/ed/test/w2.err#1 branch
.. //depot/projects/xen31/bin/ed/test/w3.err#1 branch
.. //depot/projects/xen31/bin/ed/test/x.err#1 branch
.. //depot/projects/xen31/bin/ed/test/z.err#1 branch
.. //depot/projects/xen31/bin/ed/undo.c#1 branch
.. //depot/projects/xen31/bin/expr/Makefile#1 branch
.. //depot/projects/xen31/bin/expr/expr.1#1 branch
.. //depot/projects/xen31/bin/expr/expr.y#1 branch
.. //depot/projects/xen31/bin/getfacl/Makefile#1 branch
.. //depot/projects/xen31/bin/getfacl/getfacl.1#1 branch
.. //depot/projects/xen31/bin/getfacl/getfacl.c#1 branch
.. //depot/projects/xen31/bin/hostname/Makefile#1 branch
.. //depot/projects/xen31/bin/hostname/hostname.1#1 branch
.. //depot/projects/xen31/bin/hostname/hostname.c#1 branch
.. //depot/projects/xen31/bin/kenv/Makefile#1 branch
.. //depot/projects/xen31/bin/kenv/kenv.1#1 branch
.. //depot/projects/xen31/bin/kenv/kenv.c#1 branch
.. //depot/projects/xen31/bin/kill/Makefile#1 branch
.. //depot/projects/xen31/bin/kill/kill.1#1 branch
.. //depot/projects/xen31/bin/kill/kill.c#1 branch
.. //depot/projects/xen31/bin/ln/Makefile#1 branch
.. //depot/projects/xen31/bin/ln/ln.1#1 branch
.. //depot/projects/xen31/bin/ln/ln.c#1 branch
.. //depot/projects/xen31/bin/ln/symlink.7#1 branch
.. //depot/projects/xen31/bin/ls/Makefile#1 branch
.. //depot/projects/xen31/bin/ls/cmp.c#1 branch
.. //depot/projects/xen31/bin/ls/extern.h#1 branch
.. //depot/projects/xen31/bin/ls/ls.1#1 branch
.. //depot/projects/xen31/bin/ls/ls.c#1 branch
.. //depot/projects/xen31/bin/ls/ls.h#1 branch
.. //depot/projects/xen31/bin/ls/print.c#1 branch
.. //depot/projects/xen31/bin/ls/util.c#1 branch
.. //depot/projects/xen31/bin/mkdir/Makefile#1 branch
.. //depot/projects/xen31/bin/mkdir/mkdir.1#1 branch
.. //depot/projects/xen31/bin/mkdir/mkdir.c#1 branch
.. //depot/projects/xen31/bin/mv/Makefile#1 branch
.. //depot/projects/xen31/bin/mv/mv.1#1 branch
.. //depot/projects/xen31/bin/mv/mv.c#1 branch
.. //depot/projects/xen31/bin/pax/Makefile#1 branch
.. //depot/projects/xen31/bin/pax/ar_io.c#1 branch
.. //depot/projects/xen31/bin/pax/ar_subs.c#1 branch
.. //depot/projects/xen31/bin/pax/buf_subs.c#1 branch
.. //depot/projects/xen31/bin/pax/cache.c#1 branch
.. //depot/projects/xen31/bin/pax/cache.h#1 branch
.. //depot/projects/xen31/bin/pax/cpio.1#1 branch
.. //depot/projects/xen31/bin/pax/cpio.c#1 branch
.. //depot/projects/xen31/bin/pax/cpio.h#1 branch
.. //depot/projects/xen31/bin/pax/extern.h#1 branch
.. //depot/projects/xen31/bin/pax/file_subs.c#1 branch
.. //depot/projects/xen31/bin/pax/ftree.c#1 branch
.. //depot/projects/xen31/bin/pax/ftree.h#1 branch
.. //depot/projects/xen31/bin/pax/gen_subs.c#1 branch
.. //depot/projects/xen31/bin/pax/getoldopt.c#1 branch
.. //depot/projects/xen31/bin/pax/options.c#1 branch
.. //depot/projects/xen31/bin/pax/options.h#1 branch
.. //depot/projects/xen31/bin/pax/pat_rep.c#1 branch
.. //depot/projects/xen31/bin/pax/pat_rep.h#1 branch
.. //depot/projects/xen31/bin/pax/pax.1#1 branch
.. //depot/projects/xen31/bin/pax/pax.c#1 branch
.. //depot/projects/xen31/bin/pax/pax.h#1 branch
.. //depot/projects/xen31/bin/pax/sel_subs.c#1 branch
.. //depot/projects/xen31/bin/pax/sel_subs.h#1 branch
.. //depot/projects/xen31/bin/pax/tables.c#1 branch
.. //depot/projects/xen31/bin/pax/tables.h#1 branch
.. //depot/projects/xen31/bin/pax/tar.1#1 branch
.. //depot/projects/xen31/bin/pax/tar.c#1 branch
.. //depot/projects/xen31/bin/pax/tar.h#1 branch
.. //depot/projects/xen31/bin/pax/tty_subs.c#1 branch
.. //depot/projects/xen31/bin/ps/Makefile#1 branch
.. //depot/projects/xen31/bin/ps/extern.h#1 branch
.. //depot/projects/xen31/bin/ps/fmt.c#1 branch
.. //depot/projects/xen31/bin/ps/keyword.c#1 branch
.. //depot/projects/xen31/bin/ps/nlist.c#1 branch
.. //depot/projects/xen31/bin/ps/print.c#1 branch
.. //depot/projects/xen31/bin/ps/ps.1#1 branch
.. //depot/projects/xen31/bin/ps/ps.c#1 branch
.. //depot/projects/xen31/bin/ps/ps.h#1 branch
.. //depot/projects/xen31/bin/pwd/Makefile#1 branch
.. //depot/projects/xen31/bin/pwd/pwd.1#1 branch
.. //depot/projects/xen31/bin/pwd/pwd.c#1 branch
.. //depot/projects/xen31/bin/rcp/Makefile#1 branch
.. //depot/projects/xen31/bin/rcp/extern.h#1 branch
.. //depot/projects/xen31/bin/rcp/rcp.1#1 branch
.. //depot/projects/xen31/bin/rcp/rcp.c#1 branch
.. //depot/projects/xen31/bin/rcp/util.c#1 branch
.. //depot/projects/xen31/bin/realpath/Makefile#1 branch
.. //depot/projects/xen31/bin/realpath/realpath.1#1 branch
.. //depot/projects/xen31/bin/realpath/realpath.c#1 branch
.. //depot/projects/xen31/bin/rm/Makefile#1 branch
.. //depot/projects/xen31/bin/rm/rm.1#1 branch
.. //depot/projects/xen31/bin/rm/rm.c#1 branch
.. //depot/projects/xen31/bin/rmail/Makefile#1 branch
.. //depot/projects/xen31/bin/rmdir/Makefile#1 branch
.. //depot/projects/xen31/bin/rmdir/rmdir.1#1 branch
.. //depot/projects/xen31/bin/rmdir/rmdir.c#1 branch
.. //depot/projects/xen31/bin/setfacl/Makefile#1 branch
.. //depot/projects/xen31/bin/setfacl/file.c#1 branch
.. //depot/projects/xen31/bin/setfacl/mask.c#1 branch
.. //depot/projects/xen31/bin/setfacl/merge.c#1 branch
.. //depot/projects/xen31/bin/setfacl/remove.c#1 branch
.. //depot/projects/xen31/bin/setfacl/setfacl.1#1 branch
.. //depot/projects/xen31/bin/setfacl/setfacl.c#1 branch
.. //depot/projects/xen31/bin/setfacl/setfacl.h#1 branch
.. //depot/projects/xen31/bin/setfacl/util.c#1 branch
.. //depot/projects/xen31/bin/sh/Makefile#1 branch
.. //depot/projects/xen31/bin/sh/TOUR#1 branch
.. //depot/projects/xen31/bin/sh/alias.c#1 branch
.. //depot/projects/xen31/bin/sh/alias.h#1 branch
.. //depot/projects/xen31/bin/sh/arith.h#1 branch
.. //depot/projects/xen31/bin/sh/arith.y#1 branch
.. //depot/projects/xen31/bin/sh/arith_lex.l#1 branch
.. //depot/projects/xen31/bin/sh/bltin/bltin.h#1 branch
.. //depot/projects/xen31/bin/sh/bltin/echo.1#1 branch
.. //depot/projects/xen31/bin/sh/bltin/echo.c#1 branch
.. //depot/projects/xen31/bin/sh/builtins.def#1 branch
.. //depot/projects/xen31/bin/sh/cd.c#1 branch
.. //depot/projects/xen31/bin/sh/cd.h#1 branch
.. //depot/projects/xen31/bin/sh/error.c#1 branch
.. //depot/projects/xen31/bin/sh/error.h#1 branch
.. //depot/projects/xen31/bin/sh/eval.c#1 branch
.. //depot/projects/xen31/bin/sh/eval.h#1 branch
.. //depot/projects/xen31/bin/sh/exec.c#1 branch
.. //depot/projects/xen31/bin/sh/exec.h#1 branch
.. //depot/projects/xen31/bin/sh/expand.c#1 branch
.. //depot/projects/xen31/bin/sh/expand.h#1 branch
.. //depot/projects/xen31/bin/sh/funcs/cmv#1 branch
.. //depot/projects/xen31/bin/sh/funcs/dirs#1 branch
.. //depot/projects/xen31/bin/sh/funcs/kill#1 branch
.. //depot/projects/xen31/bin/sh/funcs/login#1 branch
.. //depot/projects/xen31/bin/sh/funcs/newgrp#1 branch
.. //depot/projects/xen31/bin/sh/funcs/popd#1 branch
.. //depot/projects/xen31/bin/sh/funcs/pushd#1 branch
.. //depot/projects/xen31/bin/sh/funcs/suspend#1 branch
.. //depot/projects/xen31/bin/sh/histedit.c#1 branch
.. //depot/projects/xen31/bin/sh/init.h#1 branch
.. //depot/projects/xen31/bin/sh/input.c#1 branch
.. //depot/projects/xen31/bin/sh/input.h#1 branch
.. //depot/projects/xen31/bin/sh/jobs.c#1 branch
.. //depot/projects/xen31/bin/sh/jobs.h#1 branch
.. //depot/projects/xen31/bin/sh/mail.c#1 branch
.. //depot/projects/xen31/bin/sh/mail.h#1 branch
.. //depot/projects/xen31/bin/sh/main.c#1 branch
.. //depot/projects/xen31/bin/sh/main.h#1 branch
.. //depot/projects/xen31/bin/sh/memalloc.c#1 branch
.. //depot/projects/xen31/bin/sh/memalloc.h#1 branch
.. //depot/projects/xen31/bin/sh/miscbltin.c#1 branch
.. //depot/projects/xen31/bin/sh/mkbuiltins#1 branch
.. //depot/projects/xen31/bin/sh/mkinit.c#1 branch
.. //depot/projects/xen31/bin/sh/mknodes.c#1 branch
.. //depot/projects/xen31/bin/sh/mksyntax.c#1 branch
.. //depot/projects/xen31/bin/sh/mktokens#1 branch
.. //depot/projects/xen31/bin/sh/myhistedit.h#1 branch
.. //depot/projects/xen31/bin/sh/mystring.c#1 branch
.. //depot/projects/xen31/bin/sh/mystring.h#1 branch
.. //depot/projects/xen31/bin/sh/nodes.c.pat#1 branch
.. //depot/projects/xen31/bin/sh/nodetypes#1 branch
.. //depot/projects/xen31/bin/sh/options.c#1 branch
.. //depot/projects/xen31/bin/sh/options.h#1 branch
.. //depot/projects/xen31/bin/sh/output.c#1 branch
.. //depot/projects/xen31/bin/sh/output.h#1 branch
.. //depot/projects/xen31/bin/sh/parser.c#1 branch
.. //depot/projects/xen31/bin/sh/parser.h#1 branch
.. //depot/projects/xen31/bin/sh/redir.c#1 branch
.. //depot/projects/xen31/bin/sh/redir.h#1 branch
.. //depot/projects/xen31/bin/sh/sh.1#1 branch
.. //depot/projects/xen31/bin/sh/shell.h#1 branch
.. //depot/projects/xen31/bin/sh/show.c#1 branch
.. //depot/projects/xen31/bin/sh/show.h#1 branch
.. //depot/projects/xen31/bin/sh/trap.c#1 branch
.. //depot/projects/xen31/bin/sh/trap.h#1 branch
.. //depot/projects/xen31/bin/sh/var.c#1 branch
.. //depot/projects/xen31/bin/sh/var.h#1 branch
.. //depot/projects/xen31/bin/sleep/Makefile#1 branch
.. //depot/projects/xen31/bin/sleep/sleep.1#1 branch
.. //depot/projects/xen31/bin/sleep/sleep.c#1 branch
.. //depot/projects/xen31/bin/stty/Makefile#1 branch
.. //depot/projects/xen31/bin/stty/cchar.c#1 branch
.. //depot/projects/xen31/bin/stty/extern.h#1 branch
.. //depot/projects/xen31/bin/stty/gfmt.c#1 branch
.. //depot/projects/xen31/bin/stty/key.c#1 branch
.. //depot/projects/xen31/bin/stty/modes.c#1 branch
.. //depot/projects/xen31/bin/stty/print.c#1 branch
.. //depot/projects/xen31/bin/stty/stty.1#1 branch
.. //depot/projects/xen31/bin/stty/stty.c#1 branch
.. //depot/projects/xen31/bin/stty/stty.h#1 branch
.. //depot/projects/xen31/bin/stty/util.c#1 branch
.. //depot/projects/xen31/bin/sync/Makefile#1 branch
.. //depot/projects/xen31/bin/sync/sync.8#1 branch
.. //depot/projects/xen31/bin/sync/sync.c#1 branch
.. //depot/projects/xen31/bin/test/Makefile#1 branch
.. //depot/projects/xen31/bin/test/TEST.README#1 branch
.. //depot/projects/xen31/bin/test/TEST.csh#1 branch
.. //depot/projects/xen31/bin/test/TEST.sh#1 branch
.. //depot/projects/xen31/bin/test/test.1#1 branch
.. //depot/projects/xen31/bin/test/test.c#1 branch
.. //depot/projects/xen31/cddl/Makefile#1 branch
.. //depot/projects/xen31/cddl/Makefile.inc#1 branch
.. //depot/projects/xen31/cddl/lib/Makefile#1 branch
.. //depot/projects/xen31/cddl/lib/Makefile.inc#1 branch
.. //depot/projects/xen31/cddl/lib/libavl/Makefile#1 branch
.. //depot/projects/xen31/cddl/lib/libnvpair/Makefile#1 branch
.. //depot/projects/xen31/cddl/lib/libumem/Makefile#1 branch
.. //depot/projects/xen31/cddl/lib/libuutil/Makefile#1 branch
.. //depot/projects/xen31/cddl/lib/libzfs/Makefile#1 branch
.. //depot/projects/xen31/cddl/lib/libzpool/Makefile#1 branch
.. //depot/projects/xen31/cddl/sbin/Makefile#1 branch
.. //depot/projects/xen31/cddl/sbin/Makefile.inc#1 branch
.. //depot/projects/xen31/cddl/sbin/zfs/Makefile#1 branch
.. //depot/projects/xen31/cddl/sbin/zpool/Makefile#1 branch
.. //depot/projects/xen31/cddl/usr.bin/Makefile#1 branch
.. //depot/projects/xen31/cddl/usr.bin/Makefile.inc#1 branch
.. //depot/projects/xen31/cddl/usr.bin/ztest/Makefile#1 branch
.. //depot/projects/xen31/cddl/usr.sbin/Makefile#1 branch
.. //depot/projects/xen31/cddl/usr.sbin/Makefile.inc#1 branch
.. //depot/projects/xen31/cddl/usr.sbin/zdb/Makefile#1 branch
.. //depot/projects/xen31/compat/opensolaris/include/devid.h#1 branch
.. //depot/projects/xen31/compat/opensolaris/include/fsshare.h#1 branch
.. //depot/projects/xen31/compat/opensolaris/include/libintl.h#1 branch
.. //depot/projects/xen31/compat/opensolaris/include/mnttab.h#1 branch
.. //depot/projects/xen31/compat/opensolaris/include/priv.h#1 branch
.. //depot/projects/xen31/compat/opensolaris/include/solaris.h#1 branch
.. //depot/projects/xen31/compat/opensolaris/include/zone.h#1 branch
.. //depot/projects/xen31/compat/opensolaris/lib/libumem/umem.c#1 branch
.. //depot/projects/xen31/compat/opensolaris/lib/libumem/umem.h#1 branch
.. //depot/projects/xen31/compat/opensolaris/misc/deviceid.c#1 branch
.. //depot/projects/xen31/compat/opensolaris/misc/fsshare.c#1 branch
.. //depot/projects/xen31/compat/opensolaris/misc/mkdirp.c#1 branch
.. //depot/projects/xen31/compat/opensolaris/misc/mnttab.c#1 branch
.. //depot/projects/xen31/compat/opensolaris/misc/zmount.c#1 branch
.. //depot/projects/xen31/compat/opensolaris/misc/zone.c#1 branch
.. //depot/projects/xen31/contrib/amd/AUTHORS#1 branch
.. //depot/projects/xen31/contrib/amd/BUGS#1 branch
.. //depot/projects/xen31/contrib/amd/COPYING#1 branch
.. //depot/projects/xen31/contrib/amd/ChangeLog#1 branch
.. //depot/projects/xen31/contrib/amd/FREEBSD-Xlist#1 branch
.. //depot/projects/xen31/contrib/amd/FREEBSD-upgrade#1 branch
.. //depot/projects/xen31/contrib/amd/INSTALL#1 branch
.. //depot/projects/xen31/contrib/amd/MIRRORS.html#1 branch
.. //depot/projects/xen31/contrib/amd/MIRRORS.txt#1 branch
.. //depot/projects/xen31/contrib/amd/NEWS#1 branch
.. //depot/projects/xen31/contrib/amd/README#1 branch
.. //depot/projects/xen31/contrib/amd/README.ldap#1 branch
.. //depot/projects/xen31/contrib/amd/README.y2k#1 branch
.. //depot/projects/xen31/contrib/amd/amd/am_ops.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/amd.8#1 branch
.. //depot/projects/xen31/contrib/amd/amd/amd.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/amd.h#1 branch
.. //depot/projects/xen31/contrib/amd/amd/amfs_auto.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/amfs_direct.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/amfs_error.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/amfs_host.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/amfs_inherit.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/amfs_link.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/amfs_linkx.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/amfs_nfsl.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/amfs_nfsx.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/amfs_program.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/amfs_root.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/amfs_toplvl.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/amfs_union.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/amq_subr.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/amq_svc.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/autil.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/clock.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/conf.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/conf_parse.y#1 branch
.. //depot/projects/xen31/contrib/amd/amd/conf_tok.l#1 branch
.. //depot/projects/xen31/contrib/amd/amd/get_args.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/info_file.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/info_hesiod.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/info_ldap.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/info_ndbm.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/info_nis.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/info_nisplus.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/info_passwd.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/info_union.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/map.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/mapc.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/mntfs.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/nfs_prot_svc.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/nfs_start.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/nfs_subr.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/ops_TEMPLATE.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/ops_cachefs.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/ops_cdfs.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/ops_efs.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/ops_lofs.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/ops_mfs.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/ops_nfs.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/ops_nfs3.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/ops_nullfs.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/ops_pcfs.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/ops_tfs.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/ops_tmpfs.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/ops_ufs.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/ops_umapfs.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/ops_unionfs.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/ops_xfs.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/opts.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/restart.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/rpc_fwd.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/sched.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/srvr_amfs_auto.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/srvr_nfs.c#1 branch
.. //depot/projects/xen31/contrib/amd/amq/amq.8#1 branch
.. //depot/projects/xen31/contrib/amd/amq/amq.c#1 branch
.. //depot/projects/xen31/contrib/amd/amq/amq.h#1 branch
.. //depot/projects/xen31/contrib/amd/amq/amq_clnt.c#1 branch
.. //depot/projects/xen31/contrib/amd/amq/amq_xdr.c#1 branch
.. //depot/projects/xen31/contrib/amd/amq/pawd.1#1 branch
.. //depot/projects/xen31/contrib/amd/amq/pawd.c#1 branch
.. //depot/projects/xen31/contrib/amd/aux_conf.h.in#1 branch
.. //depot/projects/xen31/contrib/amd/bootstrap#1 branch
.. //depot/projects/xen31/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch
.. //depot/projects/xen31/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch
.. //depot/projects/xen31/contrib/amd/conf/mtab/mtab_bsd.c#1 branch
.. //depot/projects/xen31/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch
.. //depot/projects/xen31/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch
.. //depot/projects/xen31/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch
.. //depot/projects/xen31/contrib/amd/conf/transp/transp_sockets.c#1 branch
.. //depot/projects/xen31/contrib/amd/conf/trap/trap_default.h#1 branch
.. //depot/projects/xen31/contrib/amd/conf/umount/umount_bsd44.c#1 branch
.. //depot/projects/xen31/contrib/amd/doc/am-utils.texi#1 branch
.. //depot/projects/xen31/contrib/amd/doc/texinfo.tex#1 branch
.. //depot/projects/xen31/contrib/amd/doc/version.texi#1 branch
.. //depot/projects/xen31/contrib/amd/fixmount/fixmount.8#1 branch
.. //depot/projects/xen31/contrib/amd/fixmount/fixmount.c#1 branch
.. //depot/projects/xen31/contrib/amd/fsinfo/fsi_analyze.c#1 branch
.. //depot/projects/xen31/contrib/amd/fsinfo/fsi_data.h#1 branch
.. //depot/projects/xen31/contrib/amd/fsinfo/fsi_dict.c#1 branch
.. //depot/projects/xen31/contrib/amd/fsinfo/fsi_gram.y#1 branch
.. //depot/projects/xen31/contrib/amd/fsinfo/fsi_lex.l#1 branch
.. //depot/projects/xen31/contrib/amd/fsinfo/fsi_util.c#1 branch
.. //depot/projects/xen31/contrib/amd/fsinfo/fsinfo.8#1 branch
.. //depot/projects/xen31/contrib/amd/fsinfo/fsinfo.c#1 branch
.. //depot/projects/xen31/contrib/amd/fsinfo/fsinfo.h#1 branch
.. //depot/projects/xen31/contrib/amd/fsinfo/wr_atab.c#1 branch
.. //depot/projects/xen31/contrib/amd/fsinfo/wr_bparam.c#1 branch
.. //depot/projects/xen31/contrib/amd/fsinfo/wr_dumpset.c#1 branch
.. //depot/projects/xen31/contrib/amd/fsinfo/wr_exportfs.c#1 branch
.. //depot/projects/xen31/contrib/amd/fsinfo/wr_fstab.c#1 branch
.. //depot/projects/xen31/contrib/amd/hlfsd/hlfsd.8#1 branch
.. //depot/projects/xen31/contrib/amd/hlfsd/hlfsd.c#1 branch
.. //depot/projects/xen31/contrib/amd/hlfsd/hlfsd.h#1 branch
.. //depot/projects/xen31/contrib/amd/hlfsd/homedir.c#1 branch
.. //depot/projects/xen31/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch
.. //depot/projects/xen31/contrib/amd/hlfsd/stubs.c#1 branch
.. //depot/projects/xen31/contrib/amd/include/am_compat.h#1 branch
.. //depot/projects/xen31/contrib/amd/include/am_defs.h#1 branch
.. //depot/projects/xen31/contrib/amd/include/am_utils.h#1 branch
.. //depot/projects/xen31/contrib/amd/include/am_xdr_func.h#1 branch
.. //depot/projects/xen31/contrib/amd/include/amq_defs.h#1 branch
.. //depot/projects/xen31/contrib/amd/include/mount_headers1.h#1 branch
.. //depot/projects/xen31/contrib/amd/include/mount_headers2.h#1 branch
.. //depot/projects/xen31/contrib/amd/ldap-id.ms#1 branch
.. //depot/projects/xen31/contrib/amd/ldap-id.txt#1 branch
.. //depot/projects/xen31/contrib/amd/libamu/alloca.c#1 branch
.. //depot/projects/xen31/contrib/amd/libamu/amu.h#1 branch
.. //depot/projects/xen31/contrib/amd/libamu/hasmntopt.c#1 branch
.. //depot/projects/xen31/contrib/amd/libamu/misc_rpc.c#1 branch
.. //depot/projects/xen31/contrib/amd/libamu/mount_fs.c#1 branch
.. //depot/projects/xen31/contrib/amd/libamu/mtab.c#1 branch
.. //depot/projects/xen31/contrib/amd/libamu/nfs_prot_xdr.c#1 branch
.. //depot/projects/xen31/contrib/amd/libamu/strerror.c#1 branch
.. //depot/projects/xen31/contrib/amd/libamu/util.c#1 branch
.. //depot/projects/xen31/contrib/amd/libamu/wire.c#1 branch
.. //depot/projects/xen31/contrib/amd/libamu/xdr_func.c#1 branch
.. //depot/projects/xen31/contrib/amd/libamu/xutil.c#1 branch
.. //depot/projects/xen31/contrib/amd/m4/GNUmakefile#1 branch
.. //depot/projects/xen31/contrib/amd/m4/amdgrep#1 branch
.. //depot/projects/xen31/contrib/amd/m4/amindent#1 branch
.. //depot/projects/xen31/contrib/amd/m4/autopat#1 branch
.. //depot/projects/xen31/contrib/amd/m4/chop-aclocal.pl#1 branch
.. //depot/projects/xen31/contrib/amd/m4/copy-if-newbig#1 branch
.. //depot/projects/xen31/contrib/amd/m4/macros/HEADER#1 branch
.. //depot/projects/xen31/contrib/amd/m4/macros/TRAILER#1 branch
.. //depot/projects/xen31/contrib/amd/m4/mk-aclocal#1 branch
.. //depot/projects/xen31/contrib/amd/m4/mkconf#1 branch
.. //depot/projects/xen31/contrib/amd/m4/rmtspc#1 branch
.. //depot/projects/xen31/contrib/amd/m4/update_build_version#1 branch
.. //depot/projects/xen31/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch
.. //depot/projects/xen31/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch
.. //depot/projects/xen31/contrib/amd/scripts/Makefile.am#1 branch
.. //depot/projects/xen31/contrib/amd/scripts/Makefile.in#1 branch
.. //depot/projects/xen31/contrib/amd/scripts/am-eject.in#1 branch
.. //depot/projects/xen31/contrib/amd/scripts/amd.conf-sample#1 branch
.. //depot/projects/xen31/contrib/amd/scripts/amd.conf.5#1 branch
.. //depot/projects/xen31/contrib/amd/scripts/amd2ldif.in#1 branch
.. //depot/projects/xen31/contrib/amd/scripts/amd2sun.in#1 branch
.. //depot/projects/xen31/contrib/amd/scripts/automount2amd.8#1 branch
.. //depot/projects/xen31/contrib/amd/scripts/automount2amd.in#1 branch
.. //depot/projects/xen31/contrib/amd/scripts/ctl-amd.in#1 branch
.. //depot/projects/xen31/contrib/amd/scripts/ctl-hlfsd.in#1 branch
.. //depot/projects/xen31/contrib/amd/scripts/expn.1#1 branch
.. //depot/projects/xen31/contrib/amd/scripts/expn.in#1 branch
.. //depot/projects/xen31/contrib/amd/scripts/fix-amd-map.in#1 branch
.. //depot/projects/xen31/contrib/amd/scripts/fixrmtab.in#1 branch
.. //depot/projects/xen31/contrib/amd/scripts/redhat-ctl-amd.in#1 branch
.. //depot/projects/xen31/contrib/amd/scripts/wait4amd.in#1 branch
.. //depot/projects/xen31/contrib/amd/scripts/wait4amd2die.in#1 branch
.. //depot/projects/xen31/contrib/amd/tasks#1 branch
.. //depot/projects/xen31/contrib/amd/wire-test/wire-test.8#1 branch
.. //depot/projects/xen31/contrib/amd/wire-test/wire-test.c#1 branch
.. //depot/projects/xen31/contrib/bc/AUTHORS#1 branch
.. //depot/projects/xen31/contrib/bc/ChangeLog#1 branch
.. //depot/projects/xen31/contrib/bc/Examples/ckbook.b#1 branch
.. //depot/projects/xen31/contrib/bc/Examples/pi.b#1 branch
.. //depot/projects/xen31/contrib/bc/Examples/primes.b#1 branch
.. //depot/projects/xen31/contrib/bc/Examples/twins.b#1 branch
.. //depot/projects/xen31/contrib/bc/FAQ#1 branch
.. //depot/projects/xen31/contrib/bc/FREEBSD-upgrade#1 branch
.. //depot/projects/xen31/contrib/bc/INSTALL#1 branch
.. //depot/projects/xen31/contrib/bc/Makefile.am#1 branch
.. //depot/projects/xen31/contrib/bc/Makefile.in#1 branch
.. //depot/projects/xen31/contrib/bc/NEWS#1 branch
.. //depot/projects/xen31/contrib/bc/README#1 branch
.. //depot/projects/xen31/contrib/bc/Test/BUG.bc#1 branch
.. //depot/projects/xen31/contrib/bc/Test/array.b#1 branch
.. //depot/projects/xen31/contrib/bc/Test/arrayp.b#1 branch
.. //depot/projects/xen31/contrib/bc/Test/aryprm.b#1 branch
.. //depot/projects/xen31/contrib/bc/Test/atan.b#1 branch
.. //depot/projects/xen31/contrib/bc/Test/checklib.b#1 branch
.. //depot/projects/xen31/contrib/bc/Test/div.b#1 branch
.. //depot/projects/xen31/contrib/bc/Test/exp.b#1 branch
.. //depot/projects/xen31/contrib/bc/Test/fact.b#1 branch
.. //depot/projects/xen31/contrib/bc/Test/jn.b#1 branch
.. //depot/projects/xen31/contrib/bc/Test/ln.b#1 branch
.. //depot/projects/xen31/contrib/bc/Test/mul.b#1 branch
.. //depot/projects/xen31/contrib/bc/Test/raise.b#1 branch
.. //depot/projects/xen31/contrib/bc/Test/signum#1 branch
.. //depot/projects/xen31/contrib/bc/Test/sine.b#1 branch
.. //depot/projects/xen31/contrib/bc/Test/sqrt.b#1 branch
.. //depot/projects/xen31/contrib/bc/Test/sqrt1.b#1 branch
.. //depot/projects/xen31/contrib/bc/Test/sqrt2.b#1 branch
.. //depot/projects/xen31/contrib/bc/Test/testfn.b#1 branch
.. //depot/projects/xen31/contrib/bc/Test/timetest#1 branch
.. //depot/projects/xen31/contrib/bc/acconfig.h#1 branch
.. //depot/projects/xen31/contrib/bc/aclocal.m4#1 branch
.. //depot/projects/xen31/contrib/bc/bc/Makefile.am#1 branch
.. //depot/projects/xen31/contrib/bc/bc/Makefile.in#1 branch
.. //depot/projects/xen31/contrib/bc/bc/bc.y#1 branch
.. //depot/projects/xen31/contrib/bc/bc/bcdefs.h#1 branch
.. //depot/projects/xen31/contrib/bc/bc/const.h#1 branch
.. //depot/projects/xen31/contrib/bc/bc/execute.c#1 branch
.. //depot/projects/xen31/contrib/bc/bc/fix-libmath_h#1 branch
.. //depot/projects/xen31/contrib/bc/bc/global.c#1 branch
.. //depot/projects/xen31/contrib/bc/bc/global.h#1 branch
.. //depot/projects/xen31/contrib/bc/bc/libmath.b#1 branch
.. //depot/projects/xen31/contrib/bc/bc/libmath.h#1 branch
.. //depot/projects/xen31/contrib/bc/bc/load.c#1 branch
.. //depot/projects/xen31/contrib/bc/bc/main.c#1 branch
.. //depot/projects/xen31/contrib/bc/bc/proto.h#1 branch
.. //depot/projects/xen31/contrib/bc/bc/sbc.y#1 branch
.. //depot/projects/xen31/contrib/bc/bc/scan.l#1 branch
.. //depot/projects/xen31/contrib/bc/bc/storage.c#1 branch
.. //depot/projects/xen31/contrib/bc/bc/util.c#1 branch
.. //depot/projects/xen31/contrib/bc/config.h.in#1 branch
.. //depot/projects/xen31/contrib/bc/configure#1 branch
.. //depot/projects/xen31/contrib/bc/configure.in#1 branch
.. //depot/projects/xen31/contrib/bc/dc/Makefile.am#1 branch
.. //depot/projects/xen31/contrib/bc/dc/Makefile.in#1 branch
.. //depot/projects/xen31/contrib/bc/dc/array.c#1 branch
.. //depot/projects/xen31/contrib/bc/dc/dc-proto.h#1 branch
.. //depot/projects/xen31/contrib/bc/dc/dc-regdef.h#1 branch
.. //depot/projects/xen31/contrib/bc/dc/dc.c#1 branch
.. //depot/projects/xen31/contrib/bc/dc/dc.h#1 branch
.. //depot/projects/xen31/contrib/bc/dc/eval.c#1 branch
.. //depot/projects/xen31/contrib/bc/dc/misc.c#1 branch
.. //depot/projects/xen31/contrib/bc/dc/numeric.c#1 branch
.. //depot/projects/xen31/contrib/bc/dc/stack.c#1 branch
.. //depot/projects/xen31/contrib/bc/dc/string.c#1 branch
.. //depot/projects/xen31/contrib/bc/doc/Makefile.am#1 branch
.. //depot/projects/xen31/contrib/bc/doc/Makefile.in#1 branch
.. //depot/projects/xen31/contrib/bc/doc/bc.1#1 branch
.. //depot/projects/xen31/contrib/bc/doc/bc.texi#1 branch
.. //depot/projects/xen31/contrib/bc/doc/dc.1#1 branch
.. //depot/projects/xen31/contrib/bc/doc/dc.texi#1 branch
.. //depot/projects/xen31/contrib/bc/h/number.h#1 branch
.. //depot/projects/xen31/contrib/bc/install-sh#1 branch
.. //depot/projects/xen31/contrib/bc/lib/Makefile.am#1 branch
.. //depot/projects/xen31/contrib/bc/lib/Makefile.in#1 branch
.. //depot/projects/xen31/contrib/bc/lib/number.c#1 branch
.. //depot/projects/xen31/contrib/bc/lib/testmul.c#1 branch
.. //depot/projects/xen31/contrib/bc/lib/vfprintf.c#1 branch
.. //depot/projects/xen31/contrib/bc/missing#1 branch
.. //depot/projects/xen31/contrib/bc/mkinstalldirs#1 branch
.. //depot/projects/xen31/contrib/bc/stamp-h.in#1 branch
.. //depot/projects/xen31/contrib/bind9/CHANGES#1 branch
.. //depot/projects/xen31/contrib/bind9/COPYRIGHT#1 branch
.. //depot/projects/xen31/contrib/bind9/FAQ#1 branch
.. //depot/projects/xen31/contrib/bind9/FAQ.xml#1 branch
.. //depot/projects/xen31/contrib/bind9/FREEBSD-Upgrade#1 branch
.. //depot/projects/xen31/contrib/bind9/FREEBSD-Xlist#1 branch
.. //depot/projects/xen31/contrib/bind9/Makefile.in#1 branch
.. //depot/projects/xen31/contrib/bind9/README#1 branch
.. //depot/projects/xen31/contrib/bind9/README.idnkit#1 branch
.. //depot/projects/xen31/contrib/bind9/acconfig.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/Makefile.in#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/check/Makefile.in#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/check/check-tool.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/check/check-tool.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/check/named-checkconf.8#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/check/named-checkconf.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/check/named-checkconf.docbook#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/check/named-checkconf.html#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/check/named-checkzone.8#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/check/named-checkzone.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/check/named-checkzone.docbook#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/check/named-checkzone.html#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/dig/Makefile.in#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/dig/dig.1#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/dig/dig.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/dig/dig.docbook#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/dig/dig.html#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/dig/dighost.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/dig/host.1#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/dig/host.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/dig/host.docbook#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/dig/host.html#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/dig/include/dig/dig.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/dig/nslookup.1#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/dig/nslookup.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/dig/nslookup.docbook#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/dig/nslookup.html#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/dnssec/Makefile.in#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/dnssec/dnssectool.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/dnssec/dnssectool.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/Makefile.in#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/builtin.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/client.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/config.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/control.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/controlconf.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/include/named/builtin.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/include/named/client.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/include/named/config.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/include/named/control.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/include/named/globals.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/include/named/listenlist.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/include/named/log.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/include/named/logconf.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/include/named/lwresd.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/include/named/main.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/include/named/notify.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/include/named/query.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/include/named/server.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/include/named/sortlist.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/include/named/types.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/include/named/update.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/include/named/xfrout.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/interfacemgr.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/listenlist.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/log.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/logconf.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/lwaddr.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/lwdclient.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/lwderror.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/lwdgabn.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/lwdgnba.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/lwdgrbn.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/lwdnoop.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/lwresd.8#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/lwresd.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/lwresd.docbook#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/lwresd.html#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/lwsearch.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/main.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/named.8#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/named.conf.5#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/named.conf.docbook#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/named.conf.html#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/named.docbook#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/named.html#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/notify.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/query.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/server.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/sortlist.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/tkeyconf.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/tsigconf.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/unix/Makefile.in#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/unix/include/named/os.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/unix/os.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/update.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/xfrout.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/named/zoneconf.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/nsupdate/Makefile.in#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/rndc/Makefile.in#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/rndc/rndc.8#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/rndc/rndc.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/rndc/rndc.conf#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/rndc/rndc.conf.5#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/rndc/rndc.conf.html#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/rndc/rndc.docbook#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/rndc/rndc.html#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/rndc/unix/os.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/rndc/util.c#1 branch
.. //depot/projects/xen31/contrib/bind9/bin/rndc/util.h#1 branch
.. //depot/projects/xen31/contrib/bind9/config.guess#1 branch
.. //depot/projects/xen31/contrib/bind9/config.sub#1 branch
.. //depot/projects/xen31/contrib/bind9/config.threads.in#1 branch
.. //depot/projects/xen31/contrib/bind9/configure.in#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/Makefile.in#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/arm/Bv9ARM.ch10.html#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/arm/Bv9ARM.html#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/arm/Makefile.in#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/arm/README-SGML#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/arm/isc-logo.eps#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/arm/isc-logo.pdf#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/arm/man.dig.html#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/arm/man.dnssec-keygen.html#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/arm/man.dnssec-signzone.html#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/arm/man.host.html#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/arm/man.named-checkconf.html#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/arm/man.named-checkzone.html#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/arm/man.named.html#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/arm/man.rndc-confgen.html#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/arm/man.rndc.conf.html#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/arm/man.rndc.html#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-12.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-02.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-rsasha256-00.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsext-ds-sha256-05.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-04.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsext-nsid-01.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-02.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-06.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-10.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-05.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-08.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-06.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/draft/update#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/misc/Makefile.in#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/misc/dnssec#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/misc/format-options.pl#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/misc/ipv6#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/misc/migration#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/misc/migration-4to9#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/misc/options#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/misc/rfc-compliance#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/misc/roadmap#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/misc/sdb#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/rfc/index#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/rfc/rfc1032.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/rfc/rfc1033.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/rfc/rfc1034.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/rfc/rfc1035.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/rfc/rfc1101.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/rfc/rfc1122.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/rfc/rfc1123.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/rfc/rfc1183.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/rfc/rfc1348.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/rfc/rfc1535.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/rfc/rfc1536.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/rfc/rfc1537.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/rfc/rfc1591.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/rfc/rfc1611.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/rfc/rfc1612.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/rfc/rfc1706.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/rfc/rfc1712.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/rfc/rfc1750.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/rfc/rfc1876.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/rfc/rfc1886.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/rfc/rfc1982.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/rfc/rfc1995.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/rfc/rfc1996.txt#1 branch
.. //depot/projects/xen31/contrib/bind9/doc/rfc/rfc2052.txt#1 branch

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Mon Oct 22 04:04:59 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CD1A116A468; Mon, 22 Oct 2007 04:04: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 76EA816A420
	for ; Mon, 22 Oct 2007 04:04:58 +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 6B07713C48A
	for ; Mon, 22 Oct 2007 04:04:58 +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 l9M44wTM015442
	for ; Mon, 22 Oct 2007 04:04:58 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9M44wVE015439
	for perforce@freebsd.org; Mon, 22 Oct 2007 04:04:58 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 22 Oct 2007 04:04:58 GMT
Message-Id: <200710220404.l9M44wVE015439@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 127913 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, 22 Oct 2007 04:04:59 -0000

http://perforce.freebsd.org/chv.cgi?CH=127913

Change 127913 by jb@jb_freebsd1 on 2007/10/22 04:04:08

	Display the full path to the module too.

Affected files ...

.. //depot/projects/dtrace/src/sbin/kldstat/kldstat.c#4 edit
.. //depot/projects/dtrace6/src/sbin/kldstat/kldstat.c#2 edit

Differences ...

==== //depot/projects/dtrace/src/sbin/kldstat/kldstat.c#4 (text+ko) ====

@@ -60,9 +60,9 @@
     if (kldstat(fileid, &stat) < 0)
 	warn("can't stat file id %d", fileid);
     else
-	printf("%2d %4d %p %-8jx %s\n",
+	printf("%2d %4d %p %-8jx %s (%s)\n",
 	       stat.id, stat.refs, stat.address, (uintmax_t)stat.size, 
-	       stat.name);
+	       stat.name, stat.pathname);
 
     if (verbose) {
 	printf("\tContains modules:\n");

==== //depot/projects/dtrace6/src/sbin/kldstat/kldstat.c#2 (text+ko) ====

@@ -60,9 +60,9 @@
     if (kldstat(fileid, &stat) < 0)
 	warn("can't stat file id %d", fileid);
     else
-	printf("%2d %4d %p %-8jx %s\n",
+	printf("%2d %4d %p %-8jx %s (%s)\n",
 	       stat.id, stat.refs, stat.address, (uintmax_t)stat.size, 
-	       stat.name);
+	       stat.name, stat.pathname);
 
     if (verbose) {
 	printf("\tContains modules:\n");

From owner-p4-projects@FreeBSD.ORG  Mon Oct 22 13:16:17 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6426D16A474; Mon, 22 Oct 2007 13:16: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 099A216A418
	for ; Mon, 22 Oct 2007 13:16:17 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E5ED613C4BC
	for ; Mon, 22 Oct 2007 13:16:16 +0000 (UTC)
	(envelope-from zec@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 l9MDGGew010819
	for ; Mon, 22 Oct 2007 13:16:16 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9MDGGvV010816
	for perforce@freebsd.org; Mon, 22 Oct 2007 13:16:16 GMT
	(envelope-from zec@FreeBSD.org)
Date: Mon, 22 Oct 2007 13:16:16 GMT
Message-Id: <200710221316.l9MDGGvV010816@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 127921 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, 22 Oct 2007 13:16:17 -0000

http://perforce.freebsd.org/chv.cgi?CH=127921

Change 127921 by zec@zec_tpx32 on 2007/10/22 13:15:44

	Refcount ucred -> vimage bindings in struct vimage.  Obviously,
	we shouldn't release a vimage if other objects point to it.
	
	NB it is still not completely clear to me whether this additional
	refcounting would need additional protection / locking...

Affected files ...

.. //depot/projects/vimage/src/sys/kern/init_main.c#14 edit
.. //depot/projects/vimage/src/sys/kern/kern_prot.c#7 edit
.. //depot/projects/vimage/src/sys/kern/kern_vimage.c#49 edit
.. //depot/projects/vimage/src/sys/sys/vimage.h#47 edit

Differences ...

==== //depot/projects/vimage/src/sys/kern/init_main.c#14 (text+ko) ====

@@ -67,6 +67,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -447,9 +448,9 @@
 	p->p_ucred->cr_ruidinfo = uifind(0);
 	p->p_ucred->cr_prison = NULL;	/* Don't jail it. */
 #ifdef VIMAGE
-	p->p_ucred->cr_vimage =  LIST_FIRST(&vimage_head);
-	p->p_ucred->cr_rvimage = p->p_ucred->cr_vimage;
-	LIST_FIRST(&vprocg_head)->nprocs = 1;
+	P_TO_VIMAGE(p) =  LIST_FIRST(&vimage_head);
+	refcount_acquire(&P_TO_VIMAGE(p)->vi_ucredrefc);
+	LIST_FIRST(&vprocg_head)->nprocs++;
 #endif
 #ifdef AUDIT
 	audit_cred_kproc0(p->p_ucred);

==== //depot/projects/vimage/src/sys/kern/kern_prot.c#7 (text+ko) ====

@@ -1794,6 +1794,10 @@
 		 */
 		if (jailed(cr))
 			prison_free(cr->cr_prison);
+#ifdef VIMAGE
+		if (cr->cr_vimage != NULL)
+			refcount_release(&cr->cr_vimage->vi_ucredrefc);
+#endif
 #ifdef AUDIT
 		audit_cred_destroy(cr);
 #endif
@@ -1829,6 +1833,10 @@
 	uihold(dest->cr_ruidinfo);
 	if (jailed(dest))
 		prison_hold(dest->cr_prison);
+#ifdef VIMAGE
+	KASSERT(src->cr_vimage != NULL, ("cr_vimage == NULL"));
+	refcount_acquire(&dest->cr_vimage->vi_ucredrefc);
+#endif
 #ifdef AUDIT
 	audit_cred_copy(src, dest);
 #endif

==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#49 (text+ko) ====

@@ -40,6 +40,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -527,12 +528,14 @@
 			oldcred = p->p_ucred;
 			setsugid(p);
 			crcopy(newcred, oldcred);
+			refcount_release(&newcred->cr_vimage->vi_ucredrefc);
 			newcred->cr_vimage = vip_r;
-			newcred->cr_rvimage = vip_r;	/* XXX */
+			refcount_acquire(&newcred->cr_vimage->vi_ucredrefc);
 			p->p_ucred = newcred;
 			PROC_UNLOCK(p);
 			sx_xlock(&allproc_lock);
 			oldcred->cr_vimage->v_procg->nprocs--;
+			refcount_release(&oldcred->cr_vimage->vi_ucredrefc);
 			P_TO_VPROCG(p)->nprocs++;
 			sched_load_reassign(oldcred->cr_vimage->v_procg,
 			    newcred->cr_vimage->v_procg);
@@ -682,6 +685,10 @@
 	if (vnet->sockcnt != 0)
 		return (EBUSY);
 
+	if (vip->vi_ucredrefc != 0)
+		printf("vi_destroy: %s ucredrefc %d\n",
+		    vip->vi_name, vip->vi_ucredrefc);
+
 	VNET_LIST_LOCK();
 	LIST_REMOVE(vnet, vnet_le);
 	VNET_LIST_UNLOCK();

==== //depot/projects/vimage/src/sys/sys/vimage.h#47 (text+ko) ====

@@ -383,6 +383,7 @@
 	LIST_HEAD(, vimage) vi_child_head;	/* direct offspring list */
 	struct	vimage *vi_parent;	/* ptr to parent vimage */
 	u_int	vi_id;			/* ID num */
+	u_int	vi_ucredrefc;		/* refc of ucreds pointing to us */
 
 	char	vi_name[MAXHOSTNAMELEN]; /* assigned by parent */
 

From owner-p4-projects@FreeBSD.ORG  Mon Oct 22 13:24:26 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4D11B16A41B; Mon, 22 Oct 2007 13:24:26 +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 DB3C716A421
	for ; Mon, 22 Oct 2007 13:24:25 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C8AA013C48E
	for ; Mon, 22 Oct 2007 13:24:25 +0000 (UTC)
	(envelope-from zec@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 l9MDOPXs011314
	for ; Mon, 22 Oct 2007 13:24:25 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9MDOPOj011311
	for perforce@freebsd.org; Mon, 22 Oct 2007 13:24:25 GMT
	(envelope-from zec@FreeBSD.org)
Date: Mon, 22 Oct 2007 13:24:25 GMT
Message-Id: <200710221324.l9MDOPOj011311@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 127922 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, 22 Oct 2007 13:24:26 -0000

http://perforce.freebsd.org/chv.cgi?CH=127922

Change 127922 by zec@zec_tpx32 on 2007/10/22 13:23:49

	Use TD_TO_VXXX and P_TO_VXXX macros where appropriate...

Affected files ...

.. //depot/projects/vimage/src/sys/kern/kern_exit.c#13 edit
.. //depot/projects/vimage/src/sys/kern/kern_fork.c#13 edit
.. //depot/projects/vimage/src/sys/netinet6/icmp6.c#18 edit

Differences ...

==== //depot/projects/vimage/src/sys/kern/kern_exit.c#13 (text+ko) ====

@@ -415,11 +415,8 @@
 	LIST_INSERT_HEAD(&zombproc, p, p_list);
 	LIST_REMOVE(p, p_hash);
 #if defined(VIMAGE) && defined(SCHED_4BSD)
-	if (p->p_ucred->cr_vimage->v_procg !=
-	    p->p_pptr->p_ucred->cr_vimage->v_procg) {
-		sched_load_reassign(p->p_ucred->cr_vimage->v_procg,
-		    p->p_pptr->p_ucred->cr_vimage->v_procg);
-	}
+	if (P_TO_VPROCG(p) != P_TO_VPROCG(p->p_pptr))
+		sched_load_reassign(P_TO_VPROCG(p), P_TO_VPROCG(p->p_pptr));
 #endif
 	sx_xunlock(&allproc_lock);
 
@@ -723,9 +720,7 @@
 		nfound++;
 		PROC_SLOCK(p);
 		if (p->p_state == PRS_ZOMBIE) {
-#ifdef VIMAGE
-			struct vimage *vp = p->p_ucred->cr_vimage;
-#endif
+			INIT_VPROCG(P_TO_VPROCG(p));
 			if (rusage) {
 				*rusage = p->p_ru;
 				calcru(p, &rusage->ru_utime, &rusage->ru_stime);
@@ -814,7 +809,7 @@
 			sx_xlock(&allproc_lock);
 			nprocs--;
 #ifdef VIMAGE
-			vp->v_procg->nprocs--;
+			vprocg->nprocs--;
 #endif
 			sx_xunlock(&allproc_lock);
 			return (0);

==== //depot/projects/vimage/src/sys/kern/kern_fork.c#13 (text+ko) ====

@@ -326,7 +326,7 @@
 	 */
 	nprocs++;
 #ifdef VIMAGE
-	p1->p_ucred->cr_vimage->v_procg->nprocs++;
+	P_TO_VPROCG(p1)->nprocs++;
 #endif
 
 	/*

==== //depot/projects/vimage/src/sys/netinet6/icmp6.c#18 (text+ko) ====

@@ -402,7 +402,7 @@
 {
 	INIT_VNET_INET6(curvnet);
 	/* XXX this bellow is WRONG - MARKO */
-	INIT_VPROCG(curthread->td_ucred->cr_vimage->v_procg);
+	INIT_VPROCG(TD_TO_VPROCG(curthread));
 	struct mbuf *m = *mp, *n;
 	struct ip6_hdr *ip6, *nip6;
 	struct icmp6_hdr *icmp6, *nicmp6;
@@ -1165,7 +1165,7 @@
 {
 	INIT_VNET_INET6(curvnet);
 	/* XXX this bellow is WRONG - MARKO */
-	INIT_VPROCG(curthread->td_ucred->cr_vimage->v_procg);
+	INIT_VPROCG(TD_TO_VPROCG(curthread));
 	struct icmp6_nodeinfo *ni6, *nni6;
 	struct mbuf *n = NULL;
 	u_int16_t qtype;

From owner-p4-projects@FreeBSD.ORG  Mon Oct 22 20:18:07 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 82F0816A41B; Mon, 22 Oct 2007 20:18: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 3C59016A469
	for ; Mon, 22 Oct 2007 20:18:07 +0000 (UTC)
	(envelope-from pawel.worach@gmail.com)
Received: from ug-out-1314.google.com (ug-out-1314.google.com [66.249.92.169])
	by mx1.freebsd.org (Postfix) with ESMTP id 4C34713C4A8
	for ; Mon, 22 Oct 2007 20:18:05 +0000 (UTC)
	(envelope-from pawel.worach@gmail.com)
Received: by ug-out-1314.google.com with SMTP id y2so19389uge
	for ; Mon, 22 Oct 2007 13:17:57 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:user-agent:mime-version:to:cc:subject:references:in-reply-to:content-type:content-transfer-encoding;
	bh=6ofNkIELSkffAIKZNAjYQKVK+M2oIz3ZxUtHCMZtVMk=;
	b=jmAFR7cDFQamB7jNmnU4TOl/QGLv3W2ariiw7MTCAxmZy+yN1s0BASqxuAyQ/9tT9Venpfkwt6BU/+PzqH+6talVwPNXjt5qagBxBPhYWGuSoOwB99lzTHffPaLVuNWbBGCMar0oHplVxQTKqM7gtBgM7kL6U4iRDKLLN1auvGc=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:user-agent:mime-version:to:cc:subject:references:in-reply-to:content-type:content-transfer-encoding;
	b=OxgLBoJBEaPPZlAN1T6b5C9bXdFbXIbr3SLeqBFkhSM0U3uG6ACm8YA5AUkTrJnF1xUmGd0D8ZHNOy3pivUpK+mGdKGX3g/2XBgxispvOoQZUQBVGVlRfdfd+dvCZ4+nQqi8NKz0v6f7M3/Cfrz/+7Bj4AVfF99xAdpjV8A4qYs=
Received: by 10.67.19.9 with SMTP id w9mr6648885ugi.1193082618890;
	Mon, 22 Oct 2007 12:50:18 -0700 (PDT)
Received: from ?9.69.137.21? ( [195.212.29.163])
	by mx.google.com with ESMTPS id e33sm113750ugd.2007.10.22.12.50.16
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Mon, 22 Oct 2007 12:50:16 -0700 (PDT)
Message-ID: <471CFEF1.3070508@gmail.com>
Date: Mon, 22 Oct 2007 21:50:09 +0200
From: Pawel Worach 
User-Agent: Thunderbird 2.0.0.7pre (X11/20071003)
MIME-Version: 1.0
To: Ana Kukec 
References: <200709031608.l83G8JNL093158@repoman.freebsd.org>
In-Reply-To: <200709031608.l83G8JNL093158@repoman.freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: Perforce Change Reviews 
Subject: Re: PERFORCE change 126004 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, 22 Oct 2007 20:18:08 -0000

Ana Kukec wrote:
> http://perforce.freebsd.org/chv.cgi?CH=126004
> 
> Change 126004 by anchie@anchie_malimis on 2007/09/03 16:07:56
> 
> 	Virtualization of netinet6 integer variables (#2).	
> 
> Differences ...
> 
> ==== //depot/projects/vimage/src/sys/netinet6/icmp6.c#14 (text+ko) ====
> 
> @@ -138,7 +142,9 @@
>  void
>  icmp6_init(void)
>  {
> -	icmp6errpps_count = 0;	
> +	INIT_VNET_INET6(curvnet);
> +	V_icmp6errpps_count = 0;
> +	V_icmp6errpps_count = 0;	
>  

Hi Ana,

One of those is probably redundant, cut-n-pasto ?

Regards
-- 
Pawel

From owner-p4-projects@FreeBSD.ORG  Mon Oct 22 20:50:38 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B9FB416A418; Mon, 22 Oct 2007 20:50: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 6661F16A41A
	for ; Mon, 22 Oct 2007 20:50:38 +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 4582E13C48A
	for ; Mon, 22 Oct 2007 20:50:38 +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 l9MKocjK005082
	for ; Mon, 22 Oct 2007 20:50:38 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9MKocrd005079
	for perforce@freebsd.org; Mon, 22 Oct 2007 20:50:38 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 22 Oct 2007 20:50:38 GMT
Message-Id: <200710222050.l9MKocrd005079@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 127936 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, 22 Oct 2007 20:50:39 -0000

http://perforce.freebsd.org/chv.cgi?CH=127936

Change 127936 by jb@jb_freebsd1 on 2007/10/22 20:49:45

	Add a BUG section to note mount/chroot that could make
	the pathname inaccurate.

Affected files ...

.. //depot/projects/dtrace/src/lib/libc/sys/kldstat.2#5 edit
.. //depot/projects/dtrace6/src/lib/libc/sys/kldstat.2#3 edit

Differences ...

==== //depot/projects/dtrace/src/lib/libc/sys/kldstat.2#5 (text+ko) ====

@@ -128,3 +128,7 @@
 .Nm kld
 interface first appeared in
 .Fx 3.0 .
+.Sh BUGS
+The pathname many not be accurate if the file system mounts have
+changed since the module was loaded, or if this function is called
+within a chrooted environment.

==== //depot/projects/dtrace6/src/lib/libc/sys/kldstat.2#3 (text+ko) ====

@@ -128,3 +128,7 @@
 .Nm kld
 interface first appeared in
 .Fx 3.0 .
+.Sh BUGS
+The pathname many not be accurate if the file system mounts have
+changed since the module was loaded, or if this function is called
+within a chrooted environment.

From owner-p4-projects@FreeBSD.ORG  Tue Oct 23 00:15:22 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D582316A418; Tue, 23 Oct 2007 00:15: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 DE39E16A41A
	for ; Tue, 23 Oct 2007 00:15:20 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BCE2A13C4A5
	for ; Tue, 23 Oct 2007 00:15:20 +0000 (UTC)
	(envelope-from zec@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 l9N0FKEY020590
	for ; Tue, 23 Oct 2007 00:15:20 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9N0FKJd020587
	for perforce@freebsd.org; Tue, 23 Oct 2007 00:15:20 GMT
	(envelope-from zec@FreeBSD.org)
Date: Tue, 23 Oct 2007 00:15:20 GMT
Message-Id: <200710230015.l9N0FKJd020587@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 127941 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, 23 Oct 2007 00:15:22 -0000

http://perforce.freebsd.org/chv.cgi?CH=127941

Change 127941 by zec@zec_tpx32 on 2007/10/23 00:14:43

	Replace a flat vimage naming scheme with a hierarchical one.
	
	"default" as a vimage name is deprecated.  "." always
	corresponds to the current vimage.  Naming of direct child
	vimages hasn't changed, however each level in vimage
	hierarchy now has an independent naming scope.  For example,
	a vimage named "x" can have a child named "x", which was
	impossible with the old flat naming model.  Direct addressing
	of vimages deeper in the hierarchy is possible using "." as
	a delimeter, for example "x.x" corresponds to child "x" of
	vimage "x".  It is also possible to instantiate new vimages
	at arbitrary levels bellow current position in the hierarchy,
	for example "vimage -c x.y" would create a vimage "y" as a
	child of "x".  Command "vimage x vimage -c y" would have the
	same effect.

Affected files ...

.. //depot/projects/vimage/src/sys/kern/kern_vimage.c#50 edit

Differences ...

==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#50 (text+ko) ====

@@ -64,7 +64,7 @@
 MALLOC_DEFINE(M_VPROCG, "vprocg", "process group control block");
 MALLOC_DEFINE(M_VCPU, "vcpu", "cpu resource control block");
 
-static struct vimage *vi_alloc(char *, int);
+static struct vimage *vi_alloc(struct vimage *, char *);
 static int vi_destroy(struct vimage *);
 static void vnet_mod_complete_registration(struct vnet_modlink *);
 static int vnet_mod_constructor(struct vnet_modlink *);
@@ -444,6 +444,76 @@
 }
 
 
+static struct vimage *
+vimage_by_name(struct vimage *top, char *name)
+{
+	struct vimage *vip;
+	char *next_name;
+	int namelen;
+
+	next_name = strchr(name, '.');
+	if (next_name != NULL) {
+		namelen = next_name - name;
+		next_name++;
+		if (namelen == 0) {
+			if (strlen(next_name) == 0)
+				return(top);	/* '.' == this vimage */
+			else
+				return(NULL);
+		}
+	} else
+		namelen = strlen(name);
+	if (namelen == 0)
+		return(NULL);
+	LIST_FOREACH(vip, &top->vi_child_head, vi_sibilings)
+		if (strncmp(name, vip->vi_name, namelen) == 0) {
+			if (next_name != NULL)
+				return(vimage_by_name(vip, next_name));
+			else
+				return(vip);
+		}
+	return(NULL);
+}
+
+
+static int
+vimage_relative_name(struct vimage *top, struct vimage *where,
+    char *buffer, int bufflen)
+{
+	if (where == top) {
+		sprintf(buffer, ".");
+		return(1);
+	}
+
+	if (where->vi_parent != top) {
+		int len;
+
+		len  = vimage_relative_name(top, where->vi_parent,
+		    buffer, bufflen);
+		bufflen -= (len + 1);
+		buffer += len;
+		sprintf(buffer++, ".");
+	}
+
+	sprintf(buffer, "%s", where->vi_name);
+	return(strlen(where->vi_name));
+}
+
+
+static struct vimage *
+vimage_get_next(struct vimage *top, struct vimage *where)
+{
+	do {
+		where = LIST_NEXT(where, vi_le);
+		if (where == NULL)
+			where = LIST_FIRST(&vimage_head);
+		if (vi_child_of(top, where))
+			return(where);
+	} while (where != top);
+	return(NULL);
+}
+
+
 int
 vi_td_ioctl(cmd, vi_req, td)
 	u_long cmd;
@@ -453,44 +523,23 @@
 	int error;
 	struct vimage *vip = TD_TO_VIMAGE(td);
 	struct vimage *vip_r = NULL;
-	struct vimage *tvip;
 
 	error = suser(td); /* XXX replace with priv(9) */
 	if (error)
 		return (error);
 
-	VNET_LIST_LOCK(); /* XXX should lock vimage list... */
-	if (strlen(vi_req->vi_name)) {
-		LIST_FOREACH(tvip, &vimage_head, vi_le)
-			if (strcmp(vi_req->vi_name, tvip->vi_name)==0) {
-				vip_r = tvip;
-				break;
-			}
-		if (vip_r == NULL && !(vi_req->req_action & VI_CREATE)) {
-			VNET_LIST_UNLOCK(); /* XXX */
+	vip_r = vimage_by_name(vip, vi_req->vi_name);
+	if (vip_r == NULL && !(vi_req->req_action & VI_CREATE))
+		return (ESRCH);
+	if (vip_r != NULL && vi_req->req_action & VI_CREATE)
+		return (EADDRINUSE);
+	if (vi_req->req_action == VI_GETNEXT) {
+		vip_r = vimage_get_next(vip, vip_r);
+		if (vip_r == NULL)
 			return (ESRCH);
-		}
-		if (vip_r != NULL && vi_req->req_action & VI_CREATE) {
-			VNET_LIST_UNLOCK(); /* XXX */
-			return (EADDRINUSE);
-		}
-		if (vi_req->req_action == VI_GETNEXT) {
-vi_getnext_loop:
-			if ((vip_r = LIST_NEXT(vip_r, vi_le)) == 0)
-				vip_r = LIST_FIRST(&vimage_head);
-			if (vip_r == vip) {
-				VNET_LIST_UNLOCK(); /* XXX */
-				return (ESRCH);
-			}
-			if (!vi_child_of(vip, vip_r))
-				goto vi_getnext_loop;
-		}
+	}
 
-	} else
-		vip_r = vip;
-	VNET_LIST_UNLOCK(); /* XXX */
-
-	if (vip_r && !vi_child_of(vip, vip_r) &&
+	if (vip_r && !vi_child_of(vip, vip_r) && /* XXX delete the rest! */
 	    vi_req->req_action != VI_GET && vi_req->req_action != VI_GETNEXT)
 		return (EPERM);
 
@@ -498,7 +547,7 @@
 
 	case SIOCGPVIMAGE:
 		vi_req->vi_id = vip_r->vi_id;
-		bcopy(&vip_r->vi_name, &vi_req->vi_name,
+		vimage_relative_name(vip, vip_r, vi_req->vi_name,
 		    sizeof (vi_req->vi_name));
 		bcopy(&vip_r->v_procg->_averunnable, &vi_req->averunnable,
 		    sizeof (vi_req->averunnable));
@@ -520,7 +569,6 @@
 
 			/*
 			 * XXX priv_check()?
-			 * XXX refcounting ucred -> vimage ?
 			 * XXX allow only a single td per proc here?
 			 */
 			newcred = crget();
@@ -545,14 +593,23 @@
 		}
 
 		if (vi_req->req_action & VI_CREATE) {
-			vip_r = vi_alloc(vi_req->vi_name,
-			    vi_req->vi_maxsockets);
+			char *dotpos;
+
+			dotpos = strrchr(vi_req->vi_name, '.');
+			if (dotpos != NULL) {
+				*dotpos = 0;
+				vip = vimage_by_name(vip, vi_req->vi_name);
+				if (vip == NULL)
+					return (ESRCH);
+				dotpos++;
+				vip_r = vi_alloc(vip, dotpos);
+			} else
+				vip_r = vi_alloc(vip, vi_req->vi_name);
 			if (vip_r == NULL)
 				return (ENOMEM);
-
-			vip_r->vi_parent = vip;
 		}
 
+		/* XXX What the hell is this doing here? */
 		if (vip == vip_r && !IS_DEFAULT_VIMAGE(vip))
 			return (EPERM);
 	}
@@ -591,7 +648,7 @@
 
 
 struct vimage *
-vi_alloc(char *name, int maxsock)
+vi_alloc(struct vimage *parent, char *name)
 {
 	struct vimage *vip;
 	struct vnet *vnet;
@@ -613,6 +670,15 @@
 	if (vip == NULL)
 		panic("vi_alloc: malloc failed for vimage \"%s\"\n", name);
 	vip->vi_id = last_vi_id++;
+	LIST_INIT(&vip->vi_child_head);
+	sprintf(vip->vi_name, "%s", name);
+	vip->vi_parent = parent;
+	/* XXX locking */
+	if (parent != NULL)
+		LIST_INSERT_HEAD(&parent->vi_child_head, vip, vi_sibilings);
+	else if (!LIST_EMPTY(&vimage_head))
+		panic("there can be only one default vimage!");
+	LIST_INSERT_HEAD(&vimage_head, vip, vi_le);
 
 	vnet = vi_malloc(sizeof(struct vnet), M_VNET, M_NOWAIT | M_ZERO);
 	if (vnet == NULL)
@@ -633,9 +699,6 @@
 	vip->v_cpu = vcpu;
 	vcpu->vcpu_id = last_vcpu_id++;
 
-	/* Struct vimage initialization */
-	sprintf(vip->vi_name, "%s", name);
-
 	/* Struct vprocg initialization - perhaps move to anther place? */
 	V_averunnable.fscale = FSCALE;
 
@@ -656,9 +719,6 @@
 	LIST_INSERT_HEAD(&vcpu_head, vcpu, vcpu_le);
 	mtx_unlock_spin(&vcpu_list_mtx);
 
-	/* XXX locking */
-	LIST_INSERT_HEAD(&vimage_head, vip, vi_le);
-
 vi_alloc_done:
 	return (vip);
 }
@@ -679,6 +739,9 @@
 	struct vnet_modlink *vml;
 
 	/* XXX Beware of races -> more locking to be done... */
+	if (!LIST_EMPTY(&vip->vi_child_head))
+		return (EBUSY);
+
 	if (vprocg->nprocs != 0)
 		return (EBUSY);
 
@@ -689,6 +752,18 @@
 		printf("vi_destroy: %s ucredrefc %d\n",
 		    vip->vi_name, vip->vi_ucredrefc);
 
+	/* Point with no return - cleanup MUST succeed! */
+	/* XXX locking */
+	LIST_REMOVE(vip, vi_le);
+	LIST_REMOVE(vip, vi_sibilings);
+
+	/* XXX locking */
+	LIST_REMOVE(vprocg, vprocg_le);
+
+	mtx_lock_spin(&vcpu_list_mtx);
+	LIST_REMOVE(vcpu, vcpu_le);
+	mtx_unlock_spin(&vcpu_list_mtx);
+
 	VNET_LIST_LOCK();
 	LIST_REMOVE(vnet, vnet_le);
 	VNET_LIST_UNLOCK();
@@ -720,19 +795,10 @@
 	CURVNET_RESTORE();
 
 	/* hopefully, we are finally OK to free the vnet container itself! */
-	vnet->vnet_magic_n = -1;
+	vnet->vnet_magic_n = 0xdeadbeef;
 	vi_free(vnet, M_VNET);
-
-	/* XXX lock those bellow... */
-	LIST_REMOVE(vprocg, vprocg_le);
 	vi_free(vprocg, M_VPROCG);
-
-	mtx_lock_spin(&vcpu_list_mtx);
-	LIST_REMOVE(vcpu, vcpu_le);
-	mtx_unlock_spin(&vcpu_list_mtx);
 	vi_free(vcpu, M_VCPU);
-
-	LIST_REMOVE(vip, vi_le);
 	vi_free(vip, M_VIMAGE);
 
 	return (0);
@@ -830,7 +896,7 @@
 
 	mtx_init(&vcpu_list_mtx, "vcpu_list_mtx", NULL, MTX_SPIN);
 
-	vi_alloc("default", 0);
+	vi_alloc(NULL, "");	/* Default vimage has no name */
 
 	/* We MUST clear curvnet in vi_init_done before going SMP. */
 	curvnet = LIST_FIRST(&vnet_head);

From owner-p4-projects@FreeBSD.ORG  Tue Oct 23 00:18:25 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 47B1816A468; Tue, 23 Oct 2007 00:18:25 +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 CD55A16A41A
	for ; Tue, 23 Oct 2007 00:18:24 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id AC76F13C481
	for ; Tue, 23 Oct 2007 00:18:24 +0000 (UTC)
	(envelope-from zec@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 l9N0IOED020655
	for ; Tue, 23 Oct 2007 00:18:24 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9N0IO8l020652
	for perforce@freebsd.org; Tue, 23 Oct 2007 00:18:24 GMT
	(envelope-from zec@FreeBSD.org)
Date: Tue, 23 Oct 2007 00:18:24 GMT
Message-Id: <200710230018.l9N0IO8l020652@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 127942 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, 23 Oct 2007 00:18:25 -0000

http://perforce.freebsd.org/chv.cgi?CH=127942

Change 127942 by zec@zec_tpx32 on 2007/10/23 00:17:35

	Update the vimage utility to support the new naming scheme.
	
	While here, do a few stilistic / cosmetic cleanups.

Affected files ...

.. //depot/projects/vimage/src/usr.sbin/vimage/vimage.c#7 edit

Differences ...

==== //depot/projects/vimage/src/usr.sbin/vimage/vimage.c#7 (text+ko) ====

@@ -122,12 +122,12 @@
 
 	bzero(&vi_req, sizeof(vi_req));
 	if (argc == 1) {
-		vi_req.vi_name[0] = 0;
+		strcpy(vi_req.vi_name, ".");
 		cmd = VI_GET;
 	}
 
 	if (argc == 2 && strcmp(argv[1], "-l") == 0) {
-		vi_req.vi_name[0] = 0;
+		strcpy(vi_req.vi_name, ".");
 		cmd = VI_GETNEXT; /* here this means walk! */
 	}
 
@@ -141,7 +141,7 @@
 			cmd = VI_DESTROY;
 	}
 
-	if (argc>=3) {
+	if (argc >= 3) {
 		strcpy(vi_req.vi_name, argv[2]);
 		if (strcmp(argv[1], "-c") == 0)
 			cmd = VI_CREATE;
@@ -157,13 +157,18 @@
 	case VI_GET:
         	if (ioctl(s, SIOCGPVIMAGE, (caddr_t)&vi_req) < 0)
 			goto abort;
-		if (argc==1)
+		if (argc == 1)
 			printf("%s\n", vi_req.vi_name);
 		else
 			vi_print(&vi_req);
 		exit(0);
 
 	case VI_GETNEXT:
+		vi_req.req_action = VI_GET;
+        	if (ioctl(s, SIOCGPVIMAGE, (caddr_t)&vi_req) < 0)
+			goto abort;
+		vi_print(&vi_req);
+		vi_req.req_action = VI_GETNEXT;
         	while (ioctl(s, SIOCGPVIMAGE, (caddr_t)&vi_req) == 0)
 			vi_print(&vi_req);
 		exit(0);
@@ -190,51 +195,51 @@
 			}
 			if (strcmp(argv[i], "cpumin") == 0) {
 				vi_req.req_action |= VI_SET_CPU_MIN;
-				vi_req.vi_cpu_min = strtod(argv[i+1], NULL)
-							* 10000;
+				vi_req.vi_cpu_min =
+				    strtod(argv[i+1], NULL) * 10000;
 				if (vi_req.vi_cpu_min > 900000) {
 					fprintf(stderr, "error: cpumin must be between 0 and 90\n");
 					exit(1);
 				}
 			}
-			if (strcmp(argv[i], "cpumax")==0) {
+			if (strcmp(argv[i], "cpumax") == 0) {
 				vi_req.req_action |= VI_SET_CPU_MAX;
-				vi_req.vi_cpu_max = strtod(argv[i+1], NULL)
-							* 10000;
-				if (vi_req.vi_cpu_max<10000 ||
-				    vi_req.vi_cpu_max>1000000) {
+				vi_req.vi_cpu_max =
+				    strtod(argv[i+1], NULL) * 10000;
+				if (vi_req.vi_cpu_max < 10000 ||
+				    vi_req.vi_cpu_max > 1000000) {
 					fprintf(stderr, "error: cpumax must be between 1 and 100\n");
 					exit(1);
 				}
 			}
-			if (strcmp(argv[i], "cpuweight")==0) {
+			if (strcmp(argv[i], "cpuweight") == 0) {
 				vi_req.req_action |= VI_SET_CPU_WEIGHT;
 				vi_req.vi_cpu_weight = strtod(argv[i+1], NULL);
-				if (vi_req.vi_cpu_weight<1 ||
-				    vi_req.vi_cpu_weight>10) {
+				if (vi_req.vi_cpu_weight < 1 ||
+				    vi_req.vi_cpu_weight > 10) {
 					fprintf(stderr, "error: cpuweight must be between 1 and 10\n");
 					exit(1);
 				}
 			}
-			if (strcmp(argv[i], "intr")==0) {
+			if (strcmp(argv[i], "intr") == 0) {
 				vi_req.req_action |= VI_SET_INTR_LIMIT;
-				vi_req.vi_intr_limit = strtod(argv[i+1], NULL)
-							* 10000;
-				if (vi_req.vi_intr_limit<10000 ||
-				    vi_req.vi_intr_limit>1000000) {
+				vi_req.vi_intr_limit =
+				    strtod(argv[i+1], NULL) * 10000;
+				if (vi_req.vi_intr_limit < 10000 ||
+				    vi_req.vi_intr_limit > 1000000) {
 					fprintf(stderr, "error: intr limit must be between 1 and 100\n");
 					exit(1);
 				}
 			}
-			if (strcmp(argv[i], "child")==0) {
+			if (strcmp(argv[i], "child") == 0) {
 				vi_req.req_action |= VI_SET_CHILD_LIMIT;
 				vi_req.vi_child_limit = atoi(argv[i+1]);
 			}
-			if (strcmp(argv[i], "proc")==0) {
+			if (strcmp(argv[i], "proc") == 0) {
 				vi_req.req_action |= VI_SET_PROC_LIMIT;
 				vi_req.vi_proc_limit = atoi(argv[i+1]);
 			}
-			if (strcmp(argv[i], "chroot")==0) {
+			if (strcmp(argv[i], "chroot") == 0) {
 				vi_req.req_action |= VI_SET_CHROOT;
 				strncpy(vi_req.vi_chroot, argv[i+1],
 					 sizeof(vi_req.vi_chroot));
@@ -248,21 +253,27 @@
 		strcpy(vi_req.vi_name, argv[1]);
 		if (ioctl(s, SIOCSPVIMAGE, (caddr_t)&vi_req) < 0)
 			goto abort;
+
 		vi_req.req_action = VI_GET;
-		if (ioctl(s, SIOCGPVIMAGE, (caddr_t)&vi_req) < 0)
+		strcpy(vi_req.vi_name, ".");
+		if (ioctl(s, SIOCGPVIMAGE, (caddr_t)&vi_req) < 0) {
+			printf("XXX this should have not happened!\n");
 			goto abort;
+		}
+
 		if (strlen(vi_req.vi_chroot) && (chdir(vi_req.vi_chroot) ||
 		    chroot(vi_req.vi_chroot)))
 			goto abort;
 		close(s);
-		if (argc==2) {
+
+		if (argc == 2) {
 		printf("Switched to vimage %s\n", argv[1]);
-			if ((shell=getenv("SHELL"))==NULL)
-				execlp("/bin/sh",argv[0],NULL);
+			if ((shell=getenv("SHELL")) == NULL)
+				execlp("/bin/sh", argv[0], NULL);
 			else
-				execlp(shell,argv[0],NULL);
+				execlp(shell, argv[0], NULL);
 		} else 
-			execvp(argv[2],&argv[2]);
+			execvp(argv[2], &argv[2]);
 		break;
 
 	case VI_DESTROY:

From owner-p4-projects@FreeBSD.ORG  Tue Oct 23 00:49:11 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F25EE16A474; Tue, 23 Oct 2007 00:49:10 +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 9C23516A41B
	for ; Tue, 23 Oct 2007 00:49:10 +0000 (UTC)
	(envelope-from julian@elischer.org)
Received: from outU.internet-mail-service.net (outU.internet-mail-service.net
	[216.240.47.244])
	by mx1.freebsd.org (Postfix) with ESMTP id 54A6913C4A6
	for ; Tue, 23 Oct 2007 00:49:09 +0000 (UTC)
	(envelope-from julian@elischer.org)
Received: from mx0.idiom.com (HELO idiom.com) (216.240.32.160)
	by out.internet-mail-service.net (qpsmtpd/0.40) with ESMTP;
	Mon, 22 Oct 2007 17:49:00 -0700
X-Client-Authorized: MaGic Cook1e
X-Client-Authorized: MaGic Cook1e
Received: from julian-mac.elischer.org (nat.ironport.com [63.251.108.100])
	by idiom.com (Postfix) with ESMTP id 7D8C512677D;
	Mon, 22 Oct 2007 17:49:00 -0700 (PDT)
Message-ID: <471D4514.5050109@elischer.org>
Date: Mon, 22 Oct 2007 17:49:24 -0700
From: Julian Elischer 
User-Agent: Thunderbird 2.0.0.6 (Macintosh/20070728)
MIME-Version: 1.0
To: Marko Zec 
References: <200710230018.l9N0IO8l020652@repoman.freebsd.org>
In-Reply-To: <200710230018.l9N0IO8l020652@repoman.freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: Perforce Change Reviews 
Subject: Re: PERFORCE change 127942 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, 23 Oct 2007 00:49:11 -0000

question:

can processes in two vimages communicate if they both have access 
to the same named pipe/fifo in the filesystem?


From owner-p4-projects@FreeBSD.ORG  Tue Oct 23 10:55:46 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E4C1A16A46B; Tue, 23 Oct 2007 10:55: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 5A77C16A468;
	Tue, 23 Oct 2007 10:55:43 +0000 (UTC) (envelope-from olli@fromme.com)
Received: from haluter.fromme.com (haluter.fromme.com [83.120.8.11])
	by mx1.freebsd.org (Postfix) with ESMTP id CB17C13C4A8;
	Tue, 23 Oct 2007 10:55:42 +0000 (UTC) (envelope-from olli@fromme.com)
Received: from haluter.fromme.com (irc_sucks@localhost [127.0.0.1])
	by haluter.fromme.com (8.13.4/8.13.4) with ESMTP id l9N9kl6M093369;
	Tue, 23 Oct 2007 11:46:48 +0200 (CEST)
	(envelope-from olli@fromme.com)
Received: (from olli@localhost)
	by haluter.fromme.com (8.13.4/8.12.9/Submit) id l9N9kjBS093363;
	Tue, 23 Oct 2007 11:46:45 +0200 (CEST)
From: Oliver Fromme 
Message-Id: <200710230946.l9N9kjBS093363@haluter.fromme.com>
To: jb@freebsd.org (John Birrell)
Date: Tue, 23 Oct 2007 11:46:45 +0200 (CEST)
In-Reply-To: <200710222050.l9MKocrd005079@repoman.freebsd.org> from "John
	Birrell" at Oct 22, 2007 08:50:38 PM
X-Mailer: ELM [version 2.5 PL6]
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.1.2
	(haluter.fromme.com [127.0.0.1]);
	Tue, 23 Oct 2007 11:46:48 +0200 (CEST)
Cc: Perforce Change Reviews 
Subject: Re: PERFORCE change 127936 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, 23 Oct 2007 10:55:46 -0000


John Birrell wrote:
 > http://perforce.freebsd.org/chv.cgi?CH=127936
 > [...]
 > ==== //depot/projects/dtrace/src/lib/libc/sys/kldstat.2#5 (text+ko) ====
 > +The pathname many not be accurate if the file system mounts have
 > [...]
 > ==== //depot/projects/dtrace6/src/lib/libc/sys/kldstat.2#3 (text+ko) ====
 > +The pathname many not be accurate if the file system mounts have

s/many/may/, I think.

Best regards
   Oliver

PS:  John, many thanks for working on the dtrace stuff.
It is an extremely useful facility.

-- 
Oliver Fromme, Bunsenstr. 13, 81735 Muenchen, Germany

``We are all but compressed light'' (Albert Einstein)

From owner-p4-projects@FreeBSD.ORG  Tue Oct 23 19:07:30 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2294116A46B; Tue, 23 Oct 2007 19:07: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 C8E3316A41A
	for ; Tue, 23 Oct 2007 19:07:29 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CAF6113C4E1
	for ; Tue, 23 Oct 2007 19:07:29 +0000 (UTC)
	(envelope-from peter@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 l9NJ7SZT096943
	for ; Tue, 23 Oct 2007 19:07:28 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9NJ7H0e096940
	for perforce@freebsd.org; Tue, 23 Oct 2007 19:07:17 GMT
	(envelope-from peter@freebsd.org)
Date: Tue, 23 Oct 2007 19:07:17 GMT
Message-Id: <200710231907.l9NJ7H0e096940@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 127966 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, 23 Oct 2007 19:07:30 -0000

http://perforce.freebsd.org/chv.cgi?CH=127966

Change 127966 by peter@peter_daintree on 2007/10/23 19:06:32

	IFC @@127960

Affected files ...

.. //depot/projects/hammer/ObsoleteFiles.inc#36 integrate
.. //depot/projects/hammer/UPDATING#108 integrate
.. //depot/projects/hammer/contrib/libpcap/pcap.h#8 integrate
.. //depot/projects/hammer/etc/rc.d/amd#13 integrate
.. //depot/projects/hammer/etc/rc.d/kerberos#6 integrate
.. //depot/projects/hammer/etc/rc.d/named#17 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes#69 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes-o.real#7 integrate
.. //depot/projects/hammer/games/fortune/datfiles/limerick#8 integrate
.. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#28 integrate
.. //depot/projects/hammer/lib/libbsm/Makefile#6 integrate
.. //depot/projects/hammer/lib/libc/locale/iswctype.c#5 integrate
.. //depot/projects/hammer/lib/libc/stdlib/atoi.3#4 integrate
.. //depot/projects/hammer/lib/libc/sys/kldstat.2#4 integrate
.. //depot/projects/hammer/lib/libelf/elf.3#2 integrate
.. //depot/projects/hammer/lib/libelf/elf_flagdata.3#2 integrate
.. //depot/projects/hammer/lib/libelf/elf_getscn.3#2 integrate
.. //depot/projects/hammer/lib/libelf/elf_update.3#3 integrate
.. //depot/projects/hammer/lib/libelf/gelf_getphdr.3#2 integrate
.. //depot/projects/hammer/lib/libelf/gelf_newehdr.3#2 integrate
.. //depot/projects/hammer/lib/libelf/gelf_newphdr.3#2 integrate
.. //depot/projects/hammer/lib/libpam/modules/pam_unix/Makefile#5 integrate
.. //depot/projects/hammer/lib/libstand/tftp.c#4 integrate
.. //depot/projects/hammer/lib/libthr/libthr.3#3 integrate
.. //depot/projects/hammer/lib/ncurses/ncurses/Makefile#7 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#22 integrate
.. //depot/projects/hammer/sbin/geom/class/part/geom_part.c#2 integrate
.. //depot/projects/hammer/sbin/geom/class/part/gpart.8#2 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw.8#61 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw2.c#59 integrate
.. //depot/projects/hammer/sbin/kldstat/kldstat.c#9 integrate
.. //depot/projects/hammer/sbin/mount/mount.8#23 integrate
.. //depot/projects/hammer/share/man/man3/pthread.3#10 integrate
.. //depot/projects/hammer/share/man/man3/pthread_attr.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_attr_get_np.3#4 integrate
.. //depot/projects/hammer/share/man/man3/pthread_attr_setcreatesuspend_np.3#4 integrate
.. //depot/projects/hammer/share/man/man3/pthread_barrier_destroy.3#6 integrate
.. //depot/projects/hammer/share/man/man3/pthread_barrierattr.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_cancel.3#5 integrate
.. //depot/projects/hammer/share/man/man3/pthread_cleanup_pop.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_cleanup_push.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_cond_broadcast.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_cond_destroy.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_cond_init.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_cond_signal.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_cond_timedwait.3#4 integrate
.. //depot/projects/hammer/share/man/man3/pthread_cond_wait.3#5 integrate
.. //depot/projects/hammer/share/man/man3/pthread_condattr.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_create.3#4 integrate
.. //depot/projects/hammer/share/man/man3/pthread_detach.3#4 integrate
.. //depot/projects/hammer/share/man/man3/pthread_equal.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_exit.3#4 integrate
.. //depot/projects/hammer/share/man/man3/pthread_getconcurrency.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_getspecific.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_join.3#4 integrate
.. //depot/projects/hammer/share/man/man3/pthread_key_create.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_key_delete.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_kill.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_main_np.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_multi_np.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_mutex_destroy.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_mutex_init.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_mutex_lock.3#5 integrate
.. //depot/projects/hammer/share/man/man3/pthread_mutex_timedlock.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_mutex_trylock.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_mutex_unlock.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_mutexattr.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_mutexattr_getkind_np.3#4 integrate
.. //depot/projects/hammer/share/man/man3/pthread_once.3#5 integrate
.. //depot/projects/hammer/share/man/man3/pthread_resume_all_np.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_resume_np.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_rwlock_destroy.3#5 integrate
.. //depot/projects/hammer/share/man/man3/pthread_rwlock_init.3#5 integrate
.. //depot/projects/hammer/share/man/man3/pthread_rwlock_rdlock.3#5 integrate
.. //depot/projects/hammer/share/man/man3/pthread_rwlock_timedrdlock.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_rwlock_timedwrlock.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_rwlock_unlock.3#5 integrate
.. //depot/projects/hammer/share/man/man3/pthread_rwlock_wrlock.3#5 integrate
.. //depot/projects/hammer/share/man/man3/pthread_rwlockattr_destroy.3#5 integrate
.. //depot/projects/hammer/share/man/man3/pthread_rwlockattr_getpshared.3#5 integrate
.. //depot/projects/hammer/share/man/man3/pthread_rwlockattr_init.3#5 integrate
.. //depot/projects/hammer/share/man/man3/pthread_rwlockattr_setpshared.3#5 integrate
.. //depot/projects/hammer/share/man/man3/pthread_schedparam.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_self.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_set_name_np.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_setspecific.3#4 integrate
.. //depot/projects/hammer/share/man/man3/pthread_sigmask.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_spin_init.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_spin_lock.3#4 integrate
.. //depot/projects/hammer/share/man/man3/pthread_switch_add_np.3#4 integrate
.. //depot/projects/hammer/share/man/man3/pthread_testcancel.3#5 integrate
.. //depot/projects/hammer/share/man/man3/pthread_yield.3#2 integrate
.. //depot/projects/hammer/share/man/man5/nsswitch.conf.5#10 integrate
.. //depot/projects/hammer/share/man/man5/src.conf.5#13 integrate
.. //depot/projects/hammer/share/man/man9/kproc.9#1 branch
.. //depot/projects/hammer/share/man/man9/kthread.9#6 integrate
.. //depot/projects/hammer/share/mk/bsd.compat.mk#6 integrate
.. //depot/projects/hammer/share/mk/bsd.lib.mk#32 integrate
.. //depot/projects/hammer/share/mk/bsd.own.mk#20 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#98 integrate
.. //depot/projects/hammer/sys/cam/cam_xpt.c#34 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#45 integrate
.. //depot/projects/hammer/sys/compat/opensolaris/sys/proc.h#3 integrate
.. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 integrate
.. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf.c#32 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf_ioctl.c#25 integrate
.. //depot/projects/hammer/sys/dev/aac/aac.c#40 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_thermal.c#30 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aic_osm_lib.c#6 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aic_osm_lib.h#7 integrate
.. //depot/projects/hammer/sys/dev/ath/if_ath_pci.c#18 integrate
.. //depot/projects/hammer/sys/dev/bktr/msp34xx.c#6 integrate
.. //depot/projects/hammer/sys/dev/ciss/ciss.c#46 integrate
.. //depot/projects/hammer/sys/dev/fdc/fdc.c#32 integrate
.. //depot/projects/hammer/sys/dev/firewire/firewire.c#40 integrate
.. //depot/projects/hammer/sys/dev/flash/at45d.c#2 integrate
.. //depot/projects/hammer/sys/dev/hptmv/entry.c#15 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_logging.c#8 integrate
.. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#54 integrate
.. //depot/projects/hammer/sys/dev/ipmi/ipmi_kcs.c#2 integrate
.. //depot/projects/hammer/sys/dev/ipmi/ipmi_smic.c#2 integrate
.. //depot/projects/hammer/sys/dev/ipmi/ipmi_ssif.c#3 integrate
.. //depot/projects/hammer/sys/dev/iscsi/initiator/isc_sm.c#2 integrate
.. //depot/projects/hammer/sys/dev/iscsi/initiator/isc_soc.c#2 integrate
.. //depot/projects/hammer/sys/dev/isp/isp_freebsd.c#32 integrate
.. //depot/projects/hammer/sys/dev/iwi/if_iwi.c#26 integrate
.. //depot/projects/hammer/sys/dev/md/md.c#61 integrate
.. //depot/projects/hammer/sys/dev/mmc/mmcsd.c#3 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt.h#18 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt_cam.c#19 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt_raid.c#10 integrate
.. //depot/projects/hammer/sys/dev/ofw/ofw_disk.c#14 integrate
.. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#49 integrate
.. //depot/projects/hammer/sys/dev/pccbb/pccbb_pci.c#18 integrate
.. //depot/projects/hammer/sys/dev/random/harvest.c#9 integrate
.. //depot/projects/hammer/sys/dev/random/randomdev_soft.c#16 integrate
.. //depot/projects/hammer/sys/dev/sound/midi/sequencer.c#9 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac.c#10 integrate
.. //depot/projects/hammer/sys/dev/usb/if_zyd.c#3 integrate
.. //depot/projects/hammer/sys/dev/usb/uipaq.c#3 integrate
.. //depot/projects/hammer/sys/dev/usb/usb.c#21 integrate
.. //depot/projects/hammer/sys/dev/usb/usb_port.h#22 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs#88 integrate
.. //depot/projects/hammer/sys/dev/utopia/utopia.c#11 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_denode.c#28 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_lookup.c#13 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#47 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#33 integrate
.. //depot/projects/hammer/sys/geom/bde/g_bde.c#13 integrate
.. //depot/projects/hammer/sys/geom/bde/g_bde_work.c#15 integrate
.. //depot/projects/hammer/sys/geom/eli/g_eli.c#17 integrate
.. //depot/projects/hammer/sys/geom/journal/g_journal.c#5 integrate
.. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#36 integrate
.. //depot/projects/hammer/sys/geom/multipath/g_multipath.c#2 integrate
.. //depot/projects/hammer/sys/geom/part/g_part.c#6 integrate
.. //depot/projects/hammer/sys/geom/part/g_part.h#4 integrate
.. //depot/projects/hammer/sys/geom/part/g_part_apm.c#4 integrate
.. //depot/projects/hammer/sys/geom/part/g_part_gpt.c#4 integrate
.. //depot/projects/hammer/sys/geom/raid3/g_raid3.c#29 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_drive.c#18 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_init.c#11 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_plex.c#15 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_volume.c#12 integrate
.. //depot/projects/hammer/sys/i386/bios/apm.c#14 integrate
.. //depot/projects/hammer/sys/i386/conf/GENERIC#56 integrate
.. //depot/projects/hammer/sys/i386/i386/in_cksum.c#6 integrate
.. //depot/projects/hammer/sys/i386/include/in_cksum.h#6 integrate
.. //depot/projects/hammer/sys/kern/init_main.c#46 integrate
.. //depot/projects/hammer/sys/kern/kern_acct.c#30 integrate
.. //depot/projects/hammer/sys/kern/kern_fork.c#64 integrate
.. //depot/projects/hammer/sys/kern/kern_idle.c#20 integrate
.. //depot/projects/hammer/sys/kern/kern_intr.c#46 integrate
.. //depot/projects/hammer/sys/kern/kern_jail.c#24 integrate
.. //depot/projects/hammer/sys/kern/kern_kthread.c#13 integrate
.. //depot/projects/hammer/sys/kern/kern_linker.c#29 integrate
.. //depot/projects/hammer/sys/kern/kern_shutdown.c#45 integrate
.. //depot/projects/hammer/sys/kern/sched_ule.c#85 integrate
.. //depot/projects/hammer/sys/kern/subr_taskqueue.c#22 integrate
.. //depot/projects/hammer/sys/kern/syscalls.master#62 integrate
.. //depot/projects/hammer/sys/kern/vfs_aio.c#52 integrate
.. //depot/projects/hammer/sys/kern/vfs_bio.c#78 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#116 integrate
.. //depot/projects/hammer/sys/net/bpf.h#18 integrate
.. //depot/projects/hammer/sys/net/if_bridge.c#37 integrate
.. //depot/projects/hammer/sys/net/if_lagg.c#9 integrate
.. //depot/projects/hammer/sys/net/route.c#27 integrate
.. //depot/projects/hammer/sys/netgraph/netgraph.h#30 integrate
.. //depot/projects/hammer/sys/netgraph/ng_base.c#49 integrate
.. //depot/projects/hammer/sys/netgraph/ng_socket.c#27 integrate
.. //depot/projects/hammer/sys/netinet/ip.h#10 integrate
.. //depot/projects/hammer/sys/netinet/sctp_bsd_addr.c#8 integrate
.. //depot/projects/hammer/sys/netinet/tcp_syncache.c#50 integrate
.. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#52 integrate
.. //depot/projects/hammer/sys/netinet6/nd6.c#33 integrate
.. //depot/projects/hammer/sys/netsmb/smb_iod.c#10 integrate
.. //depot/projects/hammer/sys/nfs4client/nfs4_vfsops.c#22 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_nfsiod.c#15 integrate
.. //depot/projects/hammer/sys/opencrypto/crypto.c#15 integrate
.. //depot/projects/hammer/sys/powerpc/conf/GENERIC#33 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/genassym.c#13 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/swtch.S#6 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/vm_machdep.c#30 integrate
.. //depot/projects/hammer/sys/security/audit/audit_worker.c#5 integrate
.. //depot/projects/hammer/sys/security/mac/mac_framework.h#6 integrate
.. //depot/projects/hammer/sys/security/mac/mac_policy.h#7 integrate
.. //depot/projects/hammer/sys/security/mac/mac_posix_sem.c#4 integrate
.. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#43 integrate
.. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#41 integrate
.. //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#25 integrate
.. //depot/projects/hammer/sys/security/mac_test/mac_test.c#43 integrate
.. //depot/projects/hammer/sys/sun4v/sun4v/simdisk.c#2 integrate
.. //depot/projects/hammer/sys/sys/apm.h#2 integrate
.. //depot/projects/hammer/sys/sys/gpt.h#7 integrate
.. //depot/projects/hammer/sys/sys/kthread.h#3 integrate
.. //depot/projects/hammer/sys/sys/linker.h#18 integrate
.. //depot/projects/hammer/sys/sys/param.h#94 integrate
.. //depot/projects/hammer/sys/sys/priv.h#6 integrate
.. //depot/projects/hammer/sys/sys/vnode.h#72 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#45 integrate
.. //depot/projects/hammer/sys/vm/vm_map.c#64 integrate
.. //depot/projects/hammer/sys/vm/vm_zeroidle.c#29 integrate
.. //depot/projects/hammer/sys/vm/vnode_pager.c#41 integrate
.. //depot/projects/hammer/tools/build/options/WITHOUT_NS_CACHING#2 integrate
.. //depot/projects/hammer/usr.bin/lex/lib/Makefile#5 integrate
.. //depot/projects/hammer/usr.sbin/adduser/adduser.8#12 integrate
.. //depot/projects/hammer/usr.sbin/adduser/adduser.sh#13 integrate
.. //depot/projects/hammer/usr.sbin/adduser/rmuser.sh#5 integrate
.. //depot/projects/hammer/usr.sbin/mountd/mountd.8#9 integrate
.. //depot/projects/hammer/usr.sbin/mountd/mountd.c#21 integrate
.. //depot/projects/hammer/usr.sbin/rpcbind/rpcbind.c#9 integrate

Differences ...

==== //depot/projects/hammer/ObsoleteFiles.inc#36 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.113 2007/10/12 07:58:08 ru Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.114 2007/10/22 12:31:23 ru Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -579,11 +579,17 @@
 # 20070201: remove libmytinfo link
 OLD_FILES+=usr/lib/libmytinfo.a
 OLD_FILES+=usr/lib/libmytinfo.so
-OLD_FILES+=usr/lib/libmytinfo_p.a   
+OLD_FILES+=usr/lib/libmytinfo_p.a
+OLD_FILES+=usr/lib/libmytinfow.a
+OLD_FILES+=usr/lib/libmytinfow.so
+OLD_FILES+=usr/lib/libmytinfow_p.a
 .if ${TARGET_ARCH} == "amd64"
 OLD_FILES+=usr/lib32/libmytinfo.a
 OLD_FILES+=usr/lib32/libmytinfo.so
 OLD_FILES+=usr/lib32/libmytinfo_p.a
+OLD_FILES+=usr/lib32/libmytinfow.a
+OLD_FILES+=usr/lib32/libmytinfow.so
+OLD_FILES+=usr/lib32/libmytinfow_p.a
 .endif
 # 20070128: remove vnconfig
 OLD_FILES+=usr/sbin/vnconfig

==== //depot/projects/hammer/UPDATING#108 (text+ko) ====

@@ -21,6 +21,14 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20071020:
+	The misnamed kthread_create() and friends have been renamed
+	to kproc_create() etc. Many of the callers already
+	used kproc_start()..
+	I will return kthread_create() and friends in a while
+	with implementations that actually create threads, not procs.
+	Renaming corresponds with version 800002.
+
 20071010:
 	RELENG_7 branched.
 
@@ -913,4 +921,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.509 2007/10/12 04:48:58 kevlo Exp $
+$FreeBSD: src/UPDATING,v 1.510 2007/10/21 04:27:07 julian Exp $

==== //depot/projects/hammer/contrib/libpcap/pcap.h#8 (text+ko) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/contrib/libpcap/pcap.h,v 1.13 2007/10/16 02:07:55 mlaier Exp $
+ * $FreeBSD: src/contrib/libpcap/pcap.h,v 1.14 2007/10/20 20:23:39 mlaier Exp $
  * @(#) $Header: /tcpdump/master/libpcap/pcap.h,v 1.52.2.7 2007/06/11 09:52:05 guy Exp $ (LBL)
  */
 
@@ -41,9 +41,7 @@
 #include 
 #include 
 
-#ifndef PCAP_DONT_INCLUDE_PCAP_BPF_H
-#include 
-#endif
+#include 
 
 #include 
 

==== //depot/projects/hammer/etc/rc.d/amd#13 (text+ko) ====

@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $
-# $FreeBSD: src/etc/rc.d/amd,v 1.18 2006/10/18 15:56:11 flz Exp $
+# $FreeBSD: src/etc/rc.d/amd,v 1.19 2007/10/19 22:55:42 mtm Exp $
 #
 
 # PROVIDE: amd
@@ -34,7 +34,7 @@
 	[Nn][Oo] | '')
 		;;
 	*)
-		rc_flags="${rc_flags} `eval ${amd_map_program}`"
+		rc_flags="${rc_flags} `echo $(eval ${amd_map_program})`"
 		;;
 	esac
 
@@ -46,7 +46,8 @@
 		fi
 		;;
 	*)
-		rc_flags="-p ${rc_flags} > /var/run/amd.pid 2> /dev/null"
+		rc_flags="-p ${rc_flags}"
+		command_args=" > /var/run/amd.pid 2> /dev/null"
 		;;
 	esac
 	return 0

==== //depot/projects/hammer/etc/rc.d/kerberos#6 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/kerberos,v 1.6 2007/05/17 11:33:08 mtm Exp $
+# $FreeBSD: src/etc/rc.d/kerberos,v 1.7 2007/10/19 08:59:59 mtm Exp $
 #
 
 # PROVIDE: kerberos
@@ -14,4 +14,5 @@
 
 load_rc_config $name
 command="${kerberos5_server}"
+kerberos5_flags="${kerberos5_server_flags}"
 run_rc_command "$1"

==== //depot/projects/hammer/etc/rc.d/named#17 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/named,v 1.26 2006/04/20 12:30:12 delphij Exp $
+# $FreeBSD: src/etc/rc.d/named,v 1.27 2007/10/22 09:38:44 dougb Exp $
 #
 
 # PROVIDE: named
@@ -82,20 +82,28 @@
 
 named_reload()
 {
-	rndc reload
+	${command%/named}/rndc reload
 }
 
 named_stop()
 {
-	echo -n "Stopping named"
-	if rndc stop 2>/dev/null; then
-		echo .
+	# This duplicates an undesirably large amount of code from the stop
+	# routine in rc.subr in order to use rndc to shut down the process,
+	# and to give it a second chance in case rndc fails.
+	rc_pid=$(check_pidfile $pidfile $command)
+	if [ -z "$rc_pid" ]; then
+		[ -n "$rc_fast" ] && return 0
+		_run_rc_notrunning
+		return 1
+	fi
+	echo 'Stopping named.'
+	if ${command%/named}/rndc stop 2>/dev/null; then
+		wait_for_pids $rc_pid
 	else
-		echo -n ": rndc failed, trying killall: "
-		if killall named; then
-			echo .
-		fi
-	fi
+		echo -n 'rndc failed, trying kill: '
+		kill -TERM $rc_pid
+		wait_for_pids $rc_pid
+  	fi
 }
 
 named_poststop()
@@ -121,13 +129,13 @@
 	if [ -s "${named_chrootdir}/etc/namedb/rndc.conf" ]; then
 		return 0
 	fi
-	confgen_command="rndc-confgen -a -b256 -u $named_uid \
+	confgen_command="${command%/named}/rndc-confgen -a -b256 -u $named_uid \
 	    -c ${named_chrootdir}/etc/namedb/rndc.key"
 	if [ -s "${named_chrootdir}/etc/namedb/rndc.key" ]; then
-		if [ ! `stat -f%Su ${named_chrootdir}/etc/namedb/rndc.key` = \
-		    "$named_uid" ]; then
-			$confgen_command
-		fi
+		case `stat -f%Su ${named_chrootdir}/etc/namedb/rndc.key` in
+		root|$named_uid) ;;
+		*) $confgen_command ;;
+		esac
 	else
 		$confgen_command
 	fi

==== //depot/projects/hammer/games/fortune/datfiles/fortunes#69 (text+ko) ====

@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.241 2007/06/12 09:20:31 philip Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.243 2007/10/21 05:16:52 dougb Exp $
 
 %
 =======================================================================
@@ -48607,7 +48607,7 @@
 went to several nightclubs, drank champagne, danced and had a glorious
 evening.  It had gotten quite late when she motioned for the pencil and drew
 a picture of a four-poster bed.  He was dumbfounded, and to this day has
-never be able to understand how she knew he was in the furniture business.
+never been able to understand how she knew he was in the furniture business.
 %
 The part of the world that people find most puzzling is the part called "Me".
 %
@@ -57135,26 +57135,30 @@
 	Caaaall for Super Chicken!!    (**bwuck-bwuck-bwuck-bwuck**)
 	Caaaall for Super Chicken!!
 %
-When you get what you want in your struggle for self
-And the world makes you king for a day,
-Just go to a mirror and look at yourself
-And see what that man has to say.
-	For it isn't your father or mother or wife
-	Whose judgement upon you must pass;
-	The fellow whose verdict counts most in your life
-	Is the one staring back from the glass.
-Some people may think you a straight-shootin' chum
-And call you a wonderful guy,
-But the man in the glass says you're only a bum
-If you can't look him straight in the eye.
-	He's the fellow to please, never mind all the rest,
-	For he's with you clear up to the end,
-	And you've passed your most dangerous, difficult test
-	If the man in the glass is your friend.
-You may fool the whole world down the pathway of life
+When you get what you want in your struggle for pelf,
+And the world makes you King for a day,
+Then go to the mirror and look at yourself,
+And see what that guy has to say.
+	For it isn't your Father, or Mother, or Wife,
+	Who judgement upon you must pass.
+	The feller whose verdict counts most in your life
+	Is the guy staring back from the glass.
+He's the feller to please, never mind all the rest,
+For he's with you clear up to the end,
+And you've passed your most dangerous, difficult test
+If the guy in the glass is your friend.
+	You may be like Jack Horner and "chisel" a plum,
+	And think you're a wonderful guy,
+	But the man in the glass says you're only a bum
+	If you can't look him straight in the eye.
+You can fool the whole world down the pathway of years,
 And get pats on the back as you pass,
 But your final reward will be heartaches and tears
-If you've cheated the man in the glass.
+If you've cheated the guy in the glass.
+		-- "The Guy in the Glass"
+		   Copyright 1934, Dale Wimbrow (1895-1954)
+		   [Pelf is a Middle English word for wealth or riches,
+		    especially when acquired dishonestly. Ed.]
 %
 When you go into court you are putting your fate into the hands of twelve
 people who weren't smart enough to get out of jury duty.

==== //depot/projects/hammer/games/fortune/datfiles/fortunes-o.real#7 (text+ko) ====

@@ -1,4 +1,4 @@
-%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.22 2007/03/29 08:08:34 kris Exp $
+%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.23 2007/10/21 05:16:52 dougb Exp $
 		My Favorite Drugs [Sung to My Favorite Things]
 Reefers and roach clips and papers and rollers
 Cocaine and procaine for twenty year molars
@@ -1737,20 +1737,6 @@
 %
 The other night I was having sex, but the girl hung up on me.
 %
-The owner of a large furniture store in the mid-west arrived in France
-on a buying trip.  As he was checking into a hotel he struck up an
-acquaintance with a beautiful young lady.  However, she only spoke
-French and he only spoke English, so each couldn't understand a word
-the other spoke.  He took out a pencil and a notebook and drew a
-picture of a taxi.  She smiled, nodded her head and they went for a
-ride in the park.  Later, he drew a picture of a table in a restaurant
-with a question mark and she nodded, so they went to dinner.  After
-dinner he sketched two dancers and she was delighted.  They went to
-several nightclubs, drank champagne, danced and had a glorious
-evening.  It had gotten quite late when she motioned for the pencil and
-drew a picture of a four-poster bed.  He was dumbfounded, and has never
-been able to understand how she knew he was in the furniture business.
-%
 The problem with being best man at a wedding is that you never get a
 chance to prove it.
 %

==== //depot/projects/hammer/games/fortune/datfiles/limerick#8 (text+ko) ====

@@ -1,4 +1,4 @@
-%% $FreeBSD: src/games/fortune/datfiles/limerick,v 1.11 2006/09/27 19:20:43 schweikh Exp $
+%% $FreeBSD: src/games/fortune/datfiles/limerick,v 1.12 2007/10/21 05:16:52 dougb Exp $
 A bad little girl in Madrid,
 A most reprehensible kid,
 	Told her Tante Louise
@@ -1171,7 +1171,7 @@
 As he lovingly busses each table.
 %
 A worn-out young husband named Lehr
-Her daily his wife's plaintive prayer:
+Heard daily his wife's plaintive prayer:
 	"Slip on a sheath, quick,
 	Then slip your big dick
 Between these lips covered with hair."

==== //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#28 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.60 2007/10/15 08:06:42 ru Exp $
+.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.61 2007/10/22 10:01:58 ru Exp $
 .\"
 .\"     %beginstrip%
 .
@@ -48,6 +48,7 @@
 .ds doc-str-Lb-libgeom     Userland API Library for kernel GEOM subsystem (libgeom, \-lgeom)
 .ds doc-str-Lb-libipx      IPX Address Conversion Support Library (libipx, \-lipx)
 .ds doc-str-Lb-libkiconv   Kernel side iconv library (libkiconv, \-lkiconv)
+.ds doc-str-Lb-libkse      N:M Threading Library (libkse, \-lkse)
 .ds doc-str-Lb-libmd       Message Digest (MD4, MD5, etc.) Support Library (libmd, \-lmd)
 .ds doc-str-Lb-libmemstat  Kernel Memory Allocator Statistics Library (libmemstat, \-lmemstat)
 .ds doc-str-Lb-libnetgraph Netgraph User Library (libnetgraph, \-lnetgraph)

==== //depot/projects/hammer/lib/libbsm/Makefile#6 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/lib/libbsm/Makefile,v 1.7 2007/05/21 02:49:03 deischen Exp $
+# $FreeBSD: src/lib/libbsm/Makefile,v 1.8 2007/10/19 10:37:34 rwatson Exp $
 #
 
 OPENBSMDIR=		${.CURDIR}/../../contrib/openbsm
@@ -151,6 +151,8 @@
 	au_user.3 getauusernam.3					\
 	au_user.3 getauusernam_R.3					\
 	au_user.3 au_user_mask.3					\
-	au_user.3 getfauditflags.3
+	au_user.3 getfauditflags.3					\
+	getaudit.2 getaudit_addr.2					\
+	setaudit.2 setaudit_addr.2
 
 .include 

==== //depot/projects/hammer/lib/libc/locale/iswctype.c#5 (text+ko) ====

@@ -36,7 +36,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.8 2007/10/13 16:28:22 ache Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.9 2007/10/23 17:39:28 ache Exp $");
 
 #include 
 
@@ -61,7 +61,7 @@
 iswascii(wc)
 	wint_t wc;
 {
-	return (wc < 0x80);
+	return ((wc & ~0x7F) == 0);
 }
 
 #undef iswblank

==== //depot/projects/hammer/lib/libc/stdlib/atoi.3#4 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)atoi.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/stdlib/atoi.3,v 1.13 2007/01/09 00:28:09 imp Exp $
+.\" $FreeBSD: src/lib/libc/stdlib/atoi.3,v 1.14 2007/10/19 06:23:39 davidxu Exp $
 .\"
 .Dd June 4, 1993
 .Dt ATOI 3
@@ -59,10 +59,6 @@
 .Bd -literal -offset indent
 (int)strtol(nptr, (char **)NULL, 10);
 .Ed
-.Sh IMPLEMENTATION NOTES
-The
-.Fn atoi
-function is not thread-safe and also not async-cancel safe.
 .Pp
 The
 .Fn atoi

==== //depot/projects/hammer/lib/libc/sys/kldstat.2#4 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libc/sys/kldstat.2,v 1.20 2004/07/02 23:52:13 ru Exp $
+.\" $FreeBSD: src/lib/libc/sys/kldstat.2,v 1.22 2007/10/22 21:49:39 jb Exp $
 .\"
 .Dd March 3, 1999
 .Dt KLDSTAT 2
@@ -53,6 +53,7 @@
 	int         id;
 	caddr_t     address;        /* load address */
 	size_t      size;           /* size in bytes */
+	char        pathname[MAXPATHLEN];
 };
 .Ed
 .Pp
@@ -77,6 +78,10 @@
 The load address of the kld file.
 .It size
 The size of the file.
+.It pathname
+The full name of the file referred to by
+.Fa fileid ,
+including the path.
 .El
 .Sh RETURN VALUES
 .Rv -std kldstat
@@ -123,3 +128,7 @@
 .Nm kld
 interface first appeared in
 .Fx 3.0 .
+.Sh BUGS
+The pathname many not be accurate if the file system mounts have
+changed since the module was loaded, or if this function is called
+within a chrooted environment.

==== //depot/projects/hammer/lib/libelf/elf.3#2 (text+ko) ====

@@ -1,4 +1,4 @@
-.\" Copyright (c) 2006 Joseph Koshy.  All rights reserved.
+.\" Copyright (c) 2006,2007 Joseph Koshy.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -21,9 +21,9 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD: src/lib/libelf/elf.3,v 1.3 2006/12/11 09:03:27 jkoshy Exp $
+.\" $FreeBSD: src/lib/libelf/elf.3,v 1.4 2007/10/21 05:08:40 jkoshy Exp $
 .\"
-.Dd December 11, 2006
+.Dd October 21, 2007
 .Os
 .Dt ELF 3
 .Sh NAME
@@ -521,6 +521,9 @@
 .Xr elf_flagelf 3 ,
 following which the library will use the data offsets and alignments
 specified by the application when laying out the file.
+Application control of file layout is described further in the 
+.Xr elf_update 3
+manual page.
 .Pp
 Gaps in between sections will be filled with the fill character
 set by function

==== //depot/projects/hammer/lib/libelf/elf_flagdata.3#2 (text+ko) ====

@@ -1,4 +1,4 @@
-.\" Copyright (c) 2006 Joseph Koshy.  All rights reserved.
+.\" Copyright (c) 2006,2007 Joseph Koshy.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -21,9 +21,9 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD: src/lib/libelf/elf_flagdata.3,v 1.2 2006/11/13 09:46:15 ru Exp $
+.\" $FreeBSD: src/lib/libelf/elf_flagdata.3,v 1.3 2007/10/22 03:38:43 jkoshy Exp $
 .\"
-.Dd August 10, 2006
+.Dd October 22, 2007
 .Os
 .Dt ELF_FLAGDATA 3
 .Sh NAME
@@ -51,7 +51,7 @@
 .Ft "unsigned int"
 .Fn elf_flagshdr "Elf_Scn *scn" "Elf_Cmd cmd" "unsigned int flags"
 .Sh DESCRIPTION
-These functions are used to query, set or reset flag bits on data
+These functions are used to query, set or reset flags on data
 structures associated with an ELF file.
 .Pp
 Arguments
@@ -59,7 +59,7 @@
 .Ar elf
 and
 .Ar scn
-denote the data structures whose status bits need to be changed.
+denote the data structures whose flags need to be changed.
 These values are allowed to be NULL to simplify error handling in
 application code.
 .Pp
@@ -70,16 +70,16 @@
 .It Dv ELF_C_CLR
 The argument
 .Ar flags
-specifies the bits to be cleared.
+specifies the flags to be cleared.
 .It Dv ELF_C_SET
 The argument
 .Ar flags
-specifies the bits to be set.
+specifies the flags to be set.
 .El
 .Pp
 The argument
 .Ar flags
-is allowed to have the following bits set:
+is allowed to have the following flags set:
 .Bl -tag -width ELF_F_LAYOUT
 .It Dv ELF_F_DIRTY
 Mark the associated data structure as needing to be written back
@@ -111,7 +111,7 @@
 will return the current set of flags for the data structure being
 queried.
 .Sh RETURN VALUES
-These functions return the updated bits is successful, and zero if
+These functions return the updated flags is successful, and zero if
 an error is detected.
 .Sh ERRORS
 These functions may fail with the following errors:
@@ -123,7 +123,7 @@
 .It Bq Er ELF_E_ARGUMENT
 Argument
 .Ar flags
-had unsupported flag bits set.
+had unsupported flags set.
 .It Bq Er ELF_E_ARGUMENT
 The argument
 .Ar elf

==== //depot/projects/hammer/lib/libelf/elf_getscn.3#2 (text+ko) ====

@@ -1,4 +1,4 @@
-.\" Copyright (c) 2006 Joseph Koshy.  All rights reserved.
+.\" Copyright (c) 2006,2007 Joseph Koshy.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -21,9 +21,9 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD: src/lib/libelf/elf_getscn.3,v 1.2 2006/11/13 09:46:15 ru Exp $
+.\" $FreeBSD: src/lib/libelf/elf_getscn.3,v 1.3 2007/10/22 03:38:43 jkoshy Exp $
 .\"
-.Dd August 26, 2006
+.Dd October 22, 2007
 .Os
 .Dt ELF_GETSCN 3
 .Sh NAME
@@ -73,7 +73,7 @@
 .Ar elf ,
 and will set the
 .Dv ELF_F_DIRTY
-bit for the new section.
+flag on the returned section descriptor.
 For ELF descriptors opened for writing, the ELF library will
 automatically create an empty section at index zero
 .Dv ( SHN_UNDEF )

==== //depot/projects/hammer/lib/libelf/elf_update.3#3 (text+ko) ====

@@ -21,9 +21,9 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD: src/lib/libelf/elf_update.3,v 1.4 2007/09/08 08:20:12 jkoshy Exp $
+.\" $FreeBSD: src/lib/libelf/elf_update.3,v 1.5 2007/10/22 03:38:43 jkoshy Exp $
 .\"
-.Dd September 08, 2007
+.Dd October 22, 2007
 .Os
 .Dt ELF_UPDATE 3
 .Sh NAME
@@ -63,7 +63,7 @@
 .Dv ELF_F_LAYOUT
 flag has been set on the ELF descriptor, the application assumes full
 responsibility for the layout of the ELF object.
-If this bit is not set, the ELF library will compute the layout of the
+If this flag is not set, the ELF library will compute the layout of the
 file from its associated section descriptors.
 .Pp
 It is the application's responsibility to manage the the following

==== //depot/projects/hammer/lib/libelf/gelf_getphdr.3#2 (text+ko) ====

@@ -1,4 +1,4 @@
-.\" Copyright (c) 2006 Joseph Koshy.  All rights reserved.
+.\" Copyright (c) 2006,2007 Joseph Koshy.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -21,9 +21,9 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD: src/lib/libelf/gelf_getphdr.3,v 1.3 2006/12/25 02:24:39 jkoshy Exp $
+.\" $FreeBSD: src/lib/libelf/gelf_getphdr.3,v 1.4 2007/10/21 05:15:07 jkoshy Exp $
 .\"
-.Dd December 16, 2006
+.Dd October 21, 2007
 .Os
 .Dt GELF_GETPHDR 3
 .Sh NAME
@@ -57,10 +57,9 @@
 descriptors respectively.
 These descriptors are described in
 .Xr elf 5 .
-The number of entries in this array is specified by the
-.Va e_phnum
-field of the executable header for ELF descriptor
-.Ar elf .
+The number of entries in this array may be determined using the
+.Xr elf_getphnum 3
+function.
 .Pp
 Function
 .Fn gelf_getphdr
@@ -134,6 +133,7 @@
 .Xr elf64_getehdr 3 ,
 .Xr elf64_newphdr 3 ,
 .Xr elf_flagphdr 3 ,
+.Xr elf_getphnum 3 ,
 .Xr gelf 3 ,
 .Xr gelf_getehdr 3 ,
 .Xr gelf_newphdr 3 ,

==== //depot/projects/hammer/lib/libelf/gelf_newehdr.3#2 (text+ko) ====

@@ -1,4 +1,4 @@
-.\" Copyright (c) 2006 Joseph Koshy.  All rights reserved.
+.\" Copyright (c) 2006,2007 Joseph Koshy.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -21,9 +21,9 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD: src/lib/libelf/gelf_newehdr.3,v 1.3 2006/12/25 02:24:39 jkoshy Exp $
+.\" $FreeBSD: src/lib/libelf/gelf_newehdr.3,v 1.4 2007/10/22 03:38:43 jkoshy Exp $
 .\"
-.Dd December 16, 2006
+.Dd October 22, 2007
 .Os
 .Dt GELF_NEWEHDR 3
 .Sh NAME
@@ -122,7 +122,7 @@
 .Pp
 If successful, these three functions set the
 .Dv ELF_F_DIRTY
-bit on ELF descriptor
+flag on ELF descriptor
 .Ar elf .
 .Sh RETURN VALUES
 These functions return a pointer to a translated header descriptor

==== //depot/projects/hammer/lib/libelf/gelf_newphdr.3#2 (text+ko) ====

@@ -1,4 +1,4 @@
-.\" Copyright (c) 2006 Joseph Koshy.  All rights reserved.
+.\" Copyright (c) 2006,2007 Joseph Koshy.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -21,9 +21,9 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD: src/lib/libelf/gelf_newphdr.3,v 1.2 2006/11/13 09:46:16 ru Exp $
+.\" $FreeBSD: src/lib/libelf/gelf_newphdr.3,v 1.4 2007/10/22 03:38:43 jkoshy Exp $
 .\"
-.Dd August 25, 2006
+.Dd October 22, 2007
 .Os
 .Dt GELF_NEWPHDR 3
 .Sh NAME
@@ -81,14 +81,8 @@
 .Ar elf .
 .Pp
 The functions set the
-.Va e_phnum
-field of the executable header for ELF descriptor
-.Ar elf
-to
-.Ar count ,
-and also set the
 .Dv ELF_F_DIRTY
-bit on the program header table.
+flag on the program header table.
 All members of the returned array of Phdr structures
 will be initialized to zero.
 .Pp
@@ -132,6 +126,7 @@
 .Xr elf64_getphdr 3 ,
 .Xr elf64_newehdr 3 ,
 .Xr elf_flagphdr 3 ,
+.Xr elf_getphnum 3 ,
 .Xr gelf 3 ,
 .Xr gelf_getphdr 3 ,
 .Xr gelf_newehdr 3 ,

==== //depot/projects/hammer/lib/libpam/modules/pam_unix/Makefile#5 (text+ko) ====

@@ -32,9 +32,10 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/lib/libpam/modules/pam_unix/Makefile,v 1.21 2006/03/19 08:52:49 ru Exp $
+# $FreeBSD: src/lib/libpam/modules/pam_unix/Makefile,v 1.22 2007/10/20 19:01:50 ru Exp $
 
 NO_PROFILE=
+NO_INSTALLLIB=
 .include 
 
 LIB=	pam_unix

==== //depot/projects/hammer/lib/libstand/tftp.c#4 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libstand/tftp.c,v 1.12 2004/10/03 15:58:20 stefanf Exp $");
+__FBSDID("$FreeBSD: src/lib/libstand/tftp.c,v 1.13 2007/10/21 17:03:18 marius Exp $");
 
 /*
  * Simple TFTP implementation for libsa.
@@ -95,10 +95,10 @@
 		u_char header[HEADER_SIZE];
 		struct tftphdr t;
 		u_char space[RSPACE];
-	} lastdata;
+	} __packed __aligned(4) lastdata;
 };
 
-static int tftperrors[8] = {
+static const int tftperrors[8] = {
 	0,			/* ??? */
 	ENOENT,
 	EPERM,
@@ -175,7 +175,7 @@
 		u_char header[HEADER_SIZE];
 		struct tftphdr  t;
 		u_char space[FNAME_SIZE + 6];
-	} wbuf;
+	} __packed __aligned(4) wbuf;
 	char           *wtail;
 	int             l;
 	ssize_t         res;
@@ -218,7 +218,7 @@

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Tue Oct 23 19:28:53 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1EE9216A469; Tue, 23 Oct 2007 19:28: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 B2DD116A41A
	for ; Tue, 23 Oct 2007 19:28:52 +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 B3CDA13C4BF
	for ; Tue, 23 Oct 2007 19:28:52 +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 l9NJSq3S098662
	for ; Tue, 23 Oct 2007 19:28:52 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9NJSqYp098659
	for perforce@freebsd.org; Tue, 23 Oct 2007 19:28:52 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Tue, 23 Oct 2007 19:28:52 GMT
Message-Id: <200710231928.l9NJSqYp098659@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 127968 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, 23 Oct 2007 19:28:53 -0000

http://perforce.freebsd.org/chv.cgi?CH=127968

Change 127968 by pgj@disznohal on 2007/10/23 19:28:38

	Add initial Hungarian translation of Chapter 8: Configuring the
	FreeBSD Kernel.

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/kernelconfig/chapter.sgml#3 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/kernelconfig/chapter.sgml#3 (text+ko) ====

@@ -3,178 +3,243 @@
 
      $FreeBSD: doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v 1.176 2007/09/07 05:11:24 blackend Exp $
 -->
+
 
-
+
   
     
       
 	Jim
 	Mock
-	Updated and restructured by 
-	
+	Frissítette és
+	  újjászervezte: 
       
     
     
       
 	Jake
 	Hamby
-	Originally contributed by 
-	
+	Eredetileg írta: 
       
     
   
 
-  Configuring the FreeBSD Kernel
+  A &os; rendszermag testreszabása
 
   
-    Synopsis
+    Áttekintés
 
     
-      kernel
-      building a custom kernel
+      rendszermag
+      saját rendszermag
+	készítése
     
 
-    The kernel is the core of the &os; operating system.  It is
-      responsible for managing memory, enforcing security controls,
-      networking, disk access, and much more.  While more and more of &os;
-      becomes dynamically configurable it is still occasionally necessary to
-      reconfigure and recompile your kernel.
+    A rendszermag a &os; operációs rendszer lelke.
+      Felelõs a memória kezelésért, a
+      biztonsági szabályozások
+      betartatásáért, a hálózat
+      mûködtetéséért, a
+      lemezhozzáférésért és sok
+      minden másért is.  Miközben maga a &os; egyre
+      jobban konfigurálható dinamikusan, addig
+      alkalmanként elegedhetetlen, hogy
+      újrakonfiguráljuk és
+      újrafordítsuk a rendszermagot.
 
-    After reading this chapter, you will know:
+    A fejezet elolvasása során
+      megismerjük:
 
     
       
-	Why you might need to build a custom kernel.
+	Miért lehet szükségünk egy
+	  saját rendszermagra.
       
 
       
-	How to write a kernel configuration file, or alter an existing
-	  configuration file.
+	Hogyan készítsünk
+	  konfigurációs állományt a
+	  rendszermaghoz, vagy hogyan módosítsunk egy
+	  már létezõt.
       
 
       
-	How to use the kernel configuration file to create and build a
-	  new kernel.
+	Hogyan használjuk a rendszermag
+	  konfigurációs állományát egy
+	  új rendszermag lefordítására
+	  és létrehozására.
       
 
       
-	How to install the new kernel.
+	Hogyan telepítsük az új
+	  rendszermagot.
       
 
       
-	How to troubleshoot if things go wrong.
+	Hogyan orvosoljuk a felmerülõ
+	  hibákat.
       
     
 
-    All of the commands listed within this chapter by way of example
-      should be executed as root in order to
-      succeed.
+    A fejezetben az összes példaként
+      bemutatásra kerülõ parancsot
+      root felhasználóként
+      kell kiadni a sikeres végrehajtásukhoz.
   
 
   
-    Why Build a Custom Kernel?
+    Miért készítsünk saját
+      rendszermagot?
 
-    Traditionally, &os; has had what is called a
-      monolithic kernel.  This means that the kernel was one
-      large program, supported a fixed list of devices, and if you wanted to
-      change the kernel's behavior then you had to compile a new kernel, and
-      then reboot your computer with the new kernel.
+    A &os; eredetileg ún.  monolitikus
+      rendszermaggal rendelkezett.  Ez azt jelenti, hogy a rendszermag
+      egyetlen nagy program volt, ami elõre rögzített
+      eszközöket ismert, és ha meg akartuk
+      változtatni a rendszermag
+      mûködését, akkor fordítanunk
+      kellett új rendszermagot, majd újraindítanunk
+      vele a számítógépet.
 
-    Today, &os; is rapidly moving to a model where much of the
-      kernel's functionality is contained in modules which can be
-      dynamically loaded and unloaded from the kernel as necessary.
-      This allows the kernel to adapt to new hardware suddenly
-      becoming available (such as PCMCIA cards in a laptop), or for
-      new functionality to be brought into the kernel that was not
-      necessary when the kernel was originally compiled.  This is
-      known as a modular kernel.
+    Manapság azonban a &os; már inkább ahhoz
+      a modellhez mozdult el, ahol a rendszermag
+      funkcionalitásának nagy részét
+      mûködésközben az igények szerint
+      betölthetõ és kidobható modulok
+      adják.  Ezzel lehetõvé válik, hogy a
+      rendszermag gyorsan illeszkedni tudjon az újonnan
+      megjelenõ hardvereszközökhöz (mint mondjuk a
+      laptopok PCMCIA-kártyáihoz), vagy olyan új
+      funkciókat tegyünk a rendszermaghoz, amelyet a
+      fordításánál nem voltak
+      feltétlenül szükségesek.  Az ilyet nevezik
+      moduláris rendszermagnak.
 
-    Despite this, it is still necessary to carry out some static kernel
-      configuration.  In some cases this is because the functionality is so
-      tied to the kernel that it can not be made dynamically loadable.  In
-      others it may simply be because no one has yet taken the time to write a
-      dynamic loadable kernel module for that functionality.
+    Ennek ellenére még mindig elkerülhetetlen,
+      hogy ne legyen valamennyi szükség a rendszermag statikus
+      testreszabására.  Ez a legtöbb esetben azzal
+      magyarázható, hogy vannak olyan funkciók,
+      amelyek túlságosan is szorosan mélyen
+      helyezkednek el a rendszermagban, ezáltal nem
+      tölthetõek be dinamikusan.  Máskor viszont
+      egyszerûen azért nem lehetséges, mert
+      még senki sem szánt idõt az adott
+      funkcióhoz tartozó, dinamikusan betölthetõ
+      modul elkészítésére.
 
-    Building a custom kernel is one of the most important rites of
-      passage nearly every BSD user must endure.  This process, while
-      time consuming, will provide many benefits to your &os; system.
-      Unlike the GENERIC kernel, which must support a
-      wide range of hardware, a custom kernel only contains support for
-      your PC's hardware.  This has a number of
-      benefits, such as:
+    Egy saját rendszermag készítése
+      azon legfontosabb próbatételek egyike, melyet majdnem
+      az összes BSD felhasználónak ki kell
+      állnia.  Ez a folyamat, habár némileg
+      idõigényes, számos elõny tartogat &os;
+      rendszerünk számára.  Eltérõen egy
+      GENERIC (általános)
+      rendszermagtól, mely rengeteg hardvert támogat, egy
+      saját rendszermag csak a saját
+      PC-nk hardverét ismeri.  Ennek több elõnye is
+      van, például:
 
     
       
-	Faster boot time.  Since the kernel will only probe the
-	hardware you have on your system, the time it takes your system to
-	boot can decrease dramatically.
+	A rendszerünk gyorsabban indul.  Mivel a rendszermag
+	  csak azokat a hardvereket fogja keresni, melyek a
+	  rendszerünkben megtalálhatóak,
+	  jelentõs mértékben le tud csökkeni az
+	  induláshoz szükséges idõ.
       
 
       
-	Lower memory usage.  A custom kernel often uses less memory
-	  than the GENERIC kernel, which is important
-	  because the kernel must always be present in real
-	  memory.  For this reason, a custom kernel is especially useful
-	  on a system with a small amount of RAM.
+	Kisebb memóriahasználat.  Egy saját
+	  rendszermag gyakran kevesebb memóriát
+	  emészt fel, mint a GENERIC
+	  rendszermag, ami azért is fontos, mert a rendszermag
+	  mindig benn van a memóriában.  Emiatt egy
+	  saját rendszermag elkészítése
+	  különösen hasznos lehet egy kevés
+	  fizikai memóriával rendelkezõ
+	  rendszeren.
       
 
       
-	Additional hardware support.  A custom kernel allows you to
-	  add in support for devices which are not
-	  present in the GENERIC kernel, such as
-	  sound cards.
+	További hardverek támogatása.  A
+	  saját rendszermagunkba olyan eszközök
+	  támogatását is beletehetjük, amelyek
+	  nem szerepelnek a GENERIC rendszermagban,
+	  mint mondjuk a hangkártyákét.
       
     
   
 
   
-    Building and Installing a Custom Kernel
+    Saját rendszermag készítése
+      és telepítése
     
-      kernel
-      building / installing
+      rendszermag
+      készítése,
+	telepítése
     
 
-    First, let us take a quick tour of the kernel build directory.
-      All directories mentioned will be relative to the main
-      /usr/src/sys directory, which is also
-      accessible through the path name /sys.  There are a number of
-      subdirectories here representing different parts of the kernel, but
-      the most important for our purposes are
-      arch/conf, where you
-      will edit your custom kernel configuration, and
-      compile, which is the staging area where your
-      kernel will be built.  arch represents
-      one of i386, alpha,
+    Elõször is tegyünk egy rövidke
+      sétát a rendszermag könyvtárában.
+      A továbbiakban említendõ összes
+      könyvtár a /usr/src/sys
+      könyvtáron belül található, amely
+      /sys néven is elérhetõ.
+      Itt rengeteg alkönyvtár található,
+      mindegyikük a rendszermag különbözõ
+      részeit testesítik meg.  Ezek közül most
+      számunkra a legfontosabb az
+      architektúra/conf
+      lesz, ahol majd létrehozzuk a saját rendszermagunk
+      konfigurációs állományát,
+      valamint a compile, ahol majd a
+      rendszermagunk fordítása történik.  Itt
+      az architektúra lehet
+      i386, alpha,
       amd64, ia64,
-      powerpc, sparc64, or
-      pc98 (an alternative development branch of PC
-      hardware, popular in Japan).  Everything inside a particular
-      architecture's directory deals with that architecture only; the rest
-      of the code is machine independent code common to all platforms to which &os; could
-      potentially be ported.  Notice the logical organization of the
-      directory structure, with each supported device, file system, and
-      option in its own subdirectory.
+      powerpc, sparc64 vagy
+      pc98 (a PC-k egyik, leginkább
+      Japánban elterjedt változata).  Az adott
+      architektúra könyvtárában
+      található összes állomány csak
+      arra az architektúrára vonatkozik, a kód
+      többi része pedig gépfüggetlen és
+      közös az összes többi létezõ
+      és leendõ &os; platformon.  Érdemes megfigyelni
+      a könyvtárak logikai elrendezését:
+      minden egyes ismert eszköz, állományrendszer
+      és bõvítmény saját
+      alkönyvtárral rendelkezik.
 
-    This chapter assumes that you are using the i386 architecture
-      in the examples.  If this is not the case for your situation,
-      make appropriate adjustments to the path names for your system's
-      architecture.
+    A példák során ez a fejezet
+      feltételezi, hogy az i386 architektúrát
+      használjuk.  Ha ez a mi esetünkben nem így
+      lenne, ne felejtsük el átírni bennük az
+      elérési útvonalakat a rendszerünk
+      architektúrájának megfelelõen.
 
     
-      If there is not a
-	/usr/src/sys directory on your system,
-	then the kernel source has not been installed.  The easiest
-	way to do this is by running
-	sysinstall as
-	root, choosing
-	Configure, then
-	Distributions, then
-	src, then
-	base and
-	sys.  If you have an aversion to
-	sysinstall and you have access to
-	an official &os; CDROM, then you can also
-	install the source from the command line:
+      Ha nem lenne
+	/usr/src/sys könyvtár a
+	rendszerünkben, valószínûleg még
+	nem telepítettük a rendszermag
+	forráskódját.  Ezt a legkönnyebben
+	úgy tudjuk megtenni, ha root
+	felhasználóként elindítjuk a
+	sysinstallt és ott kiválasztjuk
+	a Configure
+	(Beállítások), azon belül
+	Distributions (Terjesztések)
+	menüpontot, amiben válasszuk ki a
+	src, base
+	és sys terjesztéseket.
+	Ha nem szeretnénk erre a célra a
+	sysinstallt használni
+	és rendelkezésünkre áll a
+	hivatalos &os; CD, akkor a forrásokat
+	akár parancssorból is
+	telepíthetjük:
 
       &prompt.root; mount /cdrom
 &prompt.root; mkdir -p /usr/src/sys
@@ -183,151 +248,212 @@
 &prompt.root; cat /cdrom/src/sbase.[a-d]* | tar -xzvf -
     
 
-    Next, move to the
-      arch/conf directory
-      and copy the GENERIC configuration file to the
-      name you want to give your kernel.  For example:
+    Ezután lépjünk be az
+      i386/conf
+      könyvtárba és másoljuk le a
+      GENERIC konfigurációs
+      állományt a kedvünk szerinti nevûre.
+      Például:
 
     &prompt.root; cd /usr/src/sys/i386/conf
-&prompt.root; cp GENERIC MYKERNEL
+&prompt.root; cp GENERIC SAJAT
 
-    Traditionally, this name is in all capital letters and, if you
-      are maintaining multiple &os; machines with different hardware,
-      it is a good idea to name it after your machine's hostname.  We will
-      call it MYKERNEL for the purpose of this
-      example.
+    Általában a nevet végig nagybetûkkel
+      írjuk, és ha több &os;-s gépet is
+      üzemeltetünk különbözõ hardverekkel,
+      hasznosnak bizonyulhat megemlíteni benne az adott
+      gép rendszerének nevét is.  Ebben a
+      példában ezt most SAJATnak
+      fogjuk nevezni.
 
     
-      Storing your kernel configuration file directly under
-	/usr/src can be a bad idea.  If you are
-	experiencing problems it can be tempting to just delete
-	/usr/src and start again.  After doing this,
-	it usually only takes a few seconds for
-	you to realize that you have deleted your custom kernel
-	configuration file.  Also, do not edit GENERIC
-	directly, as it may get overwritten the next time you
-	update your source tree, and
-	your kernel modifications will be lost.
+      A rendszermagunk konfigurációs
+	állományát nem éppen a legjobb
+	ötlet a /usr/src
+	könyvtárban tárolni.  Ugyanis könnyen
+	elõfordulhat, hogy egy rosszul sikerült
+	fordítás után egyszerûen csak
+	letöröljük az egész
+	/usr/src könyvtárat és
+	onnan kezdjük újra.  Azonban csak ezután
+	juthat eszünkbe, hogy vele együtt bizony
+	letöröltük a saját rendszermagunk
+	konfigurációs állományát is!
+	Ehhez hasonlóan, közvetlenül a
+	GENERIC konfigurációs
+	állomány szerkesztése sem ajánlott,
+	mivel az egy esetleges forrásfrissítésnél
+	könnyen felülíródhat és ezzel
+	együtt elvesznek a módosításaink
+	is.
 
-      You might want to keep your kernel configuration file
-	elsewhere, and then create a symbolic link to the file in
-	the i386
-	directory.
+      Tehát érdemes inkább valahol
+	máshol tárolnunk a rendszermagunk
+	konfigurációs állományát,
+	majd létrehozni rá egy szimbolikus linket a
+	i386
+	könyvtárban.
 
-      For example:
+      Valahogy így:
 
       &prompt.root; cd /usr/src/sys/i386/conf
-&prompt.root; mkdir /root/kernels
-&prompt.root; cp GENERIC /root/kernels/MYKERNEL	
-&prompt.root; ln -s /root/kernels/MYKERNEL
+&prompt.root; mkdir /root/kernel
+&prompt.root; cp GENERIC /root/kernel/SAJAT	
+&prompt.root; ln -s /root/kernel/SAJAT
     
 
-    Now, edit MYKERNEL with your favorite text
-      editor.  If you are just starting out, the only editor available
-      will probably be vi, which is too complex to
-      explain here, but is covered well in many books in the bibliography.  However, &os; does
-      offer an easier editor called ee which, if
-      you are a beginner, should be your editor of choice.  Feel free to
-      change the comment lines at the top to reflect your configuration or
-      the changes you have made to differentiate it from
-      GENERIC.
+    Most pedig a kedvenc szövegszerkesztõnkkel
+      lássunk neki a SAJAT
+      átírásának!  Ha nemrég
+      telepítettük csak a rendszerünket, az egyetlen
+      elérhetõ szövegszerkesztõnk minden bizonnyal
+      a vi lesz.  Róla most
+      túlságosan is bonyolult lenne leírást
+      adnunk, de az Irodalomjegyzékben
+      található könyvek közül sokban
+      elég jól bemutatják.  Habár a &os;
+      ajánl egy könnyebb szövegszerkesztõt is az
+      ee személyében, amely a
+      kezdõk számára az ideális
+      választás.  Nyugodtan átírhatjuk az
+      elöl található megjegyzéseket a
+      saját konfigurációnknak megfelelõen,
+      vagy akár azt is rögzíthetjük, miben
+      tértünk el a GENERIC
+      beállításaitól.
+
     SunOS
 
-    If you have built a kernel under &sunos; or some other BSD
-      operating system, much of this file will be very familiar to you.
-      If you are coming from some other operating system such as DOS, on
-      the other hand, the GENERIC configuration file
-      might seem overwhelming to you, so follow the descriptions in the
-      Configuration File
-      section slowly and carefully.
+    Ha fordítottunk már rendszermagot &sunos; vagy
+      más BSD operációs rendszer alatt, ez az
+      állomány ismerõsnek tûnhet.  Ha viszont
+      más operációs rendszerek, mint mondjuk a DOS,
+      felõl érkezünk, a GENERIC
+      konfigurációs állomány egy
+      kissé túláradónak hathat
+      számunkra, ezért A konfigurációs
+      állomány címû részt
+      figyelmesen és lassan olvassuk át.
 
     
-      If you sync your source tree with the
-        latest sources of the &os; project,
-        be sure to always check the file
-        /usr/src/UPDATING before you perform any update
-        steps.  This file describes any important issues or areas
-        requiring special attention within the updated source code.
-        /usr/src/UPDATING always matches
-        your version of the &os; source, and is therefore more up to date
-        with new information than this handbook.
+      Amennyiben a forrásfánkat a &os; projekt
+	legfrissebb forrásaival szinkronizáljuk, mindig
+	olvassuk el a /usr/src/UPDATING
+	állományt, mielõtt bármilyen
+	frissítéshez is kezdenénk.  Itt
+	megtalálhatóak azok a fontos érintett
+	kérdések és területek, amely
+	külön figyelmet igényelnek a frissített
+	forráskód esetén.  A
+	/usr/src/UPDATING mindig a &os;
+	forrásának legfrissebb változatához
+	igazodik, és ezért sokkal naprakészebb
+	információkat tartalmaz, mint ez a
+	kézikönyv.
     
 
-    You must now compile the source code for the kernel.
+    Most pedig le kell lefordítanunk a rendszermag
+      forráskódját.
 
     
-      Building a Kernel
+      A rendszermag lefordítása
 
       
-	Change to the /usr/src directory:
+	Lépjünk be a /usr/src
+	  könyvtárba:
 
 	&prompt.root; cd /usr/src
       
 
       
-	Compile the kernel:
+	Fordítsuk le a rendszermagot:
 
-	&prompt.root; make buildkernel KERNCONF=MYKERNEL
+	&prompt.root; make buildkernel KERNCONF=SAJAT
       
 
       
-	Install the new kernel:
+	Telepítsük az új rendszermagot:
 
-	&prompt.root; make installkernel KERNCONF=MYKERNEL
+	&prompt.root; make installkernel KERNCONF=SAJAT
       
     
 
     
-      It is required to have full &os; source tree to build the
-	kernel.
+      A &os; teljes forrásfájára
+	szükség van a rendszermag
+	lefordításához.
     
 
     
-      By default, when you build a custom kernel,
-	all kernel modules will be rebuilt as well.
-	If you want to update a kernel faster or to build only custom
-	modules, you should edit /etc/make.conf
-	before starting to build the kernel:
+      Amikor egy saját rendszermagot
+	alapértelmezés szerint fordítunk, vele
+	együtt az összes modul is
+	lefordításra kerül.  Ha idõt
+	szeretnénk megtakarítani a rendszermag
+	frissítése során vagy csak a saját
+	moduljainkat akarjuk lefordítani, érdemes
+	átírnunk az /etc/make.conf
+	állományt a rendszermag
+	fordításának megkezdése
+	elõtt:
 
       MODULES_OVERRIDE = linux acpi sound/sound sound/driver/ds1 ntfs
 
-      This variable sets up a list of modules to build instead
-	of all of them.
+      Ez a változó megadja a ténylegesen
+	lefordítandó modulok listáját.
 
       WITHOUT_MODULES = linux acpi sound/sound sound/driver/ds1 ntfs
 
-      This variable sets up a list of modules to exclude
-	from the build process.  For other variables which you may find useful
-	in the process of building kernel, refer to &man.make.conf.5;
-	manual page.
+      Ez a változó a
+	fordításból kihagyandó modulokat
+	sorolja fel.  A rendszermag fordításának
+	folyamatában egyéb hasznosnak tekinthetõ
+	változókról a &man.make.conf.5; man
+	oldalán olvashatunk.
     
 
     
       /boot/kernel.old
-     
+    
 
-    The new kernel will be copied to the /boot/kernel directory as
-      /boot/kernel/kernel and the old kernel will be moved to
-      /boot/kernel.old/kernel.  Now, shutdown the system and
-      reboot to use your new kernel.  If something goes wrong, there are
-      some troubleshooting
-      instructions at the end of this chapter that you may find useful.  Be sure to read the
-      section which explains how to recover in case your new kernel does not boot.
+    Ezután az új rendszermag a /boot/kernel könyvtárba
+      kerül /boot/kernel/kernel néven
+      és a korábbi rendszermag pedig a
+      /boot/kernel.old/kernel
+      állomány lesz.  Most állítsuk le a
+      rendszert és indítsuk újra az új
+      rendszermag aktiválásához.  Ha közben
+      valamilyen hiba történt volna, nézzük meg
+      a fejezet végén található, hibakeresésre
+      vonatkozó utasításokat.  Mindenképpen
+      olvassuk el azt a részt, amely leírja, hogyan
+      állítsuk helyre a rendszerünket abban az
+      esetben, ha az új rendszermaggal nem indul.
 
     
-      Other files relating to the boot process, such as the boot
-	&man.loader.8; and configuration are stored in
-	/boot.  Third party or custom modules
-	can be placed in /boot/kernel, although
-	users should be aware that keeping modules in sync with the
-	compiled kernel is very important.  Modules not intended
-	to run with the compiled kernel may result in instability
-	or incorrectness.
+      A rendszerindítási folyamathoz tartozó
+	további állományok, mint mondjuk a
+	rendszerbetöltõ (&man.loader.8;) és annak
+	konfigurációs állománya, a
+	/boot könyvtárban
+	találhatóak.  A külsõs és
+	saját modulok a /boot/kernel a
+	könyvtárba kerülhetnek, azonban a
+	felhasználóknak nagyon ügyelniük kell
+	rá, hogy az itt található modulok
+	szinkronban legyenek a fordított rendszermaggal.
+	Ellenkezõ esetben a rendszerben
+	megbízhatlanságot, hibákat
+	észlelhetünk.
     
   
 
@@ -337,453 +463,611 @@
 	
 	  Joel
 	  Dahl
-	  Updated for &os; 6.X by 
+	  A &os; 6.X verziójára alkalmazta:
+	    
 	
       
     
-    The Configuration File
+    A konfigurációs állomány
     
-      kernel
+      rendszermag
       NOTES
     
     NOTES
     
-      kernel
-      configuration file
+      rendszermag
+      konfigurációs
+	állomány
     
 
-    The general format of a configuration file is quite simple.
-      Each line contains a keyword and one or more arguments.  For
-      simplicity, most lines only contain one argument.  Anything
-      following a # is considered a comment and
-      ignored.  The following sections describe each keyword, in
-      the order they are listed in GENERIC.
-       For an exhaustive list of architecture
-      dependent options and devices, see the NOTES
-      file in the same directory as the GENERIC file. For
-      architecture independent options, see
-      /usr/src/sys/conf/NOTES.
+    A konfigurációs állomány
+      általános formátuma igen egyszerû.  Minden
+      sor tartalmaz egy kulcsszót és egy vagy több
+      paramétert.  A további
+      egyszerûsítés kedvéért a
+      legtöbb sor csak egyetlen paramétert tartalmaz.
+      Bármi, ami egy # (kettõskereszt)
+      jelet követ, megjegyzésnek minõsül és
+      nem számít konfigurációs elemnek.  A
+      most következõ részek bemutatják az egyes
+      kulcsszavakat abban a sorrendben, ahogy azokat a
+      GENERIC állományban is
+      megtalálhatjuk.  Az
+      architektúrafüggõ opciók és
+      eszközök teljes listáját a
+      GENERIC állománnyal egy
+      könyvtárban levõ NOTES
+      állományban találhatjuk meg.  Az
+      architektúrától független
+      opciókat a /usr/src/sys/conf/NOTES
+      állományban találjuk.
 
     
-      To build a file which contains all available options,
-	as normally done for testing purposes, run the following
-	command as root:
+      Ha olyan állományt akarunk
+	készíteni, amely tartalmazza az összes
+	lehetséges opciót, mondjuk teszteléshez,
+	futtassuk le root
+	felhasználóként az alábbi
+	parancsot:
 
       &prompt.root; cd /usr/src/sys/i386/conf && make LINT
     
 
     
-      kernel
-      configuration file
+      rendszermag
+      konfigurációs
+	állomány
     
 
-    The following is an example of the GENERIC kernel
-      configuration file with various additional comments where needed for
-      clarity.  This example should match your copy in
+    Itt a GENERIC
+      rendszermag-konfigurációs állomány
+      ismertetése következik, az
+      érthetõség kedvéért
+      helyenként megjegyzésekkel kibõvítve.
+      Az bemutatott állománynak majdnem pontosan meg kell
+      egyeznie a rendszerünkben található
       /usr/src/sys/i386/conf/GENERIC
-      fairly closely.
+      állománnyal.
 
     
-      kernel options
+      a rendszermag beállításai
       machine
     
 
-    machine		i386
+    machine      i386
 
-    This is the machine architecture.  It must be either
+    A számítógépünk
+      architektúráját adja meg.  A
+      következõk valamelyikének kell lennie:
       alpha, amd64,
       i386, ia64,
-      pc98, powerpc, or
+      pc98, powerpc, vagy
       sparc64.
 
     
-      kernel options
+      a rendszermag beállításai
       cpu
     
     cpu          I486_CPU
 cpu          I586_CPU
 cpu          I686_CPU
 
-    The above option specifies the type of CPU you have in your
-      system.  You may have multiple instances of the CPU line (if, for
-      example, you are not sure whether you should use
-      I586_CPU or I686_CPU),
-      but for a custom kernel it is best to specify only the CPU
-      you have.  If you are unsure of your CPU type, you can check the
-      /var/run/dmesg.boot file to view your boot
-      messages.
+    A fenti beállítás
+      segítségével megadhatjuk, milyen
+      típusú processzor található a
+      számítógépünkben.  Több
+      ilyen sorunk is lehet (ha például nem lennénk
+      biztosak benne, hogy a I586_CPU vagy
+      I686_CPU értéket kellene
+      megadnunk), de a saját rendszermagunk
+      összeállításához érdemes
+      csak egyet meghagynunk.  Ha nem ismerjük pontosan a
+      processzorunk típusát, vessünk egy
+      pillantást a /var/run/dmesg.boot
+      állományra és keressük ki
+      belõle.
 
     
-      kernel options
+      a rendszermag beállításai
       ident
     
 
     ident          GENERIC
 
-    This is the identification of the kernel.  You should change
-      this to whatever you named your kernel,
-      i.e. MYKERNEL if you have followed the
-      instructions of the previous examples.  The value you put in the
-      ident string will print when you boot up the
-      kernel, so it is useful to give the new kernel a different name if you
-      want to keep it separate from your usual kernel (e.g., you want to
-      build an experimental kernel).
+    Ez a rendszermag azonosítója.
+      Változtassuk meg rendszermagunk nevére, legyen pl.
+      SAJAT, ha a korábbi
+      utasításokat követtük.  Az
+      ident után írt sztring fog
+      megjelenni a rendszermag neve mellett a rendszer
+      indítása során, ezért fontos, hogy az
+      új rendszermagunknak más nevet adjunk, ha meg
+      akarjuk különböztetni az általában
+      használttól (pl.  egy
+      próbálgatásra szánt rendszermagot
+      akarunk készíteni).
 
-    #To statically compile in device wiring instead of /boot/device.hints
-#hints          "GENERIC.hints"         # Default places to look for devices.
+    # ha a /boot/device.hints használata helyett statikusan bele akarjuk fordítani
+#hints          "GENERIC.hints"         # itt szerepelnek az eszközök útmutatásai
 
-    The &man.device.hints.5; is
-      used to configure options of the device drivers.  The default
-      location that &man.loader.8; will check at boot time is
-      /boot/device.hints.  Using the
-      hints option you can compile these hints
-      statically into your kernel.  Then there is no need to create a
-      device.hints file in
-      /boot.
+    A &man.device.hints.5; használható az
+      eszközmeghajtók
+      beállítására.  A &man.loader.8; a
+      rendszer indítása során
+      alapértelmezés szerint a
+      /boot/device.hints állományt
+      olvassa be erre a célra.  A hints
+      beállítás használatával ezeket
+      az ún.  útmutatásokat statikusan bele tudjuk
+      építeni a rendszermagba.  Ebben az esetben nincs
+      szükségünk külön
+      device.hints állomány
+      létrehozására a /boot
+      könyvtárban.
 
-    
+    makeoptions     DEBUG=-g          # a nyomkövetéshez szükséges gdb(1) szimbólumok beépítése
 
-    makeoptions     DEBUG=-g          # Build kernel with gdb(1) debug symbols
+    A &os; normális fordításának
+      folyamata során a rendszermagot a 
+      használatával készítjük el,
+      aminek köszönhetõen hibakeresési
+      információkat tudunk átadni a
+      &man.gcc.1;-nek.
 
-    The normal build process of &os; includes
-      debugging information when building the kernel with the
-      the  option, which enables debugging
-      information when passed to &man.gcc.1;.
+    options          SCHED_4BSD         # 4BSD ütemezõ
 
-    options          SCHED_4BSD         # 4BSD scheduler
+    A &os; hagyományos és alapértelmezett
+      rendszerütemezõje.  Ne bántsuk!
 
-    The traditional and default system scheduler for &os;.  Keep this.
+    options          PREEMPTION         # a rendszerszálak megszakíthatóságának engedélyezése
 
-    options          PREEMPTION         # Enable kernel thread preemption
+    Ha engedélyezzük, a rendszermagban futó
+      szálakat meg tujdák szakítani más,
+      magasabb prioritású szálak.  Ez segít
+      növelni a rendszer válaszadási
+      sebességét és csökkenti a
+      megszakításokat kezelõ szálak
+      várakozását.
 
-    Allows threads that are in the kernel to be preempted
-      by higher priority threads.  It helps with interactivity and
-      allows interrupt threads to run sooner rather than waiting.
+    options          INET              # hálózatkezelés
 
-    options          INET              # InterNETworking
+    A hálózatkezelés
+      támogatása.  Ne töröljük ki, még
+      akkor sem, ha nem tervezzük hálózatra kapcsolni a
+      rendszert.  Sok programnak szüksége van
+      legalább a hurkolt hálózat
+      támogatására (vagyis a
+      számítógépünkön belüli
+      hálózati kapcsolatokra), ezért ez
+      feltétlenül kötelezõ!
 
-    Networking support.  Leave this in, even if you do not plan to
-      be connected to a network.  Most programs require at least loopback
-      networking (i.e., making network connections within your PC), so
-      this is essentially mandatory.
+    options          INET6             # IPv6 kommunikációs prokotollok
 
-    options          INET6             # IPv6 communications protocols
+    Engedélyezi az IPv6 kommunikációs
+      protokollok használatát.
 
-    This enables the IPv6 communication protocols.
+    options          FFS               # Berkeley gyors állományrendszer
 
-    options          FFS               # Berkeley Fast Filesystem
+    Ez a legalapvetõbb merevlemezes
+      állományrendszer.  Hagyjuk meg, ha merevlemezrõl
+      akarjuk indítani a rendszerünket.
 
-    This is the basic hard drive file system.  Leave it in if you
-      boot from the hard disk.
+    options          SOFTUPDATES       # az FFS Soft Updates támogatása
 
-    options          SOFTUPDATES       # Enable FFS Soft Updates support
+    Ez a beállítása engedélyezi a
+      rendszermagban a Soft Updates használatát, amely
+      segít felgyorsítani a lemez írási
+      sebességét.  Habár amikor a rendszermag ezt a
+      funkcionalitást ismeri, még külön
+      engedélyezni kell egyes lemezeken.  Nézzük meg
+      a &man.mount.8; kimenetét hogy lássuk, a
+      rendszerünkben levõ lemezek közül melyiken van
+      ténylegesen engedélyezve a Soft Updates
+      használata.  Ha nem látjuk benne sehol sem a
+      soft-updates opciót, akkor azt
+      (meglevõ állományrendszerek esetén) a
+      &man.tunefs.8; vagy (új állományrendszerek
+      esetén) a &man.newfs.8; parancsokkal tudjuk
+      bekapcsolni.
 
-    This option enables Soft Updates in the kernel, this will
-      help speed up write access on the disks.  Even when this
-      functionality is provided by the kernel, it must be turned on
-      for specific disks.  Review the output from &man.mount.8; to see
-      if Soft Updates is enabled for your system disks.  If you do not
-      see the soft-updates option then you will
-      need to activate it using the &man.tunefs.8; (for existing
-      file systems) or &man.newfs.8; (for new file systems)
-      commands.
+    options          UFS_ACL           # a hozzáférés-vezérlési listák (ACL) támogatása
 
-    options          UFS_ACL           # Support for access control lists
+    Ezzel a beállítással
+      engedélyezhetjük a rendszermagban a
+      hozzáférés-vezérlési
+      listák támogatását.  Ez a
+      kiterjesztett tulajdonságok és az
+      UFS2 használatára
+      támaszkodik.  Ezt a lehetõséget
+      részleteiben a ban
+      tárgyaljuk.  Az ACL
+      alapértelmezés szerint támogatott, és
+      korábban már használtuk, akkor
+      semmiképpen se kapcsoljuk ki, mert ezzel az eddig
+      létrehozott
+      hozzáférés-vezérlési
+      listáink érvénytelenné, az
+      állományaink pedig védtelenné
+      válnak.
 
-    This option enables kernel support
-      for access control lists.  This relies on the use of extended
-      attributes and UFS2, and the feature is described
-      in detail in .  ACLs are
-      enabled by default and should not be
-      disabled in the kernel if they have been used previously on a file
-      system, as this will remove the access control lists, changing the
-      way files are protected in unpredictable ways.
+    options          UFS_DIRHASH       # nagyobb könyvtárak esetén gyorsulást hoz
 

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Tue Oct 23 20:08:49 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 54F0316A46E; Tue, 23 Oct 2007 20:08: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 E5BEC16A41A
	for ; Tue, 23 Oct 2007 20:08:48 +0000 (UTC)
	(envelope-from raj@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E5C9613C4C3
	for ; Tue, 23 Oct 2007 20:08:48 +0000 (UTC)
	(envelope-from raj@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 l9NK8lR9002365
	for ; Tue, 23 Oct 2007 20:08:47 GMT
	(envelope-from raj@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9NK8l8f002362
	for perforce@freebsd.org; Tue, 23 Oct 2007 20:08:47 GMT
	(envelope-from raj@freebsd.org)
Date: Tue, 23 Oct 2007 20:08:47 GMT
Message-Id: <200710232008.l9NK8l8f002362@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	raj@freebsd.org using -f
From: Rafal Jaworowski 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 127972 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, 23 Oct 2007 20:08:49 -0000

http://perforce.freebsd.org/chv.cgi?CH=127972

Change 127972 by raj@raj_mimi on 2007/10/23 20:07:56

	Adapt loader(8) and surroundings to the new U-Boot API
	
	This update requires that loader(8) is run on top of U-Boot that is
	fresh enough to include this new API; up-to-date support for FreeBSD
	can always be found at:
	http://www.denx.de/cgi-bin/gitweb.cgi?p=u-boot/u-boot-freebsd.git

Affected files ...

.. //depot/projects/e500/lib/libstand/Makefile#3 edit
.. //depot/projects/e500/sys/boot/ficl/Makefile#2 edit
.. //depot/projects/e500/sys/boot/powerpc/uboot/Makefile#2 edit
.. //depot/projects/e500/sys/boot/powerpc/uboot/conf.c#2 edit
.. //depot/projects/e500/sys/boot/powerpc/uboot/defs.sh#2 delete
.. //depot/projects/e500/sys/boot/powerpc/uboot/gnu/NOTES#2 delete
.. //depot/projects/e500/sys/boot/powerpc/uboot/gnu/global_data.h#2 delete
.. //depot/projects/e500/sys/boot/powerpc/uboot/gnu/u-boot.h#2 delete
.. //depot/projects/e500/sys/boot/powerpc/uboot/metadata.c#2 edit
.. //depot/projects/e500/sys/boot/powerpc/uboot/start.S#2 edit
.. //depot/projects/e500/sys/boot/powerpc/uboot/version#2 edit
.. //depot/projects/e500/sys/boot/uboot/common/calls.sh#2 delete
.. //depot/projects/e500/sys/boot/uboot/common/main.c#3 edit
.. //depot/projects/e500/sys/boot/uboot/gnu/NOTES#2 delete
.. //depot/projects/e500/sys/boot/uboot/gnu/_exports.h#2 delete
.. //depot/projects/e500/sys/boot/uboot/lib/Makefile#3 edit
.. //depot/projects/e500/sys/boot/uboot/lib/api_public.h#1 add
.. //depot/projects/e500/sys/boot/uboot/lib/console.c#2 edit
.. //depot/projects/e500/sys/boot/uboot/lib/devicename.c#2 edit
.. //depot/projects/e500/sys/boot/uboot/lib/glue.c#1 add
.. //depot/projects/e500/sys/boot/uboot/lib/libuboot.h#2 edit
.. //depot/projects/e500/sys/boot/uboot/lib/net.c#2 edit
.. //depot/projects/e500/sys/boot/uboot/lib/reboot.c#2 edit
.. //depot/projects/e500/sys/boot/uboot/lib/time.c#2 edit
.. //depot/projects/e500/sys/powerpc/include/bootinfo.h#3 edit

Differences ...

==== //depot/projects/e500/lib/libstand/Makefile#3 (text+ko) ====

@@ -23,7 +23,7 @@
 CFLAGS+=	-mno-sse3
 .endif
 .if ${MACHINE_ARCH} == "powerpc"
-CFLAGS+=	-msoft-float -D_STANDALONE
+CFLAGS+=	-ffixed-r14 -ffixed-r29 -msoft-float -D_STANDALONE
 .endif
 .if ${MACHINE_ARCH} == "amd64"
 CFLAGS+=	-m32 -I.

==== //depot/projects/e500/sys/boot/ficl/Makefile#2 (text+ko) ====

@@ -15,7 +15,13 @@
 CFLAGS+=	-mno-sse3
 .endif
 .if ${MACHINE_ARCH} == "powerpc"
-CFLAGS+=	-msoft-float
+#
+# Important notice: registers dedicated for U-Boot must NOT be used by the
+# loader code, as we are going to jump between loader(8) and U-Boot code back
+# and forth safely. For PowerPC these are r14 and r29, but always make
+# sure in the U-Boot cpu/{CPU}/config.mk, e.g. cpu/mpc85xx/config.mk
+#
+CFLAGS+=	-ffixed-r14 -ffixed-r29 -msoft-float
 .endif
 .if ${MACHINE} == "pc98"
 CFLAGS+=	-DPC98

==== //depot/projects/e500/sys/boot/powerpc/uboot/Makefile#2 (text+ko) ====

@@ -64,10 +64,10 @@
 #
 # Important notice: registers dedicated for U-Boot must NOT be used by the
 # loader code, as we are going to jump between loader(8) and U-Boot code back
-# and forth safely. For PowerPC these are r2, r14 and r29, but always make
+# and forth safely. For PowerPC these are r14 and r29, but always make
 # sure in the U-Boot cpu/{CPU}/config.mk, e.g. cpu/mpc85xx/config.mk
 #
-CFLAGS+=	-ffreestanding -ffixed-r2 -ffixed-r14 -ffixed-r29
+CFLAGS+=	-ffreestanding -ffixed-r14 -ffixed-r29
 
 LDFLAGS=	-nostdlib -static -T ${.CURDIR}/ldscript.powerpc
 

==== //depot/projects/e500/sys/boot/powerpc/uboot/conf.c#2 (text+ko) ====

@@ -1,5 +1,4 @@
 /*-
- * Copyright (c) 2007 Semihalf, Rafal Jaworowski 
  * Copyright (c) 1999 Michael Smith 
  * All rights reserved.
  *

==== //depot/projects/e500/sys/boot/powerpc/uboot/metadata.c#2 (text+ko) ====

@@ -39,10 +39,11 @@
 #include 
 #include 
 
+#include "api_public.h"
 #include "bootstrap.h"
-#include "u-boot_defs.h"
 
-extern gd_t	*uboot_global_data;
+/* XXX should this go into header? */
+struct sys_info *ub_get_sys_info(void);
 
 /*
  * Return a 'boothowto' value corresponding to the kernel arguments in
@@ -270,7 +271,7 @@
     vm_offset_t			envp;
     vm_offset_t			size;
     vm_offset_t			vaddr;
-    bd_t			*bd = uboot_global_data->bd;
+    struct sys_info		*si;
     char			*rootdevname;
     int				howto;
     int				i;
@@ -309,18 +310,31 @@
     addr = roundup(addr, PAGE_SIZE);
 
     /* Fill information structure */
+    if (!(si = ub_get_sys_info()))
+	panic("can't retrieve U-Boot sysinfo");
+
+    /* Extract mem info */
+    for (i = 0; i < si->mr_no; i++)
+        if (si->mr[i].flags == MR_ATTR_DRAM) {
+	    bootinfo.mem_base = si->mr[i].start;
+	    bootinfo.mem_size = si->mr[i].size;
+	    break;
+	}
+
+    if (i == si->mr_no)
+        panic("can't retrieve memory info");
+
     bootinfo.version = 1;
-    bootinfo.mem_base = bd->bi_memstart;
-    bootinfo.mem_size = bd->bi_memsize;
-    bootinfo.bar_base = bd->BI_BAR_BASE;
-    bootinfo.cpu_clk = uboot_global_data->cpu_clk;
-    bootinfo.bus_clk = uboot_global_data->bus_clk;
-    bootinfo.baudrate = uboot_global_data->baudrate;
+    bootinfo.bar_base = si->bar;
+    bootinfo.cpu_clk = si->clk_cpu;
+    bootinfo.bus_clk = si->clk_bus;
+
+#if 0
     memcpy(bootinfo.eth0_addr, bd->bi_enetaddr, sizeof(bootinfo.eth0_addr));
 #ifdef CONFIG_HAS_ETH1
     memcpy(bootinfo.eth1_addr, bd->bi_enet1addr, sizeof(bootinfo.eth1_addr));
 #endif
-    bootinfo.eth_speed = bd->bi_ethspeed;
+#endif
 
     kernend = 0;
     kfp = file_findfile(NULL, "elf32 kernel");
@@ -340,7 +354,7 @@
     md = file_findmetadata(kfp, MODINFOMD_KERNEND);
     bcopy(&kernend, md->md_data, sizeof kernend);
 
-    /* Convert the address to the final VA */
+    /* Convert addresses to the final VA */
     *modulep -= __elfN(relocation_offset);
 
     for (i = 0; i < sizeof mdt / sizeof mdt[0]; i++) {

==== //depot/projects/e500/sys/boot/powerpc/uboot/start.S#2 (text+ko) ====

@@ -25,7 +25,6 @@
  */
 
 #include 
-#include "u-boot_calls.h"
 
 #define STACK_SIZE 8192
 
@@ -39,43 +38,17 @@
 	lis	%r1, stack@ha
 	addi	%r1, %r1, stack@l
 	addi	%r1, %r1, (STACK_SIZE - 32)
-
-	/* The global_data ptr is passed in R29 - save it */
-	lis	%r4, uboot_global_data@ha
-	addi	%r4, %r4, uboot_global_data@l
-	stw	%r29, 0(%r4)
-
 	b	main
 
-
-#define UB_CALL(FUNC)				\
-	ENTRY(ub_ ## FUNC)			\
-	lis	%r11, uboot_jump_table@ha;	\
-	addi	%r11, %r11, uboot_jump_table@l;	\
-	lwz	%r11, 0(%r11);			\
-						\
-	lwz	%r11, 4*XF_ ## FUNC(%r11);	\
-	mtctr	%r11;				\
-	bctr
-
 /*
- * U-Boot jump table entries - refer to /include/exports.h
- *
- * The calls can then be used in the loader code with ub_ prefix like
- * ub_getc() etc.
+ * syscall()
  */
-UB_CALL(get_version);
-UB_CALL(getc);
-UB_CALL(tstc);
-UB_CALL(putc);
-UB_CALL(udelay);
-UB_CALL(get_timer);
-UB_CALL(do_reset);
-UB_CALL(eth_init);
-UB_CALL(eth_halt);
-UB_CALL(eth_send);
-UB_CALL(eth_receive);
-
+ENTRY(syscall)
+	lis	%r11, syscall_ptr@ha
+	addi	%r11, %r11, syscall_ptr@l
+	lwz	%r11, 0(%r11)
+	mtctr	%r11
+	bctr
 
 /*
  * Data section
@@ -85,8 +58,5 @@
 stack:
 	.space	STACK_SIZE
 
-GLOBAL(uboot_global_data)
-        .long   0
-
-GLOBAL(uboot_jump_table)
+GLOBAL(syscall_ptr)
 	.long	0

==== //depot/projects/e500/sys/boot/powerpc/uboot/version#2 (text+ko) ====

@@ -3,6 +3,7 @@
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important.  Make sure the current version number is on line 6.
 
+0.6:	Integrated with the new U-Boot API
 0.5:	Full network functionality.
 0.2:	Initial U-Boot/PowerPC version derived from the existing
 	OpenFirmware-based.

==== //depot/projects/e500/sys/boot/uboot/common/main.c#3 (text+ko) ====

@@ -33,12 +33,13 @@
 #include "bootstrap.h"
 
 #include "libuboot.h"
-#include "u-boot_defs.h"
+#include "api_public.h"
 
-#define XF_VERSION	4		/* required U-Boot API version */
+#define DEBUG
 
 struct uboot_devdesc	currdev;
 struct arch_switch	archsw;		/* MI/MD interface boundary */
+int			devs_no;
 
 extern char end[];
 extern char bootprog_name[];
@@ -46,9 +47,6 @@
 extern char bootprog_date[];
 extern char bootprog_maker[];
 
-extern gd_t *uboot_global_data;
-extern void **uboot_jump_table;
-
 static char bootargs[128];
 
 extern unsigned char _etext[];
@@ -58,24 +56,59 @@
 extern unsigned char __sbss_end[];
 extern unsigned char _end[];
 
+extern void *		syscall_ptr;
+
+struct sys_info *	ub_get_sys_info(void);
+
+
+void dump_si(struct sys_info *si)
+{
+#ifdef DEBUG
+	printf("sys info:\n");
+	printf("  clkbus\t= 0x%08x\n", si->clk_bus);
+	printf("  clkcpu\t= 0x%08x\n", si->clk_cpu);
+	printf("  bar\t\t= 0x%08x\n", si->bar);
+#endif
+}
+
+static void dump_sig(struct api_signature *sig)
+{
+#ifdef DEBUG
+	printf("signature:\n");
+	printf("  version\t= %d\n", sig->version);
+	printf("  checksum\t= 0x%08x\n", sig->checksum);
+	printf("  sc entry\t= 0x%08x\n", sig->syscall);
+#endif
+}
 static void
 dump_addr_info(void)
 {
-	printf("\nimage addresses:\n");
+#ifdef DEBUG
+	printf("\naddresses info:\n");
 	printf(" _etext (sdata) = 0x%08x\n", (u_int32_t)_etext);
 	printf(" _edata         = 0x%08x\n", (u_int32_t)_edata);
 	printf(" __sbss_start   = 0x%08x\n", (u_int32_t)__sbss_start);
 	printf(" __sbss_end     = 0x%08x\n", (u_int32_t)__sbss_end);
 	printf(" __sbss_start   = 0x%08x\n", (u_int32_t)__bss_start);
 	printf(" _end           = 0x%08x\n", (u_int32_t)_end);
-	printf(" global_data    = 0x%08x\n", (u_int32_t)uboot_global_data);
-	printf(" jumptable      = 0x%08x\n", (u_int32_t)uboot_jump_table);
+	printf(" syscall entry  = 0x%08x\n", (u_int32_t)syscall_ptr);
+#endif
 }
 
-uint64_t
-memsize(void)
+static uint64_t
+memsize(int flags)
 {
-	return (uboot_global_data->ram_size);
+	int i;
+	struct sys_info * si;
+
+	if ((si = ub_get_sys_info()) == NULL)
+		return 0;
+	
+	for (i = 0; i < si->mr_no; i++)
+		if (si->mr[i].flags == flags && si->mr[i].size)
+			return (si->mr[i].size);
+
+	return 0;
 }
 
 int
@@ -86,8 +119,17 @@
 	int		bargc;
 	char		**bargv;
 
-	/* Extract JT pointer */
-	uboot_jump_table = uboot_global_data->jt;
+	struct api_signature *sig = NULL;
+
+	if (!api_search_sig(&sig))
+		return -1;
+
+	syscall_ptr = sig->syscall;
+	if (syscall_ptr == NULL)
+		return -2;
+
+	if (sig->version > API_SIG_VERSION)
+		return -3;
 
         /* Clear BSS sections */
 	bzero(__sbss_start, __sbss_end - __sbss_start);
@@ -98,22 +140,26 @@
          */
 	cons_probe();
 
-	/* Check if we're compatible */
-	if (ub_get_version() < XF_VERSION)
-		panic("U-Boot API version too low: %d, expected: %d",
-			ub_get_version(), XF_VERSION);
+	printf("Compatible API signature found @%x\n", sig);
 
-	printf("Found compatible API, ver. %d\n", ub_get_version());
-#if 0
+	dump_sig(sig);
 	dump_addr_info();
-#endif
+
 	/*
 	 * Initialise the heap as early as possible.  Once this is done,
 	 * alloc() is usable. The stack is buried inside us, so this is
 	 * safe.
 	 */
-	setheap((void *)end, (void *)(end + 512*1024));
+	setheap((void *)end, (void *)(end + 512 * 1024));
+
+	/*
+	 * Enumerate U-Boot devices
+	 */
+	if ((devs_no = ub_dev_enum()) == 0)
+		panic("no devices found");
+	printf("Number of U-Boot devices found %d\n", devs_no);
 
+	/* XXX all our dv_init()s currently don't do anything... */
 	/*
 	 * March through the device switch probing for things.
 	 */
@@ -124,20 +170,21 @@
 	printf("\n");
 	printf("%s, Revision %s\n", bootprog_name, bootprog_rev);
 	printf("(%s, %s)\n", bootprog_maker, bootprog_date);
-	printf("Memory: %lldMB\n", memsize() / 1024 / 1024);
+	printf("Memory: %lldMB\n", memsize(MR_ATTR_DRAM) / 1024 / 1024);
+	printf("FLASH:  %lldMB\n", memsize(MR_ATTR_FLASH) / 1024 / 1024);
+//	printf("SRAM:   %lldMB\n", memsize(MR_ATTR_SRAM) / 1024 / 1024);
 
 	/* XXX only support netbooting for now */
-	for (i = 0; devsw[i] != NULL; i++) {
-		if (strncmp(devsw[i]->dv_name, "net",
-				strlen(devsw[i]->dv_name)) == 0)
+	for (i = 0; devsw[i] != NULL; i++)
+		if (strncmp(devsw[i]->dv_name, "net", strlen(devsw[i]->dv_name)) == 0)
 			break;
-	}
+
 	if (devsw[i] == NULL)
 		panic("no network devices?!");
 
 	currdev.d_dev = devsw[i];
 	currdev.d_type = currdev.d_dev->dv_type;
-	currdev.d_kind.netif.unit = 0;
+	currdev.d_unit = 0;
 
 	env_setenv("currdev", EV_VOLATILE, uboot_fmtdev(&currdev),
 			uboot_setcurrdev, env_nounset);
@@ -174,8 +221,8 @@
 command_reboot(int argc, char *argv[])
 {
 	printf("Resetting...\n");
-	ub_eth_halt();
-	ub_do_reset();
+	ub_reset();
 
-	panic("Reset failed!");
+	printf("Reset failed!\n");
+	while(1);
 }

==== //depot/projects/e500/sys/boot/uboot/lib/Makefile#3 (text+ko) ====

@@ -1,11 +1,9 @@
-# $FreeBSD: src/sys/boot/ofw/libofw/Makefile,v 1.9 2004/10/24 15:32:50 ru Exp $
 
 LIB=		uboot
 INTERNALLIB=
 
 SRCS=	devicename.c elf_freebsd.c console.c copy.c disk.c \
-	module.c net.c reboot.c \
-	time.c
+	module.c net.c reboot.c time.c glue.c
 
 CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand/
 
@@ -13,15 +11,16 @@
 CFLAGS+=	-I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I.
 
 CFLAGS+=	-ffreestanding
+
 .if ${MACHINE_ARCH} == "powerpc"
 #
 # Important notice: registers dedicated for U-Boot must NOT be used by the
 # loader code, as we are going to jump between loader(8) and U-Boot code back
-# and forth safely. For PowerPC these are r2, r14 and r29, but always make
+# and forth safely. For PowerPC these are r14 and r29, but always make
 # sure in the U-Boot cpu/{CPU}/config.mk, e.g. cpu/mpc85xx/config.mk
 #
 # FIXME this should be integrated with the whole system build settings
-CFLAGS+=	-msoft-float -Wa,-me500 -ffixed-r2 -ffixed-r14 -ffixed-r29
+CFLAGS+=	-msoft-float -Wa,-me500 -ffixed-r14 -ffixed-r29
 .endif
 
 .ifdef(BOOT_DISK_DEBUG)
@@ -32,16 +31,8 @@
 machine:
 	ln -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine
 
-defs:
-	sh ${.CURDIR}/../../${MACHINE_ARCH}/uboot/defs.sh \
-	    ${.CURDIR}/../../${MACHINE_ARCH}/uboot > u-boot_defs.h
-
-calls:
-	sh ${.CURDIR}/../common/calls.sh \
-	    ${.CURDIR}/../gnu/_exports.h > u-boot_calls.h
-
-CLEANFILES+=	machine u-boot_defs.h u-boot_calls.h
+CLEANFILES+=	machine
 
 .include 
 
-beforedepend ${OBJS}: machine defs calls
+beforedepend ${OBJS}: machine

==== //depot/projects/e500/sys/boot/uboot/lib/console.c#2 (text+ko) ====

@@ -24,15 +24,16 @@
  * SUCH DAMAGE.
  */
 
+#include 
 #include "bootstrap.h"
 
 int console;
 
 static void uboot_cons_probe(struct console *cp);
 static int uboot_cons_init(int);
-void uboot_cons_putchar(int);
-int uboot_cons_getchar(void);
-int uboot_cons_poll(void);
+static void uboot_cons_putchar(int);
+static int uboot_cons_getchar(void);
+static int uboot_cons_poll(void);
 
 struct console uboot_console = {
 	"uboot",
@@ -57,7 +58,7 @@
 	return 0;
 }
 
-void
+static void
 uboot_cons_putchar(int c)
 {
 	if (c == '\n')
@@ -66,13 +67,13 @@
 	ub_putc(c);
 }
 
-int
+static int
 uboot_cons_getchar()
 {
 	return (ub_getc());
 }
 
-int
+static int
 uboot_cons_poll()
 {
 	return (ub_tstc());

==== //depot/projects/e500/sys/boot/uboot/lib/devicename.c#2 (text+ko) ====

@@ -143,7 +143,7 @@
 	    goto fail;
 	}
 
-	idev->d_kind.disk.unit = unit;
+	idev->d_unit = unit;
 	idev->d_kind.disk.slice = slice;
 	idev->d_kind.disk.partition = partition;
 	if (path != NULL)
@@ -166,7 +166,7 @@
 	}
 
 	if (dv->dv_type == DEVT_NET)
-	    idev->d_kind.netif.unit = unit;
+	    idev->d_unit = unit;
 
 	if (path != NULL)
 	    *path = (*cp == 0) ? cp : cp + 1;
@@ -205,7 +205,7 @@
 
     case DEVT_DISK:
 	cp = buf;
-	cp += sprintf(cp, "%s%d", dev->d_dev->dv_name, dev->d_kind.disk.unit);
+	cp += sprintf(cp, "%s%d", dev->d_dev->dv_name, dev->d_unit);
 	if (dev->d_kind.disk.slice > 0)
 	    cp += sprintf(cp, "s%d", dev->d_kind.disk.slice);
 	if (dev->d_kind.disk.partition >= 0)
@@ -214,7 +214,7 @@
 	break;
 
     case DEVT_NET:
-	sprintf(buf, "%s%d:", dev->d_dev->dv_name, dev->d_kind.netif.unit);
+	sprintf(buf, "%s%d:", dev->d_dev->dv_name, dev->d_unit);
 	break;
     }
     return(buf);

==== //depot/projects/e500/sys/boot/uboot/lib/libuboot.h#2 (text+ko) ====

@@ -34,20 +34,15 @@
 {
     struct devsw	*d_dev;
     int			d_type;
+    int			d_unit;
     union 
     {
 	struct 
 	{
-	    int		unit;
+	    void	*data;
 	    int		slice;
 	    int		partition;
-	    void	*data;
 	} disk;
-
-	struct 
-	{
-	    int		unit;
-	} netif;
     } d_kind;
 };
 

==== //depot/projects/e500/sys/boot/uboot/lib/net.c#2 (text+ko) ====

@@ -42,13 +42,14 @@
 #include 
 #include 
 
+#include "api_public.h"
 #include "libuboot.h"
-#include "u-boot_defs.h"
 
+#define NETIF_DEBUG
+#define NETIF_VERBOSE_DEBUG
 #undef NETIF_DEBUG
 #undef NETIF_VERBOSE_DEBUG
 
-extern gd_t	*uboot_global_data;
 
 static int	net_probe(struct netif *, void *);
 static int	net_match(struct netif *, void *);
@@ -57,6 +58,9 @@
 static int	net_put(struct iodesc *, void *, size_t);
 static void	net_end(struct netif *);
 
+struct device_info * ub_dev_get(int i);
+
+extern int			devs_no;
 extern struct netif_stats	net_stats[];
 
 struct netif_dif net_ifs[] = {
@@ -83,6 +87,7 @@
 	u_int8_t	sc_rxbuf[ETHER_MAX_LEN];
 	u_int8_t	sc_txbuf[ETHER_MAX_LEN + PKTALIGN];
 	u_int8_t	*sc_txbufp;
+	int		sc_handle;	/* device handle for ub_dev_xxx */
 };
 
 static struct uboot_softc uboot_softc;
@@ -102,6 +107,24 @@
 static int
 net_probe(struct netif *nif, void *machdep_hint)
 {
+	int			i;
+	struct device_info	*di;
+
+	for (i = 0; i < devs_no; i++)
+		if (di = ub_dev_get(i))
+			if (di->type == DEV_TYP_NET)
+				break;
+	if (i == devs_no) {
+		printf("net_probe: no network devices found, maybe not\
+			enumerated yet..?\n");
+		return -1;
+	}
+
+#if defined(NETIF_DEBUG)
+	printf("net_probe: network device found: %d\n", i);
+#endif
+	uboot_softc.sc_handle = i;
+	
 	return 0;
 }
 
@@ -131,10 +154,10 @@
 
 	memcpy(sc->sc_txbufp, pkt, len);
 
-	rv = ub_eth_send(sc->sc_txbufp, sendlen);
+	rv = ub_dev_send(sc->sc_handle, sc->sc_txbufp, sendlen);
 
 #if defined(NETIF_DEBUG)
-	printf("net_put: eth_send returned %d\n", rv);
+	printf("net_put: ub_send returned %d\n", rv);
 #endif
 	if (rv == 0)
 		rv = len;
@@ -160,7 +183,7 @@
 
 	t = getsecs();
 	do {
-		length = ub_eth_receive(sc->sc_rxbuf, len);
+		length = ub_dev_recv(sc->sc_handle, sc->sc_rxbuf, len);
 	} while ((length == -1 || length == 0) &&
 		(getsecs() - t < timeout));
 
@@ -185,13 +208,20 @@
 static void
 net_init(struct iodesc *desc, void *machdep_hint)
 {
-	int			i;
-	bd_t			*bd = uboot_global_data->bd;
+	int			i, err;
 	struct netif		*nif = desc->io_netif;
 	struct uboot_softc	*sc;
+	struct device_info	*di;
+	
+	sc = nif->nif_devdata = &uboot_softc;
 
+	if (err = ub_dev_open(sc->sc_handle))
+		panic("%s%d: initialisation failed with error %d\n",
+			nif->nif_driver->netif_bname, nif->nif_unit, err);
+
 	/* Get MAC address */
-	memcpy(desc->myea, bd->bi_enetaddr, 6);
+	di = ub_dev_get(sc->sc_handle);
+	memcpy(desc->myea, di->di_net.hwaddr, 6);
 	if (memcmp (desc->myea, "\0\0\0\0\0\0", 6) == 0) {
 		panic("%s%d: empty ethernet address!",
 			nif->nif_driver->netif_bname, nif->nif_unit);
@@ -202,21 +232,21 @@
 		nif->nif_unit, ether_sprintf(desc->myea));
 #endif
 
-	sc = nif->nif_devdata = &uboot_softc;
-	
 	/* Set correct alignment for TX packets */
 	sc->sc_txbufp = sc->sc_txbuf;
 	if ((unsigned long)sc->sc_txbufp % PKTALIGN)
 		sc->sc_txbufp += PKTALIGN - 
 			(unsigned long)sc->sc_txbufp % PKTALIGN;
+}
 
-	if (!ub_eth_init(bd))
-		panic("%s%d: initialisation failed.\n",
-			nif->nif_driver->netif_bname, nif->nif_unit);
-}
 
 static void
 net_end(struct netif *nif)
 {
-	ub_eth_halt();
+	int			err;
+	struct uboot_softc	*sc = nif->nif_devdata;
+
+	if (err = ub_dev_close(sc->sc_handle))
+		panic("%s%d: net_end failed with error %d\n",
+			nif->nif_driver->netif_bname, nif->nif_unit, err);
 }

==== //depot/projects/e500/sys/boot/uboot/lib/reboot.c#2 (text+ko) ====

@@ -27,5 +27,5 @@
 void
 exit(int code)
 {
-	ub_do_reset();
+	ub_reset();
 }

==== //depot/projects/e500/sys/boot/uboot/lib/time.c#2 (text+ko) ====

@@ -30,12 +30,15 @@
 
 #include 
 
+/*
+ * Return the time in seconds since the beginning of the day.
+ */
 time_t
 time(time_t *tloc)
 {
 	int secs;
 
-	secs = ub_get_timer() / 1000;
+	secs = ub_get_timer(0) / 1000;
 	if (tloc)
 		*tloc = secs;
 
@@ -45,10 +48,7 @@
 int
 getsecs()
 {
-	time_t	n = 0;
-
-	time(&n);
-	return n;
+	return (time(NULL));
 }
 
 /*

==== //depot/projects/e500/sys/powerpc/include/bootinfo.h#3 (text+ko) ====

@@ -37,10 +37,7 @@
 	vm_offset_t	bar_base;
 	u_int32_t	cpu_clk;
 	u_int32_t	bus_clk;
-	u_int32_t	baudrate;
 	u_int8_t	eth0_addr[6];
-	u_int8_t	eth1_addr[6];
-	u_int16_t	eth_speed;
 };
 
 extern struct bootinfo *bootinfo;

From owner-p4-projects@FreeBSD.ORG  Tue Oct 23 21:40:48 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 84C8716A41B; Tue, 23 Oct 2007 21:40:48 +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 A10BF16A419
	for ; Tue, 23 Oct 2007 21:40:47 +0000 (UTC)
	(envelope-from zec@icir.org)
Received: from xaqua.tel.fer.hr (xaqua.tel.fer.hr [161.53.19.25])
	by mx1.freebsd.org (Postfix) with ESMTP id 3701E13C4A5
	for ; Tue, 23 Oct 2007 21:40:47 +0000 (UTC)
	(envelope-from zec@icir.org)
Received: by xaqua.tel.fer.hr (Postfix, from userid 20006)
	id 91A829B653; Tue, 23 Oct 2007 23:14:43 +0200 (CEST)
X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on xaqua.tel.fer.hr
X-Spam-Level: 
X-Spam-Status: No, score=-4.3 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 
	autolearn=ham version=3.1.7
Received: from [192.168.200.100] (zec2.tel.fer.hr [161.53.19.79])
	by xaqua.tel.fer.hr (Postfix) with ESMTP id CAD9C9B648;
	Tue, 23 Oct 2007 23:14:42 +0200 (CEST)
From: Marko Zec 
To: Julian Elischer 
Date: Tue, 23 Oct 2007 23:14:37 +0200
User-Agent: KMail/1.9.7
References: <200710230018.l9N0IO8l020652@repoman.freebsd.org>
	<471D4514.5050109@elischer.org>
In-Reply-To: <471D4514.5050109@elischer.org>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200710232314.38149.zec@icir.org>
Cc: Perforce Change Reviews , Marko Zec 
Subject: Re: PERFORCE change 127942 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, 23 Oct 2007 21:40:49 -0000

On Tuesday 23 October 2007 02:49:24 Julian Elischer wrote:
> question:
>
> can processes in two vimages communicate if they both have access
> to the same named pipe/fifo in the filesystem?

Yes, provided that they open the fifo while they would be both attached 
to the same vnet.  Once the sockets would become open the processes 
could reassociate to arbitrary vimages, while the sockets would remain 
bound to their original vnets for their entire lifetime duration.

As an alternative, we could / should introduce an extended socket() 
syscall where an additional argument would explicitly specify to which 
vimage/vnet the new socket should belong.

Marko


From owner-p4-projects@FreeBSD.ORG  Tue Oct 23 21:53:43 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5E42B16A421; Tue, 23 Oct 2007 21:53: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 14A7316A41A
	for ; Tue, 23 Oct 2007 21:53:43 +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 0E53313C49D
	for ; Tue, 23 Oct 2007 21:53:43 +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 l9NLrg57020274
	for ; Tue, 23 Oct 2007 21:53:42 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9NLreGK020271
	for perforce@freebsd.org; Tue, 23 Oct 2007 21:53:40 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 23 Oct 2007 21:53:40 GMT
Message-Id: <200710232153.l9NLreGK020271@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 127976 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, 23 Oct 2007 21:53:43 -0000

http://perforce.freebsd.org/chv.cgi?CH=127976

Change 127976 by jb@jb_freebsd1 on 2007/10/23 21:52:57

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#11 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#18 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/Makefile#8 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/basics/chapter.sgml#11 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/bibliography/chapter.sgml#6 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/config/chapter.sgml#12 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/disks/chapter.sgml#11 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml#11 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/install/chapter.sgml#15 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/jails/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml#10 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/multimedia/chapter.sgml#8 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/security/chapter.sgml#14 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/virtualization/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/share/sgml/trademarks.ent#6 integrate
.. //depot/projects/dtrace/src/ObsoleteFiles.inc#24 integrate
.. //depot/projects/dtrace/src/etc/rc.d/named#5 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/groff/tmac/mdoc.local#11 integrate
.. //depot/projects/dtrace/src/lib/libc/locale/iswctype.c#6 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/kldstat.2#6 integrate
.. //depot/projects/dtrace/src/lib/libelf/elf_flagdata.3#6 integrate
.. //depot/projects/dtrace/src/lib/libelf/elf_getscn.3#6 integrate
.. //depot/projects/dtrace/src/lib/libelf/elf_update.3#9 integrate
.. //depot/projects/dtrace/src/lib/libelf/gelf_newehdr.3#11 integrate
.. //depot/projects/dtrace/src/lib/libelf/gelf_newphdr.3#7 integrate
.. //depot/projects/dtrace/src/lib/libthr/libthr.3#4 integrate
.. //depot/projects/dtrace/src/sbin/kldstat/kldstat.c#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread.3#6 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_attr.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_attr_get_np.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_attr_setcreatesuspend_np.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_barrier_destroy.3#4 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_barrierattr.3#4 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_cancel.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_cleanup_pop.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_cleanup_push.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_cond_broadcast.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_cond_destroy.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_cond_init.3#6 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_cond_signal.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_cond_timedwait.3#6 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_cond_wait.3#6 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_condattr.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_create.3#7 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_detach.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_equal.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_exit.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_getconcurrency.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_getspecific.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_join.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_key_create.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_key_delete.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_kill.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_main_np.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_multi_np.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_mutex_destroy.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_mutex_init.3#6 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_mutex_lock.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_mutex_timedlock.3#4 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_mutex_trylock.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_mutex_unlock.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_mutexattr.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_mutexattr_getkind_np.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_once.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_resume_all_np.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_resume_np.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_rwlock_destroy.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_rwlock_init.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_rwlock_rdlock.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_rwlock_timedrdlock.3#4 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_rwlock_timedwrlock.3#4 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_rwlock_unlock.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_rwlock_wrlock.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_rwlockattr_destroy.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_rwlockattr_getpshared.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_rwlockattr_init.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_rwlockattr_setpshared.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_schedparam.3#6 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_self.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_set_name_np.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_setspecific.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_sigmask.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_spin_init.3#4 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_spin_lock.3#4 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_switch_add_np.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_testcancel.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_yield.3#3 integrate
.. //depot/projects/dtrace/src/sys/dev/ath/if_ath_pci.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/uipaq.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#16 integrate
.. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vfsops.c#14 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_fork.c#18 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_jail.c#8 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_linker.c#21 integrate
.. //depot/projects/dtrace/src/sys/kern/sched_ule.c#17 integrate
.. //depot/projects/dtrace/src/sys/net/route.c#8 integrate
.. //depot/projects/dtrace/src/sys/netinet6/nd6.c#11 integrate
.. //depot/projects/dtrace/src/sys/powerpc/conf/GENERIC#11 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powerpc/genassym.c#6 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powerpc/swtch.S#4 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powerpc/vm_machdep.c#8 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_policy.h#4 integrate
.. //depot/projects/dtrace/src/sys/sys/linker.h#14 integrate
.. //depot/projects/dtrace/src/sys/sys/priv.h#3 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_map.c#11 integrate
.. //depot/projects/dtrace/src/sys/vm/vnode_pager.c#9 integrate
.. //depot/projects/dtrace/src/usr.sbin/rpcbind/rpcbind.c#5 integrate
.. //depot/projects/dtrace/www/de/share/sgml/press.xml#12 integrate
.. //depot/projects/dtrace/www/en/docproj/translations.sgml#10 integrate
.. //depot/projects/dtrace/www/en/releases/7.0R/schedule.sgml#3 integrate
.. //depot/projects/dtrace/www/en/releng/index.sgml#22 integrate

Differences ...

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#11 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -68,7 +68,7 @@
 	  3623 Sanford Street
 	  Concord, CA  94520-1405
 	  USA
-	  Phone: +1 925 674-0783
+	  Phone: +1 925 240-6652
 	  Fax: +1 925 674-0821
 	  Email: info@freebsdmall.com
 	  WWW: 

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#18 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -4078,7 +4078,7 @@
       Advantages of Using OpenSSH
   
       Normally, when using &man.telnet.1; or &man.rlogin.1;,
-        data is sent over the network in an clear, un-encrypted form.
+        data is sent over the network in a clear, un-encrypted form.
         Network sniffers anywhere in between the client and server can
         steal your user/password information or data transferred in
         your session.  OpenSSH offers a variety of authentication and

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/Makefile#8 (text+ko) ====

@@ -1,9 +1,9 @@
 #
-# $FreeBSD: doc/zh_CN.GB2312/books/handbook/Makefile,v 1.14 2007/08/09 15:40:36 loader Exp $
+# $FreeBSD: doc/zh_CN.GB2312/books/handbook/Makefile,v 1.15 2007/10/23 02:08:21 loader Exp $
 #
 # Build the FreeBSD Handbook (Simplified Chinese).
 #
-# Original revision: 1.107
+# Original revision: 1.108
 
 # ------------------------------------------------------------------------
 #
@@ -147,6 +147,19 @@
 IMAGES_EN+= virtualization/parallels-freebsd11.png
 IMAGES_EN+= virtualization/parallels-freebsd12.png
 IMAGES_EN+= virtualization/parallels-freebsd13.png
+IMAGES_EN+= virtualization/virtualpc-freebsd1.png
+IMAGES_EN+= virtualization/virtualpc-freebsd2.png
+IMAGES_EN+= virtualization/virtualpc-freebsd3.png
+IMAGES_EN+= virtualization/virtualpc-freebsd4.png
+IMAGES_EN+= virtualization/virtualpc-freebsd5.png
+IMAGES_EN+= virtualization/virtualpc-freebsd6.png
+IMAGES_EN+= virtualization/virtualpc-freebsd7.png
+IMAGES_EN+= virtualization/virtualpc-freebsd8.png
+IMAGES_EN+= virtualization/virtualpc-freebsd9.png
+IMAGES_EN+= virtualization/virtualpc-freebsd10.png
+IMAGES_EN+= virtualization/virtualpc-freebsd11.png
+IMAGES_EN+= virtualization/virtualpc-freebsd12.png
+IMAGES_EN+= virtualization/virtualpc-freebsd13.png
 
 # Images from the cross-document image library
 IMAGES_LIB=  callouts/1.png

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/basics/chapter.sgml#11 (text+ko) ====

@@ -3,7 +3,7 @@
      The FreeBSD Simplified Chinese Project
 
      Original Revision: 1.149
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/basics/chapter.sgml,v 1.14 2007/09/27 14:59:53 loader Exp $
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/basics/chapter.sgml,v 1.15 2007/10/23 02:08:21 loader Exp $
 -->
 
 
@@ -2287,7 +2287,7 @@
 	
 
       Èç¹ûÄúÒѾ­ÖªµÀÃüÁîµÄÃû×Ö£¬Ö»ÊDz»ÖªµÀÒªÔõÑùʹÓõĻ°£¬ÄǾͱȽϺð졣
-	µ«ÄúÁ¬Ãû×Ö¶¼²»Öªµ½ÄØ?Õâ¸öʱºòÄú¾Í¿ÉÒÔÀûÓà man µÄËÑÑ°¹¦ÄÜ£¬
+	µ«ÄúÁ¬Ãû×Ö¶¼²»ÖªµÀÄØ?Õâ¸öʱºòÄú¾Í¿ÉÒÔÀûÓà man µÄËÑÑ°¹¦ÄÜ£¬
 	Ëü»áÔÚÊÖ²áµÄ½éÉܲ¿·ÝÕÒÑ°ÄúÒªËÑÑ°µÄ¹Ø¼ü×Ö£¬ËüµÄÑ¡ÏîÊÇ £º
 
       &prompt.user; man -k mail

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/bibliography/chapter.sgml#6 (text+ko) ====

@@ -1,8 +1,8 @@
 
 
 
@@ -19,46 +19,48 @@
     
       
 	FreeBSD ÈëÃÅÓëÓ¦Óà (·±ÌåÖÐÎÄ)¡£
-      
-
+	  url="http://jdli.tw.FreeBSD.org/publication/book/freebsd2/index.htm">FreeBSD ÈëÃÅÓëÓ¦Óà (·±ÌåÖÐÎÄ)£¬
+	 ³ö°æÉÌ£º Drmaster£¬
+	 1997. ISBN 9-578-39435-7.
       
 
-	FreeBSD ¼¼ÊõÄÚÄ»(ÖÐÒë±¾)£¬
+	FreeBSD ¼¼ÊõÄÚÄ»(¼òÌåÖÐÎÄÒë±¾)£¬
 	  »úе¹¤Òµ³ö°æÉç¡£ISBN 7-111-10201-0¡£
 	
       
 
       
-	FreeBSD ʹÓôóÈ« µÚÒ»°æ£¬
+	FreeBSD ʹÓôóÈ« µÚÒ»°æ £¨¼òÌåÖÐÎÄ£©£¬
 	  »úе¹¤Òµ³ö°æÉç¡£ISBN 7-111-07482-3¡£
 	
       
 
       
-	FreeBSD ʹÓôóÈ« µÚ¶þ°æ£¬
+	FreeBSD ʹÓôóÈ« µÚ¶þ°æ £¨¼òÌåÖÐÎÄ£©£¬
 	  »úе¹¤Òµ³ö°æÉç¡£ISBN 7-111-10286-X¡£
 	
       
 
       
-	FreeBSD Handbook (µÚ¶þ°æÖÐÒë±¾)£¬
+	FreeBSD Handbook (µÚ¶þ°æ¼òÌåÖÐÎÄÒë±¾)£¬
 	  ÈËÃñÓʵç³ö°æÉç¡£ISBN 7-115-10541-3¡£
 	
       
 
       
-
-	FreeBSD 3.x Internet ¸ß¼¶·þÎñÆ÷µÄ¼ÜÉèÓë¹ÜÀí
+	FreeBSD 3.x Internet ¸ß¼¶·þÎñÆ÷µÄ¼ÜÉèÓë¹ÜÀí £¨¼òÌåÖÐÎÄ£©£¬
 	  Ç廪´óѧ³ö°æÉç¡£ISBN 7-900625-66-6¡£
       
 
       
-	FreeBSD & Windows ¼¯³É×éÍøʵÎñ£¬ÖйúÌúµÀ³ö°æÉç¡£ISBN 7-113-03845-X¡£
+	FreeBSD & Windows ¼¯³É×éÍøʵÎñ £¨¼òÌåÖÐÎÄ£©£¬
+	  ÖйúÌúµÀ³ö°æÉç¡£
+	    ISBN 7-113-03845-X¡£
       
 
       
-	FreeBSD ÍøÕ¾¼ÜÉèʵÎñ£¬ÖйúÌúµÀ³ö°æÉç¡£ISBN 7-113-03423-3¡£
+	FreeBSD ÍøÕ¾¼ÜÉèʵÎñ £¨¼òÌåÖÐÎÄ£©£¬
+	  ÖйúÌúµÀ³ö°æÉç¡£ISBN 7-113-03423-3¡£
       
 
       
@@ -72,37 +74,42 @@
       
 
       
-	Complete Introduction to FreeBSD (ÈÕÎÄ, ³ö°æÉÌ£ºShoeisha Co., Ltd. ISBN 4-88135-473-6 P3600E.
+	
+	    Complete Introduction to FreeBSD £¨ÈÕÎÄ£©, 
+	  ³ö°æÉÌ£ºShoeisha Co., Ltd. ISBN 4-88135-473-6 P3600E.
       
 
       
 	Personal UNIX Starter Kit FreeBSD (ÈÕÎÄ, ³ö°æÉÌ£ºASCII.  ISBN 4-7561-1733-3 P3000E.
+	  url="http://www.ascii.co.jp/pb/book1/shinkan/detail/1322785.html">
+	    Personal UNIX Starter Kit FreeBSD £¨ÈÕÎÄ£©, 
+	  ³ö°æÉÌ£ºASCII.  ISBN 4-7561-1733-3 P3000E.
       
 
       
-	FreeBSD Handbook (ÈÕÎÄÒë±¾, ³ö°æÉÌ£ºASCII.  ISBN 4-7561-1580-2
+	FreeBSD Handbook £¨ÈÕÎÄÒë±¾£©, ³ö°æÉÌ£ºASCII.  ISBN 4-7561-1580-2
 	  P3800E.
       
 
       
-	FreeBSD mit Methode (µÂÎÄ, ³ö°æÉÌ£ºComputer und
-	  Literatur Verlag/Vertrieb Hanser, 1998.  ISBN 3-932311-31-0.
+	FreeBSD mit Methode £¨µÂÎÄ£©, ³ö°æÉÌ£ºComputer und Literatur Verlag/Vertrieb Hanser, 1998.  ISBN 3-932311-31-0.
       
 
       
         FreeBSD 4 - Installieren, Konfigurieren, Administrieren
-	  (µÂÎÄ, ³ö°æÉÌ£ºComputer und Literatur Verlag, 2001.
+	  url="http://www.cul.de/freebsd.html">FreeBSD 4 - Installieren, Konfigurieren, Administrieren
+	  £¨µÂÎÄ£©, ³ö°æÉÌ£ºComputer und Literatur Verlag, 2001.
 	  ISBN 3-932311-88-4.
       
 
       
 	FreeBSD 5 - Installieren, Konfigurieren, Administrieren
-	  (µÂÎÄ), ³ö°æÉÌ£º Computer und Literatur Verlag, 2003.
+          url="http://www.cul.de/freebsd.html">FreeBSD 5 - Installieren, Konfigurieren, Administrieren
+	  £¨µÂÎÄ£©, ³ö°æÉÌ£º Computer und Literatur Verlag, 2003.
 	  ISBN 3-936546-06-1.
       
 
@@ -116,14 +123,32 @@
 
       
 	FreeBSD Install and Utilization Manual (ÈÕÎÄ), ³ö°æÉÌ£º Mainichi Communications Inc..
+	  url="http://www.pc.mycom.co.jp/FreeBSD/install-manual.html">FreeBSD
+	  Install and Utilization Manual £¨ÈÕÎÄ£©, ³ö°æÉÌ£º
+	  Mainichi Communications
+	    Inc.£¬1998. ISBN 4-8399-0112-0.
       
 
       
         Onno W Purbo, Dodi Maryanto, Syahrial Hubbany, Widjil Widodo
-	
-	Building Internet Server with
-	FreeBSD (Ó¡ÄáÎÄ), ³ö°æÉÌ£º Elex Media Komputindo.
+	Building Internet
+	    Server with	FreeBSD £¨Ó¡ÄáÎÄ£©, 
+	³ö°æÉÌ£º Elex Media
+	  Komputindo.
+      
+
+      
+	Absolute BSD: The Ultimate Guide to FreeBSD £¨·±ÌåÖÐÎÄ£©
+	  ³ö°æÉÌ£º GrandTech Press, 2003.
+	  ISBN 986-7944-92-5.
+      
+
+      
+	The FreeBSD 6.0 Book
+	  £¨·±ÌåÖÐÎÄ£©£¬ ³ö°æÉÌ£ºDrmaster, 2006.
+	  ISBN 9-575-27878-X.
       
 
     
@@ -140,10 +165,10 @@
 
       
 	
-	    The Complete FreeBSD, ³ö°æÉÌ£º
-	    O'Reilly, 2003.
-	    ISBN: 0596005164
+	  url="http://www.freebsdmall.com/cgi-bin/fm/bsdcomp">
+	  The Complete FreeBSD, ³ö°æÉÌ£º
+	  O'Reilly, 2003.
+	  ISBN: 0596005164
       
 
       
@@ -187,13 +212,13 @@
     
       
 	Computer Systems Research Group, UC Berkeley.  4.4BSD
-	    User's Reference Manual.  O'Reilly & Associates,
+	  User's Reference Manual.  O'Reilly & Associates,
 	  Inc., 1994. ISBN 1-56592-075-9
       
 
       
 	Computer Systems Research Group, UC Berkeley.  4.4BSD
-	    User's Supplementary Documents. O'Reilly &
+	  User's Supplementary Documents. O'Reilly &
 	  Associates, Inc., 1994. ISBN 1-56592-076-7
       
 
@@ -204,7 +229,7 @@
 
       
 	Mui, Linda.  What You Need To Know When You Can't Find
-	    Your UNIX System Administrator.  O'Reilly &
+	  Your UNIX System Administrator.  O'Reilly &
 	  Associates, Inc., 1995. ISBN 1-56592-104-6
       
 
@@ -223,11 +248,11 @@
 
       
 	Jpman Project, Japan
-	    FreeBSD Users Group.  FreeBSD User's
-	    Reference Manual (ÈÕÎÄÒë±¾). Mainichi Communications
-	    Inc., 1998.  ISBN4-8399-0088-4 P3800E.
+          FreeBSD Users Group.  FreeBSD User's
+	  Reference Manual (ÈÕÎÄÒë±¾). Mainichi Communications
+	  Inc., 1998.  ISBN4-8399-0088-4 P3800E.
       
 
       
@@ -245,13 +270,13 @@
     
       
 	Albitz, Paul and Liu, Cricket.  DNS and
-	    BIND, 4th Ed. O'Reilly & Associates, Inc., 2001.
+	  BIND, 4th Ed. O'Reilly & Associates, Inc., 2001.
 	  ISBN 1-59600-158-4
       
 
       
 	Computer Systems Research Group, UC Berkeley.  4.4BSD
-	    System Manager's Manual.  O'Reilly & Associates,
+	  System Manager's Manual.  O'Reilly & Associates,
 	  Inc., 1994.  ISBN 1-56592-080-5
       
 
@@ -262,19 +287,19 @@
 
       
 	Frisch, Æleen.  Essential System
-	    Administration, 2nd Ed. O'Reilly & Associates,
+	  Administration, 2nd Ed. O'Reilly & Associates,
 	  Inc., 1995.  ISBN 1-56592-127-5
       
 
       
 	Hunt, Craig.  TCP/IP Network
-	    Administration, 2nd Ed. O'Reilly & Associates, Inc., 1997.
-	  ISBN 1-56592-322-7
+	  Administration, 2nd Ed. O'Reilly & Associates, Inc.,
+	  1997.  ISBN 1-56592-322-7
       
 
       
 	Nemeth, Evi.  UNIX System Administration
-	    Handbook.  3rd Ed. Prentice Hall, 2000.  ISBN
+	  Handbook.  3rd Ed. Prentice Hall, 2000.  ISBN
           0-13-020601-6
       
 
@@ -285,11 +310,11 @@
 
       
 	Jpman Project, Japan
-	    FreeBSD Users Group.  FreeBSD System
-	    Administrator's Manual (ÈÕÎÄÒë±¾). Mainichi Communications
-	    Inc., 1998.  ISBN4-8399-0109-0 P3300E.
+          FreeBSD Users Group.  FreeBSD System
+	  Administrator's Manual (ÈÕÎÄÒë±¾). Mainichi Communications
+	  Inc., 1998.  ISBN4-8399-0109-0 P3300E.
       
 
       
@@ -313,25 +338,25 @@
 
       
 	Computer Systems Research Group, UC Berkeley.  4.4BSD
-	    Programmer's Reference Manual. O'Reilly &
+	  Programmer's Reference Manual. O'Reilly &
 	  Associates, Inc., 1994.  ISBN 1-56592-078-3
       
 
       
 	Computer Systems Research Group, UC Berkeley.  4.4BSD
-	    Programmer's Supplementary Documents.  O'Reilly &
+	  Programmer's Supplementary Documents.  O'Reilly &
 	  Associates, Inc., 1994.  ISBN 1-56592-079-1
       
 
       
 	Harbison, Samuel P. and Steele, Guy L. Jr.  C: A
-	    Reference Manual.  4th ed. Prentice Hall, 1995. 
+	  Reference Manual.  4th ed. Prentice Hall, 1995. 
 	  ISBN 0-13-326224-3
       
 
       
 	Kernighan, Brian and Dennis M. Ritchie.  The C
-	    Programming Language.  2nd Ed. PTR Prentice Hall, 1988.
+	  Programming Language.  2nd Ed. PTR Prentice Hall, 1988.
 	  ISBN 0-13-110362-8
       
 
@@ -362,14 +387,14 @@
       
 	Stevens, W. Richard and Stephen A. Rago.
 	Advanced Programming in the UNIX
-	    Environment.  2nd Ed.
-	    Reading, Mass. : Addison-Wesley, 2005.
+	  Environment.  2nd Ed.
+	  Reading, Mass. : Addison-Wesley, 2005.
 	  ISBN 0-201-43307-9
       
 
       
 	Stevens, W. Richard.  UNIX Network
-	    Programming.  2nd Ed, PTR Prentice Hall, 1998.  ISBN
+	  Programming.  2nd Ed, PTR Prentice Hall, 1998.  ISBN
 	  0-13-490012-X
       
 
@@ -387,7 +412,7 @@
     
       
 	Andleigh, Prabhat K.  UNIX System
-	    Architecture.  Prentice-Hall, Inc., 1990.  ISBN
+	  Architecture.  Prentice-Hall, Inc., 1990.  ISBN
           0-13-949843-5
       
 
@@ -399,21 +424,21 @@
       
 	Leffler, Samuel J., Marshall Kirk McKusick, Michael J Karels and
 	  John Quarterman The Design and Implementation of the
-	    4.3BSD UNIX Operating System.  Reading, Mass. :
+	  4.3BSD UNIX Operating System.  Reading, Mass. :
 	  Addison-Wesley, 1989.  ISBN 0-201-06196-1
       
 
       
 	Leffler, Samuel J., Marshall Kirk McKusick, The Design
-	    and Implementation of the 4.3BSD UNIX Operating System: Answer
-	    Book.  Reading, Mass. : Addison-Wesley, 1991.  ISBN
+	  and Implementation of the 4.3BSD UNIX Operating System: Answer
+	  Book.  Reading, Mass. : Addison-Wesley, 1991.  ISBN
           0-201-54629-9
       
 
       
 	McKusick, Marshall Kirk, Keith Bostic, Michael J Karels, and
 	  John Quarterman.  The Design and Implementation of the
-	    4.4BSD Operating System.  Reading, Mass. :
+	  4.4BSD Operating System.  Reading, Mass. :
 	  Addison-Wesley, 1996.  ISBN 0-201-54979-4
 
 	(Õâ±¾ÊéµÄµÚ¶þÕ嵀 
 
       
-	Marshall Kirk McKusick, George V. Neville-Neil The Design
-	    and Implementation of the FreeBSD Operating System.
-	    Boston, Mass. : Addison-Wesley, 2004.  ISBN 0-201-70245-2
+	Marshall Kirk McKusick, George V. Neville-Neil The
+	  Design and Implementation of the FreeBSD Operating
+	  System.   Boston, Mass. : Addison-Wesley, 2004.
+	  ISBN 0-201-70245-2
       
 
       
 	Stevens, W. Richard.  TCP/IP Illustrated, Volume 1:
-	    The Protocols.  Reading, Mass. : Addison-Wesley,
+	  The Protocols.  Reading, Mass. : Addison-Wesley,
 	  1996.  ISBN 0-201-63346-9
       
 
       
 	Schimmel, Curt.  Unix Systems for Modern
-	    Architectures.  Reading, Mass. : Addison-Wesley, 1994.
+	  Architectures.  Reading, Mass. : Addison-Wesley, 1994.
 	  ISBN 0-201-63338-8
       
 
       
 	Stevens, W. Richard.  TCP/IP Illustrated, Volume 3:
-	    TCP for Transactions, HTTP, NNTP and the UNIX Domain
-	    Protocols.  Reading, Mass. : Addison-Wesley, 1996.
+	  TCP for Transactions, HTTP, NNTP and the UNIX Domain
+	  Protocols.  Reading, Mass. : Addison-Wesley, 1996.
 	  ISBN 0-201-63495-3
       
 
       
 	Vahalia, Uresh.  UNIX Internals -- The New
-	    Frontiers.  Prentice Hall, 1996.  ISBN
+	  Frontiers.  Prentice Hall, 1996.  ISBN
           0-13-101908-2
       
 
       
 	Wright, Gary R. and W. Richard Stevens.  TCP/IP
-	    Illustrated, Volume 2: The Implementation. Reading,
+	  Illustrated, Volume 2: The Implementation. Reading,
 	  Mass. : Addison-Wesley, 1995.  ISBN 0-201-63354-X
       
     
@@ -468,7 +494,7 @@
     
       
 	Cheswick, William R. and Steven M. Bellovin. Firewalls
-	    and Internet Security: Repelling the Wily Hacker.
+	  and Internet Security: Repelling the Wily Hacker.
 	  Reading, Mass. : Addison-Wesley, 1995.  ISBN
 	  0-201-63357-4
       
@@ -482,7 +508,7 @@
 
       
 	Garfinkel, Simson.  PGP Pretty Good
-	    Privacy O'Reilly & Associates, Inc., 1995.  ISBN
+	  Privacy O'Reilly & Associates, Inc., 1995.  ISBN
           1-56592-098-8
       
     
@@ -494,19 +520,19 @@
     
       
 	Anderson, Don and Tom Shanley.  Pentium Processor
-	    System Architecture.  2nd Ed. Reading, Mass. :
+	  System Architecture.  2nd Ed. Reading, Mass. :
 	  Addison-Wesley, 1995.  ISBN 0-201-40992-5
       
 
       
 	Ferraro, Richard F.  Programmer's Guide to the EGA,
-	    VGA, and Super VGA Cards.  3rd ed. Reading, Mass. :
+	  VGA, and Super VGA Cards.  3rd ed. Reading, Mass. :
 	  Addison-Wesley, 1995.  ISBN 0-201-62490-7
       
 
       
 	Intel ¹«Ë¾ÔÚËûÃÇµÄ ¿ª·¢ÈËÔ±ÍøÕ¾ÉÏ,
+	  url="http://developer.intel.com/">¿ª·¢ÈËÔ±ÍøÕ¾ÉÏ,
 	  ÌṩÁ˹ØÓÚËûÃÇµÄ CPU£¬Ð¾Æ¬×飬ÒÔ¼°±ê×¼µÄÎĵµ¡£¶àÊýÊÇPDFÎļþ.
       
 
@@ -529,13 +555,14 @@
       
 
       
-	Van Gilluwe, Frank.  The Undocumented PC, 2nd Ed.
-	  Reading, Mass: Addison-Wesley Pub. Co., 1996.  ISBN
+	Van Gilluwe, Frank.  The Undocumented PC,
+	  2nd Ed.  Reading, Mass: Addison-Wesley Pub. Co., 1996.  ISBN
 	  0-201-47950-8
       
 
       
-	Messmer, Hans-Peter.  The Indispensable PC Hardware Book, 4th Ed.
+	Messmer, Hans-Peter.  The Indispensable PC Hardware
+	  Book, 4th Ed.
 	  Reading, Mass: Addison-Wesley Pub. Co., 2002.  ISBN
 	  0-201-59616-4
       
@@ -549,16 +576,16 @@
     
       
 	Lion, John Lion's Commentary on UNIX, 6th Ed. With
-	    Source Code.  ITP Media Group, 1996.  ISBN
+	  Source Code.  ITP Media Group, 1996.  ISBN
 	  1573980137
       
 
       
 	Raymond, Eric S.  The New Hacker's Dictionary, 3rd
-	    edition.  MIT Press, 1996.  ISBN
+	  edition.  MIT Press, 1996.  ISBN
 	  0-262-68092-0.  ËüÒ²±»³Æ×÷ Jargon
-	    File
+	  url="http://www.catb.org/~esr/jargon/html/index.html">Jargon
+	  File
       
 
       
@@ -569,10 +596,10 @@
 
       
 	Simon Garfinkel, Daniel Weise, Steven Strassmann. The
-	    UNIX-HATERS Handbook.  IDG Books Worldwide, Inc.,
+	  UNIX-HATERS Handbook.  IDG Books Worldwide, Inc.,
 	  1994.  ISBN 1-56884-203-1.  Out of print, but available 
-	    online.
+	  url="http://research.microsoft.com/~daniel/unix-haters.html">
+	  online.
       
 
       
@@ -595,7 +622,7 @@
 
       
 	Networked Computer Science Technical Reports
-	    Library.  
+	  Library.  
       
 
       
@@ -620,7 +647,7 @@
 
       
 	Sys Admin — The Journal for UNIX System
-	    Administrators Miller Freeman, Inc., ISSN
+	  Administrators Miller Freeman, Inc., ISSN
 	  1061-2688
       
 

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/config/chapter.sgml#12 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Chinese Documentation Project
 
-     Original Revision: 1.226
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/config/chapter.sgml,v 1.16 2007/08/09 15:40:36 loader Exp $
+     Original Revision: 1.227
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/config/chapter.sgml,v 1.17 2007/10/23 02:08:21 loader Exp $
 -->
 
 
@@ -2083,13 +2083,13 @@
 
         Òª²é¿´µ±Ç°ÔÚÓÃµÄ vnode ÊýÁ¿£º
 
-        &prompt.root; sysctl vfs.numvnodes
-vfs.numvnodes: 91349
+        &prompt.root; sysctl vfs.numvnodes
+vfs.numvnodes: 91349
 
         Òª²é¿´×î´ó¿ÉÓÃµÄ vnode ÊýÁ¿£º
 
-        &prompt.root; sysctl kern.maxvnodes
-kern.maxvnodes: 100000
+        &prompt.root; sysctl kern.maxvnodes
+kern.maxvnodes: 100000
 
         Èç¹ûµ±Ç°µÄ vnode ÓÃÁ¿½Ó½ü×î´óÖµ£¬ Ôò½«
           kern.maxvnodes ÖµÔö´ó 1,000

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/disks/chapter.sgml#11 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
 
-     Original Revision: 1.274
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/disks/chapter.sgml,v 1.16 2007/08/09 15:40:37 loader Exp $
+     Original Revision: 1.277
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/disks/chapter.sgml,v 1.17 2007/10/23 02:08:22 loader Exp $
 -->
 
 
@@ -270,7 +270,7 @@
 
 	&prompt.root; dd if=/dev/zero of=/dev/da1 bs=1k count=1
 &prompt.root; fdisk -BI da1 #³õʼ»¯Ð´ÅÅÌ
-&prompt.root; bsdlabel -B -w -r da1s1 auto #¼ÓÉϱêÇ©
+&prompt.root; bsdlabel -B -w da1s1 auto #¼ÓÉϱêÇ©
 &prompt.root; bsdlabel -e da1s1 # ÏÖÔڱ༭Äú¸Õ²Å´´½¨µÄ´ÅÅÌ·ÖÇø
 &prompt.root; mkdir -p /1
 &prompt.root; newfs /dev/da1s1e # ΪÄú´´½¨µÄÿ¸ö·ÖÇøÖظ´Õâ¸ö²Ù×÷
@@ -290,7 +290,7 @@
 	  Ëü²»Ê¶±ðÕÒµ½µÄ IBM &os2 µÄ appropriate ·ÖÇø¡£
 
 	&prompt.root; dd if=/dev/zero of=/dev/da1 bs=1k count=1
-&prompt.root; bsdlabel -Brw da1 auto
+&prompt.root; bsdlabel -Bw da1 auto
 &prompt.root; bsdlabel -e da1				# ´´½¨ `e' ·ÖÇø
 &prompt.root; newfs -d0 /dev/da1e
 &prompt.root; mkdir -p /1
@@ -300,7 +300,7 @@
 	ÁíÒ»ÖÖ·½·¨£º
 
 	&prompt.root; dd if=/dev/zero of=/dev/da1 count=2
-&prompt.root; bsdlabel /dev/da1 | bsdlabel -BrR da1 /dev/stdin
+&prompt.root; bsdlabel /dev/da1 | bsdlabel -BR da1 /dev/stdin
 &prompt.root; newfs /dev/da1e
 &prompt.root; mkdir -p /1
 &prompt.root; vi /etc/fstab					# Ϊ /dev/da1eÌí¼ÓÒ»¸ö¼Ç¼
@@ -393,9 +393,9 @@
 
  	  Òª°²×° &man.ccd.4;, Ê×ÏÈÐèҪʹÓà &man.bsdlabel.8; À´±à¼­Ó²ÅÌ£º
 
-	  bsdlabel -r -w ad1 auto
-bsdlabel -r -w ad2 auto
-bsdlabel -r -w ad3 auto
+	  bsdlabel -w ad1 auto
+bsdlabel -w ad2 auto
+bsdlabel -w ad3 auto
 
  	  ´Ë´¦½«Õû¸öÓ²ÅÌ´´½¨Îª ad1c, ad2c 
  	  ºÍ ad3c¡£
@@ -766,7 +766,7 @@
 	/dev/da0s1£¬ ÓÉÓÚÕâЩÉ豸ͨ³£ÊÇ FAT
 	Îļþϵͳ£¬ Óû§¿ÉÒÔÕâÑù¹Ò½ÓËüÃÇ£º
 
-      &prompt.user; mount_msdosfs -m 644 -M 755 /dev/da0s1 /mnt/$USER
+      &prompt.user; mount -t msdosfs -m 644 -M 755 /dev/da0s1 /mnt/$USER
 
       Èç¹û°Î³öÉ豸 (±ØÐëÊ×ÏȽ«Æä¶ÔÓ¦µÄ´ÅÅ̾íжÏÂ)£¬
 	ÔòÄú»áÔÚϵͳÏûÏ¢»º³åÇøÖп´µ½ÀàËÆÏÂÃæµÄÐÅÏ¢£º
@@ -1733,7 +1733,7 @@
 
       ÏÖÔÚ¿ÉÒÔÓÃÏÂÃæµÄ·½·¨À´Ê¹Óà &man.bsdlabel.8; ÁË£º
 
-      &prompt.root; /sbin/bsdlabel -B -r -w /dev/fd0 fd1440
+      &prompt.root; /sbin/bsdlabel -B -w /dev/fd0 fd1440
 
     
 
@@ -3308,8 +3308,8 @@
 	  Õâ¸ö½Å±¾µÄ²ÎÊý¿ÉÒÔͨ¹ý
 	  &man.rc.conf.5; À´Ö¸¶¨£¬ ÀýÈ磺
 
-	gbde_autoattach_all="YES"
-gbde_devices="ad4s1c"
+	gbde_autoattach_all="YES"
+gbde_devices="ad4s1c"
 
 	ÔÚÆô¶¯Ê±½«ÒªÇóÊäÈë gbde
 	  µÄ¿ÚÁî¡£ ÔÚÊäÈëÕýÈ·µÄ¿ÚÁîÖ®ºó£¬ gbde
@@ -3363,7 +3363,7 @@
 
       ´Ó &os; 6.0 ¿ªÊ¼ÌṩÁËÒ»¸öеÄÃÜÂëѧ GEOM class —
 	geli¡£ ËüÄ¿Ç°ÓÉ
-	&a.pjd; ¿ª·¢¡£ Geli Óë
+	&a.pjd; ¿ª·¢¡£ Geli ¹¤¾ßÓë
 	gbde ²»Í¬£» ËüÌṩÁËһЩ²»Í¬µÄ¹¦ÄÜ£¬
 	²¢²ÉÓÃÁ˲»Í¬µÄ·½Ê½À´½øÐÐÃÜÂëѧÔËËã¡£
 
@@ -3406,9 +3406,8 @@
 
       ÏÂÃæµÄ²½Öè½éÉÜÁËÈçºÎÆôÓà &os; ÄÚºËÖеÄ
 	geli Ö§³Ö£¬
-	²¢½âÊÍÁËÈçºÎ´´½¨Ð嵀 geli ¼ÓÃÜ provider¡£
-	×îºó£¬ »¹½«¶ÔÈçºÎÀûÓà geli
-	´´½¨¼ÓÃܵĽ»»»·ÖÇø¼ÓÒÔÑÝʾ¡£
+	²¢½âÊÍÁËÈçºÎ´´½¨ÐºÍʹÓà geli
+	¼ÓÃÜ provider¡£
 
       ҪʹÓà geli£¬ Äú±ØÐëÔËÐÐ
 	&os; 6.0-RELEASE »ò¸üа汾¡£ ÓÉÓÚÐèÒªÐÞ¸ÄÄںˣ¬
@@ -3416,12 +3415,12 @@
 
       
 	
-	  ÔÚÄÚºËÅäÖÃÎļþÖмÓÈë <command>geli</command> Ö§³Ö
+	  ÔÚÄÚºËÖмÓÈë <command>geli</command> Ö§³Ö
 
 	  ÔÚÄÚºËÅäÖÃÎļþÖмÓÈëÏÂÃæÁ½ÐУº
 
-	  options GEOM_ELI
-device crypto
+	  options GEOM_ELI
+device crypto
 
 	  °´ÕÕ  ½éÉܵIJ½ÖèÖØбàÒë²¢°²×°Äںˡ£
@@ -3429,7 +3428,7 @@
 	  ÁíÍ⣬ geli Ò²¿ÉÒÔÔÚϵͳÒýµ¼Ê±¼ÓÔØ¡£ ÕâÊÇͨ¹ýÔÚ
 	    /boot/loader.conf ÖÐÔö¼ÓÏÂÃæµÄÅäÖÃÀ´ÊµÏֵģº
 
-	  geom_eli_load="YES"
+	  geom_eli_load="YES"
 
 	  &man.geli.8; ÏÖÔÚÓ¦¸ÃÒѾ­ÎªÄÚºËËùÖ§³ÖÁË¡£
 	
@@ -3488,7 +3487,7 @@
 &prompt.root; mount /dev/da2.eli /private
 
 	ÏÖÔÚ¼ÓÃܵÄÎļþϵͳӦ¸ÃÒѾ­¿ÉÒÔ±» &man.df.1; ¿´µ½£¬
-	  ²¢´¦ÓÚ¿ÉÓÃ״̬ÁË¡£
+	  ²¢´¦ÓÚ¿ÉÓÃ״̬ÁË£º
 
 	  &prompt.root; df -H
 Filesystem     Size   Used  Avail Capacity  Mounted on
@@ -3523,15 +3522,16 @@
 	  Ëü¿ÉÒÔÓÃÓÚ¼ò»¯ geli µÄʹÓᣠͨ¹ý
 	  &man.rc.conf.5; ÅäÖà geli µÄ·½·¨ÈçÏ£º
 
-	geli_devices="da2"
-geli_da2_flags="-p -k /root/da2.key"
+	geli_devices="da2"
+geli_da2_flags="-p -k /root/da2.key"
 
 	Õ⽫°Ñ /dev/da2 ÅäÖÃΪһ¸ö
 	  geli provider£¬ ÆäÖ÷ÃÜÔ¿ÎļþλÓÚ
 	  /root/da2.key£¬ ¶ø
 	  geli ÔÚÁ¬½Ó provider ʱ½«²»Ê¹ÓÿÚÁî×Ö
-	  (×¢ÒâÖ»ÓÐÔÚ geli init ½×¶ÎʹÓÃÁË -P ²Å¿ÉÒÔÕâÑù×ö)¡£
-	  ϵͳ½«ÔڹرÕ֮ǰ½« geli provider ¶Ï¿ª¡£
+	  (×¢ÒâÖ»ÓÐÔÚ geli init ½×¶ÎʹÓÃÁË 
+	   ²Å¿ÉÒÔÕâÑù×ö)¡£
+	  ϵͳ½«ÔڹرÕ֮ǰ½« geli provider ¶Ï¿ª¡£
 
 	¹ØÓÚÈçºÎÅäÖà rc.d µÄÏêϸÐÅÏ¢¿ÉÒÔÔÚʹÓÃÊÖ²áµÄ
 	  rc.d Ò»½ÚÖÐÕÒµ½¡£
@@ -3602,10 +3602,10 @@
 	ÖÐÓë½»»»Çø¶ÔÓ¦µÄÐÐÖУ¬ É豸ÃûӦ׷¼Ó
 	.bde ºó׺£º
 
-      
+      
 # Device                Mountpoint      FStype  Options         Dump    Pass#
 /dev/ad0s1b.bde         none            swap    sw              0       0
-      
+      
 
       ¶ÔÓÚ &os; 6.0-RELEASE ֮ǰµÄ°æ±¾£¬
 	»¹ÐèÒªÔÚ /etc/rc.conf ÖмÓÈ룺
@@ -3621,10 +3621,10 @@
 	Öн»»»Çø¶ÔÓ¦µÄÐÐÖУ¬ É豸ÃûӦ׷¼Ó
 	.eli ºó׺£º
 
-      
+      
 # Device                Mountpoint      FStype  Options         Dump    Pass#
 /dev/ad0s1b.eli         none            swap    sw              0       0
-      
+      
 
       &man.geli.8; ĬÈÏÇé¿öÏÂʹÓÃÃÜÔ¿³¤¶ÈΪ 256-λµÄ
 	AES ¼ÓÃÜËã·¨¡£

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml#11 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
 
-     Original Revision: 1.76
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml,v 1.12 2007/08/09 15:40:37 loader Exp $
+     Original Revision: 1.77
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml,v 1.13 2007/10/23 02:08:22 loader Exp $
 -->
 
 

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/install/chapter.sgml#15 (text+ko) ====

@@ -3,7 +3,7 @@
      The FreeBSD Simplified Chinese Project
 
      Original Revision: 1.373
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/install/chapter.sgml,v 1.23 2007/08/09 15:40:38 loader Exp $
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/install/chapter.sgml,v 1.24 2007/10/23 02:08:22 loader Exp $
 -->
 
 
@@ -2795,29 +2795,29 @@
 
       Ñ¡Ôñ Sendmail ½«»á°²×° &os;ĬÈϵÄ
 	Á÷ÐÐµÄµÄ sendmail ·þÎñ³ÌÐò¡£
-	Sendmail local Ñ¡ÏîÓÃÀ´ÉèÖÃsendmail
-	ĬÈϵÄMTA£¬Ò²¿ÉÒÔ½ûÖ¹Ëü´ÓInternet½ÓÊÕÓʼþµÄÄÜÁ¦¡£
+	Sendmail local Ñ¡ÏîÓÃÀ´ÉèÖÃ sendmail
+	ĬÈ쵀 MTA£¬Ò²¿ÉÒÔ½ûÖ¹Ëü´ÓInternet½ÓÊÕÓʼþµÄÄÜÁ¦¡£
 	»¹ÓÐÆäËüµÄһЩѡÏîÈ磺
 	Postfix ºÍ
 	Exim ¶¼ÀàËÆÓÚ
-	SendmailµÄ½ÇÉ«¡£ËüÃÇÁ½ÕßÒ²¿ÉÒÔͶµÝÓʼþ£»
-	ÓÐЩÓû§¸üϲ»¶Ñ¡ÔñʹÓÃSendmail¡¢
-	MTA¶þÕßÖ®Ò»¡£
+	Sendmail µÄ½ÇÉ«¡£ËüÃÇÁ½ÕßÒ²¿ÉÒÔͶµÝÓʼþ£»
+	ÓÐЩÓû§¸üϲ»¶Ñ¡ÔñʹÓà Sendmail¡¢

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Tue Oct 23 21:58:49 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 098B616A421; Tue, 23 Oct 2007 21:58: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 BAA2816A418
	for ; Tue, 23 Oct 2007 21:58:48 +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 B8BF013C4A5
	for ; Tue, 23 Oct 2007 21:58:48 +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 l9NLwmpp020481
	for ; Tue, 23 Oct 2007 21:58:48 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9NLwmmU020478
	for perforce@freebsd.org; Tue, 23 Oct 2007 21:58:48 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 23 Oct 2007 21:58:48 GMT
Message-Id: <200710232158.l9NLwmmU020478@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 127977 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, 23 Oct 2007 21:58:49 -0000

http://perforce.freebsd.org/chv.cgi?CH=127977

Change 127977 by jb@jb_freebsd1 on 2007/10/23 21:57:58

	IF6

Affected files ...

.. //depot/projects/dtrace6/src/sbin/mount_unionfs/mount_unionfs.8#2 integrate
.. //depot/projects/dtrace6/src/sys/ddb/db_command.c#3 integrate
.. //depot/projects/dtrace6/src/sys/fs/nullfs/null_subr.c#2 integrate
.. //depot/projects/dtrace6/src/sys/fs/nullfs/null_vnops.c#2 integrate
.. //depot/projects/dtrace6/src/sys/fs/unionfs/union.h#2 integrate
.. //depot/projects/dtrace6/src/sys/fs/unionfs/union_subr.c#2 integrate
.. //depot/projects/dtrace6/src/sys/fs/unionfs/union_vfsops.c#2 integrate
.. //depot/projects/dtrace6/src/sys/fs/unionfs/union_vnops.c#2 integrate

Differences ...

==== //depot/projects/dtrace6/src/sbin/mount_unionfs/mount_unionfs.8#2 (text+ko) ====

@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_union.8	8.6 (Berkeley) 3/27/94
-.\" $FreeBSD: src/sbin/mount_unionfs/mount_unionfs.8,v 1.20.2.1 2007/02/13 05:56:43 rodrigc Exp $
+.\" $FreeBSD: src/sbin/mount_unionfs/mount_unionfs.8,v 1.20.2.2 2007/10/23 03:37:09 daichi Exp $
 .\"
 .Dd November 30, 2006
 .Dt MOUNT_UNIONFS 8
@@ -98,6 +98,10 @@
 mode, see
 .Sx MASQUERADE MODE
 below.
+.It Sm Cm whiteout No = Cm always | whenneeded Sm
+Specifies whether whiteouts should always be made in the upper layer
+when removing a file or directory or only when it already exists in the
+lower layer.
 .It Cm udir Ns = Ns Ar mode
 Specifies directory mode bits in octal for
 .Cm masquerade

==== //depot/projects/dtrace6/src/sys/ddb/db_command.c#3 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/ddb/db_command.c,v 1.60.2.3 2007/10/19 16:48:43 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/ddb/db_command.c,v 1.60.2.4 2007/10/23 16:07:30 obrien Exp $");
 
 #include 
 #include 
@@ -75,8 +75,65 @@
 static db_cmdfcn_t	db_stack_trace_all;
 static db_cmdfcn_t	db_watchdog;
 
-/* XXX this is actually forward-static. */
-extern struct command	db_show_cmds[];
+/*
+ * 'show' commands
+ */
+
+static struct command db_show_all_cmds[] = {
+	{ "procs",	db_ps,			0,	0 },
+	{ (char *)0 }
+};
+
+static struct command db_show_cmds[] = {
+	{ "all",	0,			0,	db_show_all_cmds },
+	{ "registers",	db_show_regs,		0,	0 },
+	{ "breaks",	db_listbreak_cmd, 	0,	0 },
+	{ "threads",	db_show_threads,	0,	0 },
+	{ (char *)0, }
+};
+
+static struct command db_command_table[] = {
+	{ "print",	db_print_cmd,		0,	0 },
+	{ "p",		db_print_cmd,		0,	0 },
+	{ "examine",	db_examine_cmd,		CS_SET_DOT, 0 },
+	{ "x",		db_examine_cmd,		CS_SET_DOT, 0 },
+	{ "search",	db_search_cmd,		CS_OWN|CS_SET_DOT, 0 },
+	{ "set",	db_set_cmd,		CS_OWN,	0 },
+	{ "write",	db_write_cmd,		CS_MORE|CS_SET_DOT, 0 },
+	{ "w",		db_write_cmd,		CS_MORE|CS_SET_DOT, 0 },
+	{ "delete",	db_delete_cmd,		0,	0 },
+	{ "d",		db_delete_cmd,		0,	0 },
+	{ "break",	db_breakpoint_cmd,	0,	0 },
+	{ "dwatch",	db_deletewatch_cmd,	0,	0 },
+	{ "watch",	db_watchpoint_cmd,	CS_MORE,0 },
+	{ "dhwatch",	db_deletehwatch_cmd,	0,      0 },
+	{ "hwatch",	db_hwatchpoint_cmd,	0,      0 },
+	{ "step",	db_single_step_cmd,	0,	0 },
+	{ "s",		db_single_step_cmd,	0,	0 },
+	{ "continue",	db_continue_cmd,	0,	0 },
+	{ "c",		db_continue_cmd,	0,	0 },
+	{ "until",	db_trace_until_call_cmd,0,	0 },
+	{ "next",	db_trace_until_matching_cmd,0,	0 },
+	{ "match",	db_trace_until_matching_cmd,0,	0 },
+	{ "trace",	db_stack_trace,		CS_OWN,	0 },
+	{ "alltrace",	db_stack_trace_all,	0,	0 },
+	{ "where",	db_stack_trace,		CS_OWN,	0 },
+	{ "bt",		db_stack_trace,		CS_OWN,	0 },
+	{ "call",	db_fncall,		CS_OWN,	0 },
+	{ "show",	0,			0,	db_show_cmds },
+	{ "ps",		db_ps,			0,	0 },
+	{ "gdb",	db_gdb,			0,	0 },
+	{ "halt",	db_halt,		0,	0 },
+	{ "reboot",	db_reset,		0,	0 },
+	{ "reset",	db_reset,		0,	0 },
+	{ "kill",	db_kill,		CS_OWN,	0 },
+	{ "watchdog",	db_watchdog,		0,	0 },
+	{ "thread",	db_set_thread,		CS_OWN,	0 },
+	{ (char *)0, }
+};
+
+static struct command	*db_last_command = 0;
+
 
 /*
  * if 'ed' style: 'dot' is set at start of last item printed,
@@ -374,65 +431,6 @@
 }
 
 /*
- * 'show' commands
- */
-
-static struct command db_show_all_cmds[] = {
-	{ "procs",	db_ps,			0,	0 },
-	{ (char *)0 }
-};
-
-static struct command db_show_cmds[] = {
-	{ "all",	0,			0,	db_show_all_cmds },
-	{ "registers",	db_show_regs,		0,	0 },
-	{ "breaks",	db_listbreak_cmd, 	0,	0 },
-	{ "threads",	db_show_threads,	0,	0 },
-	{ (char *)0, }
-};
-
-static struct command db_command_table[] = {
-	{ "print",	db_print_cmd,		0,	0 },
-	{ "p",		db_print_cmd,		0,	0 },
-	{ "examine",	db_examine_cmd,		CS_SET_DOT, 0 },
-	{ "x",		db_examine_cmd,		CS_SET_DOT, 0 },
-	{ "search",	db_search_cmd,		CS_OWN|CS_SET_DOT, 0 },
-	{ "set",	db_set_cmd,		CS_OWN,	0 },
-	{ "write",	db_write_cmd,		CS_MORE|CS_SET_DOT, 0 },
-	{ "w",		db_write_cmd,		CS_MORE|CS_SET_DOT, 0 },
-	{ "delete",	db_delete_cmd,		0,	0 },
-	{ "d",		db_delete_cmd,		0,	0 },
-	{ "break",	db_breakpoint_cmd,	0,	0 },
-	{ "dwatch",	db_deletewatch_cmd,	0,	0 },
-	{ "watch",	db_watchpoint_cmd,	CS_MORE,0 },
-	{ "dhwatch",	db_deletehwatch_cmd,	0,      0 },
-	{ "hwatch",	db_hwatchpoint_cmd,	0,      0 },
-	{ "step",	db_single_step_cmd,	0,	0 },
-	{ "s",		db_single_step_cmd,	0,	0 },
-	{ "continue",	db_continue_cmd,	0,	0 },
-	{ "c",		db_continue_cmd,	0,	0 },
-	{ "until",	db_trace_until_call_cmd,0,	0 },
-	{ "next",	db_trace_until_matching_cmd,0,	0 },
-	{ "match",	db_trace_until_matching_cmd,0,	0 },
-	{ "trace",	db_stack_trace,		CS_OWN,	0 },
-	{ "alltrace",	db_stack_trace_all,	0,	0 },
-	{ "where",	db_stack_trace,		CS_OWN,	0 },
-	{ "bt",		db_stack_trace,		CS_OWN,	0 },
-	{ "call",	db_fncall,		CS_OWN,	0 },
-	{ "show",	0,			0,	db_show_cmds },
-	{ "ps",		db_ps,			0,	0 },
-	{ "gdb",	db_gdb,			0,	0 },
-	{ "halt",	db_halt,		0,	0 },
-	{ "reboot",	db_reset,		0,	0 },
-	{ "reset",	db_reset,		0,	0 },
-	{ "kill",	db_kill,		CS_OWN,	0 },
-	{ "watchdog",	db_watchdog,		0,	0 },
-	{ "thread",	db_set_thread,		CS_OWN,	0 },
-	{ (char *)0, }
-};
-
-static struct command	*db_last_command = 0;
-
-/*
  * At least one non-optional command must be implemented using
  * DB_COMMAND() so that db_cmd_set gets created.  Here is one.
  */

==== //depot/projects/dtrace6/src/sys/fs/nullfs/null_subr.c#2 (text+ko) ====

@@ -31,7 +31,7 @@
  *
  *	@(#)null_subr.c	8.7 (Berkeley) 5/14/95
  *
- * $FreeBSD: src/sys/fs/nullfs/null_subr.c,v 1.48.2.1 2006/03/13 03:05:17 jeff Exp $
+ * $FreeBSD: src/sys/fs/nullfs/null_subr.c,v 1.48.2.2 2007/10/23 03:38:31 daichi Exp $
  */
 
 #include 
@@ -283,6 +283,7 @@
 	char *fil;
 	int lno;
 {
+	int interlock = 0;
 	struct null_node *a = VTONULL(vp);
 #ifdef notyet
 	/*
@@ -306,6 +307,10 @@
 		while (null_checkvp_barrier) /*WAIT*/ ;
 		panic("null_checkvp");
 	}
+	if (mtx_owned(VI_MTX(vp)) != 0) {
+		VI_UNLOCK(vp);
+		interlock = 1;
+	}
 	if (vrefcnt(a->null_lowervp) < 1) {
 		int i; u_long *p;
 		printf("vp = %p, unref'ed lowervp\n", (void *)vp);
@@ -316,6 +321,8 @@
 		while (null_checkvp_barrier) /*WAIT*/ ;
 		panic ("null with unref'ed lowervp");
 	};
+	if (interlock != 0)
+		VI_LOCK(vp);
 #ifdef notyet
 	printf("null %x/%d -> %x/%d [%s, %d]\n",
 	        NULLTOV(a), vrefcnt(NULLTOV(a)),

==== //depot/projects/dtrace6/src/sys/fs/nullfs/null_vnops.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
  *	...and...
  *	@(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project
  *
- * $FreeBSD: src/sys/fs/nullfs/null_vnops.c,v 1.87.2.3 2006/03/13 03:05:26 jeff Exp $
+ * $FreeBSD: src/sys/fs/nullfs/null_vnops.c,v 1.87.2.4 2007/10/23 03:38:32 daichi Exp $
  */
 
 /*
@@ -587,20 +587,33 @@
 {
 	struct vnode *vp = ap->a_vp;
 	int flags = ap->a_flags;
+	int mtxlkflag = 0;
 	struct thread *td = ap->a_td;
 	struct null_node *nn;
 	struct vnode *lvp;
 	int error;
 
-	if ((flags & LK_INTERLOCK) != 0) {
-		VI_UNLOCK(vp);
-		ap->a_flags = flags &= ~LK_INTERLOCK;
+	if ((flags & LK_INTERLOCK) != 0)
+		mtxlkflag = 1;
+	else if (mtx_owned(VI_MTX(vp)) == 0) {
+		VI_LOCK(vp);
+		mtxlkflag = 2;
 	}
 	nn = VTONULL(vp);
-	if (nn != NULL && (lvp = NULLVPTOLOWERVP(vp)) != NULL)
+	if (nn != NULL && (lvp = NULLVPTOLOWERVP(vp)) != NULL) {
+		VI_LOCK_FLAGS(lvp, MTX_DUPOK);
+		flags |= LK_INTERLOCK;
+		vholdl(lvp);
+		VI_UNLOCK(vp);
 		error = VOP_UNLOCK(lvp, flags, td);
-	else
+		vdrop(lvp);
+		if (mtxlkflag == 0)
+			VI_LOCK(vp);
+	} else {
+		if (mtxlkflag == 2)
+			VI_UNLOCK(vp);
 		error = vop_stdunlock(ap);
+	}
 
 	return (error);
 }

==== //depot/projects/dtrace6/src/sys/fs/unionfs/union.h#2 (text+ko) ====

@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union.h	8.9 (Berkeley) 12/10/94
- * $FreeBSD: src/sys/fs/unionfs/union.h,v 1.31.2.1 2007/02/13 05:56:42 rodrigc Exp $
+ * $FreeBSD: src/sys/fs/unionfs/union.h,v 1.31.2.3 2007/10/23 03:37:09 daichi Exp $
  */
 
 #ifdef _KERNEL
@@ -45,11 +45,18 @@
 	UNIONFS_MASQUERADE
 } unionfs_copymode;
 
+/* whiteout policy of upper layer */
+typedef enum _unionfs_whitemode {
+       UNIONFS_WHITE_ALWAYS = 0,
+       UNIONFS_WHITE_WHENNEEDED
+} unionfs_whitemode;
+
 struct unionfs_mount {
 	struct vnode   *um_lowervp;	/* VREFed once */
 	struct vnode   *um_uppervp;	/* VREFed once */
 	struct vnode   *um_rootvp;	/* ROOT vnode */
 	unionfs_copymode um_copymode;
+	unionfs_whitemode um_whitemode;
 	uid_t		um_uid;
 	gid_t		um_gid;
 	u_short		um_udir;
@@ -73,7 +80,6 @@
 
 /* A cache of vnode references */
 struct unionfs_node {
-	LIST_ENTRY(unionfs_node) un_hash;	/* Hash list */
 	struct vnode   *un_lowervp;		/* lower side vnode */
 	struct vnode   *un_uppervp;		/* upper side vnode */
 	struct vnode   *un_dvp;			/* parent unionfs vnode */
@@ -83,10 +89,12 @@
 	int		un_flag;		/* unionfs node flag */
 };
 
-/* unionfs node flags */
-#define UNIONFS_CACHED		0x01	/* is cached */
-#define UNIONFS_OPENEXTL	0x02	/* openextattr (lower) */
-#define UNIONFS_OPENEXTU	0x04	/* openextattr (upper) */
+/*
+ * unionfs node flags
+ * It needs the vnode with exclusive lock, when changing the un_flag variable.
+ */
+#define UNIONFS_OPENEXTL	0x01	/* openextattr (lower) */
+#define UNIONFS_OPENEXTU	0x02	/* openextattr (upper) */
 
 #define	MOUNTTOUNIONFSMOUNT(mp) ((struct unionfs_mount *)((mp)->mnt_data))
 #define	VTOUNIONFS(vp) ((struct unionfs_node *)(vp)->v_data)
@@ -95,7 +103,7 @@
 int unionfs_init(struct vfsconf *vfsp);
 int unionfs_uninit(struct vfsconf *vfsp);
 int unionfs_nodeget(struct mount *mp, struct vnode *uppervp, struct vnode *lowervp, struct vnode *dvp, struct vnode **vpp, struct componentname *cnp, struct thread *td);
-void unionfs_hashrem(struct vnode *vp, struct thread *td);
+void unionfs_noderem(struct vnode *vp, struct thread *td);
 void unionfs_get_node_status(struct unionfs_node *unp, struct thread *td, struct unionfs_node_status **unspp);
 void unionfs_tryrem_node_status(struct unionfs_node *unp, struct thread *td, struct unionfs_node_status *unsp);
 

==== //depot/projects/dtrace6/src/sys/fs/unionfs/union_subr.c#2 (text+ko) ====

@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_subr.c	8.20 (Berkeley) 5/20/95
- * $FreeBSD: src/sys/fs/unionfs/union_subr.c,v 1.86.2.1 2007/02/13 05:56:42 rodrigc Exp $
+ * $FreeBSD: src/sys/fs/unionfs/union_subr.c,v 1.86.2.3 2007/10/23 03:28:22 daichi Exp $
  */
 
 #include 
@@ -60,135 +60,29 @@
 
 #include 
 
-#define	NUNIONFSNODECACHE 32
-
-#define	UNIONFS_NHASH(upper, lower) \
-	(&unionfs_node_hashtbl[(((uintptr_t)upper + (uintptr_t)lower) >> 8) & unionfs_node_hash])
-
-static LIST_HEAD(unionfs_node_hashhead, unionfs_node) *unionfs_node_hashtbl;
-static u_long	unionfs_node_hash;
-struct mtx	unionfs_hashmtx;
-
-static MALLOC_DEFINE(M_UNIONFSHASH, "UNIONFS hash", "UNIONFS hash table");
 MALLOC_DEFINE(M_UNIONFSNODE, "UNIONFS node", "UNIONFS vnode private part");
 MALLOC_DEFINE(M_UNIONFSPATH, "UNIONFS path", "UNIONFS path private part");
 
 /*
- * Initialize cache headers
+ * Initialize
  */
 int 
 unionfs_init(struct vfsconf *vfsp)
 {
 	UNIONFSDEBUG("unionfs_init\n");	/* printed during system boot */
-	unionfs_node_hashtbl = hashinit(NUNIONFSNODECACHE, M_UNIONFSHASH, &unionfs_node_hash);
-	mtx_init(&unionfs_hashmtx, "unionfs", NULL, MTX_DEF);
-
 	return (0);
 }
 
 /*
- * Destroy cache headers
+ * Uninitialize
  */
 int 
 unionfs_uninit(struct vfsconf *vfsp)
 {
-	mtx_destroy(&unionfs_hashmtx);
-	free(unionfs_node_hashtbl, M_UNIONFSHASH);
 	return (0);
 }
 
 /*
- * Return a VREF'ed alias for unionfs vnode if already exists, else 0.
- */
-static struct vnode *
-unionfs_hashget(struct mount *mp, struct vnode *uppervp,
-		struct vnode *lowervp, struct vnode *dvp, char *path,
-		int lkflags, struct thread *td)
-{
-	struct unionfs_node_hashhead *hd;
-	struct unionfs_node *unp;
-	struct vnode   *vp;
-	int error;
-
-	if (lkflags & LK_TYPE_MASK)
-		lkflags |= LK_RETRY;
-	hd = UNIONFS_NHASH(uppervp, lowervp);
-
-	mtx_lock(&unionfs_hashmtx);
-	LIST_FOREACH(unp, hd, un_hash) {
-		if (unp->un_uppervp == uppervp &&
-		    unp->un_lowervp == lowervp &&
-		    unp->un_dvp == dvp &&
-		    UNIONFSTOV(unp)->v_mount == mp &&
-		    (!path || !(unp->un_path) || !strcmp(unp->un_path, path))) {
-			vp = UNIONFSTOV(unp);
-			VI_LOCK(vp);
-			mtx_unlock(&unionfs_hashmtx);
-			/*
-			 * We need to clear the OWEINACT flag here as this
-			 * may lead vget() to try to lock our vnode which is
-			 * already locked via vp.
-			 */
-			vp->v_iflag &= ~VI_OWEINACT;
-			error = vget(vp, LK_INTERLOCK, td);
-			if (error != 0)
-				panic("unionfs_hashget: vget error %d", error);
-			if (lkflags & LK_TYPE_MASK)
-				vn_lock(vp, lkflags, td);
-			return (vp);
-		}
-	}
-
-	mtx_unlock(&unionfs_hashmtx);
-
-	return (NULLVP);
-}
-
-/*
- * Act like unionfs_hashget, but add passed unionfs_node to hash if no existing
- * node found.
- */
-static struct vnode *
-unionfs_hashins(struct mount *mp, struct unionfs_node *uncp,
-		char *path, int lkflags, struct thread *td)
-{
-	struct unionfs_node_hashhead *hd;
-	struct unionfs_node *unp;
-	struct vnode   *vp;
-	int error;
-
-	if (lkflags & LK_TYPE_MASK)
-		lkflags |= LK_RETRY;
-	hd = UNIONFS_NHASH(uncp->un_uppervp, uncp->un_lowervp);
-
-	mtx_lock(&unionfs_hashmtx);
-	LIST_FOREACH(unp, hd, un_hash) {
-		if (unp->un_uppervp == uncp->un_uppervp &&
-		    unp->un_lowervp == uncp->un_lowervp &&
-		    unp->un_dvp == uncp->un_dvp &&
-		    UNIONFSTOV(unp)->v_mount == mp &&
-		    (!path || !(unp->un_path) || !strcmp(unp->un_path, path))) {
-			vp = UNIONFSTOV(unp);
-			VI_LOCK(vp);
-			mtx_unlock(&unionfs_hashmtx);
-			vp->v_iflag &= ~VI_OWEINACT;
-			error = vget(vp, LK_INTERLOCK, td);
-			if (error)
-				panic("unionfs_hashins: vget error %d", error);
-			if (lkflags & LK_TYPE_MASK)
-				vn_lock(vp, lkflags, td);
-			return (vp);
-		}
-	}
-
-	LIST_INSERT_HEAD(hd, uncp, un_hash);
-	uncp->un_flag |= UNIONFS_CACHED;
-	mtx_unlock(&unionfs_hashmtx);
-
-	return (NULLVP);
-}
-
-/*
  * Make a new or get existing unionfs node.
  * 
  * uppervp and lowervp should be unlocked. Because if new unionfs vnode is
@@ -210,20 +104,15 @@
 
 	ump = MOUNTTOUNIONFSMOUNT(mp);
 	lkflags = (cnp ? cnp->cn_lkflags : 0);
-	path = (cnp ? cnp->cn_nameptr : "");
+	path = (cnp ? cnp->cn_nameptr : NULL);
 
 	if (uppervp == NULLVP && lowervp == NULLVP)
 		panic("unionfs_nodeget: upper and lower is null");
 
 	/* If it has no ISLASTCN flag, path check is skipped. */
-	if (!cnp || !(cnp->cn_flags & ISLASTCN))
+	if (cnp && !(cnp->cn_flags & ISLASTCN))
 		path = NULL;
 
-	/* Lookup the hash first. */
-	*vpp = unionfs_hashget(mp, uppervp, lowervp, dvp, path, lkflags, td);
-	if (*vpp != NULLVP)
-		return (0);
-
 	if ((uppervp == NULLVP || ump->um_uppervp != uppervp) ||
 	    (lowervp == NULLVP || ump->um_lowervp != lowervp)) {
 		if (dvp == NULLVP)
@@ -239,7 +128,7 @@
 	    M_UNIONFSNODE, M_WAITOK | M_ZERO);
 
 	error = getnewvnode("unionfs", mp, &unionfs_vnodeops, &vp);
-	if (error) {
+	if (error != 0) {
 		FREE(unp, M_UNIONFSNODE);
 		return (error);
 	}
@@ -259,9 +148,9 @@
 	else
 		vp->v_vnlock = lowervp->v_vnlock;
 
-	if (cnp) {
+	if (path != NULL) {
 		unp->un_path = (char *)
-		    malloc(cnp->cn_namelen +1, M_UNIONFSPATH, M_WAITOK | M_ZERO);
+		    malloc(cnp->cn_namelen +1, M_UNIONFSPATH, M_WAITOK|M_ZERO);
 		bcopy(cnp->cn_nameptr, unp->un_path, cnp->cn_namelen);
 		unp->un_path[cnp->cn_namelen] = '\0';
 	}
@@ -272,23 +161,6 @@
 	    (lowervp != NULLVP && ump->um_lowervp == lowervp))
 		vp->v_vflag |= VV_ROOT;
 
-	*vpp = unionfs_hashins(mp, unp, path, lkflags, td);
-	if (*vpp != NULLVP) {
-		if (dvp != NULLVP)
-			vrele(dvp);
-		if (uppervp != NULLVP)
-			vrele(uppervp);
-		if (lowervp != NULLVP)
-			vrele(lowervp);
-
-		unp->un_uppervp = NULLVP;
-		unp->un_lowervp = NULLVP;
-		unp->un_dvp = NULLVP;
-		vrele(vp);
-
-		return (0);
-	}
-
 	if (lkflags & LK_TYPE_MASK)
 		vn_lock(vp, lkflags | LK_RETRY, td);
 
@@ -298,10 +170,10 @@
 }
 
 /*
- * Remove node from hash.
+ * Clean up the unionfs node.
  */
 void
-unionfs_hashrem(struct vnode *vp, struct thread *td)
+unionfs_noderem(struct vnode *vp, struct thread *td)
 {
 	int		vfslocked;
 	struct unionfs_node *unp;
@@ -326,13 +198,6 @@
 		VOP_UNLOCK(lvp, 0, td);
 	if (uvp != NULLVP)
 		VOP_UNLOCK(uvp, 0, td);
-
-	mtx_lock(&unionfs_hashmtx);
-	if (unp->un_flag & UNIONFS_CACHED) {
-		LIST_REMOVE(unp, un_hash);
-		unp->un_flag &= ~UNIONFS_CACHED;
-	}
-	mtx_unlock(&unionfs_hashmtx);
 	vp->v_object = NULL;
 
 	if (lvp != NULLVP) {
@@ -687,16 +552,6 @@
 	VI_UNLOCK(vp);
 	for (count = 1; count < lockcnt; count++)
 		vn_lock(uvp, LK_EXCLUSIVE | LK_CANRECURSE | LK_RETRY, td);
-
-	/*
-	 * cache update
-	 */
-	mtx_lock(&unionfs_hashmtx);
-	if (unp->un_flag & UNIONFS_CACHED)
-		LIST_REMOVE(unp, un_hash);
-	LIST_INSERT_HEAD(UNIONFS_NHASH(uvp, lvp), unp, un_hash);
-	unp->un_flag |= UNIONFS_CACHED;
-	mtx_unlock(&unionfs_hashmtx);
 }
 
 /*
@@ -1105,6 +960,12 @@
 		return (0);
 
 	/* open vnode */
+#ifdef MAC
+	if ((error = mac_check_vnode_open(cred, vp, VEXEC|VREAD)) != 0)
+		return (error);
+#endif
+	if ((error = VOP_ACCESS(vp, VEXEC|VREAD, cred, td)) != 0)
+		return (error);
 	if ((error = VOP_OPEN(vp, FREAD, cred, td, -1)) != 0)
 		return (error);
 

==== //depot/projects/dtrace6/src/sys/fs/unionfs/union_vfsops.c#2 (text+ko) ====

@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vfsops.c	8.20 (Berkeley) 5/20/95
- * $FreeBSD: src/sys/fs/unionfs/union_vfsops.c,v 1.76.2.2 2007/02/13 05:56:42 rodrigc Exp $
+ * $FreeBSD: src/sys/fs/unionfs/union_vfsops.c,v 1.76.2.5 2007/10/23 03:37:09 daichi Exp $
  */
 
 #include 
@@ -124,6 +124,7 @@
 	u_short		udir;
 	u_short		ufile;
 	unionfs_copymode copymode;
+	unionfs_whitemode whitemode;
 	struct componentname fakecn;
 	struct nameidata nd, *ndp;
 	struct vattr	va;
@@ -137,6 +138,7 @@
 	udir = 0;
 	ufile = 0;
 	copymode = UNIONFS_TRADITIONAL;	/* default */
+	whitemode = UNIONFS_WHITE_ALWAYS;
 	ndp = &nd;
 
 	if (mp->mnt_flag & MNT_ROOTFS) {
@@ -238,6 +240,20 @@
 				return (EINVAL);
 			}
 		}
+		if (vfs_getopt(mp->mnt_optnew, "whiteout", (void **)&tmp,
+		    NULL) == 0) {
+			if (tmp == NULL) {
+				vfs_mount_error(mp, "Invalid whiteout mode");
+				return (EINVAL);
+			} else if (strcasecmp(tmp, "always") == 0)
+				whitemode = UNIONFS_WHITE_ALWAYS;
+			else if (strcasecmp(tmp, "whenneeded") == 0)
+				whitemode = UNIONFS_WHITE_WHENNEEDED;
+			else {
+				vfs_mount_error(mp, "Invalid whiteout mode");
+				return (EINVAL);
+			}
+		}
 	}
 	/* If copymode is UNIONFS_TRADITIONAL, uid/gid is mounted user. */
 	if (copymode == UNIONFS_TRADITIONAL) {
@@ -287,7 +303,13 @@
 	ump->um_udir = udir;
 	ump->um_ufile = ufile;
 	ump->um_copymode = copymode;
+	ump->um_whitemode = whitemode;
 
+	MNT_ILOCK(mp);
+	if ((lowerrootvp->v_mount->mnt_kern_flag & MNTK_MPSAFE) &&
+	    (upperrootvp->v_mount->mnt_kern_flag & MNTK_MPSAFE))
+		mp->mnt_kern_flag |= MNTK_MPSAFE;
+	MNT_IUNLOCK(mp);
 	mp->mnt_data = (qaddr_t)ump;
 
 	/*
@@ -325,8 +347,8 @@
 	 */
 	error = unionfs_nodeget(mp, ump->um_uppervp, ump->um_lowervp,
 	    NULLVP, &(ump->um_rootvp), NULL, td);
+	vrele(upperrootvp);
 	if (error) {
-		vrele(upperrootvp);
 		free(ump, M_UNIONFSMNT);
 		mp->mnt_data = NULL;
 		return (error);

==== //depot/projects/dtrace6/src/sys/fs/unionfs/union_vnops.c#2 (text+ko) ====

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vnops.c	8.32 (Berkeley) 6/23/95
- * $FreeBSD: src/sys/fs/unionfs/union_vnops.c,v 1.132.2.1 2007/02/13 05:56:42 rodrigc Exp $
+ * $FreeBSD: src/sys/fs/unionfs/union_vnops.c,v 1.132.2.8 2007/10/23 03:37:10 daichi Exp $
  *
  */
 
@@ -88,7 +88,7 @@
 
 
 static int
-unionfs_lookup(struct vop_lookup_args *ap)
+unionfs_lookup(struct vop_cachedlookup_args *ap)
 {
 	int		iswhiteout;
 	int		lockflag;
@@ -171,7 +171,9 @@
 				vn_lock(dunp->un_dvp, cnp->cn_lkflags | LK_RETRY, td);
 
 			vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY, td);
-		}
+		} else if (error == ENOENT && (cnflags & MAKEENTRY) &&
+		    nameiop != CREATE)
+			cache_enter(dvp, NULLVP, cnp);
 
 		UNIONFS_INTERNAL_DEBUG("unionfs_lookup: leave (%d)\n", error);
 
@@ -318,12 +320,18 @@
 
 	*(ap->a_vpp) = vp;
 
+	if (cnflags & MAKEENTRY)
+		cache_enter(dvp, vp, cnp);
+
 unionfs_lookup_out:
 	if (uvp != NULLVP)
 		vrele(uvp);
 	if (lvp != NULLVP)
 		vrele(lvp);
 
+	if (error == ENOENT && (cnflags & MAKEENTRY) && nameiop != CREATE)
+		cache_enter(dvp, NULLVP, cnp);
+
 	UNIONFS_INTERNAL_DEBUG("unionfs_lookup: leave (%d)\n", error);
 
 	return (error);
@@ -874,6 +882,7 @@
 	unp = VTOUNIONFS(ap->a_vp);
 	unionfs_get_node_status(unp, ap->a_td, &unsp);
 	ovp = (unsp->uns_upper_opencnt ? unp->un_uppervp : unp->un_lowervp);
+	unionfs_tryrem_node_status(unp, ap->a_td, unsp);
 	VOP_UNLOCK(ap->a_vp, 0, ap->a_td);
 
 	if (ovp == NULLVP)
@@ -898,6 +907,7 @@
 	unp = VTOUNIONFS(ap->a_vp);
 	unionfs_get_node_status(unp, ap->a_td, &unsp);
 	ovp = (unsp->uns_upper_opencnt ? unp->un_uppervp : unp->un_lowervp);
+	unionfs_tryrem_node_status(unp, ap->a_td, unsp);
 	VOP_UNLOCK(ap->a_vp, 0, ap->a_td);
 
 	if (ovp == NULLVP)
@@ -916,6 +926,7 @@
 	unp = VTOUNIONFS(ap->a_vp);
 	unionfs_get_node_status(unp, ap->a_td, &unsp);
 	ovp = (unsp->uns_upper_opencnt ? unp->un_uppervp : unp->un_lowervp);
+	unionfs_tryrem_node_status(unp, ap->a_td, unsp);
 
 	if (ovp == NULLVP)
 		return (EBADF);
@@ -929,6 +940,7 @@
 	int		error;
 	struct unionfs_node *dunp;
 	struct unionfs_node *unp;
+	struct unionfs_mount *ump;
 	struct vnode   *udvp;
 	struct vnode   *uvp;
 	struct vnode   *lvp;
@@ -950,7 +962,9 @@
 		return (EROFS);
 
 	if (uvp != NULLVP) {
-		cnp->cn_flags |= DOWHITEOUT;
+		ump = MOUNTTOUNIONFSMOUNT(ap->a_vp->v_mount);
+		if (ump->um_whitemode == UNIONFS_WHITE_ALWAYS || lvp != NULLVP)
+			cnp->cn_flags |= DOWHITEOUT;
 		error = VOP_REMOVE(udvp, uvp, cnp);
 	} else if (lvp != NULLVP)
 		error = unionfs_mkwhiteout(udvp, cnp, td, unp->un_path);
@@ -1176,22 +1190,29 @@
 
 	error = VOP_RENAME(rfdvp, rfvp, fcnp, rtdvp, rtvp, tcnp);
 
+	if (error == 0) {
+		if (rtvp != NULLVP && rtvp->v_type == VDIR)
+			cache_purge(tdvp);
+		if (fvp->v_type == VDIR && fdvp != tdvp)
+			cache_purge(fdvp);
+	}
+
 	if (fdvp != rfdvp)
 		vrele(fdvp);
 	if (fvp != rfvp)
 		vrele(fvp);
+	if (ltdvp != NULLVP)
+		VOP_UNLOCK(ltdvp, 0, td);
 	if (tdvp != rtdvp)
 		vrele(tdvp);
+	if (ltvp != NULLVP)
+		VOP_UNLOCK(ltvp, 0, td);
 	if (tvp != rtvp && tvp != NULLVP) {
 		if (rtvp == NULLVP)
 			vput(tvp);
 		else
 			vrele(tvp);
 	}
-	if (ltdvp != NULLVP)
-		VOP_UNLOCK(ltdvp, 0, td);
-	if (ltvp != NULLVP)
-		VOP_UNLOCK(ltvp, 0, td);
 
 	UNIONFS_INTERNAL_DEBUG("unionfs_rename: leave (%d)\n", error);
 
@@ -1273,6 +1294,7 @@
 	int		error;
 	struct unionfs_node *dunp;
 	struct unionfs_node *unp;
+	struct unionfs_mount *ump;
 	struct componentname *cnp;
 	struct thread  *td;
 	struct vnode   *udvp;
@@ -1302,12 +1324,19 @@
 			if (error != 0)
 				return (error);
 		}
-		cnp->cn_flags |= DOWHITEOUT;
+		ump = MOUNTTOUNIONFSMOUNT(ap->a_vp->v_mount);
+		if (ump->um_whitemode == UNIONFS_WHITE_ALWAYS || lvp != NULLVP)
+			cnp->cn_flags |= DOWHITEOUT;
 		error = VOP_RMDIR(udvp, uvp, cnp);
 	}
 	else if (lvp != NULLVP)
 		error = unionfs_mkwhiteout(udvp, cnp, td, unp->un_path);
 
+	if (error == 0) {
+		cache_purge(ap->a_dvp);
+		cache_purge(ap->a_vp);
+	}
+
 	UNIONFS_INTERNAL_DEBUG("unionfs_rmdir: leave (%d)\n", error);
 
 	return (error);
@@ -1386,41 +1415,41 @@
 	/* check opaque */
 	if (uvp != NULLVP && lvp != NULLVP) {
 		if ((error = VOP_GETATTR(uvp, &va, ap->a_cred, td)) != 0)
-			return (error);
+			goto unionfs_readdir_exit;
 		if (va.va_flags & OPAQUE)
 			lvp = NULLVP;
 	}
 
+	/* check the open count. unionfs needs to open before readdir. */
 	if (VOP_ISLOCKED(ap->a_vp, td) != LK_EXCLUSIVE) {
 		vn_lock(ap->a_vp, LK_UPGRADE | LK_RETRY, td);
 		locked = 1;
 	}
-	unionfs_get_node_status(unp, curthread, &unsp);
+	unionfs_get_node_status(unp, td, &unsp);
+	if ((uvp != NULLVP && unsp->uns_upper_opencnt <= 0) ||
+	    (lvp != NULLVP && unsp->uns_lower_opencnt <= 0)) {
+		unionfs_tryrem_node_status(unp, td, unsp);
+		error = EBADF;
+	}
 	if (locked == 1)
 		vn_lock(ap->a_vp, LK_DOWNGRADE | LK_RETRY, td);
+	if (error != 0)
+		goto unionfs_readdir_exit;
 
 	/* upper only */
 	if (uvp != NULLVP && lvp == NULLVP) {
-		if (unsp->uns_upper_opencnt <= 0)
-			error = EBADF;
-		else {
-			error = VOP_READDIR(uvp, uio, ap->a_cred, ap->a_eofflag,
-			    ap->a_ncookies, ap->a_cookies);
-			unsp->uns_readdir_status = 0;
-		}
+		error = VOP_READDIR(uvp, uio, ap->a_cred, ap->a_eofflag,
+		    ap->a_ncookies, ap->a_cookies);
+		unsp->uns_readdir_status = 0;
 
 		goto unionfs_readdir_exit;
 	}
 
 	/* lower only */
 	if (uvp == NULLVP && lvp != NULLVP) {
-		if (unsp->uns_lower_opencnt <= 0)
-			error = EBADF;
-		else {
-			error = VOP_READDIR(lvp, uio, ap->a_cred, ap->a_eofflag,
-			    ap->a_ncookies, ap->a_cookies);
-			unsp->uns_readdir_status = 2;
-		}
+		error = VOP_READDIR(lvp, uio, ap->a_cred, ap->a_eofflag,
+		    ap->a_ncookies, ap->a_cookies);
+		unsp->uns_readdir_status = 2;
 
 		goto unionfs_readdir_exit;
 	}
@@ -1428,11 +1457,8 @@
 	/*
 	 * readdir upper and lower
 	 */
-	if (unsp->uns_lower_opencnt <= 0 || unsp->uns_upper_opencnt <= 0) {
-		error = EBADF;
-		goto unionfs_readdir_exit;
-	}
-
+	KASSERT(uvp != NULLVP, ("unionfs_readdir: null upper vp"));
+	KASSERT(lvp != NULLVP, ("unionfs_readdir: null lower vp"));
 	if (uio->uio_offset == 0)
 		unsp->uns_readdir_status = 0;
 
@@ -1441,10 +1467,8 @@
 		error = VOP_READDIR(uvp, uio, ap->a_cred, &eofflag,
 				    ap->a_ncookies, ap->a_cookies);
 
-		if (error != 0 || eofflag == 0) {
-			UNIONFS_INTERNAL_DEBUG("unionfs_readdir: leave (%d)\n", error);
-			return (error);
-		}
+		if (error != 0 || eofflag == 0)
+			goto unionfs_readdir_exit;
 		unsp->uns_readdir_status = 1;
 
 		/*
@@ -1453,10 +1477,8 @@
 		 * size of DIRBLKSIZ equals DEV_BSIZE.
 		 * (see: ufs/ufs/ufs_vnops.c ufs_readdir func , ufs/ufs/dir.h)
 		 */
-		if (uio->uio_resid <= (uio->uio_resid & (DEV_BSIZE -1))) {
-			UNIONFS_INTERNAL_DEBUG("unionfs_readdir: leave (%d)\n", error);
-			return (0);
-		}
+		if (uio->uio_resid <= (uio->uio_resid & (DEV_BSIZE -1)))
+			goto unionfs_readdir_exit;
 
 		/*
 		 * backup cookies
@@ -1506,6 +1528,9 @@
 	}
 
 unionfs_readdir_exit:
+	if (error != 0 && ap->a_eofflag != NULL)
+		*(ap->a_eofflag) = 1;
+
 	UNIONFS_INTERNAL_DEBUG("unionfs_readdir: leave (%d)\n", error);
 
 	return (error);
@@ -1568,13 +1593,8 @@
 static int
 unionfs_inactive(struct vop_inactive_args *ap)
 {
-	struct unionfs_node *unp;
-
-	unp = VTOUNIONFS(ap->a_vp);
-
-	if (unp == NULL || !(unp->un_flag & UNIONFS_CACHED))
-		vgone(ap->a_vp);
-
+	ap->a_vp->v_object = NULL;
+	vrecycle(ap->a_vp, ap->a_td);
 	return (0);
 }
 
@@ -1583,7 +1603,7 @@
 {
 	/* UNIONFS_INTERNAL_DEBUG("unionfs_reclaim: enter\n"); */
 
-	unionfs_hashrem(ap->a_vp, ap->a_td);
+	unionfs_noderem(ap->a_vp, ap->a_td);
 
 	/* UNIONFS_INTERNAL_DEBUG("unionfs_reclaim: leave\n"); */
 
@@ -1636,6 +1656,7 @@
 	int		flags;
 	int		revlock;
 	int		uhold;
+	struct mount   *mp;
 	struct unionfs_mount *ump;
 	struct unionfs_node *unp;
 	struct vnode   *vp;
@@ -1655,16 +1676,24 @@
 	if ((revlock = unionfs_get_llt_revlock(flags)) == 0)
 		panic("unknown lock type: 0x%x", flags & LK_TYPE_MASK);
 
-	if (!(flags & LK_INTERLOCK))
+	if ((flags & LK_INTERLOCK) == 0)
 		VI_LOCK(vp);
 
-	ump = MOUNTTOUNIONFSMOUNT(vp->v_mount);
+	mp = vp->v_mount;
+	if (mp == NULL)
+		goto unionfs_lock_null_vnode;
+

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Tue Oct 23 22:31:39 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D1DAA16A46D; Tue, 23 Oct 2007 22:31: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 830F616A420
	for ; Tue, 23 Oct 2007 22:31:38 +0000 (UTC)
	(envelope-from julian@elischer.org)
Received: from outF.internet-mail-service.net (outF.internet-mail-service.net
	[216.240.47.229])
	by mx1.freebsd.org (Postfix) with ESMTP id 77E7F13C481
	for ; Tue, 23 Oct 2007 22:31:38 +0000 (UTC)
	(envelope-from julian@elischer.org)
Received: from mx0.idiom.com (HELO idiom.com) (216.240.32.160)
	by out.internet-mail-service.net (qpsmtpd/0.40) with ESMTP;
	Tue, 23 Oct 2007 15:31:08 -0700
X-Client-Authorized: MaGic Cook1e
X-Client-Authorized: MaGic Cook1e
X-Client-Authorized: MaGic Cook1e
Received: from julian-mac.elischer.org (nat.ironport.com [63.251.108.100])
	by idiom.com (Postfix) with ESMTP id BCAA71267BD;
	Tue, 23 Oct 2007 15:31:07 -0700 (PDT)
Message-ID: <471E7645.1030503@elischer.org>
Date: Tue, 23 Oct 2007 15:31:33 -0700
From: Julian Elischer 
User-Agent: Thunderbird 2.0.0.6 (Macintosh/20070728)
MIME-Version: 1.0
To: Marko Zec 
References: <200710230018.l9N0IO8l020652@repoman.freebsd.org>
	<471D4514.5050109@elischer.org> <200710232314.38149.zec@icir.org>
In-Reply-To: <200710232314.38149.zec@icir.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: Perforce Change Reviews , Marko Zec 
Subject: Re: PERFORCE change 127942 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, 23 Oct 2007 22:31:39 -0000

Marko Zec wrote:
> On Tuesday 23 October 2007 02:49:24 Julian Elischer wrote:
>> question:
>>
>> can processes in two vimages communicate if they both have access
>> to the same named pipe/fifo in the filesystem?
> 
> Yes, provided that they open the fifo while they would be both attached 
> to the same vnet.  Once the sockets would become open the processes 
> could reassociate to arbitrary vimages, while the sockets would remain 
> bound to their original vnets for their entire lifetime duration.
hmm that's not what I want... what I want is an ability for processes in two overlapping
vimages to communicate easily without incuring the overhead of going throigh a virtual router.
another possibility is a local: interface (address 127.1.[vnet number]) which acts like
a local net  between the virtual machines.

> 
> As an alternative, we could / should introduce an extended socket() 
> syscall where an additional argument would explicitly specify to which 
> vimage/vnet the new socket should belong.

if a process in the root vimage makes fifo in /vimages/vimage1/usr/tmp/fifo1

and a process in vimage1 (that is chrooted at /vimages/vimage1/)
opens the fifo at /usr/tmp/fifo1

why can't they communicate?  I'm surprised at this..

> 
> Marko


From owner-p4-projects@FreeBSD.ORG  Tue Oct 23 23:06:49 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9AC0616A41B; Tue, 23 Oct 2007 23:06: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 2B9CD16A46B
	for ; Tue, 23 Oct 2007 23:06:49 +0000 (UTC)
	(envelope-from raj@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 273FD13C48E
	for ; Tue, 23 Oct 2007 23:06:49 +0000 (UTC)
	(envelope-from raj@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 l9NN6nxh026350
	for ; Tue, 23 Oct 2007 23:06:49 GMT
	(envelope-from raj@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9NN60Y0026305
	for perforce@freebsd.org; Tue, 23 Oct 2007 23:06:00 GMT
	(envelope-from raj@freebsd.org)
Date: Tue, 23 Oct 2007 23:06:00 GMT
Message-Id: <200710232306.l9NN60Y0026305@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	raj@freebsd.org using -f
From: Rafal Jaworowski 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 127979 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, 23 Oct 2007 23:06:50 -0000

http://perforce.freebsd.org/chv.cgi?CH=127979

Change 127979 by raj@raj_mimi on 2007/10/23 23:05:43

	IFC @127960

Affected files ...

.. //depot/projects/e500/Makefile#3 integrate
.. //depot/projects/e500/Makefile.inc1#5 integrate
.. //depot/projects/e500/ObsoleteFiles.inc#5 integrate
.. //depot/projects/e500/UPDATING#5 integrate
.. //depot/projects/e500/bin/getfacl/getfacl.c#2 integrate
.. //depot/projects/e500/bin/ps/print.c#2 integrate
.. //depot/projects/e500/bin/ps/ps.c#2 integrate
.. //depot/projects/e500/bin/sh/eval.c#2 integrate
.. //depot/projects/e500/bin/sh/sh.1#2 integrate
.. //depot/projects/e500/cddl/lib/Makefile#3 integrate
.. //depot/projects/e500/cddl/sbin/zfs/Makefile#2 integrate
.. //depot/projects/e500/cddl/sbin/zpool/Makefile#2 integrate
.. //depot/projects/e500/cddl/usr.bin/Makefile#3 integrate
.. //depot/projects/e500/cddl/usr.bin/ztest/Makefile#2 integrate
.. //depot/projects/e500/cddl/usr.sbin/Makefile#3 integrate
.. //depot/projects/e500/cddl/usr.sbin/zdb/Makefile#2 integrate
.. //depot/projects/e500/contrib/gcc/opts.c#3 integrate
.. //depot/projects/e500/contrib/groff/tmac/doc-common#2 integrate
.. //depot/projects/e500/contrib/groff/tmac/doc-syms#2 integrate
.. //depot/projects/e500/contrib/groff/tmac/groff_mdoc.man#2 integrate
.. //depot/projects/e500/contrib/ipfilter/BSD/Makefile#3 integrate
.. //depot/projects/e500/contrib/ipfilter/BSD/kupgrade#2 integrate
.. //depot/projects/e500/contrib/ipfilter/HISTORY#3 integrate
.. //depot/projects/e500/contrib/ipfilter/Makefile#3 integrate
.. //depot/projects/e500/contrib/ipfilter/ip_fil.c#3 integrate
.. //depot/projects/e500/contrib/ipfilter/iplang/Makefile#2 integrate
.. //depot/projects/e500/contrib/ipfilter/ipsend/iptests.c#3 integrate
.. //depot/projects/e500/contrib/ipfilter/ipsend/sock.c#3 integrate
.. //depot/projects/e500/contrib/ipfilter/l4check/Makefile#2 integrate
.. //depot/projects/e500/contrib/ipfilter/l4check/l4check.c#2 integrate
.. //depot/projects/e500/contrib/ipfilter/lib/Makefile#3 integrate
.. //depot/projects/e500/contrib/ipfilter/lib/alist_new.c#2 integrate
.. //depot/projects/e500/contrib/ipfilter/lib/ipft_tx.c#3 integrate
.. //depot/projects/e500/contrib/ipfilter/lib/printnat.c#3 integrate
.. //depot/projects/e500/contrib/ipfilter/lib/printpacket.c#3 integrate
.. //depot/projects/e500/contrib/ipfilter/lib/printpool_live.c#2 integrate
.. //depot/projects/e500/contrib/ipfilter/lib/printstate.c#3 integrate
.. //depot/projects/e500/contrib/ipfilter/man/ippool.5#2 integrate
.. //depot/projects/e500/contrib/ipfilter/md5.h#2 integrate
.. //depot/projects/e500/contrib/ipfilter/radix.c#2 integrate
.. //depot/projects/e500/contrib/ipfilter/radix_ipf.h#3 integrate
.. //depot/projects/e500/contrib/ipfilter/test/Makefile#3 integrate
.. //depot/projects/e500/contrib/ipfilter/test/dotest#2 integrate
.. //depot/projects/e500/contrib/ipfilter/test/expected/Makefile#1 branch
.. //depot/projects/e500/contrib/ipfilter/test/expected/f11#2 integrate
.. //depot/projects/e500/contrib/ipfilter/test/expected/f24#1 branch
.. //depot/projects/e500/contrib/ipfilter/test/expected/i19.dist#1 branch
.. //depot/projects/e500/contrib/ipfilter/test/expected/i21#2 integrate
.. //depot/projects/e500/contrib/ipfilter/test/expected/in1#2 integrate
.. //depot/projects/e500/contrib/ipfilter/test/expected/in6#2 integrate
.. //depot/projects/e500/contrib/ipfilter/test/expected/ipv6.6#1 branch
.. //depot/projects/e500/contrib/ipfilter/test/expected/n16#1 branch
.. //depot/projects/e500/contrib/ipfilter/test/input/f11#2 integrate
.. //depot/projects/e500/contrib/ipfilter/test/input/f24#1 branch
.. //depot/projects/e500/contrib/ipfilter/test/input/ipv6.6#1 branch
.. //depot/projects/e500/contrib/ipfilter/test/input/l1#2 integrate
.. //depot/projects/e500/contrib/ipfilter/test/input/n16#1 branch
.. //depot/projects/e500/contrib/ipfilter/test/nattest#2 integrate
.. //depot/projects/e500/contrib/ipfilter/test/regress/f24#1 branch
.. //depot/projects/e500/contrib/ipfilter/test/regress/i21#2 integrate
.. //depot/projects/e500/contrib/ipfilter/test/regress/i3#2 integrate
.. //depot/projects/e500/contrib/ipfilter/test/regress/in1#2 integrate
.. //depot/projects/e500/contrib/ipfilter/test/regress/in6#2 integrate
.. //depot/projects/e500/contrib/ipfilter/test/regress/ipv6.6#1 branch
.. //depot/projects/e500/contrib/ipfilter/test/regress/n16#1 branch
.. //depot/projects/e500/contrib/ipfilter/test/test.format#3 integrate
.. //depot/projects/e500/contrib/ipfilter/tools/ipf_y.y#3 integrate
.. //depot/projects/e500/contrib/ipfilter/tools/ipfstat.c#4 integrate
.. //depot/projects/e500/contrib/ipfilter/tools/ipmon.c#3 integrate
.. //depot/projects/e500/contrib/ipfilter/tools/ipnat.c#3 integrate
.. //depot/projects/e500/contrib/ipfilter/tools/ipnat_y.y#3 integrate
.. //depot/projects/e500/contrib/ipfilter/tools/lexer.c#3 integrate
.. //depot/projects/e500/contrib/less/NEWS#4 integrate
.. //depot/projects/e500/contrib/less/README#4 integrate
.. //depot/projects/e500/contrib/less/ch.c#3 integrate
.. //depot/projects/e500/contrib/less/charset.c#3 integrate
.. //depot/projects/e500/contrib/less/configure#3 integrate
.. //depot/projects/e500/contrib/less/configure.ac#3 integrate
.. //depot/projects/e500/contrib/less/filename.c#3 integrate
.. //depot/projects/e500/contrib/less/funcs.h#3 integrate
.. //depot/projects/e500/contrib/less/jump.c#3 integrate
.. //depot/projects/e500/contrib/less/less.h#3 integrate
.. //depot/projects/e500/contrib/less/less.man#4 integrate
.. //depot/projects/e500/contrib/less/less.nro#4 integrate
.. //depot/projects/e500/contrib/less/lessecho.man#4 integrate
.. //depot/projects/e500/contrib/less/lessecho.nro#4 integrate
.. //depot/projects/e500/contrib/less/lesskey.man#4 integrate
.. //depot/projects/e500/contrib/less/lesskey.nro#4 integrate
.. //depot/projects/e500/contrib/less/line.c#3 integrate
.. //depot/projects/e500/contrib/less/main.c#4 integrate
.. //depot/projects/e500/contrib/less/search.c#4 integrate
.. //depot/projects/e500/contrib/less/signal.c#3 integrate
.. //depot/projects/e500/contrib/less/version.c#4 integrate
.. //depot/projects/e500/contrib/libpcap/CHANGES#2 integrate
.. //depot/projects/e500/contrib/libpcap/CREDITS#2 integrate
.. //depot/projects/e500/contrib/libpcap/FILES#2 integrate
.. //depot/projects/e500/contrib/libpcap/INSTALL#2 delete
.. //depot/projects/e500/contrib/libpcap/INSTALL.txt#2 integrate
.. //depot/projects/e500/contrib/libpcap/Makefile.in#2 integrate
.. //depot/projects/e500/contrib/libpcap/README.dag#2 integrate
.. //depot/projects/e500/contrib/libpcap/TODO#2 integrate
.. //depot/projects/e500/contrib/libpcap/VERSION#2 integrate
.. //depot/projects/e500/contrib/libpcap/bpf_image.c#2 integrate
.. //depot/projects/e500/contrib/libpcap/config.h.in#2 integrate
.. //depot/projects/e500/contrib/libpcap/configure#2 integrate
.. //depot/projects/e500/contrib/libpcap/configure.in#2 integrate
.. //depot/projects/e500/contrib/libpcap/fad-getad.c#2 integrate
.. //depot/projects/e500/contrib/libpcap/fad-win32.c#2 integrate
.. //depot/projects/e500/contrib/libpcap/gencode.c#2 integrate
.. //depot/projects/e500/contrib/libpcap/gencode.h#2 integrate
.. //depot/projects/e500/contrib/libpcap/grammar.y#2 integrate
.. //depot/projects/e500/contrib/libpcap/inet.c#2 integrate
.. //depot/projects/e500/contrib/libpcap/lbl/gnuc.h#2 delete
.. //depot/projects/e500/contrib/libpcap/nametoaddr.c#2 integrate
.. //depot/projects/e500/contrib/libpcap/optimize.c#2 integrate
.. //depot/projects/e500/contrib/libpcap/packaging/pcap.spec.in#1 branch
.. //depot/projects/e500/contrib/libpcap/pcap-bpf.c#2 integrate
.. //depot/projects/e500/contrib/libpcap/pcap-bpf.h#2 integrate
.. //depot/projects/e500/contrib/libpcap/pcap-dag.c#2 integrate
.. //depot/projects/e500/contrib/libpcap/pcap-dlpi.c#2 integrate
.. //depot/projects/e500/contrib/libpcap/pcap-int.h#2 integrate
.. //depot/projects/e500/contrib/libpcap/pcap-linux.c#2 integrate
.. //depot/projects/e500/contrib/libpcap/pcap-win32.c#2 integrate
.. //depot/projects/e500/contrib/libpcap/pcap.3#2 integrate
.. //depot/projects/e500/contrib/libpcap/pcap.c#2 integrate
.. //depot/projects/e500/contrib/libpcap/pcap.h#2 integrate
.. //depot/projects/e500/contrib/libpcap/pf.h#2 delete
.. //depot/projects/e500/contrib/libpcap/savefile.c#2 integrate
.. //depot/projects/e500/contrib/libpcap/scanner.l#2 integrate
.. //depot/projects/e500/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch
.. //depot/projects/e500/contrib/pf/pflogd/pflogd.c#3 integrate
.. //depot/projects/e500/contrib/pf/pflogd/pidfile.c#4 delete
.. //depot/projects/e500/contrib/pf/pflogd/pidfile.h#4 delete
.. //depot/projects/e500/contrib/tcpdump/CHANGES#2 integrate
.. //depot/projects/e500/contrib/tcpdump/CREDITS#2 integrate
.. //depot/projects/e500/contrib/tcpdump/FILES#2 integrate
.. //depot/projects/e500/contrib/tcpdump/INSTALL#2 integrate
.. //depot/projects/e500/contrib/tcpdump/Makefile.in#2 integrate
.. //depot/projects/e500/contrib/tcpdump/README#2 integrate
.. //depot/projects/e500/contrib/tcpdump/VERSION#2 integrate
.. //depot/projects/e500/contrib/tcpdump/addrtoname.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/af.c#1 branch
.. //depot/projects/e500/contrib/tcpdump/af.h#1 branch
.. //depot/projects/e500/contrib/tcpdump/bootp.h#2 integrate
.. //depot/projects/e500/contrib/tcpdump/config.h.in#2 integrate
.. //depot/projects/e500/contrib/tcpdump/configure#2 integrate
.. //depot/projects/e500/contrib/tcpdump/configure.in#2 integrate
.. //depot/projects/e500/contrib/tcpdump/dccp.h#2 integrate
.. //depot/projects/e500/contrib/tcpdump/ieee802_11.h#3 integrate
.. //depot/projects/e500/contrib/tcpdump/ieee802_11_radio.h#3 integrate
.. //depot/projects/e500/contrib/tcpdump/interface.h#2 integrate
.. //depot/projects/e500/contrib/tcpdump/ip.h#2 integrate
.. //depot/projects/e500/contrib/tcpdump/llc.h#2 integrate
.. //depot/projects/e500/contrib/tcpdump/nameser.h#2 integrate
.. //depot/projects/e500/contrib/tcpdump/netdissect.h#2 integrate
.. //depot/projects/e500/contrib/tcpdump/ospf.h#2 integrate
.. //depot/projects/e500/contrib/tcpdump/parsenfsfh.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/pf.h#2 delete
.. //depot/projects/e500/contrib/tcpdump/print-802_11.c#3 integrate
.. //depot/projects/e500/contrib/tcpdump/print-atm.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-bfd.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-bgp.c#3 integrate
.. //depot/projects/e500/contrib/tcpdump/print-bootp.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-chdlc.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-dccp.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-dhcp6.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-domain.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-ether.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-fddi.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-fr.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-icmp.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-ip.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-ip6.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-ipfc.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-isoclns.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-juniper.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-l2tp.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-lane.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-ldp.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-llc.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-lmp.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-lspping.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-nfs.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-null.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-olsr.c#1 branch
.. //depot/projects/e500/contrib/tcpdump/print-ospf.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-pflog.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-pim.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-ppp.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-pptp.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-rsvp.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-rx.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-sctp.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-sll.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-smb.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-tcp.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-tftp.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-token.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/print-udp.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/smbutil.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/tcp.h#2 integrate
.. //depot/projects/e500/contrib/tcpdump/tcpdump-stdinc.h#2 integrate
.. //depot/projects/e500/contrib/tcpdump/tcpdump.1#2 integrate
.. //depot/projects/e500/contrib/tcpdump/tcpdump.c#2 integrate
.. //depot/projects/e500/contrib/tcpdump/tests/print-capX.out#2 integrate
.. //depot/projects/e500/contrib/tcpdump/tests/print-capXX.out#2 integrate
.. //depot/projects/e500/contrib/tcpdump/tftp.h#1 branch
.. //depot/projects/e500/contrib/tcpdump/udp.h#2 integrate
.. //depot/projects/e500/contrib/tcpdump/util.c#2 integrate
.. //depot/projects/e500/contrib/tcsh/sh.c#2 integrate
.. //depot/projects/e500/contrib/tcsh/sh.lex.c#2 integrate
.. //depot/projects/e500/contrib/tcsh/sh.proc.c#2 integrate
.. //depot/projects/e500/contrib/tcsh/tc.const.c#2 integrate
.. //depot/projects/e500/contrib/wpa_supplicant/main.c#3 integrate
.. //depot/projects/e500/crypto/heimdal/appl/su/Makefile.am#2 integrate
.. //depot/projects/e500/crypto/heimdal/appl/su/su.c#2 integrate
.. //depot/projects/e500/crypto/openssl/ssl/d1_both.c#2 integrate
.. //depot/projects/e500/crypto/openssl/ssl/dtls1.h#2 integrate
.. //depot/projects/e500/crypto/openssl/ssl/ssl.h#2 integrate
.. //depot/projects/e500/crypto/openssl/ssl/ssl_err.c#2 integrate
.. //depot/projects/e500/crypto/openssl/ssl/ssl_lib.c#2 integrate
.. //depot/projects/e500/etc/Makefile#3 integrate
.. //depot/projects/e500/etc/cached.conf#2 delete
.. //depot/projects/e500/etc/defaults/devfs.rules#2 integrate
.. //depot/projects/e500/etc/defaults/rc.conf#4 integrate
.. //depot/projects/e500/etc/mtree/BSD.include.dist#5 integrate
.. //depot/projects/e500/etc/mtree/BSD.local.dist#2 integrate
.. //depot/projects/e500/etc/mtree/BSD.x11-4.dist#2 integrate
.. //depot/projects/e500/etc/mtree/README#2 integrate
.. //depot/projects/e500/etc/nscd.conf#1 branch
.. //depot/projects/e500/etc/rc.d/Makefile#3 integrate
.. //depot/projects/e500/etc/rc.d/amd#2 integrate
.. //depot/projects/e500/etc/rc.d/cached#2 delete
.. //depot/projects/e500/etc/rc.d/early.sh#2 integrate
.. //depot/projects/e500/etc/rc.d/ftp-proxy#1 branch
.. //depot/projects/e500/etc/rc.d/kerberos#3 integrate
.. //depot/projects/e500/etc/rc.d/lockd#3 integrate
.. //depot/projects/e500/etc/rc.d/named#2 integrate
.. //depot/projects/e500/etc/rc.d/nscd#2 integrate
.. //depot/projects/e500/etc/rc.d/ppp#2 integrate
.. //depot/projects/e500/etc/rc.subr#4 integrate
.. //depot/projects/e500/etc/services#3 integrate
.. //depot/projects/e500/games/fortune/datfiles/fortunes#5 integrate
.. //depot/projects/e500/games/fortune/datfiles/fortunes-o.real#2 integrate
.. //depot/projects/e500/games/fortune/datfiles/limerick#2 integrate
.. //depot/projects/e500/gnu/lib/csu/Makefile#3 integrate
.. //depot/projects/e500/gnu/lib/libobjc/Makefile#3 integrate
.. //depot/projects/e500/gnu/usr.bin/binutils/ld/Makefile#2 integrate
.. //depot/projects/e500/gnu/usr.bin/binutils/ld/genscripts.sh#2 integrate
.. //depot/projects/e500/gnu/usr.bin/cc/cc_int/Makefile#3 integrate
.. //depot/projects/e500/gnu/usr.bin/cc/cc_tools/auto-host.h#3 integrate
.. //depot/projects/e500/gnu/usr.bin/cc/cc_tools/freebsd-native.h#3 integrate
.. //depot/projects/e500/gnu/usr.bin/diff/Makefile#3 integrate
.. //depot/projects/e500/gnu/usr.bin/groff/tmac/mdoc.local#2 integrate
.. //depot/projects/e500/gnu/usr.bin/man/man/man.c#2 integrate
.. //depot/projects/e500/gnu/usr.bin/sort/Makefile#2 integrate
.. //depot/projects/e500/gnu/usr.bin/texinfo/info/Makefile#2 integrate
.. //depot/projects/e500/include/Makefile#3 integrate
.. //depot/projects/e500/include/_ctype.h#2 integrate
.. //depot/projects/e500/include/ctype.h#2 integrate
.. //depot/projects/e500/include/wctype.h#2 integrate
.. //depot/projects/e500/kerberos5/usr.bin/ksu/Makefile#2 integrate
.. //depot/projects/e500/lib/Makefile#4 integrate
.. //depot/projects/e500/lib/libarchive/archive_read.3#3 integrate
.. //depot/projects/e500/lib/libarchive/archive_read_support_format_zip.c#4 integrate
.. //depot/projects/e500/lib/libarchive/archive_write_disk.c#5 integrate
.. //depot/projects/e500/lib/libarchive/archive_write_set_format_cpio.c#3 integrate
.. //depot/projects/e500/lib/libarchive/archive_write_set_format_cpio_newc.c#2 integrate
.. //depot/projects/e500/lib/libarchive/test/test_write_disk.c#4 integrate
.. //depot/projects/e500/lib/libarchive/test/test_write_format_cpio.c#2 integrate
.. //depot/projects/e500/lib/libbsm/Makefile#3 integrate
.. //depot/projects/e500/lib/libc/Makefile#4 integrate
.. //depot/projects/e500/lib/libc/arm/Symbol.map#4 integrate
.. //depot/projects/e500/lib/libc/arm/string/ffs.S#2 integrate
.. //depot/projects/e500/lib/libc/arm/string/memcpy.S#2 integrate
.. //depot/projects/e500/lib/libc/arm/string/memset.S#2 integrate
.. //depot/projects/e500/lib/libc/gdtoa/Symbol.map#2 integrate
.. //depot/projects/e500/lib/libc/gen/Makefile.inc#3 integrate
.. //depot/projects/e500/lib/libc/gen/sysctl.3#2 integrate
.. //depot/projects/e500/lib/libc/ia64/Symbol.map#3 integrate
.. //depot/projects/e500/lib/libc/locale/Symbol.map#2 integrate
.. //depot/projects/e500/lib/libc/locale/big5.c#2 integrate
.. //depot/projects/e500/lib/libc/locale/euc.c#2 integrate
.. //depot/projects/e500/lib/libc/locale/gb18030.c#2 integrate
.. //depot/projects/e500/lib/libc/locale/gb2312.c#2 integrate
.. //depot/projects/e500/lib/libc/locale/gbk.c#2 integrate
.. //depot/projects/e500/lib/libc/locale/isctype.c#2 integrate
.. //depot/projects/e500/lib/libc/locale/iswctype.c#2 integrate
.. //depot/projects/e500/lib/libc/locale/mskanji.c#2 integrate
.. //depot/projects/e500/lib/libc/locale/none.c#2 integrate
.. //depot/projects/e500/lib/libc/locale/setrunelocale.c#2 integrate
.. //depot/projects/e500/lib/libc/locale/utf8.c#2 integrate
.. //depot/projects/e500/lib/libc/net/getaddrinfo.c#2 integrate
.. //depot/projects/e500/lib/libc/net/nscache.c#2 integrate
.. //depot/projects/e500/lib/libc/net/sctp_connectx.3#3 integrate
.. //depot/projects/e500/lib/libc/net/sctp_opt_info.3#3 integrate
.. //depot/projects/e500/lib/libc/net/sctp_recvmsg.3#3 integrate
.. //depot/projects/e500/lib/libc/net/sctp_send.3#3 integrate
.. //depot/projects/e500/lib/libc/net/sctp_sendmsg.3#3 integrate
.. //depot/projects/e500/lib/libc/powerpc/Symbol.map#4 integrate
.. //depot/projects/e500/lib/libc/rpc/auth_time.c#2 integrate
.. //depot/projects/e500/lib/libc/rpc/getnetconfig.c#2 integrate
.. //depot/projects/e500/lib/libc/rpc/getnetpath.c#2 integrate
.. //depot/projects/e500/lib/libc/rpc/rpc_generic.c#2 integrate
.. //depot/projects/e500/lib/libc/rpc/rpcb_clnt.c#2 integrate
.. //depot/projects/e500/lib/libc/stdlib/atoi.3#2 integrate
.. //depot/projects/e500/lib/libc/stdlib/getenv.c#3 integrate
.. //depot/projects/e500/lib/libc/sys/Makefile.inc#4 integrate
.. //depot/projects/e500/lib/libc/sys/kldstat.2#2 integrate
.. //depot/projects/e500/lib/libc/sys/kqueue.2#2 integrate
.. //depot/projects/e500/lib/libc/sys/minherit.2#2 integrate
.. //depot/projects/e500/lib/libc/sys/ntp_adjtime.2#2 integrate
.. //depot/projects/e500/lib/libc/sys/ntp_gettime.2#2 delete
.. //depot/projects/e500/lib/libdisk/open_disk.c#3 integrate
.. //depot/projects/e500/lib/libdisk/open_ia64_disk.c#2 integrate
.. //depot/projects/e500/lib/libelf/elf.3#2 integrate
.. //depot/projects/e500/lib/libelf/elf_flagdata.3#2 integrate
.. //depot/projects/e500/lib/libelf/elf_getscn.3#2 integrate
.. //depot/projects/e500/lib/libelf/elf_update.3#2 integrate
.. //depot/projects/e500/lib/libelf/elf_update.c#2 integrate
.. //depot/projects/e500/lib/libelf/gelf_getphdr.3#2 integrate
.. //depot/projects/e500/lib/libelf/gelf_newehdr.3#2 integrate
.. //depot/projects/e500/lib/libelf/gelf_newphdr.3#2 integrate
.. //depot/projects/e500/lib/libelf/libelf_convert.m4#2 integrate
.. //depot/projects/e500/lib/libkse/Makefile#1 branch
.. //depot/projects/e500/lib/libkse/arch/amd64/Makefile.inc#1 branch
.. //depot/projects/e500/lib/libkse/arch/amd64/amd64/context.S#1 branch
.. //depot/projects/e500/lib/libkse/arch/amd64/amd64/enter_uts.S#1 branch
.. //depot/projects/e500/lib/libkse/arch/amd64/amd64/pthread_md.c#1 branch
.. //depot/projects/e500/lib/libkse/arch/amd64/include/atomic_ops.h#1 branch
.. //depot/projects/e500/lib/libkse/arch/amd64/include/pthread_md.h#1 branch
.. //depot/projects/e500/lib/libkse/arch/arm/Makefile.inc#1 branch
.. //depot/projects/e500/lib/libkse/arch/arm/arm/context.S#1 branch
.. //depot/projects/e500/lib/libkse/arch/arm/arm/pthread_md.c#1 branch
.. //depot/projects/e500/lib/libkse/arch/arm/include/atomic_ops.h#1 branch
.. //depot/projects/e500/lib/libkse/arch/arm/include/pthread_md.h#1 branch
.. //depot/projects/e500/lib/libkse/arch/i386/Makefile.inc#1 branch
.. //depot/projects/e500/lib/libkse/arch/i386/i386/pthread_md.c#1 branch
.. //depot/projects/e500/lib/libkse/arch/i386/i386/thr_enter_uts.S#1 branch
.. //depot/projects/e500/lib/libkse/arch/i386/i386/thr_getcontext.S#1 branch
.. //depot/projects/e500/lib/libkse/arch/i386/include/atomic_ops.h#1 branch
.. //depot/projects/e500/lib/libkse/arch/i386/include/pthread_md.h#1 branch
.. //depot/projects/e500/lib/libkse/arch/ia64/Makefile.inc#1 branch
.. //depot/projects/e500/lib/libkse/arch/ia64/ia64/context.S#1 branch
.. //depot/projects/e500/lib/libkse/arch/ia64/ia64/enter_uts.S#1 branch
.. //depot/projects/e500/lib/libkse/arch/ia64/ia64/pthread_md.c#1 branch
.. //depot/projects/e500/lib/libkse/arch/ia64/include/atomic_ops.h#1 branch
.. //depot/projects/e500/lib/libkse/arch/ia64/include/pthread_md.h#1 branch
.. //depot/projects/e500/lib/libkse/arch/powerpc/Makefile.inc#1 branch
.. //depot/projects/e500/lib/libkse/arch/powerpc/include/atomic_ops.h#1 branch
.. //depot/projects/e500/lib/libkse/arch/powerpc/include/pthread_md.h#1 branch
.. //depot/projects/e500/lib/libkse/arch/powerpc/powerpc/assym.c#1 branch
.. //depot/projects/e500/lib/libkse/arch/powerpc/powerpc/assym.s#1 branch
.. //depot/projects/e500/lib/libkse/arch/powerpc/powerpc/context.S#1 branch
.. //depot/projects/e500/lib/libkse/arch/powerpc/powerpc/enter_uts.S#1 branch
.. //depot/projects/e500/lib/libkse/arch/powerpc/powerpc/pthread_md.c#1 branch
.. //depot/projects/e500/lib/libkse/arch/sparc64/Makefile.inc#1 branch
.. //depot/projects/e500/lib/libkse/arch/sparc64/include/atomic_ops.h#1 branch
.. //depot/projects/e500/lib/libkse/arch/sparc64/include/pthread_md.h#1 branch
.. //depot/projects/e500/lib/libkse/arch/sparc64/sparc64/assym.s#1 branch
.. //depot/projects/e500/lib/libkse/arch/sparc64/sparc64/pthread_md.c#1 branch
.. //depot/projects/e500/lib/libkse/arch/sparc64/sparc64/thr_getcontext.S#1 branch
.. //depot/projects/e500/lib/libkse/kse.map#1 branch
.. //depot/projects/e500/lib/libkse/support/Makefile.inc#1 branch
.. //depot/projects/e500/lib/libkse/support/thr_support.c#1 branch
.. //depot/projects/e500/lib/libkse/sys/Makefile.inc#1 branch
.. //depot/projects/e500/lib/libkse/sys/lock.c#1 branch
.. //depot/projects/e500/lib/libkse/sys/lock.h#1 branch
.. //depot/projects/e500/lib/libkse/sys/thr_error.c#1 branch
.. //depot/projects/e500/lib/libkse/test/Makefile#1 branch
.. //depot/projects/e500/lib/libkse/test/README#1 branch
.. //depot/projects/e500/lib/libkse/test/guard_b.c#1 branch
.. //depot/projects/e500/lib/libkse/test/guard_b.exp#1 branch
.. //depot/projects/e500/lib/libkse/test/guard_s.pl#1 branch
.. //depot/projects/e500/lib/libkse/test/hello_b.c#1 branch
.. //depot/projects/e500/lib/libkse/test/hello_d.c#1 branch
.. //depot/projects/e500/lib/libkse/test/hello_d.exp#1 branch
.. //depot/projects/e500/lib/libkse/test/hello_s.c#1 branch
.. //depot/projects/e500/lib/libkse/test/join_leak_d.c#1 branch
.. //depot/projects/e500/lib/libkse/test/join_leak_d.exp#1 branch
.. //depot/projects/e500/lib/libkse/test/mutex_d.c#1 branch
.. //depot/projects/e500/lib/libkse/test/mutex_d.exp#1 branch
.. //depot/projects/e500/lib/libkse/test/propagate_s.pl#1 branch
.. //depot/projects/e500/lib/libkse/test/sem_d.c#1 branch
.. //depot/projects/e500/lib/libkse/test/sem_d.exp#1 branch
.. //depot/projects/e500/lib/libkse/test/sigsuspend_d.c#1 branch
.. //depot/projects/e500/lib/libkse/test/sigsuspend_d.exp#1 branch
.. //depot/projects/e500/lib/libkse/test/sigwait_d.c#1 branch
.. //depot/projects/e500/lib/libkse/test/sigwait_d.exp#1 branch
.. //depot/projects/e500/lib/libkse/test/verify#1 branch
.. //depot/projects/e500/lib/libkse/thread/Makefile.inc#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_accept.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_aio_suspend.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_atfork.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_attr_destroy.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_attr_get_np.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_attr_getdetachstate.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_attr_getguardsize.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_attr_getinheritsched.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_attr_getschedparam.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_attr_getschedpolicy.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_attr_getscope.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_attr_getstack.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_attr_getstackaddr.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_attr_getstacksize.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_attr_init.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_attr_setdetachstate.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_attr_setguardsize.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_attr_setinheritsched.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_attr_setschedparam.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_attr_setschedpolicy.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_attr_setscope.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_attr_setstack.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_attr_setstackaddr.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_attr_setstacksize.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_autoinit.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_barrier.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_barrierattr.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_cancel.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_clean.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_close.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_concurrency.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_cond.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_condattr_destroy.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_condattr_init.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_condattr_pshared.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_connect.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_creat.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_create.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_detach.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_equal.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_execve.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_exit.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_fcntl.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_find_thread.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_fork.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_fsync.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_getprio.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_getschedparam.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_info.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_init.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_join.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_kern.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_kill.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_main_np.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_mattr_init.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_mattr_kind_np.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_mattr_pshared.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_msync.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_multi_np.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_mutex.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_mutex_prioceiling.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_mutex_protocol.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_mutexattr_destroy.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_nanosleep.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_once.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_open.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_pause.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_poll.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_printf.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_priority_queue.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_private.h#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_pselect.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_pspinlock.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_raise.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_read.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_readv.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_resume_np.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_rtld.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_rwlock.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_rwlockattr.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_select.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_self.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_sem.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_seterrno.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_setprio.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_setschedparam.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_sig.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_sigaction.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_sigaltstack.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_sigmask.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_sigpending.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_sigprocmask.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_sigsuspend.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_sigwait.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_single_np.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_sleep.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_spec.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_spinlock.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_stack.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_suspend_np.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_switch_np.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_symbols.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_system.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_tcdrain.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_vfork.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_wait.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_wait4.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_waitpid.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_write.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_writev.c#1 branch
.. //depot/projects/e500/lib/libkse/thread/thr_yield.c#1 branch
.. //depot/projects/e500/lib/libkvm/kvm_proc.c#3 integrate
.. //depot/projects/e500/lib/libpam/modules/pam_unix/Makefile#2 integrate
.. //depot/projects/e500/lib/libpcap/Makefile#3 integrate
.. //depot/projects/e500/lib/libpcap/config.h#2 integrate
.. //depot/projects/e500/lib/libpthread/Makefile#3 delete
.. //depot/projects/e500/lib/libpthread/arch/amd64/Makefile.inc#2 delete
.. //depot/projects/e500/lib/libpthread/arch/amd64/amd64/context.S#2 delete
.. //depot/projects/e500/lib/libpthread/arch/amd64/amd64/enter_uts.S#2 delete
.. //depot/projects/e500/lib/libpthread/arch/amd64/amd64/pthread_md.c#2 delete
.. //depot/projects/e500/lib/libpthread/arch/amd64/include/atomic_ops.h#2 delete
.. //depot/projects/e500/lib/libpthread/arch/amd64/include/pthread_md.h#2 delete
.. //depot/projects/e500/lib/libpthread/arch/arm/Makefile.inc#2 delete
.. //depot/projects/e500/lib/libpthread/arch/arm/arm/context.S#2 delete
.. //depot/projects/e500/lib/libpthread/arch/arm/arm/pthread_md.c#2 delete
.. //depot/projects/e500/lib/libpthread/arch/arm/include/atomic_ops.h#2 delete
.. //depot/projects/e500/lib/libpthread/arch/arm/include/pthread_md.h#2 delete
.. //depot/projects/e500/lib/libpthread/arch/i386/Makefile.inc#2 delete
.. //depot/projects/e500/lib/libpthread/arch/i386/i386/pthread_md.c#2 delete
.. //depot/projects/e500/lib/libpthread/arch/i386/i386/thr_enter_uts.S#2 delete
.. //depot/projects/e500/lib/libpthread/arch/i386/i386/thr_getcontext.S#2 delete
.. //depot/projects/e500/lib/libpthread/arch/i386/include/atomic_ops.h#2 delete
.. //depot/projects/e500/lib/libpthread/arch/i386/include/pthread_md.h#2 delete
.. //depot/projects/e500/lib/libpthread/arch/ia64/Makefile.inc#2 delete
.. //depot/projects/e500/lib/libpthread/arch/ia64/ia64/context.S#2 delete
.. //depot/projects/e500/lib/libpthread/arch/ia64/ia64/enter_uts.S#2 delete
.. //depot/projects/e500/lib/libpthread/arch/ia64/ia64/pthread_md.c#2 delete
.. //depot/projects/e500/lib/libpthread/arch/ia64/include/atomic_ops.h#2 delete
.. //depot/projects/e500/lib/libpthread/arch/ia64/include/pthread_md.h#2 delete
.. //depot/projects/e500/lib/libpthread/arch/powerpc/Makefile.inc#2 delete
.. //depot/projects/e500/lib/libpthread/arch/powerpc/include/atomic_ops.h#2 delete
.. //depot/projects/e500/lib/libpthread/arch/powerpc/include/pthread_md.h#2 delete
.. //depot/projects/e500/lib/libpthread/arch/powerpc/powerpc/assym.c#2 delete
.. //depot/projects/e500/lib/libpthread/arch/powerpc/powerpc/assym.s#2 delete
.. //depot/projects/e500/lib/libpthread/arch/powerpc/powerpc/context.S#2 delete
.. //depot/projects/e500/lib/libpthread/arch/powerpc/powerpc/enter_uts.S#2 delete
.. //depot/projects/e500/lib/libpthread/arch/powerpc/powerpc/pthread_md.c#2 delete
.. //depot/projects/e500/lib/libpthread/arch/sparc64/Makefile.inc#2 delete
.. //depot/projects/e500/lib/libpthread/arch/sparc64/include/atomic_ops.h#2 delete
.. //depot/projects/e500/lib/libpthread/arch/sparc64/include/pthread_md.h#2 delete
.. //depot/projects/e500/lib/libpthread/arch/sparc64/sparc64/assym.s#2 delete
.. //depot/projects/e500/lib/libpthread/arch/sparc64/sparc64/pthread_md.c#2 delete
.. //depot/projects/e500/lib/libpthread/arch/sparc64/sparc64/thr_getcontext.S#2 delete
.. //depot/projects/e500/lib/libpthread/pthread.map#3 delete
.. //depot/projects/e500/lib/libpthread/support/Makefile.inc#2 delete
.. //depot/projects/e500/lib/libpthread/support/thr_support.c#2 delete
.. //depot/projects/e500/lib/libpthread/sys/Makefile.inc#2 delete
.. //depot/projects/e500/lib/libpthread/sys/lock.c#2 delete
.. //depot/projects/e500/lib/libpthread/sys/lock.h#2 delete
.. //depot/projects/e500/lib/libpthread/sys/thr_error.c#2 delete
.. //depot/projects/e500/lib/libpthread/test/Makefile#2 delete
.. //depot/projects/e500/lib/libpthread/test/README#2 delete
.. //depot/projects/e500/lib/libpthread/test/guard_b.c#2 delete
.. //depot/projects/e500/lib/libpthread/test/guard_b.exp#2 delete
.. //depot/projects/e500/lib/libpthread/test/guard_s.pl#2 delete
.. //depot/projects/e500/lib/libpthread/test/hello_b.c#2 delete
.. //depot/projects/e500/lib/libpthread/test/hello_d.c#2 delete
.. //depot/projects/e500/lib/libpthread/test/hello_d.exp#2 delete
.. //depot/projects/e500/lib/libpthread/test/hello_s.c#2 delete
.. //depot/projects/e500/lib/libpthread/test/join_leak_d.c#2 delete
.. //depot/projects/e500/lib/libpthread/test/join_leak_d.exp#2 delete
.. //depot/projects/e500/lib/libpthread/test/mutex_d.c#2 delete
.. //depot/projects/e500/lib/libpthread/test/mutex_d.exp#2 delete
.. //depot/projects/e500/lib/libpthread/test/propagate_s.pl#2 delete
.. //depot/projects/e500/lib/libpthread/test/sem_d.c#2 delete
.. //depot/projects/e500/lib/libpthread/test/sem_d.exp#2 delete
.. //depot/projects/e500/lib/libpthread/test/sigsuspend_d.c#2 delete
.. //depot/projects/e500/lib/libpthread/test/sigsuspend_d.exp#2 delete
.. //depot/projects/e500/lib/libpthread/test/sigwait_d.c#2 delete
.. //depot/projects/e500/lib/libpthread/test/sigwait_d.exp#2 delete
.. //depot/projects/e500/lib/libpthread/test/verify#2 delete
.. //depot/projects/e500/lib/libpthread/thread/Makefile.inc#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_accept.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_aio_suspend.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_atfork.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_attr_destroy.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_attr_get_np.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_attr_getdetachstate.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_attr_getguardsize.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_attr_getinheritsched.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_attr_getschedparam.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_attr_getschedpolicy.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_attr_getscope.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_attr_getstack.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_attr_getstackaddr.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_attr_getstacksize.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_attr_init.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_attr_setdetachstate.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_attr_setguardsize.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_attr_setinheritsched.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_attr_setschedparam.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_attr_setschedpolicy.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_attr_setscope.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_attr_setstack.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_attr_setstackaddr.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_attr_setstacksize.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_autoinit.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_barrier.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_barrierattr.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_cancel.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_clean.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_close.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_concurrency.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_cond.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_condattr_destroy.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_condattr_init.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_condattr_pshared.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_connect.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_creat.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_create.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_detach.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_equal.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_execve.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_exit.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_fcntl.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_find_thread.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_fork.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_fsync.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_getprio.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_getschedparam.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_info.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_init.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_join.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_kern.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_kill.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_main_np.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_mattr_init.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_mattr_kind_np.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_mattr_pshared.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_msync.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_multi_np.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_mutex.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_mutex_prioceiling.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_mutex_protocol.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_mutexattr_destroy.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_nanosleep.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_once.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_open.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_pause.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_poll.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_printf.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_priority_queue.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_private.h#3 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_pselect.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_pspinlock.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_raise.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_read.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_readv.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_resume_np.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_rtld.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_rwlock.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_rwlockattr.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_select.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_self.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_sem.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_seterrno.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_setprio.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_setschedparam.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_sig.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_sigaction.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_sigaltstack.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_sigmask.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_sigpending.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_sigprocmask.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_sigsuspend.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_sigwait.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_single_np.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_sleep.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_spec.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_spinlock.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_stack.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_suspend_np.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_switch_np.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_symbols.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_system.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_tcdrain.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_vfork.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_wait.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_wait4.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_waitpid.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_write.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_writev.c#2 delete
.. //depot/projects/e500/lib/libpthread/thread/thr_yield.c#2 delete
.. //depot/projects/e500/lib/libstand/Makefile#4 integrate
.. //depot/projects/e500/lib/libstand/tftp.c#2 integrate
.. //depot/projects/e500/lib/libthr/Makefile#4 integrate
.. //depot/projects/e500/lib/libthr/libthr.3#2 integrate
.. //depot/projects/e500/lib/libthr/thread/thr_once.c#2 integrate
.. //depot/projects/e500/lib/libthr/thread/thr_pspinlock.c#2 integrate
.. //depot/projects/e500/lib/libutil/Makefile#3 integrate
.. //depot/projects/e500/lib/libutil/expand_number.3#1 branch
.. //depot/projects/e500/lib/libutil/expand_number.c#1 branch
.. //depot/projects/e500/lib/libutil/flopen.3#3 integrate
.. //depot/projects/e500/lib/libutil/humanize_number.3#2 integrate
.. //depot/projects/e500/lib/libutil/kld.3#2 integrate
.. //depot/projects/e500/lib/libutil/libutil.h#3 integrate
.. //depot/projects/e500/lib/libutil/pidfile.3#2 integrate
.. //depot/projects/e500/lib/libutil/pidfile.c#4 integrate
.. //depot/projects/e500/lib/ncurses/ncurses/Makefile#4 integrate
.. //depot/projects/e500/libexec/atrun/Makefile#3 integrate
.. //depot/projects/e500/libexec/rtld-elf/sparc64/reloc.c#3 integrate
.. //depot/projects/e500/release/Makefile#4 integrate
.. //depot/projects/e500/release/doc/en_US.ISO8859-1/hardware/article.sgml#4 integrate
.. //depot/projects/e500/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 integrate
.. //depot/projects/e500/release/doc/share/misc/dev.archlist.txt#4 integrate
.. //depot/projects/e500/release/doc/share/sgml/release.ent#4 integrate
.. //depot/projects/e500/sbin/camcontrol/Makefile#2 integrate
.. //depot/projects/e500/sbin/camcontrol/camcontrol.8#2 integrate
.. //depot/projects/e500/sbin/camcontrol/camcontrol.c#2 integrate
.. //depot/projects/e500/sbin/dhclient/dhclient.8#2 integrate
.. //depot/projects/e500/sbin/fsck_ffs/Makefile#2 integrate
.. //depot/projects/e500/sbin/fsck_ffs/main.c#3 integrate
.. //depot/projects/e500/sbin/geom/class/Makefile#3 integrate
.. //depot/projects/e500/sbin/geom/class/eli/geli.8#2 integrate
.. //depot/projects/e500/sbin/geom/class/part/geom_part.c#2 integrate
.. //depot/projects/e500/sbin/geom/class/part/gpart.8#2 integrate
.. //depot/projects/e500/sbin/geom/class/virstor/Makefile#1 branch
.. //depot/projects/e500/sbin/geom/class/virstor/geom_virstor.c#1 branch
.. //depot/projects/e500/sbin/geom/class/virstor/gvirstor.8#1 branch
.. //depot/projects/e500/sbin/geom/core/geom.8#2 integrate
.. //depot/projects/e500/sbin/geom/core/geom.c#3 integrate
.. //depot/projects/e500/sbin/ggate/Makefile#2 integrate
.. //depot/projects/e500/sbin/ifconfig/ifconfig.c#4 integrate
.. //depot/projects/e500/sbin/ipfw/ipfw.8#3 integrate
.. //depot/projects/e500/sbin/ipfw/ipfw2.c#4 integrate
.. //depot/projects/e500/sbin/kldstat/kldstat.c#2 integrate
.. //depot/projects/e500/sbin/mount/mount.8#3 integrate
.. //depot/projects/e500/sbin/mount_unionfs/mount_unionfs.8#2 integrate
.. //depot/projects/e500/sbin/quotacheck/preen.c#2 integrate
.. //depot/projects/e500/sbin/quotacheck/quotacheck.c#2 integrate
.. //depot/projects/e500/sbin/sysctl/sysctl.8#3 integrate
.. //depot/projects/e500/sbin/sysctl/sysctl.c#4 integrate
.. //depot/projects/e500/sbin/tunefs/tunefs.8#3 integrate
.. //depot/projects/e500/share/examples/cvsup/cvs-supfile#3 integrate
.. //depot/projects/e500/share/examples/cvsup/doc-supfile#2 integrate
.. //depot/projects/e500/share/examples/cvsup/gnats-supfile#2 integrate
.. //depot/projects/e500/share/examples/cvsup/ports-supfile#3 integrate
.. //depot/projects/e500/share/examples/cvsup/stable-supfile#2 integrate
.. //depot/projects/e500/share/examples/cvsup/standard-supfile#2 integrate
.. //depot/projects/e500/share/examples/cvsup/www-supfile#2 integrate
.. //depot/projects/e500/share/man/man3/Makefile#2 integrate
.. //depot/projects/e500/share/man/man3/pthread.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_attr.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_attr_get_np.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_attr_setcreatesuspend_np.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_barrier_destroy.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_barrierattr.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_cancel.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_cleanup_pop.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_cleanup_push.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_cond_broadcast.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_cond_destroy.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_cond_init.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_cond_signal.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_cond_timedwait.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_cond_wait.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_condattr.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_create.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_detach.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_equal.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_exit.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_getconcurrency.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_getspecific.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_join.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_key_create.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_key_delete.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_kill.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_main_np.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_multi_np.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_mutex_destroy.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_mutex_init.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_mutex_lock.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_mutex_timedlock.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_mutex_trylock.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_mutex_unlock.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_mutexattr.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_mutexattr_getkind_np.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_once.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_resume_all_np.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_resume_np.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_rwlock_destroy.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_rwlock_init.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_rwlock_rdlock.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_rwlock_timedrdlock.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_rwlock_timedwrlock.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_rwlock_unlock.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_rwlock_wrlock.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_rwlockattr_destroy.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_rwlockattr_getpshared.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_rwlockattr_init.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_rwlockattr_setpshared.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_schedparam.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_self.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_set_name_np.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_setspecific.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_sigmask.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_spin_init.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_spin_lock.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_switch_add_np.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_testcancel.3#2 integrate
.. //depot/projects/e500/share/man/man3/pthread_yield.3#2 integrate
.. //depot/projects/e500/share/man/man4/Makefile#6 integrate
.. //depot/projects/e500/share/man/man4/ata.4#2 integrate
.. //depot/projects/e500/share/man/man4/coretemp.4#2 integrate
.. //depot/projects/e500/share/man/man4/cxgb.4#2 integrate
.. //depot/projects/e500/share/man/man4/gem.4#3 integrate
.. //depot/projects/e500/share/man/man4/hwpmc.4#2 integrate
.. //depot/projects/e500/share/man/man4/if_bridge.4#2 integrate
.. //depot/projects/e500/share/man/man4/pci.4#2 integrate
.. //depot/projects/e500/share/man/man4/ral.4#2 integrate
.. //depot/projects/e500/share/man/man4/rum.4#3 integrate
.. //depot/projects/e500/share/man/man4/sctp.4#2 integrate
.. //depot/projects/e500/share/man/man4/snd_emu10kx.4#2 integrate
.. //depot/projects/e500/share/man/man4/ural.4#4 integrate
.. //depot/projects/e500/share/man/man4/uscanner.4#2 integrate
.. //depot/projects/e500/share/man/man4/wlan.4#3 integrate
.. //depot/projects/e500/share/man/man4/wlan_amrr.4#2 integrate
.. //depot/projects/e500/share/man/man4/zyd.4#1 branch
.. //depot/projects/e500/share/man/man5/Makefile#3 integrate
.. //depot/projects/e500/share/man/man5/ar.5#1 branch
.. //depot/projects/e500/share/man/man5/elf.5#2 integrate
.. //depot/projects/e500/share/man/man5/fstab.5#2 integrate
.. //depot/projects/e500/share/man/man5/nsswitch.conf.5#2 integrate
.. //depot/projects/e500/share/man/man5/rc.conf.5#4 integrate
.. //depot/projects/e500/share/man/man5/src.conf.5#4 integrate
.. //depot/projects/e500/share/man/man7/Makefile#3 integrate
.. //depot/projects/e500/share/man/man9/DECLARE_GEOM_CLASS.9#2 integrate
.. //depot/projects/e500/share/man/man9/Makefile#3 integrate
.. //depot/projects/e500/share/man/man9/crypto.9#2 integrate
.. //depot/projects/e500/share/man/man9/kproc.9#1 branch
.. //depot/projects/e500/share/man/man9/kthread.9#2 integrate
.. //depot/projects/e500/share/man/man9/pci.9#2 integrate
.. //depot/projects/e500/share/man/man9/sleepqueue.9#2 integrate
.. //depot/projects/e500/share/man/man9/suser.9#3 integrate
.. //depot/projects/e500/share/misc/committers-ports.dot#3 integrate
.. //depot/projects/e500/share/misc/committers-src.dot#3 integrate
.. //depot/projects/e500/share/mk/bsd.compat.mk#2 integrate
.. //depot/projects/e500/share/mk/bsd.cpu.mk#5 integrate
.. //depot/projects/e500/share/mk/bsd.lib.mk#3 integrate
.. //depot/projects/e500/share/mk/bsd.libnames.mk#3 integrate
.. //depot/projects/e500/share/mk/bsd.own.mk#4 integrate
.. //depot/projects/e500/share/mk/bsd.prog.mk#2 integrate
.. //depot/projects/e500/share/mk/bsd.symver.mk#3 integrate
.. //depot/projects/e500/share/mk/version_gen.awk#3 integrate
.. //depot/projects/e500/share/mklocale/UTF-8.src#2 integrate
.. //depot/projects/e500/share/termcap/termcap.src#2 integrate
.. //depot/projects/e500/share/zoneinfo/Makefile#2 integrate
.. //depot/projects/e500/share/zoneinfo/africa#4 integrate
.. //depot/projects/e500/share/zoneinfo/asia#3 integrate
.. //depot/projects/e500/share/zoneinfo/southamerica#3 integrate
.. //depot/projects/e500/sys/amd64/amd64/genassym.c#3 integrate
.. //depot/projects/e500/sys/amd64/amd64/legacy.c#2 integrate
.. //depot/projects/e500/sys/amd64/amd64/local_apic.c#4 integrate
.. //depot/projects/e500/sys/amd64/amd64/uma_machdep.c#2 integrate
.. //depot/projects/e500/sys/amd64/conf/GENERIC#6 integrate
.. //depot/projects/e500/sys/amd64/conf/GENERIC.hints#2 integrate
.. //depot/projects/e500/sys/amd64/include/legacyvar.h#2 integrate
.. //depot/projects/e500/sys/amd64/include/smp.h#3 integrate
.. //depot/projects/e500/sys/amd64/include/vmparam.h#3 integrate
.. //depot/projects/e500/sys/amd64/isa/clock.c#4 integrate
.. //depot/projects/e500/sys/amd64/linux32/linux.h#2 integrate
.. //depot/projects/e500/sys/amd64/linux32/linux32_proto.h#2 integrate
.. //depot/projects/e500/sys/amd64/linux32/linux32_syscall.h#2 integrate
.. //depot/projects/e500/sys/amd64/linux32/linux32_sysent.c#2 integrate
.. //depot/projects/e500/sys/amd64/linux32/linux32_sysvec.c#4 integrate
.. //depot/projects/e500/sys/amd64/linux32/syscalls.master#2 integrate
.. //depot/projects/e500/sys/amd64/pci/pci_bus.c#2 integrate
.. //depot/projects/e500/sys/arm/arm/bcopy_page.S#2 integrate
.. //depot/projects/e500/sys/arm/arm/bcopyinout.S#2 integrate
.. //depot/projects/e500/sys/arm/arm/cpufunc.c#3 integrate
.. //depot/projects/e500/sys/arm/arm/cpufunc_asm_arm11.S#1 branch
.. //depot/projects/e500/sys/arm/arm/cpufunc_asm_armv5.S#1 branch
.. //depot/projects/e500/sys/arm/arm/cpufunc_asm_armv5_ec.S#1 branch
.. //depot/projects/e500/sys/arm/arm/identcpu.c#3 integrate
.. //depot/projects/e500/sys/arm/arm/in_cksum_arm.S#2 integrate
.. //depot/projects/e500/sys/arm/arm/locore.S#2 integrate
.. //depot/projects/e500/sys/arm/arm/pmap.c#5 integrate
.. //depot/projects/e500/sys/arm/arm/support.S#2 integrate
.. //depot/projects/e500/sys/arm/arm/swtch.S#3 integrate
.. //depot/projects/e500/sys/arm/arm/vm_machdep.c#5 integrate
.. //depot/projects/e500/sys/arm/at91/at91_mci.c#2 integrate
.. //depot/projects/e500/sys/arm/at91/at91_mcireg.h#2 integrate
.. //depot/projects/e500/sys/arm/at91/at91_pmc.c#2 integrate
.. //depot/projects/e500/sys/arm/conf/AVILA#3 integrate
.. //depot/projects/e500/sys/arm/conf/CRB#2 integrate
.. //depot/projects/e500/sys/arm/include/armreg.h#3 integrate
.. //depot/projects/e500/sys/arm/include/asm.h#3 integrate
.. //depot/projects/e500/sys/arm/include/asmacros.h#2 integrate
.. //depot/projects/e500/sys/arm/include/cpuconf.h#2 integrate
.. //depot/projects/e500/sys/arm/include/cpufunc.h#3 integrate
.. //depot/projects/e500/sys/arm/include/endian.h#2 integrate
.. //depot/projects/e500/sys/arm/include/vmparam.h#4 integrate
.. //depot/projects/e500/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate
.. //depot/projects/e500/sys/arm/xscale/i80321/i80321.c#2 integrate
.. //depot/projects/e500/sys/arm/xscale/i80321/i80321_pci.c#3 integrate
.. //depot/projects/e500/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate
.. //depot/projects/e500/sys/arm/xscale/i8134x/files.crb#2 integrate
.. //depot/projects/e500/sys/arm/xscale/i8134x/i81342.c#2 integrate
.. //depot/projects/e500/sys/arm/xscale/i8134x/i81342_pci.c#2 integrate
.. //depot/projects/e500/sys/arm/xscale/i8134x/i81342reg.h#2 integrate
.. //depot/projects/e500/sys/arm/xscale/i8134x/iq81342_7seg.c#1 branch
.. //depot/projects/e500/sys/arm/xscale/i8134x/iq81342reg.h#1 branch
.. //depot/projects/e500/sys/arm/xscale/i8134x/iq81342var.h#1 branch
.. //depot/projects/e500/sys/arm/xscale/ixp425/files.ixp425#2 integrate
.. //depot/projects/e500/sys/arm/xscale/ixp425/ixp425_npe.c#3 integrate
.. //depot/projects/e500/sys/arm/xscale/ixp425/ixp425_npevar.h#3 integrate
.. //depot/projects/e500/sys/arm/xscale/ixp425/ixp425_pci.c#2 integrate
.. //depot/projects/e500/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate
.. //depot/projects/e500/sys/boot/common/module.c#2 integrate
.. //depot/projects/e500/sys/boot/ficl/Makefile#3 integrate
.. //depot/projects/e500/sys/boot/forth/loader.conf#3 integrate
.. //depot/projects/e500/sys/boot/i386/libi386/Makefile#2 integrate
.. //depot/projects/e500/sys/boot/i386/libi386/pxe.c#2 integrate
.. //depot/projects/e500/sys/boot/pc98/Makefile.inc#2 integrate
.. //depot/projects/e500/sys/cam/cam_xpt.c#5 integrate
.. //depot/projects/e500/sys/cam/scsi/scsi_all.h#2 integrate
.. //depot/projects/e500/sys/compat/freebsd32/freebsd32_misc.c#4 integrate
.. //depot/projects/e500/sys/compat/ia32/ia32_sysvec.c#4 integrate
.. //depot/projects/e500/sys/compat/linprocfs/linprocfs.c#5 integrate
.. //depot/projects/e500/sys/compat/linux/linux_misc.c#6 integrate
.. //depot/projects/e500/sys/compat/linux/linux_stats.c#2 integrate
.. //depot/projects/e500/sys/compat/ndis/subr_ntoskrnl.c#4 integrate
.. //depot/projects/e500/sys/compat/opensolaris/sys/proc.h#3 integrate
.. //depot/projects/e500/sys/conf/NOTES#7 integrate
.. //depot/projects/e500/sys/conf/files#7 integrate
.. //depot/projects/e500/sys/conf/files.amd64#4 integrate
.. //depot/projects/e500/sys/conf/files.i386#4 integrate
.. //depot/projects/e500/sys/conf/newvers.sh#2 integrate
.. //depot/projects/e500/sys/conf/options#6 integrate
.. //depot/projects/e500/sys/contrib/dev/acpica/evmisc.c#2 integrate
.. //depot/projects/e500/sys/contrib/dev/acpica/evxface.c#2 integrate
.. //depot/projects/e500/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu#1 branch
.. //depot/projects/e500/sys/contrib/dev/npe/LICENSE#1 branch
.. //depot/projects/e500/sys/contrib/ipfilter/netinet/fil.c#3 integrate
.. //depot/projects/e500/sys/contrib/ipfilter/netinet/ip_auth.c#3 integrate
.. //depot/projects/e500/sys/contrib/ipfilter/netinet/ip_compat.h#3 integrate
.. //depot/projects/e500/sys/contrib/ipfilter/netinet/ip_fil.h#3 integrate
.. //depot/projects/e500/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate
.. //depot/projects/e500/sys/contrib/ipfilter/netinet/ip_frag.c#3 integrate
.. //depot/projects/e500/sys/contrib/ipfilter/netinet/ip_htable.c#3 integrate
.. //depot/projects/e500/sys/contrib/ipfilter/netinet/ip_log.c#3 integrate
.. //depot/projects/e500/sys/contrib/ipfilter/netinet/ip_lookup.c#3 integrate
.. //depot/projects/e500/sys/contrib/ipfilter/netinet/ip_lookup.h#3 integrate
.. //depot/projects/e500/sys/contrib/ipfilter/netinet/ip_nat.c#3 integrate
.. //depot/projects/e500/sys/contrib/ipfilter/netinet/ip_nat.h#3 integrate
.. //depot/projects/e500/sys/contrib/ipfilter/netinet/ip_pool.c#3 integrate
.. //depot/projects/e500/sys/contrib/ipfilter/netinet/ip_pool.h#3 integrate
.. //depot/projects/e500/sys/contrib/ipfilter/netinet/ip_proxy.c#3 integrate
.. //depot/projects/e500/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#3 integrate
.. //depot/projects/e500/sys/contrib/ipfilter/netinet/ip_scan.c#3 integrate
.. //depot/projects/e500/sys/contrib/ipfilter/netinet/ip_state.c#3 integrate
.. //depot/projects/e500/sys/contrib/ipfilter/netinet/ip_state.h#3 integrate
.. //depot/projects/e500/sys/contrib/ipfilter/netinet/ip_sync.c#3 integrate
.. //depot/projects/e500/sys/contrib/ipfilter/netinet/ipl.h#3 integrate
.. //depot/projects/e500/sys/contrib/ipfilter/netinet/mlfk_ipl.c#3 integrate
.. //depot/projects/e500/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch
.. //depot/projects/e500/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate
.. //depot/projects/e500/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate
.. //depot/projects/e500/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate
.. //depot/projects/e500/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate
.. //depot/projects/e500/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 integrate
.. //depot/projects/e500/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate
.. //depot/projects/e500/sys/contrib/pf/net/pf.c#4 integrate
.. //depot/projects/e500/sys/contrib/pf/net/pf_ioctl.c#3 integrate
.. //depot/projects/e500/sys/ddb/db_ps.c#2 integrate
.. //depot/projects/e500/sys/dev/aac/aac.c#2 integrate
.. //depot/projects/e500/sys/dev/aac/aac_pci.c#3 integrate
.. //depot/projects/e500/sys/dev/acpica/acpi.c#5 integrate
.. //depot/projects/e500/sys/dev/acpica/acpi_battery.c#2 integrate
.. //depot/projects/e500/sys/dev/acpica/acpi_cpu.c#3 integrate
.. //depot/projects/e500/sys/dev/acpica/acpi_ec.c#4 integrate
.. //depot/projects/e500/sys/dev/acpica/acpi_hpet.c#4 integrate
.. //depot/projects/e500/sys/dev/acpica/acpi_pci.c#2 integrate
.. //depot/projects/e500/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate
.. //depot/projects/e500/sys/dev/acpica/acpi_thermal.c#2 integrate
.. //depot/projects/e500/sys/dev/acpica/acpivar.h#4 integrate
.. //depot/projects/e500/sys/dev/aic7xxx/aic_osm_lib.c#3 integrate
.. //depot/projects/e500/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate
.. //depot/projects/e500/sys/dev/an/if_an.c#4 integrate
.. //depot/projects/e500/sys/dev/ata/ata-all.c#2 integrate
.. //depot/projects/e500/sys/dev/ata/ata-chipset.c#3 integrate
.. //depot/projects/e500/sys/dev/ata/ata-pci.h#3 integrate
.. //depot/projects/e500/sys/dev/ath/ath_rate/sample/sample.c#3 integrate
.. //depot/projects/e500/sys/dev/ath/if_ath.c#5 integrate
.. //depot/projects/e500/sys/dev/ath/if_ath_pci.c#3 integrate
.. //depot/projects/e500/sys/dev/awi/awi.c#3 integrate
.. //depot/projects/e500/sys/dev/bge/if_bge.c#5 integrate
.. //depot/projects/e500/sys/dev/bktr/msp34xx.c#2 integrate
.. //depot/projects/e500/sys/dev/cardbus/cardbus.c#3 integrate
.. //depot/projects/e500/sys/dev/ciss/ciss.c#5 integrate
.. //depot/projects/e500/sys/dev/cm/smc90cx6.c#2 integrate

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Tue Oct 23 23:39:17 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4C71516A468; Tue, 23 Oct 2007 23:39: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 015D716A419
	for ; Tue, 23 Oct 2007 23:39:17 +0000 (UTC)
	(envelope-from zec@icir.org)
Received: from xaqua.tel.fer.hr (xaqua.tel.fer.hr [161.53.19.25])
	by mx1.freebsd.org (Postfix) with ESMTP id 9836113C4BD
	for ; Tue, 23 Oct 2007 23:39:16 +0000 (UTC)
	(envelope-from zec@icir.org)
Received: by xaqua.tel.fer.hr (Postfix, from userid 20006)
	id 0C6159B64D; Wed, 24 Oct 2007 01:39:07 +0200 (CEST)
X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on xaqua.tel.fer.hr
X-Spam-Level: 
X-Spam-Status: No, score=-4.3 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 
	autolearn=ham version=3.1.7
Received: from [192.168.200.100] (zec2.tel.fer.hr [161.53.19.79])
	by xaqua.tel.fer.hr (Postfix) with ESMTP id E48A59B64A
	for ; Wed, 24 Oct 2007 01:39:05 +0200 (CEST)
From: Marko Zec 
To: Perforce Change Reviews 
Date: Wed, 24 Oct 2007 01:38:59 +0200
User-Agent: KMail/1.9.7
References: <200710230018.l9N0IO8l020652@repoman.freebsd.org>
	<200710232314.38149.zec@icir.org> <471E7645.1030503@elischer.org>
In-Reply-To: <471E7645.1030503@elischer.org>
MIME-Version: 1.0
Content-Disposition: inline
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Message-Id: <200710240139.00008.zec@icir.org>
Cc: 
Subject: Re: PERFORCE change 127942 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, 23 Oct 2007 23:39:17 -0000

On Wednesday 24 October 2007 00:31:33 Julian Elischer wrote:
> Marko Zec wrote:
> > On Tuesday 23 October 2007 02:49:24 Julian Elischer wrote:
> >> question:
> >>
> >> can processes in two vimages communicate if they both have access
> >> to the same named pipe/fifo in the filesystem?
> >
> > Yes, provided that they open the fifo while they would be both
> > attached to the same vnet.  Once the sockets would become open the
> > processes could reassociate to arbitrary vimages, while the sockets
> > would remain bound to their original vnets for their entire
> > lifetime duration.
>
> hmm that's not what I want... what I want is an ability for processes
> in two overlapping vimages to communicate easily without incuring the
> overhead of going throigh a virtual router.
>
> another possibility is a 
> local: interface (address 127.1.[vnet number]) which acts like a
> local net  between the virtual machines.

Uhh I'd rather not take that path...  This would require at least a) 
lots of special casing all around IP stack; and b) that vimages/vnets 
would need to be directly addressable by small integers.

I'd prefer if we could work out a solution where symbolic (textual) 
naming of vimages/vnets would be sufficient for all purposes...

> > As an alternative, we could / should introduce an extended socket()
> > syscall where an additional argument would explicitly specify to
> > which vimage/vnet the new socket should belong.
>
> if a process in the root vimage makes fifo in
> /vimages/vimage1/usr/tmp/fifo1
>
> and a process in vimage1 (that is chrooted at /vimages/vimage1/)
> opens the fifo at /usr/tmp/fifo1
>
> why can't they communicate?  I'm surprised at this..

You're right the example you gave above actually works I just tried this 
out (now I'm slightly surprised :).  However netstat -f unix will show 
the socket pair only in one of the vimages/vnets...  I don't know why I 
thought there was also a prison_check() call somewhere inside or around 
unp_connect() but apparently there isn't...

So while this obviously works for you I'm not entirely sure that this is 
the behavior we wish to have...

Cheers,

Marko



From owner-p4-projects@FreeBSD.ORG  Wed Oct 24 00:04:57 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CC34516A46B; Wed, 24 Oct 2007 00:04: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 80E7816A468
	for ; Wed, 24 Oct 2007 00:04:56 +0000 (UTC)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8128713C465
	for ; Wed, 24 Oct 2007 00:04:56 +0000 (UTC)
	(envelope-from csjp@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 l9O04u6a032125
	for ; Wed, 24 Oct 2007 00:04:56 GMT
	(envelope-from csjp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9O04udW032122
	for perforce@freebsd.org; Wed, 24 Oct 2007 00:04:56 GMT
	(envelope-from csjp@freebsd.org)
Date: Wed, 24 Oct 2007 00:04:56 GMT
Message-Id: <200710240004.l9O04udW032122@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	csjp@freebsd.org using -f
From: "Christian S.J. Peron" 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 127981 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, 24 Oct 2007 00:04:57 -0000

http://perforce.freebsd.org/chv.cgi?CH=127981

Change 127981 by csjp@push on 2007/10/24 00:03:56

	Use extended process token.  The in kernel process audit
	state is stored in an extended subject token now.  Make sure
	that we are using the extended data.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#31 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#31 (text+ko) ====

@@ -219,11 +219,11 @@
 #define PROCESS_PID_TOKENS(argn) do {					\
 	if ((ar->ar_arg_pid > 0) /* Reference a single process */	\
 	    && (ARG_IS_VALID(kar, ARG_PROCESS))) {			\
-		tok = au_to_process(ar->ar_arg_auid,			\
+		tok = au_to_process32_ex(ar->ar_arg_auid,		\
 		    ar->ar_arg_euid, ar->ar_arg_egid,			\
 		    ar->ar_arg_ruid, ar->ar_arg_rgid,			\
 		    ar->ar_arg_pid, ar->ar_arg_asid,			\
-		    &ar->ar_arg_termid);				\
+		    &ar->ar_arg_termid_addr);				\
 		kau_write(rec, tok);					\
 	} else if (ARG_IS_VALID(kar, ARG_PID)) {			\
 		tok = au_to_arg32(argn, "process", ar->ar_arg_pid);	\

From owner-p4-projects@FreeBSD.ORG  Wed Oct 24 00:11:05 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 77DA216A469; Wed, 24 Oct 2007 00:11:05 +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 EFFE416A419
	for ; Wed, 24 Oct 2007 00:11:04 +0000 (UTC)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EF7B113C49D
	for ; Wed, 24 Oct 2007 00:11:04 +0000 (UTC)
	(envelope-from csjp@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 l9O0B4O9032554
	for ; Wed, 24 Oct 2007 00:11:04 GMT
	(envelope-from csjp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9O0B4AW032541
	for perforce@freebsd.org; Wed, 24 Oct 2007 00:11:04 GMT
	(envelope-from csjp@freebsd.org)
Date: Wed, 24 Oct 2007 00:11:04 GMT
Message-Id: <200710240011.l9O0B4AW032541@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	csjp@freebsd.org using -f
From: "Christian S.J. Peron" 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 127983 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, 24 Oct 2007 00:11:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=127983

Change 127983 by csjp@push on 2007/10/24 00:10:51

	Move where we audit the PID argument such that we unconditionally
	audit it.  This fixes a problem where the user supplies an invalid
	process ID which is > 0 which results in the PID argument not being
	audited.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/kern/kern_sig.c#21 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/sys/kern/kern_sig.c#21 (text+ko) ====

@@ -1693,6 +1693,7 @@
 	int error;
 
 	AUDIT_ARG(signum, uap->signum);
+	AUDIT_ARG(pid, uap->pid);
 	if ((u_int)uap->signum > _SIG_MAXSIG)
 		return (EINVAL);
 
@@ -1709,7 +1710,6 @@
 		PROC_UNLOCK(p);
 		return (error);
 	}
-	AUDIT_ARG(pid, uap->pid);
 	switch (uap->pid) {
 	case -1:		/* broadcast signal */
 		return (killpg1(td, uap->signum, 0, 1));

From owner-p4-projects@FreeBSD.ORG  Wed Oct 24 00:40:38 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1054C16A420; Wed, 24 Oct 2007 00: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 A644A16A41A
	for ; Wed, 24 Oct 2007 00:40:37 +0000 (UTC)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id AB71213C481
	for ; Wed, 24 Oct 2007 00:40:37 +0000 (UTC)
	(envelope-from csjp@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 l9O0ebKw034027
	for ; Wed, 24 Oct 2007 00:40:37 GMT
	(envelope-from csjp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9O0eb2L034024
	for perforce@freebsd.org; Wed, 24 Oct 2007 00:40:37 GMT
	(envelope-from csjp@freebsd.org)
Date: Wed, 24 Oct 2007 00:40:37 GMT
Message-Id: <200710240040.l9O0eb2L034024@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	csjp@freebsd.org using -f
From: "Christian S.J. Peron" 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 127985 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, 24 Oct 2007 00:40:38 -0000

http://perforce.freebsd.org/chv.cgi?CH=127985

Change 127985 by csjp@push on 2007/10/24 00:39:50

	Bring in audit_proc_coredump() which will be called anytime the
	coredump(9) function is activated.  This function will result in
	a coredump audit record being created.  Currently, we structure
	the audit record much the same way Solaris does with respect to
	tokens.  However, I think it will make sense to add a process
	token too.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/kern/kern_sig.c#22 edit
.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#50 edit
.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#29 edit
.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#32 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/sys/kern/kern_sig.c#22 (text+ko) ====

@@ -3063,8 +3063,19 @@
 	MPASS((p->p_flag & P_HADTHREADS) == 0 || p->p_singlethread == td);
 	_STOPEVENT(p, S_CORE, 0);
 
+	name = expand_name(p->p_comm, td->td_ucred->cr_uid, p->p_pid);
+	if (name == NULL) {
+#ifdef AUDIT
+		audit_proc_coredump(td, NULL, EINVAL);
+#endif
+		return (EINVAL);
+	}
 	if (((sugid_coredump == 0) && p->p_flag & P_SUGID) || do_coredump == 0) {
 		PROC_UNLOCK(p);
+#ifdef AUDIT
+		audit_proc_coredump(td, name, EFAULT);
+#endif
+		free(name, M_TEMP);
 		return (EFAULT);
 	}
 	
@@ -3078,19 +3089,25 @@
 	 */
 	limit = (off_t)lim_cur(p, RLIMIT_CORE);
 	PROC_UNLOCK(p);
-	if (limit == 0)
+	if (limit == 0) {
+#ifdef AUDIT
+		audit_proc_coredump(td, name, EFBIG);
+#endif
+		free(name, M_TEMP);
 		return (EFBIG);
+	}
 
 restart:
-	name = expand_name(p->p_comm, td->td_ucred->cr_uid, p->p_pid);
-	if (name == NULL)
-		return (EINVAL);
 	NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE, UIO_SYSSPACE, name, td);
 	flags = O_CREAT | FWRITE | O_NOFOLLOW;
 	error = vn_open(&nd, &flags, S_IRUSR | S_IWUSR, NULL);
-	free(name, M_TEMP);
-	if (error)
+	if (error) {
+#ifdef AUDIT
+		audit_proc_coredump(td, name, error);
+#endif
+		free(name, M_TEMP);
 		return (error);
+	}
 	vfslocked = NDHASGIANT(&nd);
 	NDFREE(&nd, NDF_ONLY_PNBUF);
 	vp = nd.ni_vp;
@@ -3148,6 +3165,10 @@
 	if (error == 0)
 		error = error1;
 out:
+#ifdef AUDIT
+	audit_proc_coredump(td, name, error);
+#endif
+	free(name, M_TEMP);
 	VFS_UNLOCK_GIANT(vfslocked);
 	return (error);
 }

==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#50 (text+ko) ====

@@ -575,3 +575,51 @@
 
 	KASSERT(td->td_ar == NULL, ("audit_thread_free: td_ar != NULL"));
 }
+
+void
+audit_proc_coredump(struct thread *td, char *path, int errcode)
+{
+	struct kaudit_record *ar;
+	struct au_mask *aumask;
+	au_class_t class;
+	int ret, sorf;
+	char **pathp;
+	au_id_t auid;
+
+	/*
+	 * Make sure we are using the correct preselection mask.
+	 */
+	auid = td->td_ucred->cr_audit.ai_auid;
+	if (auid == AU_DEFAUDITID)
+		aumask = &audit_nae_mask;
+	else
+		aumask = &td->td_ucred->cr_audit.ai_mask;
+	/*
+	 * It's possible for coredump(9) generation to fail.  Make sure that
+	 * we handle this case correctly for preselection.
+	 */
+	if (errcode != 0)
+		sorf = AU_PRS_FAILURE;
+	else
+		sorf = AU_PRS_SUCCESS;
+	class = au_event_class(AUE_CORE);
+	if (au_preselect(AUE_CORE, class, aumask, sorf) == 0)
+		return;
+	/*
+	 * If we are interested in seeing this audit record, allocate it.
+	 * Where possible coredump records should contain a pathname and arg32
+	 * (signal) tokens.
+	 */
+	ar = audit_new(AUE_CORE, td);
+	if (path != NULL) {
+		pathp = &ar->k_ar.ar_arg_upath1;
+		*pathp = malloc(MAXPATHLEN, M_AUDITPATH, M_WAITOK);
+		canon_path(td, path, *pathp);
+		ARG_SET_VALID(ar, ARG_UPATH1);
+	}
+	ar->k_ar.ar_arg_signum = td->td_proc->p_sig;
+	ARG_SET_VALID(ar, ARG_SIGNUM);
+	if (errcode != 0)
+		ret = 1;
+	audit_commit(ar, errcode, ret);
+}

==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#29 (text+ko) ====

@@ -179,6 +179,7 @@
 void	 audit_cred_init(struct ucred *cred);
 void	 audit_cred_kproc0(struct ucred *cred);
 void	 audit_cred_proc1(struct ucred *cred);
+void	 audit_proc_coredump(struct thread *td, char *path, int errcode);
 void	 audit_thread_alloc(struct thread *td);
 void	 audit_thread_free(struct thread *td);
 

==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#32 (text+ko) ====

@@ -725,6 +725,14 @@
 		UPATH1_VNODE1_TOKENS;
 		break;
 
+	case AUE_CORE:
+		if (ARG_IS_VALID(kar, ARG_SIGNUM)) {
+			tok = au_to_arg32(0, "signal", ar->ar_arg_signum);
+			kau_write(rec, tok);
+		}
+		UPATH1_VNODE1_TOKENS;
+		break;
+
 	case AUE_EXTATTRCTL:
 		UPATH1_VNODE1_TOKENS;
 		if (ARG_IS_VALID(kar, ARG_CMD)) {

From owner-p4-projects@FreeBSD.ORG  Wed Oct 24 08:23:35 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B388916A41A; Wed, 24 Oct 2007 08:23: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 5E9E616A417
	for ; Wed, 24 Oct 2007 08:23:34 +0000 (UTC)
	(envelope-from zhouzhouyi@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5EE4613C4A5
	for ; Wed, 24 Oct 2007 08:23:34 +0000 (UTC)
	(envelope-from zhouzhouyi@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 l9O8NXrd094547
	for ; Wed, 24 Oct 2007 08:23:33 GMT
	(envelope-from zhouzhouyi@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9O8NWUC094544
	for perforce@freebsd.org; Wed, 24 Oct 2007 08:23:32 GMT
	(envelope-from zhouzhouyi@FreeBSD.org)
Date: Wed, 24 Oct 2007 08:23:32 GMT
Message-Id: <200710240823.l9O8NWUC094544@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zhouzhouyi@FreeBSD.org using -f
From: Zhouyi ZHOU 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 127993 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, 24 Oct 2007 08:23:35 -0000

http://perforce.freebsd.org/chv.cgi?CH=127993

Change 127993 by zhouzhouyi@zhouzhouyi_mactest on 2007/10/24 08:23:15

	Integrate from main branch

Affected files ...

.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/files#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-all.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-all.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-card.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-cbus.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-chipset.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-disk.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-disk.h#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-dma.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-isa.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-lowlevel.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-pci.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-pci.h#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-queue.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-raid.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-raid.h#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-usb.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata_if.m#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/atapi-cam.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/atapi-cd.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/atapi-cd.h#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/atapi-fd.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/atapi-fd.h#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/atapi-tape.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/atapi-tape.h#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_policy.h#4 edit
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_vfs.c#4 edit
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#6 edit
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test_if.c#2 edit
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test_private.h#3 edit

Differences ...

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/files#4 (text+ko) ====

@@ -2057,8 +2057,6 @@
 security/mac_seeotheruids/mac_seeotheruids.c optional mac_seeotheruids
 security/mac_stub/mac_stub.c	optional mac_stub
 security/mac_test/mac_test.c	optional mac_test
-security/mac_test/mac_test_if.c optional mac_test
-security/mac_test/mac_test_log.c optional mac_test
 ufs/ffs/ffs_alloc.c		optional ffs
 ufs/ffs/ffs_balloc.c		optional ffs
 ufs/ffs/ffs_inode.c		optional ffs

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-all.c#3 (text+ko) ====


==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-all.h#3 (text+ko) ====


==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-card.c#2 (text+ko) ====


==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-cbus.c#2 (text+ko) ====


==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-chipset.c#4 (text+ko) ====


==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-disk.c#3 (text+ko) ====


==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-disk.h#2 (text+ko) ====


==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-dma.c#2 (text+ko) ====


==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-isa.c#2 (text+ko) ====


==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-lowlevel.c#2 (text+ko) ====


==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-pci.c#2 (text+ko) ====


==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-pci.h#4 (text+ko) ====


==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-queue.c#2 (text+ko) ====


==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-raid.c#3 (text+ko) ====


==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-raid.h#2 (text+ko) ====


==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-usb.c#2 (text) ====


==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata_if.m#2 (text+ko) ====


==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/atapi-cam.c#2 (text+ko) ====


==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/atapi-cd.c#2 (text+ko) ====


==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/atapi-cd.h#2 (text+ko) ====


==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/atapi-fd.c#2 (text+ko) ====


==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/atapi-fd.h#2 (text+ko) ====


==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/atapi-tape.c#2 (text+ko) ====


==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/atapi-tape.h#2 (text+ko) ====


==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_policy.h#4 (text+ko) ====

@@ -634,6 +634,7 @@
 	mpo_init_bpfdesc_label_t		mpo_init_bpfdesc_label;
 	mpo_init_cred_label_t			mpo_init_cred_label;
 	mpo_init_devfs_label_t			mpo_init_devfs_label;
+	mpo_init_devfs_label_t			mpo_init_mactest_label;
 	mpo_placeholder_t			_mpo_placeholder0;
 	mpo_init_ifnet_label_t			mpo_init_ifnet_label;
 	mpo_init_inpcb_label_t			mpo_init_inpcb_label;

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_vfs.c#4 (text+ko) ====

@@ -66,6 +66,7 @@
 #include 
 
 #include 
+#include 
 
 #include 
 #include 
@@ -90,12 +91,27 @@
 	return (label);
 }
 
+
+static struct label *
+mac_mactest_label_alloc(void)
+{
+	struct label *label;
+
+	label = mac_labelzone_alloc(M_WAITOK);
+	MAC_PERFORM(init_devfs_label, label);
+	MAC_PERFORM(init_mactest_label, label);
+	return (label);
+}
+
 void
 mac_init_devfs(struct devfs_dirent *de)
 {
+	if (de&&de->de_dirent&&!strncmp(de->de_dirent->d_name,"mactest", 7))
+		de->de_label = mac_mactest_label_alloc();
+	else
+		de->de_label = mac_devfs_label_alloc();
+}
 
-	de->de_label = mac_devfs_label_alloc();
-}
 
 static struct label *
 mac_mount_label_alloc(void)

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#6 (text+ko) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/security/mac_test/mac_test.c,v 1.78 2007/09/10 00:00:18 rwatson Exp $
+ * $FreeBSD: src/sys/security/mac_test/mac_test.c,v 1.76 2007/04/23 13:36:54 rwatson Exp $
  */
 
 /*
@@ -54,13 +54,15 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
-
+#include 
+#include 
 #include 
 
 #include 
@@ -69,14 +71,19 @@
 #include 
 
 #include 
+#include 
 
-SYSCTL_DECL(_security_mac);
+//SYSCTL_DECL(_security_mac);
 
 SYSCTL_NODE(_security_mac, OID_AUTO, test, CTLFLAG_RW, 0,
     "TrustedBSD mac_test policy controls");
 
+SYSCTL_PROC(_security_mac_test, OID_AUTO, pseudoinit, CTLTYPE_INT | CTLFLAG_RW, 0, 0,
+     mac_test_init_if, "I", "set to setup the pseudo interfaces for MAC test");
+
 #define	MAGIC_BPF	0xfe1ad1b6
 #define	MAGIC_DEVFS	0x9ee79c32
+#define MAGIC_MACTESTLOG 0x9ee79c33
 #define	MAGIC_IFNET	0xc218b120
 #define	MAGIC_INPCB	0x4440f7bb
 #define	MAGIC_IPQ	0x206188ef
@@ -119,14 +126,16 @@
 
 #define	LABEL_CHECK(label, magic) do {					\
 	if (label != NULL) {						\
-		KASSERT(SLOT(label) == magic ||	SLOT(label) == 0,	\
+		KASSERT(SLOT(label) == magic ||	SLOT(label) == 0 ||	\
+			SLOT(label) == MAGIC_MACTESTLOG,		\
 		    ("%s: bad %s label", __func__, #magic));		\
 	}								\
 } while (0)
 
 #define	LABEL_DESTROY(label, magic) do {				\
-	if (SLOT(label) == magic || SLOT(label) == 0) {			\
-		SLOT_SET(label, MAGIC_FREE);				\
+	if (SLOT(label) == magic || SLOT(label) == 0 ||			\
+			 SLOT(label) == MAGIC_MACTESTLOG ) {		\
+			SLOT_SET(label, MAGIC_FREE);			\
 	} else if (SLOT(label) == MAGIC_FREE) {				\
 		DEBUGGER("%s: dup destroy", __func__);			\
 	} else {							\
@@ -150,7 +159,9 @@
 static void
 mac_test_init_bpfdesc_label(struct label *label)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_bpfdesc_label\n", 
+		strlen("mac_test_init_bpfdesc_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	LABEL_INIT(label, MAGIC_BPF);
 	COUNTER_INC(init_bpfdesc_label);
 }
@@ -159,7 +170,9 @@
 static void
 mac_test_init_cred_label(struct label *label)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_cred_label\n", 
+		strlen("mac_test_init_cred_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	LABEL_INIT(label, MAGIC_CRED);
 	COUNTER_INC(init_cred_label);
 }
@@ -168,16 +181,26 @@
 static void
 mac_test_init_devfs_label(struct label *label)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_devfs_label\n", 
+		strlen("mac_test_init_devfs_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	LABEL_INIT(label, MAGIC_DEVFS);
 	COUNTER_INC(init_devfs_label);
 }
 
+static void
+mac_test_init_mactest_label(struct label *label)
+{
+	LABEL_INIT(label, MAGIC_MACTESTLOG);
+}
+
 COUNTER_DECL(init_ifnet_label);
 static void
 mac_test_init_ifnet_label(struct label *label)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_ifnet_label\n", 
+		strlen("mac_test_init_ifnet_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	LABEL_INIT(label, MAGIC_IFNET);
 	COUNTER_INC(init_ifnet_label);
 }
@@ -186,7 +209,9 @@
 static int
 mac_test_init_inpcb_label(struct label *label, int flag)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_inpcb_label\n", 
+		strlen("mac_test_init_inpcb_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	if (flag & M_WAITOK)
 		WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
 		    "mac_test_init_inpcb_label() at %s:%d", __FILE__,
@@ -201,6 +226,9 @@
 static void
 mac_test_init_sysv_msgmsg_label(struct label *label)
 {
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_sysv_msgmsg_label\n", 
+		strlen("mac_test_init_sysv_msgmsg_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	LABEL_INIT(label, MAGIC_SYSV_MSG);
 	COUNTER_INC(init_sysv_msg_label);
 }
@@ -209,6 +237,9 @@
 static void
 mac_test_init_sysv_msgqueue_label(struct label *label)
 {
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_sysv_msgqueue_label\n", 
+		strlen("mac_test_init_sysv_msgqueue_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	LABEL_INIT(label, MAGIC_SYSV_MSQ);
 	COUNTER_INC(init_sysv_msq_label);
 }
@@ -217,6 +248,9 @@
 static void
 mac_test_init_sysv_sem_label(struct label *label)
 {
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_sysv_sem_label\n", 
+		strlen("mac_test_init_sysv_sem_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	LABEL_INIT(label, MAGIC_SYSV_SEM);
 	COUNTER_INC(init_sysv_sem_label);
 }
@@ -225,6 +259,9 @@
 static void
 mac_test_init_sysv_shm_label(struct label *label)
 {
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_sysv_shm_label\n", 
+		strlen("mac_test_init_sysv_shm_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	LABEL_INIT(label, MAGIC_SYSV_SHM);
 	COUNTER_INC(init_sysv_shm_label);
 }
@@ -233,7 +270,9 @@
 static int
 mac_test_init_ipq_label(struct label *label, int flag)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_ipq_label\n", 
+		strlen("mac_test_init_ipq_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	if (flag & M_WAITOK)
 		WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
 		    "mac_test_init_ipq_label() at %s:%d", __FILE__,
@@ -248,7 +287,9 @@
 static int
 mac_test_init_mbuf_label(struct label *label, int flag)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_mbuf_label\n", 
+		strlen("mac_test_init_mbuf_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	if (flag & M_WAITOK)
 		WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
 		    "mac_test_init_mbuf_label() at %s:%d", __FILE__,
@@ -263,7 +304,9 @@
 static void
 mac_test_init_mount_label(struct label *label)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_mount_label\n", 
+		strlen("mac_test_init_mount_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	LABEL_INIT(label, MAGIC_MOUNT);
 	COUNTER_INC(init_mount_label);
 }
@@ -273,6 +316,9 @@
 mac_test_init_socket_label(struct label *label, int flag)
 {
 
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_socket_label\n", 
+		strlen("mac_test_init_socket_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	if (flag & M_WAITOK)
 		WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
 		    "mac_test_init_socket_label() at %s:%d", __FILE__,
@@ -287,7 +333,9 @@
 static int
 mac_test_init_socket_peer_label(struct label *label, int flag)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_socket_peer_label\n", 
+		strlen("mac_test_init_socket_peer_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	if (flag & M_WAITOK)
 		WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
 		    "mac_test_init_socket_peer_label() at %s:%d", __FILE__,
@@ -302,7 +350,9 @@
 static void
 mac_test_init_pipe_label(struct label *label)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_pipe_label\n", 
+		strlen("mac_test_init_pipe_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	LABEL_INIT(label, MAGIC_PIPE);
 	COUNTER_INC(init_pipe_label);
 }
@@ -311,7 +361,9 @@
 static void
 mac_test_init_posix_sem_label(struct label *label)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_posix_sem_label\n", 
+		strlen("mac_test_init_posix_sem_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	LABEL_INIT(label, MAGIC_POSIX_SEM);
 	COUNTER_INC(init_posix_sem_label);
 }
@@ -320,7 +372,9 @@
 static void
 mac_test_init_proc_label(struct label *label)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_proc_label\n", 
+		strlen("mac_test_init_proc_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	LABEL_INIT(label, MAGIC_PROC);
 	COUNTER_INC(init_proc_label);
 }
@@ -329,7 +383,9 @@
 static void
 mac_test_init_vnode_label(struct label *label)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_vnode_label\n", 
+		strlen("mac_test_init_vnode_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	LABEL_INIT(label, MAGIC_VNODE);
 	COUNTER_INC(init_vnode_label);
 }
@@ -338,7 +394,9 @@
 static void
 mac_test_destroy_bpfdesc_label(struct label *label)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_bpfdesc_label\n", 
+		strlen("mac_test_destroy_bpfdesc_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	LABEL_DESTROY(label, MAGIC_BPF);
 	COUNTER_INC(destroy_bpfdesc_label);
 }
@@ -347,7 +405,9 @@
 static void
 mac_test_destroy_cred_label(struct label *label)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_cred_label\n", 
+		strlen("mac_test_destroy_cred_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	LABEL_DESTROY(label, MAGIC_CRED);
 	COUNTER_INC(destroy_cred_label);
 }
@@ -356,7 +416,9 @@
 static void
 mac_test_destroy_devfs_label(struct label *label)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_devfs_label\n", 
+		strlen("mac_test_destroy_devfs_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	LABEL_DESTROY(label, MAGIC_DEVFS);
 	COUNTER_INC(destroy_devfs_label);
 }
@@ -365,7 +427,9 @@
 static void
 mac_test_destroy_ifnet_label(struct label *label)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_ifnet_label\n", 
+		strlen("mac_test_destroy_ifnet_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	LABEL_DESTROY(label, MAGIC_IFNET);
 	COUNTER_INC(destroy_ifnet_label);
 }
@@ -374,7 +438,9 @@
 static void
 mac_test_destroy_inpcb_label(struct label *label)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_inpcb_label\n", 
+		strlen("mac_test_destroy_inpcb_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	LABEL_DESTROY(label, MAGIC_INPCB);
 	COUNTER_INC(destroy_inpcb_label);
 }
@@ -383,7 +449,9 @@
 static void
 mac_test_destroy_sysv_msgmsg_label(struct label *label)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_sysv_msgmsg_label\n", 
+		strlen("mac_test_destroy_sysv_msgmsg__label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	LABEL_DESTROY(label, MAGIC_SYSV_MSG);
 	COUNTER_INC(destroy_sysv_msg_label);
 }
@@ -392,7 +460,9 @@
 static void
 mac_test_destroy_sysv_msgqueue_label(struct label *label)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_sysv_msgqueue_label\n", 
+		strlen("mac_test_destroy_sysv_msgqueue_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	LABEL_DESTROY(label, MAGIC_SYSV_MSQ);
 	COUNTER_INC(destroy_sysv_msq_label);
 }
@@ -401,7 +471,9 @@
 static void
 mac_test_destroy_sysv_sem_label(struct label *label)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_sysv_sem_label\n", 
+		strlen("mac_test_destroy_sysv_sem_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	LABEL_DESTROY(label, MAGIC_SYSV_SEM);
 	COUNTER_INC(destroy_sysv_sem_label);
 }
@@ -410,7 +482,9 @@
 static void
 mac_test_destroy_sysv_shm_label(struct label *label)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_sysv_shm_label\n", 
+		strlen("mac_test_destroy_sysv_shm_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	LABEL_DESTROY(label, MAGIC_SYSV_SHM);
 	COUNTER_INC(destroy_sysv_shm_label);
 }
@@ -419,7 +493,9 @@
 static void
 mac_test_destroy_ipq_label(struct label *label)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_ipq_label\n", 
+		strlen("mac_test_destroy_ipq_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	LABEL_DESTROY(label, MAGIC_IPQ);
 	COUNTER_INC(destroy_ipq_label);
 }
@@ -428,7 +504,9 @@
 static void
 mac_test_destroy_mbuf_label(struct label *label)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_mbuf_label\n", 
+		strlen("mac_test_destroy_mbuf_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	/*
 	 * If we're loaded dynamically, there may be mbufs in flight that
 	 * didn't have label storage allocated for them.  Handle this
@@ -445,7 +523,9 @@
 static void
 mac_test_destroy_mount_label(struct label *label)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_mount_label\n", 
+		strlen("mac_test_destroy_mount_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	LABEL_DESTROY(label, MAGIC_MOUNT);
 	COUNTER_INC(destroy_mount_label);
 }
@@ -454,7 +534,9 @@
 static void
 mac_test_destroy_socket_label(struct label *label)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_socket_label\n", 
+		strlen("mac_test_destroy_socket_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	LABEL_DESTROY(label, MAGIC_SOCKET);
 	COUNTER_INC(destroy_socket_label);
 }
@@ -463,7 +545,9 @@
 static void
 mac_test_destroy_socket_peer_label(struct label *label)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_socket_peer_label\n", 
+		strlen("mac_test_destroy_socket_peer_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	LABEL_DESTROY(label, MAGIC_SOCKET);
 	COUNTER_INC(destroy_socket_peer_label);
 }
@@ -472,7 +556,9 @@
 static void
 mac_test_destroy_pipe_label(struct label *label)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_pipe_label\n", 
+		strlen("mac_test_destroy_pipe_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	LABEL_DESTROY(label, MAGIC_PIPE);
 	COUNTER_INC(destroy_pipe_label);
 }
@@ -481,7 +567,9 @@
 static void
 mac_test_destroy_posix_sem_label(struct label *label)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_posix_sem_label\n", 
+		strlen("mac_test_destroy_posix_sem_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	LABEL_DESTROY(label, MAGIC_POSIX_SEM);
 	COUNTER_INC(destroy_posix_sem_label);
 }
@@ -490,7 +578,9 @@
 static void
 mac_test_destroy_proc_label(struct label *label)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_proc_label\n", 
+		strlen("mac_test_destroy_proc_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	LABEL_DESTROY(label, MAGIC_PROC);
 	COUNTER_INC(destroy_proc_label);
 }
@@ -499,7 +589,9 @@
 static void
 mac_test_destroy_vnode_label(struct label *label)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_vnode_label\n", 
+		strlen("mac_test_destroy_vnode_label\n"));
+	MAC_TEST_LOG_DO_SUBMIT;
 	LABEL_DESTROY(label, MAGIC_VNODE);
 	COUNTER_INC(destroy_vnode_label);
 }
@@ -508,7 +600,9 @@
 static void
 mac_test_copy_cred_label(struct label *src, struct label *dest)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_copy_cred_label with src label:", 
+		strlen("mac_test_copy_cred_label with src label:"));
+	MAC_TEST_LOG_SUBMIT_LABEL(cred,src);
 	LABEL_CHECK(src, MAGIC_CRED);
 	LABEL_CHECK(dest, MAGIC_CRED);
 	COUNTER_INC(copy_cred_label);
@@ -518,7 +612,9 @@
 static void
 mac_test_copy_ifnet_label(struct label *src, struct label *dest)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_copy_ifnet_label with src label:", 
+		strlen("mac_test_copy_ifnet_label with src label:"));
+	MAC_TEST_LOG_SUBMIT_LABEL(ifnet,src);
 	LABEL_CHECK(src, MAGIC_IFNET);
 	LABEL_CHECK(dest, MAGIC_IFNET);
 	COUNTER_INC(copy_ifnet_label);
@@ -528,7 +624,9 @@
 static void
 mac_test_copy_mbuf_label(struct label *src, struct label *dest)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_copy_mbuf_label with src label:", 
+		strlen("mac_test_copy_mbuf_label with src label:"));
+	MAC_TEST_LOG_SUBMIT_LABEL(vnode,src);
 	LABEL_CHECK(src, MAGIC_MBUF);
 	LABEL_CHECK(dest, MAGIC_MBUF);
 	COUNTER_INC(copy_mbuf_label);
@@ -538,7 +636,9 @@
 static void
 mac_test_copy_pipe_label(struct label *src, struct label *dest)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_copy_pipe_label with src label:", 
+		strlen("mac_test_copy_pipe_label with src label:"));
+	MAC_TEST_LOG_SUBMIT_LABEL(pipe,src);
 	LABEL_CHECK(src, MAGIC_PIPE);
 	LABEL_CHECK(dest, MAGIC_PIPE);
 	COUNTER_INC(copy_pipe_label);
@@ -548,7 +648,9 @@
 static void
 mac_test_copy_socket_label(struct label *src, struct label *dest)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_copy_socket_label with src label:", 
+		strlen("mac_test_copy_socket_label with src label:"));
+	MAC_TEST_LOG_SUBMIT_LABEL(socket,src);
 	LABEL_CHECK(src, MAGIC_SOCKET);
 	LABEL_CHECK(dest, MAGIC_SOCKET);
 	COUNTER_INC(copy_socket_label);
@@ -558,7 +660,9 @@
 static void
 mac_test_copy_vnode_label(struct label *src, struct label *dest)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_copy_vnode_label with src label:", 
+		strlen("mac_test_copy_vnode_label with src label:"));
+	MAC_TEST_LOG_SUBMIT_LABEL(vnode,src);
 	LABEL_CHECK(src, MAGIC_VNODE);
 	LABEL_CHECK(dest, MAGIC_VNODE);
 	COUNTER_INC(copy_vnode_label);
@@ -598,19 +702,39 @@
     struct devfs_dirent *de, struct label *delabel, struct vnode *vp,
     struct label *vplabel)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_associate_vnode_devfs "
+		"with mplabel delabel and vplabel:", 
+		strlen("mac_test_associate_vnode_devfs with mplabel delabel and vplabel:"));
+	MAC_TEST_LOG_SUBMIT_LABEL3(vnode,mplabel,vnode,delabel,vnode,vplabel);
+	if (delabel != NULL && SLOT(delabel) == MAGIC_MACTESTLOG)
+		LABEL_INIT(vplabel, MAGIC_MACTESTLOG);
 	LABEL_CHECK(mplabel, MAGIC_MOUNT);
 	LABEL_CHECK(delabel, MAGIC_DEVFS);
 	LABEL_CHECK(vplabel, MAGIC_VNODE);
 	COUNTER_INC(associate_vnode_devfs);
 }
-
+/*
+ * To avoid recursion on reading /dev/mactest to a tempory file
+ * we associate the file with "mac_test" mac_test extattr with
+ * MAGIC_MACTESTLOG label
+ */
+ 
 COUNTER_DECL(associate_vnode_extattr);
 static int
 mac_test_associate_vnode_extattr(struct mount *mp, struct label *mplabel,
     struct vnode *vp, struct label *vplabel)
 {
-
+	char mac_test[64];
+	int error, buflen = 64;
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_associate_vnode_extattr with "
+		"mplabel and vplabel:", 
+		strlen("mac_test_associate_vnode_extattr with mplabel and vplabel:"));
+	MAC_TEST_LOG_SUBMIT_LABEL2(vnode,mplabel,vnode,vplabel);
+	bzero(mac_test,buflen);
+	error = vn_extattr_get(vp, IO_NODELOCKED, EXTATTR_NAMESPACE_SYSTEM,
+	             "mac_test", &buflen, mac_test, curthread);
+	if (!error && !strncmp(mac_test,"mac_test", 8))
+		LABEL_INIT(vplabel, MAGIC_MACTESTLOG);
 	LABEL_CHECK(mplabel, MAGIC_MOUNT);
 	LABEL_CHECK(vplabel, MAGIC_VNODE);
 	COUNTER_INC(associate_vnode_extattr);
@@ -623,7 +747,10 @@
 mac_test_associate_vnode_singlelabel(struct mount *mp, struct label *mplabel,
     struct vnode *vp, struct label *vplabel)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_associate_vnode_singlelabel "
+		"with mplabel and vplabel:", 
+		strlen("mac_test_associate_vnode_singlelabel with mplabel and vplabel:"));
+	MAC_TEST_LOG_SUBMIT_LABEL2(vnode,mplabel,vnode,vplabel);
 	LABEL_CHECK(mplabel, MAGIC_MOUNT);
 	LABEL_CHECK(vplabel, MAGIC_VNODE);
 	COUNTER_INC(associate_vnode_singlelabel);
@@ -634,9 +761,15 @@
 mac_test_create_devfs_device(struct ucred *cred, struct mount *mp,
     struct cdev *dev, struct devfs_dirent *de, struct label *delabel)
 {
-
-	if (cred != NULL)
+	struct label * tmplabel;
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_devfs_device with cr_label and delabel:", 
+		strlen("mac_test_create_devfs_device with cr_label and delabel:"));
+	if (cred != NULL){
 		LABEL_CHECK(cred->cr_label, MAGIC_CRED);
+		tmplabel = cred->cr_label;
+	}else 
+		tmplabel = 0;
+	MAC_TEST_LOG_SUBMIT_LABEL2(cred, 0, vnode,delabel);
 	LABEL_CHECK(delabel, MAGIC_DEVFS);
 	COUNTER_INC(create_devfs_device);
 }
@@ -646,7 +779,9 @@
 mac_test_create_devfs_directory(struct mount *mp, char *dirname,
     int dirnamelen, struct devfs_dirent *de, struct label *delabel)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_devfs_directory with delabel:", 
+		strlen("mac_test_create_devfs_directory with delabel:"));
+	MAC_TEST_LOG_SUBMIT_LABEL(vnode,delabel);
 	LABEL_CHECK(delabel, MAGIC_DEVFS);
 	COUNTER_INC(create_devfs_directory);
 }
@@ -657,7 +792,10 @@
     struct devfs_dirent *dd, struct label *ddlabel, struct devfs_dirent *de,
     struct label *delabel)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_devfs_symlink "
+		"with cr_label ddlabel and delabel:", 
+		strlen("mac_test_create_devfs_symlink with cr_label ddlabel and delabel:"));
+	MAC_TEST_LOG_SUBMIT_LABEL3(cred, cred->cr_label, vnode,ddlabel,vnode,delabel);
 	LABEL_CHECK(cred->cr_label, MAGIC_CRED);
 	LABEL_CHECK(ddlabel, MAGIC_DEVFS);
 	LABEL_CHECK(delabel, MAGIC_DEVFS);
@@ -670,7 +808,12 @@
     struct label *mplabel, struct vnode *dvp, struct label *dvplabel,
     struct vnode *vp, struct label *vplabel, struct componentname *cnp)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_vnode_extattr with "
+		"cr_label mplabel dvplabel and vplabel:", 
+		strlen("mac_test_create_vnode_extattr with cr_label "
+		"mplabel dvplabel and vplabel:"));
+	MAC_TEST_LOG_SUBMIT_LABEL4(cred,cred->cr_label,vnode,mplabel,vnode,
+							dvplabel,vnode,vplabel);
 	LABEL_CHECK(cred->cr_label, MAGIC_CRED);
 	LABEL_CHECK(mplabel, MAGIC_MOUNT);
 	LABEL_CHECK(dvplabel, MAGIC_VNODE);
@@ -684,7 +827,9 @@
 mac_test_create_mount(struct ucred *cred, struct mount *mp,
     struct label *mplabel)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_mount with cr_label and mplabel:", 
+		strlen("mac_test_create_mount with cr_label and mplabel:"));
+	MAC_TEST_LOG_SUBMIT_LABEL2(cred,cred->cr_label,vnode,mplabel);
 	LABEL_CHECK(cred->cr_label, MAGIC_CRED);
 	LABEL_CHECK(mplabel, MAGIC_MOUNT);
 	COUNTER_INC(create_mount);
@@ -695,7 +840,9 @@
 mac_test_relabel_vnode(struct ucred *cred, struct vnode *vp,
     struct label *vplabel, struct label *label)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_relabel_vnode with cr_label vplabel and label:", 
+		strlen("mac_test_relabel_vnode with cr_label vplabel and label:"));
+	MAC_TEST_LOG_SUBMIT_LABEL3(cred,cred->cr_label,vnode,vplabel,vnode,label);
 	LABEL_CHECK(cred->cr_label, MAGIC_CRED);
 	LABEL_CHECK(vplabel, MAGIC_VNODE);
 	LABEL_CHECK(label, MAGIC_VNODE);
@@ -707,7 +854,10 @@
 mac_test_setlabel_vnode_extattr(struct ucred *cred, struct vnode *vp,
     struct label *vplabel, struct label *intlabel)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_setlabel_vnode_extattr with "
+		"cr_label vplabel and intlabel:", 
+		strlen("mac_test_setlabel_vnode_extattr with cr_label vplabel and intlabel:"));
+	MAC_TEST_LOG_SUBMIT_LABEL3(cred,cred->cr_label,vnode,vplabel,vnode,intlabel);
 	LABEL_CHECK(cred->cr_label, MAGIC_CRED);
 	LABEL_CHECK(vplabel, MAGIC_VNODE);
 	LABEL_CHECK(intlabel, MAGIC_VNODE);
@@ -721,7 +871,9 @@
 mac_test_update_devfs(struct mount *mp, struct devfs_dirent *devfs_dirent,
     struct label *direntlabel, struct vnode *vp, struct label *vplabel)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_update_devfs with direntlabel and vplabel:", 
+		strlen("mac_test_update_devfs with direntlabel and vplabel:"));
+	MAC_TEST_LOG_SUBMIT_LABEL2(vnode,direntlabel,vnode,vplabel);
 	LABEL_CHECK(direntlabel, MAGIC_DEVFS);
 	LABEL_CHECK(vplabel, MAGIC_VNODE);
 	COUNTER_INC(update_devfs);
@@ -735,7 +887,10 @@
 mac_test_create_mbuf_from_socket(struct socket *so, struct label *socketlabel,
     struct mbuf *m, struct label *mbuflabel)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_mbuf_from_socket"
+	" with socketlabel and mbuflabel:", 
+		strlen("mac_test_update_devfs with socketlabel and mbuflabel:"));
+	MAC_TEST_LOG_SUBMIT_LABEL2(socket,socketlabel,vnode,mbuflabel);
 	LABEL_CHECK(socketlabel, MAGIC_SOCKET);
 	LABEL_CHECK(mbuflabel, MAGIC_MBUF);
 	COUNTER_INC(create_mbuf_from_socket);
@@ -746,7 +901,9 @@
 mac_test_create_socket(struct ucred *cred, struct socket *socket,
    struct label *socketlabel)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_socket with cr_label and socketlabel:", 
+		strlen("mac_test_create_socket with cr_label and socketlabel:"));
+	MAC_TEST_LOG_SUBMIT_LABEL2(cred,cred->cr_label,socket,socketlabel);
 	LABEL_CHECK(cred->cr_label, MAGIC_CRED);
 	LABEL_CHECK(socketlabel, MAGIC_SOCKET);
 	COUNTER_INC(create_socket);
@@ -757,7 +914,9 @@
 mac_test_create_pipe(struct ucred *cred, struct pipepair *pp,
    struct label *pipelabel)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_pipe with cr_label and pipelabel:", 
+		strlen("mac_test_create_socket with cr_label and pipelabel:"));
+	MAC_TEST_LOG_SUBMIT_LABEL2(cred,cred->cr_label,pipe,pipelabel);
 	LABEL_CHECK(cred->cr_label, MAGIC_CRED);
 	LABEL_CHECK(pipelabel, MAGIC_PIPE);
 	COUNTER_INC(create_pipe);
@@ -768,7 +927,9 @@
 mac_test_create_posix_sem(struct ucred *cred, struct ksem *ksem,
    struct label *posixlabel)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_posix_sem with cr_label and posixlabel:", 
+		strlen("mac_test_create_socket with cr_label and posixlabel:"));
+	MAC_TEST_LOG_SUBMIT_LABEL2(cred,cred->cr_label,vnode,posixlabel);
 	LABEL_CHECK(cred->cr_label, MAGIC_CRED);
 	LABEL_CHECK(posixlabel, MAGIC_POSIX_SEM);
 	COUNTER_INC(create_posix_sem);
@@ -780,7 +941,11 @@
     struct label *oldsocketlabel, struct socket *newsocket,
     struct label *newsocketlabel)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_socket_from_socket with "
+		"oldsocketlabel and newsocketlabel:", 
+		strlen("mac_test_create_socket_from_socket with oldsocketlabel "
+		"and newsocketlabel:"));
+	MAC_TEST_LOG_SUBMIT_LABEL2(socket,oldsocketlabel,socket,newsocketlabel);
 	LABEL_CHECK(oldsocketlabel, MAGIC_SOCKET);
 	LABEL_CHECK(newsocketlabel, MAGIC_SOCKET);
 	COUNTER_INC(create_socket_from_socket);
@@ -791,7 +956,10 @@
 mac_test_relabel_socket(struct ucred *cred, struct socket *socket,
     struct label *socketlabel, struct label *newlabel)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_relabel_socket with cr_label "
+		"socketlabel and newlabel:", 
+		strlen("mac_test_relabel_socket with cr_label socketlabel and newlabel:"));
+	MAC_TEST_LOG_SUBMIT_LABEL3(cred,cred->cr_label,socket,socketlabel,socket,newlabel);
 	LABEL_CHECK(cred->cr_label, MAGIC_CRED);
 	LABEL_CHECK(newlabel, MAGIC_SOCKET);
 	COUNTER_INC(relabel_socket);
@@ -802,7 +970,10 @@
 mac_test_relabel_pipe(struct ucred *cred, struct pipepair *pp,
     struct label *pipelabel, struct label *newlabel)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_relabel_pipe with cr_label "
+		"pipelabel and newlabel:", 
+		strlen("mac_test_relabel_pipe with cr_label pipelabel and newlabel:"));
+	MAC_TEST_LOG_SUBMIT_LABEL3(cred,cred->cr_label,pipe,pipelabel,pipe,newlabel);
 	LABEL_CHECK(cred->cr_label, MAGIC_CRED);
 	LABEL_CHECK(pipelabel, MAGIC_PIPE);
 	LABEL_CHECK(newlabel, MAGIC_PIPE);
@@ -814,7 +985,10 @@
 mac_test_set_socket_peer_from_mbuf(struct mbuf *mbuf, struct label *mbuflabel,
     struct socket *socket, struct label *socketpeerlabel)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_set_socket_peer_from_mbuf with "
+		"mbuflabel and socketpeerlabel:", 
+		strlen("mac_test_set_socket_peer_from_mbuf with mbuflabel and socketpeerlabel:"));
+	MAC_TEST_LOG_SUBMIT_LABEL2(vnode,mbuflabel,socket,socketpeerlabel);
 	LABEL_CHECK(mbuflabel, MAGIC_MBUF);
 	LABEL_CHECK(socketpeerlabel, MAGIC_SOCKET);
 	COUNTER_INC(set_socket_peer_from_mbuf);
@@ -829,7 +1003,11 @@
     struct label *oldsocketlabel, struct socket *newsocket,
     struct label *newsocketpeerlabel)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_set_socket_peer_from_socket with"
+		" oldsocketlabel and newsocketpeerlabel:", 
+		strlen("mac_test_set_socket_peer_from_socket with "
+		"oldsocketlabel and newsocketpeerlabel:"));
+	MAC_TEST_LOG_SUBMIT_LABEL2(socket,oldsocketlabel,socket,newsocketpeerlabel);
 	LABEL_CHECK(oldsocketlabel, MAGIC_SOCKET);
 	LABEL_CHECK(newsocketpeerlabel, MAGIC_SOCKET);
 	COUNTER_INC(set_socket_peer_from_socket);
@@ -840,7 +1018,9 @@
 mac_test_create_bpfdesc(struct ucred *cred, struct bpf_d *bpf_d,
     struct label *bpflabel)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_bpfdesc with cr_label and bpflabel:", 
+		strlen("mac_test_create_bpfdesc with cr_label and bpflabel:"));
+	MAC_TEST_LOG_SUBMIT_LABEL2(cred,cred->cr_label,vnode,bpflabel);
 	LABEL_CHECK(cred->cr_label, MAGIC_CRED);
 	LABEL_CHECK(bpflabel, MAGIC_BPF);
 	COUNTER_INC(create_bpfdesc);
@@ -851,7 +1031,10 @@
 mac_test_create_datagram_from_ipq(struct ipq *ipq, struct label *ipqlabel,
     struct mbuf *datagram, struct label *datagramlabel)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_datagram_from_ipq "
+		"with ipqlabel and datagramlabel:", 
+		strlen("mac_test_create_datagram_from_ipq with ipqlabel and datagramlabel:"));
+	MAC_TEST_LOG_SUBMIT_LABEL2(vnode,ipqlabel,vnode,datagramlabel);
 	LABEL_CHECK(ipqlabel, MAGIC_IPQ);
 	LABEL_CHECK(datagramlabel, MAGIC_MBUF);
 	COUNTER_INC(create_datagram_from_ipq);
@@ -862,7 +1045,10 @@
 mac_test_create_fragment(struct mbuf *datagram, struct label *datagramlabel,
     struct mbuf *fragment, struct label *fragmentlabel)
 {
-
+	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_fragment "
+		"with datagramlabel and fragmentlabel:", 

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Oct 24 08:43:04 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CF4D816A46B; Wed, 24 Oct 2007 08:43: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 7C96916A419
	for ; Wed, 24 Oct 2007 08:43:03 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7E8A313C491
	for ; Wed, 24 Oct 2007 08:43:03 +0000 (UTC)
	(envelope-from zec@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 l9O8h3IG096037
	for ; Wed, 24 Oct 2007 08:43:03 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9O8h3U5096034
	for perforce@freebsd.org; Wed, 24 Oct 2007 08:43:03 GMT
	(envelope-from zec@FreeBSD.org)
Date: Wed, 24 Oct 2007 08:43:03 GMT
Message-Id: <200710240843.l9O8h3U5096034@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 127995 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, 24 Oct 2007 08:43:04 -0000

http://perforce.freebsd.org/chv.cgi?CH=127995

Change 127995 by zec@zec_tpx32 on 2007/10/24 08:43:01

	Rewrite a function for constructing full path name to a
	vimage, which was previously not only yielding bogus
	results, but was recursively invoking itself, which was
	not a wise approach given the limited size of the kernel
	stack.
	
	Rewrite vimage_get_next() function so that it doesn't
	traverse through the entire list of vimages, but walks
	the hierarchy by looking at child/parent/sibling relations.
	
	Change the convention for addressing parent vnet when
	returning an ifnet back to parent: instead of "-" now
	".." is used.
	
	Fix spelling: vi_sibilings -> vi_sibling
	
	Do not expose vimage ID to userspace any more, since only
	symbolic vimage name is relevant for addressing purposes.

Affected files ...

.. //depot/projects/vimage/src/sys/kern/kern_vimage.c#51 edit
.. //depot/projects/vimage/src/sys/sys/vimage.h#48 edit

Differences ...

==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#51 (text+ko) ====

@@ -285,7 +285,7 @@
  * passed as ifp.  The interface will be renamed to vi_req->vi_parent_name
  * if vi_req->vi_parent_name is not an empty string (uff ugly ugly)...
  * Similary, the target vnet can be specified either by vnet argument or
- * by name. If vnet name equals to "-" or vi_req is set to NULL the
+ * by name. If vnet name equals to ".." or vi_req is set to NULL the
  * interface is moved to the parent vnet.
  */
 int
@@ -298,7 +298,7 @@
 	struct vnet *new_vnet = NULL;
 	u_char eaddr[6];
 
-	if (vi_req == NULL || strcmp(vi_req->vi_name, "-") == 0) {
+	if (vi_req == NULL || strcmp(vi_req->vi_name, "..") == 0) {
 		if (IS_DEFAULT_VIMAGE(vip))
 			return (ENXIO);
 		new_vnet = vip->vi_parent->v_net;
@@ -465,7 +465,7 @@
 		namelen = strlen(name);
 	if (namelen == 0)
 		return(NULL);
-	LIST_FOREACH(vip, &top->vi_child_head, vi_sibilings)
+	LIST_FOREACH(vip, &top->vi_child_head, vi_sibling)
 		if (strncmp(name, vip->vi_name, namelen) == 0) {
 			if (next_name != NULL)
 				return(vimage_by_name(vip, next_name));
@@ -476,40 +476,58 @@
 }
 
 
-static int
+static void
 vimage_relative_name(struct vimage *top, struct vimage *where,
     char *buffer, int bufflen)
 {
+	int used = 1;
+
 	if (where == top) {
 		sprintf(buffer, ".");
-		return(1);
-	}
+		return;
+	} else
+		*buffer = 0;
 
-	if (where->vi_parent != top) {
-		int len;
+	do {
+		int namelen = strlen(where->vi_name);
 
-		len  = vimage_relative_name(top, where->vi_parent,
-		    buffer, bufflen);
-		bufflen -= (len + 1);
-		buffer += len;
-		sprintf(buffer++, ".");
-	}
+		if (namelen + used + 1 >= bufflen)
+			panic("buffer overflow");
 
-	sprintf(buffer, "%s", where->vi_name);
-	return(strlen(where->vi_name));
+		if (used > 1) {
+			bcopy(buffer, &buffer[namelen + 1], used);
+			buffer[namelen] = '.';
+			used++;
+		} else
+			bcopy(buffer, &buffer[namelen], used);
+		bcopy(where->vi_name, buffer, namelen);
+		used += namelen;
+		where = where->vi_parent;
+	} while (where != top);
 }
 
 
 static struct vimage *
 vimage_get_next(struct vimage *top, struct vimage *where)
 {
+	struct vimage *next;
+
+	/* Try to go deeper in the hierarchy */
+	next = LIST_FIRST(&where->vi_child_head);
+	if (next != NULL)
+		return(next);
+
 	do {
-		where = LIST_NEXT(where, vi_le);
-		if (where == NULL)
-			where = LIST_FIRST(&vimage_head);
-		if (vi_child_of(top, where))
-			return(where);
-	} while (where != top);
+		/* Try to find next sibling */
+		next = LIST_NEXT(where, vi_sibling);
+		if (next != NULL)
+			return(next);
+
+		/* Nothing left on this level, go one level up */
+		where = where->vi_parent;
+	} while (where != top->vi_parent);
+
+	/* Nothing left to be visited, we are done */
 	return(NULL);
 }
 
@@ -546,7 +564,6 @@
 	switch (cmd) {
 
 	case SIOCGPVIMAGE:
-		vi_req->vi_id = vip_r->vi_id;
 		vimage_relative_name(vip, vip_r, vi_req->vi_name,
 		    sizeof (vi_req->vi_name));
 		bcopy(&vip_r->v_procg->_averunnable, &vi_req->averunnable,
@@ -675,7 +692,7 @@
 	vip->vi_parent = parent;
 	/* XXX locking */
 	if (parent != NULL)
-		LIST_INSERT_HEAD(&parent->vi_child_head, vip, vi_sibilings);
+		LIST_INSERT_HEAD(&parent->vi_child_head, vip, vi_sibling);
 	else if (!LIST_EMPTY(&vimage_head))
 		panic("there can be only one default vimage!");
 	LIST_INSERT_HEAD(&vimage_head, vip, vi_le);
@@ -755,7 +772,7 @@
 	/* Point with no return - cleanup MUST succeed! */
 	/* XXX locking */
 	LIST_REMOVE(vip, vi_le);
-	LIST_REMOVE(vip, vi_sibilings);
+	LIST_REMOVE(vip, vi_sibling);
 
 	/* XXX locking */
 	LIST_REMOVE(vprocg, vprocg_le);

==== //depot/projects/vimage/src/sys/sys/vimage.h#48 (text+ko) ====

@@ -379,7 +379,7 @@
 
 struct vimage {
 	LIST_ENTRY(vimage) vi_le;	/* all vimage list */
-	LIST_ENTRY(vimage) vi_sibilings;	/* vimages with same parent */
+	LIST_ENTRY(vimage) vi_sibling;	/* vimages with same parent */
 	LIST_HEAD(, vimage) vi_child_head;	/* direct offspring list */
 	struct	vimage *vi_parent;	/* ptr to parent vimage */
 	u_int	vi_id;			/* ID num */
@@ -461,7 +461,6 @@
 	u_int	vi_cpu_weight;		/* Prop. share scheduling priority */
 	int	vi_intr_limit;		/* Limit on CPU usage in intr ctx */
 	int	vi_maxsockets;
-	u_short vi_id;			/* IDnum - but do we need it at all? */
 	u_short vi_proc_limit;		/* max. number of processes */
 	u_short vi_proc_count;		/* current number of processes */
 	u_short vi_child_limit;		/* max. number of child vnets */

From owner-p4-projects@FreeBSD.ORG  Wed Oct 24 09:07:18 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 46DA516A419; Wed, 24 Oct 2007 09:07: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 69A1716A417
	for ; Wed, 24 Oct 2007 09:07:17 +0000 (UTC)
	(envelope-from zhouzhouyi@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6866413C4BC
	for ; Wed, 24 Oct 2007 09:07:17 +0000 (UTC)
	(envelope-from zhouzhouyi@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 l9O97Hfv007481
	for ; Wed, 24 Oct 2007 09:07:17 GMT
	(envelope-from zhouzhouyi@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9O8xi0s005756
	for perforce@freebsd.org; Wed, 24 Oct 2007 08:59:44 GMT
	(envelope-from zhouzhouyi@FreeBSD.org)
Date: Wed, 24 Oct 2007 08:59:44 GMT
Message-Id: <200710240859.l9O8xi0s005756@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zhouzhouyi@FreeBSD.org using -f
From: Zhouyi ZHOU 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 127997 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, 24 Oct 2007 09:07:18 -0000

http://perforce.freebsd.org/chv.cgi?CH=127997

Change 127997 by zhouzhouyi@zhouzhouyi_mactest on 2007/10/24 08:59:43

	Integration

Affected files ...

.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/README#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/TODO#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/acct/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/acct/pack.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/acct/regress.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/aio/aiotest/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/aio/aiotest/aiotest.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/aio/kqueue/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/aio/kqueue/aio_kqueue.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/aio/kqueue/lio/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/aio/kqueue/lio/lio_kqueue.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/atm/Funcs.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/atm/README#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/atm/RunTest.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/atm/harp/atm_udp.ng#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/atm/harp/memory_leak.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/atm/proto_cc/RunTest.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/atm/proto_sscfu/RunTest.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/atm/proto_sscop/RunTest.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/atm/proto_uni/RunTest.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/audit/audit_pipe_ioctl/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/audit/audit_pipe_ioctl/audit_pipe_ioctl.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/alias.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/alias.0.stdout#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/alias.1#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/alias.1.stderr#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/case1.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/command1.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/command2.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/command3.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/command3.0.stdout#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/command4.127#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/command5.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/command5.0.stdout#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/hash1.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/hash1.0.stdout#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/hash2.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/hash2.0.stdout#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/hash3.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/hash3.0.stdout#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/return1.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/return2.1#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/return3.1#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/type1.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/type1.0.stdout#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/unalias.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/var-assign.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/errors/bad-parm-exp1.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/errors/bad-parm-exp2.2#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/errors/bad-parm-exp2.2.stderr#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/errors/bad-parm-exp3.2#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/errors/bad-parm-exp3.2.stderr#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/errors/bad-parm-exp4.2#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/errors/bad-parm-exp4.2.stderr#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/errors/bad-parm-exp5.2#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/errors/bad-parm-exp5.2.stderr#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/errors/option-error.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/errors/redirection-error.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/regress.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/regress.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/and1.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/and2.1#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/and3.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/and4.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/background1.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/cmd1.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/cmd2.1#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/elif1.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/elif2.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/for1.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/func1.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/func2.1#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/if1.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/if2.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/if3.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/not1.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/not2.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/or1.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/or2.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/or3.1#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/pipe1.1#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/pipe2.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/return1.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/semi1.1#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/semi2.1#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/subshell1.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/subshell2.1#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/until1.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/until2.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/until3.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/while1.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/while2.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/while3.0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/a.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/b.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ccd.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ccd0.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.128k_128k_128k_128k_0_0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.128k_128k_128k_128k_0_4#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.128k_128k_128k_128k_4_0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.128k_128k_128k_128k_4_2#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.128k_128k_128k_128k_4_4#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.256k_128k_128k_128k_0_0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.256k_128k_128k_128k_0_4#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.256k_128k_128k_128k_4_0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.256k_128k_128k_128k_4_2#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.256k_128k_128k_128k_4_4#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.256k_128k_384k_128k_0_0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.256k_128k_384k_128k_0_4#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.256k_128k_384k_128k_16_0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.256k_128k_384k_128k_16_2#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.256k_128k_384k_128k_16_4#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.256k_128k_384k_128k_4_0#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.256k_128k_384k_128k_4_2#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.256k_128k_384k_128k_4_4#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/environ/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/environ/Makefile.envctl#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/environ/Makefile.retention#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/environ/Makefile.timings#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/environ/envctl.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/environ/envtest.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/environ/retention.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/environ/timings.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ethernet/ethermulti/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ethernet/ethermulti/ethermulti.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/execve/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/execve/doexec.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/execve/execve.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/execve/tests/badinterplen#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/execve/tests/devnullscript#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/execve/tests/goodaout.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/execve/tests/goodscript#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/execve/tests/nonexistshell#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/execve/tests/scriptarg#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/execve/tests/scriptarg-nospace#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fifo/fifo_create/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fifo/fifo_create/fifo_create.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fifo/fifo_io/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fifo/fifo_io/fifo_io.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fifo/fifo_misc/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fifo/fifo_misc/fifo_misc.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fifo/fifo_open/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fifo/fifo_open/fifo_open.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/file/dup/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/file/dup/dup.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/file/dup/dup.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/file/ftruncate/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/file/ftruncate/ftruncate.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/LICENSE#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/README#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/fstest.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chflags/00.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chflags/01.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chflags/02.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chflags/03.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chflags/04.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chflags/05.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chflags/06.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chflags/07.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chflags/08.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chflags/09.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chflags/10.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chflags/11.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chflags/12.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chflags/13.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chmod/00.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chmod/01.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chmod/02.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chmod/03.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chmod/04.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chmod/05.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chmod/06.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chmod/07.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chmod/08.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chmod/09.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chmod/10.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chmod/11.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chown/00.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chown/01.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chown/02.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chown/03.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chown/04.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chown/05.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chown/06.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chown/07.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chown/08.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chown/09.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chown/10.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/conf#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/00.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/01.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/02.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/03.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/04.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/05.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/06.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/07.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/08.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/09.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/10.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/11.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/12.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/13.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/14.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/15.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/16.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/17.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/misc.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkdir/00.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkdir/01.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkdir/02.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkdir/03.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkdir/04.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkdir/05.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkdir/06.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkdir/07.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkdir/08.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkdir/09.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkdir/10.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkdir/11.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkdir/12.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkfifo/00.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkfifo/01.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkfifo/02.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkfifo/03.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkfifo/04.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkfifo/05.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkfifo/06.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkfifo/07.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkfifo/08.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkfifo/09.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkfifo/10.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkfifo/11.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkfifo/12.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/00.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/01.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/02.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/03.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/04.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/05.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/06.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/07.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/08.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/09.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/10.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/11.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/12.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/13.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/14.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/15.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/16.t#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/17.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/18.t#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/19.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/20.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/21.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/22.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/23.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/00.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/01.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/02.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/03.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/04.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/05.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/06.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/07.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/08.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/09.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/10.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/11.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/12.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/13.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/14.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/15.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/16.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/17.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/18.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/19.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/20.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/00.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/01.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/02.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/03.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/04.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/05.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/06.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/07.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/08.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/09.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/10.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/11.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/12.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/13.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/14.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/15.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/symlink/00.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/symlink/01.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/symlink/02.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/symlink/03.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/symlink/04.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/symlink/05.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/symlink/06.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/symlink/07.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/symlink/08.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/symlink/09.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/symlink/10.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/symlink/11.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/symlink/12.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/truncate/00.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/truncate/01.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/truncate/02.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/truncate/03.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/truncate/04.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/truncate/05.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/truncate/06.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/truncate/07.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/truncate/08.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/truncate/09.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/truncate/10.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/truncate/11.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/truncate/12.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/truncate/13.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/truncate/14.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/unlink/00.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/unlink/01.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/unlink/02.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/unlink/03.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/unlink/04.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/unlink/05.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/unlink/06.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/unlink/07.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/unlink/08.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/unlink/09.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/unlink/10.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/unlink/11.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/unlink/12.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/unlink/13.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fsx/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fsx/fsx.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/gaithrstress/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/gaithrstress/gaithrstress.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/ConfCmp/ConfCmp.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/ConfCmp/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/ConfCmp/a1.conf#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/ConfCmp/a1a.conf#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/ConfCmp/a1b.conf#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/ConfCmp/a1c.conf#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/ConfCmp/a1d.conf#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/ConfCmp/a2.conf#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/ConfCmp/a2a.conf#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/ConfCmp/a2b.conf#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/ConfCmp/a2c.conf#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/ConfCmp/a2d.conf#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Data/disk.alpha.da0.xml#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Data/disk.alpha2.da0.xml#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Data/disk.apple.xml#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Data/disk.beast.da0.xml#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Data/disk.critter.ad0.xml#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Data/disk.empty.flp.xml#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Data/disk.far.ad0.xml#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Data/disk.flat.da1.xml#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Data/disk.kern.flp.xml#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Data/disk.msdos.ext.xml#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Data/disk.msdos.flp.xml#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Data/disk.pc98.wdc0.xml#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Data/disk.sun.da0.xml#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Data/disk.sun.da1.xml#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Data/disk.typo.ad0.xml#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/MdLoad/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/MdLoad/MdLoad.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Ref/disk.alpha.da0.xml#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Ref/disk.alpha2.da0.xml#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Ref/disk.apple.xml#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Ref/disk.beast.da0.xml#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Ref/disk.critter.ad0.xml#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Ref/disk.empty.flp.xml#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Ref/disk.far.ad0.xml#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Ref/disk.flat.da1.xml#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Ref/disk.kern.flp.xml#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Ref/disk.msdos.ext.xml#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Ref/disk.msdos.flp.xml#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Ref/disk.pc98.wdc0.xml#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Ref/disk.sun.da0.xml#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Ref/disk.sun.da1.xml#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Ref/disk.typo.ad0.xml#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/RunTest.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/RunTest.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_concat/conf.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_concat/test-1.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_concat/test-2.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/attach-d.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/configure-b-B.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/delkey.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/detach-l.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/init-a.t#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/init-i-P.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/init.t#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/integrity-copy.t#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/integrity-data.t#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/integrity-hmac.t#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/kill.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/nokey.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/onetime-a.t#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/onetime-d.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/onetime.t#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/readonly.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/setkey.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_gate/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_gate/runtests.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_gate/test-1.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_gate/test-1.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_gate/test-2.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_gate/test-2.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_gate/test-3.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_gate/test-3.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_gpt/gctl.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_gpt/test.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_mirror/conf.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_mirror/test-1.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_mirror/test-2.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_mirror/test-3.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_mirror/test-4.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_mirror/test-5.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_mirror/test-6.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_mirror/test-7.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_nop/conf.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_nop/test-1.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_nop/test-2.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_raid3/conf.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_raid3/test-1.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_raid3/test-10.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_raid3/test-11.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_raid3/test-12.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_raid3/test-2.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_raid3/test-3.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_raid3/test-4.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_raid3/test-5.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_raid3/test-6.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_raid3/test-7.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_raid3/test-8.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_raid3/test-9.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_shsec/conf.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_shsec/test-1.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_shsec/test-2.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_stripe/conf.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_stripe/test-1.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_stripe/test-2.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_subr.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_uzip/.cvsignore#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_uzip/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_uzip/etalon/etalon.txt#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_uzip/runtests.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_uzip/test-1.img.uzip.uue#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_uzip/test-1.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_uzip/test-2.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ia64/emulated/brl.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ia64/emulated/test.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ia64/unaligned/test.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ia64/unaligned/unaligned.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/include/tgmath/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/include/tgmath/tgmath.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/include/tgmath/tgmath.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ipsec/ipsec.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ipsec/ipsec6.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/gen/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/gen/test-fpclassify.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/gen/test-wordexp.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-btowc.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-btowc.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-iswctype.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-iswctype.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-mblen.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-mblen.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-mbrlen.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-mbrlen.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-mbrtowc.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-mbrtowc.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-mbsnrtowcs.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-mbsnrtowcs.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-mbsrtowcs.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-mbsrtowcs.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-mbstowcs.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-mbstowcs.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-mbtowc.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-mbtowc.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-towctrans.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-towctrans.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-wcrtomb.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-wcrtomb.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-wcsnrtombs.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-wcsnrtombs.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-wcsrtombs.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-wcsrtombs.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-wcstombs.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-wcstombs.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-wctomb.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-wctomb.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/net/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/net/test-ether.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/net/test-ether.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/net/test-eui64.h#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/net/test-eui64_aton.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/net/test-eui64_aton.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/net/test-eui64_line.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/net/test-eui64_line.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/net/test-eui64_ntoa.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/net/test-eui64_ntoa.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/README#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/mach#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-getaddr.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-getaddr.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-getgr.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-getgr.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-gethostby.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-gethostby.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-getproto.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-getproto.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-getpw.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-getpw.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-getrpc.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-getrpc.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-getserv.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-getserv.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-getusershell.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-getusershell.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/testutil.h#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/regex/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/resolv/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/resolv/mach#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/resolv/resolv.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/resolv/resolv.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/stdio/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/stdio/test-perror.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/stdio/test-perror.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/stdio/test-printfloat.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/stdio/test-printfloat.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/stdio/test-scanfloat.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/stdio/test-scanfloat.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/stdlib/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/stdlib/test-heapsort.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/stdlib/test-heapsort.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/stdlib/test-mergesort.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/stdlib/test-mergesort.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/stdlib/test-qsort.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/stdlib/test-qsort.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/stdlib/test-sort.h#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/string/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/string/test-strerror.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/string/test-strerror.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libmp/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libmp/test-libmp.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libmp/test-libmp.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libutil/Makefile#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libutil/test-flopen.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libutil/test-flopen.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libutil/test-trimdomain-nodomain.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libutil/test-trimdomain-nodomain.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libutil/test-trimdomain.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libutil/test-trimdomain.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/msun/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/msun/test-fenv.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/msun/test-fenv.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/msun/test-ilogb.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/msun/test-ilogb.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/msun/test-lrint.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/msun/test-lrint.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/msun/test-lround.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/msun/test-lround.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/msun/test-next.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/msun/test-next.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/msun/test-rem.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/msun/test-rem.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mac/mac_bsdextended/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mac/mac_bsdextended/test_matches.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mac/mac_bsdextended/test_ugidfw.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mlock/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mlock/mlock.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mqueue/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mqueue/mqtest1/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mqueue/mqtest1/mqtest1.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mqueue/mqtest2/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mqueue/mqtest2/mqtest2.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mqueue/mqtest3/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mqueue/mqtest3/mqtest3.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mqueue/mqtest4/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mqueue/mqtest4/mqtest4.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mqueue/mqtest5/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mqueue/mqtest5/mqtest5.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/msdosfs/msdosfstest-2.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/msdosfs/msdosfstest-3.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/msdosfs/msdosfstest-4.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/msdosfs/msdosfstest-5.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/msdosfs/msdosfstest-6.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/msdosfs/msdosfstest.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/net80211/ccmp/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/net80211/ccmp/test_ccmp.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/net80211/tkip/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/net80211/tkip/test_tkip.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/net80211/wep/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/net80211/wep/test_wep.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netatalk/simple_send/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netatalk/simple_send/simple_send.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/ipbroadcast/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/ipbroadcast/ipbroadcast.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/ipmulticast/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/ipmulticast/ipmulticast.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/ipsockopt/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/ipsockopt/ipsockopt.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/ipsockopt/ipsockopt.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/msocket/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/msocket/msocket.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/msocket_ifnet_remove/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/msocket_ifnet_remove/msocket_ifnet_remove.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/rawconnect/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/rawconnect/rawconnect.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/rawconnect/rawconnect.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/tcpconnect/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/tcpconnect/tcpconnect.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/tcpdrop/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/tcpdrop/tcpdrop.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/tcpfullwindowrst/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/tcpfullwindowrst/tcpfullwindowrst.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/tcpfullwindowrst/tcpfullwindowrsttest.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/tcpsockclosebeforeaccept/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/tcpsockclosebeforeaccept/tcpsockclosebeforeaccept.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/tcpsocktimewait/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/tcpsocktimewait/tcpsocktimewait.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/tcpstream/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/tcpstream/README#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/tcpstream/tcpstream.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/udpconnectjail/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/udpconnectjail/udpconnectjail.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet6/inet6_rth/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet6/inet6_rth/inet6_rth-segments.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet6/inet6_rth/test_subr.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet6/inet6_rth/test_subr.h#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet6/ip6_sockets/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet6/ip6_sockets/ip6_sockets.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netipx/README#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netipx/ipxdgramloopback/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netipx/ipxdgramloopback/ipxdgramloopback.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netipx/ipxsocket/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netipx/ipxsocket/ipxsocket.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netipx/spxabort/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netipx/spxabort/spxabort.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netipx/spxloopback/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netipx/spxloopback/spxloopback.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/nfsmmap/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/nfsmmap/README#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/nfsmmap/test1/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/nfsmmap/test1/test1.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/nfsmmap/test1/test1.good.uu#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/nfsmmap/test1/test1.zeros.uu#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/nfsmmap/test2/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/nfsmmap/test2/test2.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/nfsmmap/test2/test2.good.uu#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/nfsmmap/test2/test2.zeros.uu#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/p1003_1b/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/p1003_1b/README#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/p1003_1b/fifo.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/p1003_1b/main.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/p1003_1b/memlock.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/p1003_1b/p26.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/p1003_1b/prutil.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/p1003_1b/prutil.h#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/p1003_1b/sched.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/p1003_1b/yield.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/pipe/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/pipe/bigpipetest.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/pipe/bigpipetest.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/pipe/pipe-fstatbug.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/pipe/pipe-overcommit1.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/pipe/pipe-overcommit2.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/pipe/pipe-reverse.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/pipe/pipe-wraparound.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/Makefile#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/main.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/main.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_acct.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_adjtime.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_audit_control.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_audit_getaudit.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_audit_setaudit.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_audit_submit.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_clock_settime.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_cred.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_io.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_kenv_set.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_kenv_unset.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_msgbuf.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_netinet_raw.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_proc_setlogin.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_proc_setrlimit.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_sched_rtprio.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_sched_setpriority.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_settimeofday.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_sysctl_write.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vfs_chflags.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vfs_chmod.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vfs_chown.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vfs_chroot.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vfs_clearsugid.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vfs_extattr_system.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vfs_fhopen.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vfs_fhstat.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vfs_fhstatfs.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vfs_generation.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vfs_getfh.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vfs_read_write.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vfs_setgid.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vfs_stickyfile.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vfs_utimes.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vm_madv_protect.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vm_mlock.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vm_munlock.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/pthread/cv_cancel1/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/pthread/cv_cancel1/cv_cancel1.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/redzone9/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/redzone9/README#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/redzone9/redzone.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/redzone9/test.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/security/access/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/security/access/testaccess.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/security/proc_to_proc/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/security/proc_to_proc/README#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/security/proc_to_proc/scenario.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/security/proc_to_proc/scenario.h#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/security/proc_to_proc/testuid.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sigqueue/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sigqueue/sigqtest1/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sigqueue/sigqtest1/sigqtest1.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sigqueue/sigqtest2/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sigqueue/sigqtest2/sigqtest2.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/accept_fd_leak/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/accept_fd_leak/accept_fd_leak.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/accept_fd_leak/accept_fd_leak.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/accf_data_attach/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/accf_data_attach/accf_data_attach.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/accf_data_attach/accf_data_attach.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/kqueue/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/kqueue/kqueue.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/kqueue/kqueue.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/listen_backlog/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/listen_backlog/listen_backlog.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/listenclose/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/listenclose/listenclose.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/pr_atomic/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/pr_atomic/pr_atomic.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/reconnect/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/reconnect/reconnect.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/rtsocket/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/rtsocket/rtsocket.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/sblock/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/sblock/sblock.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/sendfile/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/sendfile/sendfile.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/shutdown/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/shutdown/shutdown.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/sigpipe/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/sigpipe/sigpipe.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/socketpair/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/socketpair/socketpair.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/unix_bindconnect/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/unix_bindconnect/unix_bindconnect.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/unix_cmsg/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/unix_cmsg/README#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/unix_cmsg/unix_cmsg.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/unix_cmsg/unix_cmsg.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/unix_passfd/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/unix_passfd/unix_passfd.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/unix_sendtorace/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/unix_sendtorace/unix_sendtorace.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/unix_socket/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/unix_socket/unix_socket.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/zerosend/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/zerosend/zerosend.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sysvmsg/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sysvmsg/README#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sysvmsg/msgtest.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sysvsem/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sysvsem/README#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sysvsem/semtest.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sysvshm/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sysvshm/README#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sysvshm/shmtest.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/Makefile.inc#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/libxx/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/libxx/xx.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/libyy/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/libyy/yy.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/ttls1/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/ttls1/ttls1.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/ttls2/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/ttls2/ttls2.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/ttls3/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/ttls3/elftls.S#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/ttls3/tls-test-lib.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/ttls3/tls-test.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/ttls4/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/ttls4/ttls4.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/Makefile#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/h_funcs.subr#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/h_tools.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_create#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_dots#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_exec#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_link#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_mkdir#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_mount#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_pipes#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_read_write#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_readdir#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_remove#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_rename#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_rmdir#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_setattr#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_sizes#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_sockets#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_statvfs#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_symlink#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_times#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_trail_slash#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_truncate#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_vnd#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_vnode_leak#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ufs/uprintf/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ufs/uprintf/ufs_uprintf.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/calendar.calibrate#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.a1.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.a2.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.a3.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.a4.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.a5.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.b1.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.b2.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.b3.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.b4.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.b5.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.s1.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.s2.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.s3.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.s4.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.w0-1.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.w0-2.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.w0-3.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.w0-4.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.w0-5.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.w0-6.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.w0-7.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.wn-1.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.wn-2.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.wn-3.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.wn-4.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.wn-5.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.wn-6.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.wn-7.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/env/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/env/regress-env.rgdata#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/env/regress-sb.rb#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/file2c/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/file2c/regress.1.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/file2c/regress.2.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/file2c/regress.3.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/file2c/regress.4.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/file2c/regress.5.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/file2c/regress.6.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/file2c/regress.7.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/file2c/regress.8.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/file2c/regress.9.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/file2c/regress.in#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/file2c/regress.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/file2c/regress.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/join/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/join/regress.1.in#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/join/regress.2.in#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/join/regress.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/join/regress.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/join/regress.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.ascii.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.block.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.dddh.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.ddhd.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.ddhd2.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.ddhh.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.ddhh2.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.dhdd.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.dhdh.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.dhhd.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.dhhd2.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.dhhh.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.dhhh2.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.ed.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.grep.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hddd.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hddd2.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hddh.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hddh2.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hdhd.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hdhd2.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hdhh.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hdhh2.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hhdd.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hhdd2.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hhdh.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hhdh2.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hhhd.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hhhd2.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hhhh.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hhhh2.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.n21.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.stutter.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.tabs.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wX.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wXl.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wc.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wdl.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wdn.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.we.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wf.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wg.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wgd.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wo.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wp1.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wp2.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wp3.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wp4.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wp5.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wp6.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wu.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wwe.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wx.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wxn.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.x.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.xaa.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.yes.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/README#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/regress.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/v1-amd64-acct.in#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/v1-amd64.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/v1-i386-acct.in#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/v1-i386.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/v1-sparc64-acct.in#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/v1-sparc64.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/v2-amd64-acct.in#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/v2-amd64.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/v2-i386-acct.in#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/v2-i386.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/v2-sparc64-acct.in#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/v2-sparc64.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/values.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/m4/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/m4/regress.changecom.in#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/m4/regress.changecom.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/m4/regress.gchangecom.out#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/m4/regress.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/m4/regress.t#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/README#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/all.sh#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/Makefile#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.status.1#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.status.2#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.status.3#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.status.4#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.status.5#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.status.6#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.status.7#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.1#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.2#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.3#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.4#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.5#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.6#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.7#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.1#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.2#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.3#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.4#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.5#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.6#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.7#2 integrate

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Oct 24 12:32:06 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A82E316A421; Wed, 24 Oct 2007 12:32: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 6DB0816A41B
	for ; Wed, 24 Oct 2007 12:32:06 +0000 (UTC)
	(envelope-from anchie@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 54C2013C49D
	for ; Wed, 24 Oct 2007 12:32:06 +0000 (UTC)
	(envelope-from anchie@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 l9OCW6GQ061319
	for ; Wed, 24 Oct 2007 12:32:06 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9OCW6sT061316
	for perforce@freebsd.org; Wed, 24 Oct 2007 12:32:06 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Wed, 24 Oct 2007 12:32:06 GMT
Message-Id: <200710241232.l9OCW6sT061316@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	anchie@FreeBSD.org using -f
From: Ana Kukec 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128006 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, 24 Oct 2007 12:32:06 -0000

http://perforce.freebsd.org/chv.cgi?CH=128006

Change 128006 by anchie@anchie_malimis on 2007/10/24 12:31:29

		Removed redundant initialization of icmp6errpps_count variable. 	

Affected files ...

.. //depot/projects/vimage/src/sys/netinet6/icmp6.c#19 edit

Differences ...

==== //depot/projects/vimage/src/sys/netinet6/icmp6.c#19 (text+ko) ====

@@ -144,7 +144,6 @@
 {
 	INIT_VNET_INET6(curvnet);
 	V_icmp6errpps_count = 0;
-	V_icmp6errpps_count = 0;	
 
 	mld6_init();
 }

From owner-p4-projects@FreeBSD.ORG  Wed Oct 24 17:48:45 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C97AE16A41B; Wed, 24 Oct 2007 17:48: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 7980516A417
	for ; Wed, 24 Oct 2007 17:48:44 +0000 (UTC)
	(envelope-from julian@elischer.org)
Received: from outG.internet-mail-service.net (outG.internet-mail-service.net
	[216.240.47.230])
	by mx1.freebsd.org (Postfix) with ESMTP id 5D0BE13C4B6
	for ; Wed, 24 Oct 2007 17:48:44 +0000 (UTC)
	(envelope-from julian@elischer.org)
Received: from mx0.idiom.com (HELO idiom.com) (216.240.32.160)
	by out.internet-mail-service.net (qpsmtpd/0.40) with ESMTP;
	Wed, 24 Oct 2007 10:48:34 -0700
X-Client-Authorized: MaGic Cook1e
X-Client-Authorized: MaGic Cook1e
Received: from julian-mac.elischer.org (nat.ironport.com [63.251.108.100])
	by idiom.com (Postfix) with ESMTP id 591041267EF;
	Wed, 24 Oct 2007 10:48:34 -0700 (PDT)
Message-ID: <471F858C.20802@elischer.org>
Date: Wed, 24 Oct 2007 10:49:00 -0700
From: Julian Elischer 
User-Agent: Thunderbird 2.0.0.6 (Macintosh/20070728)
MIME-Version: 1.0
To: Marko Zec 
References: <200710230018.l9N0IO8l020652@repoman.freebsd.org>
	<200710232314.38149.zec@icir.org> <471E7645.1030503@elischer.org>
	<200710240139.00008.zec@icir.org>
In-Reply-To: <200710240139.00008.zec@icir.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: Perforce Change Reviews 
Subject: Re: PERFORCE change 127942 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, 24 Oct 2007 17:48:45 -0000

Marko Zec wrote:
> On Wednesday 24 October 2007 00:31:33 Julian Elischer wrote:
>> Marko Zec wrote:
>>> On Tuesday 23 October 2007 02:49:24 Julian Elischer wrote:
>>>> question:
>>>>
>>>> can processes in two vimages communicate if they both have access
>>>> to the same named pipe/fifo in the filesystem?
>>> Yes, provided that they open the fifo while they would be both
>>> attached to the same vnet.  Once the sockets would become open the
>>> processes could reassociate to arbitrary vimages, while the sockets
>>> would remain bound to their original vnets for their entire
>>> lifetime duration.
>> hmm that's not what I want... what I want is an ability for processes
>> in two overlapping vimages to communicate easily without incuring the
>> overhead of going throigh a virtual router.
>>
>> another possibility is a 
>> local: interface (address 127.1.[vnet number]) which acts like a
>> local net  between the virtual machines.
> 
> Uhh I'd rather not take that path...  This would require at least a) 
> lots of special casing all around IP stack; and b) that vimages/vnets 
> would need to be directly addressable by small integers.
> 
> I'd prefer if we could work out a solution where symbolic (textual) 
> naming of vimages/vnets would be sufficient for all purposes...
> 
>>> As an alternative, we could / should introduce an extended socket()
>>> syscall where an additional argument would explicitly specify to
>>> which vimage/vnet the new socket should belong.
>> if a process in the root vimage makes fifo in
>> /vimages/vimage1/usr/tmp/fifo1
>>
>> and a process in vimage1 (that is chrooted at /vimages/vimage1/)
>> opens the fifo at /usr/tmp/fifo1
>>
>> why can't they communicate?  I'm surprised at this..
> 
> You're right the example you gave above actually works I just tried this 
> out (now I'm slightly surprised :).  However netstat -f unix will show 
> the socket pair only in one of the vimages/vnets...  I don't know why I 
> thought there was also a prison_check() call somewhere inside or around 
> unp_connect() but apparently there isn't...
> 
> So while this obviously works for you I'm not entirely sure that this is 
> the behavior we wish to have...

As a named pipe is a note in the filesystem that both can see it would 
be extremely POLA if they didn't refer to the same object..

If you do make this happen, please make it configurable.



> Cheers,
> 
> Marko
> 


From owner-p4-projects@FreeBSD.ORG  Wed Oct 24 18:00:00 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9E73716A41A; Wed, 24 Oct 2007 18: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 63DE616A418
	for ; Wed, 24 Oct 2007 18:00:00 +0000 (UTC)
	(envelope-from zec@icir.org)
Received: from xaqua.tel.fer.hr (xaqua.tel.fer.hr [161.53.19.25])
	by mx1.freebsd.org (Postfix) with ESMTP id CB5C613C4B8
	for ; Wed, 24 Oct 2007 17:59:59 +0000 (UTC)
	(envelope-from zec@icir.org)
Received: by xaqua.tel.fer.hr (Postfix, from userid 20006)
	id 713349B651; Wed, 24 Oct 2007 19:59:52 +0200 (CEST)
X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on xaqua.tel.fer.hr
X-Spam-Level: 
X-Spam-Status: No, score=-4.3 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 
	autolearn=ham version=3.1.7
Received: from [192.168.200.103] (zec2.tel.fer.hr [161.53.19.79])
	by xaqua.tel.fer.hr (Postfix) with ESMTP id 0A4299B644
	for ; Wed, 24 Oct 2007 19:59:50 +0200 (CEST)
From: Marko Zec 
To: Perforce Change Reviews 
Date: Wed, 24 Oct 2007 19:59:44 +0200
User-Agent: KMail/1.9.7
References: <200710230018.l9N0IO8l020652@repoman.freebsd.org>
	<200710240139.00008.zec@icir.org> <471F858C.20802@elischer.org>
In-Reply-To: <471F858C.20802@elischer.org>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200710241959.44505.zec@icir.org>
Cc: 
Subject: Re: PERFORCE change 127942 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, 24 Oct 2007 18:00:00 -0000

On Wednesday 24 October 2007 19:49:00 Julian Elischer wrote:
> Marko Zec wrote:
> > On Wednesday 24 October 2007 00:31:33 Julian Elischer wrote:
> >> Marko Zec wrote:
> >>> On Tuesday 23 October 2007 02:49:24 Julian Elischer wrote:
> >>>> question:
> >>>>
> >>>> can processes in two vimages communicate if they both have
> >>>> access to the same named pipe/fifo in the filesystem?
> >>>
> >>> Yes, provided that they open the fifo while they would be both
> >>> attached to the same vnet.  Once the sockets would become open
> >>> the processes could reassociate to arbitrary vimages, while the
> >>> sockets would remain bound to their original vnets for their
> >>> entire lifetime duration.
> >>
> >> hmm that's not what I want... what I want is an ability for
> >> processes in two overlapping vimages to communicate easily without
> >> incuring the overhead of going throigh a virtual router.
> >>
> >> another possibility is a
> >> local: interface (address 127.1.[vnet number]) which acts like a
> >> local net  between the virtual machines.
> >
> > Uhh I'd rather not take that path...  This would require at least
> > a) lots of special casing all around IP stack; and b) that
> > vimages/vnets would need to be directly addressable by small
> > integers.
> >
> > I'd prefer if we could work out a solution where symbolic (textual)
> > naming of vimages/vnets would be sufficient for all purposes...
> >
> >>> As an alternative, we could / should introduce an extended
> >>> socket() syscall where an additional argument would explicitly
> >>> specify to which vimage/vnet the new socket should belong.
> >>
> >> if a process in the root vimage makes fifo in
> >> /vimages/vimage1/usr/tmp/fifo1
> >>
> >> and a process in vimage1 (that is chrooted at /vimages/vimage1/)
> >> opens the fifo at /usr/tmp/fifo1
> >>
> >> why can't they communicate?  I'm surprised at this..
> >
> > You're right the example you gave above actually works I just tried
> > this out (now I'm slightly surprised :).  However netstat -f unix
> > will show the socket pair only in one of the vimages/vnets...  I
> > don't know why I thought there was also a prison_check() call
> > somewhere inside or around unp_connect() but apparently there
> > isn't...
> >
> > So while this obviously works for you I'm not entirely sure that
> > this is the behavior we wish to have...
>
> As a named pipe is a note in the filesystem that both can see it
> would be extremely POLA if they didn't refer to the same object..
>
> If you do make this happen, please make it configurable.

OK I won't change the current behavior of named pipes accross boundary 
of two vnets, unless somebody steps up with a different view / 
argumentation...

Marko


From owner-p4-projects@FreeBSD.ORG  Wed Oct 24 22:21:28 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C4F2616A46C; Wed, 24 Oct 2007 22:21: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 686B216A468
	for ; Wed, 24 Oct 2007 22:21:27 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 56D5D13C465
	for ; Wed, 24 Oct 2007 22:21:27 +0000 (UTC)
	(envelope-from peter@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 l9OMLRO1089711
	for ; Wed, 24 Oct 2007 22:21:27 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9OMLRm4089708
	for perforce@freebsd.org; Wed, 24 Oct 2007 22:21:27 GMT
	(envelope-from peter@freebsd.org)
Date: Wed, 24 Oct 2007 22:21:27 GMT
Message-Id: <200710242221.l9OMLRm4089708@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128034 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, 24 Oct 2007 22:21:28 -0000

http://perforce.freebsd.org/chv.cgi?CH=128034

Change 128034 by peter@peter_daintree on 2007/10/24 22:21:05

	Evil nasty despicable (but low impact) hack to make gcc -m32 work.

Affected files ...

.. //depot/projects/hammer/contrib/gcc/gcc.c#12 edit
.. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/freebsd-native.h#10 edit

Differences ...

==== //depot/projects/hammer/contrib/gcc/gcc.c#12 (text+ko) ====

@@ -780,12 +780,16 @@
 static const char *trad_capable_cpp =
 "cc1 -E %{traditional|ftraditional|traditional-cpp:-traditional-cpp}";
 
+#ifndef INCLUDE32
+#define INCLUDE32 " "
+#endif
+
 /* We don't wrap .d files in %W{} since a missing .d file, and
    therefore no dependency entry, confuses make into thinking a .o
    file that happens to exist is up-to-date.  */
 static const char *cpp_unique_options =
 "%{C|CC:%{!E:%eGCC does not support -C or -CC without -E}}\
- %{!Q:-quiet} %{nostdinc*} %{C} %{CC} %{v} %{I*&F*} %{P} %I\
+ %{!Q:-quiet} %{nostdinc*} %{C} %{CC} %{v}"INCLUDE32"%{I*&F*} %{P} %I\
  %{MD:-MD %{!o:%b.d}%{o*:%.d%*}}\
  %{MMD:-MMD %{!o:%b.d}%{o*:%.d%*}}\
  %{M} %{MM} %{MF*} %{MG} %{MP} %{MQ*} %{MT*}\

==== //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/freebsd-native.h#10 (text+ko) ====

@@ -23,6 +23,9 @@
 #else
 #define STANDARD_INCLUDE_DIR		PREFIX"/include"
 #endif
+#ifdef __amd64__
+#define INCLUDE32			" %{m32:-I"PREFIX"/include32} "
+#endif
 
 /* Under FreeBSD, the normal location of the compiler back ends is the
    /usr/libexec directory.
@@ -44,7 +47,11 @@
 
 #undef  MD_STARTFILE_PREFIX		/* We don't need one for now. */
 #define STANDARD_STARTFILE_PREFIX	PREFIX"/lib/"
+#ifdef __amd64__
+#define STARTFILE_PREFIX_SPEC		"%{m32:"PREFIX"/lib32/} %{!m32:"PREFIX"/lib/}"
+#else
 #define STARTFILE_PREFIX_SPEC		PREFIX"/lib/"
+#endif
 
 #if 0
 #define LIBGCC_SPEC		"%{shared: -lgcc_pic} \

From owner-p4-projects@FreeBSD.ORG  Wed Oct 24 22:38:47 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6894116A41A; Wed, 24 Oct 2007 22:38: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 CCD2F16A417
	for ; Wed, 24 Oct 2007 22:38:46 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BAA8F13C48D
	for ; Wed, 24 Oct 2007 22:38:46 +0000 (UTC)
	(envelope-from peter@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 l9OMckte090840
	for ; Wed, 24 Oct 2007 22:38:46 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9OMckpY090837
	for perforce@freebsd.org; Wed, 24 Oct 2007 22:38:46 GMT
	(envelope-from peter@freebsd.org)
Date: Wed, 24 Oct 2007 22:38:46 GMT
Message-Id: <200710242238.l9OMckpY090837@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128037 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, 24 Oct 2007 22:38:47 -0000

http://perforce.freebsd.org/chv.cgi?CH=128037

Change 128037 by peter@peter_daintree on 2007/10/24 22:38:31

	Install include32/machine files specific to i386.  These override
	the common ones in /usr/include because of the include search path.
	
	*HACK HACK HACK!*

Affected files ...

.. //depot/projects/hammer/include/Makefile#72 edit

Differences ...

==== //depot/projects/hammer/include/Makefile#72 (text+ko) ====

@@ -152,6 +152,12 @@
 	    -f ${.CURDIR}/../etc/mtree/BIND.include.dist \
 	    -p ${DESTDIR}${INCLUDEDIR}
 .endif
+.if ${MACHINE_ARCH} == "amd64" && ${MK_LIB32} != "no"
+	if [ -L ${DESTDIR}${INCLUDEDIR}32/machine ]; then \
+		rm -f ${DESTDIR}${INCLUDEDIR}32/machine; \
+	fi
+	mkdir -p ${DESTDIR}${INCLUDEDIR}32/machine
+.endif
 
 copies:
 .for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} altq crypto machine machine/pc \
@@ -163,6 +169,13 @@
 	done
 .endif
 .endfor
+.if ${MACHINE_ARCH} == "amd64" && ${MK_LIB32} != "no"
+	mkdir -p ${DESTDIR}${INCLUDEDIR}32/machine
+	cd ${DESTDIR}${INCLUDEDIR}32/machine; \
+	for h in *.h; do \
+		if [ -L $$h ]; then rm -f $$h; fi; \
+	done
+.endif
 .for i in ${LDIRS} ${LSUBDIRS:Ndev/acpica:Ndev/bktr} ${LSUBSUBDIRS}
 	cd ${.CURDIR}/../sys; \
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \
@@ -226,6 +239,11 @@
 	cd ${.CURDIR}/../sys/rpc; \
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 types.h \
 	    ${DESTDIR}${INCLUDEDIR}/rpc
+.if ${MACHINE_ARCH} == "amd64" && ${MK_LIB32} != "no"
+	cd ${.CURDIR}/../sys/i386/include; \
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
+	    ${DESTDIR}${INCLUDEDIR}32/machine
+.endif
 
 symlinks:
 	@${ECHO} "Setting up symlinks to kernel source tree..."
@@ -329,3 +347,10 @@
 		ln -fs ../../../sys/rpc/$$h \
 		    ${DESTDIR}${INCLUDEDIR}/rpc; \
 	done
+.if ${MACHINE_ARCH} == "amd64" && ${MK_LIB32} != "no"
+	cd ${.CURDIR}/../sys/i386/include; \
+	for h in *.h; do \
+		ln -fs ../../../sys/i386/include/$$h \
+		    ${DESTDIR}${INCLUDEDIR}32/machine; \
+	done
+.endif

From owner-p4-projects@FreeBSD.ORG  Thu Oct 25 00:11:29 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9FBE516A469; Thu, 25 Oct 2007 00:11: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 07B0716A417
	for ; Thu, 25 Oct 2007 00:11:29 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E295713C494
	for ; Thu, 25 Oct 2007 00:11:28 +0000 (UTC)
	(envelope-from zec@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 l9P0BSct015635
	for ; Thu, 25 Oct 2007 00:11:28 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9P0BSL5015632
	for perforce@freebsd.org; Thu, 25 Oct 2007 00:11:28 GMT
	(envelope-from zec@FreeBSD.org)
Date: Thu, 25 Oct 2007 00:11:28 GMT
Message-Id: <200710250011.l9P0BSL5015632@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128040 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 25 Oct 2007 00:11:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=128040

Change 128040 by zec@zec_tpx32 on 2007/10/25 00:11:01

	Hopefully a final attempt to make the new vimage
	naming scheme work right...
	
	While here, de-staticize vimage_by_name() so that it can
	be used from outside of kern_vimage.c

Affected files ...

.. //depot/projects/vimage/src/sys/kern/kern_vimage.c#52 edit
.. //depot/projects/vimage/src/sys/sys/vimage.h#49 edit

Differences ...

==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#52 (text+ko) ====

@@ -444,7 +444,7 @@
 }
 
 
-static struct vimage *
+struct vimage *
 vimage_by_name(struct vimage *top, char *name)
 {
 	struct vimage *vip;
@@ -466,7 +466,7 @@
 	if (namelen == 0)
 		return(NULL);
 	LIST_FOREACH(vip, &top->vi_child_head, vi_sibling)
-		if (strncmp(name, vip->vi_name, namelen) == 0) {
+		if (strcmp(name, vip->vi_name) == 0) {
 			if (next_name != NULL)
 				return(vimage_by_name(vip, next_name));
 			else

==== //depot/projects/vimage/src/sys/sys/vimage.h#49 (text+ko) ====

@@ -344,6 +344,7 @@
 int	vi_if_move(struct vi_req *, struct ifnet *, struct vimage *);
 int	vi_symlookup(struct kld_sym_lookup *, char *);
 struct	vimage *vnet2vimage(struct vnet *);
+struct	vimage *vimage_by_name(struct vimage *, char *);
 char	*vnet_name(struct vnet *);
 int	vi_child_of(struct vimage *, struct vimage *);
 

From owner-p4-projects@FreeBSD.ORG  Thu Oct 25 00:15:34 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3416216A421; Thu, 25 Oct 2007 00:15: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 D81B116A41B
	for ; Thu, 25 Oct 2007 00:15:33 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C24C513C465
	for ; Thu, 25 Oct 2007 00:15:33 +0000 (UTC)
	(envelope-from zec@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 l9P0FXGK015804
	for ; Thu, 25 Oct 2007 00:15:33 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9P0FXwh015801
	for perforce@freebsd.org; Thu, 25 Oct 2007 00:15:33 GMT
	(envelope-from zec@FreeBSD.org)
Date: Thu, 25 Oct 2007 00:15:33 GMT
Message-Id: <200710250015.l9P0FXwh015801@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128041 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 25 Oct 2007 00:15:34 -0000

http://perforce.freebsd.org/chv.cgi?CH=128041

Change 128041 by zec@zec_tpx32 on 2007/10/25 00:15:01

	A hack to allow for bpf taps to be open directly on ifnets
	attached to foreign vnets.
	
	ifname@vimage_name is the form that should be used for
	tcpdump or ethereal to attach directly to an ifnet in
	a foerign vnet.

Affected files ...

.. //depot/projects/vimage/src/sys/net/bpf.c#15 edit

Differences ...

==== //depot/projects/vimage/src/sys/net/bpf.c#15 (text+ko) ====

@@ -1156,9 +1156,32 @@
 	struct bpf_if *bp;
 	struct ifnet *theywant;
 
+#define IMUNES_BPF_HACK
+#if defined(VIMAGE) && defined(IMUNES_BPF_HACK)
+	struct vnet *target_vnet = curvnet;
+	char *c;
+
+	/* Hack to support tapping in foreign vnets */
+	c = rindex(ifr->ifr_name, '@');
+	if ( c != NULL ) {
+		struct vimage *target_vimage;
+
+		*c++ = 0;
+		target_vimage = vimage_by_name(TD_TO_VIMAGE(curthread), c);
+		if (target_vimage == NULL)
+			return ENXIO;
+		target_vnet = target_vimage->v_net;
+        }
+	CURVNET_SET_QUIET(target_vnet);
+#endif
+
 	theywant = ifunit(ifr->ifr_name);
-	if (theywant == NULL || theywant->if_bpf == NULL)
+	if (theywant == NULL || theywant->if_bpf == NULL) {
+#if defined(VIMAGE) && defined(IMUNES_BPF_HACK)
+		CURVNET_RESTORE();
+#endif
 		return (ENXIO);
+	}
 
 	bp = theywant->if_bpf;
 	/*
@@ -1180,6 +1203,9 @@
 	BPFD_LOCK(d);
 	reset_d(d);
 	BPFD_UNLOCK(d);
+#if defined(VIMAGE) && defined(IMUNES_BPF_HACK)
+	CURVNET_RESTORE();
+#endif
 	return (0);
 }
 

From owner-p4-projects@FreeBSD.ORG  Thu Oct 25 02:36:11 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7E8A516A469; Thu, 25 Oct 2007 02:36: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 169B016A421
	for ; Thu, 25 Oct 2007 02:36:11 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DDCF913C4A5
	for ; Thu, 25 Oct 2007 02:36:10 +0000 (UTC)
	(envelope-from zec@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 l9P2aACl034008
	for ; Thu, 25 Oct 2007 02:36:10 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9P2aAaA034005
	for perforce@freebsd.org; Thu, 25 Oct 2007 02:36:10 GMT
	(envelope-from zec@FreeBSD.org)
Date: Thu, 25 Oct 2007 02:36:10 GMT
Message-Id: <200710250236.l9P2aAaA034005@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128043 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 25 Oct 2007 02:36:11 -0000

http://perforce.freebsd.org/chv.cgi?CH=128043

Change 128043 by zec@zec_tpx32 on 2007/10/25 02:35:23

	Guesswork around hierarchichal vimage naming continues...

Affected files ...

.. //depot/projects/vimage/src/sys/kern/kern_vimage.c#53 edit

Differences ...

==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#53 (text+ko) ====

@@ -466,7 +466,8 @@
 	if (namelen == 0)
 		return(NULL);
 	LIST_FOREACH(vip, &top->vi_child_head, vi_sibling)
-		if (strcmp(name, vip->vi_name) == 0) {
+		if (strlen(vip->vi_name) == namelen &&
+		    strncmp(name, vip->vi_name, namelen) == 0) {
 			if (next_name != NULL)
 				return(vimage_by_name(vip, next_name));
 			else

From owner-p4-projects@FreeBSD.ORG  Thu Oct 25 05:25:34 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5B43016A41A; Thu, 25 Oct 2007 05:25: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 D663D16A421
	for ; Thu, 25 Oct 2007 05:25:33 +0000 (UTC)
	(envelope-from julian@elischer.org)
Received: from outR.internet-mail-service.net (outR.internet-mail-service.net
	[216.240.47.241])
	by mx1.freebsd.org (Postfix) with ESMTP id B87F313C4A3
	for ; Thu, 25 Oct 2007 05:25:33 +0000 (UTC)
	(envelope-from julian@elischer.org)
Received: from mx0.idiom.com (HELO idiom.com) (216.240.32.160)
	by out.internet-mail-service.net (qpsmtpd/0.40) with ESMTP;
	Wed, 24 Oct 2007 22:25:32 -0700
X-Client-Authorized: MaGic Cook1e
X-Client-Authorized: MaGic Cook1e
Received: from julian-mac.elischer.org (home.elischer.org [216.240.48.38])
	by idiom.com (Postfix) with ESMTP id 7E7771267E4;
	Wed, 24 Oct 2007 22:25:31 -0700 (PDT)
Message-ID: <472028E6.6090809@elischer.org>
Date: Wed, 24 Oct 2007 22:25:58 -0700
From: Julian Elischer 
User-Agent: Thunderbird 2.0.0.6 (Macintosh/20070728)
MIME-Version: 1.0
To: Marko Zec 
References: <200710250015.l9P0FXwh015801@repoman.freebsd.org>
In-Reply-To: <200710250015.l9P0FXwh015801@repoman.freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: Perforce Change Reviews 
Subject: Re: PERFORCE change 128041 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 25 Oct 2007 05:25:34 -0000

Marko Zec wrote:
> http://perforce.freebsd.org/chv.cgi?CH=128041
> 
> Change 128041 by zec@zec_tpx32 on 2007/10/25 00:15:01
> 
> 	A hack to allow for bpf taps to be open directly on ifnets
> 	attached to foreign vnets.
> 	
> 	ifname@vimage_name is the form that should be used for
> 	tcpdump or ethereal to attach directly to an ifnet in
> 	a foerign vnet.
> 

by definition it would have to be a child vnet right?

> Affected files ...
> 
> .. //depot/projects/vimage/src/sys/net/bpf.c#15 edit
> 
> Differences ...
> 
> ==== //depot/projects/vimage/src/sys/net/bpf.c#15 (text+ko) ====
> 
> @@ -1156,9 +1156,32 @@
>  	struct bpf_if *bp;
>  	struct ifnet *theywant;
>  
> +#define IMUNES_BPF_HACK
> +#if defined(VIMAGE) && defined(IMUNES_BPF_HACK)
> +	struct vnet *target_vnet = curvnet;
> +	char *c;
> +
> +	/* Hack to support tapping in foreign vnets */
> +	c = rindex(ifr->ifr_name, '@');
> +	if ( c != NULL ) {
> +		struct vimage *target_vimage;
> +
> +		*c++ = 0;
> +		target_vimage = vimage_by_name(TD_TO_VIMAGE(curthread), c);
> +		if (target_vimage == NULL)
> +			return ENXIO;
> +		target_vnet = target_vimage->v_net;
> +        }
> +	CURVNET_SET_QUIET(target_vnet);
> +#endif
> +
>  	theywant = ifunit(ifr->ifr_name);
> -	if (theywant == NULL || theywant->if_bpf == NULL)
> +	if (theywant == NULL || theywant->if_bpf == NULL) {
> +#if defined(VIMAGE) && defined(IMUNES_BPF_HACK)
> +		CURVNET_RESTORE();
> +#endif
>  		return (ENXIO);
> +	}
>  
>  	bp = theywant->if_bpf;
>  	/*
> @@ -1180,6 +1203,9 @@
>  	BPFD_LOCK(d);
>  	reset_d(d);
>  	BPFD_UNLOCK(d);
> +#if defined(VIMAGE) && defined(IMUNES_BPF_HACK)
> +	CURVNET_RESTORE();
> +#endif
>  	return (0);
>  }
>  


From owner-p4-projects@FreeBSD.ORG  Thu Oct 25 05:45:00 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0F50816A41A; Thu, 25 Oct 2007 05:45: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 B818516A417
	for ; Thu, 25 Oct 2007 05:44:59 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A244213C49D
	for ; Thu, 25 Oct 2007 05:44:59 +0000 (UTC)
	(envelope-from kmacy@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 l9P5ixbI056444
	for ; Thu, 25 Oct 2007 05:44:59 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9P5ijAB056438
	for perforce@freebsd.org; Thu, 25 Oct 2007 05:44:45 GMT
	(envelope-from kmacy@freebsd.org)
Date: Thu, 25 Oct 2007 05:44:45 GMT
Message-Id: <200710250544.l9P5ijAB056438@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128048 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 25 Oct 2007 05:45:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=128048

Change 128048 by kmacy@entropy_kmacy_xen31 on 2007/10/25 05:44:00

	IFC @128039

Affected files ...

.. //depot/projects/xen31/ObsoleteFiles.inc#2 integrate
.. //depot/projects/xen31/UPDATING#2 integrate
.. //depot/projects/xen31/etc/rc.d/named#2 integrate
.. //depot/projects/xen31/gnu/usr.bin/groff/tmac/mdoc.local#2 integrate
.. //depot/projects/xen31/lib/libarchive/archive_read_support_format_tar.c#2 integrate
.. //depot/projects/xen31/lib/libc/locale/iswctype.c#2 integrate
.. //depot/projects/xen31/lib/libc/sys/kldstat.2#2 integrate
.. //depot/projects/xen31/lib/libelf/elf_flagdata.3#2 integrate
.. //depot/projects/xen31/lib/libelf/elf_getscn.3#2 integrate
.. //depot/projects/xen31/lib/libelf/elf_update.3#2 integrate
.. //depot/projects/xen31/lib/libelf/gelf_newehdr.3#2 integrate
.. //depot/projects/xen31/lib/libelf/gelf_newphdr.3#2 integrate
.. //depot/projects/xen31/lib/libstand/Makefile#2 integrate
.. //depot/projects/xen31/lib/libthr/libthr.3#2 integrate
.. //depot/projects/xen31/sbin/gpt/Makefile#2 integrate
.. //depot/projects/xen31/sbin/gpt/add.c#2 integrate
.. //depot/projects/xen31/sbin/gpt/boot.c#1 branch
.. //depot/projects/xen31/sbin/gpt/gpt.8#2 integrate
.. //depot/projects/xen31/sbin/gpt/gpt.c#2 integrate
.. //depot/projects/xen31/sbin/gpt/gpt.h#2 integrate
.. //depot/projects/xen31/sbin/gpt/show.c#2 integrate
.. //depot/projects/xen31/sbin/kldstat/kldstat.c#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_attr.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_attr_get_np.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_attr_setcreatesuspend_np.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_barrier_destroy.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_barrierattr.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_cancel.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_cleanup_pop.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_cleanup_push.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_cond_broadcast.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_cond_destroy.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_cond_init.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_cond_signal.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_cond_timedwait.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_cond_wait.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_condattr.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_create.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_detach.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_equal.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_exit.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_getconcurrency.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_getspecific.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_join.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_key_create.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_key_delete.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_kill.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_main_np.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_multi_np.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_mutex_destroy.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_mutex_init.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_mutex_lock.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_mutex_timedlock.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_mutex_trylock.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_mutex_unlock.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_mutexattr.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_mutexattr_getkind_np.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_once.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_resume_all_np.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_resume_np.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_rwlock_destroy.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_rwlock_init.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_rwlock_rdlock.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_rwlock_timedrdlock.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_rwlock_timedwrlock.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_rwlock_unlock.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_rwlock_wrlock.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_rwlockattr_destroy.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_rwlockattr_getpshared.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_rwlockattr_init.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_rwlockattr_setpshared.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_schedparam.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_self.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_set_name_np.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_setspecific.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_sigmask.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_spin_init.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_spin_lock.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_switch_add_np.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_testcancel.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_yield.3#2 integrate
.. //depot/projects/xen31/sys/amd64/amd64/msi.c#2 integrate
.. //depot/projects/xen31/sys/arm/at91/if_ate.c#2 integrate
.. //depot/projects/xen31/sys/arm/at91/kb920x_machdep.c#2 integrate
.. //depot/projects/xen31/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate
.. //depot/projects/xen31/sys/boot/common/ufsread.c#2 integrate
.. //depot/projects/xen31/sys/boot/i386/Makefile#2 integrate
.. //depot/projects/xen31/sys/boot/i386/boot2/boot2.c#2 integrate
.. //depot/projects/xen31/sys/boot/i386/gptboot/Makefile#1 branch
.. //depot/projects/xen31/sys/boot/i386/gptboot/gptboot.c#1 branch
.. //depot/projects/xen31/sys/boot/i386/gptboot/gptldr.S#1 branch
.. //depot/projects/xen31/sys/boot/i386/libi386/bioscd.c#2 integrate
.. //depot/projects/xen31/sys/boot/i386/libi386/biosdisk.c#2 integrate
.. //depot/projects/xen31/sys/boot/i386/libi386/devicename.c#2 integrate
.. //depot/projects/xen31/sys/boot/i386/loader/main.c#2 integrate
.. //depot/projects/xen31/sys/boot/i386/pmbr/Makefile#1 branch
.. //depot/projects/xen31/sys/boot/i386/pmbr/pmbr.s#1 branch
.. //depot/projects/xen31/sys/boot/pc98/boot2/boot.c#2 integrate
.. //depot/projects/xen31/sys/boot/pc98/libpc98/bioscd.c#2 integrate
.. //depot/projects/xen31/sys/boot/pc98/libpc98/biosdisk.c#2 integrate
.. //depot/projects/xen31/sys/boot/pc98/loader/main.c#2 integrate
.. //depot/projects/xen31/sys/compat/linux/linux_file.c#2 integrate
.. //depot/projects/xen31/sys/compat/linux/linux_getcwd.c#2 integrate
.. //depot/projects/xen31/sys/compat/linux/linux_misc.c#2 integrate
.. //depot/projects/xen31/sys/compat/svr4/svr4_fcntl.c#2 integrate
.. //depot/projects/xen31/sys/compat/svr4/svr4_misc.c#2 integrate
.. //depot/projects/xen31/sys/contrib/pf/net/pf.c#2 integrate
.. //depot/projects/xen31/sys/contrib/pf/net/pf_if.c#2 integrate
.. //depot/projects/xen31/sys/contrib/pf/net/pf_table.c#2 integrate
.. //depot/projects/xen31/sys/dev/ath/if_ath_pci.c#2 integrate
.. //depot/projects/xen31/sys/dev/pci/pci_user.c#2 integrate
.. //depot/projects/xen31/sys/dev/usb/uipaq.c#2 integrate
.. //depot/projects/xen31/sys/dev/usb/usbdevs#2 integrate
.. //depot/projects/xen31/sys/fs/devfs/devfs_devs.c#2 integrate
.. //depot/projects/xen31/sys/fs/devfs/devfs_vnops.c#2 integrate
.. //depot/projects/xen31/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate
.. //depot/projects/xen31/sys/fs/unionfs/union_subr.c#2 integrate
.. //depot/projects/xen31/sys/geom/part/g_part.c#2 integrate
.. //depot/projects/xen31/sys/geom/part/g_part.h#2 integrate
.. //depot/projects/xen31/sys/geom/part/g_part_gpt.c#2 integrate
.. //depot/projects/xen31/sys/i386/conf/PAE#2 integrate
.. //depot/projects/xen31/sys/i386/i386/msi.c#2 integrate
.. //depot/projects/xen31/sys/i386/ibcs2/ibcs2_misc.c#2 integrate
.. //depot/projects/xen31/sys/i386/include/bootinfo.h#2 integrate
.. //depot/projects/xen31/sys/kern/init_main.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_acct.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_alq.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_environment.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_exec.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_exit.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_fork.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_jail.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_ktrace.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_linker.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_mbuf.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_prot.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_shutdown.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_sig.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_sysctl.c#2 integrate
.. //depot/projects/xen31/sys/kern/link_elf.c#2 integrate
.. //depot/projects/xen31/sys/kern/link_elf_obj.c#2 integrate
.. //depot/projects/xen31/sys/kern/sched_ule.c#2 integrate
.. //depot/projects/xen31/sys/kern/sys_pipe.c#2 integrate
.. //depot/projects/xen31/sys/kern/sys_socket.c#2 integrate
.. //depot/projects/xen31/sys/kern/sysv_msg.c#2 integrate
.. //depot/projects/xen31/sys/kern/sysv_sem.c#2 integrate
.. //depot/projects/xen31/sys/kern/sysv_shm.c#2 integrate
.. //depot/projects/xen31/sys/kern/uipc_mbuf2.c#2 integrate
.. //depot/projects/xen31/sys/kern/uipc_sem.c#2 integrate
.. //depot/projects/xen31/sys/kern/uipc_socket.c#2 integrate
.. //depot/projects/xen31/sys/kern/uipc_syscalls.c#2 integrate
.. //depot/projects/xen31/sys/kern/uipc_usrreq.c#2 integrate
.. //depot/projects/xen31/sys/kern/vfs_acl.c#2 integrate
.. //depot/projects/xen31/sys/kern/vfs_extattr.c#2 integrate
.. //depot/projects/xen31/sys/kern/vfs_lookup.c#2 integrate
.. //depot/projects/xen31/sys/kern/vfs_mount.c#2 integrate
.. //depot/projects/xen31/sys/kern/vfs_subr.c#2 integrate
.. //depot/projects/xen31/sys/kern/vfs_syscalls.c#2 integrate
.. //depot/projects/xen31/sys/kern/vfs_vnops.c#2 integrate
.. //depot/projects/xen31/sys/net/bpf.c#2 integrate
.. //depot/projects/xen31/sys/net/bsd_comp.c#2 integrate
.. //depot/projects/xen31/sys/net/if.c#2 integrate
.. //depot/projects/xen31/sys/net/if_atmsubr.c#2 integrate
.. //depot/projects/xen31/sys/net/if_ethersubr.c#2 integrate
.. //depot/projects/xen31/sys/net/if_fddisubr.c#2 integrate
.. //depot/projects/xen31/sys/net/if_fwsubr.c#2 integrate
.. //depot/projects/xen31/sys/net/if_gif.c#2 integrate
.. //depot/projects/xen31/sys/net/if_iso88025subr.c#2 integrate
.. //depot/projects/xen31/sys/net/if_ppp.c#2 integrate
.. //depot/projects/xen31/sys/net/if_stf.c#2 integrate
.. //depot/projects/xen31/sys/net/if_tun.c#2 integrate
.. //depot/projects/xen31/sys/net/route.c#2 integrate
.. //depot/projects/xen31/sys/net80211/ieee80211_scan.c#2 integrate
.. //depot/projects/xen31/sys/netatalk/ddp_input.c#2 integrate
.. //depot/projects/xen31/sys/netatalk/ddp_output.c#2 integrate
.. //depot/projects/xen31/sys/netinet/in_pcb.c#2 integrate
.. //depot/projects/xen31/sys/netinet/ip_divert.c#2 integrate
.. //depot/projects/xen31/sys/netinet/ip_fw2.c#2 integrate
.. //depot/projects/xen31/sys/netinet/ip_icmp.c#2 integrate
.. //depot/projects/xen31/sys/netinet/ip_input.c#2 integrate
.. //depot/projects/xen31/sys/netinet/ip_options.c#2 integrate
.. //depot/projects/xen31/sys/netinet/ip_output.c#2 integrate
.. //depot/projects/xen31/sys/netinet/raw_ip.c#2 integrate
.. //depot/projects/xen31/sys/netinet/tcp_input.c#2 integrate
.. //depot/projects/xen31/sys/netinet/tcp_output.c#2 integrate
.. //depot/projects/xen31/sys/netinet/tcp_subr.c#2 integrate
.. //depot/projects/xen31/sys/netinet/tcp_syncache.c#2 integrate
.. //depot/projects/xen31/sys/netinet/tcp_timewait.c#2 integrate
.. //depot/projects/xen31/sys/netinet/udp_usrreq.c#2 integrate
.. //depot/projects/xen31/sys/netinet6/nd6.c#2 integrate
.. //depot/projects/xen31/sys/netinet6/udp6_usrreq.c#2 integrate
.. //depot/projects/xen31/sys/powerpc/conf/GENERIC#2 integrate
.. //depot/projects/xen31/sys/powerpc/powerpc/genassym.c#2 integrate
.. //depot/projects/xen31/sys/powerpc/powerpc/swtch.S#2 integrate
.. //depot/projects/xen31/sys/powerpc/powerpc/vm_machdep.c#2 integrate
.. //depot/projects/xen31/sys/security/audit/audit_bsm.c#2 integrate
.. //depot/projects/xen31/sys/security/audit/audit_syscalls.c#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_audit.c#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_framework.h#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_inet.c#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_internal.h#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_net.c#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_pipe.c#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_policy.h#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_posix_sem.c#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_process.c#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_socket.c#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_syscalls.c#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_system.c#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_sysv_msg.c#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_sysv_sem.c#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_sysv_shm.c#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_vfs.c#2 integrate
.. //depot/projects/xen31/sys/security/mac_biba/mac_biba.c#2 integrate
.. //depot/projects/xen31/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate
.. //depot/projects/xen31/sys/security/mac_ifoff/mac_ifoff.c#2 integrate
.. //depot/projects/xen31/sys/security/mac_lomac/mac_lomac.c#2 integrate
.. //depot/projects/xen31/sys/security/mac_mls/mac_mls.c#2 integrate
.. //depot/projects/xen31/sys/security/mac_partition/mac_partition.c#2 integrate
.. //depot/projects/xen31/sys/security/mac_portacl/mac_portacl.c#2 integrate
.. //depot/projects/xen31/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate
.. //depot/projects/xen31/sys/security/mac_stub/mac_stub.c#2 integrate
.. //depot/projects/xen31/sys/security/mac_test/mac_test.c#2 integrate
.. //depot/projects/xen31/sys/sys/gpt.h#2 integrate
.. //depot/projects/xen31/sys/sys/linker.h#2 integrate
.. //depot/projects/xen31/sys/sys/param.h#2 integrate
.. //depot/projects/xen31/sys/sys/pciio.h#2 integrate
.. //depot/projects/xen31/sys/ufs/ffs/ffs_vfsops.c#2 integrate
.. //depot/projects/xen31/sys/ufs/ufs/ufs_vnops.c#2 integrate
.. //depot/projects/xen31/sys/vm/swap_pager.c#2 integrate
.. //depot/projects/xen31/sys/vm/vm_map.c#2 integrate
.. //depot/projects/xen31/sys/vm/vm_mmap.c#2 integrate
.. //depot/projects/xen31/sys/vm/vnode_pager.c#2 integrate
.. //depot/projects/xen31/usr.sbin/rpcbind/rpcbind.c#2 integrate
.. //depot/projects/xen31/usr.sbin/traceroute6/traceroute6.c#2 integrate

Differences ...

==== //depot/projects/xen31/ObsoleteFiles.inc#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.113 2007/10/12 07:58:08 ru Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.114 2007/10/22 12:31:23 ru Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -579,11 +579,17 @@
 # 20070201: remove libmytinfo link
 OLD_FILES+=usr/lib/libmytinfo.a
 OLD_FILES+=usr/lib/libmytinfo.so
-OLD_FILES+=usr/lib/libmytinfo_p.a   
+OLD_FILES+=usr/lib/libmytinfo_p.a
+OLD_FILES+=usr/lib/libmytinfow.a
+OLD_FILES+=usr/lib/libmytinfow.so
+OLD_FILES+=usr/lib/libmytinfow_p.a
 .if ${TARGET_ARCH} == "amd64"
 OLD_FILES+=usr/lib32/libmytinfo.a
 OLD_FILES+=usr/lib32/libmytinfo.so
 OLD_FILES+=usr/lib32/libmytinfo_p.a
+OLD_FILES+=usr/lib32/libmytinfow.a
+OLD_FILES+=usr/lib32/libmytinfow.so
+OLD_FILES+=usr/lib32/libmytinfow_p.a
 .endif
 # 20070128: remove vnconfig
 OLD_FILES+=usr/sbin/vnconfig

==== //depot/projects/xen31/UPDATING#2 (text+ko) ====

@@ -21,6 +21,19 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20071024:
+	It has been decided that it is desirable to provide ABI
+	backwards compatibility to the FreeBSD 4/5/6 versions of the
+	PCIOCGETCONF, PCIOCREAD and PCIOCWRITE IOCTLs, which was
+	broken with the introduction of PCI domain support (see the
+	20070930 entry). Unfortunately, this required the ABI of
+	PCIOCGETCONF to be broken again in order to be able to
+	provide backwards compatibility to the old version of that
+	IOCTL. Thus consumers of PCIOCGETCONF have to be recompiled
+	again. As for prominent ports this affects neither pciutils
+	nor xorg-server this time, the hal port needs to be rebuilt
+	however.
+
 20071020:
 	The misnamed kthread_create() and friends have been renamed
 	to kproc_create() etc. Many of the callers already
@@ -921,4 +934,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.510 2007/10/21 04:27:07 julian Exp $
+$FreeBSD: src/UPDATING,v 1.511 2007/10/24 20:51:43 marius Exp $

==== //depot/projects/xen31/etc/rc.d/named#2 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/named,v 1.26 2006/04/20 12:30:12 delphij Exp $
+# $FreeBSD: src/etc/rc.d/named,v 1.27 2007/10/22 09:38:44 dougb Exp $
 #
 
 # PROVIDE: named
@@ -82,20 +82,28 @@
 
 named_reload()
 {
-	rndc reload
+	${command%/named}/rndc reload
 }
 
 named_stop()
 {
-	echo -n "Stopping named"
-	if rndc stop 2>/dev/null; then
-		echo .
+	# This duplicates an undesirably large amount of code from the stop
+	# routine in rc.subr in order to use rndc to shut down the process,
+	# and to give it a second chance in case rndc fails.
+	rc_pid=$(check_pidfile $pidfile $command)
+	if [ -z "$rc_pid" ]; then
+		[ -n "$rc_fast" ] && return 0
+		_run_rc_notrunning
+		return 1
+	fi
+	echo 'Stopping named.'
+	if ${command%/named}/rndc stop 2>/dev/null; then
+		wait_for_pids $rc_pid
 	else
-		echo -n ": rndc failed, trying killall: "
-		if killall named; then
-			echo .
-		fi
-	fi
+		echo -n 'rndc failed, trying kill: '
+		kill -TERM $rc_pid
+		wait_for_pids $rc_pid
+  	fi
 }
 
 named_poststop()
@@ -121,13 +129,13 @@
 	if [ -s "${named_chrootdir}/etc/namedb/rndc.conf" ]; then
 		return 0
 	fi
-	confgen_command="rndc-confgen -a -b256 -u $named_uid \
+	confgen_command="${command%/named}/rndc-confgen -a -b256 -u $named_uid \
 	    -c ${named_chrootdir}/etc/namedb/rndc.key"
 	if [ -s "${named_chrootdir}/etc/namedb/rndc.key" ]; then
-		if [ ! `stat -f%Su ${named_chrootdir}/etc/namedb/rndc.key` = \
-		    "$named_uid" ]; then
-			$confgen_command
-		fi
+		case `stat -f%Su ${named_chrootdir}/etc/namedb/rndc.key` in
+		root|$named_uid) ;;
+		*) $confgen_command ;;
+		esac
 	else
 		$confgen_command
 	fi

==== //depot/projects/xen31/gnu/usr.bin/groff/tmac/mdoc.local#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/gnu/usr.bin/groff/tmac/mdoc.local,v 1.60 2007/10/15 08:06:42 ru Exp $
+.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.61 2007/10/22 10:01:58 ru Exp $
 .\"
 .\"     %beginstrip%
 .
@@ -48,6 +48,7 @@
 .ds doc-str-Lb-libgeom     Userland API Library for kernel GEOM subsystem (libgeom, \-lgeom)
 .ds doc-str-Lb-libipx      IPX Address Conversion Support Library (libipx, \-lipx)
 .ds doc-str-Lb-libkiconv   Kernel side iconv library (libkiconv, \-lkiconv)
+.ds doc-str-Lb-libkse      N:M Threading Library (libkse, \-lkse)
 .ds doc-str-Lb-libmd       Message Digest (MD4, MD5, etc.) Support Library (libmd, \-lmd)
 .ds doc-str-Lb-libmemstat  Kernel Memory Allocator Statistics Library (libmemstat, \-lmemstat)
 .ds doc-str-Lb-libnetgraph Netgraph User Library (libnetgraph, \-lnetgraph)

==== //depot/projects/xen31/lib/libarchive/archive_read_support_format_tar.c#2 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.61 2007/08/18 21:53:25 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.62 2007/10/24 04:01:31 kientzle Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include 
@@ -164,6 +164,7 @@
 	struct sparse_block	*sparse_last;
 	int64_t			 sparse_offset;
 	int64_t			 sparse_numbytes;
+	int64_t			 sparse_realsize;
 	int			 sparse_gnu_major;
 	int			 sparse_gnu_minor;
 	char			 sparse_gnu_pending;
@@ -440,6 +441,7 @@
 		free(sp);
 	}
 	tar->sparse_last = NULL;
+	tar->sparse_realsize = -1; /* Mark this as "unset" */
 
 	r = tar_read_header(a, tar, entry);
 
@@ -1388,9 +1390,10 @@
 		}
 		if (wcscmp(key, L"GNU.sparse.name") == 0)
 			archive_entry_copy_pathname_w(entry, value);
-		if (wcscmp(key, L"GNU.sparse.realsize") == 0)
-			archive_entry_set_size(entry,
-			    tar_atol10(value, wcslen(value)));
+		if (wcscmp(key, L"GNU.sparse.realsize") == 0) {
+			tar->sparse_realsize = tar_atol10(value, wcslen(value));
+			archive_entry_set_size(entry, tar->sparse_realsize);
+		}
 		break;
 	case 'L':
 		/* Our extensions */
@@ -1471,11 +1474,22 @@
 		/* POSIX has reserved 'security.*' */
 		/* Someday: if (wcscmp(key, L"security.acl")==0) { ... } */
 		if (wcscmp(key, L"size")==0) {
-			tar->entry_bytes_remaining = tar_atol10(value, wcslen(value));
-			archive_entry_set_size(entry, tar->entry_bytes_remaining);
+			/* "size" is the size of the data in the entry. */
+			tar->entry_bytes_remaining
+			    = tar_atol10(value, wcslen(value));
+			/*
+			 * But, "size" is not necessarily the size of
+			 * the file on disk; if this is a sparse file,
+			 * the disk size may have already been set from
+			 * GNU.sparse.realsize.
+			 */
+			if (tar->sparse_realsize < 0) {
+				archive_entry_set_size(entry,
+				    tar->entry_bytes_remaining);
+				tar->sparse_realsize
+				    = tar->entry_bytes_remaining;
+			}
 		}
-		tar->entry_bytes_remaining = 0;
-
 		break;
 	case 'u':
 		if (wcscmp(key, L"uid")==0)

==== //depot/projects/xen31/lib/libc/locale/iswctype.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.8 2007/10/13 16:28:22 ache Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.9 2007/10/23 17:39:28 ache Exp $");
 
 #include 
 
@@ -61,7 +61,7 @@
 iswascii(wc)
 	wint_t wc;
 {
-	return (wc < 0x80);
+	return ((wc & ~0x7F) == 0);
 }
 
 #undef iswblank

==== //depot/projects/xen31/lib/libc/sys/kldstat.2#2 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libc/sys/kldstat.2,v 1.20 2004/07/02 23:52:13 ru Exp $
+.\" $FreeBSD: src/lib/libc/sys/kldstat.2,v 1.22 2007/10/22 21:49:39 jb Exp $
 .\"
 .Dd March 3, 1999
 .Dt KLDSTAT 2
@@ -53,6 +53,7 @@
 	int         id;
 	caddr_t     address;        /* load address */
 	size_t      size;           /* size in bytes */
+	char        pathname[MAXPATHLEN];
 };
 .Ed
 .Pp
@@ -77,6 +78,10 @@
 The load address of the kld file.
 .It size
 The size of the file.
+.It pathname
+The full name of the file referred to by
+.Fa fileid ,
+including the path.
 .El
 .Sh RETURN VALUES
 .Rv -std kldstat
@@ -123,3 +128,7 @@
 .Nm kld
 interface first appeared in
 .Fx 3.0 .
+.Sh BUGS
+The pathname many not be accurate if the file system mounts have
+changed since the module was loaded, or if this function is called
+within a chrooted environment.

==== //depot/projects/xen31/lib/libelf/elf_flagdata.3#2 (text+ko) ====

@@ -1,4 +1,4 @@
-.\" Copyright (c) 2006 Joseph Koshy.  All rights reserved.
+.\" Copyright (c) 2006,2007 Joseph Koshy.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -21,9 +21,9 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD: src/lib/libelf/elf_flagdata.3,v 1.2 2006/11/13 09:46:15 ru Exp $
+.\" $FreeBSD: src/lib/libelf/elf_flagdata.3,v 1.3 2007/10/22 03:38:43 jkoshy Exp $
 .\"
-.Dd August 10, 2006
+.Dd October 22, 2007
 .Os
 .Dt ELF_FLAGDATA 3
 .Sh NAME
@@ -51,7 +51,7 @@
 .Ft "unsigned int"
 .Fn elf_flagshdr "Elf_Scn *scn" "Elf_Cmd cmd" "unsigned int flags"
 .Sh DESCRIPTION
-These functions are used to query, set or reset flag bits on data
+These functions are used to query, set or reset flags on data
 structures associated with an ELF file.
 .Pp
 Arguments
@@ -59,7 +59,7 @@
 .Ar elf
 and
 .Ar scn
-denote the data structures whose status bits need to be changed.
+denote the data structures whose flags need to be changed.
 These values are allowed to be NULL to simplify error handling in
 application code.
 .Pp
@@ -70,16 +70,16 @@
 .It Dv ELF_C_CLR
 The argument
 .Ar flags
-specifies the bits to be cleared.
+specifies the flags to be cleared.
 .It Dv ELF_C_SET
 The argument
 .Ar flags
-specifies the bits to be set.
+specifies the flags to be set.
 .El
 .Pp
 The argument
 .Ar flags
-is allowed to have the following bits set:
+is allowed to have the following flags set:
 .Bl -tag -width ELF_F_LAYOUT
 .It Dv ELF_F_DIRTY
 Mark the associated data structure as needing to be written back
@@ -111,7 +111,7 @@
 will return the current set of flags for the data structure being
 queried.
 .Sh RETURN VALUES
-These functions return the updated bits is successful, and zero if
+These functions return the updated flags is successful, and zero if
 an error is detected.
 .Sh ERRORS
 These functions may fail with the following errors:
@@ -123,7 +123,7 @@
 .It Bq Er ELF_E_ARGUMENT
 Argument
 .Ar flags
-had unsupported flag bits set.
+had unsupported flags set.
 .It Bq Er ELF_E_ARGUMENT
 The argument
 .Ar elf

==== //depot/projects/xen31/lib/libelf/elf_getscn.3#2 (text+ko) ====

@@ -1,4 +1,4 @@
-.\" Copyright (c) 2006 Joseph Koshy.  All rights reserved.
+.\" Copyright (c) 2006,2007 Joseph Koshy.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -21,9 +21,9 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD: src/lib/libelf/elf_getscn.3,v 1.2 2006/11/13 09:46:15 ru Exp $
+.\" $FreeBSD: src/lib/libelf/elf_getscn.3,v 1.3 2007/10/22 03:38:43 jkoshy Exp $
 .\"
-.Dd August 26, 2006
+.Dd October 22, 2007
 .Os
 .Dt ELF_GETSCN 3
 .Sh NAME
@@ -73,7 +73,7 @@
 .Ar elf ,
 and will set the
 .Dv ELF_F_DIRTY
-bit for the new section.
+flag on the returned section descriptor.
 For ELF descriptors opened for writing, the ELF library will
 automatically create an empty section at index zero
 .Dv ( SHN_UNDEF )

==== //depot/projects/xen31/lib/libelf/elf_update.3#2 (text+ko) ====

@@ -21,9 +21,9 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD: src/lib/libelf/elf_update.3,v 1.4 2007/09/08 08:20:12 jkoshy Exp $
+.\" $FreeBSD: src/lib/libelf/elf_update.3,v 1.5 2007/10/22 03:38:43 jkoshy Exp $
 .\"
-.Dd September 08, 2007
+.Dd October 22, 2007
 .Os
 .Dt ELF_UPDATE 3
 .Sh NAME
@@ -63,7 +63,7 @@
 .Dv ELF_F_LAYOUT
 flag has been set on the ELF descriptor, the application assumes full
 responsibility for the layout of the ELF object.
-If this bit is not set, the ELF library will compute the layout of the
+If this flag is not set, the ELF library will compute the layout of the
 file from its associated section descriptors.
 .Pp
 It is the application's responsibility to manage the the following

==== //depot/projects/xen31/lib/libelf/gelf_newehdr.3#2 (text+ko) ====

@@ -1,4 +1,4 @@
-.\" Copyright (c) 2006 Joseph Koshy.  All rights reserved.
+.\" Copyright (c) 2006,2007 Joseph Koshy.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -21,9 +21,9 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD: src/lib/libelf/gelf_newehdr.3,v 1.3 2006/12/25 02:24:39 jkoshy Exp $
+.\" $FreeBSD: src/lib/libelf/gelf_newehdr.3,v 1.4 2007/10/22 03:38:43 jkoshy Exp $
 .\"
-.Dd December 16, 2006
+.Dd October 22, 2007
 .Os
 .Dt GELF_NEWEHDR 3
 .Sh NAME
@@ -122,7 +122,7 @@
 .Pp
 If successful, these three functions set the
 .Dv ELF_F_DIRTY
-bit on ELF descriptor
+flag on ELF descriptor
 .Ar elf .
 .Sh RETURN VALUES
 These functions return a pointer to a translated header descriptor

==== //depot/projects/xen31/lib/libelf/gelf_newphdr.3#2 (text+ko) ====

@@ -21,9 +21,9 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD: src/lib/libelf/gelf_newphdr.3,v 1.3 2007/10/21 05:15:07 jkoshy Exp $
+.\" $FreeBSD: src/lib/libelf/gelf_newphdr.3,v 1.4 2007/10/22 03:38:43 jkoshy Exp $
 .\"
-.Dd October 21, 2007
+.Dd October 22, 2007
 .Os
 .Dt GELF_NEWPHDR 3
 .Sh NAME
@@ -82,7 +82,7 @@
 .Pp
 The functions set the
 .Dv ELF_F_DIRTY
-bit on the program header table.
+flag on the program header table.
 All members of the returned array of Phdr structures
 will be initialized to zero.
 .Pp

==== //depot/projects/xen31/lib/libstand/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libstand/Makefile,v 1.58 2007/10/15 14:20:24 nyan Exp $
+# $FreeBSD: src/lib/libstand/Makefile,v 1.59 2007/10/24 21:32:57 jhb Exp $
 # Originally from	$NetBSD: Makefile,v 1.21 1997/10/26 22:08:38 lukem Exp $
 #
 # Notes:
@@ -72,6 +72,10 @@
 SRCS+=	syncicache.c
 .endif
 
+# uuid functions from libc
+.PATH: ${.CURDIR}/../libc/uuid
+SRCS+= uuid_equal.c uuid_is_nil.c
+
 # _setjmp/_longjmp
 .if ${MACHINE_ARCH} == "amd64"
 .PATH: ${.CURDIR}/i386

==== //depot/projects/xen31/lib/libthr/libthr.3#2 (text+ko) ====

@@ -22,14 +22,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libthr/libthr.3,v 1.3 2005/06/16 19:01:07 ru Exp $
+.\" $FreeBSD: src/lib/libthr/libthr.3,v 1.4 2007/10/22 10:13:38 ru Exp $
 .\"
-.Dd June 11, 2005
+.Dd October 19, 2007
 .Os
 .Dt LIBTHR 3
 .Sh NAME
 .Nm libthr
-.Nd "alternative POSIX threads library"
+.Nd "1:1 POSIX threads library"
 .Sh LIBRARY
 .Lb libthr
 .Sh SYNOPSIS
@@ -37,22 +37,14 @@
 .Sh DESCRIPTION
 The
 .Nm
-library provides an alternative 1:1 implementation of the
+library provides a 1:1 implementation of the
 .Xr pthread 3
 library interfaces for application threading.
-While applications may be linked directly against
-.Nm ,
-system administrators are offered maximum flexibility by linking against
-.Xr pthread 3 ,
-as they can then use
-.Xr libmap.conf 5
-to select the threading implementation on a per-application basis.
-.Pp
-The
-.Nm
-library
+It
 has been optimized for use by applications expecting system scope thread
-semantics, and can provide significant performance improvements.
+semantics, and can provide significant performance improvements
+compared to
+.Lb libkse .
 .Sh SEE ALSO
 .Xr pthread 3
 .Sh AUTHORS

==== //depot/projects/xen31/sbin/gpt/Makefile#2 (text+ko) ====

@@ -1,8 +1,8 @@
-# $FreeBSD: src/sbin/gpt/Makefile,v 1.7 2005/09/01 02:49:20 marcel Exp $
+# $FreeBSD: src/sbin/gpt/Makefile,v 1.8 2007/10/24 21:32:57 jhb Exp $
 
 PROG=	gpt
-SRCS=	add.c create.c destroy.c gpt.c label.c map.c migrate.c recover.c \
-	remove.c show.c
+SRCS=	add.c boot.c create.c destroy.c gpt.c label.c map.c migrate.c \
+	recover.c remove.c show.c
 WARNS?=	4
 MAN=	gpt.8
 

==== //depot/projects/xen31/sbin/gpt/add.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.15 2006/10/04 18:20:25 marcel Exp $");
+__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.16 2007/10/24 21:32:57 jhb Exp $");
 
 #include 
 
@@ -39,9 +39,9 @@
 #include "map.h"
 #include "gpt.h"
 
-static uuid_t type;
-static off_t block, size;
-static unsigned int entry;
+static uuid_t add_type;
+static off_t add_block, add_size;
+static unsigned int add_entry;
 
 static void
 usage_add(void)
@@ -53,8 +53,8 @@
 	exit(1);
 }
 
-static void
-add(int fd)
+map_t *
+gpt_add_part(int fd, uuid_t type, off_t start, off_t size, unsigned int *entry)
 {
 	map_t *gpt, *tpg;
 	map_t *tbl, *lbt;
@@ -67,38 +67,38 @@
 	if (gpt == NULL) {
 		warnx("%s: error: no primary GPT header; run create or recover",
 		    device_name);
-		return;
+		return (NULL);
 	}
 
 	tpg = map_find(MAP_TYPE_SEC_GPT_HDR);
 	if (tpg == NULL) {
 		warnx("%s: error: no secondary GPT header; run recover",
 		    device_name);
-		return;
+		return (NULL);
 	}
 
 	tbl = map_find(MAP_TYPE_PRI_GPT_TBL);
 	lbt = map_find(MAP_TYPE_SEC_GPT_TBL);
 	if (tbl == NULL || lbt == NULL) {
 		warnx("%s: error: run recover -- trust me", device_name);
-		return;
+		return (NULL);
 	}
 
 	hdr = gpt->map_data;
-	if (entry > le32toh(hdr->hdr_entries)) {
+	if (*entry > le32toh(hdr->hdr_entries)) {
 		warnx("%s: error: index %u out of range (%u max)", device_name,
-		    entry, le32toh(hdr->hdr_entries));
-		return;
+		    *entry, le32toh(hdr->hdr_entries));
+		return (NULL);
 	}
 
-	if (entry > 0) {
-		i = entry - 1;
+	if (*entry > 0) {
+		i = *entry - 1;
 		ent = (void*)((char*)tbl->map_data + i *
 		    le32toh(hdr->hdr_entsz));
 		if (!uuid_is_nil(&ent->ent_type, NULL)) {
 			warnx("%s: error: entry at index %u is not free",
-			    device_name, entry);
-			return;
+			    device_name, *entry);
+			return (NULL);
 		}
 	} else {
 		/* Find empty slot in GPT table. */
@@ -111,14 +111,14 @@
 		if (i == le32toh(hdr->hdr_entries)) {
 			warnx("%s: error: no available table entries",
 			    device_name);
-			return;
+			return (NULL);
 		}
 	}
 
-	map = map_alloc(block, size);
+	map = map_alloc(start, size);
 	if (map == NULL) {
 		warnx("%s: error: no space available on device", device_name);
-		return;
+		return (NULL);
 	}
 
 	le_uuid_enc(&ent->ent_type, &type);
@@ -148,7 +148,19 @@
 	gpt_write(fd, lbt);
 	gpt_write(fd, tpg);
 
-	printf("%sp%u added\n", device_name, i + 1);
+	*entry = i + 1;
+
+	return (map);
+}
+
+static void
+add(int fd)
+{
+
+	if (gpt_add_part(fd, add_type, add_block, add_size, &add_entry) != 0)
+		return;
+
+	printf("%sp%u added\n", device_name, add_entry);
 }
 
 int
@@ -161,30 +173,30 @@
 	while ((ch = getopt(argc, argv, "b:i:s:t:")) != -1) {
 		switch(ch) {
 		case 'b':
-			if (block > 0)
+			if (add_block > 0)
 				usage_add();
-			block = strtoll(optarg, &p, 10);
-			if (*p != 0 || block < 1)
+			add_block = strtoll(optarg, &p, 10);
+			if (*p != 0 || add_block < 1)
 				usage_add();
 			break;
 		case 'i':
-			if (entry > 0)
+			if (add_entry > 0)
 				usage_add();
-			entry = strtol(optarg, &p, 10);
-			if (*p != 0 || entry < 1)
+			add_entry = strtol(optarg, &p, 10);
+			if (*p != 0 || add_entry < 1)
 				usage_add();
 			break;
 		case 's':
-			if (size > 0)
+			if (add_size > 0)
 				usage_add();
-			size = strtoll(optarg, &p, 10);
-			if (*p != 0 || size < 1)
+			add_size = strtoll(optarg, &p, 10);
+			if (*p != 0 || add_size < 1)
 				usage_add();
 			break;
 		case 't':
-			if (!uuid_is_nil(&type, NULL))
+			if (!uuid_is_nil(&add_type, NULL))
 				usage_add();
-			if (parse_uuid(optarg, &type) != 0)
+			if (parse_uuid(optarg, &add_type) != 0)
 				usage_add();
 			break;
 		default:
@@ -196,9 +208,9 @@
 		usage_add();
 
 	/* Create UFS partitions by default. */
-	if (uuid_is_nil(&type, NULL)) {
+	if (uuid_is_nil(&add_type, NULL)) {
 		uuid_t ufs = GPT_ENT_TYPE_FREEBSD_UFS;
-		type = ufs;
+		add_type = ufs;
 	}
 
 	while (optind < argc) {

==== //depot/projects/xen31/sbin/gpt/gpt.8#2 (text+ko) ====

@@ -22,9 +22,9 @@
 .\" (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/sbin/gpt/gpt.8,v 1.17 2006/06/22 22:22:32 marcel Exp $
+.\" $FreeBSD: src/sbin/gpt/gpt.8,v 1.18 2007/10/24 21:32:57 jhb Exp $
 .\"
-.Dd June 22, 2006
+.Dd October 24, 2007
 .Os
 .Dt GPT 8
 .Sh NAME
@@ -130,10 +130,51 @@
 The type is given as an UUID, but
 .Nm
 accepts
-.Cm efi , swap , ufs , hfs , linux
+.Cm boot , efi , swap , ufs , hfs , linux
 and
 .Cm windows
 as aliases for the most commonly used partition types.
+.\" ==== boot ====
+.It Xo
+.Nm
+.Ic boot
+.Op Fl b Ar pmbr
+.Op Fl g Ar gptboot
+.Op Fl s Ar count
+.Ar device ...
+.Xc
+The

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Thu Oct 25 23:12:50 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 078DF16A418; Thu, 25 Oct 2007 23:12: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 085B516A421
	for ; Thu, 25 Oct 2007 23:12:49 +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 E0D6313C4AA
	for ; Thu, 25 Oct 2007 23:12:48 +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 l9PNCmAC000933
	for ; Thu, 25 Oct 2007 23:12:48 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9PNCjSo000930
	for perforce@freebsd.org; Thu, 25 Oct 2007 23:12:45 GMT
	(envelope-from jb@freebsd.org)
Date: Thu, 25 Oct 2007 23:12:45 GMT
Message-Id: <200710252312.l9PNCjSo000930@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 128099 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 25 Oct 2007 23:12:50 -0000

http://perforce.freebsd.org/chv.cgi?CH=128099

Change 128099 by jb@jb_freebsd1 on 2007/10/25 23:12:34

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#48 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#32 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#7 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#12 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#42 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#24 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/lulf.key#1 branch
.. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#26 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#25 integrate
.. //depot/projects/dtrace/ports/LEGAL#24 integrate
.. //depot/projects/dtrace/ports/MOVED#48 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.gnome.mk#11 integrate
.. //depot/projects/dtrace/ports/Tools/scripts/tindex#5 integrate
.. //depot/projects/dtrace/ports/UPDATING#38 integrate
.. //depot/projects/dtrace/src/ObsoleteFiles.inc#25 integrate
.. //depot/projects/dtrace/src/UPDATING#19 integrate
.. //depot/projects/dtrace/src/contrib/one-true-awk/FIXES#5 integrate
.. //depot/projects/dtrace/src/contrib/one-true-awk/FREEBSD-upgrade#5 integrate
.. //depot/projects/dtrace/src/contrib/one-true-awk/lib.c#5 integrate
.. //depot/projects/dtrace/src/contrib/one-true-awk/tran.c#4 integrate
.. //depot/projects/dtrace/src/etc/rc.d/Makefile#14 integrate
.. //depot/projects/dtrace/src/etc/rc.d/amd#7 integrate
.. //depot/projects/dtrace/src/etc/rc.d/nfslocking#5 delete
.. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_tar.c#10 integrate
.. //depot/projects/dtrace/src/lib/libstand/Makefile#7 integrate
.. //depot/projects/dtrace/src/sbin/gpt/Makefile#4 integrate
.. //depot/projects/dtrace/src/sbin/gpt/add.c#5 integrate
.. //depot/projects/dtrace/src/sbin/gpt/boot.c#1 branch
.. //depot/projects/dtrace/src/sbin/gpt/gpt.8#4 integrate
.. //depot/projects/dtrace/src/sbin/gpt/gpt.c#5 integrate
.. //depot/projects/dtrace/src/sbin/gpt/gpt.h#4 integrate
.. //depot/projects/dtrace/src/sbin/gpt/show.c#4 integrate
.. //depot/projects/dtrace/src/share/misc/committers-src.dot#4 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/msi.c#3 integrate
.. //depot/projects/dtrace/src/sys/arm/at91/if_ate.c#11 integrate
.. //depot/projects/dtrace/src/sys/arm/at91/kb920x_machdep.c#18 integrate
.. //depot/projects/dtrace/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#6 integrate
.. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/emac_init.c#6 integrate
.. //depot/projects/dtrace/src/sys/boot/common/ufsread.c#4 integrate
.. //depot/projects/dtrace/src/sys/boot/i386/Makefile#5 integrate
.. //depot/projects/dtrace/src/sys/boot/i386/boot2/boot2.c#7 integrate
.. //depot/projects/dtrace/src/sys/boot/i386/gptboot/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/boot/i386/gptboot/gptboot.c#1 branch
.. //depot/projects/dtrace/src/sys/boot/i386/gptboot/gptldr.S#1 branch
.. //depot/projects/dtrace/src/sys/boot/i386/libi386/bioscd.c#5 integrate
.. //depot/projects/dtrace/src/sys/boot/i386/libi386/biosdisk.c#5 integrate
.. //depot/projects/dtrace/src/sys/boot/i386/libi386/devicename.c#5 integrate
.. //depot/projects/dtrace/src/sys/boot/i386/loader/main.c#8 integrate
.. //depot/projects/dtrace/src/sys/boot/i386/pmbr/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/boot/i386/pmbr/pmbr.s#1 branch
.. //depot/projects/dtrace/src/sys/boot/pc98/boot2/boot.c#7 integrate
.. //depot/projects/dtrace/src/sys/boot/pc98/libpc98/bioscd.c#4 integrate
.. //depot/projects/dtrace/src/sys/boot/pc98/libpc98/biosdisk.c#5 integrate
.. //depot/projects/dtrace/src/sys/boot/pc98/loader/main.c#6 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_file.c#10 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_getcwd.c#6 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_misc.c#18 integrate
.. //depot/projects/dtrace/src/sys/compat/svr4/svr4_fcntl.c#7 integrate
.. //depot/projects/dtrace/src/sys/compat/svr4/svr4_misc.c#9 integrate
.. //depot/projects/dtrace/src/sys/conf/files#46 integrate
.. //depot/projects/dtrace/src/sys/conf/files.amd64#18 integrate
.. //depot/projects/dtrace/src/sys/conf/files.arm#9 integrate
.. //depot/projects/dtrace/src/sys/conf/files.i386#22 integrate
.. //depot/projects/dtrace/src/sys/conf/files.ia64#8 integrate
.. //depot/projects/dtrace/src/sys/conf/files.powerpc#11 integrate
.. //depot/projects/dtrace/src/sys/conf/files.sun4v#12 integrate
.. //depot/projects/dtrace/src/sys/contrib/pf/net/pf.c#9 integrate
.. //depot/projects/dtrace/src/sys/contrib/pf/net/pf_if.c#5 integrate
.. //depot/projects/dtrace/src/sys/contrib/pf/net/pf_table.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/acpi_support/acpi_ibm.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/acpica/acpi_ec.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/pci/pci_user.c#6 integrate
.. //depot/projects/dtrace/src/sys/fs/devfs/devfs_devs.c#8 integrate
.. //depot/projects/dtrace/src/sys/fs/devfs/devfs_vnops.c#11 integrate
.. //depot/projects/dtrace/src/sys/fs/msdosfs/denode.h#8 integrate
.. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_fat.c#6 integrate
.. //depot/projects/dtrace/src/sys/fs/unionfs/union_subr.c#9 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part.c#3 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part.h#3 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part_gpt.c#3 integrate
.. //depot/projects/dtrace/src/sys/i386/conf/PAE#7 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/msi.c#3 integrate
.. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_misc.c#9 integrate
.. //depot/projects/dtrace/src/sys/i386/include/bootinfo.h#4 integrate
.. //depot/projects/dtrace/src/sys/kern/init_main.c#17 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_acct.c#10 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_alq.c#6 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_environment.c#11 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_exec.c#16 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_exit.c#13 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_fork.c#19 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_jail.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_ktrace.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_linker.c#22 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_mbuf.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_prot.c#10 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_shutdown.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_sig.c#14 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_sysctl.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/link_elf.c#12 integrate
.. //depot/projects/dtrace/src/sys/kern/link_elf_obj.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/sys_pipe.c#8 integrate
.. //depot/projects/dtrace/src/sys/kern/sys_socket.c#7 integrate
.. //depot/projects/dtrace/src/sys/kern/sysv_msg.c#10 integrate
.. //depot/projects/dtrace/src/sys/kern/sysv_sem.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/sysv_shm.c#7 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_mbuf2.c#5 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_sem.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_socket.c#18 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_syscalls.c#18 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_usrreq.c#17 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_acl.c#2 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_extattr.c#2 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_lookup.c#10 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#18 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#22 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_syscalls.c#15 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_vnops.c#10 integrate
.. //depot/projects/dtrace/src/sys/net/bpf.c#14 integrate
.. //depot/projects/dtrace/src/sys/net/bsd_comp.c#5 integrate
.. //depot/projects/dtrace/src/sys/net/if.c#11 integrate
.. //depot/projects/dtrace/src/sys/net/if_atmsubr.c#6 integrate
.. //depot/projects/dtrace/src/sys/net/if_ethersubr.c#12 integrate
.. //depot/projects/dtrace/src/sys/net/if_fddisubr.c#5 integrate
.. //depot/projects/dtrace/src/sys/net/if_fwsubr.c#6 integrate
.. //depot/projects/dtrace/src/sys/net/if_gif.c#9 integrate
.. //depot/projects/dtrace/src/sys/net/if_iso88025subr.c#5 integrate
.. //depot/projects/dtrace/src/sys/net/if_ppp.c#10 integrate
.. //depot/projects/dtrace/src/sys/net/if_stf.c#9 integrate
.. //depot/projects/dtrace/src/sys/net/if_tun.c#10 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_scan.c#2 integrate
.. //depot/projects/dtrace/src/sys/netatalk/ddp_input.c#6 integrate
.. //depot/projects/dtrace/src/sys/netatalk/ddp_output.c#6 integrate
.. //depot/projects/dtrace/src/sys/netinet/in_pcb.c#15 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_divert.c#11 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#21 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_icmp.c#7 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_input.c#10 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_options.c#7 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_output.c#13 integrate
.. //depot/projects/dtrace/src/sys/netinet/raw_ip.c#13 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_input.c#12 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_output.c#8 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_subr.c#16 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_syncache.c#10 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_timewait.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet/udp_usrreq.c#15 integrate
.. //depot/projects/dtrace/src/sys/netinet6/udp6_usrreq.c#12 integrate
.. //depot/projects/dtrace/src/sys/nfsserver/nfs_srvsock.c#7 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_bsm.c#9 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_syscalls.c#10 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_audit.c#2 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_framework.h#11 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_inet.c#9 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_internal.h#8 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_net.c#9 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_pipe.c#8 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_policy.h#5 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_posix_sem.c#10 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_process.c#8 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_socket.c#8 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_syscalls.c#3 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_system.c#8 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_sysv_msg.c#8 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_sysv_sem.c#8 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_sysv_shm.c#8 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_vfs.c#9 integrate
.. //depot/projects/dtrace/src/sys/security/mac_biba/mac_biba.c#12 integrate
.. //depot/projects/dtrace/src/sys/security/mac_bsdextended/mac_bsdextended.c#8 integrate
.. //depot/projects/dtrace/src/sys/security/mac_ifoff/mac_ifoff.c#6 integrate
.. //depot/projects/dtrace/src/sys/security/mac_lomac/mac_lomac.c#10 integrate
.. //depot/projects/dtrace/src/sys/security/mac_mls/mac_mls.c#11 integrate
.. //depot/projects/dtrace/src/sys/security/mac_none/mac_none.c#6 integrate
.. //depot/projects/dtrace/src/sys/security/mac_partition/mac_partition.c#7 integrate
.. //depot/projects/dtrace/src/sys/security/mac_portacl/mac_portacl.c#8 integrate
.. //depot/projects/dtrace/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#7 integrate
.. //depot/projects/dtrace/src/sys/security/mac_stub/mac_stub.c#9 integrate
.. //depot/projects/dtrace/src/sys/security/mac_test/mac_test.c#8 integrate
.. //depot/projects/dtrace/src/sys/sys/gpt.h#5 integrate
.. //depot/projects/dtrace/src/sys/sys/param.h#22 integrate
.. //depot/projects/dtrace/src/sys/sys/pciio.h#5 integrate
.. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_vfsops.c#16 integrate
.. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_vnops.c#12 integrate
.. //depot/projects/dtrace/src/sys/vm/swap_pager.c#14 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_mmap.c#9 integrate
.. //depot/projects/dtrace/src/usr.bin/awk/Makefile#6 integrate
.. //depot/projects/dtrace/src/usr.bin/awk/lib.c.diff#4 delete
.. //depot/projects/dtrace/src/usr.bin/awk/tran.c.diff#2 delete
.. //depot/projects/dtrace/src/usr.bin/calendar/calendars/calendar.freebsd#14 integrate
.. //depot/projects/dtrace/src/usr.sbin/traceroute6/traceroute6.c#5 integrate
.. //depot/projects/dtrace/www/en/developers.sgml#22 integrate
.. //depot/projects/dtrace/www/en/gnome/docs/Makefile#7 integrate
.. //depot/projects/dtrace/www/en/gnome/docs/faq2.sgml#13 integrate
.. //depot/projects/dtrace/www/en/gnome/docs/faq220.sgml#1 branch
.. //depot/projects/dtrace/www/en/gnome/images/Makefile#8 integrate
.. //depot/projects/dtrace/www/en/gnome/images/ss218-1-tn.png#2 delete
.. //depot/projects/dtrace/www/en/gnome/images/ss218-1.png#2 delete
.. //depot/projects/dtrace/www/en/gnome/images/ss218-2-tn.png#2 delete
.. //depot/projects/dtrace/www/en/gnome/images/ss218-2.png#2 delete
.. //depot/projects/dtrace/www/en/gnome/images/ss218-3-tn.png#2 delete
.. //depot/projects/dtrace/www/en/gnome/images/ss218-3.png#2 delete
.. //depot/projects/dtrace/www/en/gnome/index.xsl#9 integrate
.. //depot/projects/dtrace/www/en/gnome/screenshots.sgml#9 integrate
.. //depot/projects/dtrace/www/share/sgml/navibar.ent#5 integrate
.. //depot/projects/dtrace/www/share/sgml/news.xml#23 integrate
.. //depot/projects/dtrace/www/share/sgml/press.xml#16 integrate
.. //depot/projects/dtrace/www/share/sgml/release.ent#10 integrate

Differences ...

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#48 (text+ko) ====

@@ -1,4 +1,4 @@
-
+
 
+
 
 
@@ -575,7 +575,6 @@
     
   
 
-
 
 
 
 
 
@@ -50,7 +50,7 @@
 	  Phone: +1 866 273-6255
 	  Fax: +1 217 453-9956
 	  Email: sales@bsdmall.com
-	  WWW: 
+	  WWW: 
         
       
 

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#42 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 602112
 		  
 		  
+		    6.2-STABLE after MFC of wide and single byte
+		      ctype separation.  Newly compiled binary that references
+		      to ctype.h may require a new symbol, __mb_sb_limit,
+		      which is not available on older systems.
+		    602113
+		  
+		  
 		    7.0-CURRENT.
 		    700000
 		  
@@ -11573,6 +11580,11 @@
 		    700053
 		  
 		  
+		    7.0-STABLE after MFC of wide and single byte
+		      ctype separation.
+		    700054
+		  
+		  
 		    8.0-CURRENT. Separating wide and single byte
 		      ctype.
 		    800000
@@ -11587,6 +11599,14 @@
 		      and friends to kproc_create() etc.
 		    800002
 		  
+		  
+		    8.0-CURRENT after ABI backwards compatibility
+		      to the FreeBSD 4/5/6 versions of the PCIOCGETCONF,
+		      PCIOCREAD and PCIOCWRITE IOCTLs was added, which
+		      required the ABI of the PCIOCGETCONF IOCTL to be
+		      broken again
+		    800003
+		  
 
 		
 	      

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#24 (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.431 2007/09/28 14:55:47 kaiw Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.432 2007/10/25 18:51:21 lulf Exp $
 -->
 
 aaron@FreeBSD.org">
@@ -600,6 +600,8 @@
 
 luigi@FreeBSD.org">
 
+lulf@FreeBSD.org">
+
 luoqi@FreeBSD.org">
 
 lwhsu@FreeBSD.org">

==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#26 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
     
@@ -589,6 +589,11 @@
       &pgpkey.ijliao;
     
 
+    
+      &a.lulf;
+      &pgpkey.lulf;
+    
+
     
       &a.clive;
       &pgpkey.clive;

==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#25 (text+ko) ====

@@ -1,5 +1,5 @@
 
-
+
 
 
 
@@ -146,6 +146,7 @@
 
 
 
+
 
 
 

==== //depot/projects/dtrace/ports/LEGAL#24 (text+ko) ====

@@ -1,5 +1,5 @@
 # Creator:  Jordan Hubbard
-# $FreeBSD: ports/LEGAL,v 1.555 2007/10/11 19:35:06 vd Exp $
+# $FreeBSD: ports/LEGAL,v 1.556 2007/10/24 19:49:20 garga Exp $
 
    **********************************************************************
    ***                      NOTE TO COMMITTERS                        ***
@@ -494,6 +494,11 @@
 							not sure of its license
 savage/SFE*		games/linux-savage	Savage is freeware, but i am
 						not sure of its license
+scim-kmfl-sil-ipa-unicode5* textproc/scim-kmfl-sil-ipa-unicode5	SIL's Freeware License
+								(a) doesn't allow distribution,
+								(b) makes keyboard free for personal use only,
+								(c) doesn't allow distribution of modified
+								    keyboard sources under the same name.
 sdr-*			mbone/sdr		Crypto; export-controlled
 seatools_cli.tar	sysutils/seatools	Distfile should be loaded by hand
 serialmail-*		mail/serialmail		No license -- see

==== //depot/projects/dtrace/ports/MOVED#48 (text+ko) ====

@@ -1,7 +1,7 @@
 #
 # MOVED - a list of (recently) moved or removed ports
 #
-# $FreeBSD: ports/MOVED,v 1.1505 2007/10/21 19:33:24 beech Exp $
+# $FreeBSD: ports/MOVED,v 1.1508 2007/10/25 14:52:54 hrs Exp $
 #
 # Each entry consists of a single line containing the following four
 # fields in the order named, separated with the pipe (`|') character:
@@ -3319,3 +3319,7 @@
 devel/bison2|devel/bison|2007-10-17|Bison 1.x to 2.x conversion
 games/actioncube|games/assaultcube|2007-10-19|Project name changed
 x11-fm/pcmanfm||2007-10-21|Has expired: Unmaintained upstream
+graphics/gimp-devel|graphics/gimp|2007-10-24|Gimp 2.4.0 released
+graphics/gimp-app-devel|graphics/gimp-app|2007-10-24|Gimp 2.4.0 released
+print/gimp-devel-gutenprint|print/gimp-gutenprint|2007-10-24|Gimp 2.4.0 released
+print/yatex-mule||2007-10-25|Has expired: emacs19 and related ports are obsolete

==== //depot/projects/dtrace/ports/Mk/bsd.gnome.mk#11 (text+ko) ====

@@ -1,9 +1,9 @@
 #-*- mode: Fundamental; tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.143 2007/08/04 11:37:23 gabor Exp $
+# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.144 2007/10/24 23:34:29 marcus Exp $
 #	$NetBSD: $
-#     $MCom: ports/Mk/bsd.gnome.mk,v 1.414 2007/03/13 01:24:54 marcus Exp $
+#     $MCom: ports/Mk/bsd.gnome.mk,v 1.429 2007/08/04 22:09:00 marcus Exp $
 #
 # Please view me with 4 column tabs!
 
@@ -40,9 +40,9 @@
 #					  each .omf file found to track OMF registration database.
 #
 # INSTALLS_ICONS	- If your port installs Freedesktop-style icons to
-#					  ${LOCALBASE}/share/icons or ${X11BASE}/share/icons, then
-#					  you should use this macro. If the icons are not cached,
-#					  they will not be displayed.
+#					  ${LOCALBASE}/share/icons, then you should use this
+#					  macro. If the icons are not cached, they will not be
+#					  displayed.
 #
 
 # non-version specific components
@@ -59,40 +59,25 @@
 _USE_GNOME_ALL+= atk atspi desktopfileutils eel2 evolutiondataserver gail \
 		gal2 gconf2 glib20 gnomecontrolcenter2 gnomedesktop gnomedocutils \
 		gnomemenus gnomepanel gnomesharp20 gnomespeech gnomevfs2 gtk20 \
-		gtkhtml3 gtksharp10 gtksharp20 gtksourceview libartlgpl2 libbonobo \
-		libbonoboui libgailgnome libgda2 libgda3 libglade2 libgnome \
-		libgnomecanvas libgnomedb libgnomeprint libgnomeprintui \
-		libgnomeui libgsf libgsf_gnome libgtkhtml libidl librsvg2 libwnck \
-		libxml2 libxslt libzvt linc metacity nautilus2 nautiluscdburner \
-		orbit2 pango pygnome2 pygnomeextras pygtk2 vte pygnomedesktop \
-		libgnomekbd
+		gtkhtml3 gtksharp10 gtksharp20 gtksourceview gtksourceview2 \
+		libartlgpl2 libbonobo libbonoboui libgailgnome libgda2 libgda3 \
+		libglade2 libgnome libgnomecanvas libgnomedb libgnomekbd libgnomeprint \
+		libgnomeprintui libgnomeui libgsf libgsf_gnome libgtkhtml libidl \
+		librsvg2 libwnck libxml2 libxslt libzvt linc metacity nautilus2 \
+		nautiluscdburner orbit2 pango pygnome2 pygnomedesktop pygnomeextras \
+		pygtk2 pygtksourceview vte
 
 GNOME_MAKEFILEIN?=	Makefile.in
-SCROLLKEEPER_DIR=	/var/db/scrollkeeper
+SCROLLKEEPER_DIR=	/var/db/rarian
 gnomehack_PRE_PATCH=	${FIND} ${WRKSRC} -name "${GNOME_MAKEFILEIN}*" -type f | ${XARGS} ${REINPLACE_CMD} -e \
-				's|[(]GNOME_datadir[)]/gnome/|(datadir)/|g ; \
-				 s|[(]GNOME_datadir[)]/locale|(prefix)/share/locale|g ; \
-				 s|[(]datadir[)]/locale|(prefix)/share/locale|g ; \
-				 s|[(]libdir[)]/locale|(prefix)/share/locale|g ; \
-				 s|[(]gnomedatadir[)]/gnome|(gnomedatadir)|g ; \
-				 s|[(]datadir[)]/aclocal|(prefix)/share/aclocal|g ; \
-				 s|[(]datadir[)]/gnome/|(datadir)/|g ; \
-				 s|[(]datadir[)]/mime/|(prefix)/share/mime/|g ; \
-				 s|[(]datadir[)]/mime"|(prefix)/share/mime"|g ; \
-				 s|[(]datadir[)]/mime;|(prefix)/share/mime;|g ; \
-				 s|[(]datadir[)]/mime$$|(prefix)/share/mime|g ; \
-				 s|[(]datadir[)]/dbus-1|(prefix)/share/dbus-1|g ; \
+				's|[(]libdir[)]/locale|(prefix)/share/locale|g ; \
 				 s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
+				 s|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
 				 s|[$$][(]localstatedir[)]/scrollkeeper|${SCROLLKEEPER_DIR}|g ; \
-				 s|[(]datadir[)]/icons/hicolor|(prefix)/share/icons/hicolor|g ; \
-				 s|{datadir}/icons/hicolor|{prefix}/share/icons/hicolor|g ; \
 				 s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g' ; \
 			${FIND} ${WRKSRC} -name "configure" -type f | ${XARGS} ${REINPLACE_CMD} -e \
 				's|-lpthread|${PTHREAD_LIBS}|g ; \
 				 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
-				 s|{datadir}/locale|{prefix}/share/locale|g ; \
-				 s|DATADIR/dbus-1/services|prefix/share/dbus-1/services|g ; \
-				 s|datadir/dbus-1/services|prefix/share/dbus-1/services|g ; \
 				 s|{libdir}/locale|{prefix}/share/locale|g'
 
 referencehack_PRE_PATCH=	${FIND} ${WRKSRC} -name "Makefile.in" -type f | ${XARGS} ${REINPLACE_CMD} -e \
@@ -109,12 +94,10 @@
 GCONF_CONFIG_OPTIONS?=	merged
 GCONF_CONFIG_DIRECTORY?=etc/gconf/gconf.xml.defaults
 GCONF_CONFIG_SOURCE?=xml:${GCONF_CONFIG_OPTIONS}:${PREFIX}/${GCONF_CONFIG_DIRECTORY}
-GNOME_LOCALSTATEDIR?=	${PREFIX}/share/gnome
+GNOME_LOCALSTATEDIR?=	${PREFIX}/share
 gnomeprefix_CONFIGURE_ENV=GTKDOC="false"
 gnomeprefix_CONFIGURE_ARGS=--localstatedir=${GNOME_LOCALSTATEDIR} \
-			   --datadir=${PREFIX}/share/gnome \
 			   --with-html-dir=${GNOME_HTML_DIR} \
-			   --with-help-dir=${PREFIX}/share/gnome/help \
 			   --disable-gtk-doc \
 			   --with-gconf-source=${GCONF_CONFIG_SOURCE}
 gnomeprefix_USE_GNOME_IMPL=gnomehier
@@ -322,11 +305,11 @@
 
 gail_LIB_DEPENDS=	gailutil.18:${PORTSDIR}/accessibility/gail
 gail_DETECT=		${LOCALBASE}/libdata/pkgconfig/gail.pc
-gail_USE_GNOME_IMPL=	libgnomecanvas
+gail_USE_GNOME_IMPL=	gtk20
 
 libgnomecanvas_LIB_DEPENDS=	gnomecanvas-2.0:${PORTSDIR}/graphics/libgnomecanvas
 libgnomecanvas_DETECT=		${LOCALBASE}/libdata/pkgconfig/libgnomecanvas-2.0.pc
-libgnomecanvas_USE_GNOME_IMPL=	libglade2 libartlgpl2
+libgnomecanvas_USE_GNOME_IMPL=	libglade2 libartlgpl2 gail
 
 libartlgpl2_LIB_DEPENDS=	art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl
 libartlgpl2_DETECT=		${LOCALBASE}/libdata/pkgconfig/libart-2.0.pc
@@ -369,7 +352,7 @@
 gnomedesktop_USE_GNOME_IMPL=	libgnomeui gnomedocutils
 gnomedesktop_GNOME_DESKTOP_VERSION=2
 
-libwnck_LIB_DEPENDS=	wnck-1.18:${PORTSDIR}/x11-toolkits/libwnck
+libwnck_LIB_DEPENDS=	wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck
 libwnck_DETECT=		${LOCALBASE}/libdata/pkgconfig/libwnck-1.0.pc
 libwnck_USE_GNOME_IMPL=	gtk20
 
@@ -427,6 +410,10 @@
 gtksourceview_DETECT=	${LOCALBASE}/libdata/pkgconfig/gtksourceview-1.0.pc
 gtksourceview_USE_GNOME_IMPL=libgnome libgnomeprintui
 
+gtksourceview2_LIB_DEPENDS=	gtksourceview-2.0.0:${PORTSDIR}/x11-toolkits/gtksourceview2
+gtksourceview2_DETECT=	${LOCALBASE}/libdata/pkgconfig/gtksourceview-2.0.pc
+gtksourceview2_USE_GNOME_IMPL=gtk20 libxml2
+
 pkgconfig_DETECT=			${LOCALBASE}/bin/pkg-config
 pkgconfig_BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkg-config
 pkgconfig_RUN_DEPENDS=		pkg-config:${PORTSDIR}/devel/pkg-config
@@ -518,6 +505,11 @@
 libgnomekbd_LIB_DEPENDS=	gnomekbd.1:${PORTSDIR}/x11/libgnomekbd
 libgnomekbd_USE_GNOME_IMPL=	libgnomeui
 
+pygtksourceview_DETECT=		${LOCALBASE}/libdata/pkgconfig/pygtksourceview-2.0.pc
+pygtksourceview_BUILD_DEPENDS=	${pygtksourceview_DETECT}:${PORTSDIR}/x11-toolkits/py-gtksourceview
+pygtksourceview_RUN_DEPENDS=	${pygtksourceview_DETECT}:${PORTSDIR}/x11-toolkits/py-gtksourceview
+pygtksourceview_USE_GNOME_IMPL=	gtksourceview2 pygtk2
+
 # End component definition section
 
 # This section defines tests for optional software.  These work off four

==== //depot/projects/dtrace/ports/Tools/scripts/tindex#5 (text+ko) ====

@@ -32,6 +32,7 @@
 export SRCDIR5=${BASEDIR}/src.5
 export SRCDIR6=${BASEDIR}/src.6
 export SRCDIR7=${BASEDIR}/src.7
+export SRCDIR8=${BASEDIR}/src.8
 
 # Target architecture if not set in the environment
 if [ "${ARCH}" = "" ]; then
@@ -139,18 +140,23 @@
 # First update the source trees to get current OSVERSION
 cd ${SRCDIR5}/sys/sys
 cvs -Rq update -PdA -r RELENG_5 param.h
-OSVERSION5=$(awk '/^#define __FreeBSD_version/ {print $3}' < ${SRCDIR5}/sys/sys/param.h)
+OSVERSION5=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR5}/sys/sys/param.h)
 
 cd ${SRCDIR6}/sys/sys
 cvs -Rq update -PdA -r RELENG_6 param.h
-OSVERSION6=$(awk '/^#define __FreeBSD_version/ {print $3}' < ${SRCDIR6}/sys/sys/param.h)
+OSVERSION6=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR6}/sys/sys/param.h)
 
 cd ${SRCDIR7}/sys/sys
+cvs -Rq update -PdA -r RELENG_7 param.h
+OSVERSION7=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR7}/sys/sys/param.h)
+
+cd ${SRCDIR8}/sys/sys
 cvs -Rq update -PdA param.h
-OSVERSION7=$(awk '/^#define __FreeBSD_version/ {print $3}' < ${SRCDIR7}/sys/sys/param.h)
+OSVERSION8=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR8}/sys/sys/param.h)
+
 
 cd ${PORTSDIR}
-rm -f INDEX-5 INDEX-5.bz2 INDEX-6 INDEX-6.bz2 INDEX-7 INDEX-7.bz2
+rm -f INDEX-5 INDEX-5.bz2 INDEX-6 INDEX-6.bz2 INDEX-7 INDEX-7.bz2 INDEX-8 INDEX-8.bz2 
 (cvs -Rq update -PdA 2>1 ) > cvs.log
 if grep -q ^C cvs.log ; then
   (echo "cvs update failed with conflicts:";
@@ -203,5 +209,20 @@
 scp -q ${SSHKEY} ${PORTSDIR}/INDEX-7 ${PORTSDIR}/INDEX-7.bz2 ${SCP_DEST_HOST}:${TMPDIR} || mail -s "Cannot copy INDEX-7 to temp dir" ${ERROR_ADDRESS}
 ssh ${SCP_DEST_HOST} "/bin/mv ${TMPDIR}/INDEX-7 ${SCP_DEST_DIR}; /bin/mv ${TMPDIR}/INDEX-7.bz2 ${SCP_DEST_DIR}; rmdir ${TMPDIR}" || mail -s "Cannot move INDEX-7 to final dir" ${ERROR_ADDRESS}
 
+BRANCH=8.x
+export OSVERSION=${OSVERSION8}
+echo "Building INDEX for ${BRANCH} with OSVERSION=${OSVERSION}"
+cd ${PORTSDIR}
+((make index 2> index.err) > index.out) || indexfail ${BRANCH}
+if [ -s index.err ]; then
+	indexfail ${BRANCH}
+fi
+checkfixed ${BRANCH}
+
+createtmpdir
+bzip2 -kf ${PORTSDIR}/INDEX-8
+scp -q ${SSHKEY} ${PORTSDIR}/INDEX-8 ${PORTSDIR}/INDEX-8.bz2 ${SCP_DEST_HOST}:${TMPDIR} || mail -s "Cannot copy INDEX-8 to temp dir" ${ERROR_ADDRESS}
+ssh ${SCP_DEST_HOST} "/bin/mv ${TMPDIR}/INDEX-8 ${SCP_DEST_DIR}; /bin/mv ${TMPDIR}/INDEX-8.bz2 ${SCP_DEST_DIR}; rmdir ${TMPDIR}" || mail -s "Cannot move INDEX-8 to final dir" ${ERROR_ADDRESS}
+
 # All indexes built successfully, clear the hook
 rm -f ${PORTSDIR}/hook

==== //depot/projects/dtrace/ports/UPDATING#38 (text+ko) ====

@@ -6,6 +6,40 @@
 time you update your ports collection, before attempting any port
 upgrades.
 
+20071024:
+  AFFECTS: All GNOME users and ports depend on gnomehier
+  AUTHOR: gnome@FreeBSD.org
+
+  GNOME has been updated to 2.20.1. All ports that depend on gnomehier have
+  had their DATADIR moved from share/gnome/ to share/ (e.g.
+  ${LOCALBASE}/share/gnome/ to ${LOCALBASE}/share/).
+  This puts the FreeBSD GNOME ports more in line with the default
+  GNOME installation hierarchy. To find the specific directories that
+  have changed, see misc/gnomehier/files/dirlist. To upgrade your
+  installed ports, you will need to use either sysutils/portupgrade or
+  sysutils/portmaster.
+
+    Portupgrade users:
+        # pkgdb -Ff
+        # portupgrade -f -o textproc/rarian textproc/scrollkeeper
+        # portupgrade -a
+
+    Portmaster users:
+        # portmaster -o textproc/rarian textproc/scrollkeeper
+        # portmaster -a
+
+  If some of icons, applets, themes or other customized items have
+  disappered from your desktop in this upgrade, you will need to
+  remove and re-add these items to make them appear again due to the
+  DATADIR change.
+
+20071024:
+  AFFECTS: users of databases/mysql-connector-java
+  AUTHOR: miwi@FreeBSD.org
+
+  databases/mysql-connector-java version is 5.1.5 now. 5.0.8 version was
+  preserved on databases/mysql-connector-java50 port.
+
 20071009:
   AFFECTS: users of mail/vpopmail
   AUTHOR: roam@FreeBSD.org
@@ -79,7 +113,7 @@
   AFFECTS: users of sysutils/nut sysutils/nut-*
   AUTHOR: Martin Matuska 
 
-  The slave ports sysutils/nut-libupsclient, sysutils/nut-snmp and 
+  The slave ports sysutils/nut-libupsclient, sysutils/nut-snmp and
   sysutils/nut-usb have been removed with the upgrade of sysutils/nut to 2.2.0
   They are now fully integrated into sysutils/nut and their functionality
   can be enabled/disabled in OPTIONS of sysutils/nut.
@@ -117,10 +151,10 @@
   AFFECTS: users of devel/p5-gearmand
   AUTHOR: clsung@FreeBSD.org
 
-  The port p5-gearmand has been splited up, so Gearman servers can 
-  be embedded into other processes. The Gearman::Server class is 
+  The port p5-gearmand has been splited up, so Gearman servers can
+  be embedded into other processes. The Gearman::Server class is
   located at devel/p5-Gearman-Server, if you have devel/p5-gearmand
-  installed, perform an upgrade devel/p5-Gearman-Server with a 
+  installed, perform an upgrade devel/p5-Gearman-Server with a
   command like:
 
     # portupgrade -o devel/p5-Gearman-Server devel/p5-gearmand
@@ -137,7 +171,7 @@
   AUTHOR: Wesley Shields 
 
   The new version of grok has changed the meaning of a couple of
-  pre-defined patterns. 
+  pre-defined patterns.
   Please see /usr/local/share/doc/grok/CHANGELIST for more
   information. Existing grok.conf may be broken by these changes.
 
@@ -5785,4 +5819,4 @@
   2) Update all p5-* modules.
 	portupgrade -f p5-\*
 
-$FreeBSD: ports/UPDATING,v 1.559 2007/10/20 10:41:09 rafan Exp $
+$FreeBSD: ports/UPDATING,v 1.563 2007/10/25 07:43:49 marcus Exp $

==== //depot/projects/dtrace/src/ObsoleteFiles.inc#25 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.114 2007/10/22 12:31:23 ru Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.115 2007/10/25 18:10:05 mtm Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,8 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd
+OLD_FILES+=etc/rc.d/nfslocking
 # 20070930: rename of cached to nscd
 OLD_FILES+=etc/rc.d/cached
 OLD_FILES+=usr/sbin/cached

==== //depot/projects/dtrace/src/UPDATING#19 (text+ko) ====

@@ -21,6 +21,19 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20071024:
+	It has been decided that it is desirable to provide ABI
+	backwards compatibility to the FreeBSD 4/5/6 versions of the
+	PCIOCGETCONF, PCIOCREAD and PCIOCWRITE IOCTLs, which was
+	broken with the introduction of PCI domain support (see the
+	20070930 entry). Unfortunately, this required the ABI of
+	PCIOCGETCONF to be broken again in order to be able to
+	provide backwards compatibility to the old version of that
+	IOCTL. Thus consumers of PCIOCGETCONF have to be recompiled
+	again. As for prominent ports this affects neither pciutils
+	nor xorg-server this time, the hal port needs to be rebuilt
+	however.
+
 20071020:
 	The misnamed kthread_create() and friends have been renamed
 	to kproc_create() etc. Many of the callers already
@@ -921,4 +934,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.510 2007/10/21 04:27:07 julian Exp $
+$FreeBSD: src/UPDATING,v 1.511 2007/10/24 20:51:43 marius Exp $

==== //depot/projects/dtrace/src/contrib/one-true-awk/FIXES#5 (text+ko) ====

@@ -25,6 +25,14 @@
 This file lists all bug fixes, changes, etc., made since the AWK book
 was sent to the printers in August, 1987.
 
+Oct 23, 2007:
+	minor fix in lib.c: increase inputFS to 100, change malloc
+	for fields to n+1.  
+
+	fixed memory fault caused by out of order test in setsval.
+
+	thanks to david o'brien, freebsd, for both fixes.
+
 May 1, 2007:
 	fiddle in makefile to fix for BSD make; thanks to igor sobrado.
 

==== //depot/projects/dtrace/src/contrib/one-true-awk/FREEBSD-upgrade#5 (text+ko) ====

@@ -1,12 +1,12 @@
-# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.10 2007/06/05 15:34:40 rafan Exp $
+# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.11 2007/10/25 12:38:34 obrien Exp $
 
 Import of the 2005/04/24 version of the "one true awk", as described
 in "The AWK Programming Language", by Al Aho, Brian Kernighan, and
 Peter Weinberger (Addison-Wesley, 1988, ISBN 0-201-07981-X).
 
-Original sources were taken from the Brian Kernighan's home page
-(http://cm.bell-labs.com/who/bwk/) and include bug fixes up thru
-May 01, 2007.
+Original sources were taken from the Brian Kernighan's AWK page
+http://www.cs.princeton.edu/~bwk/btl.mirror
+and include bug fixes up thru Oct 23, 2007.
 
 The following files were removed for this import:
 
@@ -21,4 +21,4 @@
 
 The vendor import was done by:
 
-	cvs import src/contrib/one-true-awk BELL_LABS bwk_20070501
+	cvs import src/contrib/one-true-awk BELL_LABS bwk_20071023

==== //depot/projects/dtrace/src/contrib/one-true-awk/lib.c#5 (text+ko) ====

@@ -40,7 +40,7 @@
 int	fieldssize = RECSIZE;
 
 Cell	**fldtab;	/* pointers to Cells */
-char	inputFS[10] = " ";
+char	inputFS[100] = " ";
 
 #define	MAXFLD	2
 int	nfields	= MAXFLD;	/* last allocated slot for $i */
@@ -58,7 +58,7 @@
 void recinit(unsigned int n)
 {
 	if ( (record = (char *) malloc(n)) == NULL
-	  || (fields = (char *) malloc(n)) == NULL
+	  || (fields = (char *) malloc(n+1)) == NULL
 	  || (fldtab = (Cell **) malloc((nfields+1) * sizeof(Cell *))) == NULL
 	  || (fldtab[0] = (Cell *) malloc(sizeof(Cell))) == NULL )
 		FATAL("out of space for $0 and fields");

==== //depot/projects/dtrace/src/contrib/one-true-awk/tran.c#4 (text+ko) ====

@@ -332,10 +332,10 @@
 		donerec = 1;
 	}
 	t = tostring(s);	/* in case it's self-assign */
+	if (freeable(vp))
+		xfree(vp->sval);
 	vp->tval &= ~NUM;
 	vp->tval |= STR;
-	if (freeable(vp))
-		xfree(vp->sval);
 	vp->tval &= ~DONTFREE;
 	   dprintf( ("setsval %p: %s = \"%s (%p) \", t=%o r,f=%d,%d\n", 
 		vp, NN(vp->nval), t,t, vp->tval, donerec, donefld) );

==== //depot/projects/dtrace/src/etc/rc.d/Makefile#14 (text+ko) ====

@@ -1,5 +1,5 @@
 # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.86 2007/10/15 20:00:18 netchild Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.87 2007/10/25 18:10:05 mtm Exp $
 
 .include 
 
@@ -25,7 +25,7 @@
 	mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \
 	named natd netif netoptions \
 	network_ipv6 newsyslog nfsclient nfsd \
-	nfslocking nfsserver nisdomain nsswitch ntpd ntpdate \
+	nfsserver nisdomain nsswitch ntpd ntpdate \
 	othermta \
 	pf pflog pfsync \
 	powerd power_profile ppp pppoed pwcheck \

==== //depot/projects/dtrace/src/etc/rc.d/amd#7 (text+ko) ====

@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $
-# $FreeBSD: src/etc/rc.d/amd,v 1.19 2007/10/19 22:55:42 mtm Exp $
+# $FreeBSD: src/etc/rc.d/amd,v 1.20 2007/10/25 16:59:06 mtm Exp $
 #
 
 # PROVIDE: amd
@@ -47,7 +47,7 @@
 		;;
 	*)
 		rc_flags="-p ${rc_flags}"
-		command_args=" > /var/run/amd.pid 2> /dev/null"
+		command_args="> /var/run/amd.pid 2> /dev/null"
 		;;
 	esac
 	return 0

==== //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_tar.c#10 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.61 2007/08/18 21:53:25 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.62 2007/10/24 04:01:31 kientzle Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include 
@@ -164,6 +164,7 @@
 	struct sparse_block	*sparse_last;
 	int64_t			 sparse_offset;
 	int64_t			 sparse_numbytes;
+	int64_t			 sparse_realsize;
 	int			 sparse_gnu_major;
 	int			 sparse_gnu_minor;
 	char			 sparse_gnu_pending;
@@ -440,6 +441,7 @@
 		free(sp);
 	}
 	tar->sparse_last = NULL;
+	tar->sparse_realsize = -1; /* Mark this as "unset" */
 
 	r = tar_read_header(a, tar, entry);
 
@@ -1388,9 +1390,10 @@
 		}
 		if (wcscmp(key, L"GNU.sparse.name") == 0)
 			archive_entry_copy_pathname_w(entry, value);
-		if (wcscmp(key, L"GNU.sparse.realsize") == 0)
-			archive_entry_set_size(entry,
-			    tar_atol10(value, wcslen(value)));
+		if (wcscmp(key, L"GNU.sparse.realsize") == 0) {
+			tar->sparse_realsize = tar_atol10(value, wcslen(value));
+			archive_entry_set_size(entry, tar->sparse_realsize);
+		}
 		break;
 	case 'L':
 		/* Our extensions */
@@ -1471,11 +1474,22 @@
 		/* POSIX has reserved 'security.*' */
 		/* Someday: if (wcscmp(key, L"security.acl")==0) { ... } */
 		if (wcscmp(key, L"size")==0) {
-			tar->entry_bytes_remaining = tar_atol10(value, wcslen(value));
-			archive_entry_set_size(entry, tar->entry_bytes_remaining);
+			/* "size" is the size of the data in the entry. */
+			tar->entry_bytes_remaining
+			    = tar_atol10(value, wcslen(value));
+			/*
+			 * But, "size" is not necessarily the size of
+			 * the file on disk; if this is a sparse file,
+			 * the disk size may have already been set from
+			 * GNU.sparse.realsize.
+			 */
+			if (tar->sparse_realsize < 0) {
+				archive_entry_set_size(entry,
+				    tar->entry_bytes_remaining);
+				tar->sparse_realsize
+				    = tar->entry_bytes_remaining;
+			}
 		}
-		tar->entry_bytes_remaining = 0;
-
 		break;
 	case 'u':
 		if (wcscmp(key, L"uid")==0)

==== //depot/projects/dtrace/src/lib/libstand/Makefile#7 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libstand/Makefile,v 1.58 2007/10/15 14:20:24 nyan Exp $
+# $FreeBSD: src/lib/libstand/Makefile,v 1.59 2007/10/24 21:32:57 jhb Exp $
 # Originally from	$NetBSD: Makefile,v 1.21 1997/10/26 22:08:38 lukem Exp $

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Fri Oct 26 01:04:56 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 98B3516A419; Fri, 26 Oct 2007 01:04: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 11FC216A418
	for ; Fri, 26 Oct 2007 01:04:56 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D5AFA13C4B8
	for ; Fri, 26 Oct 2007 01:04:55 +0000 (UTC)
	(envelope-from peter@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 l9Q14tX6017575
	for ; Fri, 26 Oct 2007 01:04:55 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9Q14t8c017572
	for perforce@freebsd.org; Fri, 26 Oct 2007 01:04:55 GMT
	(envelope-from peter@freebsd.org)
Date: Fri, 26 Oct 2007 01:04:55 GMT
Message-Id: <200710260104.l9Q14t8c017572@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128101 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 26 Oct 2007 01:04:57 -0000

http://perforce.freebsd.org/chv.cgi?CH=128101

Change 128101 by peter@peter_daintree on 2007/10/26 01:04:03

	Hack to make this compile.

Affected files ...

.. //depot/projects/hammer/sys/i386/i386/pmap.c#96 edit

Differences ...

==== //depot/projects/hammer/sys/i386/i386/pmap.c#96 (text+ko) ====

@@ -3520,11 +3520,13 @@
 }
 
 void
-pmap_activate(struct vmspace *vm)
+pmap_switch_vmspace(struct vmspace *vm)
 {
 	pmap_t	pmap, oldpmap;
+	struct thread *td;
 	u_int32_t  cr3;
 
+	td = curthread;
 	critical_enter();
 	td->td_proc->p_vmspace = vm;
 	pmap = vmspace_pmap(td->td_proc->p_vmspace);

From owner-p4-projects@FreeBSD.ORG  Fri Oct 26 02:21:20 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1BB9316A418; Fri, 26 Oct 2007 02:21:20 +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 B569F16A421
	for ; Fri, 26 Oct 2007 02:21:19 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9E6CA13C480
	for ; Fri, 26 Oct 2007 02:21:19 +0000 (UTC)
	(envelope-from peter@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 l9Q2LJ9Q023992
	for ; Fri, 26 Oct 2007 02:21:19 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9Q2LJIY023989
	for perforce@freebsd.org; Fri, 26 Oct 2007 02:21:19 GMT
	(envelope-from peter@freebsd.org)
Date: Fri, 26 Oct 2007 02:21:19 GMT
Message-Id: <200710260221.l9Q2LJIY023989@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128103 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 26 Oct 2007 02:21:20 -0000

http://perforce.freebsd.org/chv.cgi?CH=128103

Change 128103 by peter@peter_daintree on 2007/10/26 02:21:04

	Make nvram a real device.
	Make it do checksums on write.
	(Check for a valid checksum before allowing writes or risk a 'press F1
	 to continue' bios boot problem if we dont understand the algorithm)

Affected files ...

.. //depot/projects/hammer/sys/amd64/conf/DEFAULTS#7 edit
.. //depot/projects/hammer/sys/amd64/include/clock.h#24 edit
.. //depot/projects/hammer/sys/amd64/isa/clock.c#65 edit
.. //depot/projects/hammer/sys/conf/files.amd64#96 edit
.. //depot/projects/hammer/sys/conf/files.i386#82 edit
.. //depot/projects/hammer/sys/dev/nvram/nvram.c#1 add
.. //depot/projects/hammer/sys/i386/conf/DEFAULTS#7 edit
.. //depot/projects/hammer/sys/i386/include/clock.h#14 edit
.. //depot/projects/hammer/sys/i386/isa/clock.c#39 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/conf/DEFAULTS#7 (text+ko) ====

@@ -11,6 +11,7 @@
 # Pseudo devices.
 device		mem		# Memory and kernel memory devices
 device		io		# I/O device
+device		nvram		# Access to rtc cmos via /dev/nvram
 
 # UART chips on this platform
 device		uart_ns8250

==== //depot/projects/hammer/sys/amd64/include/clock.h#24 (text+ko) ====

@@ -31,7 +31,8 @@
 
 int	acquire_timer2(int mode);
 int	release_timer2(void);
-int	rtcin(int val);
+int	rtcin(int reg);
+void	writertc(int reg, unsigned char val);
 int	sysbeep(int pitch, int period);
 void	init_TSC(void);
 void	init_TSC_tc(void);

==== //depot/projects/hammer/sys/amd64/isa/clock.c#65 (text+ko) ====

@@ -433,7 +433,7 @@
 	return (val);
 }
 
-static void
+void
 writertc(int reg, u_char val)
 {
 
@@ -934,99 +934,4 @@
 DRIVER_MODULE(attimer, isa, attimer_driver, attimer_devclass, 0, 0);
 DRIVER_MODULE(attimer, acpi, attimer_driver, attimer_devclass, 0, 0);
 
-/*
- * Linux-style /dev/nvram driver
- *
- * cmos ram starts at bytes 14 through 128, for a total of 114 bytes.
- * bytes 16 through 31 are checksummed at byte 32.
- * Unlike Linux, you have to take care of the checksums yourself.
- * The driver exposes byte 14 as file offset 0.
- */
-
-#define NVRAM_FIRST	RTC_DIAG	/* 14 */
-#define NVRAM_LAST	128
-
-static d_open_t		nvram_open;
-static d_read_t		nvram_read;
-static d_write_t	nvram_write;
-
-static struct cdev *nvram_dev;
-
-static struct cdevsw nvram_cdevsw = {
-	.d_version =	D_VERSION,
-	.d_flags =	D_NEEDGIANT,
-	.d_open =	nvram_open,
-	.d_read =	nvram_read,
-	.d_write =	nvram_write,
-	.d_name =	"nvram",
-};
-
-static int
-nvram_open(struct cdev *dev __unused, int flags, int fmt __unused,
-    struct thread *td)
-{
-	int error = 0;
-
-	if (flags & FWRITE)
-		error = securelevel_gt(td->td_ucred, 0);
-
-	return (error);
-}
-
-static int
-nvram_read(struct cdev *dev, struct uio *uio, int flags)
-{
-	int nv_off;
-	u_char v;
-	int error = 0;
-
-	while (uio->uio_resid > 0 && error == 0) {
-		nv_off = uio->uio_offset + NVRAM_FIRST;
-		if (nv_off < NVRAM_FIRST || nv_off >= NVRAM_LAST)
-			return (0);	/* Signal EOF */
-		/* Single byte at a time */
-		v = rtcin(nv_off);
-		error = uiomove(&v, 1, uio);
-	}
-	return (error);
-
-}
-
-static int
-nvram_write(struct cdev *dev, struct uio *uio, int flags)
-{
-	int nv_off;
-	u_char v;
-	int error = 0;
-
-	while (uio->uio_resid > 0 && error == 0) {
-		nv_off = uio->uio_offset + NVRAM_FIRST;
-		if (nv_off < NVRAM_FIRST || nv_off >= NVRAM_LAST)
-			return (0);	/* Signal EOF */
-		/* Single byte at a time */
-		error = uiomove(&v, 1, uio);
-		writertc(nv_off, v);
-	}
-	return (error);
-}
-
-static int
-nvram_modevent(module_t mod __unused, int type, void *data __unused)
-{
-	switch (type) {
-	case MOD_LOAD:
-		nvram_dev = make_dev(&nvram_cdevsw, 0,
-		    UID_ROOT, GID_KMEM, 0640, "nvram");
-		break;
-	case MOD_UNLOAD:
-	case MOD_SHUTDOWN:
-		destroy_dev(nvram_dev);
-		break;
-	default:
-		return (EOPNOTSUPP);
-	}
-	return (0);
-}
-DEV_MODULE(nvram, nvram_modevent, NULL);
-
 #endif /* DEV_ISA */

==== //depot/projects/hammer/sys/conf/files.amd64#96 (text+ko) ====

@@ -185,6 +185,7 @@
 dev/mem/memutil.c		optional	mem
 dev/nfe/if_nfe.c		optional	nfe pci
 dev/nve/if_nve.c		optional	nve pci
+dev/nvram/nvram.c		optional	nvram isa
 dev/rr232x/os_bsd.c		optional	rr232x
 dev/rr232x/osm_bsd.c		optional	rr232x
 dev/rr232x/rr232x_config.c	optional	rr232x

==== //depot/projects/hammer/sys/conf/files.i386#82 (text+ko) ====

@@ -211,6 +211,7 @@
 dev/mse/mse_isa.c		optional mse isa
 dev/nfe/if_nfe.c		optional nfe pci
 dev/nve/if_nve.c		optional nve pci
+dev/nvram/nvram.c		optional nvram isa
 dev/pcf/pcf_isa.c		optional pcf
 dev/random/nehemiah.c		optional random
 dev/rr232x/os_bsd.c		optional rr232x

==== //depot/projects/hammer/sys/i386/conf/DEFAULTS#7 (text+ko) ====

@@ -15,6 +15,7 @@
 # Pseudo devices.
 device		mem		# Memory and kernel memory devices
 device		io		# I/O device
+device		nvram		# Access to rtc cmos via /dev/nvram
 
 # UART chips on this platform
 device		uart_ns8250

==== //depot/projects/hammer/sys/i386/include/clock.h#14 (text+ko) ====

@@ -31,7 +31,8 @@
 
 int	acquire_timer2(int mode);
 int	release_timer2(void);
-int	rtcin(int val);
+int	rtcin(int reg);
+void	writertc(int reg, unsigned char val);
 int	sysbeep(int pitch, int period);
 void	timer_restore(void);
 void	init_TSC(void);

==== //depot/projects/hammer/sys/i386/isa/clock.c#39 (text+ko) ====

@@ -438,7 +438,7 @@
 	return (val);
 }
 
-static void
+void
 writertc(int reg, u_char val)
 {
 
@@ -938,99 +938,4 @@
 DRIVER_MODULE(attimer, isa, attimer_driver, attimer_devclass, 0, 0);
 DRIVER_MODULE(attimer, acpi, attimer_driver, attimer_devclass, 0, 0);
 
-/*
- * Linux-style /dev/nvram driver
- *
- * cmos ram starts at bytes 14 through 128, for a total of 114 bytes.
- * bytes 16 through 31 are checksummed at byte 32.
- * Unlike Linux, you have to take care of the checksums yourself.
- * The driver exposes byte 14 as file offset 0.
- */
-
-#define NVRAM_FIRST	RTC_DIAG	/* 14 */
-#define NVRAM_LAST	128
-
-static d_open_t		nvram_open;
-static d_read_t		nvram_read;
-static d_write_t	nvram_write;
-
-static struct cdev *nvram_dev;
-
-static struct cdevsw nvram_cdevsw = {
-	.d_version =	D_VERSION,
-	.d_flags =	D_NEEDGIANT,
-	.d_open =	nvram_open,
-	.d_read =	nvram_read,
-	.d_write =	nvram_write,
-	.d_name =	"nvram",
-};
-
-static int
-nvram_open(struct cdev *dev __unused, int flags, int fmt __unused,
-    struct thread *td)
-{
-	int error = 0;
-
-	if (flags & FWRITE)
-		error = securelevel_gt(td->td_ucred, 0);
-
-	return (error);
-}
-
-static int
-nvram_read(struct cdev *dev, struct uio *uio, int flags)
-{
-	int nv_off;
-	u_char v;
-	int error = 0;
-
-	while (uio->uio_resid > 0 && error == 0) {
-		nv_off = uio->uio_offset + NVRAM_FIRST;
-		if (nv_off < NVRAM_FIRST || nv_off >= NVRAM_LAST)
-			return (0);	/* Signal EOF */
-		/* Single byte at a time */
-		v = rtcin(nv_off);
-		error = uiomove(&v, 1, uio);
-	}
-	return (error);
-
-}
-
-static int
-nvram_write(struct cdev *dev, struct uio *uio, int flags)
-{
-	int nv_off;
-	u_char v;
-	int error = 0;
-
-	while (uio->uio_resid > 0 && error == 0) {
-		nv_off = uio->uio_offset + NVRAM_FIRST;
-		if (nv_off < NVRAM_FIRST || nv_off >= NVRAM_LAST)
-			return (0);	/* Signal EOF */
-		/* Single byte at a time */
-		error = uiomove(&v, 1, uio);
-		writertc(nv_off, v);
-	}
-	return (error);
-}
-
-static int
-nvram_modevent(module_t mod __unused, int type, void *data __unused)
-{
-	switch (type) {
-	case MOD_LOAD:
-		nvram_dev = make_dev(&nvram_cdevsw, 0,
-		    UID_ROOT, GID_KMEM, 0640, "nvram");
-		break;
-	case MOD_UNLOAD:
-	case MOD_SHUTDOWN:
-		destroy_dev(nvram_dev);
-		break;
-	default:
-		return (EOPNOTSUPP);
-	}
-	return (0);
-}
-DEV_MODULE(nvram, nvram_modevent, NULL);
-
 #endif /* DEV_ISA */

From owner-p4-projects@FreeBSD.ORG  Fri Oct 26 02:32:33 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1E13D16A468; Fri, 26 Oct 2007 02:32:33 +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 BAF8C16A417
	for ; Fri, 26 Oct 2007 02:32:32 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8D9C713C494
	for ; Fri, 26 Oct 2007 02:32:32 +0000 (UTC)
	(envelope-from peter@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 l9Q2WWKc049979
	for ; Fri, 26 Oct 2007 02:32:32 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9Q2WW2J049975
	for perforce@freebsd.org; Fri, 26 Oct 2007 02:32:32 GMT
	(envelope-from peter@freebsd.org)
Date: Fri, 26 Oct 2007 02:32:32 GMT
Message-Id: <200710260232.l9Q2WW2J049975@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128106 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 26 Oct 2007 02:32:33 -0000

http://perforce.freebsd.org/chv.cgi?CH=128106

Change 128106 by peter@peter_daintree on 2007/10/26 02:31:49

	nvram module.  Yay for 1-liner stub files.

Affected files ...

.. //depot/projects/hammer/sys/modules/nvram/Makefile#1 add

Differences ...

From owner-p4-projects@FreeBSD.ORG  Fri Oct 26 07:53:36 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AB39916A469; Fri, 26 Oct 2007 07:53: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 57ABB16A420
	for ; Fri, 26 Oct 2007 07:53:36 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 428AB13C4B7
	for ; Fri, 26 Oct 2007 07:53:36 +0000 (UTC)
	(envelope-from peter@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 l9Q7ra3S085341
	for ; Fri, 26 Oct 2007 07:53:36 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9Q7rVl8085337
	for perforce@freebsd.org; Fri, 26 Oct 2007 07:53:31 GMT
	(envelope-from peter@freebsd.org)
Date: Fri, 26 Oct 2007 07:53:31 GMT
Message-Id: <200710260753.l9Q7rVl8085337@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128113 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 26 Oct 2007 07:53:36 -0000

http://perforce.freebsd.org/chv.cgi?CH=128113

Change 128113 by peter@peter_overcee on 2007/10/26 07:53:11

	IFC @128112 

Affected files ...

.. //depot/projects/hammer/ObsoleteFiles.inc#37 integrate
.. //depot/projects/hammer/UPDATING#109 integrate
.. //depot/projects/hammer/contrib/one-true-awk/FIXES#8 integrate
.. //depot/projects/hammer/contrib/one-true-awk/FREEBSD-upgrade#8 integrate
.. //depot/projects/hammer/contrib/one-true-awk/lib.c#6 integrate
.. //depot/projects/hammer/contrib/one-true-awk/tran.c#4 integrate
.. //depot/projects/hammer/etc/rc.d/Makefile#57 integrate
.. //depot/projects/hammer/etc/rc.d/amd#14 integrate
.. //depot/projects/hammer/etc/rc.d/nfslocking#11 delete
.. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#37 integrate
.. //depot/projects/hammer/lib/libstand/Makefile#19 integrate
.. //depot/projects/hammer/sbin/gpt/Makefile#7 integrate
.. //depot/projects/hammer/sbin/gpt/add.c#13 integrate
.. //depot/projects/hammer/sbin/gpt/boot.c#1 branch
.. //depot/projects/hammer/sbin/gpt/gpt.8#14 integrate
.. //depot/projects/hammer/sbin/gpt/gpt.c#12 integrate
.. //depot/projects/hammer/sbin/gpt/gpt.h#10 integrate
.. //depot/projects/hammer/sbin/gpt/show.c#10 integrate
.. //depot/projects/hammer/share/misc/committers-src.dot#6 integrate
.. //depot/projects/hammer/sys/amd64/amd64/msi.c#5 integrate
.. //depot/projects/hammer/sys/amd64/conf/DEFAULTS#8 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#99 integrate
.. //depot/projects/hammer/sys/amd64/include/clock.h#25 integrate
.. //depot/projects/hammer/sys/amd64/isa/clock.c#66 integrate
.. //depot/projects/hammer/sys/arm/at91/at91rm92reg.h#6 integrate
.. //depot/projects/hammer/sys/arm/at91/if_ate.c#9 integrate
.. //depot/projects/hammer/sys/arm/at91/kb920x_machdep.c#9 integrate
.. //depot/projects/hammer/sys/arm/at91/std.at91#3 integrate
.. //depot/projects/hammer/sys/arm/at91/std.kb920x#3 integrate
.. //depot/projects/hammer/sys/arm/at91/uart_cpu_at91rm9200usart.c#5 integrate
.. //depot/projects/hammer/sys/boot/arm/at91/libat91/eeprom.c#3 integrate
.. //depot/projects/hammer/sys/boot/arm/at91/libat91/emac.c#5 integrate
.. //depot/projects/hammer/sys/boot/arm/at91/libat91/emac_init.c#2 integrate
.. //depot/projects/hammer/sys/boot/arm/at91/libat91/lib.h#3 integrate
.. //depot/projects/hammer/sys/boot/common/ufsread.c#7 integrate
.. //depot/projects/hammer/sys/boot/i386/Makefile#7 integrate
.. //depot/projects/hammer/sys/boot/i386/boot2/boot2.c#20 integrate
.. //depot/projects/hammer/sys/boot/i386/gptboot/Makefile#1 branch
.. //depot/projects/hammer/sys/boot/i386/gptboot/gptboot.c#1 branch
.. //depot/projects/hammer/sys/boot/i386/gptboot/gptldr.S#1 branch
.. //depot/projects/hammer/sys/boot/i386/libi386/bioscd.c#7 integrate
.. //depot/projects/hammer/sys/boot/i386/libi386/biosdisk.c#13 integrate
.. //depot/projects/hammer/sys/boot/i386/libi386/devicename.c#5 integrate
.. //depot/projects/hammer/sys/boot/i386/loader/main.c#15 integrate
.. //depot/projects/hammer/sys/boot/i386/pmbr/Makefile#1 branch
.. //depot/projects/hammer/sys/boot/i386/pmbr/pmbr.s#1 branch
.. //depot/projects/hammer/sys/boot/pc98/boot2/boot.c#10 integrate
.. //depot/projects/hammer/sys/boot/pc98/libpc98/bioscd.c#3 integrate
.. //depot/projects/hammer/sys/boot/pc98/libpc98/biosdisk.c#11 integrate
.. //depot/projects/hammer/sys/boot/pc98/loader/main.c#10 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_file.c#24 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_getcwd.c#16 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_misc.c#43 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_fcntl.c#12 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_misc.c#29 integrate
.. //depot/projects/hammer/sys/conf/files#161 integrate
.. //depot/projects/hammer/sys/conf/files.amd64#97 integrate
.. //depot/projects/hammer/sys/conf/files.arm#10 integrate
.. //depot/projects/hammer/sys/conf/files.i386#83 integrate
.. //depot/projects/hammer/sys/conf/files.ia64#40 integrate
.. //depot/projects/hammer/sys/conf/files.powerpc#24 integrate
.. //depot/projects/hammer/sys/conf/files.sun4v#4 integrate
.. //depot/projects/hammer/sys/conf/options.arm#12 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf.c#33 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf_if.c#10 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf_table.c#7 integrate
.. //depot/projects/hammer/sys/dev/acpi_support/acpi_ibm.c#12 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#41 integrate
.. //depot/projects/hammer/sys/dev/pci/pci_user.c#14 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_devs.c#18 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#53 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/denode.h#14 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_fat.c#11 integrate
.. //depot/projects/hammer/sys/fs/unionfs/union_subr.c#24 integrate
.. //depot/projects/hammer/sys/geom/geom_io.c#41 integrate
.. //depot/projects/hammer/sys/geom/part/g_part.c#7 integrate
.. //depot/projects/hammer/sys/geom/part/g_part.h#5 integrate
.. //depot/projects/hammer/sys/geom/part/g_part_gpt.c#5 integrate
.. //depot/projects/hammer/sys/i386/conf/DEFAULTS#8 integrate
.. //depot/projects/hammer/sys/i386/conf/GENERIC#57 integrate
.. //depot/projects/hammer/sys/i386/conf/PAE#23 integrate
.. //depot/projects/hammer/sys/i386/i386/msi.c#5 integrate
.. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_misc.c#18 integrate
.. //depot/projects/hammer/sys/i386/include/bootinfo.h#3 integrate
.. //depot/projects/hammer/sys/i386/include/clock.h#15 integrate
.. //depot/projects/hammer/sys/i386/isa/clock.c#40 integrate
.. //depot/projects/hammer/sys/kern/init_main.c#47 integrate
.. //depot/projects/hammer/sys/kern/kern_acct.c#31 integrate
.. //depot/projects/hammer/sys/kern/kern_alq.c#16 integrate
.. //depot/projects/hammer/sys/kern/kern_environment.c#18 integrate
.. //depot/projects/hammer/sys/kern/kern_exec.c#72 integrate
.. //depot/projects/hammer/sys/kern/kern_exit.c#68 integrate
.. //depot/projects/hammer/sys/kern/kern_fork.c#65 integrate
.. //depot/projects/hammer/sys/kern/kern_jail.c#25 integrate
.. //depot/projects/hammer/sys/kern/kern_ktrace.c#33 integrate
.. //depot/projects/hammer/sys/kern/kern_linker.c#30 integrate
.. //depot/projects/hammer/sys/kern/kern_mbuf.c#25 integrate
.. //depot/projects/hammer/sys/kern/kern_prot.c#31 integrate
.. //depot/projects/hammer/sys/kern/kern_shutdown.c#46 integrate
.. //depot/projects/hammer/sys/kern/kern_sig.c#82 integrate
.. //depot/projects/hammer/sys/kern/kern_sysctl.c#33 integrate
.. //depot/projects/hammer/sys/kern/link_elf.c#29 integrate
.. //depot/projects/hammer/sys/kern/link_elf_obj.c#53 integrate
.. //depot/projects/hammer/sys/kern/sys_pipe.c#35 integrate
.. //depot/projects/hammer/sys/kern/sys_socket.c#21 integrate
.. //depot/projects/hammer/sys/kern/sysv_msg.c#19 integrate
.. //depot/projects/hammer/sys/kern/sysv_sem.c#28 integrate
.. //depot/projects/hammer/sys/kern/sysv_shm.c#28 integrate
.. //depot/projects/hammer/sys/kern/uipc_mbuf2.c#18 integrate
.. //depot/projects/hammer/sys/kern/uipc_sem.c#18 integrate
.. //depot/projects/hammer/sys/kern/uipc_socket.c#76 integrate
.. //depot/projects/hammer/sys/kern/uipc_syscalls.c#66 integrate
.. //depot/projects/hammer/sys/kern/uipc_usrreq.c#52 integrate
.. //depot/projects/hammer/sys/kern/vfs_acl.c#2 integrate
.. //depot/projects/hammer/sys/kern/vfs_extattr.c#2 integrate
.. //depot/projects/hammer/sys/kern/vfs_lookup.c#29 integrate
.. //depot/projects/hammer/sys/kern/vfs_mount.c#82 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#117 integrate
.. //depot/projects/hammer/sys/kern/vfs_syscalls.c#74 integrate
.. //depot/projects/hammer/sys/kern/vfs_vnops.c#49 integrate
.. //depot/projects/hammer/sys/modules/Makefile#116 integrate
.. //depot/projects/hammer/sys/net/bpf.c#53 integrate
.. //depot/projects/hammer/sys/net/bsd_comp.c#8 integrate
.. //depot/projects/hammer/sys/net/if.c#71 integrate
.. //depot/projects/hammer/sys/net/if_atmsubr.c#21 integrate
.. //depot/projects/hammer/sys/net/if_ethersubr.c#68 integrate
.. //depot/projects/hammer/sys/net/if_fddisubr.c#22 integrate
.. //depot/projects/hammer/sys/net/if_fwsubr.c#19 integrate
.. //depot/projects/hammer/sys/net/if_gif.c#28 integrate
.. //depot/projects/hammer/sys/net/if_iso88025subr.c#20 integrate
.. //depot/projects/hammer/sys/net/if_ppp.c#31 integrate
.. //depot/projects/hammer/sys/net/if_stf.c#28 integrate
.. //depot/projects/hammer/sys/net/if_tun.c#32 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_scan.c#4 integrate
.. //depot/projects/hammer/sys/netatalk/ddp_input.c#14 integrate
.. //depot/projects/hammer/sys/netatalk/ddp_output.c#14 integrate
.. //depot/projects/hammer/sys/netinet/in_pcb.c#51 integrate
.. //depot/projects/hammer/sys/netinet/ip_divert.c#40 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw2.c#88 integrate
.. //depot/projects/hammer/sys/netinet/ip_icmp.c#37 integrate
.. //depot/projects/hammer/sys/netinet/ip_input.c#69 integrate
.. //depot/projects/hammer/sys/netinet/ip_options.c#5 integrate
.. //depot/projects/hammer/sys/netinet/ip_output.c#66 integrate
.. //depot/projects/hammer/sys/netinet/raw_ip.c#50 integrate
.. //depot/projects/hammer/sys/netinet/tcp_input.c#81 integrate
.. //depot/projects/hammer/sys/netinet/tcp_output.c#45 integrate
.. //depot/projects/hammer/sys/netinet/tcp_subr.c#77 integrate
.. //depot/projects/hammer/sys/netinet/tcp_syncache.c#51 integrate
.. //depot/projects/hammer/sys/netinet/tcp_timewait.c#3 integrate
.. //depot/projects/hammer/sys/netinet/udp_usrreq.c#52 integrate
.. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#32 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs_srvsock.c#23 integrate
.. //depot/projects/hammer/sys/security/audit/audit.c#10 integrate
.. //depot/projects/hammer/sys/security/audit/audit.h#9 integrate
.. //depot/projects/hammer/sys/security/audit/audit_bsm.c#10 integrate
.. //depot/projects/hammer/sys/security/audit/audit_syscalls.c#10 integrate
.. //depot/projects/hammer/sys/security/mac/mac_audit.c#3 integrate
.. //depot/projects/hammer/sys/security/mac/mac_framework.h#7 integrate
.. //depot/projects/hammer/sys/security/mac/mac_inet.c#5 integrate
.. //depot/projects/hammer/sys/security/mac/mac_internal.h#12 integrate
.. //depot/projects/hammer/sys/security/mac/mac_net.c#15 integrate
.. //depot/projects/hammer/sys/security/mac/mac_pipe.c#9 integrate
.. //depot/projects/hammer/sys/security/mac/mac_policy.h#8 integrate
.. //depot/projects/hammer/sys/security/mac/mac_posix_sem.c#5 integrate
.. //depot/projects/hammer/sys/security/mac/mac_process.c#12 integrate
.. //depot/projects/hammer/sys/security/mac/mac_socket.c#7 integrate
.. //depot/projects/hammer/sys/security/mac/mac_syscalls.c#4 integrate
.. //depot/projects/hammer/sys/security/mac/mac_system.c#9 integrate
.. //depot/projects/hammer/sys/security/mac/mac_sysv_msg.c#5 integrate
.. //depot/projects/hammer/sys/security/mac/mac_sysv_sem.c#5 integrate
.. //depot/projects/hammer/sys/security/mac/mac_sysv_shm.c#4 integrate
.. //depot/projects/hammer/sys/security/mac/mac_vfs.c#15 integrate
.. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#44 integrate
.. //depot/projects/hammer/sys/security/mac_bsdextended/mac_bsdextended.c#27 integrate
.. //depot/projects/hammer/sys/security/mac_ifoff/mac_ifoff.c#13 integrate
.. //depot/projects/hammer/sys/security/mac_lomac/mac_lomac.c#32 integrate
.. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#42 integrate
.. //depot/projects/hammer/sys/security/mac_none/mac_none.c#15 integrate
.. //depot/projects/hammer/sys/security/mac_partition/mac_partition.c#13 integrate
.. //depot/projects/hammer/sys/security/mac_portacl/mac_portacl.c#13 integrate
.. //depot/projects/hammer/sys/security/mac_seeotheruids/mac_seeotheruids.c#13 integrate
.. //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#26 integrate
.. //depot/projects/hammer/sys/security/mac_test/mac_test.c#44 integrate
.. //depot/projects/hammer/sys/sys/gpt.h#8 integrate
.. //depot/projects/hammer/sys/sys/param.h#95 integrate
.. //depot/projects/hammer/sys/sys/pciio.h#3 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#68 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#49 integrate
.. //depot/projects/hammer/sys/vm/swap_pager.c#54 integrate
.. //depot/projects/hammer/sys/vm/vm_mmap.c#48 integrate
.. //depot/projects/hammer/usr.bin/awk/Makefile#6 integrate
.. //depot/projects/hammer/usr.bin/awk/lib.c.diff#3 delete
.. //depot/projects/hammer/usr.bin/awk/tran.c.diff#2 delete
.. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#57 integrate
.. //depot/projects/hammer/usr.sbin/traceroute6/traceroute6.c#11 integrate

Differences ...

==== //depot/projects/hammer/ObsoleteFiles.inc#37 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.114 2007/10/22 12:31:23 ru Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.115 2007/10/25 18:10:05 mtm Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,8 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd
+OLD_FILES+=etc/rc.d/nfslocking
 # 20070930: rename of cached to nscd
 OLD_FILES+=etc/rc.d/cached
 OLD_FILES+=usr/sbin/cached

==== //depot/projects/hammer/UPDATING#109 (text+ko) ====

@@ -21,6 +21,19 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20071024:
+	It has been decided that it is desirable to provide ABI
+	backwards compatibility to the FreeBSD 4/5/6 versions of the
+	PCIOCGETCONF, PCIOCREAD and PCIOCWRITE IOCTLs, which was
+	broken with the introduction of PCI domain support (see the
+	20070930 entry). Unfortunately, this required the ABI of
+	PCIOCGETCONF to be broken again in order to be able to
+	provide backwards compatibility to the old version of that
+	IOCTL. Thus consumers of PCIOCGETCONF have to be recompiled
+	again. As for prominent ports this affects neither pciutils
+	nor xorg-server this time, the hal port needs to be rebuilt
+	however.
+
 20071020:
 	The misnamed kthread_create() and friends have been renamed
 	to kproc_create() etc. Many of the callers already
@@ -921,4 +934,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.510 2007/10/21 04:27:07 julian Exp $
+$FreeBSD: src/UPDATING,v 1.511 2007/10/24 20:51:43 marius Exp $

==== //depot/projects/hammer/contrib/one-true-awk/FIXES#8 (text+ko) ====

@@ -25,6 +25,14 @@
 This file lists all bug fixes, changes, etc., made since the AWK book
 was sent to the printers in August, 1987.
 
+Oct 23, 2007:
+	minor fix in lib.c: increase inputFS to 100, change malloc
+	for fields to n+1.  
+
+	fixed memory fault caused by out of order test in setsval.
+
+	thanks to david o'brien, freebsd, for both fixes.
+
 May 1, 2007:
 	fiddle in makefile to fix for BSD make; thanks to igor sobrado.
 

==== //depot/projects/hammer/contrib/one-true-awk/FREEBSD-upgrade#8 (text+ko) ====

@@ -1,12 +1,12 @@
-# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.10 2007/06/05 15:34:40 rafan Exp $
+# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.11 2007/10/25 12:38:34 obrien Exp $
 
 Import of the 2005/04/24 version of the "one true awk", as described
 in "The AWK Programming Language", by Al Aho, Brian Kernighan, and
 Peter Weinberger (Addison-Wesley, 1988, ISBN 0-201-07981-X).
 
-Original sources were taken from the Brian Kernighan's home page
-(http://cm.bell-labs.com/who/bwk/) and include bug fixes up thru
-May 01, 2007.
+Original sources were taken from the Brian Kernighan's AWK page
+http://www.cs.princeton.edu/~bwk/btl.mirror
+and include bug fixes up thru Oct 23, 2007.
 
 The following files were removed for this import:
 
@@ -21,4 +21,4 @@
 
 The vendor import was done by:
 
-	cvs import src/contrib/one-true-awk BELL_LABS bwk_20070501
+	cvs import src/contrib/one-true-awk BELL_LABS bwk_20071023

==== //depot/projects/hammer/contrib/one-true-awk/lib.c#6 (text+ko) ====

@@ -40,7 +40,7 @@
 int	fieldssize = RECSIZE;
 
 Cell	**fldtab;	/* pointers to Cells */
-char	inputFS[10] = " ";
+char	inputFS[100] = " ";
 
 #define	MAXFLD	2
 int	nfields	= MAXFLD;	/* last allocated slot for $i */
@@ -58,7 +58,7 @@
 void recinit(unsigned int n)
 {
 	if ( (record = (char *) malloc(n)) == NULL
-	  || (fields = (char *) malloc(n)) == NULL
+	  || (fields = (char *) malloc(n+1)) == NULL
 	  || (fldtab = (Cell **) malloc((nfields+1) * sizeof(Cell *))) == NULL
 	  || (fldtab[0] = (Cell *) malloc(sizeof(Cell))) == NULL )
 		FATAL("out of space for $0 and fields");

==== //depot/projects/hammer/contrib/one-true-awk/tran.c#4 (text+ko) ====

@@ -332,10 +332,10 @@
 		donerec = 1;
 	}
 	t = tostring(s);	/* in case it's self-assign */
+	if (freeable(vp))
+		xfree(vp->sval);
 	vp->tval &= ~NUM;
 	vp->tval |= STR;
-	if (freeable(vp))
-		xfree(vp->sval);
 	vp->tval &= ~DONTFREE;
 	   dprintf( ("setsval %p: %s = \"%s (%p) \", t=%o r,f=%d,%d\n", 
 		vp, NN(vp->nval), t,t, vp->tval, donerec, donefld) );

==== //depot/projects/hammer/etc/rc.d/Makefile#57 (text+ko) ====

@@ -1,5 +1,5 @@
 # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.86 2007/10/15 20:00:18 netchild Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.87 2007/10/25 18:10:05 mtm Exp $
 
 .include 
 
@@ -25,7 +25,7 @@
 	mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \
 	named natd netif netoptions \
 	network_ipv6 newsyslog nfsclient nfsd \
-	nfslocking nfsserver nisdomain nsswitch ntpd ntpdate \
+	nfsserver nisdomain nsswitch ntpd ntpdate \
 	othermta \
 	pf pflog pfsync \
 	powerd power_profile ppp pppoed pwcheck \

==== //depot/projects/hammer/etc/rc.d/amd#14 (text+ko) ====

@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $
-# $FreeBSD: src/etc/rc.d/amd,v 1.19 2007/10/19 22:55:42 mtm Exp $
+# $FreeBSD: src/etc/rc.d/amd,v 1.20 2007/10/25 16:59:06 mtm Exp $
 #
 
 # PROVIDE: amd
@@ -47,7 +47,7 @@
 		;;
 	*)
 		rc_flags="-p ${rc_flags}"
-		command_args=" > /var/run/amd.pid 2> /dev/null"
+		command_args="> /var/run/amd.pid 2> /dev/null"
 		;;
 	esac
 	return 0

==== //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#37 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.61 2007/08/18 21:53:25 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.62 2007/10/24 04:01:31 kientzle Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include 
@@ -164,6 +164,7 @@
 	struct sparse_block	*sparse_last;
 	int64_t			 sparse_offset;
 	int64_t			 sparse_numbytes;
+	int64_t			 sparse_realsize;
 	int			 sparse_gnu_major;
 	int			 sparse_gnu_minor;
 	char			 sparse_gnu_pending;
@@ -440,6 +441,7 @@
 		free(sp);
 	}
 	tar->sparse_last = NULL;
+	tar->sparse_realsize = -1; /* Mark this as "unset" */
 
 	r = tar_read_header(a, tar, entry);
 
@@ -1388,9 +1390,10 @@
 		}
 		if (wcscmp(key, L"GNU.sparse.name") == 0)
 			archive_entry_copy_pathname_w(entry, value);
-		if (wcscmp(key, L"GNU.sparse.realsize") == 0)
-			archive_entry_set_size(entry,
-			    tar_atol10(value, wcslen(value)));
+		if (wcscmp(key, L"GNU.sparse.realsize") == 0) {
+			tar->sparse_realsize = tar_atol10(value, wcslen(value));
+			archive_entry_set_size(entry, tar->sparse_realsize);
+		}
 		break;
 	case 'L':
 		/* Our extensions */
@@ -1471,11 +1474,22 @@
 		/* POSIX has reserved 'security.*' */
 		/* Someday: if (wcscmp(key, L"security.acl")==0) { ... } */
 		if (wcscmp(key, L"size")==0) {
-			tar->entry_bytes_remaining = tar_atol10(value, wcslen(value));
-			archive_entry_set_size(entry, tar->entry_bytes_remaining);
+			/* "size" is the size of the data in the entry. */
+			tar->entry_bytes_remaining
+			    = tar_atol10(value, wcslen(value));
+			/*
+			 * But, "size" is not necessarily the size of
+			 * the file on disk; if this is a sparse file,
+			 * the disk size may have already been set from
+			 * GNU.sparse.realsize.
+			 */
+			if (tar->sparse_realsize < 0) {
+				archive_entry_set_size(entry,
+				    tar->entry_bytes_remaining);
+				tar->sparse_realsize
+				    = tar->entry_bytes_remaining;
+			}
 		}
-		tar->entry_bytes_remaining = 0;
-
 		break;
 	case 'u':
 		if (wcscmp(key, L"uid")==0)

==== //depot/projects/hammer/lib/libstand/Makefile#19 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libstand/Makefile,v 1.58 2007/10/15 14:20:24 nyan Exp $
+# $FreeBSD: src/lib/libstand/Makefile,v 1.59 2007/10/24 21:32:57 jhb Exp $
 # Originally from	$NetBSD: Makefile,v 1.21 1997/10/26 22:08:38 lukem Exp $
 #
 # Notes:
@@ -72,6 +72,10 @@
 SRCS+=	syncicache.c
 .endif
 
+# uuid functions from libc
+.PATH: ${.CURDIR}/../libc/uuid
+SRCS+= uuid_equal.c uuid_is_nil.c
+
 # _setjmp/_longjmp
 .if ${MACHINE_ARCH} == "amd64"
 .PATH: ${.CURDIR}/i386

==== //depot/projects/hammer/sbin/gpt/Makefile#7 (text+ko) ====

@@ -1,8 +1,8 @@
-# $FreeBSD: src/sbin/gpt/Makefile,v 1.7 2005/09/01 02:49:20 marcel Exp $
+# $FreeBSD: src/sbin/gpt/Makefile,v 1.8 2007/10/24 21:32:57 jhb Exp $
 
 PROG=	gpt
-SRCS=	add.c create.c destroy.c gpt.c label.c map.c migrate.c recover.c \
-	remove.c show.c
+SRCS=	add.c boot.c create.c destroy.c gpt.c label.c map.c migrate.c \
+	recover.c remove.c show.c
 WARNS?=	4
 MAN=	gpt.8
 

==== //depot/projects/hammer/sbin/gpt/add.c#13 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.15 2006/10/04 18:20:25 marcel Exp $");
+__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.16 2007/10/24 21:32:57 jhb Exp $");
 
 #include 
 
@@ -39,9 +39,9 @@
 #include "map.h"
 #include "gpt.h"
 
-static uuid_t type;
-static off_t block, size;
-static unsigned int entry;
+static uuid_t add_type;
+static off_t add_block, add_size;
+static unsigned int add_entry;
 
 static void
 usage_add(void)
@@ -53,8 +53,8 @@
 	exit(1);
 }
 
-static void
-add(int fd)
+map_t *
+gpt_add_part(int fd, uuid_t type, off_t start, off_t size, unsigned int *entry)
 {
 	map_t *gpt, *tpg;
 	map_t *tbl, *lbt;
@@ -67,38 +67,38 @@
 	if (gpt == NULL) {
 		warnx("%s: error: no primary GPT header; run create or recover",
 		    device_name);
-		return;
+		return (NULL);
 	}
 
 	tpg = map_find(MAP_TYPE_SEC_GPT_HDR);
 	if (tpg == NULL) {
 		warnx("%s: error: no secondary GPT header; run recover",
 		    device_name);
-		return;
+		return (NULL);
 	}
 
 	tbl = map_find(MAP_TYPE_PRI_GPT_TBL);
 	lbt = map_find(MAP_TYPE_SEC_GPT_TBL);
 	if (tbl == NULL || lbt == NULL) {
 		warnx("%s: error: run recover -- trust me", device_name);
-		return;
+		return (NULL);
 	}
 
 	hdr = gpt->map_data;
-	if (entry > le32toh(hdr->hdr_entries)) {
+	if (*entry > le32toh(hdr->hdr_entries)) {
 		warnx("%s: error: index %u out of range (%u max)", device_name,
-		    entry, le32toh(hdr->hdr_entries));
-		return;
+		    *entry, le32toh(hdr->hdr_entries));
+		return (NULL);
 	}
 
-	if (entry > 0) {
-		i = entry - 1;
+	if (*entry > 0) {
+		i = *entry - 1;
 		ent = (void*)((char*)tbl->map_data + i *
 		    le32toh(hdr->hdr_entsz));
 		if (!uuid_is_nil(&ent->ent_type, NULL)) {
 			warnx("%s: error: entry at index %u is not free",
-			    device_name, entry);
-			return;
+			    device_name, *entry);
+			return (NULL);
 		}
 	} else {
 		/* Find empty slot in GPT table. */
@@ -111,14 +111,14 @@
 		if (i == le32toh(hdr->hdr_entries)) {
 			warnx("%s: error: no available table entries",
 			    device_name);
-			return;
+			return (NULL);
 		}
 	}
 
-	map = map_alloc(block, size);
+	map = map_alloc(start, size);
 	if (map == NULL) {
 		warnx("%s: error: no space available on device", device_name);
-		return;
+		return (NULL);
 	}
 
 	le_uuid_enc(&ent->ent_type, &type);
@@ -148,7 +148,19 @@
 	gpt_write(fd, lbt);
 	gpt_write(fd, tpg);
 
-	printf("%sp%u added\n", device_name, i + 1);
+	*entry = i + 1;
+
+	return (map);
+}
+
+static void
+add(int fd)
+{
+
+	if (gpt_add_part(fd, add_type, add_block, add_size, &add_entry) != 0)
+		return;
+
+	printf("%sp%u added\n", device_name, add_entry);
 }
 
 int
@@ -161,30 +173,30 @@
 	while ((ch = getopt(argc, argv, "b:i:s:t:")) != -1) {
 		switch(ch) {
 		case 'b':
-			if (block > 0)
+			if (add_block > 0)
 				usage_add();
-			block = strtoll(optarg, &p, 10);
-			if (*p != 0 || block < 1)
+			add_block = strtoll(optarg, &p, 10);
+			if (*p != 0 || add_block < 1)
 				usage_add();
 			break;
 		case 'i':
-			if (entry > 0)
+			if (add_entry > 0)
 				usage_add();
-			entry = strtol(optarg, &p, 10);
-			if (*p != 0 || entry < 1)
+			add_entry = strtol(optarg, &p, 10);
+			if (*p != 0 || add_entry < 1)
 				usage_add();
 			break;
 		case 's':
-			if (size > 0)
+			if (add_size > 0)
 				usage_add();
-			size = strtoll(optarg, &p, 10);
-			if (*p != 0 || size < 1)
+			add_size = strtoll(optarg, &p, 10);
+			if (*p != 0 || add_size < 1)
 				usage_add();
 			break;
 		case 't':
-			if (!uuid_is_nil(&type, NULL))
+			if (!uuid_is_nil(&add_type, NULL))
 				usage_add();
-			if (parse_uuid(optarg, &type) != 0)
+			if (parse_uuid(optarg, &add_type) != 0)
 				usage_add();
 			break;
 		default:
@@ -196,9 +208,9 @@
 		usage_add();
 
 	/* Create UFS partitions by default. */
-	if (uuid_is_nil(&type, NULL)) {
+	if (uuid_is_nil(&add_type, NULL)) {
 		uuid_t ufs = GPT_ENT_TYPE_FREEBSD_UFS;
-		type = ufs;
+		add_type = ufs;
 	}
 
 	while (optind < argc) {

==== //depot/projects/hammer/sbin/gpt/gpt.8#14 (text+ko) ====

@@ -22,9 +22,9 @@
 .\" (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/sbin/gpt/gpt.8,v 1.17 2006/06/22 22:22:32 marcel Exp $
+.\" $FreeBSD: src/sbin/gpt/gpt.8,v 1.18 2007/10/24 21:32:57 jhb Exp $
 .\"
-.Dd June 22, 2006
+.Dd October 24, 2007
 .Os
 .Dt GPT 8
 .Sh NAME
@@ -130,10 +130,51 @@
 The type is given as an UUID, but
 .Nm
 accepts
-.Cm efi , swap , ufs , hfs , linux
+.Cm boot , efi , swap , ufs , hfs , linux
 and
 .Cm windows
 as aliases for the most commonly used partition types.
+.\" ==== boot ====
+.It Xo
+.Nm
+.Ic boot
+.Op Fl b Ar pmbr
+.Op Fl g Ar gptboot
+.Op Fl s Ar count
+.Ar device ...
+.Xc
+The
+.Ic boot
+command allows the user to make a GPT labeled disk bootable via the BIOS
+bootstrap on i386 and amd64 machines.
+By default,
+the
+.Pa /boot/pmbr
+boot loader is installed into the PMBR and the
+.Pa /boot/gptboot
+boot loader is installed into the first boot partition.
+If no boot partition exists and there is available space,
+a boot partition will be created.
+.Pp
+The
+.Fl b Ar pmbr
+option allows the user to specify an alternate path for the PMBR boot loader.
+.Pp
+The
+.Fl g Ar gptboot
+option allows the user to specify an alternate path for the GPT boot loader
+that is installed into the boot partition.
+.Pp
+The
+.Fl s Ar count
+option allows the user to specify the size in sectors of the boot partition
+if one does not already exist.
+A boot partition must be at least 16 kilobytes.
+By default,
+a size of 64 kilobytes is used.
+Note that the PMBR boot loader will load the entire boot partition into
+memory.
+As a result, the boot partition may not exceed 545 kilobytes.
 .\" ==== create ====
 .It Nm Ic create Oo Fl fp Oc Ar device ...
 The

==== //depot/projects/hammer/sbin/gpt/gpt.c#12 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.16 2006/07/07 02:44:23 marcel Exp $");
+__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.17 2007/10/24 21:32:57 jhb Exp $");
 
 #include 
 #include 
@@ -609,6 +609,7 @@
 	const char *name;
 } cmdsw[] = {
 	{ cmd_add, "add" },
+	{ cmd_boot, "boot" },
 	{ cmd_create, "create" },
 	{ cmd_destroy, "destroy" },
 	{ NULL, "help" },

==== //depot/projects/hammer/sbin/gpt/gpt.h#10 (text+ko) ====

@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sbin/gpt/gpt.h,v 1.11 2006/06/22 22:05:28 marcel Exp $
+ * $FreeBSD: src/sbin/gpt/gpt.h,v 1.12 2007/10/24 21:32:58 jhb Exp $
  */
 
 #ifndef _GPT_H_
@@ -67,6 +67,7 @@
 extern int readonly, verbose;
 
 uint32_t crc32(const void *, size_t);
+map_t	*gpt_add_part(int, uuid_t, off_t, off_t, unsigned int *);
 void	gpt_close(int);
 int	gpt_open(const char *);
 void*	gpt_read(int, off_t, size_t);
@@ -76,6 +77,7 @@
 void	utf8_to_utf16(const uint8_t *, uint16_t *, size_t);
 
 int	cmd_add(int, char *[]);
+int	cmd_boot(int, char *[]);
 int	cmd_create(int, char *[]);
 int	cmd_destroy(int, char *[]);
 int	cmd_label(int, char *[]);

==== //depot/projects/hammer/sbin/gpt/show.c#10 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sbin/gpt/show.c,v 1.14 2006/06/22 22:22:32 marcel Exp $");
+__FBSDID("$FreeBSD: src/sbin/gpt/show.c,v 1.15 2007/10/24 21:32:58 jhb Exp $");
 
 #include 
 
@@ -54,6 +54,7 @@
 static const char *
 friendly(uuid_t *t)
 {
+	static uuid_t boot = GPT_ENT_TYPE_FREEBSD_BOOT;
 	static uuid_t efi_slice = GPT_ENT_TYPE_EFI;
 	static uuid_t mslinux = GPT_ENT_TYPE_MS_BASIC_DATA;
 	static uuid_t freebsd = GPT_ENT_TYPE_FREEBSD;
@@ -71,6 +72,8 @@
 
 	if (uuid_equal(t, &efi_slice, NULL))
 		return ("EFI System");
+	if (uuid_equal(t, &boot, NULL))
+		return ("FreeBSD boot");
 	if (uuid_equal(t, &swap, NULL))
 		return ("FreeBSD swap");
 	if (uuid_equal(t, &ufs, NULL))

==== //depot/projects/hammer/share/misc/committers-src.dot#6 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/misc/committers-src.dot,v 1.66 2007/09/29 17:01:19 kaiw Exp $
+# $FreeBSD: src/share/misc/committers-src.dot,v 1.67 2007/10/25 19:32:48 lulf Exp $
 
 # This file is meant to list all FreeBSD src committers and describe the
 # mentor-mentee relationships between them.
@@ -113,6 +113,7 @@
 kmacy [label="Kip Macy\nkmacy@FreeBSD.org\n2005/06/01"]
 le [label="Lukas Ertl\nle@FreeBSD.org\n2004/02/02"]
 linimon [label="Mark Linimon\nlinimon@FreeBSD.org\n2006/09/30"]
+lulf [label="Ulf Lilleengen\nlulf@FreeBSD.org\n2007/10/24"]
 marks [label="Mark Santcroos\nmarks@FreeBSD.org\n2004/03/18"]
 markus [label="Markus Brueffer\nmarkus@FreeBSD.org\n2006/06/01"]
 matteo [label="Matteo Riondato\nmatteo@FreeBSD.org\n2006/01/18"]
@@ -292,6 +293,8 @@
 julian -> archie
 julian -> adrian
 
+kib -> lulf
+
 mdodd -> jake
 
 mlaier -> benjsc
@@ -322,6 +325,8 @@
 philip -> jls
 philip -> matteo
 
+pjd -> lulf
+
 ru -> ceri
 ru -> cjc
 ru -> eik

==== //depot/projects/hammer/sys/amd64/amd64/msi.c#5 (text+ko) ====

@@ -1,6 +1,7 @@
 /*-
- * Copyright (c) 2006 John Baldwin 
+ * Copyright (c) 2006 Yahoo!, Inc.
  * All rights reserved.
+ * Written by: John Baldwin 
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -34,7 +35,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.6 2007/05/08 21:29:13 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.7 2007/10/24 21:16:22 jhb Exp $");
 
 #include 
 #include 

==== //depot/projects/hammer/sys/amd64/conf/DEFAULTS#8 (text+ko) ====

@@ -1,7 +1,7 @@
 #
 # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64
 #
-# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.10 2007/06/11 00:38:05 marcel Exp $
+# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.11 2007/10/26 03:23:52 peter Exp $
 
 machine		amd64
 

==== //depot/projects/hammer/sys/amd64/conf/GENERIC#99 (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.485 2007/10/19 12:30:33 kensmith Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.487 2007/10/26 02:35:42 imp Exp $
 
 cpu		HAMMER
 ident		GENERIC
@@ -279,8 +279,19 @@
 device		umass		# Disks/Mass storage - Requires scbus and da
 device		ums		# Mouse
 device		ural		# Ralink Technology RT2500USB wireless NICs
+device		rum		# Ralink Technology RT2501USB wireless NICs
 device		urio		# Diamond Rio 500 MP3 player
 device		uscanner	# Scanners
+# USB Serial devices
+device		ucom		# Generic com ttys
+device		uark		# Technologies ARK3116 based serial adapters
+device		ubsa		# Belkin F5U103 and compatible serial adapters
+device		ubser		# BWCT console serial adapters
+device		uftdi		# For FTDI usb serial adapters
+device		uipaq		# Some WinCE based devices
+device		uplcom		# Prolific PL-2303 serial adapters
+device		uvisor		# Visor and Palm devices
+device		uvscom		# USB serial support for DDI pocket's PHS
 # USB Ethernet, requires miibus
 device		aue		# ADMtek USB Ethernet
 device		axe		# ASIX Electronics USB Ethernet
@@ -288,6 +299,7 @@
 device		cue		# CATC USB Ethernet
 device		kue		# Kawasaki LSI USB Ethernet
 device		rue		# RealTek RTL8150 USB Ethernet
+device		udav		# Davicom DM9601E USB
 
 # FireWire support
 device		firewire	# FireWire bus code

==== //depot/projects/hammer/sys/amd64/include/clock.h#25 (text+ko) ====

@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- * $FreeBSD: src/sys/amd64/include/clock.h,v 1.54 2007/01/23 08:01:19 bde Exp $
+ * $FreeBSD: src/sys/amd64/include/clock.h,v 1.55 2007/10/26 03:23:53 peter Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_

==== //depot/projects/hammer/sys/amd64/isa/clock.c#66 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.234 2007/09/14 01:12:39 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.235 2007/10/26 03:23:53 peter Exp $");
 
 /*
  * Routines to handle clock hardware.

==== //depot/projects/hammer/sys/arm/at91/at91rm92reg.h#6 (text) ====

@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD: src/sys/arm/at91/at91rm92reg.h,v 1.5 2007/07/31 17:43:18 imp Exp $ */
+/* $FreeBSD: src/sys/arm/at91/at91rm92reg.h,v 1.6 2007/10/25 23:02:42 cognet Exp $ */
 
 #ifndef AT91RM92REG_H_
 #define AT91RM92REG_H_
@@ -340,7 +340,9 @@
 #define AT91RM92_OHCI_PA_BASE	0x00300000
 #define AT91RM92_OHCI_SIZE	0x00100000
 
+#ifndef AT91C_MASTER_CLOCK
 #define AT91C_MASTER_CLOCK	60000000
+#endif
 
 /* SDRAMC */
 

==== //depot/projects/hammer/sys/arm/at91/if_ate.c#9 (text) ====

@@ -33,7 +33,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.20 2007/06/11 19:36:37 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.21 2007/10/24 23:12:19 cognet Exp $");
 
 #include 
 #include 
@@ -597,12 +597,12 @@
 	high =  RD4(sc, ETH_SA1H);
 	if ((low | (high & 0xffff)) == 0)
 		return (ENXIO);
-	eaddr[0] = (high >> 8) & 0xff;
-	eaddr[1] = high & 0xff;
-	eaddr[2] = (low >> 24) & 0xff;
-	eaddr[3] = (low >> 16) & 0xff;
-	eaddr[4] = (low >> 8) & 0xff;
-	eaddr[5] = low & 0xff;
+	eaddr[0] = low & 0xff;
+	eaddr[1] = (low >> 8) & 0xff;
+	eaddr[2] = (low >> 16) & 0xff;
+	eaddr[3] = (low >> 24) & 0xff;
+	eaddr[4] = high & 0xff;
+	eaddr[5] = (high >> 8) & 0xff;
 	return (0);
 }
 

==== //depot/projects/hammer/sys/arm/at91/kb920x_machdep.c#9 (text) ====

@@ -48,7 +48,7 @@
 #include "opt_at91.h"
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.23 2007/07/31 17:43:18 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.26 2007/10/25 22:43:17 cognet Exp $");
 
 #define _ARM32_BUS_DMA_PRIVATE
 #include 
@@ -283,10 +283,10 @@
 	i += 2;
 	fake_preload[i++] = MODINFO_ADDR;
 	fake_preload[i++] = sizeof(vm_offset_t);

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Fri Oct 26 07:54:38 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A90D116A421; Fri, 26 Oct 2007 07:54: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 6EC1916A41B
	for ; Fri, 26 Oct 2007 07:54:38 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5B12113C4A7
	for ; Fri, 26 Oct 2007 07:54:38 +0000 (UTC)
	(envelope-from peter@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 l9Q7scN4085382
	for ; Fri, 26 Oct 2007 07:54:38 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9Q7scr2085379
	for perforce@freebsd.org; Fri, 26 Oct 2007 07:54:38 GMT
	(envelope-from peter@freebsd.org)
Date: Fri, 26 Oct 2007 07:54:38 GMT
Message-Id: <200710260754.l9Q7scr2085379@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128114 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 26 Oct 2007 07:54:39 -0000

http://perforce.freebsd.org/chv.cgi?CH=128114

Change 128114 by peter@peter_overcee on 2007/10/26 07:54:30

	IFC @128112 

Affected files ...

.. //depot/projects/hammer/sys/dev/nvram/nvram.c#2 integrate
.. //depot/projects/hammer/sys/modules/nvram/Makefile#2 integrate

Differences ...

==== //depot/projects/hammer/sys/dev/nvram/nvram.c#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nvram/nvram.c,v 1.1 2007/10/26 03:23:53 peter Exp $
  */
 
 #include 

==== //depot/projects/hammer/sys/modules/nvram/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/nvram/Makefile,v 1.1 2007/10/26 03:23:54 peter Exp $
 
 .PATH: ${.CURDIR}/../../dev/nvram
 

From owner-p4-projects@FreeBSD.ORG  Fri Oct 26 14:50:05 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2FB8D16A468; Fri, 26 Oct 2007 14:50:05 +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 B8D0116A41B
	for ; Fri, 26 Oct 2007 14:50:04 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A628B13C49D
	for ; Fri, 26 Oct 2007 14:50:04 +0000 (UTC)
	(envelope-from imp@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 l9QEo4Lo035485
	for ; Fri, 26 Oct 2007 14:50:04 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9QEntv3035436
	for perforce@freebsd.org; Fri, 26 Oct 2007 14:49:55 GMT
	(envelope-from imp@freebsd.org)
Date: Fri, 26 Oct 2007 14:49:55 GMT
Message-Id: <200710261449.l9QEntv3035436@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128134 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 26 Oct 2007 14:50:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=128134

Change 128134 by imp@imp_paco-paco on 2007/10/26 14:49:26

	IFC @128108

Affected files ...

.. //depot/projects/arm/src/Makefile#12 integrate
.. //depot/projects/arm/src/ObsoleteFiles.inc#30 integrate
.. //depot/projects/arm/src/UPDATING#22 integrate
.. //depot/projects/arm/src/contrib/ipfilter/BSD/Makefile#4 integrate
.. //depot/projects/arm/src/contrib/ipfilter/BSD/kupgrade#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/HISTORY#4 integrate
.. //depot/projects/arm/src/contrib/ipfilter/Makefile#4 integrate
.. //depot/projects/arm/src/contrib/ipfilter/ip_fil.c#4 integrate
.. //depot/projects/arm/src/contrib/ipfilter/iplang/Makefile#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/ipsend/iptests.c#4 integrate
.. //depot/projects/arm/src/contrib/ipfilter/ipsend/sock.c#4 integrate
.. //depot/projects/arm/src/contrib/ipfilter/l4check/Makefile#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/l4check/l4check.c#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/lib/Makefile#4 integrate
.. //depot/projects/arm/src/contrib/ipfilter/lib/alist_new.c#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/lib/ipft_tx.c#4 integrate
.. //depot/projects/arm/src/contrib/ipfilter/lib/printnat.c#3 integrate
.. //depot/projects/arm/src/contrib/ipfilter/lib/printpacket.c#3 integrate
.. //depot/projects/arm/src/contrib/ipfilter/lib/printpool_live.c#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/lib/printstate.c#3 integrate
.. //depot/projects/arm/src/contrib/ipfilter/man/ippool.5#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/md5.h#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/radix.c#3 integrate
.. //depot/projects/arm/src/contrib/ipfilter/radix_ipf.h#3 integrate
.. //depot/projects/arm/src/contrib/ipfilter/test/Makefile#4 integrate
.. //depot/projects/arm/src/contrib/ipfilter/test/dotest#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/test/expected/Makefile#1 branch
.. //depot/projects/arm/src/contrib/ipfilter/test/expected/f11#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/test/expected/f24#1 branch
.. //depot/projects/arm/src/contrib/ipfilter/test/expected/i19.dist#1 branch
.. //depot/projects/arm/src/contrib/ipfilter/test/expected/i21#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/test/expected/in1#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/test/expected/in6#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/test/expected/ipv6.6#1 branch
.. //depot/projects/arm/src/contrib/ipfilter/test/expected/n16#1 branch
.. //depot/projects/arm/src/contrib/ipfilter/test/input/f11#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/test/input/f24#1 branch
.. //depot/projects/arm/src/contrib/ipfilter/test/input/ipv6.6#1 branch
.. //depot/projects/arm/src/contrib/ipfilter/test/input/l1#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/test/input/n16#1 branch
.. //depot/projects/arm/src/contrib/ipfilter/test/nattest#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/test/regress/f24#1 branch
.. //depot/projects/arm/src/contrib/ipfilter/test/regress/i21#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/test/regress/i3#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/test/regress/in1#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/test/regress/in6#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/test/regress/ipv6.6#1 branch
.. //depot/projects/arm/src/contrib/ipfilter/test/regress/n16#1 branch
.. //depot/projects/arm/src/contrib/ipfilter/test/test.format#4 integrate
.. //depot/projects/arm/src/contrib/ipfilter/tools/ipf_y.y#4 integrate
.. //depot/projects/arm/src/contrib/ipfilter/tools/ipfstat.c#5 integrate
.. //depot/projects/arm/src/contrib/ipfilter/tools/ipmon.c#4 integrate
.. //depot/projects/arm/src/contrib/ipfilter/tools/ipnat.c#3 integrate
.. //depot/projects/arm/src/contrib/ipfilter/tools/ipnat_y.y#4 integrate
.. //depot/projects/arm/src/contrib/ipfilter/tools/lexer.c#4 integrate
.. //depot/projects/arm/src/contrib/libpcap/pcap.h#4 integrate
.. //depot/projects/arm/src/contrib/one-true-awk/FIXES#3 integrate
.. //depot/projects/arm/src/contrib/one-true-awk/FREEBSD-upgrade#3 integrate
.. //depot/projects/arm/src/contrib/one-true-awk/lib.c#3 integrate
.. //depot/projects/arm/src/contrib/one-true-awk/tran.c#2 integrate
.. //depot/projects/arm/src/crypto/heimdal/appl/su/Makefile.am#2 integrate
.. //depot/projects/arm/src/crypto/heimdal/appl/su/su.c#2 integrate
.. //depot/projects/arm/src/crypto/openssl/ssl/d1_both.c#2 integrate
.. //depot/projects/arm/src/crypto/openssl/ssl/dtls1.h#2 integrate
.. //depot/projects/arm/src/crypto/openssl/ssl/ssl.h#5 integrate
.. //depot/projects/arm/src/crypto/openssl/ssl/ssl_err.c#4 integrate
.. //depot/projects/arm/src/etc/Makefile#7 integrate
.. //depot/projects/arm/src/etc/cached.conf#2 delete
.. //depot/projects/arm/src/etc/nscd.conf#2 integrate
.. //depot/projects/arm/src/etc/rc.d/Makefile#12 integrate
.. //depot/projects/arm/src/etc/rc.d/amd#3 integrate
.. //depot/projects/arm/src/etc/rc.d/kerberos#3 integrate
.. //depot/projects/arm/src/etc/rc.d/named#2 integrate
.. //depot/projects/arm/src/etc/rc.d/nfslocking#6 delete
.. //depot/projects/arm/src/etc/rc.d/ppp#5 integrate
.. //depot/projects/arm/src/games/fortune/datfiles/fortunes#15 integrate
.. //depot/projects/arm/src/games/fortune/datfiles/fortunes-o.real#4 integrate
.. //depot/projects/arm/src/games/fortune/datfiles/limerick#3 integrate
.. //depot/projects/arm/src/gnu/usr.bin/groff/tmac/mdoc.local#8 integrate
.. //depot/projects/arm/src/kerberos5/usr.bin/ksu/Makefile#2 integrate
.. //depot/projects/arm/src/lib/libarchive/archive_read_support_format_tar.c#14 integrate
.. //depot/projects/arm/src/lib/libbsm/Makefile#6 integrate
.. //depot/projects/arm/src/lib/libc/arm/Symbol.map#5 integrate
.. //depot/projects/arm/src/lib/libc/ia64/Symbol.map#4 integrate
.. //depot/projects/arm/src/lib/libc/locale/iswctype.c#4 integrate
.. //depot/projects/arm/src/lib/libc/powerpc/Symbol.map#5 integrate
.. //depot/projects/arm/src/lib/libc/stdlib/atoi.3#3 integrate
.. //depot/projects/arm/src/lib/libc/sys/kldstat.2#2 integrate
.. //depot/projects/arm/src/lib/libelf/elf.3#3 integrate
.. //depot/projects/arm/src/lib/libelf/elf_flagdata.3#2 integrate
.. //depot/projects/arm/src/lib/libelf/elf_getscn.3#2 integrate
.. //depot/projects/arm/src/lib/libelf/elf_update.3#4 integrate
.. //depot/projects/arm/src/lib/libelf/gelf_getphdr.3#3 integrate
.. //depot/projects/arm/src/lib/libelf/gelf_newehdr.3#3 integrate
.. //depot/projects/arm/src/lib/libelf/gelf_newphdr.3#2 integrate
.. //depot/projects/arm/src/lib/libpam/modules/pam_unix/Makefile#2 integrate
.. //depot/projects/arm/src/lib/libstand/Makefile#5 integrate
.. //depot/projects/arm/src/lib/libstand/tftp.c#2 integrate
.. //depot/projects/arm/src/lib/libthr/libthr.3#2 integrate
.. //depot/projects/arm/src/lib/ncurses/ncurses/Makefile#7 integrate
.. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#24 integrate
.. //depot/projects/arm/src/sbin/geom/class/part/geom_part.c#2 integrate
.. //depot/projects/arm/src/sbin/geom/class/part/gpart.8#2 integrate
.. //depot/projects/arm/src/sbin/gpt/Makefile#2 integrate
.. //depot/projects/arm/src/sbin/gpt/add.c#3 integrate
.. //depot/projects/arm/src/sbin/gpt/boot.c#1 branch
.. //depot/projects/arm/src/sbin/gpt/gpt.8#2 integrate
.. //depot/projects/arm/src/sbin/gpt/gpt.c#2 integrate
.. //depot/projects/arm/src/sbin/gpt/gpt.h#2 integrate
.. //depot/projects/arm/src/sbin/gpt/show.c#2 integrate
.. //depot/projects/arm/src/sbin/ipfw/ipfw.8#12 integrate
.. //depot/projects/arm/src/sbin/ipfw/ipfw2.c#13 integrate
.. //depot/projects/arm/src/sbin/kldstat/kldstat.c#2 integrate
.. //depot/projects/arm/src/sbin/mount/mount.8#6 integrate
.. //depot/projects/arm/src/share/man/man3/pthread.3#4 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_attr.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_attr_get_np.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_attr_setcreatesuspend_np.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_barrier_destroy.3#2 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_barrierattr.3#2 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_cancel.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_cleanup_pop.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_cleanup_push.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_cond_broadcast.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_cond_destroy.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_cond_init.3#4 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_cond_signal.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_cond_timedwait.3#4 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_cond_wait.3#4 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_condattr.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_create.3#5 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_detach.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_equal.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_exit.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_getconcurrency.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_getspecific.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_join.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_key_create.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_key_delete.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_kill.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_main_np.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_multi_np.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_mutex_destroy.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_mutex_init.3#4 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_mutex_lock.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_mutex_timedlock.3#2 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_mutex_trylock.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_mutex_unlock.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_mutexattr.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_mutexattr_getkind_np.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_once.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_resume_all_np.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_resume_np.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_rwlock_destroy.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_rwlock_init.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_rwlock_rdlock.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_rwlock_timedrdlock.3#2 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_rwlock_timedwrlock.3#2 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_rwlock_unlock.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_rwlock_wrlock.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_rwlockattr_destroy.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_rwlockattr_getpshared.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_rwlockattr_init.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_rwlockattr_setpshared.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_schedparam.3#4 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_self.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_set_name_np.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_setspecific.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_sigmask.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_spin_init.3#2 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_spin_lock.3#2 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_switch_add_np.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_testcancel.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_yield.3#2 integrate
.. //depot/projects/arm/src/share/man/man5/nsswitch.conf.5#3 integrate
.. //depot/projects/arm/src/share/man/man5/src.conf.5#12 integrate
.. //depot/projects/arm/src/share/man/man9/kproc.9#1 branch
.. //depot/projects/arm/src/share/man/man9/kthread.9#2 integrate
.. //depot/projects/arm/src/share/misc/committers-src.dot#8 integrate
.. //depot/projects/arm/src/share/mk/bsd.compat.mk#4 integrate
.. //depot/projects/arm/src/share/mk/bsd.lib.mk#9 integrate
.. //depot/projects/arm/src/share/mk/bsd.own.mk#16 integrate
.. //depot/projects/arm/src/share/mk/bsd.symver.mk#5 integrate
.. //depot/projects/arm/src/share/mk/version_gen.awk#5 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/msi.c#6 integrate
.. //depot/projects/arm/src/sys/amd64/conf/DEFAULTS#8 integrate
.. //depot/projects/arm/src/sys/amd64/conf/GENERIC#26 integrate
.. //depot/projects/arm/src/sys/amd64/include/clock.h#6 integrate
.. //depot/projects/arm/src/sys/amd64/isa/clock.c#15 integrate
.. //depot/projects/arm/src/sys/arm/arm/cpufunc.c#18 integrate
.. //depot/projects/arm/src/sys/arm/arm/identcpu.c#14 integrate
.. //depot/projects/arm/src/sys/arm/at91/at91_mcireg.h#8 integrate
.. //depot/projects/arm/src/sys/arm/at91/at91rm92reg.h#22 integrate
.. //depot/projects/arm/src/sys/arm/at91/if_ate.c#72 integrate
.. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#45 integrate
.. //depot/projects/arm/src/sys/arm/at91/std.at91#6 integrate
.. //depot/projects/arm/src/sys/arm/at91/std.kb920x#7 integrate
.. //depot/projects/arm/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#13 integrate
.. //depot/projects/arm/src/sys/arm/include/armreg.h#7 integrate
.. //depot/projects/arm/src/sys/arm/include/cpuconf.h#8 integrate
.. //depot/projects/arm/src/sys/arm/include/cpufunc.h#10 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/eeprom.c#10 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#45 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac_init.c#13 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib.h#23 integrate
.. //depot/projects/arm/src/sys/boot/common/ufsread.c#3 integrate
.. //depot/projects/arm/src/sys/boot/i386/Makefile#3 integrate
.. //depot/projects/arm/src/sys/boot/i386/boot2/boot2.c#4 integrate
.. //depot/projects/arm/src/sys/boot/i386/gptboot/Makefile#1 branch
.. //depot/projects/arm/src/sys/boot/i386/gptboot/gptboot.c#1 branch
.. //depot/projects/arm/src/sys/boot/i386/gptboot/gptldr.S#1 branch
.. //depot/projects/arm/src/sys/boot/i386/libi386/bioscd.c#4 integrate
.. //depot/projects/arm/src/sys/boot/i386/libi386/biosdisk.c#5 integrate
.. //depot/projects/arm/src/sys/boot/i386/libi386/devicename.c#4 integrate
.. //depot/projects/arm/src/sys/boot/i386/loader/main.c#9 integrate
.. //depot/projects/arm/src/sys/boot/i386/pmbr/Makefile#1 branch
.. //depot/projects/arm/src/sys/boot/i386/pmbr/pmbr.s#1 branch
.. //depot/projects/arm/src/sys/boot/pc98/boot2/boot.c#5 integrate
.. //depot/projects/arm/src/sys/boot/pc98/libpc98/bioscd.c#3 integrate
.. //depot/projects/arm/src/sys/boot/pc98/libpc98/biosdisk.c#5 integrate
.. //depot/projects/arm/src/sys/boot/pc98/loader/main.c#6 integrate
.. //depot/projects/arm/src/sys/cam/cam_xpt.c#23 integrate
.. //depot/projects/arm/src/sys/compat/linux/linux_file.c#14 integrate
.. //depot/projects/arm/src/sys/compat/linux/linux_getcwd.c#9 integrate
.. //depot/projects/arm/src/sys/compat/linux/linux_misc.c#28 integrate
.. //depot/projects/arm/src/sys/compat/ndis/subr_ntoskrnl.c#12 integrate
.. //depot/projects/arm/src/sys/compat/opensolaris/sys/proc.h#3 integrate
.. //depot/projects/arm/src/sys/compat/svr4/svr4_fcntl.c#6 integrate
.. //depot/projects/arm/src/sys/compat/svr4/svr4_misc.c#11 integrate
.. //depot/projects/arm/src/sys/conf/files#80 integrate
.. //depot/projects/arm/src/sys/conf/files.amd64#29 integrate
.. //depot/projects/arm/src/sys/conf/files.arm#9 integrate
.. //depot/projects/arm/src/sys/conf/files.i386#31 integrate
.. //depot/projects/arm/src/sys/conf/files.ia64#11 integrate
.. //depot/projects/arm/src/sys/conf/files.powerpc#17 integrate
.. //depot/projects/arm/src/sys/conf/files.sun4v#9 integrate
.. //depot/projects/arm/src/sys/conf/options.arm#24 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/fil.c#9 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_auth.c#7 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_compat.h#7 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_fil.h#7 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#6 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_frag.c#6 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_htable.c#4 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_log.c#7 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_lookup.c#4 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_lookup.h#4 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_nat.c#6 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_nat.h#5 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_pool.c#4 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_pool.h#4 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_proxy.c#6 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#4 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_scan.c#5 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_state.c#7 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_state.h#5 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_sync.c#5 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ipl.h#6 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#7 integrate
.. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#5 integrate
.. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate
.. //depot/projects/arm/src/sys/contrib/pf/net/pf.c#12 integrate
.. //depot/projects/arm/src/sys/contrib/pf/net/pf_if.c#5 integrate
.. //depot/projects/arm/src/sys/contrib/pf/net/pf_ioctl.c#10 integrate
.. //depot/projects/arm/src/sys/contrib/pf/net/pf_table.c#4 integrate
.. //depot/projects/arm/src/sys/dev/aac/aac.c#7 integrate
.. //depot/projects/arm/src/sys/dev/acpi_support/acpi_ibm.c#8 integrate
.. //depot/projects/arm/src/sys/dev/acpica/acpi_ec.c#12 integrate
.. //depot/projects/arm/src/sys/dev/acpica/acpi_thermal.c#8 integrate
.. //depot/projects/arm/src/sys/dev/aic7xxx/aic_osm_lib.c#4 integrate
.. //depot/projects/arm/src/sys/dev/aic7xxx/aic_osm_lib.h#3 integrate
.. //depot/projects/arm/src/sys/dev/ath/if_ath_pci.c#9 integrate
.. //depot/projects/arm/src/sys/dev/bktr/msp34xx.c#2 integrate
.. //depot/projects/arm/src/sys/dev/ciss/ciss.c#18 integrate
.. //depot/projects/arm/src/sys/dev/fdc/fdc.c#10 integrate
.. //depot/projects/arm/src/sys/dev/firewire/firewire.c#10 integrate
.. //depot/projects/arm/src/sys/dev/flash/at45d.c#14 integrate
.. //depot/projects/arm/src/sys/dev/hptmv/entry.c#10 integrate
.. //depot/projects/arm/src/sys/dev/hwpmc/hwpmc_logging.c#6 integrate
.. //depot/projects/arm/src/sys/dev/if_ndis/if_ndis.c#13 integrate
.. //depot/projects/arm/src/sys/dev/ipmi/ipmi_kcs.c#2 integrate
.. //depot/projects/arm/src/sys/dev/ipmi/ipmi_smic.c#2 integrate
.. //depot/projects/arm/src/sys/dev/ipmi/ipmi_ssif.c#3 integrate
.. //depot/projects/arm/src/sys/dev/iscsi/initiator/isc_sm.c#2 integrate
.. //depot/projects/arm/src/sys/dev/iscsi/initiator/isc_soc.c#2 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.c#33 integrate
.. //depot/projects/arm/src/sys/dev/iwi/if_iwi.c#20 integrate
.. //depot/projects/arm/src/sys/dev/md/md.c#10 integrate
.. //depot/projects/arm/src/sys/dev/mmc/mmcsd.c#14 integrate
.. //depot/projects/arm/src/sys/dev/mpt/mpt.h#29 integrate
.. //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#43 integrate
.. //depot/projects/arm/src/sys/dev/mpt/mpt_raid.c#13 integrate
.. //depot/projects/arm/src/sys/dev/nvram/nvram.c#1 branch
.. //depot/projects/arm/src/sys/dev/ofw/ofw_disk.c#3 integrate
.. //depot/projects/arm/src/sys/dev/pccbb/pccbb.c#19 integrate
.. //depot/projects/arm/src/sys/dev/pccbb/pccbb_pci.c#12 integrate
.. //depot/projects/arm/src/sys/dev/pci/pci_user.c#6 integrate
.. //depot/projects/arm/src/sys/dev/random/harvest.c#2 integrate
.. //depot/projects/arm/src/sys/dev/random/randomdev_soft.c#7 integrate
.. //depot/projects/arm/src/sys/dev/sound/midi/sequencer.c#10 integrate
.. //depot/projects/arm/src/sys/dev/sound/pci/hda/hdac.c#18 integrate
.. //depot/projects/arm/src/sys/dev/usb/if_zyd.c#3 integrate
.. //depot/projects/arm/src/sys/dev/usb/uchcom.c#1 branch
.. //depot/projects/arm/src/sys/dev/usb/uipaq.c#5 integrate
.. //depot/projects/arm/src/sys/dev/usb/usb.c#10 integrate
.. //depot/projects/arm/src/sys/dev/usb/usb_port.h#12 integrate
.. //depot/projects/arm/src/sys/dev/usb/usbdevs#39 integrate
.. //depot/projects/arm/src/sys/dev/utopia/utopia.c#4 integrate
.. //depot/projects/arm/src/sys/fs/devfs/devfs_devs.c#10 integrate
.. //depot/projects/arm/src/sys/fs/devfs/devfs_vnops.c#20 integrate
.. //depot/projects/arm/src/sys/fs/msdosfs/denode.h#8 integrate
.. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_denode.c#9 integrate
.. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_fat.c#7 integrate
.. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_lookup.c#6 integrate
.. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vfsops.c#22 integrate
.. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vnops.c#14 integrate
.. //depot/projects/arm/src/sys/fs/unionfs/union_subr.c#10 integrate
.. //depot/projects/arm/src/sys/geom/bde/g_bde.c#3 integrate
.. //depot/projects/arm/src/sys/geom/bde/g_bde_work.c#5 integrate
.. //depot/projects/arm/src/sys/geom/eli/g_eli.c#20 integrate
.. //depot/projects/arm/src/sys/geom/journal/g_journal.c#6 integrate
.. //depot/projects/arm/src/sys/geom/mirror/g_mirror.c#21 integrate
.. //depot/projects/arm/src/sys/geom/multipath/g_multipath.c#2 integrate
.. //depot/projects/arm/src/sys/geom/part/g_part.c#7 integrate
.. //depot/projects/arm/src/sys/geom/part/g_part.h#4 integrate
.. //depot/projects/arm/src/sys/geom/part/g_part_apm.c#4 integrate
.. //depot/projects/arm/src/sys/geom/part/g_part_gpt.c#4 integrate
.. //depot/projects/arm/src/sys/geom/raid3/g_raid3.c#26 integrate
.. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_drive.c#8 integrate
.. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_init.c#4 integrate
.. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_plex.c#4 integrate
.. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_volume.c#5 integrate
.. //depot/projects/arm/src/sys/i386/bios/apm.c#5 integrate
.. //depot/projects/arm/src/sys/i386/conf/DEFAULTS#8 integrate
.. //depot/projects/arm/src/sys/i386/conf/GENERIC#26 integrate
.. //depot/projects/arm/src/sys/i386/conf/PAE#9 integrate
.. //depot/projects/arm/src/sys/i386/i386/in_cksum.c#3 integrate
.. //depot/projects/arm/src/sys/i386/i386/msi.c#6 integrate
.. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_misc.c#8 integrate
.. //depot/projects/arm/src/sys/i386/include/bootinfo.h#2 integrate
.. //depot/projects/arm/src/sys/i386/include/clock.h#8 integrate
.. //depot/projects/arm/src/sys/i386/include/in_cksum.h#3 integrate
.. //depot/projects/arm/src/sys/i386/isa/clock.c#15 integrate
.. //depot/projects/arm/src/sys/kern/init_main.c#19 integrate
.. //depot/projects/arm/src/sys/kern/kern_acct.c#18 integrate
.. //depot/projects/arm/src/sys/kern/kern_alq.c#8 integrate
.. //depot/projects/arm/src/sys/kern/kern_environment.c#11 integrate
.. //depot/projects/arm/src/sys/kern/kern_exec.c#22 integrate
.. //depot/projects/arm/src/sys/kern/kern_exit.c#26 integrate
.. //depot/projects/arm/src/sys/kern/kern_fork.c#22 integrate
.. //depot/projects/arm/src/sys/kern/kern_idle.c#8 integrate
.. //depot/projects/arm/src/sys/kern/kern_intr.c#15 integrate
.. //depot/projects/arm/src/sys/kern/kern_jail.c#10 integrate
.. //depot/projects/arm/src/sys/kern/kern_kthread.c#6 integrate
.. //depot/projects/arm/src/sys/kern/kern_ktrace.c#16 integrate
.. //depot/projects/arm/src/sys/kern/kern_linker.c#13 integrate
.. //depot/projects/arm/src/sys/kern/kern_mbuf.c#17 integrate
.. //depot/projects/arm/src/sys/kern/kern_prot.c#13 integrate
.. //depot/projects/arm/src/sys/kern/kern_shutdown.c#9 integrate
.. //depot/projects/arm/src/sys/kern/kern_sig.c#25 integrate
.. //depot/projects/arm/src/sys/kern/kern_sysctl.c#12 integrate
.. //depot/projects/arm/src/sys/kern/link_elf.c#9 integrate
.. //depot/projects/arm/src/sys/kern/link_elf_obj.c#8 integrate
.. //depot/projects/arm/src/sys/kern/sched_ule.c#28 integrate
.. //depot/projects/arm/src/sys/kern/subr_taskqueue.c#10 integrate
.. //depot/projects/arm/src/sys/kern/sys_pipe.c#10 integrate
.. //depot/projects/arm/src/sys/kern/sys_socket.c#8 integrate
.. //depot/projects/arm/src/sys/kern/syscalls.master#25 integrate
.. //depot/projects/arm/src/sys/kern/sysv_msg.c#10 integrate
.. //depot/projects/arm/src/sys/kern/sysv_sem.c#11 integrate
.. //depot/projects/arm/src/sys/kern/sysv_shm.c#8 integrate
.. //depot/projects/arm/src/sys/kern/uipc_mbuf2.c#4 integrate
.. //depot/projects/arm/src/sys/kern/uipc_sem.c#10 integrate
.. //depot/projects/arm/src/sys/kern/uipc_socket.c#39 integrate
.. //depot/projects/arm/src/sys/kern/uipc_syscalls.c#29 integrate
.. //depot/projects/arm/src/sys/kern/uipc_usrreq.c#29 integrate
.. //depot/projects/arm/src/sys/kern/vfs_acl.c#2 integrate
.. //depot/projects/arm/src/sys/kern/vfs_aio.c#19 integrate
.. //depot/projects/arm/src/sys/kern/vfs_bio.c#23 integrate
.. //depot/projects/arm/src/sys/kern/vfs_extattr.c#2 integrate
.. //depot/projects/arm/src/sys/kern/vfs_lookup.c#18 integrate
.. //depot/projects/arm/src/sys/kern/vfs_mount.c#34 integrate
.. //depot/projects/arm/src/sys/kern/vfs_subr.c#38 integrate
.. //depot/projects/arm/src/sys/kern/vfs_syscalls.c#33 integrate
.. //depot/projects/arm/src/sys/kern/vfs_vnops.c#17 integrate
.. //depot/projects/arm/src/sys/modules/Makefile#51 integrate
.. //depot/projects/arm/src/sys/modules/nvram/Makefile#1 branch
.. //depot/projects/arm/src/sys/modules/uchcom/Makefile#1 branch
.. //depot/projects/arm/src/sys/net/bpf.c#23 integrate
.. //depot/projects/arm/src/sys/net/bpf.h#8 integrate
.. //depot/projects/arm/src/sys/net/bsd_comp.c#4 integrate
.. //depot/projects/arm/src/sys/net/ethernet.h#10 integrate
.. //depot/projects/arm/src/sys/net/if.c#23 integrate
.. //depot/projects/arm/src/sys/net/if_atmsubr.c#6 integrate
.. //depot/projects/arm/src/sys/net/if_bridge.c#37 integrate
.. //depot/projects/arm/src/sys/net/if_ethersubr.c#28 integrate
.. //depot/projects/arm/src/sys/net/if_fddisubr.c#5 integrate
.. //depot/projects/arm/src/sys/net/if_fwsubr.c#7 integrate
.. //depot/projects/arm/src/sys/net/if_gif.c#12 integrate
.. //depot/projects/arm/src/sys/net/if_iso88025subr.c#5 integrate
.. //depot/projects/arm/src/sys/net/if_lagg.c#11 integrate
.. //depot/projects/arm/src/sys/net/if_ppp.c#13 integrate
.. //depot/projects/arm/src/sys/net/if_stf.c#10 integrate
.. //depot/projects/arm/src/sys/net/if_tun.c#10 integrate
.. //depot/projects/arm/src/sys/net/if_vlan.c#22 integrate
.. //depot/projects/arm/src/sys/net/route.c#8 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_scan.c#3 integrate
.. //depot/projects/arm/src/sys/netatalk/ddp_input.c#4 integrate
.. //depot/projects/arm/src/sys/netatalk/ddp_output.c#6 integrate
.. //depot/projects/arm/src/sys/netgraph/netgraph.h#8 integrate
.. //depot/projects/arm/src/sys/netgraph/ng_base.c#13 integrate
.. //depot/projects/arm/src/sys/netgraph/ng_socket.c#11 integrate
.. //depot/projects/arm/src/sys/netinet/in_pcb.c#24 integrate
.. //depot/projects/arm/src/sys/netinet/ip.h#5 integrate
.. //depot/projects/arm/src/sys/netinet/ip_divert.c#14 integrate
.. //depot/projects/arm/src/sys/netinet/ip_fw2.c#39 integrate
.. //depot/projects/arm/src/sys/netinet/ip_icmp.c#11 integrate
.. //depot/projects/arm/src/sys/netinet/ip_input.c#23 integrate
.. //depot/projects/arm/src/sys/netinet/ip_options.c#5 integrate
.. //depot/projects/arm/src/sys/netinet/ip_output.c#26 integrate
.. //depot/projects/arm/src/sys/netinet/raw_ip.c#18 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_bsd_addr.c#11 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_input.c#38 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_output.c#22 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_subr.c#34 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_syncache.c#28 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_timewait.c#5 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_usrreq.c#24 integrate
.. //depot/projects/arm/src/sys/netinet/udp_usrreq.c#26 integrate
.. //depot/projects/arm/src/sys/netinet6/nd6.c#18 integrate
.. //depot/projects/arm/src/sys/netinet6/udp6_usrreq.c#18 integrate
.. //depot/projects/arm/src/sys/netsmb/smb_iod.c#3 integrate
.. //depot/projects/arm/src/sys/nfs4client/nfs4_vfsops.c#9 integrate
.. //depot/projects/arm/src/sys/nfsclient/nfs_nfsiod.c#6 integrate
.. //depot/projects/arm/src/sys/nfsclient/nfs_vfsops.c#16 integrate
.. //depot/projects/arm/src/sys/nfsserver/nfs_serv.c#16 integrate
.. //depot/projects/arm/src/sys/nfsserver/nfs_srvsock.c#12 integrate
.. //depot/projects/arm/src/sys/opencrypto/crypto.c#8 integrate
.. //depot/projects/arm/src/sys/powerpc/conf/GENERIC#18 integrate
.. //depot/projects/arm/src/sys/powerpc/powerpc/genassym.c#5 integrate
.. //depot/projects/arm/src/sys/powerpc/powerpc/swtch.S#2 integrate
.. //depot/projects/arm/src/sys/powerpc/powerpc/vm_machdep.c#8 integrate
.. //depot/projects/arm/src/sys/security/audit/audit.c#20 integrate
.. //depot/projects/arm/src/sys/security/audit/audit.h#10 integrate
.. //depot/projects/arm/src/sys/security/audit/audit_bsm.c#14 integrate
.. //depot/projects/arm/src/sys/security/audit/audit_syscalls.c#16 integrate
.. //depot/projects/arm/src/sys/security/audit/audit_worker.c#6 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_audit.c#3 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_framework.h#10 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_inet.c#8 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_internal.h#6 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_net.c#8 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_pipe.c#7 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_policy.h#7 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_posix_sem.c#7 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_process.c#8 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_socket.c#7 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_syscalls.c#4 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_system.c#8 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_sysv_msg.c#7 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_sysv_sem.c#7 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_sysv_shm.c#6 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_vfs.c#11 integrate
.. //depot/projects/arm/src/sys/security/mac_biba/mac_biba.c#12 integrate
.. //depot/projects/arm/src/sys/security/mac_bsdextended/mac_bsdextended.c#13 integrate
.. //depot/projects/arm/src/sys/security/mac_ifoff/mac_ifoff.c#5 integrate
.. //depot/projects/arm/src/sys/security/mac_lomac/mac_lomac.c#11 integrate
.. //depot/projects/arm/src/sys/security/mac_mls/mac_mls.c#11 integrate
.. //depot/projects/arm/src/sys/security/mac_none/mac_none.c#5 integrate
.. //depot/projects/arm/src/sys/security/mac_partition/mac_partition.c#7 integrate
.. //depot/projects/arm/src/sys/security/mac_portacl/mac_portacl.c#9 integrate
.. //depot/projects/arm/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#8 integrate
.. //depot/projects/arm/src/sys/security/mac_stub/mac_stub.c#10 integrate
.. //depot/projects/arm/src/sys/security/mac_test/mac_test.c#9 integrate
.. //depot/projects/arm/src/sys/sun4v/sun4v/simdisk.c#3 integrate
.. //depot/projects/arm/src/sys/sys/apm.h#2 integrate
.. //depot/projects/arm/src/sys/sys/gpt.h#4 integrate
.. //depot/projects/arm/src/sys/sys/kthread.h#2 integrate
.. //depot/projects/arm/src/sys/sys/linker.h#5 integrate
.. //depot/projects/arm/src/sys/sys/param.h#37 integrate
.. //depot/projects/arm/src/sys/sys/pciio.h#3 integrate
.. //depot/projects/arm/src/sys/sys/priv.h#7 integrate
.. //depot/projects/arm/src/sys/sys/vnode.h#19 integrate
.. //depot/projects/arm/src/sys/ufs/ffs/ffs_softdep.c#20 integrate
.. //depot/projects/arm/src/sys/ufs/ffs/ffs_vfsops.c#26 integrate
.. //depot/projects/arm/src/sys/ufs/ufs/ufs_vnops.c#18 integrate
.. //depot/projects/arm/src/sys/vm/swap_pager.c#16 integrate
.. //depot/projects/arm/src/sys/vm/vm_map.c#18 integrate
.. //depot/projects/arm/src/sys/vm/vm_mmap.c#12 integrate
.. //depot/projects/arm/src/sys/vm/vm_object.c#24 integrate
.. //depot/projects/arm/src/sys/vm/vm_zeroidle.c#14 integrate
.. //depot/projects/arm/src/sys/vm/vnode_pager.c#12 integrate
.. //depot/projects/arm/src/tools/build/options/WITHOUT_NS_CACHING#2 integrate
.. //depot/projects/arm/src/usr.bin/awk/Makefile#4 integrate
.. //depot/projects/arm/src/usr.bin/awk/lib.c.diff#3 delete
.. //depot/projects/arm/src/usr.bin/awk/tran.c.diff#2 delete
.. //depot/projects/arm/src/usr.bin/calendar/calendars/calendar.freebsd#18 integrate
.. //depot/projects/arm/src/usr.bin/lex/lib/Makefile#2 integrate
.. //depot/projects/arm/src/usr.bin/makewhatis/makewhatis.c#2 integrate
.. //depot/projects/arm/src/usr.bin/nfsstat/nfsstat.1#3 integrate
.. //depot/projects/arm/src/usr.bin/nfsstat/nfsstat.c#2 integrate
.. //depot/projects/arm/src/usr.bin/su/su.c#7 integrate
.. //depot/projects/arm/src/usr.sbin/adduser/adduser.8#4 integrate
.. //depot/projects/arm/src/usr.sbin/adduser/adduser.sh#4 integrate
.. //depot/projects/arm/src/usr.sbin/adduser/rmuser.sh#2 integrate
.. //depot/projects/arm/src/usr.sbin/mountd/mountd.8#3 integrate
.. //depot/projects/arm/src/usr.sbin/mountd/mountd.c#7 integrate
.. //depot/projects/arm/src/usr.sbin/rpcbind/rpcbind.c#5 integrate
.. //depot/projects/arm/src/usr.sbin/traceroute6/traceroute6.c#5 integrate

Differences ...

==== //depot/projects/arm/src/Makefile#12 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile,v 1.341 2007/05/16 08:46:35 des Exp $
+# $FreeBSD: src/Makefile,v 1.342 2007/10/18 08:41:52 delphij Exp $
 #
 # The user-driven targets are:
 #
@@ -149,14 +149,14 @@
 .if ${.CURDIR} == ${.OBJDIR} || ${.CURDIR}/obj == ${.OBJDIR}
 .if exists(${BW_CANONICALOBJDIR}/)
 	-rm -rf ${BW_CANONICALOBJDIR}/*
-	chflags -R 0 ${BW_CANONICALOBJDIR}
+	-chflags -R 0 ${BW_CANONICALOBJDIR}
 	rm -rf ${BW_CANONICALOBJDIR}/*
 .endif
 	#   To be safe in this case, fall back to a 'make cleandir'
 	${_+_}@cd ${.CURDIR}; ${_MAKE} cleandir
 .else
 	-rm -rf ${.OBJDIR}/*
-	chflags -R 0 ${.OBJDIR}
+	-chflags -R 0 ${.OBJDIR}
 	rm -rf ${.OBJDIR}/*
 .endif
 

==== //depot/projects/arm/src/ObsoleteFiles.inc#30 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.113 2007/10/12 07:58:08 ru Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.115 2007/10/25 18:10:05 mtm Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,8 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd
+OLD_FILES+=etc/rc.d/nfslocking
 # 20070930: rename of cached to nscd
 OLD_FILES+=etc/rc.d/cached
 OLD_FILES+=usr/sbin/cached
@@ -579,11 +581,17 @@
 # 20070201: remove libmytinfo link
 OLD_FILES+=usr/lib/libmytinfo.a
 OLD_FILES+=usr/lib/libmytinfo.so
-OLD_FILES+=usr/lib/libmytinfo_p.a   
+OLD_FILES+=usr/lib/libmytinfo_p.a
+OLD_FILES+=usr/lib/libmytinfow.a
+OLD_FILES+=usr/lib/libmytinfow.so
+OLD_FILES+=usr/lib/libmytinfow_p.a
 .if ${TARGET_ARCH} == "amd64"
 OLD_FILES+=usr/lib32/libmytinfo.a
 OLD_FILES+=usr/lib32/libmytinfo.so
 OLD_FILES+=usr/lib32/libmytinfo_p.a
+OLD_FILES+=usr/lib32/libmytinfow.a
+OLD_FILES+=usr/lib32/libmytinfow.so
+OLD_FILES+=usr/lib32/libmytinfow_p.a
 .endif
 # 20070128: remove vnconfig
 OLD_FILES+=usr/sbin/vnconfig

==== //depot/projects/arm/src/UPDATING#22 (text+ko) ====

@@ -21,6 +21,27 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20071024:
+	It has been decided that it is desirable to provide ABI
+	backwards compatibility to the FreeBSD 4/5/6 versions of the
+	PCIOCGETCONF, PCIOCREAD and PCIOCWRITE IOCTLs, which was
+	broken with the introduction of PCI domain support (see the
+	20070930 entry). Unfortunately, this required the ABI of
+	PCIOCGETCONF to be broken again in order to be able to
+	provide backwards compatibility to the old version of that
+	IOCTL. Thus consumers of PCIOCGETCONF have to be recompiled
+	again. As for prominent ports this affects neither pciutils
+	nor xorg-server this time, the hal port needs to be rebuilt
+	however.
+
+20071020:
+	The misnamed kthread_create() and friends have been renamed
+	to kproc_create() etc. Many of the callers already
+	used kproc_start()..
+	I will return kthread_create() and friends in a while
+	with implementations that actually create threads, not procs.
+	Renaming corresponds with version 800002.
+
 20071010:
 	RELENG_7 branched.
 
@@ -913,4 +934,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.509 2007/10/12 04:48:58 kevlo Exp $
+$FreeBSD: src/UPDATING,v 1.511 2007/10/24 20:51:43 marius Exp $

==== //depot/projects/arm/src/contrib/ipfilter/BSD/Makefile#4 (text+ko) ====

@@ -485,13 +485,21 @@
 		cp if_ipl.o /lkm; \
 	fi
 	-if [ -d /modules -a -f ipf.ko ] ; then \
-		cp ipf.ko /modules; \
+		if [ -f /modules/ipl.ko ] ; then \
+			cp ipf.ko /modules/ipl.ko; \
+		else \
+			cp ipf.ko /modules; \
+		fi \
 	fi
 	-if [ -d /modules -a -f ipfrule.ko ] ; then \
 		cp ipfrule.ko /modules; \
 	fi
 	-if [ -d /boot/kernel -a -f ipf.ko ] ; then \
-		cp ipf.ko /boot/kernel; \
+		if [ -f /boot/kernel/ipl.ko ] ; then \
+			cp ipf.ko /boot/kernel/ipl.ko; \
+		else \
+			cp ipf.ko /boot/kernel; \
+		fi \
 	fi
 	-if [ -d /boot/kernel -a -f ipfrule.ko ] ; then \
 		cp ipfrule.ko /boot/kernel; \

==== //depot/projects/arm/src/contrib/ipfilter/BSD/kupgrade#2 (text+ko) ====

@@ -32,11 +32,15 @@
 fi
  
 if [ ! -f ip_rules.c -o ! -f ip_rules.h ] ; then
-	echo "Please do a build of ipfilter and then run the following"
-	echo "command to build extra files:"
-	echo
-	echo "make ip_rules.c"
-	exit 1
+	echo "Trying to build ip_rules.c and ip_rules.h"
+	make ip_rules.c
+	if [ ! -f ip_rules.c -o ! -f ip_rules.h ] ; then
+		echo "Please do a build of ipfilter and then run the following"
+		echo "command to build extra files:"
+		echo
+		echo "make ip_rules.c"
+		exit 1
+	fi
 fi
 
 echo -n "Installing "

==== //depot/projects/arm/src/contrib/ipfilter/HISTORY#4 (text+ko) ====

@@ -10,12 +10,110 @@
 # and especially those who have found the time to port IP Filter to new
 # platforms.
 #
+4.1.28 - Release 16 October 2007
+
+backout changes (B1) & (B2) as they've caused NAT entries to persist for
+too long and possibly other side effects.
+
+Still need to compile in our own radix.c for Solaris as the one in S10U4
+has a different alignment of structure members (causes panic)
+
+keep state doesn't work with multicast/broadcast packets (makes UPnP easier)
+
+ippool -l may only lists every 2nd pool's contents
+
+4.1.27 - Released 29 September 2007
+
+SunOS5/replace script does not deal with i386 systems that have the
+i86/amd64 directory pair.
+
+make BSD/kupgrade try to build ip_rules.[ch] before complaining
+
+Need to look for ipl.ko LKM on FreeBSD, not just ipf.ko
+
+Cleanup SunOS5 Makefile pieces, removing CPU, sunos5x86; buildsunos needs
+to drive 32bit cc builds differently for sparc/i386 now.
+
+Update instructions for rebuilding FreeBSD kernels
+
+Make the target "freebsd" work for building ipfilter
+
+destroying NAT entries for blocked packets can lead to NAT table entry leak,
+provide a counter of orphan'd NAT entries to track this problem.
+
+4.1.26 - Released 24 September 2007
+
+Fix build problem for Solaris prior to S10U4
+
+4.1.25 - Released 20 September 2007
+
+stepping through structures with ioctls can lead to the wrong things
+being free'd and panics
+
+if a NAT entry (such as an rdr) is created but the packet ends up being
+blocked, tear down the NAT entry.
+
+fix fragment cache preventing keep state from functioning
+
+fix handling of \ to indicate a continued line in .conf files
+
+include port ranges in the allowed input for ipf when using "port = ()"
+
+only advance TCP state for packets on the leading edge of the window. (B1)
+
+using ipnat -l can lead to memory corruption in high stress situations
+
+track TCP sequence numbers with NAT so that it can do timeout advances
+correctly inline with state
+
+ICMP checksums for some redirect'd packets are not adjusted correctly.
+
+IPv6 address components need to be explicitly cast to a 32bit pointer
+boundary so that compilers don't try to access them as two 64bit
+pieces (no guarantee is made that an Ipv6 address is on a 64bit
+aligned address)
+
+filling up the ipauth packet queue can lead to no more packets being
+processed.
+
+locking used to deref a nat entry causes a significant performance hit
+
+m_pulldown isn't properly handled, leading to possible panics with ICMPv6
+packets
+
+IPv6 fragment handling doesn't allow for "keep frag" to work
+
+build on Solaris10 Update4 with pfhooks in the kernel
+
+logging of Ipv6 packets with extension headers fix - Miroslaw Luc
+
+4.1.24 - Released 8 July 2007
+
+patch from Stuart Remphrey to address recursive mutex lock with TCP state
+
+add hash table bucket stats display to ipnat -s
+
+give ASSERT some teeth for user compiles
+
+initialising ipf_global, ipf_frcache, ipf_mutex should all be done very
+early on
+
+do some caddr_t cleanup, where possible
+
+fr_ref no longer tracks the number of children rules in a group for head rules
+
+make sure all BCOPY* have a value assigned to something
+
+fix possible use of icmp pointer after pullup makes it invalid
+
+resolve compile problems related to FreeBSD tree
+
 4.1.23 - Released 31 May 2007
 
 NAT was not always correctly fixing ICMP headers for errors
 
 some TCP state steps when closing do not update timeouts, leading to
-them being removed prematurely.
+them being removed prematurely. (B2)
 
 fix compilation problems for netbsd 4.99
 

==== //depot/projects/arm/src/contrib/ipfilter/Makefile#4 (text+ko) ====

@@ -5,8 +5,8 @@
 # provided that this notice is preserved and due credit is given
 # to the original author and the contributors.
 #
-# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.7 2007/06/04 02:54:31 darrenr Exp $
-# Id: Makefile,v 2.76.2.19 2006/03/17 10:38:38 darrenr Exp $
+# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.8 2007/10/18 21:52:11 darrenr Exp $
+# Id: Makefile,v 2.76.2.24 2007/09/26 10:04:03 darrenr Exp $
 #
 SHELL=/bin/sh
 BINDEST=/usr/local/bin
@@ -132,10 +132,7 @@
 	@echo "openbsd	- compile for OpenBSD"
 	@echo "freebsd20	- compile for FreeBSD 2.0, 2.1 or earlier"
 	@echo "freebsd22	- compile for FreeBSD-2.2 or greater"
-	@echo "freebsd3	- compile for FreeBSD-3.x"
-	@echo "freebsd4	- compile for FreeBSD-4.x"
-	@echo "freebsd5 - compile for FreeBSD-5.x"
-	@echo "freebsd6 - compile for FreeBSD-6.x"
+	@echo "freebsd  - compile for all other versions of FreeBSD"
 	@echo "bsd	- compile for generic 4.4BSD systems"
 	@echo "bsdi	- compile for BSD/OS"
 	@echo "irix	- compile for SGI IRIX"
@@ -152,6 +149,7 @@
 	else echo test directory not present, sorry; fi
 
 include:
+	-mkdir -p net netinet
 	if [ ! -f netinet/done ] ; then \
 		(cd netinet; ln -s ../*.h .; ln -s ../ip_*_pxy.c .;); \
 		(cd netinet; ln -s ../ipsend/tcpip.h tcpip.h); \
@@ -167,6 +165,9 @@
 	MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" BPFILTER=$(BPFILTER) \
 		CC="$(CC)" DEBUG="$(DEBUG)" ./buildsunos
 
+freebsd:
+	make freebsd`uname -r|cut -c1`
+
 freebsd22: include
 	make setup "TARGOS=BSD" "CPUDIR=$(CPUDIR)"
 	-rm -f BSD/$(CPUDIR)/ioconf.h
@@ -351,13 +352,9 @@
 	(cd SunOS4; make -f Makefile.ipsend build "CC=$(CC)" TOP=.. $(DEST) $(MFLAGS); cd ..)
 
 sunos5 solaris2: null
-	(cd SunOS5/$(CPUDIR); $(MAKE) build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS) "SOLARIS2=$(SOLARIS2)" "CPU=-Dsparc -D__sparc__"; cd ..)
+	(cd SunOS5/$(CPUDIR); $(MAKE) build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS) "SOLARIS2=$(SOLARIS2)"; cd ..)
 	(cd SunOS5/$(CPUDIR); $(MAKE) -f Makefile.ipsend build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS); cd ..)
 
-sunos5x86 solaris2x86: null
-	(cd SunOS5/$(CPUDIR); make build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS) "SOLARIS2=$(SOLARIS2)" "CPU=-Di86pc -Di386 -D__i386__"; cd ..)
-	(cd SunOS5/$(CPUDIR); make -f Makefile.ipsend build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS); cd ..)
-
 linux: include
 	(cd Linux; make build LINUX=$(LINUX) TOP=.. "DEBUG=-g" "CC=$(CC)" $(MFLAGS) OBJ=$(CPUDIR) LINUXKERNEL=$(LINUXKERNEL); cd ..)
 	(cd Linux; make ipflkm LINUX=$(LINUX) TOP=.. "DEBUG=-g" "CC=$(CC)" $(MFLAGS) OBJ=$(CPUDIR) LINUXKERNEL=$(LINUXKERNEL) WORKDIR=`pwd`; cd ..)
@@ -374,7 +371,7 @@
 	(cd SunOS4; $(MAKE) CPU=$(CPU) TOP=.. install)
 
 install-sunos5: solaris null
-	(cd SunOS5; $(MAKE) CPU=$(CPU) TOP=.. install)
+	(cd SunOS5; $(MAKE) TOP=.. install)
 
 install-aix:
 	(cd AIX/`AIX/cpurev`; make install "TOP=../.." $(MFLAGS); cd ..)

==== //depot/projects/arm/src/contrib/ipfilter/ip_fil.c#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/contrib/ipfilter/ip_fil.c,v 1.5 2007/06/04 02:54:31 darrenr Exp $	*/
+/*	$FreeBSD: src/contrib/ipfilter/ip_fil.c,v 1.6 2007/10/18 21:52:11 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
@@ -7,7 +7,7 @@
  */
 #if !defined(lint)
 static const char sccsid[] = "@(#)ip_fil.c	2.41 6/5/96 (C) 1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.133.2.16 2007/05/28 11:56:22 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.133.2.18 2007/09/09 11:32:05 darrenr Exp $";
 #endif
 
 #ifndef	SOLARIS
@@ -81,7 +81,7 @@
 #include 
 # endif
 #endif
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(SOLARIS2)
 # include "radix_ipf.h"
 #endif
 #ifndef __osf__
@@ -390,7 +390,7 @@
 		*addr++ = '\0';
 
 	for (ifpp = ifneta; ifpp && (ifp = *ifpp); ifpp++) {
-		COPYIFNAME(ifp, ifname);
+		COPYIFNAME(v, ifp, ifname);
 		if (!strcmp(name, ifname)) {
 			if (addr != NULL)
 				fr_setifpaddr(ifp, addr);
@@ -429,6 +429,9 @@
 	}
 	ifp = ifneta[nifs - 1];
 
+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
+	TAILQ_INIT(&ifp->if_addrlist);
+#endif
 #if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) || \
     (defined(OpenBSD) && (OpenBSD >= 199603)) || defined(linux) || \
     (defined(__FreeBSD__) && (__FreeBSD_version >= 501113))

==== //depot/projects/arm/src/contrib/ipfilter/iplang/Makefile#2 (text+ko) ====

@@ -3,20 +3,21 @@
 #
 #CC=gcc -Wuninitialized -Wstrict-prototypes -Werror -O
 CFLAGS=-I..
+CCARGS=$(DEBUG) -I. -I.. $(CFLAGS) -I$(DESTDIR) -I$(DESTDIR)/.. -I../ipsend
 
 all: $(DESTDIR)/iplang_y.o $(DESTDIR)/iplang_l.o
 
 $(DESTDIR)/iplang_y.o: $(DESTDIR)/iplang_y.c
-	$(CC) $(DEBUG) -I. -I.. -I$(DESTDIR) -I../ipsend $(CFLAGS) $(LINUX) -c $(DESTDIR)/iplang_y.c -o $@
+	$(CC) $(CCARGS) $(LINUX) -c $(DESTDIR)/iplang_y.c -o $@
 
 $(DESTDIR)/iplang_l.o: $(DESTDIR)/iplang_l.c
-	$(CC) $(DEBUG) -I. -I.. -I$(DESTDIR) -I../ipsend $(CFLAGS) $(LINUX) -c $(DESTDIR)/iplang_l.c -o $@
+	$(CC) $(CCARGS) $(LINUX) -c $(DESTDIR)/iplang_l.c -o $@
 
 iplang_y.o: iplang_y.c
-	$(CC) $(DEBUG) -I. -I.. -I../ipsend $(CFLAGS) $(LINUX) -c $< -o $@
+	$(CC) $(CCARGS) $< -o $@
 
 iplang_l.o: iplang_l.c
-	$(CC) $(DEBUG) -I. -I.. -I../ipsend $(CFLAGS) $(LINUX) -c $< -o $@
+	$(CC) $(CCARGS) $< -o $@
 
 $(DESTDIR)/iplang_l.c: iplang_l.l $(DESTDIR)/iplang_y.h
 	lex iplang_l.l

==== //depot/projects/arm/src/contrib/ipfilter/ipsend/iptests.c#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/contrib/ipfilter/ipsend/iptests.c,v 1.13 2007/06/04 02:54:31 darrenr Exp $	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/iptests.c,v 1.14 2007/10/18 21:52:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-1998 by Darren Reed.
@@ -8,7 +8,7 @@
  */
 #if !defined(lint)
 static const char sccsid[] = "%W% %G% (C)1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id: iptests.c,v 2.8.2.8 2007/02/17 12:41:51 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id: iptests.c,v 2.8.2.9 2007/09/13 07:19:34 darrenr Exp $";
 #endif
 #include 
 #include 
@@ -22,6 +22,9 @@
 #endif
 #include 
 #if !defined(__osf__)
+# ifdef __NetBSD__ 
+#  include 
+# endif
 # define _KERNEL
 # define KERNEL
 # if !defined(solaris) && !defined(linux) && !defined(__sgi) && !defined(hpux)
@@ -1097,7 +1100,8 @@
 	struct tcpcb *tcbp, tcb;
 	struct tcpiphdr ti;
 	struct sockaddr_in sin;
-	int fd, slen;
+	int fd;
+	socklen_t slen;
 
 	bzero((char *)&sin, sizeof(sin));
 

==== //depot/projects/arm/src/contrib/ipfilter/ipsend/sock.c#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/ipfilter/ipsend/sock.c,v 1.18 2007/06/04 02:54:31 darrenr Exp $ */
+/* $FreeBSD: src/contrib/ipfilter/ipsend/sock.c,v 1.19 2007/10/18 21:52:12 darrenr Exp $ */
 /*
  * sock.c (C) 1995-1998 Darren Reed
  *
@@ -7,7 +7,7 @@
  */
 #if !defined(lint)
 static const char sccsid[] = "@(#)sock.c	1.2 1/11/96 (C)1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id: sock.c,v 2.8.4.6 2007/02/17 12:41:51 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id: sock.c,v 2.8.4.7 2007/09/13 07:19:34 darrenr Exp $";
 #endif
 #include 
 #include 
@@ -30,6 +30,9 @@
 # include 
 #endif
 #if !defined(__osf__)
+# ifdef __NetBSD__ 
+#  include 
+# endif
 # define _KERNEL
 # define	KERNEL
 # ifdef	ultrix
@@ -385,7 +388,8 @@
 {
 	struct	sockaddr_in	rsin, lsin;
 	struct	tcpcb	*t, tcb;
-	int	fd, nfd, len;
+	int	fd, nfd;

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Fri Oct 26 15:49:11 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CD79916A46C; Fri, 26 Oct 2007 15:49: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 671C816A468
	for ; Fri, 26 Oct 2007 15:49:11 +0000 (UTC)
	(envelope-from mharvan@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3E19513C4C2
	for ; Fri, 26 Oct 2007 15:49:11 +0000 (UTC)
	(envelope-from mharvan@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 l9QFnBjW042343
	for ; Fri, 26 Oct 2007 15:49:11 GMT
	(envelope-from mharvan@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9QFnBZL042340
	for perforce@freebsd.org; Fri, 26 Oct 2007 15:49:11 GMT
	(envelope-from mharvan@FreeBSD.org)
Date: Fri, 26 Oct 2007 15:49:11 GMT
Message-Id: <200710261549.l9QFnBZL042340@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mharvan@FreeBSD.org using -f
From: Matus Harvan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128137 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 26 Oct 2007 15:49:12 -0000

http://perforce.freebsd.org/chv.cgi?CH=128137

Change 128137 by mharvan@mharvan_peleus on 2007/10/26 15:48:17

	added an updated version of the tcp listenall patch

Affected files ...

.. //depot/projects/soc2007/mharvan-mtund/sys.patches/sys.8-current.tcp_catchall.patch#1 add

Differences ...

From owner-p4-projects@FreeBSD.ORG  Sat Oct 27 01:12:54 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ED25316A41B; Sat, 27 Oct 2007 01:12: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 7662C16A418
	for ; Sat, 27 Oct 2007 01:12:53 +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 65B7713C494
	for ; Sat, 27 Oct 2007 01:12:53 +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 l9R1CrZD019201
	for ; Sat, 27 Oct 2007 01:12:53 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9R1CrUU019198
	for perforce@freebsd.org; Sat, 27 Oct 2007 01:12:53 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sat, 27 Oct 2007 01:12:53 GMT
Message-Id: <200710270112.l9R1CrUU019198@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 128168 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 27 Oct 2007 01:12:54 -0000

http://perforce.freebsd.org/chv.cgi?CH=128168

Change 128168 by pgj@disznohal on 2007/10/27 01:12:21

	Add initial Hungarian translation of Chapter 4: Installing Applications:
	Packages and Ports.

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/ports/chapter.sgml#2 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/ports/chapter.sgml#2 (text+ko) ====

@@ -4,312 +4,436 @@
      $FreeBSD: doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.268 2007/09/03 01:59:22 keramida Exp $
 -->
 
-
-  Installing Applications: Packages and Ports
+
+
+
+  Alkalmazások telepítése: csomagok
+    és portok
 
   
-    Synopsis
+    Áttekintés
 
-    ports
-    packages
-    FreeBSD is bundled with a rich collection of system tools as
-      part of the base system.  However, there is only so much one can
-      do before needing to install an additional third-party
-      application to get real work done.  FreeBSD provides two
-      complementary technologies for installing third-party software
-      on your system: the FreeBSD Ports Collection (for installing from
-      source), and packages (for installing from pre-built binaries).
-      Either method may be used to install the
-      newest version of your favorite applications from local media or
-      straight off the network.
+    portok
+    csomagok
+    A &os; rendszereszközök gazdag
+      gyûjteményével érkezik az alaprendszer
+      részeként.  Azonban a külsõs
+      alkalmazások telepítéséhez rengeteg
+      teendõt kell elvégeznünk.  A feladat
+      elvégzésére ezért a &os; két,
+      egymást kiegészítõ
+      technológiát kínál fel: a &os;
+      Portgyûjteményt (telepítés
+      forráskódból) és a csomagokat
+      (telepítés elõre elkészített
+      binárisokból).  Mind a két módszerrel
+      fel tudjuk telepíteni a kedvenc alkalmazásunk
+      legújabb verzióját helybõl vagy
+      egyenesen a hálózatról.
 
-    After reading this chapter, you will know:
+    A fejezet elolvasása során
+      megismerjük:
 
     
       
-	How to install third-party binary software packages.
+	Hogyan telepítsünk külsõs
+	  bináris szoftvercsomagokat.
       
       
-	How to build third-party software from source by using the ports
-	collection.
+	Hogyan fordítsunk le a forrásukból
+	  külsõs szoftvereket a portgyûjtemény
+	  segítségével.
       
       
-	How to remove previously installed packages or ports.
+	Hogyan távolítsunk el korábban
+	  már telepített csomagokat és
+	  portokat.
       
       
-	How to override the default values that the ports
-	  collection uses.
+	Hogyan bíráljuk felül a
+	  portgyûjtemény által használt
+	  alapértelmezett értékeket.
       
       
-	How to find the appropriate software package.
+	Hogyan keressük meg a megfelelõ
+	  szoftvercsomagokat.
       
       
-	How to upgrade your applications.
+	Hogyan frissítsük a telepített
+	  alkalmazásokat.
       
     
   
 
   
-    Overview of Software Installation
+    Az alkalmazások telepítésének
+      összefoglalása
 
-    If you have used a &unix; system before you will know that
-      the typical procedure for installing third-party software goes
-      something like this:
+    Ha korábban már használtunk &unix;
+      rendszereket, valószínûleg ismerjük a
+      külsõs alkalmazások
+      telepítésének jellemezõ
+      menetét:
 
     
       
-	Download the software, which might be distributed in
-	  source code format, or as a binary.
+	Töltsük le a szoftvert, melyet vagy
+	  forráskód vagy pedig bináris
+	  formátumban érhetünk el.
       
 
       
-	Unpack the software from its distribution format
-	  (typically a tarball compressed with &man.compress.1;,
-	  &man.gzip.1;, or &man.bzip2.1;).
+	Bontsuk ki az alkalmazás letöltött
+	  változatát (általában a
+	  &man.compress.1;, &man.gzip.1; vagy a &man.bzip2.1;
+	  által tömörített összevont
+	  állomány).
       
 
       
-	Locate the documentation (perhaps an
-	  INSTALL or README
-	  file, or some files in a doc/
-	  subdirectory) and read up on how to install the
-	  software.
+	Keressük meg dokumentációt
+	  (többnyire a INSTALL vagy a
+	  README állományban
+	  található, vagy a doc/
+	  alkönyvtárban) és olvassuk el benne, hogyan
+	  tudjuk telepíteni a szoftvert.
       
 
       
-	If the software was distributed in source format,
-	  compile it.  This may involve editing a
-	  Makefile, or running a
-	  configure script, and other work.
+	Ha a szoftver forrását
+	  töltöttük le, fordítsuk le.
+	  Elképzelhetõ, hogy ennek során
+	  szerkesztenünk kell a Makefile
+	  állományt vagy lefuttatnunk a
+	  configure szkriptet, ill. más
+	  egyet is csinálunk kell.
       
 
       
-	Test and install the software.
+	Próbáljuk a ki szoftvert, majd
+	  telepítsük.
       
     
 
-    And that is only if everything goes well.  If you are
-      installing a software package that was not deliberately ported
-      to FreeBSD you may even have to go in and edit the code to make
-      it work properly.
+    Ez annak a forgatókönyve, amikor minden hiba
+      nélkül lezajlik.  Megeshet azonban, ha olyan szoftvert
+      telepítünk, melyet kifejezetten nem igazítottak
+      a &os;-hez, hogy javítanunk kell a
+      forráskódban a szoftver megfelelõ
+      mûködéséhez.
 
-    Should you want to, you can continue to install software the
-      traditional way with FreeBSD.  However, FreeBSD
-      provides two technologies which can save you a lot of effort:
-      packages and ports.  At the time of writing, over &os.numports;
-      third-party applications have been made available in this
-      way.
+    Ha sikerül mûködésre bírni,
+      folytathatjuk &os;-n a szoftver telepítését a
+      megszokott módon.  Habár a &os; erre
+      a célra két lehetõséget is
+      felkínál, mellyel rengeteg
+      erõlködéstõl megkímélhet
+      minket: ezek a csomagok és a portok.  Az írás
+      pillanatában közel &os.numports; külsõ
+      alkalmazás érhetõ el ilyen
+      formában.
 
-    For any given application, the FreeBSD package for that
-      application is a single file which you must download.  The
-      package contains pre-compiled copies of all the commands for the
-      application, as well as any configuration files or
-      documentation.  A downloaded package file can be manipulated
-      with FreeBSD package management commands, such as
-      &man.pkg.add.1;, &man.pkg.delete.1;, &man.pkg.info.1;, and so
-      on.  Installing a new application can be carried out with a
-      single command.
+    Egy adott alkalmazás esetén a
+      hozzátartozó &os;-s csomag mindössze egyetlen
+      letöltendõ állományt takar.  A csomag
+      tartalmazza az alkalmazás
+      telepítéséhez szükséges
+      összes parancs elõre lefordított
+      változtatát, ugyanígy magát a
+      dokumentációt is.  A letöltött csomagokot
+      a &os; csomagkezelõ parancsaival vehetjük
+      használatba: ilyenek a &man.pkg.add.1;, &man.pkg.delete.1;,
+      &man.pkg.info.1; és így tovább.  Az új
+      alkalmazások telepítése ennek
+      köszönhetõen egyetlen paranccsal
+      elvégezhetõ.
 
-    A FreeBSD port for an application is a collection of files
-      designed to automate the process of compiling an application
-      from source code.
+    Egy alkalmazás &os;-s portja mögött
+      lényegében állományok
+      gyûjteménye áll, melyek a
+      forráskódból történõ
+      telepítés folyamatának
+      automatizálását segítik
+      elõ.
 
-    Remember that there are a number of steps you would normally
-      carry out if you compiled a program yourself (downloading,
-      unpacking, patching, compiling, installing).  The files that
-      make up a port contain all the necessary information to allow
-      the system to do this for you.  You run a handful of simple
-      commands and the source code for the application is
-      automatically downloaded, extracted, patched, compiled, and
-      installed for you.
+    Ne felejtsük el, hogy normális esetben
+      számos lépcsõt meg kell másznunk egy
+      program sajátkezû lefordításához
+      (letöltés, kitömörítés,
+      javítgatás, fordítás,
+      telepítés).  A portot alkotó
+      állományok tartalmazzák az összes olyan
+      szükséges információt, amelyek
+      átengedik ezt a feladatot a rendszernek.  Kiadunk egy
+      maréknyi egyszerû parancsot, és az
+      alkalmazás magától letöltõdik,
+      kitömörítõdik, módosítja a
+      forráskódját, lefordul és
+      feltelepül.
 
-    In fact, the ports system can also be used to generate packages
-      which can later be manipulated with pkg_add
-      and the other package management commands that will be introduced
-      shortly.
+    Valójában a portrendszer
+      használható olyan csomagok
+      létrehozására is, amelyeket
+      késõbb a pkg_add és
+      többi hozzá hasonló, hamarosan
+      részletesebben is bemutatandó csomagkezelõ
+      paranccsal is kezelni tudunk.
 
-    Both packages and ports understand
-      dependencies.  Suppose you want to install
-      an application that depends on a specific library being
-      installed.  Both the application and the library have been made
-      available as FreeBSD ports and packages.  If you use the
-      pkg_add command or the ports system to add
-      the application, both will notice that the library has not been
-      installed, and automatically install the library first.
+    A csomagok és a portok is egyaránt
+      képesek függõségeket
+      kezelni.  Tegyük fel, hogy egy olyan alkalmazást
+      akarunk telepíteni, amely egy adott
+      függvénykönyvtár
+      meglététõl függ a rendszeren.  Az
+      alkalmazás és a könyvtár is
+      elérhetõ &os; portként és
+      csomagként.  Akár a pkg_add
+      parancsot, akár a portrendszert használjuk az
+      alkalmazás hozzáadására, mind a
+      kettõ észre fogja venni, hogy a szükséges
+      könyvtárt még nem telepítettük,
+      ezért elõször azt fogja automatikusan
+      telepíteni.
 
-    Given that the two technologies are quite similar, you might
-      be wondering why FreeBSD bothers with both.  Packages and ports
-      both have their own strengths, and which one you use will depend
-      on your own preference.
+    Tudván, hogy a két említett
+      megoldás szinte teljesen egyenértékû,
+      felmerülhet a kérdés, a &os; mégis
+      miért ismeri mindkettõjüket.  A csomagoknak
+      és a portnak is megvannak a maguk elõnyös
+      oldalai, és hogy a kettõ közül melyiket
+      használjuk, csak a saját
+      ízlésünkön múlik.
 
     
-      Package Benefits
-      
+      A csomagok használatának elõnyei
+
       
-	A compressed package tarball is typically smaller than
-	  the compressed tarball containing the source code for the
-	  application.
+	Egy csomag általában kisebb, mint az
+	  alkalmazás forráskódját
+	  tartalmazó tömörített összevont
+	  állomány.
       
 
       
-	Packages do not require any additional compilation.  For
-	  large applications, such as
+	A csomagokat nem kell fordítani.  Nagyobb
+	  alkalmazások, mint mondjuk a
 	  Mozilla,
-	  KDE, or
-	  GNOME this can be important,
-	  particularly if you are on a slow system.
+	  KDE vagy
+	  GNOME esetén ez
+	  kulcsfontosságú lehet, fõleg abban az
+	  esetben, ha a rendszerünk nem eléggé
+	  gyors.
       
 
       
-	Packages do not require any understanding of the process
-	  involved in compiling software on FreeBSD.
+	A csomagok használata nem várja el a
+	  szoftverek &os;-n történõ
+	  fordítási folyamatának behatóbb
+	  ismeretét.
       
     
 
     
-      Ports Benefits
-      
+      A portok használatának elõnyei
+
       
-	Packages are normally compiled with conservative options,
-	  because they have to run on the maximum number of systems.  By
-	  installing from the port, you can tweak the compilation options to
-	  (for example) generate code that is specific to a Pentium
-	  4 or Athlon processor.
+	A csomagokat általános esetben igen
+	  óvatos beállításokkal
+	  készítik el, hiszen a lehetõ legtöbb
+	  rendszeren mûködõképesnek kell
+	  lenniük.  Ha viszont portból
+	  telepítünk, nyugodtan hangolhatjuk úgy a
+	  beállításokat, hogy
+	  (például) a &pentium; 4 vagy az Athlon
+	  processzoroknak kedvezõ kódot hozzanak
+	  létre.
       
 
       
-	Some applications have compile-time options relating to
-	  what they can and cannot do.  For example,
-	  Apache can be configured with a
-	  wide variety of different built-in options.  By building
-	  from the port you do not have to accept the default options,
-	  and can set them yourself.
+	Bizonyos alkalmazások fordítás
+	  idején állítandó
+	  beállításokkal rendelkeznek arról,
+	  hogy mire lesznek képesek és mire nem.
+	  Például az Apache
+	  beépített konfigurációs
+	  opciók széles kelléktárával
+	  rendelkezik.  Amikor viszont portból hozzuk
+	  létre, nem kell elfogadnunk ezek alapértelmezett
+	  értékeit, hanem a saját
+	  igényeinknek megfelelõen
+	  átállíthatjuk õket.
 
-	In some cases, multiple packages will exist for the same
-	  application to specify certain settings.  For example,
-	  Ghostscript is available as a
-	  ghostscript package and a
-	  ghostscript-nox11 package, depending on
-	  whether or not you have installed an X11 server.  This sort
-	  of rough tweaking is possible with packages, but rapidly
-	  becomes impossible if an application has more than one or
-	  two different compile-time options.
+	Egyes esetekben több különféle
+	  beállítást tükrözõ csomag is
+	  létezhet ugyanahhoz az alkalmazáshoz.
+	  Például a Ghostscript
+	  elérhetõ ghostscript
+	  és ghostscript-nox11
+	  csomagként is attól függõen, hogy
+	  telepítettük-e az X11 szervert.  Ez
+	  természetesen egy meglehetõsen durva
+	  kijátszása a csomagrendszernek, és
+	  gyorsan lehetetlenné is válik a
+	  használata, ha az adott alkalmazás
+	  egy-két fordítási idejû
+	  beállításnál többel
+	  rendelkezik.
       
 
       
-	The licensing conditions of some software distributions forbid
-	  binary distribution.  They must be distributed as source
-	  code.
+	Néhány szoftver licenszelése tiltja a
+	  bináris terjesztést.  Ezért ezek a
+	  szoftverek kizárólag csak
+	  forráskód formájában
+	  továbbíthatóak.
       
 
       
-	Some people do not trust binary distributions.  At least
-	  with source code, you can (in theory) read through it and
-	  look for potential problems yourself.
+	Néhányan nem bíznak meg a
+	  bináris verziókban.  Ha látjuk a
+	  forráskódot is, akkor (elméletben)
+	  át tudjuk nézni és mi magunk is
+	  megkereshetjük a benne lappangó
+	  hibákat.
       
 
       
-	If you have local patches, you will need the source in order to
-	  apply them.
+	Ha vannak saját javításaink, csak a
+	  forráskód birtokában tudjuk õket
+	  felhasználni.
       
 
       
-	Some people like having code around, so they can read it
-	  if they get bored, hack it, borrow from it (license
-	  permitting, of course), and so on.
+	Sokan szeretik, ha egyszerûen csak ott
+	  van a szoftverek forráskódja.  Ha
+	  éppen unatkoznak, beléjük tudnak
+	  nézni, ötleteket és kódot tudnak
+	  belõlük meríteni (persze csak akkor, ha ezt a
+	  licensz megengedi), vagy tovább tudják õket
+	  fejleszteni, orvosolni tudják a hibáikat
+	  stb.
       
     
 
-    To keep track of updated ports, subscribe to the
-      &a.ports; and the &a.ports-bugs;.
+    A portok frissítésérõl a &a.ports;
+      és a &a.ports-bugs; valamelyikérõl
+      szerezhetünk naprakész
+      információkat.
 
     
-      Before installing any application, you should check  for security issues
-	related to your application.
+      Mielõtt bármelyik alkalmazást is
+	telepítenénk, érdemes meglátogatnunk
+	az  oldalt, ahol a
+	hozzátartozó ismert biztonsági
+	problémákról olvashatunk.
 
-      You can also install ports-mgmt/portaudit which will
-	automatically check all installed applications for known
-	vulnerabilities; a check will be also performed before any port
-	build.  Meanwhile, you can use the command portaudit
-	-F -a after you have installed some
-	packages.
+      Feltelepíthetjük a ports-mgmt/portaudit programot is,
+	amely automatikusan ellenõrzi a telepített
+	alkalmazások ismert sebezhetõségeit.  Ez az
+	ellenõrzés egyébként megejthetõ
+	minden port lefordítása elõtt is.  Ezalatt a
+	portaudit -F -a parancs
+	kiadásával ellenõrizhetjük utólag
+	a telepített csomagokat.
     
 
-    The remainder of this chapter will explain how to use
-      packages and ports to install and manage third-party software on
-      FreeBSD.
+    A fejezet fennmaradó részében
+      megmutatjuk, hogyan használjuk &os;-ben a csomagokat
+      és portokat külsõs alkalmazások
+      telepítésére és
+      karbantartására.
   
 
   
-    Finding Your Application
+    A számunkra kellõ alkalmazások
+      megtalálása
 
-    Before you can install any applications you need to know what you
-      want, and what the application is called.
+    Mielõtt telepítenénk bármilyen
+      alkalmazást, ismernünk kell, hogyan is nevezik.
 
-    FreeBSD's list of available applications is growing all the
-      time.  Fortunately, there are a number of ways to find what you
-      want:
+    A &os;-hez elérhetõ alkalmazások
+      listája folyamatosan növekszik.  Szerencsére
+      számos módja van annak, hogy
+      utánajárjunk a keresett szoftvernek:
 
     
       
-	The FreeBSD web site maintains an up-to-date searchable
-	  list of all the available applications, at http://www.FreeBSD.org/ports/.
-	  The ports are divided into categories, and you may either
-	  search for an application by name (if you know it), or see
-	  all the applications available in a category.
+	A &os; honlapján találhatunk egy
+	  rendszeresen frissülõ listát az összes
+	  elérhetõ alkalmazásról, a http://www.FreeBSD.org/ports/
+	  címen.  A portok különbözõ
+	  kategóriákba vannak sorolva, ahol név
+	  szerint megkereshetjük az alkalmazást (amennyiben
+	  ismerjük), vagy
+	  végigböngészhetjük az adott
+	  kategóriában elérhetõ
+	  alkalmazások listáját is.
       
 
       FreshPorts
 
       
-	Dan Langille maintains FreshPorts, at .  FreshPorts
-	  tracks changes to the applications in the ports tree as they
-	  happen, allows you to watch one or more
-	  ports, and can send you email when they are updated.
+	Dan Langlille a  címen
+	  karbantartja a FreshPorts nevû oldalt.  Ezen az oldalon
+	  folyamatosan nyomon lehet követni a portfában
+	  megtalálható alkalmazásokkal
+	  történõ változásokat,
+	  lehetõvé téve, hogy egy vagy több
+	  portot is figyeljünk, vagy e-mailt
+	  küldjünk a
+	  frissítésükrõl.
       
 
       FreshMeat
 
       
-	If you do not know the name of the application you want,
-	  try using a site like FreshMeat () to find an
-	  application, then check back at the FreeBSD site to see if
-	  the application has been ported yet.
+	Amennyiben nem ismerjük a keresett alkalmazás
+	  nevét, próbáljuk meg felkutatni a
+	  FreshMeaten ()
+	  vagy hozzá hasonló oldalakon, majd
+	  nézzük a &os; honlapján, hogy az adott
+	  alkalmazást portolták-e már a
+	  rendszerre.
       
 
       
-	If you know the exact name of the port, but just need to
-        find out which category it is in, you can use the
-        &man.whereis.1; command.
-	Simply type whereis
-        file, where
-        file is the program you want to
-        install.  If it is found on your system, you will be told
-        where it is, as follows:
+	Ha pontosan ismerjük a port nevét, és
+	  csak a kategóriáját kellene
+	  megkeresnünk, használhatjuk erre a &man.whereis.1;
+	  parancsot.  Egyszerûen csak adjuk ki a whereis
+	  név parancsot,
+	  ahol az név a
+	  telepítendõ program neve.  Ha sikerült
+	  megtalálni, részletes információt
+	  kapunk arról, hol található, valahogy
+	  így:
 
       &prompt.root; whereis lsof
 lsof: /usr/ports/sysutils/lsof
 
-      This tells us that lsof (a system
-	utility) can be found in the
+      A fenti példában megtudhatjuk, hogy az
+	lsof parancs a
 	/usr/ports/sysutils/lsof
-	directory.
+	könyvtárban található.
+      
 
       
-	Yet another way to find a particular port is by using the
-        Ports Collection's built-in search mechanism.  To use the
-        search feature, you will need to be in the
-        /usr/ports directory.  Once in that
-        directory, run make search
-        name=program-name where
-        program-name is the name of the
-        program you want to find.  For example, if you were looking
-        for lsof:
+	Egy másik lehetõség egy adott port
+	  megtalálására, ha a
+	  Portgyûjtemény beépített
+	  keresési mechanizmusát használjuk.  Ennek
+	  használatához a /usr/ports
+	  könyvtárban kell állnunk.  Miután
+	  beléptünk ide, futtassuk le a make search
+	  name=programnév
+	  parancsot, ahol a programnév
+	  a keresendõ program neve.  Például, ha az
+	  lsofot keressük:
 
       &prompt.root; cd /usr/ports
 &prompt.root; make search name=lsof
@@ -321,60 +445,71 @@
 B-deps: 
 R-deps: 
 
-      The part of the output you want to pay particular
-        attention to is the Path: line, since that
-        tells you where to find the port.  The other information
-        provided is not needed in order to install the port, so it
-        will not be covered here.
+      Az eredményben leginkább a
+	Path: kezdetû sorra kell odafigyelnünk,
+	mivel ez árulja el, hol is találhatjuk meg a
+	portot.  Az itt szereplõ többi
+	információ nem szükséges a port
+	telepítéséhez, ezért azokkal itt
+	most nem foglalkozunk.
 
-      For more in-depth searching you can also use make
-       search key=string where
-       string is some text to search for.
-       This searches port names, comments, descriptions and
-       dependencies and can be used to find ports which relate to a
-       particular subject if you do not know the name of the program
-       you are looking for.
+      Mélyebb keresésekhez használhatjuk a
+	make search
+	key=szöveg parancsot
+	is, ahol a szöveg a
+	keresendõ szöveg(részlet) lesz.  Ezt a rendszer
+	keresni fogja a portok neveiben, megjegyzésekben,
+	leírásokban és
+	függõségekben.  Amikor nem ismerjük a
+	keresett program nevét, ez olyan portok
+	keresésére használható, amelyek egy
+	adott témához kapcsolódnak.
 
-      In both of these cases, the search string is case-insensitive.
-       Searching for LSOF will yield the same results as 
-       searching for lsof.
+      A fenti esetek mindegyikében a keresés nem
+	különbözteti meg a kis- és nagybetûket.
+	Tehát a LSOF keresése ugyanazt az
+	eredményt adja, mint az lsof
+	esetén.
       
 
     
   
 
   
-        
+    
       
         
-          Chern
+	  Chern
 	  Lee
-	  Contributed by 
+	  Írta: 
         
       
-    
     
 
-    Using the Packages System
+    A csomagrendszer használata
 
     
-      Installing a Package
+      Csomagok telepítése
       
-        packages
-        installing
+	csomagok
+	telepítése
       
-    
+
       
-        pkg_add
+	pkg_add
       
-      You can use the &man.pkg.add.1; utility to install a
-	FreeBSD software package from a local file or from a server on
-	the network.
+      A &man.pkg.add.1; segédprogram
+	segítségével telepíthetünk fel
+	&os;-hez készült szoftvercsomagokat helyben vagy a
+	hálózaton levõ egyik szerveren
+	megtalálható
+	állományokból:
 
       
-        Downloading a Package Manually and Installing It Locally
+	Csomagok letöltése manuálisan
+	  és telepítése helybõl
 
-        &prompt.root; ftp -a ftp2.FreeBSD.org
+	&prompt.root; ftp -a ftp2.FreeBSD.org
 Connected to ftp2.FreeBSD.org.
 220 ftp2.FreeBSD.org FTP server (Version 6.00LS) ready.
 331 Guest login ok, send your email address as password.
@@ -399,288 +534,374 @@
 &prompt.root; pkg_add lsof-4.56.4.tgz
       
 
-      If you do not have a source of local packages (such as a
-        FreeBSD CD-ROM set) then it will probably be easier to use the
-         option to &man.pkg.add.1;.  This will
-        cause the utility to automatically determine the correct
-        object format and release and then fetch and install the
-        package from an FTP site.
-      
+      Ha nincsenek egyáltalán helyben csomagjaink
+	(pl. egy &os; CD-készletben), akkor a legjobban úgy
+	járunk, ha a használjuk a &man.pkg.add.1;
+	 kapcsolóját.  Ennek
+	hatására a segédprogram
+	önmagától meghatározza a
+	szükséges állományformátumot
+	és verziót, majd letölti FTP-n keresztül
+	és feltelepíti a csomagot.
 
       
-        pkg_add
+	pkg_add
       &prompt.root; pkg_add -r lsof
 
-      The example above would download the correct package and
-	add it without any further user intervention.
-	If you want to specify an alternative &os; Packages Mirror,
-	instead of the main distribution site, you have to set the
-	PACKAGESITE environment variable accordingly, to
-	override the default settings.  &man.pkg.add.1;
-	uses &man.fetch.3; to download the files, which honors various
-	environment variables, including
-	FTP_PASSIVE_MODE, FTP_PROXY, and
-	FTP_PASSWORD.  You may need to set one or more
-	of these if you are behind a firewall, or need to use an
-	FTP/HTTP proxy.  See &man.fetch.3; for the complete list.
-	Note that in the example above
-	lsof is used instead of
-	lsof-4.56.4.  When the remote fetching
-	feature is used, the version number of the package must be
-	removed.  &man.pkg.add.1; will automatically fetch the latest
-	version of the application.
+      Az iménti példában a program
+	mindenféle további beavatkozás
+	nélkül letölti a megfelelõ csomagot
+	és felteszi.  Ha a központi helyett egy másik
+	szervert szeretnénk használni, felül kell
+	bírálnunk az alapértelmezett
+	beállításokat és igényeinknek
+	megfelelõen be kell állítanunk a
+	PACKAGESITE környezeti változó
+	értékét.  A &man.pkg.add.1; a &man.fetch.3;
+	programot használja az állományok
+	letöltésére, ami pedig számos
+	egyéb környezeti változót is
+	tiszteletben tart, mint mondjuk az
+	FTP_PASSIVE_MODE, az FTP_PROXY
+	és az FTP_PASSWORD.  Ha tûzfal
+	mögött vagyunk, ezek közül
+	néhányat biztosan be kell majd
+	állítanunk, vagy FTP/HTTP proxy-t kell
+	használnunk.  A &man.fetch.3; man oldalán
+	megtaláljuk ezen változók teljes
+	felsorolását.  Figyeljük meg, hogy az
+	lsof-4.56.4 helyett csak
+	lsof-ot adtunk meg.  Amikor ugyanis
+	kérjük a csomag letöltését is,
+	nem szabad verziószámot megadnunk.  A
+	&man.pkg.add.1; mindig az alkalmazás legfrissebb
+	verzióját fogja letöltetni.
 
       
-	&man.pkg.add.1; will download the latest version of
-	  your application if you are using &os.current; or
-	  &os.stable;.  If you run a -RELEASE version, it will grab
-	  the version of the package that was built with your
-	  release.  It is possible to change this behavior by
-	  overriding PACKAGESITE.
-	  For example, if you run a &os; 5.4-RELEASE
-	  system, by default &man.pkg.add.1; will try to fetch
-	  packages from
-	  ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-5.4-release/Latest/.
-	  If you want to force &man.pkg.add.1; to download
-	  &os; 5-STABLE packages, set PACKAGESITE
-	  to
-	  ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-5-stable/Latest/.
-	
+	Ha a &os.current; vagy &os.stable; verziókat
+	  használjuk, a &man.pkg.add.1; mindig az alkalmazás
+	  elérhetõ legfrissebb verzióját fogja
+	  letölteni.  Ha azonban valamelyik -RELEASE verziót
+	  használjuk, a csomagnak az adott kiadáshoz
+	  készült verzióját fogja leszedni.
+	  Ezt az észjárást a
+	  PACKAGESITE változó
+	  felülírásával viszont meg tudjuk
+	  változtatni.  Például ha a
+	  &os; 5.4-RELEASE változatával dolgozunk, a
+	  &man.pkg.add.1; alapértelmezés szerint a
+	  ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-5.4-release/Latest/
+	  címrõl fogja letölteni a csomagokat.
+	  Amennyiben ezzel szemben mi viszont a &os; 5-STABLE
+	  csomagok letöltését akarjuk elérni,
+	  állítsuk az PACKAGESITE
+	  értékét a
+	  ftp://ftp.freebsd.org/pub/FreeBSD/i386/packages-5-stable/Latest/
+	  címre.
       
 
-      Package files are distributed in .tgz
-          and .tbz formats.  You can find them at ,
-          or on the FreeBSD CD-ROM distribution.  Every CD on the
-          FreeBSD 4-CD set (and the PowerPak, etc.) contains packages
-          in the /packages directory.  The layout
-          of the packages is similar to that of the
-          /usr/ports tree.  Each category has its
-          own directory, and every package can be found within the
-          All directory.
-      
+      A csomagok .tgz és
+	.tbz formátumokban kerülnek
+	terjesztésre.  Ezek az 
+	címen, vagy pedig a &os; CD-ken találhatóak
+	meg.  A 4 CD-bõl álló készlet (ill. a
+	PowerPak stb.) minden CD-jén találhatunk
+	csomagokat a packages/
+	könyvtárban.  A csomagokat tároló
+	könyvtár struktúrája hasonló a
+	/usr/ports könyvtárban
+	kialakított könyvtárfához.  Minden
+	kategóriának saját könyvtára
+	van, és minden csomag megtalálható az
+	All (összes)
+	kategóriában.
 
-      The directory structure of the package system matches the
-        ports layout; they work with each other to form the entire
-        package/port system.
-      
+      A csomagrendszer könyvtárszerkezete tehát
+	megegyezik a portok szétosztásával,
+	ezáltal így képesek egymással
+	összedolgozni a teljes csomag/port rendszer
+	megformálásában.
 
     
 
     
-      Managing Packages
+      A csomagok kezelése
 
       
-        packages
-        managing
+	csomagok
+	kezelés
       
-      &man.pkg.info.1; is a utility that lists and describes 
-        the various packages installed.
-      
+      A &man.pkg.info.1; egy olyan segédprogram, amellyel
+	készíteni lehet egy listát a
+	telepített csomagokról, és más
+	egyéb információkat tudhatunk meg
+	róluk.
 
       
-        pkg_info
+	pkg_info
       
       &prompt.root; pkg_info
 cvsup-16.1          A general network file distribution system optimized for CV
 docbook-1.2         Meta-port for the different versions of the DocBook DTD
 ...
-      &man.pkg.version.1; is a utility that summarizes the
-        versions of all installed packages.  It compares the package 
-        version to the current version found in the ports tree.
-       
+      A &man.pkg.version.1; összefoglalja az összes
+	telepített csomag verzióját.
+	Ezenkívül össze is hasonlítja a csomagok
+	verzióját a portfában
+	található aktuális
+	verziókéval.
       
-        pkg_version
+	pkg_version
       
         &prompt.root; pkg_version
 cvsup                       =
 docbook                     =
 ...
 
-      The symbols in the second column indicate the relative age
-        of the installed version and the version available in the
-        local ports tree.
+      A második oszlopban látható jelek
+	utalnak a telepített verzió a helyi portfában
+	található verzióéhoz
+	viszonyított korára.
 
       
         
-	  
-            
-              Symbol
-              Meaning
-            
-          
-
- 	  
-  	    
-	    = The version of the
-	    installed package matches the one found in the
-	    local ports tree.
-  	    
- 
-        <
-	The installed version is older than the one available
-	in the ports tree.
-	
-
-        >The installed version is newer
-          than the one found in the local ports tree. (The local ports
-          tree is probably out of date.)
-
-        ?The installed package cannot be
-	  found in the ports index.  (This can happen, for instance, if an
-	  installed port is removed from the Ports Collection or
-	  renamed.)
-
-        *There are multiple versions of the
-        package.
-
+	
+	    
+	      Jel
+	      Jelentés
+	    
+	
+	
+	  
+	    =
+	    A telepített csomag verziója megegyzik
+	      a helyi portfában található
+	      verziójával.
+	  
+	  
+	    <
+	    A telepített verzió a portfában
+	      levõnél régebbi.
+	  
+	  

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat Oct 27 03:42:35 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 94E9916A421; Sat, 27 Oct 2007 03:42: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 3ABE516A41A
	for ; Sat, 27 Oct 2007 03:42:35 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2B09E13C48E
	for ; Sat, 27 Oct 2007 03:42:35 +0000 (UTC)
	(envelope-from kmacy@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 l9R3gZve029171
	for ; Sat, 27 Oct 2007 03:42:35 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9R3gYbu029168
	for perforce@freebsd.org; Sat, 27 Oct 2007 03:42:34 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sat, 27 Oct 2007 03:42:34 GMT
Message-Id: <200710270342.l9R3gYbu029168@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128170 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 27 Oct 2007 03:42:36 -0000

http://perforce.freebsd.org/chv.cgi?CH=128170

Change 128170 by kmacy@kmacy:storage:toestack on 2007/10/27 03:42:01

	basic infrastructure for TOE connection setup

Affected files ...

.. //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.c#4 edit
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.h#4 edit
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#7 edit
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.h#5 edit
.. //depot/projects/toestack/sys/dev/cxgb/sys/mvec.h#5 edit
.. //depot/projects/toestack/sys/dev/cxgb/t3cdev.h#2 edit
.. //depot/projects/toestack/sys/dev/cxgb/ulp/toecore/toedev.c#3 edit
.. //depot/projects/toestack/sys/dev/cxgb/ulp/toecore/toedev.h#5 edit
.. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#1 add
.. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#1 add
.. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_listen.c#1 add
.. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.c#1 add
.. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.h#1 add
.. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#1 add
.. //depot/projects/toestack/sys/modules/cxgb/Makefile#8 edit
.. //depot/projects/toestack/sys/modules/cxgb/cxgb/Makefile#4 edit
.. //depot/projects/toestack/sys/modules/cxgb/toecore/Makefile#2 edit
.. //depot/projects/toestack/sys/netinet/tcp_var.h#5 edit
.. //depot/projects/toestack/sys/sys/socket.h#4 edit

Differences ...

==== //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.c#4 (text+ko) ====


==== //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.h#4 (text+ko) ====

@@ -108,12 +108,10 @@
 #define L2T_MBUF_CB(skb) ((struct l2t_mbuf_cb *)(skb)->cb)
 
 
-static __inline void set_arp_failure_handler(struct mbuf *m,
+static __inline void set_arp_failure_handler(struct toe_mbuf *m,
 					   arp_failure_handler_func hnd)
 {
-#if 0
-	L2T_SKB_CB(skb)->arp_failure_handler = hnd;
-#endif
+	m->m_toe.mt_arp_fail = hnd;
 	panic("implement me");
 }
 
@@ -146,8 +144,8 @@
 			   struct l2t_entry *e)
 {
 	if (__predict_true(e->state == L2T_STATE_VALID))
-		return cxgb_ofld_send(dev, m);
-	return t3_l2t_send_slow(dev, m, e);
+		return cxgb_ofld_send(dev, (struct mbuf *)m);
+	return t3_l2t_send_slow(dev, (struct mbuf *)m, e);
 }
 
 static inline void l2t_release(struct l2t_data *d, struct l2t_entry *e)

==== //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#7 (text+ko) ====

@@ -1641,3 +1641,4 @@
 
 #endif
 
+MODULE_VERSION(if_cxgb, 1);

==== //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.h#5 (text+ko) ====

@@ -256,5 +256,5 @@
 int attach_t3cdev(struct t3cdev *dev);
 void detach_t3cdev(struct t3cdev *dev);
 
-
+#define UNIMPLEMENTED() panic("IMPLEMENT: %s:%s:%d", __FUNCTION__, __FILE__, __LINE__)
 #endif

==== //depot/projects/toestack/sys/dev/cxgb/sys/mvec.h#5 (text+ko) ====

@@ -77,6 +77,7 @@
 #define MAX_MBUF_IOV        ((MHLEN-8)/sizeof(struct mbuf_iovec))
 #define MAX_MIOVEC_IOV      ((MIOVBYTES-sizeof(struct m_hdr)-sizeof(struct pkthdr)-8)/sizeof(struct mbuf_iovec))
 #define MAX_CL_IOV          ((MCLBYTES-sizeof(struct m_hdr)-sizeof(struct pkthdr)-8)/sizeof(struct mbuf_iovec))
+#define MAX_PAGE_IOV        ((MJUMPAGESIZE-sizeof(struct m_hdr)-sizeof(struct pkthdr)-8)/sizeof(struct mbuf_iovec))
 
 struct mbuf_vec {
 	uint16_t mv_first;     /* first valid cluster        */

==== //depot/projects/toestack/sys/dev/cxgb/t3cdev.h#2 (text+ko) ====

@@ -16,13 +16,13 @@
 struct t3cdev {
 	char name[T3CNAMSIZ];		    /* T3C device name */
 	enum t3ctype type;
-	TAILQ_ENTRY(t3cdev) ofld_entry;  /* for list linking */
+	TAILQ_ENTRY(t3cdev) entry;  /* for list linking */
         struct ifnet *lldev;     /* LL dev associated with T3C messages */
 	struct adapter *adapter;			    
 	int (*send)(struct t3cdev *dev, struct mbuf *m);
 	int (*recv)(struct t3cdev *dev, struct mbuf **m, int n);
 	int (*ctl)(struct t3cdev *dev, unsigned int req, void *data);
-	void (*neigh_update)(struct t3cdev *dev, struct rtentry *neigh);
+	void (*arp_update)(struct t3cdev *dev, struct rtentry *neigh);
 	void *priv;                         /* driver private data */
 	void *l2opt;                        /* optional layer 2 data */
 	void *l3opt;                        /* optional layer 3 data */

==== //depot/projects/toestack/sys/dev/cxgb/ulp/toecore/toedev.c#3 (text+ko) ====

@@ -380,7 +380,7 @@
 }
 
 static int
-toedev_load(module_t mod, int cmd, void *arg)
+toecore_load(module_t mod, int cmd, void *arg)
 {
 	int err = 0;
 
@@ -415,9 +415,10 @@
 
 
 static moduledata_t mod_data= {
-	"toedev",
-	toedev_load,
+	"toecore",
+	toecore_load,
 	0
 };
 
-DECLARE_MODULE(toedev, mod_data, SI_SUB_EXEC, SI_ORDER_ANY);
+MODULE_VERSION(toecore, 1);
+DECLARE_MODULE(toecore, mod_data, SI_SUB_EXEC, SI_ORDER_ANY);

==== //depot/projects/toestack/sys/dev/cxgb/ulp/toecore/toedev.h#5 (text+ko) ====

@@ -163,10 +163,13 @@
 }
 #endif /* CONFIG_TCP_OFFLOAD */
 
+struct toepcb;
 
 struct m_toe_ {
-	void             (*mt_arp_fail)(struct toedev *, struct mbuf *);
-	struct socket    *mt_so;  
+	void		(*mt_arp_fail)(struct t3cdev *, struct mbuf *);
+	void		(*mt_backlog_rcv)(struct toepcb *, struct mbuf *);
+	int 		priority;
+	struct toepcb	*mt_toepcb;  
 };
 
 #define TMLEN  (MLEN - sizeof(struct m_toe_))
@@ -186,5 +189,6 @@
 	} M_dat;
 };
 
+#define m_toe	M_dat.MH.MH_toe
 
 #endif /* _OFFLOAD_DEV_H_ */

==== //depot/projects/toestack/sys/modules/cxgb/Makefile#8 (text+ko) ====

@@ -2,5 +2,6 @@
 SUBDIR= cxgb
 SUBDIR+= iw_cxgb
 SUBDIR+= toecore
+SUBDIR+= tom
 
 .include 

==== //depot/projects/toestack/sys/modules/cxgb/cxgb/Makefile#4 (text+ko) ====

@@ -7,7 +7,7 @@
 SRCS=	cxgb_mc5.c cxgb_vsc8211.c cxgb_ael1002.c cxgb_mv88e1xxx.c 
 SRCS+=	cxgb_xgmac.c cxgb_vsc7323.c cxgb_t3_hw.c cxgb_main.c 
 SRCS+=  cxgb_sge.c cxgb_lro.c cxgb_offload.c cxgb_l2t.c
-SRCS+=	device_if.h bus_if.h pci_if.h opt_zero.h 
+SRCS+=	device_if.h bus_if.h pci_if.h opt_zero.h opt_sched.h
 SRCS+=	uipc_mvec.c cxgb_multiq.c cxgb_support.c
 
 CFLAGS+= -DCONFIG_CHELSIO_T3_CORE -g -DCONFIG_DEFINED -DDEFAULT_JUMBO -I${CXGB} -DSMP

==== //depot/projects/toestack/sys/modules/cxgb/toecore/Makefile#2 (text+ko) ====

@@ -3,5 +3,5 @@
 
 KMOD=	toecore
 SRCS=   toedev.c
-SRCS+=	device_if.h bus_if.h pci_if.h 
+SRCS+=	device_if.h bus_if.h pci_if.h opt_sched.h
 .include 
==== //depot/projects/toestack/sys/netinet/tcp_var.h#5 (text+ko) ====

@@ -208,7 +208,7 @@
 	u_int32_t	rfbuf_ts;	/* recv buffer autoscaling timestamp */
 	int	rfbuf_cnt;		/* recv buffer autoscaling byte count */
 	struct toe_usrreqs *t_tu;       /* offload operations vector */
-	void *t_toe_priv;
+	void *t_toe;
 };
 
 #define IN_FASTRECOVERY(tp)	(tp->t_flags & TF_FASTRECOVERY)

==== //depot/projects/toestack/sys/sys/socket.h#4 (text+ko) ====

@@ -119,6 +119,7 @@
 #define	SO_BINTIME	0x2000		/* timestamp received dgram traffic */
 #endif
 #define	SO_NOOFFLOAD	0x4000		/* socket cannot be offloaded */
+#define SO_NO_DDP       0x8000
 
 /*
  * Additional options, not kept in so_options.

From owner-p4-projects@FreeBSD.ORG  Sat Oct 27 21:44:57 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 58FFA16A41A; Sat, 27 Oct 2007 21:44: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 C3C1016A417
	for ; Sat, 27 Oct 2007 21:44:56 +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 B1F7113C48A
	for ; Sat, 27 Oct 2007 21:44:56 +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 l9RLiur1067029
	for ; Sat, 27 Oct 2007 21:44:56 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9RLisBV067026
	for perforce@freebsd.org; Sat, 27 Oct 2007 21:44:54 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 27 Oct 2007 21:44:54 GMT
Message-Id: <200710272144.l9RLisBV067026@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 128208 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 27 Oct 2007 21:44:57 -0000

http://perforce.freebsd.org/chv.cgi?CH=128208

Change 128208 by jb@jb_freebsd1 on 2007/10/27 21:44:22

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#13 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#7 integrate
.. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#8 integrate
.. //depot/projects/dtrace/doc/share/sgml/man-refs.ent#18 integrate
.. //depot/projects/dtrace/ports/LEGAL#25 integrate
.. //depot/projects/dtrace/ports/MOVED#49 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#19 integrate
.. //depot/projects/dtrace/src/bin/ps/extern.h#4 integrate
.. //depot/projects/dtrace/src/bin/ps/keyword.c#4 integrate
.. //depot/projects/dtrace/src/bin/ps/print.c#5 integrate
.. //depot/projects/dtrace/src/bin/ps/ps.c#5 integrate
.. //depot/projects/dtrace/src/include/_ctype.h#5 integrate
.. //depot/projects/dtrace/src/lib/Makefile#15 integrate
.. //depot/projects/dtrace/src/lib/libkvm/kvm_proc.c#10 integrate
.. //depot/projects/dtrace/src/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8#4 integrate
.. //depot/projects/dtrace/src/rescue/rescue/Makefile#8 integrate
.. //depot/projects/dtrace/src/share/man/man8/rc.subr.8#9 integrate
.. //depot/projects/dtrace/src/share/man/man9/Makefile#18 integrate
.. //depot/projects/dtrace/src/share/man/man9/kproc.9#2 integrate
.. //depot/projects/dtrace/src/share/man/man9/kthread.9#5 integrate
.. //depot/projects/dtrace/src/share/misc/committers-doc.dot#2 integrate
.. //depot/projects/dtrace/src/share/mk/sys.mk#10 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/local_apic.c#10 integrate
.. //depot/projects/dtrace/src/sys/amd64/conf/DEFAULTS#10 integrate
.. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#24 integrate
.. //depot/projects/dtrace/src/sys/amd64/include/clock.h#7 integrate
.. //depot/projects/dtrace/src/sys/amd64/isa/clock.c#7 integrate
.. //depot/projects/dtrace/src/sys/arm/at91/at91rm92reg.h#6 integrate
.. //depot/projects/dtrace/src/sys/arm/at91/kb920x_machdep.c#19 integrate
.. //depot/projects/dtrace/src/sys/arm/at91/std.at91#5 integrate
.. //depot/projects/dtrace/src/sys/arm/at91/std.kb920x#6 integrate
.. //depot/projects/dtrace/src/sys/boot/arm/at91/boot2/boot2.c#4 integrate
.. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/eeprom.c#5 integrate
.. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/emac.c#9 integrate
.. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/lib.h#6 integrate
.. //depot/projects/dtrace/src/sys/boot/common/ufsread.c#5 integrate
.. //depot/projects/dtrace/src/sys/boot/i386/boot2/boot2.c#8 integrate
.. //depot/projects/dtrace/src/sys/boot/i386/gptboot/Makefile#2 integrate
.. //depot/projects/dtrace/src/sys/boot/i386/gptboot/gptboot.c#2 integrate
.. //depot/projects/dtrace/src/sys/conf/files#47 integrate
.. //depot/projects/dtrace/src/sys/conf/files.amd64#19 integrate
.. //depot/projects/dtrace/src/sys/conf/files.i386#23 integrate
.. //depot/projects/dtrace/src/sys/conf/files.pc98#15 integrate
.. //depot/projects/dtrace/src/sys/conf/options.arm#11 integrate
.. //depot/projects/dtrace/src/sys/contrib/pf/net/pf.c#10 integrate
.. //depot/projects/dtrace/src/sys/ddb/db_examine.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/acpica/acpi_pci.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/acpica/acpi_pci_link.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-chipset.c#16 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-pci.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/atapi-cd.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/atapi-cd.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/nvram/nvram.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/pci/pci_user.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/sound/pcm/ac97.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/sound/pcm/ac97_patch.c#7 integrate
.. //depot/projects/dtrace/src/sys/geom/geom_io.c#6 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#9 integrate
.. //depot/projects/dtrace/src/sys/i386/conf/DEFAULTS#10 integrate
.. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#23 integrate
.. //depot/projects/dtrace/src/sys/i386/include/clock.h#7 integrate
.. //depot/projects/dtrace/src/sys/i386/isa/clock.c#8 integrate
.. //depot/projects/dtrace/src/sys/kern/init_main.c#18 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_exit.c#14 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_idle.c#10 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_intr.c#14 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_kthread.c#6 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_mbuf.c#10 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_shutdown.c#10 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_sig.c#15 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_thread.c#13 integrate
.. //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#23 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#19 integrate
.. //depot/projects/dtrace/src/sys/modules/Makefile#25 integrate
.. //depot/projects/dtrace/src/sys/modules/geom/Makefile#7 integrate
.. //depot/projects/dtrace/src/sys/modules/nvram/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/net/if_disc.c#6 integrate
.. //depot/projects/dtrace/src/sys/net/if_loop.c#8 integrate
.. //depot/projects/dtrace/src/sys/netatalk/aarp.c#6 integrate
.. //depot/projects/dtrace/src/sys/netinet/if_ether.c#10 integrate
.. //depot/projects/dtrace/src/sys/netinet/igmp.c#7 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#22 integrate
.. //depot/projects/dtrace/src/sys/netinet6/nd6.c#12 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_vfsops.c#13 integrate
.. //depot/projects/dtrace/src/sys/pc98/conf/GENERIC#12 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit.c#10 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit.h#7 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_bsm.c#10 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_framework.h#12 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_inet.c#10 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_net.c#10 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_policy.h#6 integrate
.. //depot/projects/dtrace/src/sys/security/mac_biba/mac_biba.c#13 integrate
.. //depot/projects/dtrace/src/sys/security/mac_lomac/mac_lomac.c#11 integrate
.. //depot/projects/dtrace/src/sys/security/mac_mls/mac_mls.c#12 integrate
.. //depot/projects/dtrace/src/sys/security/mac_stub/mac_stub.c#10 integrate
.. //depot/projects/dtrace/src/sys/security/mac_test/mac_test.c#9 integrate
.. //depot/projects/dtrace/src/sys/sys/kthread.h#5 integrate
.. //depot/projects/dtrace/src/sys/sys/proc.h#23 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_page.c#22 integrate
.. //depot/projects/dtrace/src/tools/regression/geom_eli/init-a.t#4 integrate
.. //depot/projects/dtrace/src/tools/regression/geom_eli/init.t#5 integrate
.. //depot/projects/dtrace/src/tools/regression/geom_eli/integrity-copy.t#4 integrate
.. //depot/projects/dtrace/src/tools/regression/geom_eli/integrity-data.t#4 integrate
.. //depot/projects/dtrace/src/tools/regression/geom_eli/integrity-hmac.t#4 integrate
.. //depot/projects/dtrace/src/tools/regression/geom_eli/onetime-a.t#4 integrate
.. //depot/projects/dtrace/src/tools/regression/geom_eli/onetime.t#5 integrate
.. //depot/projects/dtrace/src/usr.bin/top/machine.c#7 integrate
.. //depot/projects/dtrace/src/usr.sbin/crunch/crunchgen/crunched_main.c#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/devinfo/devinfo.c#5 integrate
.. //depot/projects/dtrace/src/usr.sbin/mountd/mountd.c#12 integrate
.. //depot/projects/dtrace/src/usr.sbin/pciconf/cap.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/pkg_install/version/perform.c#5 integrate
.. //depot/projects/dtrace/src/usr.sbin/wpa/hostapd/hostapd.8#4 integrate
.. //depot/projects/dtrace/www/en/donations/wantlist.sgml#25 integrate
.. //depot/projects/dtrace/www/en/features.sgml#5 integrate
.. //depot/projects/dtrace/www/en/index.xsl#14 integrate
.. //depot/projects/dtrace/www/en/ports/Makefile#5 integrate
.. //depot/projects/dtrace/www/en/snapshots/index.sgml#18 integrate
.. //depot/projects/dtrace/www/en/where.sgml#11 integrate
.. //depot/projects/dtrace/www/share/sgml/news.xml#24 integrate
.. //depot/projects/dtrace/www/share/sgml/release.ent#11 integrate

Differences ...

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#13 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -4093,7 +4093,7 @@
 	System Tools menu.
 
       &os; can support &ms-dos; based file systems (FAT16 and FAT32).
-	This requires you use the &man.mount.msdosfs.8; command
+	This requires you use the &man.mount.8; command
 	with the required parameters.  The utility most common usage is:
 
       &prompt.root; mount -t msdosfs /dev/ad0s1 /mnt
@@ -4123,19 +4123,19 @@
 	  
 	    My system hangs while probing hardware during boot,
 	      or it behaves strangely during install, or the floppy
-	      drive isn't probed.
+	      drive is not probed.
 	  
 	  
 	    &os; 5.0 and above makes extensive use of the system
 	      ACPI service on the i386, amd64 and ia64 platforms to
-	      aid in system configuration if it's detected during
+	      aid in system configuration if it is detected during
 	      boot.  Unfortunately, some bugs still exist in both the
 	      ACPI driver and within system motherboards and BIOS.
 	      The use of ACPI can be disabled by setting
 	      the hint.acpi.0.disabled hint in the
 	      third stage boot loader:
 
-	    set hint.acpi.0.disabled="1"
+	    set hint.acpi.0.disabled="1"
 
 	    This is reset each time the system is booted, so it
 	      is necessary to
@@ -4204,7 +4204,7 @@
 
 	    To tell &os; that you want to boot from BIOS disk 2,
 	      which is the first SCSI disk in the system.  If you only
-	      had one IDE disk, you would use '1:' instead.
+	      had one IDE disk, you would use 1: instead.
 
 	    Once you have determined the correct values to use,
 	      you can put the command exactly as you would have typed
@@ -4219,17 +4219,17 @@
 	    I go to boot from the hard disk for the first time
 	      after installing &os;, but the Boot Manager prompt just
 	      prints F? at the boot menu each time
-	      but the boot won't go any further.
+	      but the boot will not go any further.
 	  
 	  
 	    The hard disk geometry was set incorrectly in the
-	      Partition editor when you installed &os;.  Go back into
+	      partition editor when you installed &os;.  Go back into
 	      the partition editor and specify the actual geometry of
 	      your hard disk.  You must reinstall &os; again from the
 	      beginning with the correct geometry.
 
 	    If you are failing entirely in figuring out the
-	      correct geometry for your machine, here's a tip: Install
+	      correct geometry for your machine, here is a tip: Install
 	      a small DOS partition at the beginning of the disk and
 	      install &os; after that.  The install program will see
 	      the DOS partition and try to infer the correct geometry
@@ -4240,10 +4240,10 @@
 
 	    

 	      If you are setting up a truly dedicated &os;
-		server or workstation where you don't care for
+		server or workstation where you do not care for
 		(future) compatibility with DOS, Linux or another
-		operating system, you've also got the option to use
-		the entire disk (`A' in the partition editor),
+		operating system, you also have got the option to use
+		the entire disk (A in the partition editor),
 		selecting the non-standard option where &os; occupies
 		the entire disk from the very first to the very last
 		sector.  This will leave all geometry considerations
@@ -4262,7 +4262,7 @@
 	    Your card is probably on a different IRQ from what
 	      is specified in
 	      the /boot/device.hints file.  The
-	      ed driver does not use the `soft' configuration by
+	      &man.ed.4; driver does not use the soft configuration by
 	      default (values entered using EZSETUP in DOS), but it
 	      will use the software configuration if you
 	      specify -1 in the hints for the
@@ -4271,7 +4271,7 @@
 	    Either move the jumper on the card to a hard
 	      configuration setting (altering the kernel settings if
 	      necessary), or specify the IRQ as -1
-	      by setting the hint hint.ed.0.irq="-1"
+	      by setting the hint hint.ed.0.irq="-1"
 	      This will tell the kernel to use the soft
 	      configuration.
 

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#7 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -799,7 +799,7 @@
 		analogy above is not very accurate, and it may be
 		more suitable to say that these are the people who gave up
 		their lives in favor of FreeBSD against their better
-		judgment!
+		judgement!
 	    
 	  
 	

==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#8 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml,v 1.36 2007/07/26 18:31:30 blackend Exp $
-     Original revision: 1.359
+     $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml,v 1.37 2007/10/27 07:58:51 blackend Exp $
+     Original revision: 1.383
 -->
 
 
@@ -120,9 +120,9 @@
 	linkend="install-floppies">.
 
       
-	Architectures &i386; et pc98
+	Architectures &os;/&arch.i386; et &os;/&arch.pc98;
 
-	&os;/&i386 et &os;/pc98 nécessitent un processeur
+	&os;/&arch.i386; et &os;/&arch.pc98; nécessitent un processeur
 	  486 ou plus performant et au moins 24 Mo de RAM.  Vous
 	  aurez également besoin d'au moins 150 Mo
 	  d'espace libre sur un disque dur pour l'installation la plus
@@ -137,9 +137,11 @@
       
 
       
-	Architecture Alpha
+	Architecture &os;/&arch.alpha;
+
+	Alpha
 
-	Pour installer &os;/alpha, une plate-forme
+	Pour installer &os;/&arch.alpha;, une plate-forme
 	  supportée sera nécessaire (voir ) ainsi qu'un disque
 	  dédié à &os;.  Il n'est pas, pour le
@@ -150,19 +152,40 @@
 	  disque IDE en supposant que votre machine permet le
 	  démarrage à partir de disques IDE.
 
+	ARC
+	Alpha BIOS
+	SRM
+
 	Vous aurez besoin du firmware SRM pour votre
 	  plate-forme.  Dans certains cas, il est possible de basculer
 	  entre AlphaBIOS (ou ARC) et SRM.  Dans d'autres cas, il sera
 	  nécessaire de récupérer un nouveau
 	  firmware sur le site du constructeur.
+
+	
+	  Le support pour l'architecture Alpha cesse avec
+	    &os; 7.0.  Les versions
+	    &os; 6.X sont les
+	    dernières proposant le support de cette
+	    architecture.
+	
       
 
       
-	Architecture amd64
+	Architecture &os;/&arch.amd64;
+
+	Il existe deux classes de processeurs en mesure
+	  d'utiliser &os;/&arch.amd64;.  La première est
+	  composée des processeurs AMD64, dont les processeurs
+	  &amd.athlon;64, &amd.athlon;64-FX, &amd.opteron; et
+	  suivants.
 
-	&os;/amd64 nécessite un processeur
-	  &amd.athlon;64, &amd.athlon;64-FX, &amd.opteron; ou plus
-	  puissant pour fonctionner.
+	La seconde classe de processeurs pouvant utiliser
+	  &os;/&arch.amd64; comprend les processeurs basés sur
+	  l'architecture &intel; EM64T.  Comme par exemple, les
+	  familles de processeur &intel; &core; 2 Duo, Quad,
+	  et Extreme et la série des processeurs
+	  &intel; &xeon; 3000, 5000, et 7000.
 
 	Si vous avez une machine basée sur le circuit
 	  nVidia nForce3 Pro-150, vous devez
@@ -175,14 +198,14 @@
       
 
       
-	Architecture &sparc64;
+	Architecture &os;/&arch.sparc64;
 
-	Pour installer &os;/&sparc64;, une plate-forme
+	Pour installer &os;/&arch.sparc64;, une plate-forme
 	  supportée sera nécessaire (voir ).
 
 	Vous aurez besoin d'un disque dédié pour
-	  &os;/&sparc64;.  Il n'est pas, pour le moment, possible de
+	  &os;/&arch.sparc64;.  Il n'est pas, pour le moment, possible de
 	  partager un disque avec un autre système
 	  d'exploitation.
       
@@ -367,7 +390,7 @@
 	sur le disque, et comment cela vous affecte.
 
       
-	Organisation des disques pour l'architecture &i386;
+	Organisation des disques pour l'architecture &os;/&arch.i386;
 
       Le disque d'un PC peut être divisé en portions
 	indépendantes.
@@ -453,7 +476,17 @@
 	Les logiciels &partitionmagic; et
 	GParted fonctionne également avec
 	les partitions NTFS.
-      
+	GParted est disponible sur
+	plusieurs CD Live Linux, comme SystemRescueCD.
+
+      Des problèmes ont été
+	rapportés concernant le redimensionnement des
+	partitions µsoft; Vista.  Il est recommandé
+	d'avoir un CDROM de Vista sous la main quand l'on tente une
+	telle opération.  Comme pour toute tâche de
+	maintenance des disques, il est fortement conseillé de
+	disposer d'un ensemble de sauvegardes à jour.
 
       
 	Une utilisation incorrecte de ces outils peut détruire les
@@ -772,7 +805,7 @@
 	    respectivement l'architecture et le numéro de
 	    version que vous désirez installer.  Par exemple,
 	    les images de disquettes de démarrage de
-	    &os; &rel.current;-RELEASE pour &i386; sont
+	    &os;/&arch.i386; &rel.current;-RELEASE sont
 	    disponibles à partir de l'adresse
 	    .
 
@@ -785,9 +818,10 @@
 	    dans certains cas, du matériel sur lequel vous effectuez
 	    l'installation.
 	    Dans la plupart des cas vous aurez besoin
-	    de trois disquettes: boot.flp,
-	    kern1.flp, et
-	    kern2.flp.  Consultez
+	    de quatre disquettes: boot.flp,
+	    kern1.flp,
+	    kern2.flp, et
+	    kern3.flp.  Consultez
 	    README.TXT dans le même
 	    répertoire pour une information actualisée
 	    sur ces images de disquette.
@@ -1007,31 +1041,32 @@
 	  FreeBSD démarrera.  Si vous démarrez depuis
 	    le CDROM vous verrez un affichage similaire à ceci (information sur la version omise):
 
-	  Verifying DMI Pool Data ........
-Boot from ATAPI CD-ROM :
- 1. FD 2.88MB  System Type-(00)
-Uncompressing ... done
+	  Booting from CD-Rom...
+CD Loader 1.2
+
+Building the boot loader arguments
+Looking up /BOOT/LOADER... Found
+Relocating the loader and the BTX
+Starting the BTX loader
 
 BTX loader 1.00 BTX version is 1.01
 Console: internal video/keyboard
-BIOS drive A: is disk0
-BIOS drive B: is disk1
-BIOS drive C: is disk2
-BIOS drive D: is disk3
+BIOS CD is cd0
+BIOS drive C: is disk0
+BIOS drive D: is disk1
 BIOS 639kB/261120kB available memory
 
-FreeBSD/i386 bootstrap loader, Revision 0.8
+FreeBSD/i386 bootstrap loader, Revision 1.1
 
-/kernel text=0x277391 data=0x3268c+0x332a8 |
+Loading /boot/defaults/loader.conf
+/boot/kernel/kernel text=0x64daa0 data=0xa4e80+0xa9e40 syms=[0x4+0x6cac0+0x4+0x88e9d]
+\
 
-|
-Hit [Enter] to boot immediately, or any other key for command prompt.
-Booting [kernel] in 9 seconds... _
-
 	  Si vous démarrez depuis une disquette, vous verrez un
 	    affichage similaire à ceci (information sur la version omise):
 
-	  Verifying DMI Pool Data ........
+	  Booting from Floppy...
+Uncompressing ... done
 
 BTX loader 1.00  BTX version is 1.01
 Console: internal video/keyboard
@@ -1039,8 +1074,9 @@
 BIOS drive C: is disk1
 BIOS 639kB/261120kB available memory
 
-FreeBSD/i386 bootstrap loader, Revision 0.8
+FreeBSD/i386 bootstrap loader, Revision 1.1
 
+Loading /boot/defaults/loader.conf
 /kernel text=0x277391 data=0x3268c+0x332a8 |
 
 Insert disk labelled "Kernel floppy 1" and press any key...
@@ -1056,10 +1092,17 @@
 	
 	  Que vous démarriez à partir
 	    de disquettes ou de CDROM, le processus de démarrage
-	    vous amènera au point suivant:
+	    vous amènera au menu du chargeur &os;:
+
+	  

+	    Menu du chargeur &os;
 
-	  Hit [Enter] to boot immediately, or any other key for command prompt.
-Booting [kernel] in 9 seconds... _
+	    
+	      
+		
+	      
+	    
+	  

 
 	  Attendez dix secondes, ou appuyez sur
 	    Entrée.
@@ -1132,6 +1175,65 @@
 
       
 
+      
+	Démarrage pour l'architecture &sparc64;
+
+	La plupart des systèmes &sparc64; sont
+	  configurés pour démarrer automatiquement
+	  à partir du disque dur.  Pour installer &os;, vous
+	  devez démarrer à partir du réseau ou
+	  à partir d'un CDROM, ce qui nécessitera un
+	  passage par le PROM (OpenFirmware).
+
+	Pour cela, redémarrez le système, et
+	  attendez l'affichage des messages de démarrage.  En
+	  fonction du modèle, vous devriez voir quelque chose
+	  comme ce qui suit:
+
+    Sun Blade 100 (UltraSPARC-IIe), Keyboard Present
+Copyright 1998-2001 Sun Microsystems, Inc.  All rights reserved.
+OpenBoot 4.2, 128 MB memory installed, Serial #51090132.
+Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.
+
+	Si votre système tente de démarrer
+	  à partir du disque dur en cet endroit, vous devrez
+	  alors appuyer sur L1A
+	  ou StopA
+	  sur le clavier, ou envoyer un BREAK par
+	  l'intermédiaire de la console série (en
+	  utilisant par exemple ~# sous &man.tip.1;
+	  ou &man.cu.1;) pour obtenir l'invite PROM.  Elle ressemble
+	  à ceci:
+
+	
+	  
+	    
+	    
+	  
+
+	  ok     
+ok {0} 
+
+	  
+	    
+	      C'est l'invite utilisée sur les
+		systèmes avec un seul CPU.
+	    
+
+	    
+	      C'est l'invite utilisée sur les
+		systèmes SMP, le chiffre indiquant le nombre de
+		CPU actifs.
+	    
+	  
+	
+
+	En ce point, placez le CDROM dans le lecteur, et
+	  à l'invite PROM, tapez boot
+	  cdrom.
+      
     
 
     
@@ -1274,7 +1376,7 @@
 
                             User Confirmation Requested
          Are you sure you wish to exit? The system will reboot
-           (be sure to remove any floppies from the drives).
+           (be sure to remove any floppies/CDs/DVDs from the drives).
 
                             [ Yes ]    No
 
@@ -1984,11 +2086,11 @@
 
 	      /
 
-	      100 Mo
+	      128 Mo
 
 	      C'est le système de fichiers racine.  Tous les
 		autres systèmes de fichiers seront montés sous ce
-		dernier.  100 Mo est une taille raisonnable pour ce
+		dernier.  128 Mo est une taille raisonnable pour ce
 		système de fichiers.  Vous ne devrez pas stocker trop de
 		données dessus, comme une installation habituelle de
 		FreeBSD prendra environ 40 Mo.  La place restante est pour les
@@ -2035,7 +2137,7 @@
 
 	      /var
 
-	      50 Mo
+	      256 Mo
 
 	      Le répertoire /var contient
 		des fichiers variant constamment; fichiers de traces, et
@@ -2272,7 +2374,7 @@
 	occupera le reste de la tranche.  Si vous utilisez les tailles
 	de partitions comme décrit dans l'exemple précédent, alors effacez la
 	valeur proposée en utilisant Backspace,
-	et ensuite tapez 64M,
+	et ensuite tapez 128M,
 	comme présenté sur la .  Puis appuyez sur &gui.ok;.
 
@@ -2655,7 +2757,7 @@
 
                                  [ OK ]
 
-                      [  Press enter to continue  ]
+                      [  Press enter or space  ]
 
     Appuyez sur Entrée pour poursuivre avec les
       configurations de post-installation.
@@ -2970,6 +3072,27 @@
 
     
 
+    
+      Autoriser les ouvertures de session SSH
+
+      
+	SSH
+	sshd
+      
+
+                            User Confirmation Requested
+                  Would you like to enable SSH login?
+                           Yes        [  No  ]
+
+      Sélectionner &gui.yes; activera &man.sshd.8;, le
+	programme daemon pour
+	OpenSSH.  Cela permettra
+	l'ouverture à distance de sessions
+	sécurisées sur votre machine.  Pour plus
+	d'information au sujet d'OpenSSH
+	voir la .
+    
+
     
       FTP anonyme
 
@@ -3006,8 +3129,36 @@
 	Pour autoriser le FTP anonyme, utilisez les touches
 	  fléchées pour sélectionner
 	  &gui.yes; et appuyez sur
-	  Entrée.  L'écran suivant (ou
-	  semblable) apparaîtra:
+	  Entrée.
+	  Une confirmation supplémentaire
+	  apparaîtra:
+
+	                       User Confirmation Requested
+ Anonymous FTP permits un-authenticated users to connect to the system
+ FTP server, if FTP service is enabled.  Anonymous users are
+ restricted to a specific subset of the file system, and the default
+ configuration provides a drop-box incoming directory to which uploads
+ are permitted.  You must separately enable both inetd(8), and enable
+ ftpd(8) in inetd.conf(5) for FTP services to be available.  If you
+ did not do so earlier, you will have the opportunity to enable inetd(8)
+ again later.
+
+ If you want the server to be read-only you should leave the upload
+ directory option empty and add the -r command-line option to ftpd(8)
+ in inetd.conf(5)
+
+ Do you wish to continue configuring anonymous FTP?
+
+                          [ Yes ]         No
+
+	Ce message vous indique que le servec FTP devra
+	  également être activé dans le fichier
+	  /etc/inetd.conf si vous voulez
+	  autoriser les connexions FTP anonymes, voir la .  Sélectionnez &gui.yes; et
+	  appuyez sur Entrée pour continuer;
+	  l'écran suivant (ou semblable)
+	  apparaîtra:
 
 	

 	  Configuration par défaut du FTP anonyme
@@ -3019,35 +3170,69 @@
 	  
 	

 
-	L'appui sur la touche F1 affichera
-	  l'aide:
+	Utilisez la touche Tab pour choisir les
+	  champs d'information et compléter avec l'information
+	  appropriée:
 
-	This screen allows you to configure the anonymous FTP user.
+	
+	  
+	    UID
 
-The following configuration values are editable:
+	    
+	      L'ID utilisateur que vous voulez affecter
+		à l'utilisateur du FTP anonyme.  Tous les
+		fichiers chargés sur le serveur appartiendront
+		à cet ID.
+	    
+	  
 
-UID:     The user ID you wish to assign to the anonymous FTP user.
-         All files uploaded will be owned by this ID.
+	  
+	    Group - Groupe
 
-Group:   Which group you wish the anonymous FTP user to be in.
+	    
+	      Le groupe auquel appartiendra l'utilisateur du FTP
+		anonyme.
+	    
+	  
 
-Comment: String describing this user in /etc/passwd
+	  
+	    Comment - Commentaire
 
+	    
+	      La chaîne de caractères
+		décrivant cet utilisateur dans le fichier
+		/etc/passwd.
+	    
+	  
 
-FTP Root Directory:
+	  
+	    FTP Root Directory - Répertoire racine
+	      FTP
 
-        Where files available for anonymous FTP will be kept.
+	    
+	      L'emplacement où seront conservés
+		les fichiers du FTP anonyme.
+	    
+	  
 
-Upload subdirectory:
+	  
+	    Upload Subdirectory - Sous-répertoire
+	      de téléchargement
 
-        Where files uploaded by anonymous FTP users will go.
+	    
+	      L'emplacement où seront stockés les
+		fichiers téléchargés sur le
+		serveur par les utilisateurs du FTP anonyme.
+	    
+	  
+	
 
 	Le répertoire racine du FTP sera placé dans
 	  /var par défaut.  Si vous n'avez pas de
 	  place à cet endroit pour les besoins prévus du FTP, le
 	  répertoire /usr pourra être
 	  utilisé en
-	  configurant “FTP Root Directory” à
+	  configurant le répertoire racine FTP à
 	  /usr/ftp.
 
 	Quand vous êtes satisfait de ces valeurs, appuyez sur
@@ -3375,12 +3560,12 @@
 	ou sur port COM):
 
                             User Confirmation Requested
-         Does this system have a non-USB mouse attached to it?
+         Does this system have a PS/2, serial, or bus mouse?
 
                             [ Yes ]   No
 
       Sélectionnez &gui.yes; pour une souris
-	non-USB ou &gui.no; pour une souris USB et
+	PS/2 ou série, ou &gui.no; pour une souris USB et
 	appuyez sur Entrée.
 
       

@@ -3485,345 +3670,6 @@
 	configuration de post-installation.
     
 
-    
-      
-	
-	  
-	    Tom
-	    Rhodes
-	    Contribution de 
-	  
-	
-      
-      Configuration des services réseaux
-	supplémentaires
-
-      La configuration des services réseaux peut
-	être une tâche intimidante pour les nouveaux
-	utilisateurs s'ils ne possèdent pas de connaissances
-	dans ce domaine.  L'accès réseau, y compris
-	l'Internet, est un élément essentiel de tout
-	système d'exploitation moderne, c'est le cas de &os;;
-	il en résulte, qu'il est très utile de
-	comprendre un peu les capacités réseau
-	étendues de &os;.  Effectuer cette configuration lors
-	de l'installation garantira que les utilisateurs ont une
-	compréhension des divers services qui leur sont
-	disponibles.
-
-      Les services réseaux sont des programmes qui
-	acceptent des entrées depuis n'importe quel endroit du
-	réseau.  De nombreux efforts sont fait pour s'assurer
-	que ces programmes ne feront rien de “nocif”.
-	Malheureusement, les programmeurs ne sont pas parfait et par
-	le passé il y a eu des cas où des bogues dans
-	les services réseaux ont été
-	exploités par des personnes malveillantes pour faire de
-	mauvaises choses.  Il est donc important que vous n'activiez
-	que les services dont vous avez besoin.  Dans le doute, il
-	vaut mieux que vous n'activiez pas un service réseau
-	avant que vous ne vous rendiez compte que vous en avez
-	réellement besoin.  Vous pouvez toujours l'activer plus
-	tard en relançant sysinstall
-	ou en utilisant les options fournies par le fichier
-	/etc/rc.conf.
-
-      Sélectionner Networking fera
-	apparaître un menu similaire au suivant:
-
-      

-	Configuration réseau
-
-	
-	  
-	    
-	  
-	
-      

-
-      La première option,
-	Interfaces, a été
-	précédemment abordée dans la , aussi cette option peut
-	être ignorée sans risque.
-
-      La sélection de l'option
-	AMD ajoute le support de
-	l'utilitaire de montage automatique BSD.
-	Il est généralement employé en
-	conjonction avec le protocole NFS (voir
-	plus bas) pour monter automatiquement les systèmes de
-	fichiers distants.  Aucune configuration particulière
-	n'est ici nécessaire.
-
-      La ligne suivante est l'option AMD
-	Flags.  Quand elle est
-	sélectionnée, un menu s'affichera pour que vous
-	puissiez saisir les paramètres spécifiques
-	à AMD.  Le menu affiche
-	déjà un ensemble d'options par
-	défaut:
-
-      -a /.amd_mnt -l syslog /host /etc/amd.map /net /etc/amd.map
-
-      L'option  fixe l'emplacement de
-	montage par défaut qui est ici
-	/.amd_mnt.  L'option
-	 spécifie le fichier journal par
-	défaut, cependant quand syslogd est
-	utilisé toutes les traces seront envoyées au
-	“daemon” gérant les journaux
-	systèmes.  Le répertoire /host est employé pour
-	monter un système de fichiers exporté par une
-	machine distante, tandis que le répertoire /net est utilisé pour
-	monter un système de fichiers exporté à
-	partir d'une adresse IP.  Le fichier
-	/etc/amd.map définit les options
-	par défaut pour les exportations
-	AMD.
-
-      
-	FTP
-	anonyme
-      
-
-      L'option Anon FTP autorise les
-	connexions FTP anonymes.
-	Sélectionnez cette option pour faire de la machine un
-	serveur FTP anonyme.  Soyez cependant
-	conscient des risques de sécurité
-	impliqués avec cette option.  Un autre menu sera
-	affiché pour expliquer les risques au niveau de la
-	sécurité et la configuration en
-	détail.
-
-      Le menu de configuration
-	Gateway paramétrera la
-	machine pour agir en passerelle comme expliqué
-	précédemment.  Cela peut être
-	utilisé pour désactiver l'option
-	Gateway si vous l'avez
-	sélectionné accidentellement durant le processus
-	d'installation.
-
-      L'option Inetd peut être
-	utilisée pour configurer ou complètement
-	désactiver le “daemon” &man.inetd.8; comme
-	exposé plus haut.
-
-      L'option Mail est
-	employée pour configurer l'agent de transfert du
-	courrier électronique (“MTA”) par
-	défaut du système.  Choisir cette option fera
-	afficher le menu suivant:
-
-      

-	Sélection du MTA par défaut
-
-	
-	  
-	    
-	  
-	
-      

-
-      On vous propose ici un choix de MTA
-	à installer et à utiliser par défaut.  Un
-	MTA n'est ni plus ni moins qu'un serveur de
-	courrier électronique qui délivre le courrier
-	électronique aux utilisateurs sur le système ou
-	sur l'Internet.
-
-      Sélectionner Sendmail
-	installera le serveur sendmail qui
-	est celui par défaut sous &os;. L'option
-	Sendmail local fera en sorte que
-	sendmail soit le
-	MTA par défaut, mais
-	désactivera sa capacité à recevoir du
-	courrier électronique en provenance de l'Internet.  Les
-	autres options, Postfix et
-	Exim agissent de façon
-	similaire à Sendmail.  Dans
-	les deux cas le courrier électronique sera
-	également distribué; cependant, certains
-	utilisateurs, préfèrent ces alternatives au
-	MTA
-	sendmail.
-
-      Après la sélection d'un
-	MTA, ou avoir choisi de ne pas
-	sélectionner de MTA, le menu de configuration du
-	réseau apparaîtra avec l'option suivante qui est
-	NFS client.
-
-      L'option NFS client configurera
-	le système pour communiquer avec un serveur via
-	NFS.  Un serveur NFS
-	rend disponible à d'autres serveurs des systèmes
-	de fichiers par l'intermédiaire du protocole
-	NFS.  Si c'est une machine
-	indépendante, cette option peut rester
-	désactivée.  Ce système peut demander
-	plus de configuration ultérieurement, consultez la
-	 pour plus d'informations sur la
-	configuration du client et du serveur.
-
-      Sous cette option se trouve l'option NFS
-	server, vous permettant de configurer le
-	système comme serveur NFS.  Ceci
-	ajoute l'information nécessaire pour démarrer
-	les services d'appel de procédures distantes
-	(RPC).  Les RPC sont utilisées pour
-	coordonner les connexions entre machines et programmes.
-
-      L'option suivante est Ntpdate,
-	qui traite de la synchronisation de l'horloge.  Quand cette
-	option est sélectionnée, un menu semblable au
-	suivant apparaît:
-
-      

-	Configuration de ntpdate
-
-	
-	  
-	    
-	  
-	
-      

-
-      A partir de ce menu, sélectionnez le serveur le
-	plus proche de chez vous.  En choisir un proche rendra la
-	synchronisation plus précise qu'avec un serveur
-	éloigné qui pourra présenter plus de
-	délais dans la connexion.
-
-      L'option suivante est la sélection de
-	PCNFSD.  Cette option installera le
-	paquetage net/pcnfsd.
-	C'est un programme très utile qui fournit des services
-	d'authentification pour les systèmes qui sont dans
-	l'incapacité de fournir leur propre service
-	d'authentification, comme le système d'exploitation
-	&ms-dos; de Microsoft.
-

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat Oct 27 21:46:59 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A4ED616A4DC; Sat, 27 Oct 2007 21:46: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 489C416A4C4
	for ; Sat, 27 Oct 2007 21:46: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 37DD013C4F5
	for ; Sat, 27 Oct 2007 21:46: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 l9RLkx8G067139
	for ; Sat, 27 Oct 2007 21:46:59 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9RLkx12067136
	for perforce@freebsd.org; Sat, 27 Oct 2007 21:46:59 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 27 Oct 2007 21:46:59 GMT
Message-Id: <200710272146.l9RLkx12067136@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 128209 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 27 Oct 2007 21:47:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=128209

Change 128209 by jb@jb_freebsd1 on 2007/10/27 21:46:03

	IFopensolaris

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/messages/sgs.ident#4 integrate
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/cpuvar.h#2 integrate

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/messages/sgs.ident#4 (text) ====

@@ -57,5 +57,6 @@
 MSG_ID_ELFEDIT_EHDR	27	SUNW_OST_SGS		/*	ehdr: */
 MSG_ID_ELFEDIT_PHDR	27	SUNW_OST_SGS		/*	phdr: */
 MSG_ID_ELFEDIT_SHDR	27	SUNW_OST_SGS		/*	shdr: */
+MSG_ID_ELFEDIT_STR	27	SUNW_OST_SGS		/*	str: */
 MSG_ID_ELFEDIT_SYM	27	SUNW_OST_SGS		/*	sym: */
 MSG_ID_ELFEDIT_SYMINFO	27	SUNW_OST_SGS		/*	syminfo: */

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/cpuvar.h#2 (text) ====

@@ -512,6 +512,7 @@
 #define	CPU_CPR_OFFLINE		0x0
 #define	CPU_CPR_ONLINE		0x1
 #define	CPU_CPR_IS_OFFLINE(cpu)	(((cpu)->cpu_cpr_flags & CPU_CPR_ONLINE) == 0)
+#define	CPU_CPR_IS_ONLINE(cpu)	((cpu)->cpu_cpr_flags & CPU_CPR_ONLINE)
 #define	CPU_SET_CPR_FLAGS(cpu, flag)	((cpu)->cpu_cpr_flags |= flag)
 
 #if defined(_KERNEL) || defined(_KMEMUSER)