From owner-p4-projects@FreeBSD.ORG Sun Mar 28 05:39:22 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D3111065670; Sun, 28 Mar 2010 05:39:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0429C106564A for ; Sun, 28 Mar 2010 05:39:22 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E57FE8FC08 for ; Sun, 28 Mar 2010 05:39:21 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2S5dLZs067782 for ; Sun, 28 Mar 2010 05:39:21 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2S5dLAa067780 for perforce@freebsd.org; Sun, 28 Mar 2010 05:39:21 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 28 Mar 2010 05:39:21 GMT Message-Id: <201003280539.o2S5dLAa067780@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 176181 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Mar 2010 05:39:22 -0000 http://p4web.freebsd.org/chv.cgi?CH=176181 Change 176181 by gcooper@gcooper-bayonetta on 2010/03/28 05:38:39 1. Compress isfile and issymlink check. 2. Add a comment to move_file, and just be a bit more pedantic about the results from vsystem, and provide better diags when the function call fails. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/lib/file.c#2 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/lib/file.c#2 (text+ko) ==== @@ -82,9 +82,7 @@ isfile(const char *fname) { struct stat sb; - if (stat(fname, &sb) != FAIL && S_ISREG(sb.st_mode)) - return TRUE; - return FALSE; + return (stat(fname, &sb) == 0 && S_ISREG(sb.st_mode) != 0); } /* @@ -108,9 +106,7 @@ issymlink(const char *fname) { struct stat sb; - if (lstat(fname, &sb) != FAIL && S_ISLNK(sb.st_mode)) - return TRUE; - return FALSE; + return (lstat(fname, &sb) == 0 && S_ISLNK(sb.st_mode) != 0); } /* Returns TRUE if file is a URL specification */ @@ -278,18 +274,22 @@ } } +/* + * Move a file -- fname -- to a directory -- to. If fname starts with '/', + * then it's assumed to be an absolute path. + */ void move_file(const char *dir, const char *fname, const char *to) { char cmd[FILENAME_MAX]; if (fname[0] == '/') - snprintf(cmd, FILENAME_MAX, "/bin/mv %s %s", fname, to); + snprintf(cmd, FILENAME_MAX, "/bin/mv %s %s", fname, to); else snprintf(cmd, FILENAME_MAX, "/bin/mv %s/%s %s", dir, fname, to); - if (vsystem(cmd)) { + if (vsystem(cmd) != 0) { cleanup(0); - errx(2, "%s: could not perform '%s'", __func__, cmd); + errx(2, "%s.%s: could not perform '%s'", progname, __func__, cmd); } } From owner-p4-projects@FreeBSD.ORG Sun Mar 28 06:03:46 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 801291065672; Sun, 28 Mar 2010 06:03: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 4470F106566C for ; Sun, 28 Mar 2010 06:03:46 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 317048FC08 for ; Sun, 28 Mar 2010 06:03:46 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2S63kVP070776 for ; Sun, 28 Mar 2010 06:03:46 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2S63kGl070774 for perforce@freebsd.org; Sun, 28 Mar 2010 06:03:46 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 28 Mar 2010 06:03:46 GMT Message-Id: <201003280603.o2S63kGl070774@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 176182 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Mar 2010 06:03:46 -0000 http://p4web.freebsd.org/chv.cgi?CH=176182 Change 176182 by gcooper@gcooper-bayonetta on 2010/03/28 06:03:36 There no sense lying about this point anymore: vsystem calls are limited by ARG_MAX, not by any factor of FILENAME_MAX or PATH_MAX. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/lib/file.c#3 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/lib/file.c#3 (text+ko) ==== @@ -262,15 +262,15 @@ void copy_file(const char *dir, const char *fname, const char *to) { - char cmd[FILENAME_MAX]; + char cmd[ARG_MAX]; if (fname[0] == '/') - snprintf(cmd, FILENAME_MAX, "/bin/cp -r %s %s", fname, to); + snprintf(cmd, ARG_MAX, "/bin/cp -r %s %s", fname, to); else - snprintf(cmd, FILENAME_MAX, "/bin/cp -r %s/%s %s", dir, fname, to); + snprintf(cmd, ARG_MAX, "/bin/cp -r %s/%s %s", dir, fname, to); if (vsystem(cmd)) { cleanup(0); - errx(2, "%s: could not perform '%s'", __func__, cmd); + errx(2, "%s.%s: could not perform '%s'", progname, __func__, cmd); } } @@ -281,12 +281,12 @@ void move_file(const char *dir, const char *fname, const char *to) { - char cmd[FILENAME_MAX]; + char cmd[ARG_MAX]; if (fname[0] == '/') - snprintf(cmd, FILENAME_MAX, "/bin/mv %s %s", fname, to); + snprintf(cmd, ARG_MAX, "/bin/mv %s %s", fname, to); else - snprintf(cmd, FILENAME_MAX, "/bin/mv %s/%s %s", dir, fname, to); + snprintf(cmd, ARG_MAX, "/bin/mv %s/%s %s", dir, fname, to); if (vsystem(cmd) != 0) { cleanup(0); errx(2, "%s.%s: could not perform '%s'", progname, __func__, cmd); @@ -304,17 +304,17 @@ void copy_hierarchy(const char *dir, const char *fname, Boolean to) { - char cmd[FILENAME_MAX * 3]; + char cmd[ARG_MAX]; if (!to) { /* If absolute path, use it */ if (*fname == '/') dir = "/"; - snprintf(cmd, FILENAME_MAX * 3, "/usr/bin/tar cf - -C %s %s | /usr/bin/tar xpf -", + snprintf(cmd, ARG_MAX, "/usr/bin/tar cf - -C %s %s | /usr/bin/tar xpf -", dir, fname); } else - snprintf(cmd, FILENAME_MAX * 3, "/usr/bin/tar cf - %s | /usr/bin/tar xpf - -C %s", + snprintf(cmd, ARG_MAX, "/usr/bin/tar cf - %s | /usr/bin/tar xpf - -C %s", fname, dir); #ifdef DEBUG printf("Using '%s' to copy trees.\n", cmd); From owner-p4-projects@FreeBSD.ORG Sun Mar 28 09:01:45 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F45A1065674; Sun, 28 Mar 2010 09:01: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 23F83106564A for ; Sun, 28 Mar 2010 09:01:45 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EB29F8FC12 for ; Sun, 28 Mar 2010 09:01:44 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2S91iDq025906 for ; Sun, 28 Mar 2010 09:01:44 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2S91iSs025904 for perforce@freebsd.org; Sun, 28 Mar 2010 09:01:44 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 28 Mar 2010 09:01:44 GMT Message-Id: <201003280901.o2S91iSs025904@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 176186 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Mar 2010 09:01:45 -0000 http://p4web.freebsd.org/chv.cgi?CH=176186 Change 176186 by gcooper@gcooper-bayonetta on 2010/03/28 09:01:24 Submit a dumb [negative] test that verifies that the positive expectations for pkg_add'ing a remote file based on $UNAME_m and $UNAME_r works. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/usr.sbin/pkg_install/add/test_fetch_uname.sh#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Mar 28 09:03:47 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 80BE51065670; Sun, 28 Mar 2010 09:03: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 14FBE106564A for ; Sun, 28 Mar 2010 09:03:47 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 017128FC0A for ; Sun, 28 Mar 2010 09:03:47 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2S93kE0026992 for ; Sun, 28 Mar 2010 09:03:46 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2S93kKf026990 for perforce@freebsd.org; Sun, 28 Mar 2010 09:03:46 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 28 Mar 2010 09:03:46 GMT Message-Id: <201003280903.o2S93kKf026990@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 176187 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Mar 2010 09:03:47 -0000 http://p4web.freebsd.org/chv.cgi?CH=176187 Change 176187 by gcooper@gcooper-bayonetta on 2010/03/28 09:03:18 Remove the hardcoded versioning information in lieu of $UNAME_r driven data; hardcoding is so 90's... Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/main.c#4 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/main.c#4 (text+ko) ==== @@ -52,51 +52,6 @@ char *progname = NULL; -struct { - int lowver; /* Lowest version number to match */ - int hiver; /* Highest version number to match */ - const char *directory; /* Directory it lives in */ -} releases[] = { - { 410000, 410000, "/packages-4.1-release" }, - { 420000, 420000, "/packages-4.2-release" }, - { 430000, 430000, "/packages-4.3-release" }, - { 440000, 440000, "/packages-4.4-release" }, - { 450000, 450000, "/packages-4.5-release" }, - { 460000, 460001, "/packages-4.6-release" }, - { 460002, 460099, "/packages-4.6.2-release" }, - { 470000, 470099, "/packages-4.7-release" }, - { 480000, 480099, "/packages-4.8-release" }, - { 490000, 490099, "/packages-4.9-release" }, - { 491000, 491099, "/packages-4.10-release" }, - { 492000, 492099, "/packages-4.11-release" }, - { 500000, 500099, "/packages-5.0-release" }, - { 501000, 501099, "/packages-5.1-release" }, - { 502000, 502009, "/packages-5.2-release" }, - { 502010, 502099, "/packages-5.2.1-release" }, - { 503000, 503099, "/packages-5.3-release" }, - { 504000, 504099, "/packages-5.4-release" }, - { 505000, 505099, "/packages-5.5-release" }, - { 600000, 600099, "/packages-6.0-release" }, - { 601000, 601099, "/packages-6.1-release" }, - { 602000, 602099, "/packages-6.2-release" }, - { 603000, 603099, "/packages-6.3-release" }, - { 604000, 604099, "/packages-6.4-release" }, - { 700000, 700099, "/packages-7.0-release" }, - { 701000, 701099, "/packages-7.1-release" }, - { 702000, 702099, "/packages-7.2-release" }, - { 800000, 800499, "/packages-8.0-release" }, - { 300000, 399000, "/packages-3-stable" }, - { 400000, 499000, "/packages-4-stable" }, - { 502100, 502128, "/packages-5-current" }, - { 503100, 599000, "/packages-5-stable" }, - { 600100, 699000, "/packages-6-stable" }, - { 700100, 799000, "/packages-7-stable" }, - { 800500, 899000, "/packages-8-stable" }, - { 900000, 999000, "/packages-9-current" }, - { 0, 9999999, "/packages-current" }, - { 0, 0, NULL } -}; - static char *getpackagesite(void); int getosreldate(void); @@ -302,8 +257,8 @@ static char * getpackagesite(void) { - int reldate, i; static char sitepath[MAXPATHLEN]; + size_t i; struct utsname u; if (getenv("PACKAGESITE")) { @@ -327,20 +282,22 @@ >= sizeof(sitepath)) return NULL; - uname(&u); - if (strlcat(sitepath, u.machine, sizeof(sitepath)) >= sizeof(sitepath)) + if (uname(&u) == -1) { + warn("%s.%s: could not determine uname information", progname, + __func__); + return NULL; + } + if (strlcat(sitepath, u.machine, sizeof(sitepath)) >= sizeof(sitepath) || + strlcat(sitepath, "/", sizeof(sitepath)) >= sizeof(sitepath)) return NULL; - reldate = getosreldate(); - for(i = 0; releases[i].directory != NULL; i++) { - if (reldate >= releases[i].lowver && reldate <= releases[i].hiver) { - if (strlcat(sitepath, releases[i].directory, sizeof(sitepath)) - >= sizeof(sitepath)) - return NULL; - break; - } + for (i = 0; u.release[i] != '\0'; i++) { + u.release[i] = tolower(u.release[i]); } + if (strlcat(sitepath, u.release, sizeof(sitepath)) >= sizeof(sitepath)) + return NULL; + if (strlcat(sitepath, "/Latest/", sizeof(sitepath)) >= sizeof(sitepath)) return NULL; From owner-p4-projects@FreeBSD.ORG Sun Mar 28 09:09:53 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87B611065670; Sun, 28 Mar 2010 09:09: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 4C1B6106564A for ; Sun, 28 Mar 2010 09:09:53 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 395A18FC26 for ; Sun, 28 Mar 2010 09:09:53 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2S99rp9027448 for ; Sun, 28 Mar 2010 09:09:53 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2S99rfk027446 for perforce@freebsd.org; Sun, 28 Mar 2010 09:09:53 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 28 Mar 2010 09:09:53 GMT Message-Id: <201003280909.o2S99rfk027446@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 176188 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Mar 2010 09:09:53 -0000 http://p4web.freebsd.org/chv.cgi?CH=176188 Change 176188 by gcooper@gcooper-bayonetta on 2010/03/28 09:08:57 Note to self: there's suffixing before the release number. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/usr.sbin/pkg_install/add/test_fetch_uname.sh#2 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/usr.sbin/pkg_install/add/test_fetch_uname.sh#2 (text+ko) ==== @@ -12,4 +12,4 @@ # # pkg_add: unable to fetch 'ftp://ftp.freebsd.org/pub/FreeBSD/ports/foobar/10.0-wewtwewt/Latest/foo.tbz' by URL # -pkg_add -Knr foo 2>&1 | grep -Eq "/$UNAME_m/$(echo "$UNAME_r" | tr '[:upper:]' '[:lower:]')/Latest/foo.tbz' by URL" +pkg_add -Knr foo 2>&1 | grep -Eq "/$UNAME_m/packages-$(echo "$UNAME_r" | tr '[:upper:]' '[:lower:]')/Latest/foo.tbz' by URL" From owner-p4-projects@FreeBSD.ORG Sun Mar 28 09:10:54 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD36E106566B; Sun, 28 Mar 2010 09:10:54 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 71EA71065675 for ; Sun, 28 Mar 2010 09:10:54 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5F4FC8FC22 for ; Sun, 28 Mar 2010 09:10:54 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2S9AsAs027599 for ; Sun, 28 Mar 2010 09:10:54 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2S9AsHc027597 for perforce@freebsd.org; Sun, 28 Mar 2010 09:10:54 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 28 Mar 2010 09:10:54 GMT Message-Id: <201003280910.o2S9AsHc027597@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 176189 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Mar 2010 09:10:54 -0000 http://p4web.freebsd.org/chv.cgi?CH=176189 Change 176189 by gcooper@gcooper-bayonetta on 2010/03/28 09:10:51 Wash, rinse, repeat as per perforce change # 176188. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/main.c#5 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/main.c#5 (text+ko) ==== @@ -288,7 +288,7 @@ return NULL; } if (strlcat(sitepath, u.machine, sizeof(sitepath)) >= sizeof(sitepath) || - strlcat(sitepath, "/", sizeof(sitepath)) >= sizeof(sitepath)) + strlcat(sitepath, "/packages-", sizeof(sitepath)) >= sizeof(sitepath)) return NULL; for (i = 0; u.release[i] != '\0'; i++) { From owner-p4-projects@FreeBSD.ORG Sun Mar 28 09:48:34 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 585221065677; Sun, 28 Mar 2010 09:48: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 1CB241065670 for ; Sun, 28 Mar 2010 09:48:34 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E42AE8FC08 for ; Sun, 28 Mar 2010 09:48:33 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2S9mXCb030445 for ; Sun, 28 Mar 2010 09:48:33 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2S9mXHF030443 for perforce@freebsd.org; Sun, 28 Mar 2010 09:48:33 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 28 Mar 2010 09:48:33 GMT Message-Id: <201003280948.o2S9mXHF030443@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 176191 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Mar 2010 09:48:34 -0000 http://p4web.freebsd.org/chv.cgi?CH=176191 Change 176191 by gcooper@gcooper-bayonetta on 2010/03/28 09:47:39 Add a simple script for detecting whether or not pkg_version -I passes or fails based on properly formulated -I arguments. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/usr.sbin/pkg_install/version/test_index_search.sh#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Mar 28 09:53:39 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AE841065675; Sun, 28 Mar 2010 09:53: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 36D5D106564A for ; Sun, 28 Mar 2010 09:53:39 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 23ED58FC15 for ; Sun, 28 Mar 2010 09:53:39 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2S9rdZh030806 for ; Sun, 28 Mar 2010 09:53:39 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2S9rd31030804 for perforce@freebsd.org; Sun, 28 Mar 2010 09:53:39 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 28 Mar 2010 09:53:39 GMT Message-Id: <201003280953.o2S9rd31030804@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 176192 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Mar 2010 09:53:39 -0000 http://p4web.freebsd.org/chv.cgi?CH=176192 Change 176192 by gcooper@gcooper-bayonetta on 2010/03/28 09:52:51 Yank hardcoded INDEX filename detection scheme. Again, hardcoding is so 90's... Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/lib/lib.h#3 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/version/perform.c#2 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/lib/lib.h#3 (text+ko) ==== @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -86,18 +87,6 @@ #define DISPLAY_FNAME "+DISPLAY" #define MTREE_FNAME "+MTREE_DIRS" -#if defined(__FreeBSD_version) && __FreeBSD_version >= 900000 -#define INDEX_FNAME "INDEX-9" -#elif defined(__FreeBSD_version) && __FreeBSD_version >= 800000 -#define INDEX_FNAME "INDEX-8" -#elif defined(__FreeBSD_version) && __FreeBSD_version >= 700000 -#define INDEX_FNAME "INDEX-7" -#elif defined(__FreeBSD_version) && __FreeBSD_version >= 600000 -#define INDEX_FNAME "INDEX-6" -#else -#define INDEX_FNAME "INDEX" -#endif - #define CMD_CHAR '@' /* prefix for extended PLIST cmd */ /* The name of the "prefix" environment variable given to scripts */ ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/version/perform.c#2 (text+ko) ==== @@ -35,28 +35,42 @@ static void show_version(Package, const char *, const char *); /* - * This is the traditional pkg_perform, except that the argument is _not_ - * a list of packages. It is the index file from the command line. + * This is the traditional pkg_perform, except that the argument is _not_ a + * list of packages. It is the index file from the command line. + * + * We loop over the installed packages, matching them with the -s flag if + * needed and calling pkg_do(). Beforehand we set up a few things, and after + * we tear them down... * - * We loop over the installed packages, matching them with the -s flag - * if needed and calling pkg_do(). Before hand we set up a few things, - * and after we tear them down... + * Returns 0 on success, non-zero on failure, corresponding to the number of + * failed attempts to access the INDEX. */ int pkg_perform(char **indexarg) { char **pkgs, *pat[2], **patterns; struct index_entry *ie; - int i, err_cnt = 0; + int i, err_cnt = 0, rel_major_ver; int MatchType; + struct utsname u; + + if (uname(&u) == -1) { + warn("%s.%s: failed to determine uname information", progname, + __func__); + return 1; + } else if ((rel_major_ver = (int) strtol(u.release, NULL, 10)) <= 0) { + + } + /* * Try to find and open the INDEX. We only check IndexFile != NULL * later, if we actually need the INDEX. */ - if (*indexarg == NULL) - snprintf(IndexPath, sizeof(IndexPath), "%s/%s", PORTS_DIR, INDEX_FNAME); - else + if (*indexarg == NULL) { + snprintf(IndexPath, sizeof(IndexPath), "%s/INDEX-%d", PORTS_DIR, + rel_major_ver); + } else strlcpy(IndexPath, *indexarg, sizeof(IndexPath)); if (isURL(IndexPath)) IndexFile = fetchGetURL(IndexPath, ""); From owner-p4-projects@FreeBSD.ORG Sun Mar 28 09:56:42 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA8861065678; Sun, 28 Mar 2010 09:56:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6EF731065675 for ; Sun, 28 Mar 2010 09:56:42 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 51A658FC13 for ; Sun, 28 Mar 2010 09:56:42 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2S9ugME031053 for ; Sun, 28 Mar 2010 09:56:42 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2S9ugVT031051 for perforce@freebsd.org; Sun, 28 Mar 2010 09:56:42 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 28 Mar 2010 09:56:42 GMT Message-Id: <201003280956.o2S9ugVT031051@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 176193 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Mar 2010 09:56:43 -0000 http://p4web.freebsd.org/chv.cgi?CH=176193 Change 176193 by gcooper@gcooper-bayonetta on 2010/03/28 09:56:15 Act on strtol failure instead of just letting it silently pass. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/version/perform.c#3 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/version/perform.c#3 (text+ko) ==== @@ -60,7 +60,8 @@ __func__); return 1; } else if ((rel_major_ver = (int) strtol(u.release, NULL, 10)) <= 0) { - + warnx("%s.%s: release version specified: %s", u.release); + return 1; } /* From owner-p4-projects@FreeBSD.ORG Sun Mar 28 10:04:51 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C9B01065670; Sun, 28 Mar 2010 10:04:51 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E54EC106566B for ; Sun, 28 Mar 2010 10:04:50 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D2B5A8FC0C for ; Sun, 28 Mar 2010 10:04:50 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2SA4ojL032617 for ; Sun, 28 Mar 2010 10:04:50 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2SA4olB032615 for perforce@freebsd.org; Sun, 28 Mar 2010 10:04:50 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 28 Mar 2010 10:04:50 GMT Message-Id: <201003281004.o2SA4olB032615@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 176194 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Mar 2010 10:04:51 -0000 http://p4web.freebsd.org/chv.cgi?CH=176194 Change 176194 by gcooper@gcooper-bayonetta on 2010/03/28 10:04:05 - Simplify test script. Add another negative testcase for an invalid version string. - Fix compile error with version/perform.c Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/usr.sbin/pkg_install/version/test_index_search.sh#2 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/version/perform.c#4 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/usr.sbin/pkg_install/version/test_index_search.sh#2 (text+ko) ==== @@ -3,7 +3,12 @@ # A simple script for testing -I (INDEX lookup). # +set -e + # XXX (gcooper): hardcoding version in test is BAD! -UNAME_r=8.0-RELEASE pkg_version -I >/dev/null || exit $? +UNAME_r=8.0-RELEASE pkg_version -I >/dev/null export UNAME_r=1142.0-RELEASE pkg_version -I 2>&1 | grep -Eq "pkg_version: Unable to open.*INDEX-${UNAME_r%.*}" +# Battle of Britain: TAKA TAKA TAKA TAKA TAKA TAKA! +export UNAME_r=Iveseenmonkiescodebetterthanthis +pkg_version -I 2>&1 | grep -Eq "bad release version specified: $UNAME_r" ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/version/perform.c#4 (text+ko) ==== @@ -60,7 +60,8 @@ __func__); return 1; } else if ((rel_major_ver = (int) strtol(u.release, NULL, 10)) <= 0) { - warnx("%s.%s: release version specified: %s", u.release); + warnx("%s.%s: bad release version specified: %s", progname, __func__, + u.release); return 1; } From owner-p4-projects@FreeBSD.ORG Sun Mar 28 16:21:08 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 359AF1065672; Sun, 28 Mar 2010 16:21:08 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EE4A8106566B for ; Sun, 28 Mar 2010 16:21:07 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DA0F18FC0A for ; Sun, 28 Mar 2010 16:21:07 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2SGL7so077901 for ; Sun, 28 Mar 2010 16:21:07 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2SGL7oU077899 for perforce@freebsd.org; Sun, 28 Mar 2010 16:21:07 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 28 Mar 2010 16:21:07 GMT Message-Id: <201003281621.o2SGL7oU077899@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 Precedence: bulk Cc: Subject: PERFORCE change 176205 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Mar 2010 16:21:08 -0000 http://p4web.freebsd.org/chv.cgi?CH=176205 Change 176205 by pgj@Binturong on 2010/03/28 16:20:10 IFC Affected files ... .. //depot/projects/docproj_hu/www/en/cgi/man.cgi#18 integrate .. //depot/projects/docproj_hu/www/en/projects/ideas/ideas.xml#15 integrate .. //depot/projects/docproj_hu/www/hu/security/security.sgml#19 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#92 integrate .. //depot/projects/docproj_hu/www/share/sgml/commercial.consult.xml#24 integrate Differences ... ==== //depot/projects/docproj_hu/www/en/cgi/man.cgi#18 (text+ko) ==== @@ -34,7 +34,7 @@ # Dual CGI/Plexus mode and new interface by sanders@bsdi.com 9/22/1995 # # $Id: man.cgi,v 1.172 2007/11/28 18:51:29 hrs Exp $ -# $FreeBSD: www/en/cgi/man.cgi,v 1.243 2010/03/23 17:55:05 hrs Exp $ +# $FreeBSD: www/en/cgi/man.cgi,v 1.244 2010/03/26 02:44:48 hrs Exp $ ############################################################################ # !!! man.cgi is stale perl4 code !!! @@ -206,7 +206,7 @@ 'FreeBSD 8.0-RELEASE', "$manLocalDir/FreeBSD-8.0-RELEASE/man:$manLocalDir/FreeBSD-8.0-RELEASE/openssl/man", 'FreeBSD 8.0-stable', "$manLocalDir/FreeBSD-8.0-stable/man:$manLocalDir/FreeBSD-8.0-stable/openssl/man", - 'FreeBSD 7.3-stable', "$manLocalDir/FreeBSD-7.3-stable", + 'FreeBSD 7.3-stable', "$manLocalDir/FreeBSD-7.3-RELEASE/man:$manLocalDir/FreeBSD-7.3-RELEASE/openssl/man", 'FreeBSD 7.3-RELEASE', "$manLocalDir/FreeBSD-7.3-RELEASE/man:$manLocalDir/FreeBSD-7.3-RELEASE/openssl/man", 'FreeBSD 7.2-stable', "$manLocalDir/FreeBSD-7.2-stable", 'FreeBSD 7.2-RELEASE', "$manLocalDir/FreeBSD-7.2-RELEASE/man:$manLocalDir/FreeBSD-7.2-RELEASE/openssl/man", @@ -1431,7 +1431,7 @@ } local $id = - '$FreeBSD: www/en/cgi/man.cgi,v 1.243 2010/03/23 17:55:05 hrs Exp $'; + '$FreeBSD: www/en/cgi/man.cgi,v 1.244 2010/03/26 02:44:48 hrs Exp $'; return qq{\ 
 Copyright (c) 1996-2010 Wolfram Schneider

==== //depot/projects/docproj_hu/www/en/projects/ideas/ideas.xml#15 (text+ko) ====

@@ -15,7 +15,7 @@
 
   
     
-      $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.158 2010/03/22 16:36:20 erwin Exp $
+      $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.159 2010/03/27 17:56:58 ganbold Exp $
     
   
 
@@ -1015,7 +1015,7 @@
   href="http://www.freebsd.org/cgi/cvsweb.cgi/projects/csup/">CVSweb
   

 
csup is a port of the cvsup high-speed CVS repository replication
-  application from the original Modula-3 to the C lanaguage.  It is now
+  application from the original Modula-3 to the C language.  It is now
   distributed with FreeBSD, but is missing some important features that would
   make useful projects to work on:

 
    

==== //depot/projects/docproj_hu/www/hu/security/security.sgml#19 (text+ko) ====

@@ -1,12 +1,12 @@
 
-
+
 
 
  %developers;
 
 ]>
-
+
 
 
+
 
 
   
     
-      $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.109 2010/03/09 22:18:46 jkois Exp $
+      $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.113 2010/03/28 12:02:35 jkois Exp $
     
   
 
@@ -540,6 +540,18 @@
     
   
 
+  
+    Okanagan Technology Solutions
+    http://www.okts.ca/
+    
+      Okanagan Technology Solutions specializes in open source
+      technologies, in particular FreeBSD, Perl, Apache, and MySQL for
+      clients in the beautiful Okanagan region of British Columbia.
+      For more information, please visit our web site.
+    
+  
+
   
     Linux Network Care
     http://www.linuxnetworkcare.com/
@@ -650,21 +662,6 @@
     
   
 
-  
-    Neturn Corp.
-    http://neturn.sinacity.com/netserv/
-    
-      Neturn Corp., based in Vancouver, Canada, provides complete solutions
-      on selective and fine-tuned hardware and software (BSDs as primary
-      server OSs) platforms to meet the demand from e-commerce,
-      telecom, manufacturing, industrial, aerospace, medical applications
-      where stability and reliability are mandatory. For detailed
-      information, please visit http://neturn.sinacity.com
-      /netserv.
-    
-  
-
   
     Netgraft Corp.
     http://netgraft.com/
@@ -1200,8 +1197,8 @@
     
       Raditex AB are a firm of consultants and also do education in Unix.
       We have long experience with all kinds of Unix systems not only
-      FreeBSD or Linux. For more information phone us at +46.8.6949270 or
-      give us an email at gorhas@raditex.nu or visit our web site.
     

From owner-p4-projects@FreeBSD.ORG  Sun Mar 28 18:41:29 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1274A1065677; Sun, 28 Mar 2010 18:41: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 B26C61065675
	for ; Sun, 28 Mar 2010 18:41:28 +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 9F2E78FC12
	for ; Sun, 28 Mar 2010 18:41:28 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2SIfSHs001025
	for ; Sun, 28 Mar 2010 18:41:28 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2SIfSca001023
	for perforce@freebsd.org; Sun, 28 Mar 2010 18:41:28 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sun, 28 Mar 2010 18:41:28 GMT
Message-Id: <201003281841.o2SIfSca001023@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 176210 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sun, 28 Mar 2010 18:41:29 -0000

http://p4web.freebsd.org/chv.cgi?CH=176210

Change 176210 by pgj@Binturong on 2010/03/28 18:41:04

	MFen (doc):
		1.426      -> 1.428      hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml
		1.477      -> 1.479      hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml
		1.121      -> 1.122      hu_HU.ISO8859-2/share/sgml/freebsd.ent

Affected files ...

.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#39 edit
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#46 edit
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#29 edit

Differences ...

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#39 (text+ko) ====

@@ -7,7 +7,7 @@
 
 
 
@@ -1183,8 +1183,15 @@
 	    más esetben ennek a nevét kell csak
 	    lecserélünk a példákban.  A
 	    rendszerben elérhetõ vezeték
-	    nélküli meghajtók a &man.wlan.4; man
-	    oldal elején találhatóak.  Ha a
+	    nélküli meghajtók és az
+	    általuk támogatott kártyák
+	    listája a &os; Hardverjegyzetekben
+	    található.  Ezek a jegyzetek a
+	    különbözõ architektúrákra
+	    és kiadásokhoz a &os;
+	    holnapjáról, a Kiadási jegyzetek
+	    oldalról érhetõek el.  Ha a
 	    vezeték nélküli
 	    eszközünkhöz nem létezik natív
 	    &os;-s meghajtó, akkor az 
 	
 
-	Az eszközmeghajtó
+	&os; 7.X esetén az
+	  eszközmeghajtó
 	  beállításával együtt a 802.11
 	  hálózatok támogatását is be
 	  kell töltenünk a rendszermagba.  Ez az &man.ath.4;
@@ -1213,13 +1221,11 @@
 	wlan_scan_ap_load="YES"
 wlan_scan_sta_load="YES"
 
-	
-	  A &os; 7.X
-	    változataiban mind a wlan_scan_ap
-	    és wlan_scan_sta modulokra
-	    szükségünk van, más verziók
-	    esetén nem kell megadnunk ezeket.
-	
+	A &os; 8.0 kiadástól
+	  kezdõdõen ezek a modulok részei a &man.wlan.4;
+	  meghajtónak, amely a hálózati
+	  kártya meghajtójával együtt mindig
+	  automatikusan betöltõdik.
 
 	Emellett még azokra a modulokra is
 	  szükségünk van, amelyek a használni
@@ -1265,23 +1271,23 @@
 	    beállításait tartalmazó
 	    állományban:
 
-	  device ath                 # Atheros IEEE 802.11 vezeték nélküli hálózati meghajtó
+	  device wlan                # a 802.11 támogatása
+device wlan_wep            # 802.11 WEP  támogatás
+device wlan_ccmp           # 802.11 CCMP támogatás
+device wlan_tkip           # 802.11 TKIP támogatás
+device wlan_amrr           # AMRR forgalomvezérlési algoritmus
+device ath                 # Atheros IEEE 802.11 vezeték nélküli hálózati meghajtó
 device ath_hal             # az Atheros meghajtó hardveres rétege
-device ath_rate_sample     # SampleRate forgalomvezérlési algoritmus
-device wlan                # a 802.11 támogatása
 options AH_SUPPORT_AR5416  # az AR5416 tx/rx leírók engedélyezése
-device wlan_scan_ap        # a 802.11 AP módú keresés
-device wlan_scan_sta       # a 802.11 STA módú keresés
-device wlan_wep            # 802.11 WEP  támogatás
-device wlan_ccmp           # 802.11 CCMP támogatás
-device wlan_tkip           # 802.11 TKIP támogatás
+device ath_rate_sample     # SampleRate forgalomvezérlési algoritmus
+
+	  Hozzátesszük, hogy az alábbi sorok
+	    hozzáadása a &os; 7.X
+	    változatában kötelezõ, más
+	    verzióknál viszont nem:
 
-	  Hozzátesszük, hogy a &os;
-	    7.X változatában a
-	    wlan_scan_ap és
-	    wlan_scan_sta modulok megadása
-	    egyaránt kötelezõ, más
-	    verzióknál viszont nem.
+	  device wlan_scan_ap        # a 802.11 AP módú keresés
+device wlan_scan_sta       # a 802.11 STA módú keresés
 
 	  Az elõbbiek megadásával
 	    fordítsuk újra és telepítsük
@@ -1337,10 +1343,11 @@
 	    rendszeradminisztrátor kezdeményezheti ezeket
 	    a kereséseket:
 
-	  &prompt.root; ifconfig ath0 up scan
-SSID            BSSID              CHAN RATE  S:N   INT CAPS
-dlinkap         00:13:46:49:41:76    6   54M 29:3   100 EPS  WPA WME
-freebsdap       00:11:95:c3:0d:ac    1   54M 22:1   100 EPS  WPA
+	  &prompt.root; ifconfig wlan0 create wlandev ath0
+&prompt.root; ifconfig wlan0 up scan
+SSID            BSSID              CHAN RATE  S:N     INT CAPS
+dlinkap         00:13:46:49:41:76   11   54M -90:96   100 EPS  WPA WME
+freebsdap       00:11:95:c3:0d:ac    1   54M -83:96   100 EPS  WPA
 
 	  
 	    Csak  jelzésû
@@ -1350,6 +1357,28 @@
 	      állapotban tartásához.
 	  
 
+	  
+	    &os; 7.X esetén
+	      a wlan0
+	      eszköz helyett közvetlenül az adott
+	      eszköz nevét kell megadnunk,
+	      például
+	      ath0.
+	      Az iménti sorokat ennek megfelelõen
+	      tehát ebben az esetben így kell
+	      értelmezni:
+
+	    &prompt.root; ifconfig ath0 up scan
+
+	    A leírás további
+	      részében a
+	      &os; 7.X
+	      felhasználóknak ezen séma
+	      alapján kell használniuk a parancsokat
+	      és a konfigurációs
+	      beállításokat.
+	  
+
 	  A keresés során keletkezõ
 	    listában láthatjuk megtalált BBS vagy
 	    IBBS fajtájú hálózatokat.  A
@@ -1427,7 +1456,7 @@
 	    listáját így tudjuk
 	    lekérdezni:
 
-	  &prompt.root; ifconfig ath0 list scan
+	  &prompt.root; ifconfig wlan0 list scan
 
 	  Ezt az információt maga az adapter
 	    automatikusan, vagy a felhasználó tudja
@@ -1481,14 +1510,26 @@
 	      állományból hivatkozunk
 	      rá:
 
-	    ifconfig_ath0="DHCP"
+	    wlans_ath0="wlan0"
+ifconfig_wlan0="DHCP"
+
+	    
+	      A korábban említettek szerint a
+		&os; 7.X
+		felhasználóknak csak a
+		kártyát kell
+		beállítani:
+
+	      ifconfig_ath0="DHCP"
+	    
 
 	    Ha viszont több hozzáférési
 	      pont közül mi magunk akarunk kiválasztani
 	      egyet, akkor ezt az SSID megadásával
 	      tehetjük meg:
 
-	    ifconfig_ath0="ssid saját_ssid DHCP"
+	    wlans_ath0="wlan0"
+ifconfig_wlan0="ssid saját_ssid DHCP"
 
 	    Amikor olyan környezetben vagyunk, ahol több
 	      hozzáférési pontnak is megegyezik az
@@ -1501,7 +1542,8 @@
 	      BSSID-ját is definiálni kell (és az
 	      SSID-t akár el is hagyhatjuk):
 
-	    ifconfig_ath0="ssid saját_ssid bssid xx:xx:xx:xx:xx:xx DHCP"
+	    wlans_ath0="wlan0"
+ifconfig_wlan0="ssid saját_ssid bssid xx:xx:xx:xx:xx:xx DHCP"
 
 	    Más módokon is képesek vagyunk
 	      szabályozni a hozzáférési
@@ -1519,7 +1561,8 @@
 	      sávra leszûkíteni,
 	      például a
 
-	    ifconfig_ath0="mode 11g ssid saját_ssid DHCP"
+	    wlans_ath0="wlan0"
+ifconfig_wlan0="mode 11g ssid saját_ssid DHCP"
 
 	    beállítás hatására
 	      a kártya 802.11g módban fog üzemelni,
@@ -1536,7 +1579,6 @@
 	      paraméterekrõl részletesebb
 	      leírást az &man.ifconfig.8; man oldalon
 	      találhatunk.
-
 	  
 
 	  
@@ -1588,7 +1630,8 @@
 		elérést valahogy így tudjuk
 		beállítani:
 
-	      ifconfig_ath0="authmode shared wepmode on weptxkey 1 wepkey 01234567 DHCP"
+	      wlans_ath0="wlan0"
+ifconfig_wlan0="authmode shared wepmode on weptxkey 1 wepkey 01234567 DHCP"
 
 	      Általánosságban véve
 		elmondhatjuk, hogy az osztott kulcsú
@@ -1629,7 +1672,8 @@
 	      paramétert az eszközünk
 	      beállításaihoz:
 
-	    ifconfig_ath0="DHCP"
+	    wlans_ath0="DHCP"
+ifconfig_wlan0="DHCP"
 
 	    Így már készen is állunk a
 	      vezeték nélküli felület
@@ -1644,15 +1688,16 @@
 	      tudjuk az ath0 felület
 	      állapotát:
 
-	    &prompt.root; ifconfig ath0
-ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
-        inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1
+	    &prompt.root; ifconfig wlan0
+wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+        ether 00:11:95:d5:43:62
         inet 192.168.1.100 netmask 0xffffff00 broadcast 192.168.1.255
-        ether 00:11:95:d5:43:62
-        media: IEEE 802.11 Wireless Ethernet autoselect (OFDM/54Mbps)
+        media: IEEE 802.11 Wireless Ethernet OFDM/54Mbps mode 11g
         status: associated
-        ssid dlinkap channel 6 bssid 00:13:46:49:41:76
-        authmode OPEN privacy OFF txpowmax 36 protmode CTS bintval 100
+        ssid dlinkap channel 11 (2462 Mhz 11g) bssid 00:13:46:49:41:76
+        country US ecm authmode OPEN privacy OFF txpower 21.5 bmiss 7
+        scanvalid 60 bgscan bgscanintvl 300 bgscanidle 250 roam:rssi 7
+        roam:rate 5 protmode CTS wme burst
 
 	    A status: associated azt jelenti,
 	      hogy sikeresen csatlakoztunk egy vezeték
@@ -1661,9 +1706,9 @@
 	      bssid 00:13:46:49:41:76 rész a
 	      hozzáférési pont
 	      MAC-címét tartalmazza.  Az
-	      authmode pedig arról
+	      authmode OPEN pedig arról
 	      számol be, hogy a kommunikáció nem
-	      titkosított (OPEN).
+	      titkosított.
 
 	  
 
@@ -1681,7 +1726,8 @@
 	      többi paramétert azonban
 	      feltétlenül hagyjuk meg:
 
-	    ifconfig_ath0="ssid saját_ssid inet 192.168.1.100 netmask 255.255.255.0"
+	    wlans_ath0="wlan0"
+ifconfig_wlan0="ssid saját_ssid inet 192.168.1.100 netmask 255.255.255.0"
 
 	  
 	
@@ -1797,28 +1843,30 @@
 	      be és az IP-címet a DHCP szervertõl
 	      kérjük el:
 
-	    ifconfig_ath0="WPA DHCP"
+	    wlans_ath0="wlan0"
+ifconfig_ath0="WPA DHCP"
 
 	    Innentõl már fel is tudjuk
 	      éleszteni a felületet:
 
 	    &prompt.root; /etc/rc.d/netif start
 Starting wpa_supplicant.
-DHCPDISCOVER on ath0 to 255.255.255.255 port 67 interval 5
-DHCPDISCOVER on ath0 to 255.255.255.255 port 67 interval 6
+DHCPDISCOVER on wlan0 to 255.255.255.255 port 67 interval 5
+DHCPDISCOVER on wlan0 to 255.255.255.255 port 67 interval 6
 DHCPOFFER from 192.168.0.1
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67
 DHCPACK from 192.168.0.1
 bound to 192.168.0.254 -- renewal in 300 seconds.
-ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
-      inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1
+wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+      ether 00:11:95:d5:43:62
       inet 192.168.0.254 netmask 0xffffff00 broadcast 192.168.0.255
-      ether 00:11:95:d5:43:62
-      media: IEEE 802.11 Wireless Ethernet autoselect (OFDM/36Mbps)
+      media: IEEE 802.11 Wireless Ethernet autoselect OFDM/36Mbps mode 11g
       status: associated
-      ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
-      authmode WPA privacy ON deftxkey UNDEF TKIP 2:128-bit txpowmax 36
-      protmode CTS roaming MANUAL bintval 100
+      ssid freebsdap channel 1 (2412 Mhz 11g) bssid 00:11:95:c3:0d:ac
+      country US ecm authmode WPA2/802.11i privacy ON deftxkey UNDEF
+      AES-CCM 3:128-bit txpower 21.5 bmiss 7 scanvalid 450 bgscan
+      bgscanintvl 300 bgscanidle 250 roam:rssi 7 roam:rate 5 protmode CTS
+      wme burst roaming MANUAL
 
 	    Kézzel is megpróbálhatjuk
 	      elindítani az /etc/wpa_supplicant.conf
 	      állomány használatával:
 
-	    &prompt.root; wpa_supplicant -i ath0 -c /etc/wpa_supplicant.conf
+	    &prompt.root; wpa_supplicant -i wlan0 -c /etc/wpa_supplicant.conf
 Trying to associate with 00:11:95:c3:0d:ac (SSID='freebsdap' freq=2412 MHz)
 Associated with 00:11:95:c3:0d:ac
-WPA: Key negotiation completed with 00:11:95:c3:0d:ac [PTK=TKIP GTK=TKIP]
+WPA: Key negotiation completed with 00:11:95:c3:0d:ac [PTK=CCMP GTK=CCMP]
+CTRL-EVENT-CONNECTED - Connection to 00:11:95:c3:0d:ac completed (auth) [id=0 id_str=]
 
 	    A következõ parancs a
 	      dhclient indítása legyen,
 	      amivel megszerezzük a DHCP szervertõl az
 	      IP-címünket:
 
-	    &prompt.root; dhclient ath0
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
+	    &prompt.root; dhclient wlan0
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67
 DHCPACK from 192.168.0.1
 bound to 192.168.0.254 -- renewal in 300 seconds.
-&prompt.root; ifconfig ath0
+&prompt.root; ifconfig wlan0
 ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
-      inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1
+      ether 00:11:95:d5:43:62
       inet 192.168.0.254 netmask 0xffffff00 broadcast 192.168.0.255
-      ether 00:11:95:d5:43:62
-      media: IEEE 802.11 Wireless Ethernet autoselect (OFDM/48Mbps)
+      media: IEEE 802.11 Wireless Ethernet OFDM/36Mbps mode 11g
       status: associated
-      ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
-      authmode WPA privacy ON deftxkey UNDEF TKIP 2:128-bit txpowmax 36
-      protmode CTS roaming MANUAL bintval 100
+      ssid freebsdap channel 1 (2412 Mhz 11g) bssid 00:11:95:c3:0d:ac
+      country US ecm authmode WPA2/802.11i privacy ON deftxkey UNDEF
+      AES-CCM 3:128-bit txpower 21.5 bmiss 7 scanvalid 450 bgscan
+      bgscanintvl 300 bgscanidle 250 roam:rssi 7 roam:rate 5 protmode CTS
+      wme burst roaming MANUAL
 
 	    
 	      Ha az /etc/rc.conf
 		állományban szerepel a
-		ifconfig_ath0="DHCP" sor, akkor
+		ifconfig_wlan0="DHCP" sor, akkor
 		egyáltalán nem szükséges a
 		dhclient parancs manuális
 		kiadása, mivel a dhclient
@@ -1869,17 +1919,18 @@
 	      wpa_supplicant sikeresen
 	      lebonyolította a hitelesítést:
 
-	    &prompt.root; ifconfig ath0 inet 192.168.0.100 netmask 255.255.255.0
-&prompt.root; ifconfig ath0
+	    &prompt.root; ifconfig wlan0 inet 192.168.0.100 netmask 255.255.255.0
+&prompt.root; ifconfig wlan0
 ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
-      inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1
+      ether 00:11:95:d5:43:62
       inet 192.168.0.100 netmask 0xffffff00 broadcast 192.168.0.255
-      ether 00:11:95:d5:43:62
-      media: IEEE 802.11 Wireless Ethernet autoselect (OFDM/36Mbps)
+      media: IEEE 802.11 Wireless Ethernet OFDM/36Mbps mode 11g
       status: associated
-      ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
-      authmode WPA privacy ON deftxkey UNDEF TKIP 2:128-bit txpowmax 36
-      protmode CTS roaming MANUAL bintval 100
+      ssid freebsdap channel 1 (2412 Mhz 11g) bssid 00:11:95:c3:0d:ac
+      country US ecm authmode WPA2/802.11i privacy ON deftxkey UNDEF
+      AES-CCM 3:128-bit txpower 21.5 bmiss 7 scanvalid 450 bgscan
+      bgscanintvl 300 bgscanidle 250 roam:rssi 7 roam:rate 5 protmode CTS
+      wme burst roaming MANUAL
 
 	    Ha egyáltalán nem használunk DHCP
 	      szervert, akkor nekünk kell beállítani
@@ -2022,9 +2073,10 @@
 
 	    Az /etc/rc.conf
 	      állományba vegyük fel a
-	      következõ sort:
+	      következõ sorokat:
 
-	    ifconfig_ath0="WPA DHCP"
+	    wlans_ath0="wlan0"
+ifconfig_wlan0="WPA DHCP"
 
 	    A következõ lépés a
 	      felület felébresztése lesz az
@@ -2033,19 +2085,20 @@
 
 	    &prompt.root; /etc/rc.d/netif start
 Starting wpa_supplicant.
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67
 DHCPACK from 192.168.0.20
 bound to 192.168.0.254 -- renewal in 300 seconds.
-ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
-      inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1
+wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+      ether 00:11:95:d5:43:62
       inet 192.168.0.254 netmask 0xffffff00 broadcast 192.168.0.255
-      ether 00:11:95:d5:43:62
-      media: IEEE 802.11 Wireless Ethernet autoselect (DS/11Mbps)
+      media: IEEE 802.11 Wireless Ethernet DS/11Mbps mode 11g
       status: associated
-      ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
-      authmode WPA2/802.11i privacy ON deftxkey UNDEF TKIP 2:128-bit
-      txpowmax 36 protmode CTS roaming MANUAL bintval 100
+      ssid freebsdap channel 1 (2412 Mhz 11g) bssid 00:11:95:c3:0d:ac
+      country US ecm authmode WPA2/802.11i privacy ON deftxkey UNDEF
+      AES-CCM 3:128-bit txpower 21.5 bmiss 7 scanvalid 450 bgscan
+      bgscanintvl 300 bgscanidle 250 roam:rssi 7 roam:rate 5 protmode CTS
+      wme burst roaming MANUAL
 
 	    Természetesen, ahogy azt már az
 	      elõbbiekben is megmutattuk, mindezt manuálisan
@@ -2134,32 +2187,34 @@
 	      
 	    
 
-	    Mindezek mellett még a következõ sort
-	      is vegyük fel az /etc/rc.conf
+	    Mindezek mellett még a következõ
+	      sorokat is vegyük fel az
+	      /etc/rc.conf
 	      állományba:
 
-	    ifconfig_ath0="WPA DHCP"
+	    wlans_ath0="wlan0"
+ifconfig_wlan0="WPA DHCP"
 
 	    Ezután hozzuk mûködésbe a
 	      felületet:
 
 	    &prompt.root; /etc/rc.d/netif start
 Starting wpa_supplicant.
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67
 DHCPACK from 192.168.0.20
 bound to 192.168.0.254 -- renewal in 300 seconds.
-ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
-      inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1
+wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+      ether 00:11:95:d5:43:62
       inet 192.168.0.254 netmask 0xffffff00 broadcast 192.168.0.255
-      ether 00:11:95:d5:43:62
-      media: IEEE 802.11 Wireless Ethernet autoselect (DS/11Mbps)
+      media: IEEE 802.11 Wireless Ethernet DS/11Mbps mode 11g
       status: associated
-      ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
-      authmode WPA2/802.11i privacy ON deftxkey UNDEF TKIP 2:128-bit
-      txpowmax 36 protmode CTS roaming MANUAL bintval 100
-
+      ssid freebsdap channel 1 (2412 Mhz 11g) bssid 00:11:95:c3:0d:ac
+      country US ecm authmode WPA2/802.11i privacy ON deftxkey UNDEF
+      AES-CCM 3:128-bit txpower 21.5 bmiss 7 scanvalid 450 bgscan
+      bgscanintvl 300 bgscanidle 250 roam:rssi 7 roam:rate 5 protmode CTS
+      wme burst roaming MANUAL
 	  
 
 	  
@@ -2274,27 +2329,29 @@
 	      /etc/rc.conf
 	      állományhoz:
 
-	    ifconfig_ath0="WPA DHCP"
+	    wlans_ath0="wlan0"
+ifconfig_wlan0="WPA DHCP"
 
 	    Ezután már mûködésbe is
 	      hozhatjuk a felületet:
 
 	    &prompt.root; /etc/rc.d/netif start
 Starting wpa_supplicant.
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67
 DHCPACK from 192.168.0.20
 bound to 192.168.0.254 -- renewal in 300 seconds.
-ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
-      inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1
+wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+      ether 00:11:95:d5:43:62
       inet 192.168.0.254 netmask 0xffffff00 broadcast 192.168.0.255
-      ether 00:11:95:d5:43:62
-      media: IEEE 802.11 Wireless Ethernet autoselect (DS/11Mbps)
+      media: IEEE 802.11 Wireless Ethernet DS/11Mbps mode 11g
       status: associated
-      ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
-      authmode WPA2/802.11i privacy ON deftxkey UNDEF TKIP 2:128-bit
-      txpowmax 36 protmode CTS roaming MANUAL bintval 100
+      ssid freebsdap channel 1 (2412 Mhz 11g) bssid 00:11:95:c3:0d:ac
+      country US ecm authmode WPA2/802.11i privacy ON deftxkey UNDEF
+      AES-CCM 3:128-bit txpower 21.5 bmiss 7 scanvalid 450 bgscan
+      bgscanintvl 300 bgscanidle 250 roam:rssi 7 roam:rate 5 protmode CTS
+      wme burst roaming MANUAL
 
 	  
 	
@@ -2314,7 +2371,8 @@
 	    használatán keresztül
 	    állítható be:
 
-	  &prompt.root; ifconfig ath0 ssid saját_hálózat wepmode on weptxkey 3 wepkey 3:0x3456789012 \
+	  &prompt.root; ifconfig wlan0 create wlandev ath0
+&prompt.root; ifconfig wlan0 ssid saját_hálózat wepmode on weptxkey 3 wepkey 3:0x3456789012 \
 	    inet 192.168.1.100 netmask 255.255.255.0
 
 	  
@@ -2374,7 +2432,7 @@
 
 	  Majd:
 
-	  &prompt.root; wpa_supplicant -i ath0 -c /etc/wpa_supplicant.conf
+	  &prompt.root; wpa_supplicant -i wlan0 -c /etc/wpa_supplicant.conf
 Trying to associate with 00:13:46:49:41:76 (SSID='dlinkap' freq=2437 MHz)
 Associated with 00:13:46:49:41:76
 
@@ -2398,12 +2456,12 @@
       Így állítjuk be az A
 	gépet:
 
-      &prompt.root; ifconfig ath0 ssid freebsdap mediaopt adhoc inet 192.168.0.1 netmask 255.255.255.0
-&prompt.root; ifconfig ath0
-  ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+      &prompt.root; ifconfig wlan0 create wlandev ath0
+&prompt.root; ifconfig wlan0 ssid freebsdap mediaopt adhoc inet 192.168.0.1 netmask 255.255.255.0
+&prompt.root; ifconfig wlan0
+  wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+	  ether 00:11:95:c3:0d:ac
 	  inet 192.168.0.1 netmask 0xffffff00 broadcast 192.168.0.255
-	  inet6 fe80::211:95ff:fec3:dac%ath0 prefixlen 64 scopeid 0x4
-	  ether 00:11:95:c3:0d:ac
 	  media: IEEE 802.11 Wireless Ethernet autoselect <adhoc> (autoselect <adhoc>)
 	  status: associated
 	  ssid freebsdap channel 2 bssid 02:11:95:c3:0d:ac
@@ -2417,9 +2475,9 @@
 	képesek vagyunk észlelni az A
 	gépet:
 
-      &prompt.root; ifconfig ath0 up scan
-  SSID            BSSID              CHAN RATE  S:N   INT CAPS
-  freebsdap       02:11:95:c3:0d:ac    2   54M 19:3   100 IS
+      &prompt.root; ifconfig wlan0 up scan
+  SSID            BSSID              CHAN RATE  S:N     INT CAPS
+  freebsdap       02:11:95:c3:0d:ac    2   54M -90:-96  100 IS
 
       A kimenetben szereplõ I is
 	megerõsíti, hogy az A gépet
@@ -2428,12 +2486,12 @@
 	beállítanunk egy másik
 	IP-címmel:
 
-      &prompt.root; ifconfig ath0 ssid freebsdap mediaopt adhoc inet 192.168.0.2 netmask 255.255.255.0
-&prompt.root; ifconfig ath0
-  ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
-	  inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1
+      &prompt.root; ifconfig wlan0 create wlandev ath0
+&prompt.root; ifconfig wlan0 ssid freebsdap mediaopt adhoc inet 192.168.0.2 netmask 255.255.255.0
+&prompt.root; ifconfig wlan0
+  wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+	  ether 00:11:95:d5:43:62
 	  inet 192.168.0.2 netmask 0xffffff00 broadcast 192.168.0.255
-	  ether 00:11:95:d5:43:62
 	  media: IEEE 802.11 Wireless Ethernet autoselect <adhoc> (autoselect <adhoc>)
 	  status: associated
 	  ssid freebsdap channel 2 bssid 02:11:95:c3:0d:ac

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#46 (text+ko) ====

@@ -7,7 +7,7 @@
      The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor 
      %SOURCE%	en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
-     %SRCID%	1.477
+     %SRCID%	1.479
 -->
 
 
@@ -1168,14 +1168,9 @@
 	  hiszen az alaprendszer része.  A &os; korábbi
 	  verzióinak alaprendszerei ugyan nem tartalmazzák
 	  a &man.csup.1; parancsot, viszont a net/csup port vagy csomag
+	    role="package">net/csup port vagy csomag
 	  segítségével pillanatok alatt
-	  telepíteni tudjuk.  Emellett a
-	  csup segédprogram nem
-	  támogatja a CVS módot sem.  Teljes repositoryk
-	  tükrözéséhez ezért
-	  továbbra is a CVSup kell
-	  használnunk.  Amennyiben a
+	  telepíteni tudjuk.  Amennyiben a
 	  csup mellett tennénk le a
 	  voksunkat, a szakasz fennmaradó részében
 	  egyszerûen hagyjuk ki a CVSup
@@ -3416,6 +3411,14 @@
 
     
       
+	RELENG_7_3_0_RELEASE
+
+	
+	  &os; 7.3
+	
+      
+
+      
 	RELENG_7_2_0_RELEASE
 
 	

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#29 (text+ko) ====

@@ -12,7 +12,7 @@
 
 
 
-
-
+
+
 
 
 

From owner-p4-projects@FreeBSD.ORG  Mon Mar 29 12:59:56 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AC2B81065676; Mon, 29 Mar 2010 12:59: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 6F12F1065673
	for ; Mon, 29 Mar 2010 12:59:56 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5A90E8FC13
	for ; Mon, 29 Mar 2010 12:59:56 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2TCxuCs060083
	for ; Mon, 29 Mar 2010 12:59:56 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2TCxtBK060081
	for perforce@freebsd.org; Mon, 29 Mar 2010 12:59:55 GMT
	(envelope-from mav@freebsd.org)
Date: Mon, 29 Mar 2010 12:59:55 GMT
Message-Id: <201003291259.o2TCxtBK060081@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 176233 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 29 Mar 2010 12:59:57 -0000

http://p4web.freebsd.org/chv.cgi?CH=176233

Change 176233 by mav@mav_mavbook on 2010/03/29 12:59:49

	IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/MAINTAINERS#10 integrate
.. //depot/projects/scottl-camlock/src/Makefile.inc1#17 integrate
.. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#26 integrate
.. //depot/projects/scottl-camlock/src/bin/cp/utils.c#6 integrate
.. //depot/projects/scottl-camlock/src/bin/ls/cmp.c#2 integrate
.. //depot/projects/scottl-camlock/src/bin/rcp/rcp.c#3 integrate
.. //depot/projects/scottl-camlock/src/bin/test/test.c#3 integrate
.. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#3 integrate
.. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/zpool/zpool.8#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/bsnmp/gensnmpdef/gensnmpdef.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/bsnmp/snmpd/config.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/cpio/ABOUT-NLS#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/AUTHORS#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/COPYING#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/ChangeLog#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/FREEBSD-upgrade#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/INSTALL#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/NEWS#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/README#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/THANKS#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/TODO#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/doc/cpio.1#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/doc/cpio.texi#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/doc/version.texi#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/alloca_.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/argp-ba.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/argp-eexst.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/argp-fmtstream.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/argp-fmtstream.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/argp-fs-xinl.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/argp-help.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/argp-namefrob.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/argp-parse.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/argp-pin.c#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/argp-pv.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/argp-pvh.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/argp-xinl.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/argp.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/basename.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/dirname.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/dirname.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/error.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/error.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/exitfail.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/exitfail.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/fatal.c#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/full-write.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/full-write.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/getopt.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/getopt1.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/getopt_.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/getopt_int.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/gettext.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/hash.c#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/hash.h#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/intprops.h#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/inttostr.c#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/inttostr.h#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/mempcpy.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/paxerror.c#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/paxexit.c#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/paxlib.h#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/paxnames.c#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/quote.c#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/quote.h#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/quotearg.c#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/quotearg.h#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/rmt-command.h#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/rmt.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/rtapelib.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/safe-read.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/safe-read.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/safe-write.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/safe-write.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/savedir.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/savedir.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/strchrnul.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/stripslash.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/strndup.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/strnlen.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/system-ioctl.h#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/system.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/umaxtostr.c#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/unlocked-io.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/utimens.c#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/utimens.h#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/xalloc-die.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/xalloc.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/xmalloc.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/xstrndup.c#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/xstrndup.h#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/copyin.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/copyout.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/copypass.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/cpio.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/cpiohdr.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/defer.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/defer.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/dstring.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/dstring.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/extern.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/filemode.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/filetypes.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/global.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/idcache.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/main.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/makepath.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/safe-stat.h#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/tar.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/tar.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/tarhdr.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/userspec.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/util.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/netcat/FREEBSD-upgrade#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/netcat/FREEBSD-vendor#5 integrate
.. //depot/projects/scottl-camlock/src/contrib/netcat/nc.1#7 integrate
.. //depot/projects/scottl-camlock/src/contrib/netcat/netcat.c#6 integrate
.. //depot/projects/scottl-camlock/src/contrib/openpam/include/security/pam_appl.h#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/tzdata/antarctica#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tzdata/asia#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tzdata/australasia#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tzdata/zone.tab#2 integrate
.. //depot/projects/scottl-camlock/src/etc/defaults/periodic.conf#5 integrate
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/cpio/Makefile#3 delete
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/cpio/config.h#3 delete
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/cpio/doc/Makefile#2 delete
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/diff/context.c.diff#2 integrate
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/diff/diff.c.diff#2 integrate
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/Makefile.inc#2 integrate
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/kgdb/trgt_ia64.c#3 integrate
.. //depot/projects/scottl-camlock/src/include/dlfcn.h#5 integrate
.. //depot/projects/scottl-camlock/src/lib/csu/i386-elf/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/dlfcn.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/dlopen.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/opendir.c#6 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/posix1e/acl_to_text_nfs4.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sparc64/fpu/fpu.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sparc64/fpu/fpu_div.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sparc64/fpu/fpu_explode.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sparc64/fpu/fpu_extern.h#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sparc64/fpu/fpu_implode.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/mmap.2#6 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/open.2#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/stat.2#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.xscale.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libusbhid/data.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libusbhid/descr.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libusbhid/parse.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libusbhid/usage.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libusbhid/usbhid.h#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libusbhid/usbvar.h#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/ChangeLog#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/FAQ#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/README#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/Symbol.map#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/Versions.def#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/adler32.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/algorithm.txt#2 delete
.. //depot/projects/scottl-camlock/src/lib/libz/compress.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/contrib/README.contrib#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/contrib/asm686/README.686#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/contrib/asm686/match.S#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/contrib/gcc_gvmat64/gvmat64.S#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/crc32.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/deflate.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/deflate.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/doc/algorithm.txt#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/doc/rfc1950.txt#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/doc/rfc1951.txt#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/doc/rfc1952.txt#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/doc/txtvsbin.txt#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/example.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/gzclose.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/gzguts.h#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/gzio.c#2 delete
.. //depot/projects/scottl-camlock/src/lib/libz/gzlib.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/gzread.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/gzwrite.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/infback.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/inffast.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/inflate.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/inflate.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/inftrees.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/inftrees.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/minigzip.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/trees.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/uncompr.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/zconf.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/zlib.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/zlib.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/zutil.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/zutil.h#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/ftpd/popen.c#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/rtld-elf/rtld.c#11 integrate
.. //depot/projects/scottl-camlock/src/sbin/geom/class/multipath/geom_multipath.c#4 integrate
.. //depot/projects/scottl-camlock/src/sbin/hastd/primary.c#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifieee80211.c#11 integrate
.. //depot/projects/scottl-camlock/src/sbin/ipfw/ipfw.8#10 integrate
.. //depot/projects/scottl-camlock/src/sbin/ipfw/ipfw2.c#7 integrate
.. //depot/projects/scottl-camlock/src/sbin/setkey/setkey.8#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man3/pthread_affinity_np.3#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/ath.4#5 integrate
.. //depot/projects/scottl-camlock/src/share/man/man5/src.conf.5#6 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/uio.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/misc/bsd-family-tree#8 integrate
.. //depot/projects/scottl-camlock/src/share/mk/bsd.own.mk#6 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#35 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mca.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#41 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_signal.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/specialreg.h#16 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_sysvec.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/machdep.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#28 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/cambria_fled.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/boot2/boot2.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/gptboot/gptboot.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/zfsboot/zfsboot.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_misc.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ia32/ia32_signal.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linprocfs/linprocfs.c#29 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_file.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_stats.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_stat.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/x86bios/x86bios.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/NOTES#53 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files#68 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/kern.post.mk#16 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/kmod.mk#20 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/options#41 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#106 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-raid.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#40 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bktr/ioctl_bt848.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bktr/ioctl_meteor.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fb/vesa.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fb/vga.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_logging.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#33 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.h#24 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_library.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/ispvar.h#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/LICENSE#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_82598.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_82599.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_api.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_api.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_common.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_phy.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_phy.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_type.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ofw/ofw_standard.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ppc/ppc_pci.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/dsp.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/scvgarndr.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_pci.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ohci_pci.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/input/ukbd.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/quirk/usb_quirk.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_compat_linux.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#46 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonport.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdport.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/geom_dump.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/geom_io.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/multipath/g_multipath.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#33 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/mca.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#45 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/trap.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_stat.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/md_var.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/specialreg.h#19 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/linux/linux.h#16 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_sysvec.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/conf/GENERIC#24 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia32/ia32_signal.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/autoconf.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/clock.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/db_machdep.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/exception.S#10 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/highfp.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/interrupt.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/machdep.c#29 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/mp_machdep.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/nexus.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/pmap.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/sapic.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/trap.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/acpica_machdep.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/cpufunc.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/frame.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/intr.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/nexusvar.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/ia64/include/pcb.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/pcpu.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/pci/pci_cfgreg.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/imgact_elf.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_exec.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_rwlock.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sys_pipe.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/tty_pts.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_mqueue.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_sem.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_shm.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_lookup.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_syscalls.c#33 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_vnops.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/cpufunc.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/pm_machdep.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/support.S#4 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/tick.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_asm.S#6 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_scd.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/Makefile#47 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/dummynet/Makefile#6 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/ixgbe/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/sys/net/flowtable.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_media.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_vlan.c#29 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_hostap.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ht.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_var.h#21 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/netflow/ng_netflow.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_input.c#30 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/dn_sched.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/dn_sched_prio.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dn_io.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_private.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_sockopt.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_table.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/test/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_indata.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_input.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_output.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_pcb.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_pcb.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_sysctl.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_uio.h#18 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctputil.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctputil.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_timer.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.c#30 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/key.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_srvsubs.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/pc98/pc98/machdep.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/machdep.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea64.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/nexus.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/ofw_machdep.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/booke/interrupt.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/booke/machdep.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/booke/trap_subr.S#4 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/mpc85xx/ocpbus.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/mpc85xx/ocpbus.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/mpc85xx/pci_ocp.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/ofw/ofw_real.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/ofw/ofw_syscons.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/cuda.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/cudavar.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/pmu.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/smu.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/cpu.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/rpc/svc.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/include/wstate.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/exception.S#8 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/locore.S#5 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/machdep.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/pmap.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/support.S#6 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/machdep.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/_timespec.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/imgact.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/param.h#42 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/stat.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/sysent.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/timespec.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/uma_int.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_mmap.c#20 integrate
.. //depot/projects/scottl-camlock/src/tools/build/mk/OptionalObsoleteFiles.inc#11 integrate
.. //depot/projects/scottl-camlock/src/tools/build/options/WITH_GNU_CPIO#2 delete
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/ncal/regress.sh#2 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/Files/root/updatep1#2 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/Files/root/updatep2#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/biff/biff.1#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendar.1#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendar.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendar.h#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendars/calendar.dutch#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/dates.c#1 branch
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/day.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/events.c#1 branch
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/io.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/locale.c#1 branch
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/ostern.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/parsedata.c#1 branch
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/paskha.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/pathnames.h#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/pom.c#1 branch
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/sunpos.c#1 branch
.. //depot/projects/scottl-camlock/src/usr.bin/compress/compress.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/cpio/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/gzip/gzip.c#6 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/kdump/kdump.c#8 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/mail/util.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/minigzip/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/ncal/ncal.1#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/ncal/ncal.c#6 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/touch/touch.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/bsnmpd/modules/snmp_pf/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/mtree/compare.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/mtree/create.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcpl_calltree.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcstat_log.c#6 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/sysinstall.8#5 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/MAINTAINERS#10 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.158 2010/03/20 11:05:11 gavin Exp $
+$FreeBSD: src/MAINTAINERS,v 1.160 2010/03/26 12:59:15 des Exp $
 
 Please note that the content of this file is strictly advisory.
 No locks listed here are valid.  The only strict review requirements
@@ -36,8 +36,6 @@
 cdboot		jhb	Pre-commit review requested.
 pxeboot		jhb	Pre-commit review requested.
 witness		jhb	Pre-commit review requested.
-twe		aradford@amcc.com	Pre-commit review requested
-twa		aradford@amcc.com	Pre-commit review requested
 CAM		gibbs,
 		ken	Pre-commit review requested. send to scsi@freebsd.org
 devstat(9)	ken	Pre-commit review requested.
@@ -59,15 +57,12 @@
 fetch		des	Advance notification requested.
 libpam		des	Pre-commit review requested.
 openssh		des	Pre-commit review requested.
-pseudofs	des	Advance notification requested.
-procfs		des	Advance notification requested.
-linprocfs	des	Advance notification requested.
+pseudofs	des	Pre-commit review requested.
+procfs		des	Pre-commit review requested.
+linprocfs	des	Pre-commit review requested.
 lpr		gad	Pre-commit review requested, particularly for
 			lpd/recvjob.c and lpd/printjob.c.
 newsyslog(8)	gad	Heads-up appreciated.  I'm going thru the PR's for it.
-pkill		gad	Heads-up appreciated.
-ps		gad	I am working on a number of changes to this.  Would
-			like advance notice of major changes planned to it.
 cvs		peter	Heads-up appreciated, try not to break it.
 nvi		peter	Try not to break it.
 libz		peter	Try not to break it.
@@ -76,9 +71,6 @@
 			offer a pre-commit review for anything non-trivial.
 ipfw		ipfw	Pre-commit review preferred. send to ipfw@freebsd.org
 drm		rnoland	Just keep me informed of changes, try not to break it.
-libufs		jmallett	Willing to handle problems, help with work.
-fdc(4)		joerg	Just keep me informed of changes, try not to break it.
-sppp(4)		joerg	Just keep me informed of changes, try not to break it.
 unifdef(1)	fanf	Pre-commit review requested.
 ntp         	roberto	Pre-commit review requested.
 inetd		dwmalone	Recommends pre-commit review.

==== //depot/projects/scottl-camlock/src/Makefile.inc1#17 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.641 2010/03/07 14:55:43 antoine Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.642 2010/03/24 18:40:57 delphij Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -283,6 +283,7 @@
 		VERSION="${VERSION}" \
 		MACHINE=i386 \
 		MACHINE_ARCH=i386 \
+		MACHINE_CPU="i686 mmx sse sse2" \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH} \
 		CC="${CC} ${LIB32FLAGS}" \

==== //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#26 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.229 2010/03/14 10:18:58 ed Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.232 2010/03/27 03:17:39 marcel Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,19 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20100326: [ia64] removed 
+.if ${TARGET_ARCH} == "ia64"
+OLD_FILES+=usr/include/machine/nexusvar.h
+.endif
+# 20100326: gcpio removal
+OLD_FILES+=usr/bin/gcpio
+OLD_FILES+=usr/share/info/cpio.info.gz
+OLD_FILES+=usr/share/man/man1/gcpio.1.gz
+# 20100322: libz update
+OLD_LIBS+=lib/libz.so.5
+.if ${TARGET_ARCH} == "amd64"
+OLD_LIBS+=usr/lib32/libz.so.5
+.endif
 # 20100314: removal of regexp.h
 OLD_FILES+=usr/include/regexp.h
 OLD_FILES+=usr/share/man/man3/regexp.3.gz

==== //depot/projects/scottl-camlock/src/bin/cp/utils.c#6 (text+ko) ====

@@ -33,7 +33,7 @@
 #endif
 #endif /* not lint */
 #include 
-__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.60 2010/01/17 09:37:31 gavin Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.61 2010/03/28 13:16:08 ed Exp $");
 
 #include 
 #include 
@@ -323,8 +323,8 @@
 	fs->st_mode &= S_ISUID | S_ISGID | S_ISVTX |
 		       S_IRWXU | S_IRWXG | S_IRWXO;
 
-	TIMESPEC_TO_TIMEVAL(&tv[0], &fs->st_atimespec);
-	TIMESPEC_TO_TIMEVAL(&tv[1], &fs->st_mtimespec);
+	TIMESPEC_TO_TIMEVAL(&tv[0], &fs->st_atim);
+	TIMESPEC_TO_TIMEVAL(&tv[1], &fs->st_mtim);
 	if (islink ? lutimes(to.p_path, tv) : utimes(to.p_path, tv)) {
 		warn("%sutimes: %s", islink ? "l" : "", to.p_path);
 		rval = 1;

==== //depot/projects/scottl-camlock/src/bin/ls/cmp.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif /* not lint */
 #endif
 #include 
-__FBSDID("$FreeBSD: src/bin/ls/cmp.c,v 1.18 2006/03/24 16:38:02 jhb Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/cmp.c,v 1.19 2010/03/28 13:16:08 ed Exp $");
 
 
 #include 
@@ -66,17 +66,17 @@
 modcmp(const FTSENT *a, const FTSENT *b)
 {
 
-	if (b->fts_statp->st_mtimespec.tv_sec >
-	    a->fts_statp->st_mtimespec.tv_sec)
+	if (b->fts_statp->st_mtim.tv_sec >
+	    a->fts_statp->st_mtim.tv_sec)
 		return (1);
-	if (b->fts_statp->st_mtimespec.tv_sec <
-	    a->fts_statp->st_mtimespec.tv_sec)
+	if (b->fts_statp->st_mtim.tv_sec <
+	    a->fts_statp->st_mtim.tv_sec)
 		return (-1);
-	if (b->fts_statp->st_mtimespec.tv_nsec >
-	    a->fts_statp->st_mtimespec.tv_nsec)
+	if (b->fts_statp->st_mtim.tv_nsec >
+	    a->fts_statp->st_mtim.tv_nsec)
 		return (1);
-	if (b->fts_statp->st_mtimespec.tv_nsec <
-	    a->fts_statp->st_mtimespec.tv_nsec)
+	if (b->fts_statp->st_mtim.tv_nsec <
+	    a->fts_statp->st_mtim.tv_nsec)
 		return (-1);
 	return (strcoll(a->fts_name, b->fts_name));
 }
@@ -92,17 +92,17 @@
 acccmp(const FTSENT *a, const FTSENT *b)
 {
 
-	if (b->fts_statp->st_atimespec.tv_sec >
-	    a->fts_statp->st_atimespec.tv_sec)
+	if (b->fts_statp->st_atim.tv_sec >
+	    a->fts_statp->st_atim.tv_sec)
 		return (1);
-	if (b->fts_statp->st_atimespec.tv_sec <
-	    a->fts_statp->st_atimespec.tv_sec)
+	if (b->fts_statp->st_atim.tv_sec <
+	    a->fts_statp->st_atim.tv_sec)
 		return (-1);
-	if (b->fts_statp->st_atimespec.tv_nsec >
-	    a->fts_statp->st_atimespec.tv_nsec)
+	if (b->fts_statp->st_atim.tv_nsec >
+	    a->fts_statp->st_atim.tv_nsec)
 		return (1);
-	if (b->fts_statp->st_atimespec.tv_nsec <
-	    a->fts_statp->st_atimespec.tv_nsec)
+	if (b->fts_statp->st_atim.tv_nsec <
+	    a->fts_statp->st_atim.tv_nsec)
 		return (-1);
 	return (strcoll(a->fts_name, b->fts_name));
 }
@@ -118,17 +118,17 @@
 birthcmp(const FTSENT *a, const FTSENT *b)
 {
 
-	if (b->fts_statp->st_birthtimespec.tv_sec >
-	    a->fts_statp->st_birthtimespec.tv_sec)
+	if (b->fts_statp->st_birthtim.tv_sec >
+	    a->fts_statp->st_birthtim.tv_sec)
 		return (1);
-	if (b->fts_statp->st_birthtimespec.tv_sec <
-	    a->fts_statp->st_birthtimespec.tv_sec)
+	if (b->fts_statp->st_birthtim.tv_sec <
+	    a->fts_statp->st_birthtim.tv_sec)
 		return (-1);
-	if (b->fts_statp->st_birthtimespec.tv_nsec >
-	    a->fts_statp->st_birthtimespec.tv_nsec)
+	if (b->fts_statp->st_birthtim.tv_nsec >
+	    a->fts_statp->st_birthtim.tv_nsec)
 		return (1);
-	if (b->fts_statp->st_birthtimespec.tv_nsec <
-	    a->fts_statp->st_birthtimespec.tv_nsec)
+	if (b->fts_statp->st_birthtim.tv_nsec <
+	    a->fts_statp->st_birthtim.tv_nsec)
 		return (-1);
 	return (strcoll(a->fts_name, b->fts_name));
 }
@@ -144,17 +144,17 @@
 statcmp(const FTSENT *a, const FTSENT *b)
 {
 
-	if (b->fts_statp->st_ctimespec.tv_sec >
-	    a->fts_statp->st_ctimespec.tv_sec)
+	if (b->fts_statp->st_ctim.tv_sec >
+	    a->fts_statp->st_ctim.tv_sec)
 		return (1);
-	if (b->fts_statp->st_ctimespec.tv_sec <
-	    a->fts_statp->st_ctimespec.tv_sec)
+	if (b->fts_statp->st_ctim.tv_sec <
+	    a->fts_statp->st_ctim.tv_sec)
 		return (-1);
-	if (b->fts_statp->st_ctimespec.tv_nsec >
-	    a->fts_statp->st_ctimespec.tv_nsec)
+	if (b->fts_statp->st_ctim.tv_nsec >
+	    a->fts_statp->st_ctim.tv_nsec)
 		return (1);
-	if (b->fts_statp->st_ctimespec.tv_nsec <
-	    a->fts_statp->st_ctimespec.tv_nsec)
+	if (b->fts_statp->st_ctim.tv_nsec <
+	    a->fts_statp->st_ctim.tv_nsec)
 		return (-1);
 	return (strcoll(a->fts_name, b->fts_name));
 }

==== //depot/projects/scottl-camlock/src/bin/rcp/rcp.c#3 (text+ko) ====

@@ -46,7 +46,7 @@
 #endif /* not lint */
 #endif
 #include 
-__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.47 2008/10/28 17:15:46 rdivacky Exp $");
+__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.48 2010/03/28 13:16:08 ed Exp $");
 
 #include 
 #include 
@@ -390,8 +390,8 @@
 			 * versions expecting microseconds.
 			 */
 			(void)snprintf(buf, sizeof(buf), "T%ld 0 %ld 0\n",
-			    (long)stb.st_mtimespec.tv_sec,
-			    (long)stb.st_atimespec.tv_sec);
+			    (long)stb.st_mtim.tv_sec,
+			    (long)stb.st_atim.tv_sec);
 			(void)write(rem, buf, strlen(buf));
 			if (response() < 0)
 				goto next;
@@ -454,8 +454,8 @@
 		last++;
 	if (pflag) {
 		(void)snprintf(path, sizeof(path), "T%ld 0 %ld 0\n",
-		    (long)statp->st_mtimespec.tv_sec,
-		    (long)statp->st_atimespec.tv_sec);
+		    (long)statp->st_mtim.tv_sec,
+		    (long)statp->st_atim.tv_sec);
 		(void)write(rem, path, strlen(path));
 		if (response() < 0) {
 			closedir(dirp);

==== //depot/projects/scottl-camlock/src/bin/test/test.c#3 (text+ko) ====

@@ -11,7 +11,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/bin/test/test.c,v 1.54 2009/05/26 22:33:10 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/test/test.c,v 1.55 2010/03/28 13:16:08 ed Exp $");
 
 #include 
 #include 
@@ -572,12 +572,12 @@
 	if (stat(f1, &b1) != 0 || stat(f2, &b2) != 0)
 		return 0;
 
-	if (b1.st_mtimespec.tv_sec > b2.st_mtimespec.tv_sec)
+	if (b1.st_mtim.tv_sec > b2.st_mtim.tv_sec)
 		return 1;
-	if (b1.st_mtimespec.tv_sec < b2.st_mtimespec.tv_sec)
+	if (b1.st_mtim.tv_sec < b2.st_mtim.tv_sec)
 		return 0;
 
-       return (b1.st_mtimespec.tv_nsec > b2.st_mtimespec.tv_nsec);
+       return (b1.st_mtim.tv_nsec > b2.st_mtim.tv_nsec);
 }
 
 static int

==== //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#3 (text+ko) ====

@@ -1,24 +1,9 @@
 '\" te
-.\" CDDL HEADER START
-.\"
-.\" The contents of this file are subject to the terms of the
-.\" Common Development and Distribution License (the "License").  
-.\" You may not use this file except in compliance with the License.
-.\"
-.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-.\" or http://www.opensolaris.org/os/licensing.
-.\" See the License for the specific language governing permissions
-.\" and limitations under the License.
-.\"
-.\" When distributing Covered Code, include this CDDL HEADER in each
-.\" file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-.\" If applicable, add the following below this CDDL HEADER, with the
-.\" fields enclosed by brackets "[]" replaced with your own identifying
-.\" information: Portions Copyright [yyyy] [name of copyright owner]
-.\"
-.\" CDDL HEADER END
-.\" Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved.
-.TH zfs 1M "8 Apr 2008" "SunOS 5.11" "System Administration Commands"
+.\" Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
+.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
+.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
+.\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
+.TH zfs 1M "14 Feb 2009" "SunOS 5.11" "System Administration Commands"
 .SH NAME
 zfs \- configures ZFS file systems
 .SH SYNOPSIS
@@ -44,7 +29,8 @@
 
 .LP
 .nf
-\fBzfs\fR \fBsnapshot\fR [\fB-r\fR] \fIfilesystem@snapname\fR|\fIvolume@snapname\fR
+\fBzfs\fR \fBsnapshot\fR [\fB-r\fR] [\fB-o\fR \fIproperty\fR=\fIvalue\fR]... 
+      \fIfilesystem@snapname\fR|\fIvolume@snapname\fR
 .fi
 
 .LP
@@ -54,7 +40,7 @@
 
 .LP
 .nf
-\fBzfs\fR \fBclone\fR [\fB-p\fR] \fIsnapshot\fR \fIfilesystem\fR|\fIvolume\fR
+\fBzfs\fR \fBclone\fR [\fB-p\fR] [\fB-o\fR \fIproperty\fR=\fIvalue\fR] ... \fIsnapshot\fR \fIfilesystem\fR|\fIvolume\fR
 .fi
 
 .LP
@@ -65,7 +51,7 @@
 .LP
 .nf
 \fBzfs\fR \fBrename\fR \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR 
-    \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR
+     \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR
 .fi
 
 .LP
@@ -81,23 +67,23 @@
 .LP
 .nf
 \fBzfs\fR \fBlist\fR [\fB-rH\fR] [\fB-o\fR \fIproperty\fR[,...]] [\fB-t\fR \fItype\fR[,...]]
-    [\fB-s\fR \fIproperty\fR] ... [\fB-S\fR \fIproperty\fR ... [\fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR] ...
+     [\fB-s\fR \fIproperty\fR] ... [\fB-S\fR \fIproperty\fR] ... [\fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR] ...
 .fi
 
 .LP
 .nf
-\fBzfs\fR \fBset\fR \fIproperty\fR=\fIvalue\fR \fIfilesystem\fR|\fIvolume\fR ...
+\fBzfs\fR \fBset\fR \fIproperty\fR=\fIvalue\fR \fIfilesystem\fR|\fIvolume\fR|snapshot ...
 .fi
 
 .LP
 .nf
 \fBzfs\fR \fBget\fR [\fB-rHp\fR] [\fB-o\fR \fIfield\fR[,...]] [\fB-s\fR \fIsource\fR[,...]] "\fIall\fR" | \fIproperty\fR[,...]
-     \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR ...
+      \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR ...
 .fi
 
 .LP
 .nf
-\fBzfs\fR \fBinherit\fR [\fB-r\fR] \fIproperty\fR \fIfilesystem\fR|\fIvolume\fR ...
+\fBzfs\fR \fBinherit\fR [\fB-r\fR] \fIproperty\fR \fIfilesystem\fR|\fIvolume|snapshot\fR ...
 .fi
 
 .LP
@@ -132,12 +118,12 @@
 
 .LP
 .nf
-\fBzfs\fR \fBunshare\fR  \fB-a\fR \fIfilesystem\fR|\fImountpoint\fR
+\fBzfs\fR \fBunshare\fR \fB-a\fR \fIfilesystem\fR|\fImountpoint\fR
 .fi
 
 .LP
 .nf
-\fBzfs\fR \fBsend\fR [\fB-vR\fR] [\fB-\fR[\fB-iI\fR] \fIsnapshot\fR] \fIsnapshot\fR
+\fBzfs\fR \fBsend\fR [\fB-vR\fR] [\fB-\fR[\fBiI\fR] \fIsnapshot\fR] \fIsnapshot\fR
 .fi
 
 .LP
@@ -153,7 +139,7 @@
 .LP
 .nf
 \fBzfs\fR \fBallow\fR [\fB-ldug\fR] "\fIeveryone\fR"|\fIuser\fR|\fIgroup\fR[,...] \fIperm\fR|\fI@setname\fR[,...] 
-    \fIfilesystem\fR|\fIvolume\fR
+     \fIfilesystem\fR|\fIvolume\fR
 .fi
 
 .LP
@@ -174,7 +160,7 @@
 .LP
 .nf
 \fBzfs\fR \fBunallow\fR [\fB-rldug\fR] "\fIeveryone\fR"|\fIuser\fR|\fIgroup\fR[,...] [\fIperm\fR|@\fIsetname\fR[,... ]] 
-    \fIfilesystem\fR|\fIvolume\fR
+     \fIfilesystem\fR|\fIvolume\fR
 .fi
 
 .LP
@@ -192,20 +178,10 @@
 \fBzfs\fR \fBunallow\fR [\fB-r\fR] \fB-s\fR @setname [\fIperm\fR|@\fIsetname\fR[,... ]] \fIfilesystem\fR|\fIvolume\fR
 .fi
 
-.LP
-.nf
-\fBzfs\fR \fBjail\fR \fBjailid\fR \fB\fIfilesystem\fR\fR
-.fi
-.LP
-.nf
-\fBzfs\fR \fBunjail\fR \fBjailid\fR \fB\fIfilesystem\fR\fR
-.fi
-
 .SH DESCRIPTION
 .sp
 .LP
-The \fBzfs\fR command configures \fBZFS\fR datasets within a \fBZFS\fR storage pool, as described in \fBzpool\fR(1M). A
-dataset is identified by a unique path within the \fBZFS\fR namespace. For example:
+The \fBzfs\fR command configures \fBZFS\fR datasets within a \fBZFS\fR storage pool, as described in \fBzpool\fR(1M). A dataset is identified by a unique path within the \fBZFS\fR namespace. For example:
 .sp
 .in +2
 .nf
@@ -226,9 +202,9 @@
 .na
 \fB\fIfile system\fR\fR
 .ad
-.RS 15n
-.rt  
-A standard \fBPOSIX\fR file system. \fBZFS\fR file systems can be mounted within the standard file system namespace and behave like any other file system.
+.sp .6
+.RS 4n
+A \fBZFS\fR dataset of type "filesystem" that can be mounted within the standard system namespace and behaves like other file systems. While \fBZFS\fR file systems are designed to be \fBPOSIX\fR compliant, known issues exist that prevent compliance in some cases. Applications that depend on standards conformance might fail due to nonstandard behavior when checking file system free space.
 .RE
 
 .sp
@@ -237,8 +213,8 @@
 .na
 \fB\fIvolume\fR\fR
 .ad
-.RS 15n
-.rt  
+.sp .6
+.RS 4n
 A logical volume exported as a raw or block device. This type of dataset should only be used under special circumstances. File systems are typically used in most environments. Volumes cannot be used in a non-global zone.
 .RE
 
@@ -248,8 +224,8 @@
 .na
 \fB\fIsnapshot\fR\fR
 .ad
-.RS 15n
-.rt  
+.sp .6
+.RS 4n
 A read-only version of a file system or volume at a given point in time. It is specified as \fIfilesystem@name\fR or \fIvolume@name\fR.
 .RE
 
@@ -272,20 +248,17 @@
 Snapshots can have arbitrary names. Snapshots of volumes can be cloned or rolled back, but cannot be accessed independently.
 .sp
 .LP
-File system snapshots can be accessed under the ".zfs/snapshot" directory in the root of the file system. Snapshots are automatically mounted on demand and may be unmounted at regular intervals. The visibility of the ".zfs" directory can be controlled by the "snapdir"
-property.
+File system snapshots can be accessed under the ".zfs/snapshot" directory in the root of the file system. Snapshots are automatically mounted on demand and may be unmounted at regular intervals. The visibility of the ".zfs" directory can be controlled by the "snapdir" property.
 .SS "Clones"
 .sp
 .LP
 A clone is a writable volume or file system whose initial contents are the same as another dataset. As with snapshots, creating a clone is nearly instantaneous, and initially consumes no additional space.
 .sp
 .LP
-Clones can only be created from a snapshot. When a snapshot is cloned, it creates an implicit dependency between the parent and child. Even though the clone is created somewhere else in the dataset hierarchy, the original snapshot cannot be destroyed as long as a clone exists. The "origin"
-property exposes this dependency, and the \fBdestroy\fR command lists any such dependencies, if they exist.
+Clones can only be created from a snapshot. When a snapshot is cloned, it creates an implicit dependency between the parent and child. Even though the clone is created somewhere else in the dataset hierarchy, the original snapshot cannot be destroyed as long as a clone exists. The "origin" property exposes this dependency, and the \fBdestroy\fR command lists any such dependencies, if they exist.
 .sp
 .LP
-The clone parent-child dependency relationship can be reversed by using the "\fBpromote\fR" subcommand. This causes the "origin" file system to become a clone of the specified file system, which makes it possible to destroy the file system that the clone
-was created from.
+The clone parent-child dependency relationship can be reversed by using the "\fBpromote\fR" subcommand. This causes the "origin" file system to become a clone of the specified file system, which makes it possible to destroy the file system that the clone was created from.
 .SS "Mount Points"
 .sp
 .LP
@@ -301,8 +274,7 @@
 A file system mountpoint property of "none" prevents the file system from being mounted.
 .sp
 .LP
-If needed, \fBZFS\fR file systems can also be managed with traditional tools (\fBmount\fR, \fBumount\fR, \fB/etc/vfstab\fR). If a file system's mount point is set to "legacy", \fBZFS\fR makes no attempt to manage
-the file system, and the administrator is responsible for mounting and unmounting the file system.
+If needed, \fBZFS\fR file systems can also be managed with traditional tools (\fBmount\fR, \fBumount\fR, \fB/etc/vfstab\fR). If a file system's mount point is set to "legacy", \fBZFS\fR makes no attempt to manage the file system, and the administrator is responsible for mounting and unmounting the file system.
 .SS "Zones"
 .sp
 .LP
@@ -312,8 +284,7 @@
 The physical properties of an added file system are controlled by the global administrator. However, the zone administrator can create, modify, or destroy files within the added file system, depending on how the file system is mounted.
 .sp
 .LP
-A dataset can also be delegated to a non-global zone by using zonecfg's "\fBadd dataset\fR" subcommand. You cannot delegate a dataset to one zone and the children of the same dataset to another zone. The zone administrator can change properties of the dataset or
-any of its children. However, the "quota" property is controlled by the global administrator.
+A dataset can also be delegated to a non-global zone by using zonecfg's "\fBadd dataset\fR" subcommand. You cannot delegate a dataset to one zone and the children of the same dataset to another zone. The zone administrator can change properties of the dataset or any of its children. However, the "quota" property is controlled by the global administrator.
 .sp
 .LP
 A \fBZFS\fR volume can be added as a device to a non-global zone by using zonecfg's "\fBadd device\fR" subcommand. However, its physical properties can only be modified by the global administrator.
@@ -329,15 +300,13 @@
 .SS "Native Properties"
 .sp
 .LP
-Properties are divided into two types, native properties and user defined properties. Native properties either export internal statistics or control \fBZFS\fR behavior. In addition, native properties are either editable or read-only. User properties have no effect on \fBZFS\fR behavior,
-but you can use them to annotate datasets in a way that is meaningful in your environment. For more information about user properties, see the "User Properties" section.
+Properties are divided into two types, native properties and user defined properties. Native properties either export internal statistics or control \fBZFS\fR behavior. In addition, native properties are either editable or read-only. User properties have no effect on \fBZFS\fR behavior, but you can use them to annotate datasets in a way that is meaningful in your environment. For more information about user properties, see the "User Properties" section.
 .sp
 .LP
-Every dataset has a set of properties that export statistics about the dataset as well as control various behavior. Properties are inherited from the parent unless overridden by the child. Snapshot properties can not be edited; they always inherit their inheritable properties. Properties
-that are not applicable to snapshots are not displayed.
+Every dataset has a set of properties that export statistics about the dataset as well as control various behavior. Properties are inherited from the parent unless overridden by the child. Some properties only apply to certain types of datasets (file systems, volumes or snapshots).
 .sp
 .LP
-The values of numeric properties can be specified using the following human-readable suffixes (for example, "k", "KB", "M", "Gb", etc, up to Z for zettabyte). The following are all valid (and equal) specifications: 
+The values of numeric properties can be specified using human-readable suffixes (for example, "k", "KB", "M", "Gb", etc, up to Z for zettabyte). The following are all valid (and equal) specifications: 
 .sp
 .in +2
 .nf
@@ -360,8 +329,7 @@
 .ad
 .sp .6
 .RS 4n
-The amount of space available to the dataset and all its children, assuming that there is no other activity in the pool. Because space is shared within a pool, availability can be limited by any number of factors, including physical pool size, quotas, reservations, or other datasets
-within the pool.
+The amount of space available to the dataset and all its children, assuming that there is no other activity in the pool. Because space is shared within a pool, availability can be limited by any number of factors, including physical pool size, quotas, reservations, or other datasets within the pool.
 .sp
 This property can also be referred to by its shortened column name, "avail".
 .RE
@@ -418,8 +386,7 @@
 .ad
 .sp .6
 .RS 4n
-The amount of data that is accessible by this dataset, which may or may not be shared with other datasets in the pool. When a snapshot or clone is created, it initially references the same amount of space as the file system or snapshot it was created from, since its contents are
-identical.
+The amount of data that is accessible by this dataset, which may or may not be shared with other datasets in the pool. When a snapshot or clone is created, it initially references the same amount of space as the file system or snapshot it was created from, since its contents are identical.
 .sp
 This property can also be referred to by its shortened column name, "refer".
 .RE
@@ -432,7 +399,7 @@
 .ad
 .sp .6
 .RS 4n

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

From owner-p4-projects@FreeBSD.ORG  Mon Mar 29 20:02:02 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 73EE51065673; Mon, 29 Mar 2010 20:02:02 +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 379161065670
	for ; Mon, 29 Mar 2010 20:02:02 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 240278FC08
	for ; Mon, 29 Mar 2010 20:02:02 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2TK223Z011113
	for ; Mon, 29 Mar 2010 20:02:02 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2TK22XW011111
	for perforce@freebsd.org; Mon, 29 Mar 2010 20:02:02 GMT
	(envelope-from rene@FreeBSD.org)
Date: Mon, 29 Mar 2010 20:02:02 GMT
Message-Id: <201003292002.o2TK22XW011111@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 176256 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 29 Mar 2010 20:02:02 -0000

http://p4web.freebsd.org/chv.cgi?CH=176256

Change 176256 by rene@rene_eee on 2010/03/29 20:01:51

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#53 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#20 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#26 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#45 integrate
.. //depot/projects/docproj_nl/www/en/cgi/man.cgi#13 integrate
.. //depot/projects/docproj_nl/www/en/donations/donors.sgml#28 integrate
.. //depot/projects/docproj_nl/www/en/projects/ideas/ideas.xml#9 integrate
.. //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#21 integrate
.. //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#10 integrate

Differences ...

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

@@ -1,4 +1,4 @@
-
+
 
 
 
@@ -821,8 +821,13 @@
 	  In the rest of this document, we will use an
 	    &man.ath.4; device, the device name in the examples must
 	    be changed according to your configuration.  A list of
-	    available wireless drivers can be found at the beginning
-	    of the &man.wlan.4; manual page.  If a native &os; driver
+	    available wireless drivers and supported adapters can be
+	    found in the &os; Hardware Notes.  Copies of these notes
+	    for various releases and architectures are available on
+	    the Release
+	    Information page of the &os; Web site.
+	    If a native &os; driver
 	    for your wireless device does not exist, it may be
 	    possible to directly use the &windows; driver with the
 	    help of the 
 	
 
-	With a device driver configured you need to also bring
+	Under &os; 7.X, with a device driver you need to also bring
 	  in the 802.11 networking support required by the driver.
 	  For the &man.ath.4; driver these are at least the &man.wlan.4;,
 	  wlan_scan_ap and
@@ -843,12 +848,9 @@
 	wlan_scan_ap_load="YES"
 wlan_scan_sta_load="YES"
 
-	
-	  Both wlan_scan_ap and
-	    wlan_scan_sta modules are required by
-	    &os; 7.X, other &os; versions do not need
-	    them.
-	
+	Since &os; 8.0, these modules are part of the
+	  base &man.wlan.4; driver which is dynamically loaded with
+	  the adapter driver.
 
 	With that you will need the modules
 	  that implement cryptographic support for the security
@@ -880,21 +882,22 @@
 	    compile these drivers into the kernel by adding the
 	    following lines to your kernel configuration file:
 
-	  device ath               # Atheros IEEE 802.11 wireless network driver
-device ath_hal           # Atheros Hardware Access Layer
-options AH_SUPPORT_AR5416       # enable AR5416 tx/rx descriptors
-device ath_rate_sample   # SampleRate tx rate control for ath
-device wlan              # 802.11 support
-device wlan_scan_ap      # 802.11 AP mode scanning
-device wlan_scan_sta     # 802.11 STA mode scanning
+	  device wlan              # 802.11 support
 device wlan_wep          # 802.11 WEP support
 device wlan_ccmp         # 802.11 CCMP support
-device wlan_tkip         # 802.11 TKIP support
+device wlan_tkip         # 802.11 TKIP support
+device wlan_amrr         # AMRR transmit rate control algorithm
+device ath               # Atheros pci/cardbus NIC's
+device ath_hal           # pci/cardbus chip support
+options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors
+device ath_rate_sample   # SampleRate tx rate control for ath
 
-	  Both wlan_scan_ap and
-	    wlan_scan_sta lines are required by
+	  Both following lines are also required by
 	    &os; 7.X, other &os; versions do not need
-	    them.
+	    them:
+
+	  device wlan_scan_ap      # 802.11 AP mode scanning
+device wlan_scan_sta     # 802.11 STA mode scanning
 
 	  With this information in the kernel configuration
 	    file, recompile the kernel and reboot your &os;
@@ -934,10 +937,11 @@
 	    probes for available access points.  Only the super-user
 	    can initiate such a scan:
 
-	  &prompt.root; ifconfig ath0 up scan
+	  &prompt.root; ifconfig wlan0 create wlandev ath0
+&prompt.root; ifconfig wlan0 up scan
 SSID            BSSID              CHAN RATE  S:N   INT CAPS
-dlinkap         00:13:46:49:41:76    6   54M 29:3   100 EPS  WPA WME
-freebsdap       00:11:95:c3:0d:ac    1   54M 22:1   100 EPS  WPA
+dlinkap         00:13:46:49:41:76   11   54M -90:96   100 EPS  WPA WME
+freebsdap       00:11:95:c3:0d:ac    1   54M -83:96   100 EPS  WPA
 
 	  
 	    You must mark the interface 
@@ -945,6 +949,21 @@
 	      require you to mark the interface up again.
 	  
 
+	  
+	    Under &os; 7.X, the adapter device, for example
+	      ath0,
+	      is used directly instead of the
+	      wlan0
+	      device.  This requires you to replace the both previous
+	      lines with:
+
+	    &prompt.root; ifconfig ath0 up scan
+
+	    In the rest of this document, the &os; 7.X user
+	      will have to change the command and configuration lines
+	      according to that scheme.
+	  
+
 	  The output of a scan request lists each BSS/IBSS
 	    network found.  Beside the name of the network,
 	    SSID, we find the
@@ -1013,7 +1032,7 @@
 	  One can also display the current list of known
 	    networks with:
 
-	  &prompt.root; ifconfig ath0 list scan
+	  &prompt.root; ifconfig wlan0 list scan
 
 	  This information may be updated automatically by the
 	    adapter or manually with a  request.
@@ -1046,13 +1065,22 @@
 	      up or otherwise configure an interface by listing it in
 	      /etc/rc.conf, e.g.:
 
-	    ifconfig_ath0="DHCP"
+	    wlans_ath0="wlan0"
+ifconfig_wlan0="DHCP"
+
+	    
+	      As previously mentioned, &os; 7.X will only
+		require a line related to the adapter device:
+
+	      ifconfig_ath0="DHCP"
+	    
 
 	    If there are multiple access points and you want to
 	      select a specific one, you can select it by its
 	      SSID:
 
-	    ifconfig_ath0="ssid your_ssid_here DHCP"
+	    wlans_ath0="wlan0"
+ifconfig_wlan0="ssid your_ssid_here DHCP"
 
 	    In an environment where there are multiple access
 	      points with the same SSID (often done to simplify
@@ -1061,7 +1089,8 @@
 	      BSSID of the access point (you can also leave off the
 	      SSID):
 
-	    ifconfig_ath0="ssid your_ssid_here bssid xx:xx:xx:xx:xx:xx DHCP"
+	    wlans_ath0="wlan0"
+ifconfig_wlan0="ssid your_ssid_here bssid xx:xx:xx:xx:xx:xx DHCP"
 
 	    There are other ways to constrain the choice of an
 	      access point such as limiting the set of frequencies the
@@ -1071,7 +1100,8 @@
 	      specific band you can use the 
 	      parameter; e.g.:
 
-	    ifconfig_ath0="mode 11g ssid your_ssid_here DHCP"
+	    wlans_ath0="wlan0"
+ifconfig_wlan0="mode 11g ssid your_ssid_here DHCP"
 
 	    will force the card to operate in 802.11g which is
 	      defined only for 2.4GHz frequencies so any 5GHz channels
@@ -1113,7 +1143,8 @@
 		&airport; base station you can setup access with
 		something like:
 
-	      ifconfig_ath0="authmode shared wepmode on weptxkey 1 wepkey 01234567 DHCP"
+	      wlans_ath0="wlan0"
+ifconfig_wlan0="authmode shared wepmode on weptxkey 1 wepkey 01234567 DHCP"
 
 	      In general shared key authentication is to be
 		avoided because it uses the WEP key material in a
@@ -1137,7 +1168,8 @@
 	      DHCP to the configuration for your
 	      device as shown in various examples above:
 
-	    ifconfig_ath0="DHCP"
+	    wlans_ath0="wlan0"
+ifconfig_wlan0="DHCP"
 
 	    At this point, you are ready to bring up the
 	      wireless interface:
@@ -1148,24 +1180,24 @@
 	      ifconfig to see the status of the
 	      interface ath0:
 
-	    &prompt.root; ifconfig ath0
-ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
-        inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1
+	    &prompt.root; ifconfig wlan0
+wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+        ether 00:11:95:d5:43:62
         inet 192.168.1.100 netmask 0xffffff00 broadcast 192.168.1.255
-        ether 00:11:95:d5:43:62
-        media: IEEE 802.11 Wireless Ethernet autoselect (OFDM/54Mbps)
+        media: IEEE 802.11 Wireless Ethernet OFDM/54Mbps mode 11g
         status: associated
-        ssid dlinkap channel 6 bssid 00:13:46:49:41:76
-        authmode OPEN privacy OFF txpowmax 36 protmode CTS bintval 100
+        ssid dlinkap channel 11 (2462 Mhz 11g) bssid 00:13:46:49:41:76
+        country US ecm authmode OPEN privacy OFF txpower 21.5 bmiss 7
+        scanvalid 60 bgscan bgscanintvl 300 bgscanidle 250 roam:rssi 7
+        roam:rate 5 protmode CTS wme burst
 
 	    The status: associated means you
 	      are connected to the wireless network (to the
 	      dlinkap network in our case).  The
 	      bssid 00:13:46:49:41:76 part is the
 	      MAC address of your access point; the
-	      authmode line informs you that the
-	      communication is not encrypted
-	      (OPEN).
+	      authmode OPEN part informs you that the
+	      communication is not encrypted.
 	  
 
 	  
@@ -1178,7 +1210,8 @@
 	      parameters you have set up for selecting an access
 	      point:
 
-	    ifconfig_ath0="ssid your_ssid_here inet 192.168.1.100 netmask 255.255.255.0"
+	    wlans_ath0="wlan0"
+ifconfig_wlan0="ssid your_ssid_here inet 192.168.1.100 netmask 255.255.255.0"
 	  
 	
 
@@ -1253,60 +1286,64 @@
 	      done with WPA and the IP address will be obtained with
 	      DHCP:
 
-	    ifconfig_ath0="WPA DHCP"
+	    wlans_ath0="wlan0"
+ifconfig_wlan0="WPA DHCP"
 
 	    Then, we can bring up the interface:
 
 	    &prompt.root; /etc/rc.d/netif start
 Starting wpa_supplicant.
-DHCPDISCOVER on ath0 to 255.255.255.255 port 67 interval 5
-DHCPDISCOVER on ath0 to 255.255.255.255 port 67 interval 6
+DHCPDISCOVER on wlan0 to 255.255.255.255 port 67 interval 5
+DHCPDISCOVER on wlan0 to 255.255.255.255 port 67 interval 6
 DHCPOFFER from 192.168.0.1
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67
 DHCPACK from 192.168.0.1
 bound to 192.168.0.254 -- renewal in 300 seconds.
-ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
-      inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1
+wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+      ether 00:11:95:d5:43:62
       inet 192.168.0.254 netmask 0xffffff00 broadcast 192.168.0.255
-      ether 00:11:95:d5:43:62
-      media: IEEE 802.11 Wireless Ethernet autoselect (OFDM/36Mbps)
+      media: IEEE 802.11 Wireless Ethernet OFDM/36Mbps mode 11g
       status: associated
-      ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
-      authmode WPA privacy ON deftxkey UNDEF TKIP 2:128-bit txpowmax 36
-      protmode CTS roaming MANUAL bintval 100
+      ssid freebsdap channel 1 (2412 Mhz 11g) bssid 00:11:95:c3:0d:ac
+      country US ecm authmode WPA2/802.11i privacy ON deftxkey UNDEF
+      AES-CCM 3:128-bit txpower 21.5 bmiss 7 scanvalid 450 bgscan
+      bgscanintvl 300 bgscanidle 250 roam:rssi 7 roam:rate 5 protmode CTS
+      wme burst roaming MANUAL
 
 	    Or you can try to configure it manually using the
 	      same /etc/wpa_supplicant.conf above, and
 	      run:
 
-	    &prompt.root; wpa_supplicant -i ath0 -c /etc/wpa_supplicant.conf
+	    &prompt.root; wpa_supplicant -i wlan0 -c /etc/wpa_supplicant.conf
 Trying to associate with 00:11:95:c3:0d:ac (SSID='freebsdap' freq=2412 MHz)
 Associated with 00:11:95:c3:0d:ac
-WPA: Key negotiation completed with 00:11:95:c3:0d:ac [PTK=TKIP GTK=TKIP]
+WPA: Key negotiation completed with 00:11:95:c3:0d:ac [PTK=CCMP GTK=CCMP]
+CTRL-EVENT-CONNECTED - Connection to 00:11:95:c3:0d:ac completed (auth) [id=0 id_str=]
 
 	    The next operation is the launch of the
 	      dhclient command to get the IP
 	      address from the DHCP server:
 
-	    &prompt.root; dhclient ath0
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
+	    &prompt.root; dhclient wlan0
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67
 DHCPACK from 192.168.0.1
 bound to 192.168.0.254 -- renewal in 300 seconds.
-&prompt.root; ifconfig ath0
-ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
-      inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1
+&prompt.root; ifconfig wlan0
+wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+      ether 00:11:95:d5:43:62
       inet 192.168.0.254 netmask 0xffffff00 broadcast 192.168.0.255
-      ether 00:11:95:d5:43:62
-      media: IEEE 802.11 Wireless Ethernet autoselect (OFDM/48Mbps)
+      media: IEEE 802.11 Wireless Ethernet OFDM/36Mbps mode 11g
       status: associated
-      ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
-      authmode WPA privacy ON deftxkey UNDEF TKIP 2:128-bit txpowmax 36
-      protmode CTS roaming MANUAL bintval 100
+      ssid freebsdap channel 1 (2412 Mhz 11g) bssid 00:11:95:c3:0d:ac
+      country US ecm authmode WPA2/802.11i privacy ON deftxkey UNDEF
+      AES-CCM 3:128-bit txpower 21.5 bmiss 7 scanvalid 450 bgscan
+      bgscanintvl 300 bgscanidle 250 roam:rssi 7 roam:rate 5 protmode CTS
+      wme burst roaming MANUAL
 
 	    
 	      If the /etc/rc.conf is set up
-		with the line ifconfig_ath0="DHCP"
+		with the line ifconfig_wlan0="DHCP"
 		then it is no need to run the
 		dhclient command manually,
 		dhclient will be launched after
@@ -1319,17 +1356,18 @@
 	      wpa_supplicant has authenticated the
 	      station:
 
-	    &prompt.root; ifconfig ath0 inet 192.168.0.100 netmask 255.255.255.0
-&prompt.root; ifconfig ath0
-ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
-      inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1
+	    &prompt.root; ifconfig wlan0 inet 192.168.0.100 netmask 255.255.255.0
+&prompt.root; ifconfig wlan0
+wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+      ether 00:11:95:d5:43:62
       inet 192.168.0.100 netmask 0xffffff00 broadcast 192.168.0.255
-      ether 00:11:95:d5:43:62
-      media: IEEE 802.11 Wireless Ethernet autoselect (OFDM/36Mbps)
+      media: IEEE 802.11 Wireless Ethernet OFDM/36Mbps mode 11g
       status: associated
-      ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
-      authmode WPA privacy ON deftxkey UNDEF TKIP 2:128-bit txpowmax 36
-      protmode CTS roaming MANUAL bintval 100
+      ssid freebsdap channel 1 (2412 Mhz 11g) bssid 00:11:95:c3:0d:ac
+      country US ecm authmode WPA2/802.11i privacy ON deftxkey UNDEF
+      AES-CCM 3:128-bit txpower 21.5 bmiss 7 scanvalid 450 bgscan
+      bgscanintvl 300 bgscanidle 250 roam:rssi 7 roam:rate 5 protmode CTS
+      wme burst roaming MANUAL
 
 	    When DHCP is not used, you also have to manually set
 	      up the default gateway and the nameserver:
@@ -1437,29 +1475,31 @@
 	      
 	    
 
-	    Then add the following line to
+	    Then add the following lines to
 	      /etc/rc.conf:
 
-	    ifconfig_ath0="WPA DHCP"
+	    wlans_ath0="wlan0"
+ifconfig_wlan0="WPA DHCP"
 
 	    The next step is to bring up the interface with the
 	      help of the rc.d facility:
 
 	    &prompt.root; /etc/rc.d/netif start
 Starting wpa_supplicant.
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 7
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 15
 DHCPACK from 192.168.0.20
 bound to 192.168.0.254 -- renewal in 300 seconds.
-ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
-      inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1
+wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+      ether 00:11:95:d5:43:62
       inet 192.168.0.254 netmask 0xffffff00 broadcast 192.168.0.255
-      ether 00:11:95:d5:43:62
-      media: IEEE 802.11 Wireless Ethernet autoselect (DS/11Mbps)
+      media: IEEE 802.11 Wireless Ethernet DS/11Mbps mode 11g
       status: associated
-      ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
-      authmode WPA2/802.11i privacy ON deftxkey UNDEF TKIP 2:128-bit
-      txpowmax 36 protmode CTS roaming MANUAL bintval 100
+      ssid freebsdap channel 1 (2412 Mhz 11g) bssid 00:11:95:c3:0d:ac
+      country US ecm authmode WPA2/802.11i privacy ON deftxkey UNDEF
+      AES-CCM 3:128-bit txpower 21.5 bmiss 7 scanvalid 450 bgscan
+      bgscanintvl 300 bgscanidle 250 roam:rssi 7 roam:rate 5 protmode CTS
+      wme burst roaming MANUAL
 
 	    As previously shown, it is also possible to bring up
 	      the interface manually with both
@@ -1527,29 +1567,31 @@
 	      
 	    
 
-	    You also have to add the following line to
+	    You also have to add the following lines to
 	      /etc/rc.conf:
 
-	    ifconfig_ath0="WPA DHCP"
+	    wlans_ath0="wlan0"
+ifconfig_wlan0="WPA DHCP"
 
 	    The next step is to bring up the interface:
 
 	    &prompt.root; /etc/rc.d/netif start
 Starting wpa_supplicant.
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 7
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 15
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 21
 DHCPACK from 192.168.0.20
 bound to 192.168.0.254 -- renewal in 300 seconds.
-ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
-      inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1
+wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+      ether 00:11:95:d5:43:62
       inet 192.168.0.254 netmask 0xffffff00 broadcast 192.168.0.255
-      ether 00:11:95:d5:43:62
-      media: IEEE 802.11 Wireless Ethernet autoselect (DS/11Mbps)
+      media: IEEE 802.11 Wireless Ethernet DS/11Mbps mode 11g
       status: associated
-      ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
-      authmode WPA2/802.11i privacy ON deftxkey UNDEF TKIP 2:128-bit
-      txpowmax 36 protmode CTS roaming MANUAL bintval 100
+      ssid freebsdap channel 1 (2412 Mhz 11g) bssid 00:11:95:c3:0d:ac
+      country US ecm authmode WPA2/802.11i privacy ON deftxkey UNDEF
+      AES-CCM 3:128-bit txpower 21.5 bmiss 7 scanvalid 450 bgscan
+      bgscanintvl 300 bgscanidle 250 roam:rssi 7 roam:rate 5 protmode CTS
+      wme burst roaming MANUAL
 	  
 
 	  
@@ -1637,26 +1679,28 @@
 	    The following must be added to
 	      /etc/rc.conf:
 
-	    ifconfig_ath0="WPA DHCP"
+	    wlans_ath0="wlan0"
+ifconfig_wlan0="WPA DHCP"
 
 	    Then, we can bring up the interface:
 
 	    &prompt.root; /etc/rc.d/netif start
 Starting wpa_supplicant.
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 7
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 15
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 21
 DHCPACK from 192.168.0.20
 bound to 192.168.0.254 -- renewal in 300 seconds.
-ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
-      inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1
+wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+      ether 00:11:95:d5:43:62
       inet 192.168.0.254 netmask 0xffffff00 broadcast 192.168.0.255
-      ether 00:11:95:d5:43:62
-      media: IEEE 802.11 Wireless Ethernet autoselect (DS/11Mbps)
+      media: IEEE 802.11 Wireless Ethernet DS/11Mbps mode 11g
       status: associated
-      ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
-      authmode WPA2/802.11i privacy ON deftxkey UNDEF TKIP 2:128-bit
-      txpowmax 36 protmode CTS roaming MANUAL bintval 100
+      ssid freebsdap channel 1 (2412 Mhz 11g) bssid 00:11:95:c3:0d:ac
+      country US ecm authmode WPA2/802.11i privacy ON deftxkey UNDEF
+      AES-CCM 3:128-bit txpower 21.5 bmiss 7 scanvalid 450 bgscan
+      bgscanintvl 300 bgscanidle 250 roam:rssi 7 roam:rate 5 protmode CTS
+      wme burst roaming MANUAL
 	  
 	
 
@@ -1671,7 +1715,8 @@
 	  WEP can be set up with
 	    ifconfig:
 
-	  &prompt.root; ifconfig ath0 ssid my_net wepmode on weptxkey 3 wepkey 3:0x3456789012 \
+	  &prompt.root; ifconfig wlan0 create wlandev ath0
+&prompt.root; ifconfig wlan0 ssid my_net wepmode on weptxkey 3 wepkey 3:0x3456789012 \
 	    inet 192.168.1.100 netmask 255.255.255.0
 
 	  
@@ -1719,7 +1764,7 @@
 
 	  Then:
 
-	  &prompt.root; wpa_supplicant -i ath0 -c /etc/wpa_supplicant.conf
+	  &prompt.root; wpa_supplicant -i wlan0 -c /etc/wpa_supplicant.conf
 Trying to associate with 00:13:46:49:41:76 (SSID='dlinkap' freq=2437 MHz)
 Associated with 00:13:46:49:41:76
 	
@@ -1737,12 +1782,12 @@
 
       On the box A:
 
-      &prompt.root; ifconfig ath0 ssid freebsdap mediaopt adhoc inet 192.168.0.1 netmask 255.255.255.0
-&prompt.root; ifconfig ath0
-  ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+      &prompt.root; ifconfig wlan0 create wlandev ath0
+&prompt.root; ifconfig wlan0 ssid freebsdap mediaopt adhoc inet 192.168.0.1 netmask 255.255.255.0
+&prompt.root; ifconfig wlan0
+  wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+	  ether 00:11:95:c3:0d:ac
 	  inet 192.168.0.1 netmask 0xffffff00 broadcast 192.168.0.255
-	  inet6 fe80::211:95ff:fec3:dac%ath0 prefixlen 64 scopeid 0x4
-	  ether 00:11:95:c3:0d:ac
 	  media: IEEE 802.11 Wireless Ethernet autoselect <adhoc> (autoselect <adhoc>)
 	  status: associated
 	  ssid freebsdap channel 2 bssid 02:11:95:c3:0d:ac
@@ -1754,21 +1799,21 @@
       On B, we should be able to detect
 	A:
 
-      &prompt.root; ifconfig ath0 up scan
+      &prompt.root; ifconfig wlan0 up scan
   SSID            BSSID              CHAN RATE  S:N   INT CAPS
-  freebsdap       02:11:95:c3:0d:ac    2   54M 19:3   100 IS
+  freebsdap       02:11:95:c3:0d:ac    2   54M -90:-96   100 IS
 
       The I in the output confirms the
 	machine A is in ad-hoc mode.  We just have to
 	configure B with a different IP
 	address:
 
-      &prompt.root; ifconfig ath0 ssid freebsdap mediaopt adhoc inet 192.168.0.2 netmask 255.255.255.0
-&prompt.root; ifconfig ath0
-  ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
-	  inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1
+      &prompt.root; ifconfig wlan0 create wlandev ath0
+&prompt.root; ifconfig wlan0 ssid freebsdap mediaopt adhoc inet 192.168.0.2 netmask 255.255.255.0
+&prompt.root; ifconfig wlan0
+  wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+	  ether 00:11:95:d5:43:62
 	  inet 192.168.0.2 netmask 0xffffff00 broadcast 192.168.0.255
-	  ether 00:11:95:d5:43:62
 	  media: IEEE 802.11 Wireless Ethernet autoselect <adhoc> (autoselect <adhoc>)
 	  status: associated
 	  ssid freebsdap channel 2 bssid 02:11:95:c3:0d:ac

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

@@ -1,7 +1,7 @@
 
 
 
@@ -892,10 +892,7 @@
 	  system.  Older &os; versions do not have &man.csup.1; in their
 	  base system but you can easily install the
 	  net/csup port, or a precompiled
-	  package.  The csup utility does not
-	  support CVS mode, though.  If you want to mirror complete
-	  repositories, you will still need to use
-	  CVSup.  If you decided to use
+	  package.  If you decided to use
 	  csup, just skip the steps on the
 	  installation of CVSup and
 	  substitute the references of CVSup with

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#45 (text+ko) ====

@@ -1,7 +1,7 @@
 
+
 
 
   
     
-      $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.109 2010/03/09 22:18:46 jkois Exp $
+      $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.113 2010/03/28 12:02:35 jkois Exp $
     
   
 
@@ -540,6 +540,18 @@
     
   
 
+  
+    Okanagan Technology Solutions
+    http://www.okts.ca/
+    
+      Okanagan Technology Solutions specializes in open source
+      technologies, in particular FreeBSD, Perl, Apache, and MySQL for
+      clients in the beautiful Okanagan region of British Columbia.
+      For more information, please visit our web site.
+    
+  
+
   
     Linux Network Care
     http://www.linuxnetworkcare.com/
@@ -650,21 +662,6 @@
     
   
 
-  
-    Neturn Corp.
-    http://neturn.sinacity.com/netserv/
-    
-      Neturn Corp., based in Vancouver, Canada, provides complete solutions
-      on selective and fine-tuned hardware and software (BSDs as primary
-      server OSs) platforms to meet the demand from e-commerce,
-      telecom, manufacturing, industrial, aerospace, medical applications
-      where stability and reliability are mandatory. For detailed
-      information, please visit http://neturn.sinacity.com
-      /netserv.
-    
-  
-
   
     Netgraft Corp.
     http://netgraft.com/
@@ -1200,8 +1197,8 @@
     
       Raditex AB are a firm of consultants and also do education in Unix.
       We have long experience with all kinds of Unix systems not only
-      FreeBSD or Linux. For more information phone us at +46.8.6949270 or
-      give us an email at gorhas@raditex.nu or visit our web site.
     

==== //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#10 (text+ko) ====

@@ -5,7 +5,7 @@
 
   
     
-      $FreeBSD: www/share/sgml/usergroups.xml,v 1.83 2010/01/21 21:48:07 jkois Exp $
+      $FreeBSD: www/share/sgml/usergroups.xml,v 1.84 2010/03/28 17:59:39 jkois Exp $
     
   
 
@@ -519,18 +519,6 @@
     
   
 
-
-  
-    
-      Swiss BSD User Group (SwissBUG)
-      http://www.swissbug.org
-
-      The Swiss BSD User Group (SwissBUG) caters for
-        users of BSD-based systems in Switzerland. Located in
-        Switzerland.
-      
-    
-  
   
     
       Ukrainian FreeBSD User Group (UAFUG)

From owner-p4-projects@FreeBSD.ORG  Mon Mar 29 20:03:03 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B0F0D1065670; Mon, 29 Mar 2010 20:03: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 5CDA7106566B
	for ; Mon, 29 Mar 2010 20:03:03 +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 4A7B88FC14
	for ; Mon, 29 Mar 2010 20:03:03 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2TK33ch012142
	for ; Mon, 29 Mar 2010 20:03:03 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2TK33vn012140
	for perforce@freebsd.org; Mon, 29 Mar 2010 20:03:03 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Mon, 29 Mar 2010 20:03:03 GMT
Message-Id: <201003292003.o2TK33vn012140@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 176257 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 29 Mar 2010 20:03:03 -0000

http://p4web.freebsd.org/chv.cgi?CH=176257

Change 176257 by anchie@anchie_malimis on 2010/03/29 20:02:52

	Partial cleanup. Tring to get read of panic in soreceive_generic() after
	sbappendrecord_locked() on SEND socket.	

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#35 edit

Differences ...

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#35 (text+ko) ====

@@ -210,19 +210,19 @@
 sosend_rcv(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam,
     struct mbuf *control, struct thread *td)
 {
-	struct ifnet *ifp;
+	//struct ifnet *ifp = NULL;
 	struct snd_hdr *snd_hdr;
-	int if_index;
 
 	printf("sosend_rcv \n");
 
 	snd_hdr = mtod(m, struct snd_hdr *);
-	if_index = snd_hdr->ifidx;
 	printf("direction: %d, ifidx: %d \n", snd_hdr->direction, snd_hdr->ifidx);
+	//send_ifnet_setbyindex(snd_hdr->ifidx, ifp);
 #if 0
 	ifnet_setbyindex(snd_hdr->ifidx, ifp);
 	m_adj(n, sizeof(struct snd_hdr));
-	send_output_hook(m, ifp, snd_hdr->direction);
+	if (ifp)
+		send_output_hook(m, ifp, snd_hdr->direction);
 #endif
 
 	return 0;
@@ -235,9 +235,10 @@
 send_sendso_input(struct socket *s, struct mbuf *m, int direction, int msglen)
 {
     u_int len;
-    void *data;
     struct ip6_hdr *ip6;
     struct snd_hdr *snd_hdr;
+
+printf("send_sendso_input \n");
                         
         /*
          * Make sure to clear any possible internally embedded scope before
@@ -252,26 +253,19 @@
         if (len != msglen)
                 printf("XXX-BZ %s: (m)len=%u (ip6)msglen=%d", __func__, len, msglen);
                         
-        /*
-         * XXX-BZ we can save the alloc/free here if not relying on rtsock.c:rt_msg3()
-         * but using a version operating on mbuf-to-mbuf copy.
-         */
-        data = malloc(msglen, M_SEND, M_NOWAIT);
-        if (data == NULL) {
-                m_freem(m);
-                return (ENOBUFS);
-        }
+	M_PREPEND(m, SEND_HDR_LEN, M_DONTWAIT);
+	if (m == NULL) {
+		m_freem(m);
+		return (ENOBUFS);
+	}
 
-        m_copydata(m, 0, msglen, data);
+	m->m_flags &= M_PKTHDR;
+printf("MLEN: %d, MHLEN: %d, SEND_HDR_LEN: %d \n", MLEN, MHLEN, SEND_HDR_LEN);
 
-    M_PREPEND(m, SEND_HDR_LEN, M_DONTWAIT);
-    if ((m == NULL && (m = m_pullup(m, len + SEND_HDR_LEN)) == NULL)) {
-	m_freem(m);
-	return (ENOBUFS);
-    }
-    snd_hdr = mtod(m, struct snd_hdr *);
-    snd_hdr->direction = direction;
-    snd_hdr->ifidx = -1;
+	snd_hdr = mtod(m, struct snd_hdr *);
+	snd_hdr->direction = direction;
+	snd_hdr->ifidx = -1;
+printf("direction: %d \n", snd_hdr->direction);
 
         /*
          * Send incoming or outgoing traffic to the user space either to be
@@ -281,11 +275,9 @@
 		SOCKBUF_LOCK(&s->so_rcv);
 		sbappendrecord_locked(&s->so_rcv, m);
 		sorwakeup_locked(s);
+printf("Nakon sorwakeup \n");
 		return 0;
-    	}
-
-    m_freem(m);
-    free(data, M_SEND);
+	}
 
     return -1;
 }
@@ -301,9 +293,8 @@
 }
 
 struct pr_usrreqs send_usrreqs = {
-    // Read sys/kern/uipc_socket.c	
     .pru_attach =		send_uattach,
-    .pru_send =		sosend_rcv,
+    .pru_send =			sosend_rcv,
     .pru_detach =		send_close
 };
 
@@ -325,7 +316,6 @@
 		error = pf_proto_register(PF_INET, &send_protosw);
 		if (error != 0)
 			break;
-printf("pf_proto_register() OK\n");
 
 		send_output_hook = send_output;
 		send_input_hook = send_input;

From owner-p4-projects@FreeBSD.ORG  Tue Mar 30 09:17:23 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 01C831065674; Tue, 30 Mar 2010 09:17:23 +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 B90911065672
	for ; Tue, 30 Mar 2010 09:17:22 +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 8D55A8FC1C
	for ; Tue, 30 Mar 2010 09:17:22 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2U9HMqD027034
	for ; Tue, 30 Mar 2010 09:17:22 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2U9HMgX027032
	for perforce@freebsd.org; Tue, 30 Mar 2010 09:17:22 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Tue, 30 Mar 2010 09:17:22 GMT
Message-Id: <201003300917.o2U9HMgX027032@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 176275 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 30 Mar 2010 09:17:23 -0000

http://p4web.freebsd.org/chv.cgi?CH=176275

Change 176275 by anchie@anchie_malimis on 2010/03/30 09:16:35

	Still trying to get rid of the panic soreceive_generic().	

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#36 edit

Differences ...

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#36 (text+ko) ====

@@ -236,7 +236,7 @@
 {
     u_int len;
     struct ip6_hdr *ip6;
-    struct snd_hdr *snd_hdr;
+    struct snd_hdr *snd_hdr = NULL;
 
 printf("send_sendso_input \n");
                         
@@ -253,19 +253,29 @@
         if (len != msglen)
                 printf("XXX-BZ %s: (m)len=%u (ip6)msglen=%d", __func__, len, msglen);
                         
-	M_PREPEND(m, SEND_HDR_LEN, M_DONTWAIT);
-	if (m == NULL) {
-		m_freem(m);
-		return (ENOBUFS);
-	}
+printf("M_LEADINGSPACE(%d) >= SEND_HDR_LEN(%d)?\n", M_LEADINGSPACE(m), SEND_HDR_LEN);
+	if (M_LEADINGSPACE(m) >= SEND_HDR_LEN) {
+		M_PREPEND(m, SEND_HDR_LEN, M_PKTHDR|M_DONTWAIT);
+		snd_hdr = mtod(m, struct snd_hdr *);
+		snd_hdr->direction = direction;
+		snd_hdr->ifidx = -1;
+	} else {
+		struct mbuf *n;
+		MGET(n, M_PKTHDR|M_DONTWAIT, MT_DATA);
+		if (n == NULL) {
+			m_freem(m);
+			return ENOBUFS;
+		}	
 
-	m->m_flags &= M_PKTHDR;
-printf("MLEN: %d, MHLEN: %d, SEND_HDR_LEN: %d \n", MLEN, MHLEN, SEND_HDR_LEN);
+		snd_hdr = mtod(n, struct snd_hdr *);
+		snd_hdr->direction = direction;
+		snd_hdr->ifidx = -1;
 
-	snd_hdr = mtod(m, struct snd_hdr *);
-	snd_hdr->direction = direction;
-	snd_hdr->ifidx = -1;
-printf("direction: %d \n", snd_hdr->direction);
+		n->m_len = SEND_HDR_LEN;
+		n->m_next = m->m_next;
+		m->m_next = n;
+		m->m_pkthdr.len += SEND_HDR_LEN;
+	}
 
         /*
          * Send incoming or outgoing traffic to the user space either to be
@@ -275,7 +285,6 @@
 		SOCKBUF_LOCK(&s->so_rcv);
 		sbappendrecord_locked(&s->so_rcv, m);
 		sorwakeup_locked(s);
-printf("Nakon sorwakeup \n");
 		return 0;
 	}
 

From owner-p4-projects@FreeBSD.ORG  Tue Mar 30 16:10:30 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9E1E3106566C; Tue, 30 Mar 2010 16:10: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 545A0106564A
	for ; Tue, 30 Mar 2010 16:10:30 +0000 (UTC)
	(envelope-from sbruno@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 401B28FC16
	for ; Tue, 30 Mar 2010 16:10:30 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2UGAUvD076855
	for ; Tue, 30 Mar 2010 16:10:30 GMT
	(envelope-from sbruno@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2UG9uAs076752
	for perforce@freebsd.org; Tue, 30 Mar 2010 16:09:56 GMT
	(envelope-from sbruno@freebsd.org)
Date: Tue, 30 Mar 2010 16:09:56 GMT
Message-Id: <201003301609.o2UG9uAs076752@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sbruno@freebsd.org using -f
From: Sean Bruno 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 176285 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 30 Mar 2010 16:10:30 -0000

http://p4web.freebsd.org/chv.cgi?CH=176285

Change 176285 by sbruno@sbruno_consultcsg on 2010/03/30 16:09:50

	IFC

Affected files ...

.. //depot/projects/firewire/COPYRIGHT#2 integrate
.. //depot/projects/firewire/MAINTAINERS#2 integrate
.. //depot/projects/firewire/Makefile#2 integrate
.. //depot/projects/firewire/Makefile.inc1#2 integrate
.. //depot/projects/firewire/ObsoleteFiles.inc#2 integrate
.. //depot/projects/firewire/UPDATING#3 integrate
.. //depot/projects/firewire/bin/Makefile#2 integrate
.. //depot/projects/firewire/bin/cat/Makefile#2 integrate
.. //depot/projects/firewire/bin/cp/cp.1#2 integrate
.. //depot/projects/firewire/bin/cp/cp.c#2 integrate
.. //depot/projects/firewire/bin/cp/utils.c#2 integrate
.. //depot/projects/firewire/bin/csh/config.h#2 integrate
.. //depot/projects/firewire/bin/csh/config_p.h#2 integrate
.. //depot/projects/firewire/bin/csh/iconv_stub.c#2 integrate
.. //depot/projects/firewire/bin/date/Makefile#2 integrate
.. //depot/projects/firewire/bin/date/date.1#2 integrate
.. //depot/projects/firewire/bin/date/date.c#2 integrate
.. //depot/projects/firewire/bin/ed/Makefile#2 integrate
.. //depot/projects/firewire/bin/ed/main.c#2 integrate
.. //depot/projects/firewire/bin/getfacl/getfacl.1#2 integrate
.. //depot/projects/firewire/bin/kenv/kenv.c#2 integrate
.. //depot/projects/firewire/bin/kill/kill.c#2 integrate
.. //depot/projects/firewire/bin/ls/cmp.c#2 integrate
.. //depot/projects/firewire/bin/ls/ls.c#2 integrate
.. //depot/projects/firewire/bin/ls/ls.h#2 integrate
.. //depot/projects/firewire/bin/ls/print.c#2 integrate
.. //depot/projects/firewire/bin/pax/Makefile#2 integrate
.. //depot/projects/firewire/bin/pax/cpio.h#2 integrate
.. //depot/projects/firewire/bin/pax/ftree.c#2 integrate
.. //depot/projects/firewire/bin/pax/gen_subs.c#2 integrate
.. //depot/projects/firewire/bin/pax/sel_subs.c#2 integrate
.. //depot/projects/firewire/bin/pax/tar.h#2 integrate
.. //depot/projects/firewire/bin/pkill/Makefile#2 integrate
.. //depot/projects/firewire/bin/pkill/pkill.1#2 integrate
.. //depot/projects/firewire/bin/pkill/pkill.c#2 integrate
.. //depot/projects/firewire/bin/ps/extern.h#2 integrate
.. //depot/projects/firewire/bin/ps/keyword.c#2 integrate
.. //depot/projects/firewire/bin/ps/print.c#2 integrate
.. //depot/projects/firewire/bin/ps/ps.1#2 integrate
.. //depot/projects/firewire/bin/ps/ps.c#2 integrate
.. //depot/projects/firewire/bin/pwait/Makefile#1 branch
.. //depot/projects/firewire/bin/pwait/pwait.1#1 branch
.. //depot/projects/firewire/bin/pwait/pwait.c#1 branch
.. //depot/projects/firewire/bin/rcp/rcp.c#2 integrate
.. //depot/projects/firewire/bin/rmail/Makefile#2 integrate
.. //depot/projects/firewire/bin/setfacl/file.c#2 integrate
.. //depot/projects/firewire/bin/setfacl/mask.c#2 integrate
.. //depot/projects/firewire/bin/setfacl/merge.c#2 integrate
.. //depot/projects/firewire/bin/setfacl/remove.c#2 integrate
.. //depot/projects/firewire/bin/setfacl/setfacl.1#2 integrate
.. //depot/projects/firewire/bin/setfacl/setfacl.c#2 integrate
.. //depot/projects/firewire/bin/setfacl/setfacl.h#2 integrate
.. //depot/projects/firewire/bin/setfacl/util.c#2 integrate
.. //depot/projects/firewire/bin/sh/alias.c#2 integrate
.. //depot/projects/firewire/bin/sh/alias.h#2 integrate
.. //depot/projects/firewire/bin/sh/arith.h#2 integrate
.. //depot/projects/firewire/bin/sh/arith.y#2 integrate
.. //depot/projects/firewire/bin/sh/arith_lex.l#2 integrate
.. //depot/projects/firewire/bin/sh/cd.c#2 integrate
.. //depot/projects/firewire/bin/sh/error.c#2 integrate
.. //depot/projects/firewire/bin/sh/error.h#2 integrate
.. //depot/projects/firewire/bin/sh/eval.c#2 integrate
.. //depot/projects/firewire/bin/sh/eval.h#2 integrate
.. //depot/projects/firewire/bin/sh/exec.c#2 integrate
.. //depot/projects/firewire/bin/sh/exec.h#2 integrate
.. //depot/projects/firewire/bin/sh/expand.c#2 integrate
.. //depot/projects/firewire/bin/sh/expand.h#2 integrate
.. //depot/projects/firewire/bin/sh/histedit.c#2 integrate
.. //depot/projects/firewire/bin/sh/input.c#2 integrate
.. //depot/projects/firewire/bin/sh/input.h#2 integrate
.. //depot/projects/firewire/bin/sh/jobs.c#2 integrate
.. //depot/projects/firewire/bin/sh/mail.c#2 integrate
.. //depot/projects/firewire/bin/sh/main.c#2 integrate
.. //depot/projects/firewire/bin/sh/main.h#2 integrate
.. //depot/projects/firewire/bin/sh/memalloc.c#2 integrate
.. //depot/projects/firewire/bin/sh/memalloc.h#2 integrate
.. //depot/projects/firewire/bin/sh/miscbltin.c#2 integrate
.. //depot/projects/firewire/bin/sh/mkbuiltins#2 integrate
.. //depot/projects/firewire/bin/sh/mkinit.c#2 integrate
.. //depot/projects/firewire/bin/sh/mksyntax.c#2 integrate
.. //depot/projects/firewire/bin/sh/myhistedit.h#2 integrate
.. //depot/projects/firewire/bin/sh/mystring.c#2 integrate
.. //depot/projects/firewire/bin/sh/options.c#2 integrate
.. //depot/projects/firewire/bin/sh/options.h#2 integrate
.. //depot/projects/firewire/bin/sh/output.c#2 integrate
.. //depot/projects/firewire/bin/sh/output.h#2 integrate
.. //depot/projects/firewire/bin/sh/parser.c#3 integrate
.. //depot/projects/firewire/bin/sh/parser.h#2 integrate
.. //depot/projects/firewire/bin/sh/redir.c#2 integrate
.. //depot/projects/firewire/bin/sh/sh.1#3 integrate
.. //depot/projects/firewire/bin/sh/show.c#2 integrate
.. //depot/projects/firewire/bin/sh/show.h#2 integrate
.. //depot/projects/firewire/bin/sh/trap.c#2 integrate
.. //depot/projects/firewire/bin/sh/trap.h#2 integrate
.. //depot/projects/firewire/bin/sh/var.c#2 integrate
.. //depot/projects/firewire/bin/sh/var.h#2 integrate
.. //depot/projects/firewire/bin/test/test.c#2 integrate
.. //depot/projects/firewire/bin/uuidgen/Makefile#2 integrate
.. //depot/projects/firewire/cddl/Makefile.inc#2 integrate
.. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#2 integrate
.. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/zfs/zfs.8#3 integrate
.. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 integrate
.. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 integrate
.. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#2 integrate
.. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/zpool/zpool.8#2 integrate
.. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#2 integrate
.. //depot/projects/firewire/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 integrate
.. //depot/projects/firewire/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate
.. //depot/projects/firewire/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 integrate
.. //depot/projects/firewire/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#2 integrate
.. //depot/projects/firewire/cddl/lib/drti/Makefile#2 integrate
.. //depot/projects/firewire/cddl/lib/libavl/Makefile#2 integrate
.. //depot/projects/firewire/cddl/lib/libctf/Makefile#2 integrate
.. //depot/projects/firewire/cddl/lib/libdtrace/Makefile#2 integrate
.. //depot/projects/firewire/cddl/lib/libnvpair/Makefile#2 integrate
.. //depot/projects/firewire/cddl/lib/libumem/Makefile#2 integrate
.. //depot/projects/firewire/cddl/lib/libuutil/Makefile#2 integrate
.. //depot/projects/firewire/cddl/lib/libzfs/Makefile#2 integrate
.. //depot/projects/firewire/cddl/lib/libzpool/Makefile#2 integrate
.. //depot/projects/firewire/cddl/sbin/zfs/Makefile#2 integrate
.. //depot/projects/firewire/cddl/sbin/zpool/Makefile#2 integrate
.. //depot/projects/firewire/cddl/usr.bin/ctfconvert/Makefile#2 integrate
.. //depot/projects/firewire/cddl/usr.bin/ctfdump/Makefile#2 integrate
.. //depot/projects/firewire/cddl/usr.bin/ctfmerge/Makefile#2 integrate
.. //depot/projects/firewire/cddl/usr.bin/sgsmsg/Makefile#2 integrate
.. //depot/projects/firewire/cddl/usr.bin/zinject/Makefile#2 integrate
.. //depot/projects/firewire/cddl/usr.bin/ztest/Makefile#2 integrate
.. //depot/projects/firewire/cddl/usr.sbin/dtrace/Makefile#2 integrate
.. //depot/projects/firewire/cddl/usr.sbin/lockstat/Makefile#2 integrate
.. //depot/projects/firewire/cddl/usr.sbin/zdb/Makefile#2 integrate
.. //depot/projects/firewire/contrib/bc/AUTHORS#2 delete
.. //depot/projects/firewire/contrib/bc/ChangeLog#2 delete
.. //depot/projects/firewire/contrib/bc/Examples/ckbook.b#2 delete
.. //depot/projects/firewire/contrib/bc/Examples/pi.b#2 delete
.. //depot/projects/firewire/contrib/bc/Examples/primes.b#2 delete
.. //depot/projects/firewire/contrib/bc/Examples/twins.b#2 delete
.. //depot/projects/firewire/contrib/bc/FAQ#2 delete
.. //depot/projects/firewire/contrib/bc/FREEBSD-upgrade#2 delete
.. //depot/projects/firewire/contrib/bc/INSTALL#2 delete
.. //depot/projects/firewire/contrib/bc/Makefile.am#2 delete
.. //depot/projects/firewire/contrib/bc/Makefile.in#2 delete
.. //depot/projects/firewire/contrib/bc/NEWS#2 delete
.. //depot/projects/firewire/contrib/bc/README#2 delete
.. //depot/projects/firewire/contrib/bc/Test/BUG.bc#2 delete
.. //depot/projects/firewire/contrib/bc/Test/array.b#2 delete
.. //depot/projects/firewire/contrib/bc/Test/arrayp.b#2 delete
.. //depot/projects/firewire/contrib/bc/Test/aryprm.b#2 delete
.. //depot/projects/firewire/contrib/bc/Test/atan.b#2 delete
.. //depot/projects/firewire/contrib/bc/Test/checklib.b#2 delete
.. //depot/projects/firewire/contrib/bc/Test/div.b#2 delete
.. //depot/projects/firewire/contrib/bc/Test/exp.b#2 delete
.. //depot/projects/firewire/contrib/bc/Test/fact.b#2 delete
.. //depot/projects/firewire/contrib/bc/Test/jn.b#2 delete
.. //depot/projects/firewire/contrib/bc/Test/ln.b#2 delete
.. //depot/projects/firewire/contrib/bc/Test/mul.b#2 delete
.. //depot/projects/firewire/contrib/bc/Test/raise.b#2 delete
.. //depot/projects/firewire/contrib/bc/Test/signum#2 delete
.. //depot/projects/firewire/contrib/bc/Test/sine.b#2 delete
.. //depot/projects/firewire/contrib/bc/Test/sqrt.b#2 delete
.. //depot/projects/firewire/contrib/bc/Test/sqrt1.b#2 delete
.. //depot/projects/firewire/contrib/bc/Test/sqrt2.b#2 delete
.. //depot/projects/firewire/contrib/bc/Test/testfn.b#2 delete
.. //depot/projects/firewire/contrib/bc/Test/timetest#2 delete
.. //depot/projects/firewire/contrib/bc/acconfig.h#2 delete
.. //depot/projects/firewire/contrib/bc/aclocal.m4#2 delete
.. //depot/projects/firewire/contrib/bc/bc/Makefile.am#2 delete
.. //depot/projects/firewire/contrib/bc/bc/Makefile.in#2 delete
.. //depot/projects/firewire/contrib/bc/bc/bc.y#2 delete
.. //depot/projects/firewire/contrib/bc/bc/bcdefs.h#2 delete
.. //depot/projects/firewire/contrib/bc/bc/const.h#2 delete
.. //depot/projects/firewire/contrib/bc/bc/execute.c#2 delete
.. //depot/projects/firewire/contrib/bc/bc/fix-libmath_h#2 delete
.. //depot/projects/firewire/contrib/bc/bc/global.c#2 delete
.. //depot/projects/firewire/contrib/bc/bc/global.h#2 delete
.. //depot/projects/firewire/contrib/bc/bc/libmath.b#2 delete
.. //depot/projects/firewire/contrib/bc/bc/libmath.h#2 delete
.. //depot/projects/firewire/contrib/bc/bc/load.c#2 delete
.. //depot/projects/firewire/contrib/bc/bc/main.c#2 delete
.. //depot/projects/firewire/contrib/bc/bc/proto.h#2 delete
.. //depot/projects/firewire/contrib/bc/bc/sbc.y#2 delete
.. //depot/projects/firewire/contrib/bc/bc/scan.l#2 delete
.. //depot/projects/firewire/contrib/bc/bc/storage.c#2 delete
.. //depot/projects/firewire/contrib/bc/bc/util.c#2 delete
.. //depot/projects/firewire/contrib/bc/config.h.in#2 delete
.. //depot/projects/firewire/contrib/bc/configure#2 delete
.. //depot/projects/firewire/contrib/bc/configure.in#2 delete
.. //depot/projects/firewire/contrib/bc/dc/Makefile.am#2 delete
.. //depot/projects/firewire/contrib/bc/dc/Makefile.in#2 delete
.. //depot/projects/firewire/contrib/bc/dc/array.c#2 delete
.. //depot/projects/firewire/contrib/bc/dc/dc-proto.h#2 delete
.. //depot/projects/firewire/contrib/bc/dc/dc-regdef.h#2 delete
.. //depot/projects/firewire/contrib/bc/dc/dc.c#2 delete
.. //depot/projects/firewire/contrib/bc/dc/dc.h#2 delete
.. //depot/projects/firewire/contrib/bc/dc/eval.c#2 delete
.. //depot/projects/firewire/contrib/bc/dc/misc.c#2 delete
.. //depot/projects/firewire/contrib/bc/dc/numeric.c#2 delete
.. //depot/projects/firewire/contrib/bc/dc/stack.c#2 delete
.. //depot/projects/firewire/contrib/bc/dc/string.c#2 delete
.. //depot/projects/firewire/contrib/bc/doc/Makefile.am#2 delete
.. //depot/projects/firewire/contrib/bc/doc/Makefile.in#2 delete
.. //depot/projects/firewire/contrib/bc/doc/bc.1#2 delete
.. //depot/projects/firewire/contrib/bc/doc/bc.texi#2 delete
.. //depot/projects/firewire/contrib/bc/doc/dc.1#2 delete
.. //depot/projects/firewire/contrib/bc/doc/dc.texi#2 delete
.. //depot/projects/firewire/contrib/bc/h/number.h#2 delete
.. //depot/projects/firewire/contrib/bc/install-sh#2 delete
.. //depot/projects/firewire/contrib/bc/lib/Makefile.am#2 delete
.. //depot/projects/firewire/contrib/bc/lib/Makefile.in#2 delete
.. //depot/projects/firewire/contrib/bc/lib/number.c#2 delete
.. //depot/projects/firewire/contrib/bc/lib/testmul.c#2 delete
.. //depot/projects/firewire/contrib/bc/lib/vfprintf.c#2 delete
.. //depot/projects/firewire/contrib/bc/missing#2 delete
.. //depot/projects/firewire/contrib/bc/mkinstalldirs#2 delete
.. //depot/projects/firewire/contrib/bc/stamp-h.in#2 delete
.. //depot/projects/firewire/contrib/bind9/CHANGES#2 integrate
.. //depot/projects/firewire/contrib/bind9/COPYRIGHT#2 integrate
.. //depot/projects/firewire/contrib/bind9/FAQ#2 integrate
.. //depot/projects/firewire/contrib/bind9/FAQ.xml#2 integrate
.. //depot/projects/firewire/contrib/bind9/NSEC3-NOTES#2 integrate
.. //depot/projects/firewire/contrib/bind9/README#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/check/named-checkconf.8#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/check/named-checkconf.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/check/named-checkzone.8#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/check/named-checkzone.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/check/named-checkzone.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/dig/dig.1#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/dig/dig.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/dig/dighost.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/dig/host.1#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/dig/host.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/dig/host.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/dig/nslookup.1#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/dig/nslookup.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/dig/nslookup.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/dnssec/dnssec-keygen.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/dnssec/dnssectool.h#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/named/control.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/named/include/named/server.h#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/named/lwresd.8#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/named/lwresd.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/named/named.8#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/named/named.conf.5#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/named/named.conf.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/named/named.docbook#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/named/named.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/named/query.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/named/server.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/named/statschannel.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/named/update.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/nsupdate/nsupdate.1#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/rndc/rndc.8#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/bin/rndc/rndc.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/config.h.in#2 integrate
.. //depot/projects/firewire/contrib/bind9/configure.in#2 integrate
.. //depot/projects/firewire/contrib/bind9/doc/arm/Bv9ARM-book.xml#2 integrate
.. //depot/projects/firewire/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/doc/arm/Bv9ARM.ch06.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/doc/arm/Bv9ARM.ch10.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/doc/arm/Bv9ARM.pdf#2 integrate
.. //depot/projects/firewire/contrib/bind9/doc/arm/man.dig.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/doc/arm/man.dnssec-keygen.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/doc/arm/man.dnssec-signzone.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/doc/arm/man.host.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/doc/arm/man.named-checkconf.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/doc/arm/man.named-checkzone.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/doc/arm/man.named.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/doc/arm/man.nsupdate.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/doc/arm/man.rndc-confgen.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/doc/arm/man.rndc.conf.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/doc/arm/man.rndc.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/doc/misc/Makefile.in#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/api#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/db.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/dispatch.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/dnssec.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/dst_api.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/dst_internal.h#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/dst_parse.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/include/dns/db.h#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/include/dns/dnssec.h#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/include/dns/journal.h#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/include/dns/keyvalues.h#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/include/dns/name.h#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/include/dns/ncache.h#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/include/dns/nsec3.h#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/include/dns/rbt.h#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/include/dns/resolver.h#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/include/dns/result.h#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/include/dns/types.h#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/include/dns/zone.h#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/include/dst/dst.h#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/journal.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/masterdump.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/message.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/ncache.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/nsec3.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/opensslrsa_link.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/rbt.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/rbtdb.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/rcode.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/rdatalist.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/rdataset.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/rdataslab.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/resolver.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/result.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/sdb.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/sdlz.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/spnego.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/validator.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/view.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/dns/zone.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/isc/api#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/isc/base32.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/isc/base64.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/isc/heap.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/isc/httpd.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/isc/include/isc/entropy.h#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/isc/include/isc/netscope.h#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/isc/include/isc/portset.h#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/isc/include/isc/sha2.h#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/isc/include/isc/util.h#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/isc/inet_ntop.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/isc/random.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/isc/sha2.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/isc/unix/socket.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/isccc/api#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/isccfg/aclconf.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/isccfg/api#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/api#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/context.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/getipnode.c#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres.3#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate
.. //depot/projects/firewire/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate
.. //depot/projects/firewire/contrib/bind9/version#2 integrate
.. //depot/projects/firewire/contrib/bsnmp/gensnmpdef/gensnmpdef.c#2 integrate
.. //depot/projects/firewire/contrib/bsnmp/gensnmptree/gensnmptree.1#2 integrate
.. //depot/projects/firewire/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#2 integrate
.. //depot/projects/firewire/contrib/bsnmp/snmp_mibII/mibII.c#2 integrate
.. //depot/projects/firewire/contrib/bsnmp/snmp_mibII/mibII.h#2 integrate
.. //depot/projects/firewire/contrib/bsnmp/snmp_mibII/mibII_begemot.c#2 integrate
.. //depot/projects/firewire/contrib/bsnmp/snmp_mibII/mibII_tree.def#2 integrate
.. //depot/projects/firewire/contrib/bsnmp/snmpd/config.c#2 integrate
.. //depot/projects/firewire/contrib/bsnmp/snmpd/snmpmod.3#2 integrate
.. //depot/projects/firewire/contrib/cpio/ABOUT-NLS#2 delete
.. //depot/projects/firewire/contrib/cpio/AUTHORS#2 delete
.. //depot/projects/firewire/contrib/cpio/COPYING#2 delete
.. //depot/projects/firewire/contrib/cpio/ChangeLog#2 delete
.. //depot/projects/firewire/contrib/cpio/FREEBSD-upgrade#2 delete
.. //depot/projects/firewire/contrib/cpio/INSTALL#2 delete
.. //depot/projects/firewire/contrib/cpio/NEWS#2 delete
.. //depot/projects/firewire/contrib/cpio/README#2 delete
.. //depot/projects/firewire/contrib/cpio/THANKS#2 delete
.. //depot/projects/firewire/contrib/cpio/TODO#2 delete
.. //depot/projects/firewire/contrib/cpio/doc/cpio.1#2 delete
.. //depot/projects/firewire/contrib/cpio/doc/cpio.texi#2 delete
.. //depot/projects/firewire/contrib/cpio/doc/version.texi#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/alloca_.h#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/argp-ba.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/argp-eexst.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/argp-fmtstream.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/argp-fmtstream.h#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/argp-fs-xinl.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/argp-help.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/argp-namefrob.h#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/argp-parse.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/argp-pin.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/argp-pv.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/argp-pvh.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/argp-xinl.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/argp.h#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/basename.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/dirname.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/dirname.h#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/error.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/error.h#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/exitfail.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/exitfail.h#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/fatal.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/full-write.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/full-write.h#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/getopt.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/getopt1.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/getopt_.h#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/getopt_int.h#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/gettext.h#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/hash.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/hash.h#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/intprops.h#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/inttostr.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/inttostr.h#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/mempcpy.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/paxerror.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/paxexit.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/paxlib.h#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/paxnames.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/quote.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/quote.h#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/quotearg.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/quotearg.h#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/rmt-command.h#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/rmt.h#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/rtapelib.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/safe-read.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/safe-read.h#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/safe-write.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/safe-write.h#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/savedir.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/savedir.h#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/strchrnul.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/stripslash.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/strndup.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/strnlen.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/system-ioctl.h#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/system.h#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/umaxtostr.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/unlocked-io.h#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/utimens.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/utimens.h#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/xalloc-die.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/xalloc.h#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/xmalloc.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/xstrndup.c#2 delete
.. //depot/projects/firewire/contrib/cpio/lib/xstrndup.h#2 delete
.. //depot/projects/firewire/contrib/cpio/src/copyin.c#2 delete
.. //depot/projects/firewire/contrib/cpio/src/copyout.c#2 delete
.. //depot/projects/firewire/contrib/cpio/src/copypass.c#2 delete
.. //depot/projects/firewire/contrib/cpio/src/cpio.h#2 delete
.. //depot/projects/firewire/contrib/cpio/src/cpiohdr.h#2 delete
.. //depot/projects/firewire/contrib/cpio/src/defer.c#2 delete
.. //depot/projects/firewire/contrib/cpio/src/defer.h#2 delete
.. //depot/projects/firewire/contrib/cpio/src/dstring.c#2 delete
.. //depot/projects/firewire/contrib/cpio/src/dstring.h#2 delete
.. //depot/projects/firewire/contrib/cpio/src/extern.h#2 delete
.. //depot/projects/firewire/contrib/cpio/src/filemode.c#2 delete
.. //depot/projects/firewire/contrib/cpio/src/filetypes.h#2 delete
.. //depot/projects/firewire/contrib/cpio/src/global.c#2 delete
.. //depot/projects/firewire/contrib/cpio/src/idcache.c#2 delete
.. //depot/projects/firewire/contrib/cpio/src/main.c#2 delete
.. //depot/projects/firewire/contrib/cpio/src/makepath.c#2 delete
.. //depot/projects/firewire/contrib/cpio/src/safe-stat.h#2 delete
.. //depot/projects/firewire/contrib/cpio/src/tar.c#2 delete
.. //depot/projects/firewire/contrib/cpio/src/tar.h#2 delete
.. //depot/projects/firewire/contrib/cpio/src/tarhdr.h#2 delete
.. //depot/projects/firewire/contrib/cpio/src/userspec.c#2 delete
.. //depot/projects/firewire/contrib/cpio/src/util.c#2 delete
.. //depot/projects/firewire/contrib/csup/GNUmakefile#2 delete
.. //depot/projects/firewire/contrib/csup/Makefile#2 delete
.. //depot/projects/firewire/contrib/csup/README#2 delete
.. //depot/projects/firewire/contrib/csup/TODO#2 delete
.. //depot/projects/firewire/contrib/csup/attrstack.c#2 delete
.. //depot/projects/firewire/contrib/csup/attrstack.h#2 delete
.. //depot/projects/firewire/contrib/csup/config.c#2 delete
.. //depot/projects/firewire/contrib/csup/config.h#2 delete
.. //depot/projects/firewire/contrib/csup/csup.1#2 delete
.. //depot/projects/firewire/contrib/csup/detailer.c#2 delete
.. //depot/projects/firewire/contrib/csup/detailer.h#2 delete
.. //depot/projects/firewire/contrib/csup/diff.c#2 delete
.. //depot/projects/firewire/contrib/csup/diff.h#2 delete
.. //depot/projects/firewire/contrib/csup/fattr.c#2 delete
.. //depot/projects/firewire/contrib/csup/fattr.h#2 delete
.. //depot/projects/firewire/contrib/csup/fattr_bsd.h#2 delete
.. //depot/projects/firewire/contrib/csup/fattr_posix.h#2 delete
.. //depot/projects/firewire/contrib/csup/fixups.c#2 delete
.. //depot/projects/firewire/contrib/csup/fixups.h#2 delete
.. //depot/projects/firewire/contrib/csup/fnmatch.c#2 delete
.. //depot/projects/firewire/contrib/csup/fnmatch.h#2 delete
.. //depot/projects/firewire/contrib/csup/globtree.c#2 delete
.. //depot/projects/firewire/contrib/csup/globtree.h#2 delete
.. //depot/projects/firewire/contrib/csup/idcache.c#2 delete
.. //depot/projects/firewire/contrib/csup/idcache.h#2 delete
.. //depot/projects/firewire/contrib/csup/keyword.c#2 delete
.. //depot/projects/firewire/contrib/csup/keyword.h#2 delete
.. //depot/projects/firewire/contrib/csup/lex.rcs.c#2 delete
.. //depot/projects/firewire/contrib/csup/lister.c#2 delete
.. //depot/projects/firewire/contrib/csup/lister.h#2 delete
.. //depot/projects/firewire/contrib/csup/main.c#2 delete
.. //depot/projects/firewire/contrib/csup/main.h#2 delete
.. //depot/projects/firewire/contrib/csup/misc.c#2 delete
.. //depot/projects/firewire/contrib/csup/misc.h#2 delete
.. //depot/projects/firewire/contrib/csup/mux.c#2 delete
.. //depot/projects/firewire/contrib/csup/mux.h#2 delete
.. //depot/projects/firewire/contrib/csup/parse.y#2 delete
.. //depot/projects/firewire/contrib/csup/pathcomp.c#2 delete
.. //depot/projects/firewire/contrib/csup/pathcomp.h#2 delete
.. //depot/projects/firewire/contrib/csup/proto.c#2 delete
.. //depot/projects/firewire/contrib/csup/proto.h#2 delete
.. //depot/projects/firewire/contrib/csup/queue.h#2 delete
.. //depot/projects/firewire/contrib/csup/rcsfile.c#2 delete
.. //depot/projects/firewire/contrib/csup/rcsfile.h#2 delete
.. //depot/projects/firewire/contrib/csup/rcsparse.c#2 delete
.. //depot/projects/firewire/contrib/csup/rcsparse.h#2 delete
.. //depot/projects/firewire/contrib/csup/rcstokenizer.h#2 delete
.. //depot/projects/firewire/contrib/csup/rcstokenizer.l#2 delete
.. //depot/projects/firewire/contrib/csup/rsyncfile.c#2 delete
.. //depot/projects/firewire/contrib/csup/rsyncfile.h#2 delete
.. //depot/projects/firewire/contrib/csup/status.c#2 delete
.. //depot/projects/firewire/contrib/csup/status.h#2 delete
.. //depot/projects/firewire/contrib/csup/stream.c#2 delete
.. //depot/projects/firewire/contrib/csup/stream.h#2 delete
.. //depot/projects/firewire/contrib/csup/threads.c#2 delete
.. //depot/projects/firewire/contrib/csup/threads.h#2 delete
.. //depot/projects/firewire/contrib/csup/token.h#2 delete
.. //depot/projects/firewire/contrib/csup/token.l#2 delete
.. //depot/projects/firewire/contrib/csup/updater.c#2 delete
.. //depot/projects/firewire/contrib/csup/updater.h#2 delete
.. //depot/projects/firewire/contrib/dtc/Documentation/dtc-paper.bib#1 branch
.. //depot/projects/firewire/contrib/dtc/Documentation/dtc-paper.tex#1 branch
.. //depot/projects/firewire/contrib/dtc/Documentation/dts-format.txt#1 branch
.. //depot/projects/firewire/contrib/dtc/Documentation/manual.txt#1 branch
.. //depot/projects/firewire/contrib/dtc/GPL#1 branch
.. //depot/projects/firewire/contrib/dtc/Makefile#1 branch
.. //depot/projects/firewire/contrib/dtc/Makefile.convert-dtsv0#1 branch
.. //depot/projects/firewire/contrib/dtc/Makefile.ftdump#1 branch
.. //depot/projects/firewire/contrib/dtc/README.license#1 branch
.. //depot/projects/firewire/contrib/dtc/TODO#1 branch
.. //depot/projects/firewire/contrib/dtc/checks.c#1 branch
.. //depot/projects/firewire/contrib/dtc/convert-dtsv0-lexer.l#1 branch
.. //depot/projects/firewire/contrib/dtc/data.c#1 branch
.. //depot/projects/firewire/contrib/dtc/dtc-lexer.l#1 branch
.. //depot/projects/firewire/contrib/dtc/dtc-parser.y#1 branch
.. //depot/projects/firewire/contrib/dtc/dtc.c#1 branch
.. //depot/projects/firewire/contrib/dtc/dtc.h#1 branch
.. //depot/projects/firewire/contrib/dtc/flattree.c#1 branch
.. //depot/projects/firewire/contrib/dtc/fstree.c#1 branch
.. //depot/projects/firewire/contrib/dtc/ftdump.c#1 branch
.. //depot/projects/firewire/contrib/dtc/libfdt/Makefile.libfdt#1 branch
.. //depot/projects/firewire/contrib/dtc/libfdt/TODO#1 branch
.. //depot/projects/firewire/contrib/dtc/libfdt/fdt.c#1 branch
.. //depot/projects/firewire/contrib/dtc/libfdt/fdt.h#1 branch
.. //depot/projects/firewire/contrib/dtc/libfdt/fdt_ro.c#1 branch
.. //depot/projects/firewire/contrib/dtc/libfdt/fdt_rw.c#1 branch
.. //depot/projects/firewire/contrib/dtc/libfdt/fdt_strerror.c#1 branch
.. //depot/projects/firewire/contrib/dtc/libfdt/fdt_sw.c#1 branch
.. //depot/projects/firewire/contrib/dtc/libfdt/fdt_wip.c#1 branch
.. //depot/projects/firewire/contrib/dtc/libfdt/libfdt.h#1 branch
.. //depot/projects/firewire/contrib/dtc/libfdt/libfdt_env.h#1 branch
.. //depot/projects/firewire/contrib/dtc/libfdt/libfdt_internal.h#1 branch
.. //depot/projects/firewire/contrib/dtc/libfdt/version.lds#1 branch
.. //depot/projects/firewire/contrib/dtc/livetree.c#1 branch
.. //depot/projects/firewire/contrib/dtc/scripts/setlocalversion#1 branch
.. //depot/projects/firewire/contrib/dtc/srcpos.c#1 branch
.. //depot/projects/firewire/contrib/dtc/srcpos.h#1 branch
.. //depot/projects/firewire/contrib/dtc/treesource.c#1 branch
.. //depot/projects/firewire/contrib/dtc/util.c#1 branch
.. //depot/projects/firewire/contrib/dtc/util.h#1 branch
.. //depot/projects/firewire/contrib/ee/ee.c#2 integrate
.. //depot/projects/firewire/contrib/expat/lib/xmlparse.c#2 integrate
.. //depot/projects/firewire/contrib/expat/lib/xmltok_impl.c#2 integrate
.. //depot/projects/firewire/contrib/gcc/config/freebsd-spec.h#2 integrate
.. //depot/projects/firewire/contrib/gcc/config/i386/i386.c#2 integrate
.. //depot/projects/firewire/contrib/gcc/config/mips/freebsd.h#2 integrate
.. //depot/projects/firewire/contrib/gdb/gdb/config/mips/nm-fbsd.h#1 branch
.. //depot/projects/firewire/contrib/gdb/gdb/config/mips/tm-fbsd.h#1 branch
.. //depot/projects/firewire/contrib/gdb/gdb/mips-tdep.h#2 integrate
.. //depot/projects/firewire/contrib/gdb/gdb/mipsfbsd-nat.c#1 branch
.. //depot/projects/firewire/contrib/gdb/gdb/mipsfbsd-tdep.c#1 branch
.. //depot/projects/firewire/contrib/gdb/gdb/mipsfbsd-tdep.h#1 branch
.. //depot/projects/firewire/contrib/groff/font/devutf8/R.proto#2 integrate
.. //depot/projects/firewire/contrib/groff/tmac/an-old.tmac#2 integrate
.. //depot/projects/firewire/contrib/groff/tmac/doc-common#2 integrate
.. //depot/projects/firewire/contrib/groff/tmac/doc-old.tmac#2 integrate
.. //depot/projects/firewire/contrib/groff/tmac/doc-syms#2 integrate
.. //depot/projects/firewire/contrib/groff/tmac/doc.tmac#2 integrate
.. //depot/projects/firewire/contrib/groff/tmac/groff_mdoc.man#2 integrate
.. //depot/projects/firewire/contrib/ipfilter/ipsend/sbpf.c#2 integrate
.. //depot/projects/firewire/contrib/ipfilter/man/ipf.8#2 integrate
.. //depot/projects/firewire/contrib/libpcap/inet.c#2 integrate
.. //depot/projects/firewire/contrib/ncurses/ncurses/base/lib_getch.c#2 integrate
.. //depot/projects/firewire/contrib/netcat/FREEBSD-upgrade#2 integrate
.. //depot/projects/firewire/contrib/netcat/FREEBSD-vendor#2 integrate
.. //depot/projects/firewire/contrib/netcat/nc.1#2 integrate
.. //depot/projects/firewire/contrib/netcat/netcat.c#2 integrate
.. //depot/projects/firewire/contrib/ntp/COPYRIGHT#2 integrate
.. //depot/projects/firewire/contrib/ntp/ChangeLog#2 integrate
.. //depot/projects/firewire/contrib/ntp/CommitLog#2 integrate
.. //depot/projects/firewire/contrib/ntp/Makefile.in#2 integrate
.. //depot/projects/firewire/contrib/ntp/NEWS#2 integrate
.. //depot/projects/firewire/contrib/ntp/README#2 integrate
.. //depot/projects/firewire/contrib/ntp/README.bk#2 integrate
.. //depot/projects/firewire/contrib/ntp/README.patches#2 integrate
.. //depot/projects/firewire/contrib/ntp/WHERE-TO-START#2 integrate
.. //depot/projects/firewire/contrib/ntp/aclocal.m4#2 integrate
.. //depot/projects/firewire/contrib/ntp/adjtimed/Makefile.in#2 integrate
.. //depot/projects/firewire/contrib/ntp/arlib/Makefile.in#2 integrate
.. //depot/projects/firewire/contrib/ntp/arlib/aclocal.m4#2 integrate
.. //depot/projects/firewire/contrib/ntp/arlib/configure#2 integrate
.. //depot/projects/firewire/contrib/ntp/build#2 integrate
.. //depot/projects/firewire/contrib/ntp/clockstuff/Makefile.in#2 integrate
.. //depot/projects/firewire/contrib/ntp/config.h.in#2 integrate
.. //depot/projects/firewire/contrib/ntp/configure#2 integrate
.. //depot/projects/firewire/contrib/ntp/configure.ac#2 integrate
.. //depot/projects/firewire/contrib/ntp/flock-build#2 integrate
.. //depot/projects/firewire/contrib/ntp/html/build/hints/solaris.xtra.4095849#1 branch
.. //depot/projects/firewire/contrib/ntp/html/copyright.html#2 integrate
.. //depot/projects/firewire/contrib/ntp/html/drivers/driver40.html#2 integrate
.. //depot/projects/firewire/contrib/ntp/include/Makefile.in#2 integrate
.. //depot/projects/firewire/contrib/ntp/include/copyright.def#2 integrate
.. //depot/projects/firewire/contrib/ntp/include/isc/Makefile.in#2 integrate
.. //depot/projects/firewire/contrib/ntp/include/ntp_debug.h#2 integrate
.. //depot/projects/firewire/contrib/ntp/include/version.def#2 integrate
.. //depot/projects/firewire/contrib/ntp/kernel/Makefile.in#2 integrate
.. //depot/projects/firewire/contrib/ntp/kernel/sys/Makefile.in#2 integrate
.. //depot/projects/firewire/contrib/ntp/libntp/Makefile.in#2 integrate
.. //depot/projects/firewire/contrib/ntp/libopts/Makefile.in#2 integrate
.. //depot/projects/firewire/contrib/ntp/libparse/Makefile.am#2 integrate
.. //depot/projects/firewire/contrib/ntp/libparse/Makefile.in#2 integrate
.. //depot/projects/firewire/contrib/ntp/libparse/clk_rawdcf.c#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpd/Makefile.in#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpd/cmd_args.c#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpd/ntp_crypto.c#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpd/ntp_intres.c#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpd/ntp_io.c#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpd/ntp_request.c#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpd/ntp_timer.c#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpd/ntpd-opts.c#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpd/ntpd-opts.h#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpd/ntpd-opts.texi#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpd/ntpd.1#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpd/ntpd.c#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpd/ntpdsim-opts.c#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpd/ntpdsim-opts.h#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpd/ntpdsim-opts.texi#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpd/ntpdsim.1#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpd/refclock_dumbclock.c#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpd/refclock_hopfser.c#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpd/refclock_jjy.c#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpd/refclock_nmea.c#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpd/refclock_palisade.c#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpdate/Makefile.in#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpdc/Makefile.in#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpdc/ntpdc-opts.c#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpdc/ntpdc-opts.h#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpdc/ntpdc-opts.texi#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpdc/ntpdc.1#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpq/Makefile.in#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpq/ntpq-opts.c#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpq/ntpq-opts.h#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpq/ntpq-opts.texi#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpq/ntpq.1#2 integrate
.. //depot/projects/firewire/contrib/ntp/ntpq/ntpq.c#2 integrate
.. //depot/projects/firewire/contrib/ntp/packageinfo.sh#2 integrate
.. //depot/projects/firewire/contrib/ntp/parseutil/Makefile.in#2 integrate
.. //depot/projects/firewire/contrib/ntp/scripts/Makefile.in#2 integrate
.. //depot/projects/firewire/contrib/ntp/sntp/Makefile.in#2 integrate
.. //depot/projects/firewire/contrib/ntp/sntp/aclocal.m4#2 integrate
.. //depot/projects/firewire/contrib/ntp/sntp/config.h.in#2 integrate
.. //depot/projects/firewire/contrib/ntp/sntp/configure#2 integrate
.. //depot/projects/firewire/contrib/ntp/sntp/configure.ac#2 integrate
.. //depot/projects/firewire/contrib/ntp/sntp/libopts/Makefile.in#2 integrate
.. //depot/projects/firewire/contrib/ntp/sntp/sntp-opts.c#2 integrate
.. //depot/projects/firewire/contrib/ntp/sntp/sntp-opts.def#2 integrate
.. //depot/projects/firewire/contrib/ntp/sntp/sntp-opts.h#2 integrate
.. //depot/projects/firewire/contrib/ntp/sntp/sntp-opts.texi#2 integrate
.. //depot/projects/firewire/contrib/ntp/sntp/sntp.1#2 integrate
.. //depot/projects/firewire/contrib/ntp/sntp/version.def#2 integrate
.. //depot/projects/firewire/contrib/ntp/util/Makefile.in#2 integrate
.. //depot/projects/firewire/contrib/ntp/util/ntp-keygen-opts.c#2 integrate
.. //depot/projects/firewire/contrib/ntp/util/ntp-keygen-opts.h#2 integrate
.. //depot/projects/firewire/contrib/ntp/util/ntp-keygen-opts.texi#2 integrate
.. //depot/projects/firewire/contrib/ntp/util/ntp-keygen.1#2 integrate
.. //depot/projects/firewire/contrib/ntp/version#2 integrate
.. //depot/projects/firewire/contrib/ntp/version.m4#2 integrate
.. //depot/projects/firewire/contrib/one-true-awk/FIXES#2 integrate
.. //depot/projects/firewire/contrib/one-true-awk/b.c#2 integrate
.. //depot/projects/firewire/contrib/one-true-awk/lib.c#2 integrate
.. //depot/projects/firewire/contrib/one-true-awk/mac.code#2 delete
.. //depot/projects/firewire/contrib/one-true-awk/main.c#2 integrate
.. //depot/projects/firewire/contrib/one-true-awk/makefile#2 integrate
.. //depot/projects/firewire/contrib/one-true-awk/maketab.c#2 integrate
.. //depot/projects/firewire/contrib/one-true-awk/proctab.c#2 integrate
.. //depot/projects/firewire/contrib/one-true-awk/proto.h#2 integrate
.. //depot/projects/firewire/contrib/one-true-awk/run.c#2 integrate
.. //depot/projects/firewire/contrib/openpam/doc/man/pam.conf.5#2 integrate
.. //depot/projects/firewire/contrib/openpam/include/security/pam_appl.h#2 integrate
.. //depot/projects/firewire/contrib/opie/libopie/getutmpentry.c#2 integrate
.. //depot/projects/firewire/contrib/opie/libopie/insecure.c#2 integrate
.. //depot/projects/firewire/contrib/opie/libopie/login.c#2 integrate
.. //depot/projects/firewire/contrib/pf/man/pf.conf.5#2 integrate
.. //depot/projects/firewire/contrib/pf/pfctl/parse.y#2 integrate
.. //depot/projects/firewire/contrib/pf/pfctl/pf_print_state.c#2 integrate
.. //depot/projects/firewire/contrib/pf/pfctl/pfctl_parser.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/CACerts#2 integrate
.. //depot/projects/firewire/contrib/sendmail/FREEBSD-upgrade#2 integrate
.. //depot/projects/firewire/contrib/sendmail/LICENSE#2 integrate
.. //depot/projects/firewire/contrib/sendmail/PGPKEYS#2 integrate
.. //depot/projects/firewire/contrib/sendmail/README#2 integrate
.. //depot/projects/firewire/contrib/sendmail/RELEASE_NOTES#2 integrate
.. //depot/projects/firewire/contrib/sendmail/cf/README#2 integrate
.. //depot/projects/firewire/contrib/sendmail/cf/cf/submit.cf#2 integrate
.. //depot/projects/firewire/contrib/sendmail/cf/feature/ldap_routing.m4#2 integrate
.. //depot/projects/firewire/contrib/sendmail/cf/m4/cfhead.m4#2 integrate
.. //depot/projects/firewire/contrib/sendmail/cf/m4/proto.m4#2 integrate
.. //depot/projects/firewire/contrib/sendmail/cf/m4/version.m4#2 integrate
.. //depot/projects/firewire/contrib/sendmail/contrib/qtool.pl#2 integrate
.. //depot/projects/firewire/contrib/sendmail/contrib/smcontrol.pl#2 integrate
.. //depot/projects/firewire/contrib/sendmail/doc/op/op.me#2 integrate
.. //depot/projects/firewire/contrib/sendmail/include/libmilter/mfapi.h#2 integrate
.. //depot/projects/firewire/contrib/sendmail/include/libmilter/mfdef.h#2 integrate
.. //depot/projects/firewire/contrib/sendmail/include/sm/conf.h#2 integrate
.. //depot/projects/firewire/contrib/sendmail/include/sm/ldap.h#2 integrate
.. //depot/projects/firewire/contrib/sendmail/include/sm/sem.h#2 integrate
.. //depot/projects/firewire/contrib/sendmail/libmilter/Makefile.m4#2 integrate
.. //depot/projects/firewire/contrib/sendmail/libmilter/comm.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/libmilter/docs/api.html#2 integrate
.. //depot/projects/firewire/contrib/sendmail/libmilter/docs/overview.html#2 integrate
.. //depot/projects/firewire/contrib/sendmail/libmilter/docs/smfi_addheader.html#2 integrate
.. //depot/projects/firewire/contrib/sendmail/libmilter/docs/smfi_chgheader.html#2 integrate
.. //depot/projects/firewire/contrib/sendmail/libmilter/docs/smfi_insheader.html#2 integrate
.. //depot/projects/firewire/contrib/sendmail/libmilter/engine.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/libmilter/example.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/libmilter/handler.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/libmilter/libmilter.h#2 integrate
.. //depot/projects/firewire/contrib/sendmail/libmilter/listener.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/libmilter/main.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/libmilter/worker.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/libsm/debug.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/libsm/ldap.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/libsm/mbdb.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/libsm/sem.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/libsm/t-sem.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/libsmdb/smdb1.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/libsmdb/smdb2.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/libsmutil/safefile.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/praliases/praliases.8#2 integrate
.. //depot/projects/firewire/contrib/sendmail/praliases/praliases.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/src/Makefile.m4#2 integrate
.. //depot/projects/firewire/contrib/sendmail/src/README#2 integrate
.. //depot/projects/firewire/contrib/sendmail/src/TRACEFLAGS#2 integrate
.. //depot/projects/firewire/contrib/sendmail/src/collect.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/src/conf.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/src/conf.h#2 integrate
.. //depot/projects/firewire/contrib/sendmail/src/daemon.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/src/deliver.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/src/envelope.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/src/headers.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/src/main.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/src/map.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/src/milter.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/src/queue.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/src/ratectrl.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/src/readcf.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/src/savemail.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/src/sendmail.8#2 integrate
.. //depot/projects/firewire/contrib/sendmail/src/sendmail.h#2 integrate
.. //depot/projects/firewire/contrib/sendmail/src/sfsasl.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/src/srvrsmtp.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/src/tls.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/src/usersmtp.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/src/util.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/src/version.c#2 integrate
.. //depot/projects/firewire/contrib/sendmail/vacation/vacation.c#2 integrate
.. //depot/projects/firewire/contrib/smbfs/smbutil/view.c#2 integrate
.. //depot/projects/firewire/contrib/tcp_wrappers/hosts_access.c#2 integrate
.. //depot/projects/firewire/contrib/tcpdump/print-tcp.c#2 integrate
.. //depot/projects/firewire/contrib/tcpdump/tcp.h#2 integrate
.. //depot/projects/firewire/contrib/tcsh/sh.c#2 integrate
.. //depot/projects/firewire/contrib/telnet/telnet/externs.h#2 integrate
.. //depot/projects/firewire/contrib/telnet/telnetd/sys_term.c#2 integrate
.. //depot/projects/firewire/contrib/telnet/telnetd/telnetd.c#2 integrate
.. //depot/projects/firewire/contrib/top/username.c#2 integrate
.. //depot/projects/firewire/contrib/top/utils.c#2 integrate
.. //depot/projects/firewire/contrib/tzcode/stdtime/asctime.c#1 branch
.. //depot/projects/firewire/contrib/tzcode/stdtime/ctime.3#1 branch
.. //depot/projects/firewire/contrib/tzcode/stdtime/difftime.c#1 branch
.. //depot/projects/firewire/contrib/tzcode/stdtime/localtime.c#1 branch
.. //depot/projects/firewire/contrib/tzcode/stdtime/private.h#1 branch
.. //depot/projects/firewire/contrib/tzcode/stdtime/time2posix.3#1 branch
.. //depot/projects/firewire/contrib/tzcode/stdtime/tzfile.5#1 branch
.. //depot/projects/firewire/contrib/tzcode/stdtime/tzfile.h#1 branch
.. //depot/projects/firewire/contrib/tzcode/zic/README#1 branch
.. //depot/projects/firewire/contrib/tzcode/zic/Theory#1 branch
.. //depot/projects/firewire/contrib/tzcode/zic/ialloc.c#1 branch
.. //depot/projects/firewire/contrib/tzcode/zic/private.h#1 branch
.. //depot/projects/firewire/contrib/tzcode/zic/scheck.c#1 branch
.. //depot/projects/firewire/contrib/tzcode/zic/zdump.8#1 branch
.. //depot/projects/firewire/contrib/tzcode/zic/zdump.c#1 branch
.. //depot/projects/firewire/contrib/tzcode/zic/zdump/Makefile#1 branch
.. //depot/projects/firewire/contrib/tzcode/zic/zic.8#1 branch
.. //depot/projects/firewire/contrib/tzcode/zic/zic.c#1 branch
.. //depot/projects/firewire/contrib/tzcode/zic/zic/Makefile#1 branch
.. //depot/projects/firewire/contrib/tzdata/africa#1 branch
.. //depot/projects/firewire/contrib/tzdata/antarctica#1 branch
.. //depot/projects/firewire/contrib/tzdata/asia#1 branch
.. //depot/projects/firewire/contrib/tzdata/australasia#1 branch
.. //depot/projects/firewire/contrib/tzdata/backward#1 branch
.. //depot/projects/firewire/contrib/tzdata/etcetera#1 branch
.. //depot/projects/firewire/contrib/tzdata/europe#1 branch
.. //depot/projects/firewire/contrib/tzdata/factory#1 branch
.. //depot/projects/firewire/contrib/tzdata/leapseconds#1 branch
.. //depot/projects/firewire/contrib/tzdata/northamerica#1 branch
.. //depot/projects/firewire/contrib/tzdata/pacificnew#1 branch
.. //depot/projects/firewire/contrib/tzdata/southamerica#1 branch
.. //depot/projects/firewire/contrib/tzdata/systemv#1 branch
.. //depot/projects/firewire/contrib/tzdata/yearistype.sh#1 branch
.. //depot/projects/firewire/contrib/tzdata/zone.tab#1 branch
.. //depot/projects/firewire/crypto/heimdal/kcm/connect.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/ChangeLog#3 integrate
.. //depot/projects/firewire/crypto/openssh/INSTALL#2 integrate
.. //depot/projects/firewire/crypto/openssh/PROTOCOL#2 integrate
.. //depot/projects/firewire/crypto/openssh/PROTOCOL.agent#2 integrate
.. //depot/projects/firewire/crypto/openssh/PROTOCOL.certkeys#1 branch
.. //depot/projects/firewire/crypto/openssh/PROTOCOL.mux#1 branch
.. //depot/projects/firewire/crypto/openssh/README#3 integrate
.. //depot/projects/firewire/crypto/openssh/README.smartcard#2 delete
.. //depot/projects/firewire/crypto/openssh/addrmatch.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/auth-krb5.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/auth-options.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/auth-options.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/auth-rh-rsa.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/auth-rhosts.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/auth-rsa.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/auth.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/auth.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/auth2-hostbased.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/auth2-pubkey.c#3 integrate
.. //depot/projects/firewire/crypto/openssh/authfd.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/authfd.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/authfile.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/authfile.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/bufaux.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/buffer.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/buffer.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/canohost.c#3 integrate
.. //depot/projects/firewire/crypto/openssh/channels.c#3 integrate
.. //depot/projects/firewire/crypto/openssh/channels.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/clientloop.c#3 integrate
.. //depot/projects/firewire/crypto/openssh/clientloop.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/config.guess#2 integrate
.. //depot/projects/firewire/crypto/openssh/config.h#3 integrate
.. //depot/projects/firewire/crypto/openssh/config.h.in#3 integrate
.. //depot/projects/firewire/crypto/openssh/defines.h#3 integrate
.. //depot/projects/firewire/crypto/openssh/dh.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/dns.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/dns.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/hostfile.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/hostfile.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/kex.c#3 integrate
.. //depot/projects/firewire/crypto/openssh/kex.h#3 integrate
.. //depot/projects/firewire/crypto/openssh/kexdhs.c#3 integrate
.. //depot/projects/firewire/crypto/openssh/kexgexs.c#3 integrate
.. //depot/projects/firewire/crypto/openssh/key.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/key.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/loginrec.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/match.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/misc.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/misc.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/monitor.c#3 integrate
.. //depot/projects/firewire/crypto/openssh/monitor_fdpass.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/monitor_wrap.c#3 integrate
.. //depot/projects/firewire/crypto/openssh/mux.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/myproposal.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/nchan.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#3 integrate
.. //depot/projects/firewire/crypto/openssh/openbsd-compat/openbsd-compat.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/openbsd-compat/openssl-compat.c#3 integrate
.. //depot/projects/firewire/crypto/openssh/openbsd-compat/port-aix.c#3 integrate
.. //depot/projects/firewire/crypto/openssh/openbsd-compat/port-aix.h#3 integrate
.. //depot/projects/firewire/crypto/openssh/openbsd-compat/port-linux.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/openbsd-compat/port-linux.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/openbsd-compat/pwcache.c#1 branch
.. //depot/projects/firewire/crypto/openssh/openbsd-compat/readpassphrase.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/pathnames.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/pkcs11.h#1 branch
.. //depot/projects/firewire/crypto/openssh/platform.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/platform.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/readconf.c#3 integrate
.. //depot/projects/firewire/crypto/openssh/readconf.h#3 integrate
.. //depot/projects/firewire/crypto/openssh/roaming.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/roaming_client.c#1 branch
.. //depot/projects/firewire/crypto/openssh/roaming_common.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/roaming_serv.c#1 branch
.. //depot/projects/firewire/crypto/openssh/scard-opensc.c#2 delete
.. //depot/projects/firewire/crypto/openssh/scard.c#2 delete
.. //depot/projects/firewire/crypto/openssh/scard.h#2 delete
.. //depot/projects/firewire/crypto/openssh/scp.1#2 integrate
.. //depot/projects/firewire/crypto/openssh/scp.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/servconf.c#3 integrate
.. //depot/projects/firewire/crypto/openssh/servconf.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/session.c#3 integrate
.. //depot/projects/firewire/crypto/openssh/sftp-client.c#3 integrate
.. //depot/projects/firewire/crypto/openssh/sftp-client.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/sftp-common.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/sftp-common.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/sftp-server.8#3 integrate
.. //depot/projects/firewire/crypto/openssh/sftp-server.c#3 integrate
.. //depot/projects/firewire/crypto/openssh/sftp.1#2 integrate
.. //depot/projects/firewire/crypto/openssh/sftp.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/ssh-add.1#2 integrate
.. //depot/projects/firewire/crypto/openssh/ssh-add.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/ssh-agent.1#3 integrate
.. //depot/projects/firewire/crypto/openssh/ssh-agent.c#3 integrate
.. //depot/projects/firewire/crypto/openssh/ssh-dss.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/ssh-keygen.1#2 integrate
.. //depot/projects/firewire/crypto/openssh/ssh-keygen.c#3 integrate
.. //depot/projects/firewire/crypto/openssh/ssh-keyscan.1#2 integrate
.. //depot/projects/firewire/crypto/openssh/ssh-keyscan.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/ssh-keysign.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/ssh-pkcs11-client.c#1 branch
.. //depot/projects/firewire/crypto/openssh/ssh-pkcs11-helper.0#1 branch
.. //depot/projects/firewire/crypto/openssh/ssh-pkcs11-helper.8#1 branch
.. //depot/projects/firewire/crypto/openssh/ssh-pkcs11-helper.c#1 branch
.. //depot/projects/firewire/crypto/openssh/ssh-pkcs11.c#1 branch
.. //depot/projects/firewire/crypto/openssh/ssh-pkcs11.h#1 branch
.. //depot/projects/firewire/crypto/openssh/ssh-rand-helper.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/ssh-rsa.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/ssh.1#3 integrate
.. //depot/projects/firewire/crypto/openssh/ssh.c#3 integrate
.. //depot/projects/firewire/crypto/openssh/ssh2.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/ssh_config#3 integrate
.. //depot/projects/firewire/crypto/openssh/ssh_config.5#3 integrate
.. //depot/projects/firewire/crypto/openssh/ssh_namespace.h#3 integrate
.. //depot/projects/firewire/crypto/openssh/sshconnect.c#3 integrate
.. //depot/projects/firewire/crypto/openssh/sshconnect2.c#3 integrate
.. //depot/projects/firewire/crypto/openssh/sshd.8#3 integrate
.. //depot/projects/firewire/crypto/openssh/sshd.c#3 integrate
.. //depot/projects/firewire/crypto/openssh/sshd_config#3 integrate
.. //depot/projects/firewire/crypto/openssh/sshd_config.5#3 integrate
.. //depot/projects/firewire/crypto/openssh/sshpty.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/sshtty.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/version.h#3 integrate
.. //depot/projects/firewire/crypto/openssl/CHANGES#2 integrate
.. //depot/projects/firewire/crypto/openssl/Configure#2 integrate
.. //depot/projects/firewire/crypto/openssl/FAQ#2 integrate
.. //depot/projects/firewire/crypto/openssl/Makefile#2 integrate
.. //depot/projects/firewire/crypto/openssl/Makefile.org#2 integrate
.. //depot/projects/firewire/crypto/openssl/NEWS#2 integrate

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

From owner-p4-projects@FreeBSD.ORG  Tue Mar 30 16:33:54 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 35246106566C; Tue, 30 Mar 2010 16:33:54 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EDAC3106564A
	for ; Tue, 30 Mar 2010 16:33:53 +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 DAF9D8FC12
	for ; Tue, 30 Mar 2010 16:33:53 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2UGXrKJ078598
	for ; Tue, 30 Mar 2010 16:33:53 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2UGXrEA078596
	for perforce@freebsd.org; Tue, 30 Mar 2010 16:33:53 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Tue, 30 Mar 2010 16:33:53 GMT
Message-Id: <201003301633.o2UGXrEA078596@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 176287 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 30 Mar 2010 16:33:54 -0000

http://p4web.freebsd.org/chv.cgi?CH=176287

Change 176287 by anchie@anchie_malimis on 2010/03/30 16:33:48

	Got rid of panic in soreceive_generic(). Messages flow now in both
	directions. There are still some issues -- ndp does not store ndp
	records properly yet.	

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#33 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#37 edit

Differences ...

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#33 (text+ko) ====

@@ -793,7 +793,7 @@
 		if (send_input_hook != NULL) {
 			IP6_EXTHDR_CHECK(m, off, icmp6len, IPPROTO_DONE);
                         printf("send_sendso_input_hook\n");
-                        send_sendso_input_hook(V_send_so, m, SND_IN, ip6len);
+                        send_sendso_input_hook(V_send_so, n, SND_IN, ip6len);
 			return (IPPROTO_DONE);
 		} else
 			nd6_rs_input(n, off, icmp6len);
@@ -819,7 +819,7 @@
 			goto freeit;
 		}
 		if (send_input_hook != NULL) {
-			send_sendso_input_hook(V_send_so, m, SND_IN, ip6len);	
+			send_sendso_input_hook(V_send_so, n, SND_IN, ip6len);	
 			return (IPPROTO_DONE);
 		} else
 			nd6_ra_input(n, off, icmp6len);
@@ -847,7 +847,7 @@
 		if (send_input_hook != NULL) {
 			/* Send incoming SeND/ND packet to user space. */
 			printf("%s: send_input_hook n=%p\n", __func__, n);
-			send_sendso_input_hook(V_send_so, m, SND_IN, ip6len);
+			send_sendso_input_hook(V_send_so, n, SND_IN, ip6len);
 		} else 
 			nd6_ns_input(n, off, icmp6len);
 		/* m stays. */
@@ -873,7 +873,7 @@
 			goto freeit;
 		}
 		if (send_input_hook != NULL)
-			send_sendso_input_hook(V_send_so, m, SND_IN, ip6len);
+			send_sendso_input_hook(V_send_so, n, SND_IN, ip6len);
 		else
 			nd6_na_input(n, off, icmp6len);
 		/* m stays. */
@@ -899,7 +899,7 @@
 			goto freeit;
 		}
 		if (send_input_hook != NULL) {
-			send_sendso_input_hook(V_send_so, m, SND_IN, ip6len);
+			send_sendso_input_hook(V_send_so, n, SND_IN, ip6len);
 			return (IPPROTO_DONE);
 		} else
 			icmp6_redirect_input(n, off);

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#37 (text+ko) ====

@@ -198,34 +198,48 @@
 static int
 send_uattach(struct socket *so, int proto, struct thread *td)
 {
-	int error = 0;
 
 	printf("send_uattach: proto = %d\n", proto);
+	if (V_send_so != NULL)
+		return (EEXIST);
+
+	/* XXX: Revisit this, hardocoded! */
+	so->so_snd.sb_hiwat = 8192;
+
 	V_send_so = so;
  
-	return error;
+	return (0);
 }
 
 static int
-sosend_rcv(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam,
-    struct mbuf *control, struct thread *td)
+sosend_rcv(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr,
+	struct mbuf *control, struct thread *td)
 {
-	//struct ifnet *ifp = NULL;
+	struct ifnet *ifp;
 	struct snd_hdr *snd_hdr;
 
-	printf("sosend_rcv \n");
+	printf("sosend_rcv, mbuf len: %d \n", m->m_len);
 
 	snd_hdr = mtod(m, struct snd_hdr *);
 	printf("direction: %d, ifidx: %d \n", snd_hdr->direction, snd_hdr->ifidx);
-	//send_ifnet_setbyindex(snd_hdr->ifidx, ifp);
-#if 0
-	ifnet_setbyindex(snd_hdr->ifidx, ifp);
-	m_adj(n, sizeof(struct snd_hdr));
-	if (ifp)
-		send_output_hook(m, ifp, snd_hdr->direction);
-#endif
+
+	struct mbuf *m0;
+	m0 = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
+	if (m0 == NULL) {
+		m_freem(m);
+		return (ENOBUFS);
+	}
+	m_move_pkthdr(m, m0);
 
-	return 0;
+	ifp = ifnet_byindex_ref(snd_hdr->ifidx);
+	m_adj(m, sizeof(struct snd_hdr));
+	if (ifp) {
+		int error = send_output(m, ifp, snd_hdr->direction);
+		printf("error: %d\n", error);
+		if_rele(ifp);
+		return (0);
+	} else
+		return (ENETUNREACH);
 }
 
 /*
@@ -253,29 +267,14 @@
         if (len != msglen)
                 printf("XXX-BZ %s: (m)len=%u (ip6)msglen=%d", __func__, len, msglen);
                         
-printf("M_LEADINGSPACE(%d) >= SEND_HDR_LEN(%d)?\n", M_LEADINGSPACE(m), SEND_HDR_LEN);
-	if (M_LEADINGSPACE(m) >= SEND_HDR_LEN) {
-		M_PREPEND(m, SEND_HDR_LEN, M_PKTHDR|M_DONTWAIT);
-		snd_hdr = mtod(m, struct snd_hdr *);
-		snd_hdr->direction = direction;
-		snd_hdr->ifidx = -1;
-	} else {
-		struct mbuf *n;
-		MGET(n, M_PKTHDR|M_DONTWAIT, MT_DATA);
-		if (n == NULL) {
-			m_freem(m);
-			return ENOBUFS;
-		}	
-
-		snd_hdr = mtod(n, struct snd_hdr *);
-		snd_hdr->direction = direction;
-		snd_hdr->ifidx = -1;
-
-		n->m_len = SEND_HDR_LEN;
-		n->m_next = m->m_next;
-		m->m_next = n;
-		m->m_pkthdr.len += SEND_HDR_LEN;
+	m = m_prepend(m, SEND_HDR_LEN, M_PKTHDR|M_DONTWAIT);
+	if (m == NULL) {
+		printf("m_prepend() failed!\n");
+		return (ENOBUFS);
 	}
+	snd_hdr = mtod(m, struct snd_hdr *);
+	snd_hdr->direction = direction;
+	snd_hdr->ifidx = -1;
 
         /*
          * Send incoming or outgoing traffic to the user space either to be
@@ -286,6 +285,9 @@
 		sbappendrecord_locked(&s->so_rcv, m);
 		sorwakeup_locked(s);
 		return 0;
+	} else {
+		m_freem(m);
+		return 0;
 	}
 
     return -1;
@@ -308,7 +310,7 @@
 };
 
 struct protosw send_protosw = {
-    .pr_type =		SOCK_RAW,
+    .pr_type =			SOCK_RAW,
     .pr_protocol =		IPPROTO_SEND,
     .pr_usrreqs =		&send_usrreqs
 };

From owner-p4-projects@FreeBSD.ORG  Tue Mar 30 18:39:01 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6D9D41065672; Tue, 30 Mar 2010 18:39: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 31836106566C
	for ; Tue, 30 Mar 2010 18:39:01 +0000 (UTC)
	(envelope-from jona@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1E6328FC14
	for ; Tue, 30 Mar 2010 18:39:01 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2UIcxOJ000978
	for ; Tue, 30 Mar 2010 18:38:59 GMT
	(envelope-from jona@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2UIcxm0000976
	for perforce@freebsd.org; Tue, 30 Mar 2010 18:38:59 GMT
	(envelope-from jona@FreeBSD.org)
Date: Tue, 30 Mar 2010 18:38:59 GMT
Message-Id: <201003301838.o2UIcxm0000976@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jona@FreeBSD.org using -f
From: Jonathan Anderson 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 176294 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 30 Mar 2010 18:39:01 -0000

http://p4web.freebsd.org/chv.cgi?CH=176294

Change 176294 by jona@jona-belle-freebsd8 on 2010/03/30 18:38:41

	Farewell to cap_main()

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/lib/csu/amd64/crt1.c#7 edit
.. //depot/projects/trustedbsd/capabilities/src/lib/csu/common/crtbrand.c#9 edit
.. //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/Makefile#5 edit
.. //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/crt1_c.c#4 edit
.. //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/crt1_s.S#3 edit
.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#40 edit
.. //depot/projects/trustedbsd/capabilities/src/tools/cap/cap_exec/main.c#4 edit
.. //depot/projects/trustedbsd/capabilities/src/tools/cap/fdlist/Makefile#3 edit
.. //depot/projects/trustedbsd/capabilities/src/tools/cap/fdlist/fdlist.c#10 edit
.. //depot/projects/trustedbsd/capabilities/src/tools/cap/fdrpc/Makefile#5 edit
.. //depot/projects/trustedbsd/capabilities/src/tools/cap/fdrpc/fdrpc.c#9 edit
.. //depot/projects/trustedbsd/capabilities/src/tools/cap/fdsendrecv/Makefile#4 edit
.. //depot/projects/trustedbsd/capabilities/src/tools/cap/fdsendrecv/fdsendrecv.c#6 edit
.. //depot/projects/trustedbsd/capabilities/src/tools/cap/ld_libdirs/Makefile#2 edit
.. //depot/projects/trustedbsd/capabilities/src/tools/cap/ld_libdirs/ld_libdirs.c#2 edit
.. //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_echo/Makefile#7 edit
.. //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_echo/sandbox_echo.c#13 edit
.. //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_world/Makefile#3 edit
.. //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_world/sandbox_world.c#8 edit
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/gzip/Makefile#10 edit
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/gzip/gzip.c#10 edit
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/gzip/gzsandbox.c#15 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/lib/csu/amd64/crt1.c#7 (text+ko) ====

@@ -45,7 +45,6 @@
 extern void _init(void);
 extern int main(int, char **, char **);
 extern void _start(char **, void (*)(void));
-extern void _capstart(char **, void (*)(void));
 
 #ifdef GCRT
 extern void _mcleanup(void);
@@ -94,41 +93,4 @@
 	exit( main(argc, argv, env) );
 }
 
-/* The Capsicum entry function. */
-void
-_capstart(char **ap, void (*cleanup)(void))
-{
-	int argc;
-	char **argv;
-	char **env;
-	const char *s;
-
-	argc = *(long *)(void *)ap;
-	argv = ap + 1;
-	env = ap + 2 + argc;
-	environ = env;
-	if (argc > 0 && argv[0] != NULL) {
-		__progname = argv[0];
-		for (s = __progname; *s != '\0'; s++)
-			if (*s == '/')
-				__progname = s + 1;
-	}
-
-	if (&_DYNAMIC != NULL)
-		atexit(cleanup);
-	else
-		_init_tls();
-
-#ifdef GCRT
-	atexit(_mcleanup);
-#endif
-	atexit(_fini);
-#ifdef GCRT
-/*	monstartup(&eprol, &etext);*/
-/*__asm__("eprol:");*/             /* JA hope and pray... */
-#endif
-	_init();
-	exit( cap_main(argc, argv, env) );
-}
-
 __asm__(".ident\t\"$FreeBSD: src/lib/csu/amd64/crt1.c,v 1.15 2005/10/07 22:13:17 bde Exp $\"");

==== //depot/projects/trustedbsd/capabilities/src/lib/csu/common/crtbrand.c#9 (text+ko) ====

@@ -52,12 +52,3 @@
     __FreeBSD_version
 };
 
-extern int cap_main(int, char **, char **) __attribute__((weak));
-int cap_main(__unused int argc, __unused char **argv, __unused char **env)
-{
-	const char warning[] =
-		"ERROR: attempting to run a regular binary in capability mode!\n\nIf you want to run a binary in a sandbox, you must provide a cap_main() function, which takes the same arguments as main().\n";
-
-	write(2, warning, sizeof(warning));
-	return (-1);
-}

==== //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/Makefile#5 (text+ko) ====

@@ -20,13 +20,13 @@
 
 crt1.o:	crt1_c.o crt1_s.o
 	${LD} ${LDFLAGS} -o crt1.o -r crt1_s.o crt1_c.o
-	objcopy --localize-symbol _start1 --localize-symbol _capstart1 crt1.o
+	objcopy --localize-symbol _start1 crt1.o
 
 Scrt1_c.o:	crt1_c.c
 	${CC} ${CFLAGS} -DGCRT -fPIC -DPIC -c -o Scrt1_c.o ${.CURDIR}/crt1_c.c
 
 Scrt1.o: Scrt1_c.o crt1_s.o
 	${LD} ${LDFLAGS} -o Scrt1.o -r crt1_s.o Scrt1_c.o
-	objcopy --localize-symbol _start1 --localize-symbol _capstart1 Scrt1.o
+	objcopy --localize-symbol _start1 Scrt1.o
 
 .include 

==== //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/crt1_c.c#4 (text+ko) ====

@@ -46,7 +46,6 @@
 extern void _init(void);
 extern int main(int, char **, char **);
 extern void _start(char *, ...);
-extern void _capstart(char *, ...);
 
 #ifdef GCRT
 extern void _mcleanup(void);
@@ -59,7 +58,6 @@
 const char *__progname = "";
 
 void _start1(fptr, int, char *[]) __dead2;
-void _capstart1(fptr, int, char *[]) __dead2;
 
 /* The entry function, C part. */
 void
@@ -96,37 +94,3 @@
 
 __asm(".hidden	_start1");
 
-/* The Capsicum entry function. */
-void
-_capstart1(fptr cleanup, int argc, char *argv[])
-{
-	char **env;
-	const char *s;
-
-	env = argv + argc + 1;
-	environ = env;
-	if (argc > 0 && argv[0] != NULL) {
-		__progname = argv[0];
-		for (s = __progname; *s != '\0'; s++)
-			if (*s == '/')
-				__progname = s + 1;
-	}
-
-	if (&_DYNAMIC != NULL)
-		atexit(cleanup);
-	else
-		_init_tls();
-
-#ifdef GCRT
-	atexit(_mcleanup);
-#endif
-	atexit(_fini);
-#ifdef GCRT
-/* XXXCAP:	monstartup(&eprol, &etext); */
-/* XXXCAP: __asm__("eprol:"); */
-#endif
-	_init();
-	exit( cap_main(argc, argv, env) );
-}
-
-__asm(".hidden	_capstart1");

==== //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/crt1_s.S#3 (text+ko) ====

@@ -41,17 +41,4 @@
 	call	_start1
 	.size	_start, . - _start
 
-	.globl	_capstart
-	.type	_capstart, @function
-_capstart:	xorl	%ebp,%ebp
-	pushl	%ebp
-	movl	%esp,%ebp
-	andl	$0xfffffff0,%esp # align stack
-	leal	8(%ebp),%eax
-	pushl	%eax		# argv
-	pushl	4(%ebp)		# argc
-	pushl	%edx		# rtld cleanup
-	call	_capstart1
-	.size	_capstart, . - _capstart
-
 	.ident	"$FreeBSD: src/lib/csu/i386-elf/crt1_s.S,v 1.1 2009/12/02 16:34:20 kib Exp $"

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#40 (text+ko) ====

@@ -106,9 +106,7 @@
 static bool donelist_check(DoneList *, const Obj_Entry *);
 static void errmsg_restore(char *);
 static char *errmsg_save(void);
-#ifdef IN_RTLD_CAP
-static void *find_capstart(const Obj_Entry *);
-#else
+#ifndef IN_RTLD_CAP
 static void *fill_search_info(const char *, size_t, void *);
 static char *find_library(const char *, const Obj_Entry *);
 static const char *gethints(void);
@@ -352,7 +350,6 @@
 #ifdef IN_RTLD_CAP
     struct stat sb;
     Elf_Auxinfo aux_execfd;
-    void *capstart_ptr;
 #endif
     Elf_Auxinfo *aux_info[AT_COUNT];
     int i;
@@ -649,21 +646,7 @@
     *exit_proc = rtld_exit;
     *objp = obj_main;
 
-#ifdef IN_RTLD_CAP
-    /*
-     * If the object provides an alternative capability-mode specific entry
-     * point, prefer that to the ELF default entry point.  Otherwise, use the
-     * ELF default.
-     */
-    capstart_ptr = find_capstart(obj_main);
-    if (capstart_ptr == NULL) {
-	_rtld_error("_capstart not found; has the binary been compiled with -rdynamic?");
-	die();
-    }
-    return (func_ptr_type) capstart_ptr;
-#else
     return (func_ptr_type) obj_main->entry;
-#endif
 }
 
 Elf_Addr
@@ -830,25 +813,6 @@
     return (res4);
 }
 
-#ifdef IN_RTLD_CAP
-static void *
-find_capstart(const Obj_Entry *obj)
-{
-    const char *capstart_str = "_capstart";
-    const Elf_Sym *def;
-    const Obj_Entry *defobj;
-    unsigned long hash;
-
-    hash = elf_hash(capstart_str);
-    def = symlook_default(capstart_str, hash, obj, &defobj, NULL,
-	SYMLOOK_IN_PLT);
-    if (def == NULL)
-	return (NULL);
-    if (ELF_ST_TYPE(def->st_info) != STT_FUNC)
-	return (NULL);
-    return (make_function_pointer(def, defobj));
-}
-#endif
 
 static void
 die(void)

==== //depot/projects/trustedbsd/capabilities/src/tools/cap/cap_exec/main.c#4 (text+ko) ====

@@ -4,9 +4,20 @@
 #include 
 
 
+int	ld_insandbox(void);
+
+int
+sandbox(int argc, char *argv[])
+{
+	printf("pid %d cap_main(%d, %p)\n", getpid(), argc, argv);
+	return 0;
+}
+
 int
 main(int argc, char *argv[])
 {
+	if (ld_insandbox()) return sandbox(argc, argv);
+
 	printf("pid %d main(%d, %p)\n", getpid(), argc, argv);
 
 	if(opendir("./") == NULL)
@@ -18,9 +29,3 @@
 	return 0;
 }
 
-int
-cap_main(int argc, char *argv[])
-{
-
-	printf("pid %d cap_main(%d, %p)\n", getpid(), argc, argv);
-}

==== //depot/projects/trustedbsd/capabilities/src/tools/cap/fdlist/Makefile#3 (text+ko) ====

@@ -1,6 +1,6 @@
 PROG=fdlist
 NO_MAN=
-CFLAGS=-Wall -Werror -g -rdynamic
+CFLAGS=-Wall -Werror -g
 
 DPADD=	${LIBCAPABILITY} ${LIBSBUF}
 LDADD=	-lcapsicum -lsbuf

==== //depot/projects/trustedbsd/capabilities/src/tools/cap/fdlist/fdlist.c#10 (text+ko) ====

@@ -46,6 +46,8 @@
 #include 
 
 
+int	ld_insandbox(void);
+int	sandbox(void);
 
 static void print_fdlist(struct lc_fdlist *lfp);
 
@@ -59,6 +61,8 @@
 	struct lc_fdlist *lfp;
 	int testfd;
 
+	if (ld_insandbox()) return sandbox();
+
 	printf("fdlist: PID %d\n", getpid());
 
 	/* create an FD list and add some junk to it */
@@ -110,9 +114,9 @@
 
 
 int
-cap_main(__unused int argc, __unused char *argv[])
+sandbox()
 {
-	printf("cap_main() alive\n"); fflush(stdout);
+	printf("sandbox alive\n"); fflush(stdout);
 
 	struct lc_fdlist *global_fdlist = lc_fdlist_global();
 	printf("Received FD list:\n"); fflush(stdout);

==== //depot/projects/trustedbsd/capabilities/src/tools/cap/fdrpc/Makefile#5 (text+ko) ====

@@ -1,6 +1,6 @@
 PROG=fdrpc
 NO_MAN=
-CFLAGS=-Wall -g -rdynamic
+CFLAGS=-Wall -g
 
 DPADD=	${LIBCAPABILITY} ${LIBSBUF}
 LDADD=	-lcapsicum -lsbuf

==== //depot/projects/trustedbsd/capabilities/src/tools/cap/fdrpc/fdrpc.c#9 (text+ko) ====

@@ -52,6 +52,9 @@
 
 #define	FDRPC_SANDBOX	"./fdrpc"
 
+int	ld_insandbox(void);
+int	sandbox(void);
+
 /*
  * Unsandboxed host process with full user rights.
  */
@@ -65,6 +68,8 @@
 	size_t len;
 	char ch;
 
+	if (ld_insandbox()) return sandbox();
+
 	if (argc != 1)
 		errx(-1, "usage: fdrpc_host");
 
@@ -107,7 +112,7 @@
  * descriptors to the host.
  */
 int
-cap_main(int argc, char *argv[])
+sandbox()
 {
 	int fd, fdcount;
 	struct lc_host *lchp;

==== //depot/projects/trustedbsd/capabilities/src/tools/cap/fdsendrecv/Makefile#4 (text+ko) ====

@@ -1,6 +1,6 @@
 PROG=fdsendrecv
 NO_MAN=
-CFLAGS=-Wall -g -rdynamic
+CFLAGS=-Wall -g
 
 DPADD=	${LIBCAPABILITY} ${LIBSBUF}
 LDADD=	-lcapsicum -lsbuf

==== //depot/projects/trustedbsd/capabilities/src/tools/cap/fdsendrecv/fdsendrecv.c#6 (text+ko) ====

@@ -48,6 +48,10 @@
 
 #define	FDSENDRECV_SANDBOX	"fdsendrecv"
 
+int	ld_insandbox(void);
+int	sandbox(void);
+
+
 int
 main(int argc, char *argv[])
 {
@@ -56,6 +60,8 @@
 	int fdarray[2], fdcount;
 	char ch;
 
+	if (ld_insandbox()) return sandbox();
+
 	if (argc != 1)
 		errx(-1, "usage: fdsendrecv_host");
 
@@ -86,7 +92,7 @@
 }
 
 int
-cap_main(int argc, char *argv[])
+sandbox()
 {
 	struct lc_host *lchp;
 	ssize_t len;

==== //depot/projects/trustedbsd/capabilities/src/tools/cap/ld_libdirs/Makefile#2 (text+ko) ====

@@ -1,6 +1,6 @@
 PROG=ld_libdirs
 NO_MAN=
-CFLAGS=-Wall -g -rdynamic
+CFLAGS=-Wall -g
 
 DPADD=	${LIBCAPABILITY} ${LIBSBUF}
 LDADD=	-lcapsicum -lsbuf

==== //depot/projects/trustedbsd/capabilities/src/tools/cap/ld_libdirs/ld_libdirs.c#2 (text+ko) ====

@@ -47,7 +47,10 @@
 #include 
 
 
-void print_fdlist(struct lc_fdlist*);
+int	ld_insandbox(void);
+int	sandbox(void);
+
+void	print_fdlist(struct lc_fdlist*);
 
 
 int
@@ -56,6 +59,8 @@
 	struct lc_sandbox *lcsp;
 	char *sandbox_argv[3] = { argv[1], "sandbox", NULL };
 
+	if (ld_insandbox()) return sandbox();
+
 	for (int i = 0; i < 200; i++) {
 		int size = i;
 		int libdirs[size];
@@ -82,7 +87,7 @@
 }
 
 int
-cap_main(int argc, char *argv[])
+sandbox()
 {
 	struct lcs_host *host;
 

==== //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_echo/Makefile#7 (text+ko) ====

@@ -1,6 +1,6 @@
 PROG=sandbox_echo
 NO_MAN=
-CFLAGS=-Wall -g -rdynamic
+CFLAGS=-Wall -g
 
 DPADD=	${LIBCAPABILITY} ${LIBSBUF}
 LDADD=	-lcapsicum -lsbuf

==== //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_echo/sandbox_echo.c#13 (text+ko) ====

@@ -47,6 +47,9 @@
 
 #define	MYNAME	"sandbox_echo"
 
+
+int sandbox(int argc, char *argv[]);
+
 int
 main(int argc, char *argv[])
 {
@@ -57,6 +60,8 @@
 	char ch;
 	int i;
 
+	if(ld_insandbox()) return cap_main(argc, argv);
+
 	if (argc != 1)
 		errx(-1, "usage: sandbox_echo");
 
@@ -84,7 +89,7 @@
 }
 
 int
-cap_main(int argc, char *argv[])
+sandbox(int argc, char *argv[])
 {
 	char *sandbox_argv[3] = { MYNAME, NULL };
 	struct lc_sandbox *lcsp;

==== //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_world/Makefile#3 (text+ko) ====

@@ -1,6 +1,6 @@
 PROG=sandbox_world
 NO_MAN=
-CFLAGS=-Wall -g -rdynamic
+CFLAGS=-Wall -g
 
 DPADD=	${LIBCAPABILITY} ${LIBSBUF}
 LDADD=	-lcapsicum -lsbuf

==== //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_world/sandbox_world.c#8 (text+ko) ====

@@ -53,6 +53,9 @@
 
 #define	MYNAME	"sandbox_world"		/* Binary to run in sandbox. */
 
+int	ld_insandbox(void);
+int	sandbox(void);
+
 /*
  * Unsandboxed host process with full user rights.
  */
@@ -65,6 +68,8 @@
 	size_t len;
 	char ch;
 
+	if (ld_insandbox()) return sandbox();
+
 	if (argc != 1)
 		errx(-1, "usage: sandbox_world");
 
@@ -99,7 +104,7 @@
  * Sandboxed process implementing a 'printf hello world' RPC.
  */
 int
-cap_main(int argc, char *argv[])
+sandbox()
 {
 	struct lc_host *lchp;
 	u_int32_t opno, seqno;
@@ -142,4 +147,6 @@
 		}
 		free(buffer);
 	}
+
+	return 0;
 }

==== //depot/projects/trustedbsd/capabilities/src/usr.bin/gzip/Makefile#10 (text+ko) ====

@@ -9,7 +9,6 @@
 
 DPADD=		${LIBZ} ${LIBCAPSICUM}
 LDADD=		-lz -lcapsicum
-CFLAGS+=	-rdynamic			# For sandbox cap_main
 
 .if ${MK_BZIP2_SUPPORT} != "no"
 DPADD+=		${LIBBZ2}

==== //depot/projects/trustedbsd/capabilities/src/usr.bin/gzip/gzip.c#10 (text+ko) ====

@@ -259,6 +259,11 @@
 
 int main(int, char **p);
 
+#ifndef NO_SANDBOX_SUPPORT
+int ld_insandbox(void);
+int gzsandbox(void);
+#endif
+
 #ifdef SMALL
 #define getopt_long(a,b,c,d,e) getopt(a,b,c)
 #else
@@ -297,6 +302,10 @@
 #endif
 	int ch;
 
+#ifndef NO_SANDBOX_SUPPORT
+	if (ld_insandbox()) return gzsandbox();
+#endif
+
 	/* XXX set up signals */
 
 #ifndef SMALL

==== //depot/projects/trustedbsd/capabilities/src/usr.bin/gzip/gzsandbox.c#15 (text+ko) ====

@@ -53,6 +53,8 @@
 
 #ifndef NO_SANDBOX_SUPPORT
 
+int	gzsandbox(void);
+
 static char *lc_sandbox_argv[] = { __DECONST(char *, LC_USR_BIN_GZIP_SANDBOX),
 				    NULL };
 
@@ -325,8 +327,7 @@
 /*
  * Main entry point for capability-mode 
  */
-int
-cap_main(__unused int argc, __unused char *argv[])
+int gzsandbox(void)
 {
 	int fdarray[2], fdcount;
 	struct lc_host *lchp;

From owner-p4-projects@FreeBSD.ORG  Tue Mar 30 19:12:34 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E4B851065677; Tue, 30 Mar 2010 19:12: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 A848C106566B
	for ; Tue, 30 Mar 2010 19:12:33 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9659E8FC26
	for ; Tue, 30 Mar 2010 19:12:33 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2UJCXX4004820
	for ; Tue, 30 Mar 2010 19:12:33 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2UJCXXY004818
	for perforce@freebsd.org; Tue, 30 Mar 2010 19:12:33 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 30 Mar 2010 19:12:33 GMT
Message-Id: <201003301912.o2UJCXXY004818@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 176296 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 30 Mar 2010 19:12:34 -0000

http://p4web.freebsd.org/chv.cgi?CH=176296

Change 176296 by hselasky@hselasky_laptop001 on 2010/03/30 19:12:24

	USB quirk:
		- add new mass storage quirk from:
		Dmitry Luhtionov

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#26 edit
.. //depot/projects/usb/src/sys/dev/usb/usbdevs#116 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#26 (text+ko) ====

@@ -151,6 +151,7 @@
 	USB_QUIRK(AIPTEK2, SUNPLUS_TECH, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE),
 	USB_QUIRK(ALCOR, SDCR_6335, 0x0000, 0xffff, UQ_MSC_NO_TEST_UNIT_READY,
 	    UQ_MSC_NO_SYNC_CACHE),
+	USB_QUIRK(ALCOR, SDCR_6362, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE),
 	USB_QUIRK(ALCOR, AU6390, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE),
 	USB_QUIRK(ALCOR, UMCR_9361, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB,
 	    UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_GETMAXLUN),

==== //depot/projects/usb/src/sys/dev/usb/usbdevs#116 (text+ko) ====

@@ -872,6 +872,7 @@
 product ALCOR2 KBD_HUB		0x2802	Kbd Hub
 
 product ALCOR SDCR_6335		0x6335	SD/MMC Card Reader
+product ALCOR SDCR_6362		0x6362	SD/MMC Card Reader
 product ALCOR TRANSCEND		0x6387	Transcend JetFlash Drive
 product ALCOR MA_KBD_HUB	0x9213	MacAlly Kbd Hub
 product ALCOR AU9814		0x9215	AU9814 Hub

From owner-p4-projects@FreeBSD.ORG  Tue Mar 30 23:50:18 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7A1071065676; Tue, 30 Mar 2010 23:50: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 3E8FF1065672
	for ; Tue, 30 Mar 2010 23:50:18 +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 120828FC17
	for ; Tue, 30 Mar 2010 23:50:18 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2UNoHxt041126
	for ; Tue, 30 Mar 2010 23:50:17 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2UNoHc2041124
	for perforce@freebsd.org; Tue, 30 Mar 2010 23:50:17 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Tue, 30 Mar 2010 23:50:17 GMT
Message-Id: <201003302350.o2UNoHc2041124@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 176322 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 30 Mar 2010 23:50:18 -0000

http://p4web.freebsd.org/chv.cgi?CH=176322

Change 176322 by anchie@anchie_malimis on 2010/03/30 23:50:16

	Partial cleanup.	

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#38 edit

Differences ...

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#38 (text+ko) ====

@@ -154,48 +154,6 @@
 }
 
 static int
-send_input(struct mbuf *m, struct ifnet *ifp, int direction, int msglen)
-{
-	u_int len;
-	void *data;
-	struct ip6_hdr *ip6;
-
-	/*
-	 * Make sure to clear any possible internally embedded scope before 
-	 * passing the packet to userspace for SeND cryptographic signature
-	 * validation to succeed.
-	 */
-	ip6 = mtod(m, struct ip6_hdr *);
-	in6_clearscope(&ip6->ip6_src);
-	in6_clearscope(&ip6->ip6_dst); 
-
-	len = m_length(m, NULL);
-	if (len != msglen)
-		printf("XXX-BZ %s: (m)len=%u (ip6)msglen=%d", __func__, len, msglen);
-
-	/*
-	 * XXX-BZ we can save the alloc/free here if not relying on rtsock.c:rt_msg3()
-	 * but using a version operating on mbuf-to-mbuf copy.
-	 */
-	data = malloc(msglen, M_SEND, M_NOWAIT);
-	if (data == NULL) {
-		m_freem(m);
-		return (ENOBUFS);
-	}
-	
-	m_copydata(m, 0, msglen, data);
-
-	/* 
-	 * Send incoming or outgoing traffic to the user space either to be
-	 * protected (outgoing) or validated (incoming) according to rfc3971. */
-	rt_securendmsg(ifp, direction, data, msglen);
-
-	free(data, M_SEND);
-
-	return (0);
-}
-
-static int
 send_uattach(struct socket *so, int proto, struct thread *td)
 {
 
@@ -204,7 +162,7 @@
 		return (EEXIST);
 
 	/* XXX: Revisit this, hardocoded! */
-	so->so_snd.sb_hiwat = 8192;
+	//so->so_snd.sb_hiwat = 8192;
 
 	V_send_so = so;
  
@@ -232,7 +190,7 @@
 	m_move_pkthdr(m, m0);
 
 	ifp = ifnet_byindex_ref(snd_hdr->ifidx);
-	m_adj(m, sizeof(struct snd_hdr));
+	m_adj(m, SEND_HDR_LEN);
 	if (ifp) {
 		int error = send_output(m, ifp, snd_hdr->direction);
 		printf("error: %d\n", error);
@@ -296,23 +254,20 @@
 static void
 send_close(struct socket *so)
 {
-    /* XXX-AK: Memory leakage! */
-    if (V_send_so)
-    	V_send_so = NULL;
-    printf("pru_detach: send_close\n");
-    //soisdisconnected(so);
+	if (V_send_so)
+	V_send_so = NULL;
 }
 
 struct pr_usrreqs send_usrreqs = {
-    .pru_attach =		send_uattach,
-    .pru_send =			sosend_rcv,
-    .pru_detach =		send_close
+	.pru_attach =		send_uattach,
+	.pru_send =			sosend_rcv,
+	.pru_detach =		send_close
 };
 
 struct protosw send_protosw = {
-    .pr_type =			SOCK_RAW,
-    .pr_protocol =		IPPROTO_SEND,
-    .pr_usrreqs =		&send_usrreqs
+	.pr_type =			SOCK_RAW,
+	.pr_protocol =		IPPROTO_SEND,
+	.pr_usrreqs =		&send_usrreqs
 };
 
 static int

From owner-p4-projects@FreeBSD.ORG  Wed Mar 31 01:05:37 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AE0EA1065672; Wed, 31 Mar 2010 01:05:37 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 70252106566C
	for ; Wed, 31 Mar 2010 01:05:37 +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 5C2218FC1D
	for ; Wed, 31 Mar 2010 01:05:37 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2V15bMl059685
	for ; Wed, 31 Mar 2010 01:05:37 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2V15XRA059680
	for perforce@freebsd.org; Wed, 31 Mar 2010 01:05:33 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Wed, 31 Mar 2010 01:05:33 GMT
Message-Id: <201003310105.o2V15XRA059680@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 176327 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 31 Mar 2010 01:05:37 -0000

http://p4web.freebsd.org/chv.cgi?CH=176327

Change 176327 by anchie@anchie_malimis on 2010/03/31 01:05:19

	IFC	

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/amd64/acpica/acpi_machdep.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/apic_vector.S#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/atpic_vector.S#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/busdma_machdep.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/db_trace.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/exception.S#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/identcpu.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/intr_machdep.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/local_apic.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/machdep.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/mca.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/nexus.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/pmap.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/vm_machdep.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/conf/GENERIC#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/conf/NOTES#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/conf/XENHVM#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/ia32/ia32_signal.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/_inttypes.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/apicvar.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/elf.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/mca.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/md_var.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/reg.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/specialreg.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/sysarch.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/isa/atpic.c#3 delete
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/isa/atpic_vector.S#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/isa/clock.c#5 delete
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/isa/elcr.c#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/isa/icu.h#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/isa/isa.c#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/isa/isa.h#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/isa/isa_dma.c#3 delete
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/isa/nmi.c#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/linux32/linux.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/linux32/linux32_sysvec.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/busdma_machdep.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/cpufunc.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/identcpu.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/machdep.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/pmap.c#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/vm_machdep.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/if_ate.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/BWCT#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/BWCT.hints#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/HL200#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/KB920X#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/LN2410SBC#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/arm/include/armreg.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/include/md_var.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/common.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/kirkwood/kirkwood.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/mv_machdep.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/s3c2xx0/board_ln2410sbc.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/arm/s3c2xx0/files.s3c2xx0#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/arm/s3c2xx0/s3c2410reg.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/arm/s3c2xx0/s3c2410var.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/arm/s3c2xx0/s3c2440reg.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/arm/s3c2xx0/s3c24x0.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/arm/s3c2xx0/s3c24x0_clk.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/arm/s3c2xx0/s3c24x0_machdep.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/arm/s3c2xx0/s3c24x0reg.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/arm/s3c2xx0/s3c24x0var.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/arm/s3c2xx0/s3c2xx0_space.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/arm/s3c2xx0/s3c2xx0board.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/arm/s3c2xx0/s3c2xx0reg.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/arm/s3c2xx0/s3c2xx0var.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/arm/s3c2xx0/std.ln2410sbc#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/arm/s3c2xx0/std.s3c2410#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/arm/s3c2xx0/uart_bus_s3c2410.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/arm/s3c2xx0/uart_cpu_s3c2410.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/arm/s3c2xx0/uart_dev_s3c2410.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/arm/s3c2xx0/uart_dev_s3c2410.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/cambria_fled.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/boot2/bwct_board.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/boot/forth/loader.conf#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/boot2/boot2.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/gptboot/gptboot.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/zfsboot/zfsboot.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/boot/powerpc/ofw/Makefile#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/boot/powerpc/uboot/Makefile#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/boot/powerpc/uboot/conf.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/boot/sparc64/loader/main.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/boot/uboot/common/main.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/boot/uboot/lib/disk.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/boot/uboot/lib/time.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cam/ata/ata_xpt.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cam/cam_xpt.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cam/cam_xpt_internal.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cam/scsi/scsi_sg.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cam/scsi/scsi_xpt.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/compat/freebsd32/freebsd32.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/compat/freebsd32/freebsd32_ipc.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/compat/freebsd32/freebsd32_misc.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/compat/freebsd32/freebsd32_proto.h#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/compat/freebsd32/freebsd32_util.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/compat/freebsd32/syscalls.master#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/compat/ia32/ia32_reg.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/compat/ia32/ia32_signal.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/compat/ia32/ia32_sysvec.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/compat/linprocfs/linprocfs.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/compat/linux/linux_file.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/compat/linux/linux_getcwd.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/compat/linux/linux_ioctl.c#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/compat/linux/linux_stats.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/compat/linux/linux_time.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/compat/svr4/svr4_stat.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/compat/x86bios/x86bios.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/NOTES#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/files#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/files.amd64#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/files.i386#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/files.ia64#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/files.mips#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/files.pc98#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/kern.post.mk#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/kmod.mk#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/ldscript.mips.cfe#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/ldscript.mips.octeon1.32#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/ldscript.mips.octeon1.64#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/ldscript.mips.octeon1.n32#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/newvers.sh#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/options#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/options.amd64#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/options.i386#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/options.ia64#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/options.mips#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/changes.txt#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/common/dmextern.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/common/dmtable.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/common/dmtbdump.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/common/dmtbinfo.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/compiler/aslglobal.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/compiler/aslmain.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/compiler/aslmap.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/compiler/aslpredef.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/compiler/aslstubs.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/compiler/asltypes.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/dispatcher/dsfield.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/dispatcher/dsmethod.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/dispatcher/dsobject.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/dispatcher/dsopcode.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/dispatcher/dswexec.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/dispatcher/dswstate.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/events/evevent.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/events/evgpe.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/events/evgpeblk.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/events/evmisc.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/events/evxface.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/executer/exconvrt.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/executer/excreate.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/executer/exdebug.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/executer/exfield.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/executer/exfldio.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/executer/exmisc.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/executer/exmutex.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/executer/exnames.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/executer/exoparg1.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/executer/exoparg2.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/executer/exoparg3.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/executer/exoparg6.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/executer/exprep.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/executer/exregion.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/executer/exresnte.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/executer/exresolv.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/executer/exresop.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/executer/exstore.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/executer/exsystem.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/hardware/hwregs.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/hardware/hwsleep.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/hardware/hwvalid.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/include/acdisasm.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/include/acglobal.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/include/acinterp.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/include/acoutput.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/include/acpixf.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/include/actbl2.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/namespace/nsaccess.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/namespace/nsdump.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/namespace/nsnames.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/namespace/nssearch.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/namespace/nsutils.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/parser/psargs.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/parser/psloop.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/resources/rscreate.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/resources/rslist.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/resources/rsmisc.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/tables/tbfadt.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/tables/tbutils.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/tables/tbxfroot.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/utilities/utalloc.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/utilities/utdelete.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/utilities/uteval.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/utilities/utmisc.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/utilities/utmutex.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/utilities/utobject.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/utilities/uttrack.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/libfdt/fdt.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/libfdt/fdt.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/libfdt/fdt_ro.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/libfdt/fdt_rw.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/libfdt/fdt_strerror.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/libfdt/fdt_sw.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/libfdt/fdt_wip.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/libfdt/libfdt.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/libfdt/libfdt_env.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/libfdt/libfdt_internal.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/x86emu/x86emu.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/aac/aac.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/aac/aac_cam.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/acpica/acpi.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/acpica/acpi_video.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/age/if_age.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/agp/agp_i810.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ahci/ahci.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/alc/if_alc.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ale/if_ale.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ata/ata-all.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ata/ata-pci.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ata/ata-pci.h#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ata/ata-raid.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ata/ata-sata.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ata/chipsets/ata-acerlabs.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ata/chipsets/ata-intel.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ah_debug.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ah_decode.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ah_devid.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ah_eeprom.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ah_eeprom_v1.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ah_eeprom_v1.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ah_eeprom_v3.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ah_internal.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ah_soc.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5210/ar5210_beacon.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5210/ar5210_keycache.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5210/ar5210_power.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5210/ar5210desc.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5210/ar5210phy.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5210/ar5210reg.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5210/ar5k_0007.ini#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5211/ar5211_beacon.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5211/ar5211_keycache.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5211/ar5211_power.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5211/ar5211desc.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5211/ar5211phy.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5211/ar5211reg.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5211/boss.ini#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5212/ar5212.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5212/ar5212.ini#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5212/ar5212_eeprom.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5212/ar5212desc.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5212/ar5212phy.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5212/ar5311reg.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5312/ar5312_eeprom.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5312/ar5312_interrupts.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5312/ar5312_misc.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5312/ar5312_power.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5312/ar5312phy.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5312/ar5312reg.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/if_ath.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/bce/if_bce.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/bce/if_bcefw.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/bce/if_bcereg.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/bge/if_bge.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/bktr/ioctl_bt848.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/bktr/ioctl_meteor.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/bwn/if_bwn.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/bwn/if_bwnvar.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ciss/ciss.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ciss/cissvar.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/cm/if_cm_isa.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/cm/smc90cx6.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/cm/smc90cx6reg.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/cm/smc90cx6var.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/common/cxgb_ael1002.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/common/cxgb_common.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/common/cxgb_version.h#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/cxgb_adapter.h#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/cxgb_config.h#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/cxgb_main.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/cxgb_offload.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/cxgb_osdep.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/cxgb_sge.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/drm_pciids.h#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/i915_drv.h#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/i915_reg.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/e1000_80003es2lan.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/e1000_82571.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/e1000_82575.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/e1000_82575.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/e1000_defines.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/e1000_hw.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/e1000_ich8lan.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/e1000_ich8lan.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/e1000_mac.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/e1000_manage.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/e1000_phy.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/e1000_regs.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/if_em.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/if_em.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/if_igb.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/if_igb.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/if_lem.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/if_lem.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/dev/fb/fb.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/fb/vesa.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/fb/vga.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/firewire/sbp.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/gem/if_gem.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/hme/if_hme_sbus.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/hme/if_hmereg.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/hme/if_hmevar.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/hwpmc_logging.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/hwpmc_mips.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/hwpmc_mips24k.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/hwpmc_mips24k.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/pmc_events.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/isp/isp.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/isp/isp_freebsd.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/isp/isp_freebsd.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/isp/isp_library.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/isp/isp_library.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/isp/isp_pci.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/isp/isp_sbus.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/isp/isp_target.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/isp/ispmbox.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/isp/ispreg.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/isp/ispvar.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ispfw/ispfw.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ixgbe/LICENSE#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ixgbe/ixgbe.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ixgbe/ixgbe.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ixgbe/ixgbe_82598.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ixgbe/ixgbe_82599.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ixgbe/ixgbe_api.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ixgbe/ixgbe_api.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ixgbe/ixgbe_common.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ixgbe/ixgbe_phy.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ixgbe/ixgbe_phy.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ixgbe/ixgbe_type.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/jme/if_jme.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/le/am79900var.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/le/am7990var.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/le/if_le_ledma.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/le/lancevar.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/malo/if_malo.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/md/md.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/mfi/mfi_cam.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/mfi/mfi_pci.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/mii/bmtphyreg.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/mii/brgphy.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/mii/brgphyreg.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/mii/e1000phy.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/mii/icsphyreg.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/mii/lxtphyreg.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/mii/mii.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/mii/mii_physubr.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/mii/miidevs#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/mii/miivar.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/mii/nsphyreg.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/mii/nsphyterreg.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/mii/qsphyreg.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/mii/ukphy_subr.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/mpt/mpt_cam.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/mpt/mpt_raid.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/msk/if_msk.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/msk/if_mskreg.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/mxge/if_mxge.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ofw/ofw_pci.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ofw/ofw_standard.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/pci/vga_pci.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ppc/ppc_pci.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/re/if_re.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/siba/siba.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/siba/siba_bwn.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/siba/siba_cc.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/siba/siba_core.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/siba/siba_pcib.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/siba/sibavar.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/siis/siis.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/sound/pci/envy24.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/sound/pci/envy24.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/sound/pci/envy24ht.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/sound/pci/envy24ht.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/sound/pci/es137x.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/sound/pci/hda/hdac.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/sound/pci/spicds.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/sound/pci/spicds.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/sound/pcm/dsp.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/stge/if_stge.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/stge/if_stgereg.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/syscons/scvgarndr.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/syscons/scvidctl.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/syscons/snake/snake_saver.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/syscons/syscons.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/syscons/syscons.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/uart/uart_bus_pci.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ubsec/ubsec.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/controller/ehci.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/controller/ehci_pci.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/controller/ehcireg.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/controller/ohci.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/controller/ohci_pci.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/controller/ohci_s3c24x0.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/controller/ohcireg.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/controller/uhci.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/controller/uhci_pci.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/controller/uhcireg.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/controller/usb_controller.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/controller/uss820dci.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/input/uhid.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/input/ukbd.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/input/ums.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/quirk/usb_quirk.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/serial/uftdi.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/serial/ugensa.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/serial/uipaq.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/serial/ulpt.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/serial/uvisor.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/template/usb_template.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/template/usb_template.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/template/usb_template_mtp.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_cdc.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_compat_linux.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_device.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_device.h#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_generic.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_hid.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_transfer.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usbdevs#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/wlan/if_run.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/wlan/if_runreg.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/wlan/if_runvar.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/xen/netback/netback.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/xen/netfront/netfront.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/ext2fs/ext2_vnops.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/fdescfs/fdesc_vnops.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/msdosfs/msdosfs_denode.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/msdosfs/msdosfs_fat.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/msdosfs/msdosfs_fileno.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/msdosfs/msdosfs_lookup.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/msdosfs/msdosfs_vnops.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/msdosfs/msdosfsmount.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/nfs/nfs_commonport.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/nfs/nfs_commonsubs.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/nfs/nfs_var.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/nfs/nfsport.h#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/nfs/nfsrvstate.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsserver/nfs_nfsdport.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsserver/nfs_nfsdstate.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/procfs/procfs_dbregs.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/procfs/procfs_fpregs.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/procfs/procfs_ioctl.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/procfs/procfs_map.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/procfs/procfs_regs.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/geom/gate/g_gate.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/geom/geom_dump.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/geom/geom_io.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/geom/geom_vfs.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/geom/multipath/g_multipath.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/geom/vinum/geom_vinum.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/acpica/acpi_machdep.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/bios/smbios.c#4 delete
.. //depot/projects/soc2009/anchie_send/src/sys/i386/bios/vpd.c#4 delete
.. //depot/projects/soc2009/anchie_send/src/sys/i386/conf/GENERIC#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/conf/NOTES#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/conf/XEN#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/cpufreq/est.c#4 delete
.. //depot/projects/soc2009/anchie_send/src/sys/i386/cpufreq/hwpstate.c#4 delete
.. //depot/projects/soc2009/anchie_send/src/sys/i386/cpufreq/p4tcc.c#3 delete
.. //depot/projects/soc2009/anchie_send/src/sys/i386/cpufreq/powernow.c#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/i386/cpufreq/smist.c#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/apic_vector.s#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/atpic_vector.s#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/exception.s#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/identcpu.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/local_apic.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/machdep.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/mca.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/mp_machdep.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/nexus.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/pmap.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/trap.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/vm_machdep.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/ibcs2/ibcs2_stat.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/include/_inttypes.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/include/apicvar.h#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/include/mca.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/include/md_var.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/include/specialreg.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/isa/atpic.c#3 delete
.. //depot/projects/soc2009/anchie_send/src/sys/i386/isa/atpic_vector.s#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/i386/isa/clock.c#5 delete
.. //depot/projects/soc2009/anchie_send/src/sys/i386/isa/elcr.c#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/i386/isa/icu.h#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/i386/isa/isa.c#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/i386/isa/isa.h#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/i386/isa/isa_dma.c#3 delete
.. //depot/projects/soc2009/anchie_send/src/sys/i386/isa/nmi.c#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/i386/linux/linux.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/linux/linux_sysvec.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/xen/clock.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/xen/mp_machdep.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/xen/pmap.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/xen/xen_machdep.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/conf/GENERIC#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/conf/NOTES#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/ia32/ia32_signal.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/ia64/autoconf.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/ia64/clock.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/ia64/context.S#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/ia64/db_machdep.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/ia64/exception.S#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/ia64/genassym.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/ia64/highfp.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/ia64/interrupt.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/ia64/locore.S#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/ia64/machdep.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/ia64/mp_machdep.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/ia64/nexus.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/ia64/pmap.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/ia64/sal.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/ia64/sapic.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/ia64/support.S#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/ia64/syscall.S#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/ia64/trap.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/ia64/vm_machdep.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/include/_inttypes.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/include/acpica_machdep.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/include/clock.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/include/cpufunc.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/include/elf.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/include/frame.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/include/intr.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/include/intrcnt.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/include/nexusvar.h#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/include/pcb.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/include/pcpu.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/include/pmap.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/include/reg.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/include/sapicreg.h#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/include/sapicvar.h#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/include/smp.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/pci/pci_cfgreg.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/isa/atrtc.c#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/isa/orm.c#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/kern/imgact_elf.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_conf.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_event.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_exec.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_gzio.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_jail.c#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_kthread.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_ktr.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_module.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_proc.c#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_resource.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_rwlock.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_sig.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_subr.c#3 delete
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_syscalls.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_thr.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_umtx.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/ksched.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/subr_eventhandler.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/subr_firmware.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/subr_hash.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/kern/subr_param.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/subr_uio.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/kern/sys_generic.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/sys_pipe.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/sys_process.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/sysv_ipc.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/sysv_msg.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/sysv_sem.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/sysv_shm.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/tty_pts.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/uipc_mqueue.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/uipc_sem.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/uipc_shm.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/uipc_socket.c#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/uipc_syscalls.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/vfs_aio.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/vfs_lookup.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/vfs_syscalls.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/vfs_vnops.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/atheros/ar71xxreg.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/dev/rgmii/octeon_rgmx.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octeon_ebt3000_cf.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octeon_machdep.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octeon_pcmap_regs.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/conf/ADM5120#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/conf/AR71XX#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/conf/MALTA#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/conf/MALTA64#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/conf/OCTEON1#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/conf/OCTEON1-32#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/conf/QEMU#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/conf/SWARM#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/conf/XLR#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/include/_inttypes.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/include/asm.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/include/bus.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/include/cdefs.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/include/clock.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/include/cpu.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/include/cpufunc.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/include/cpuinfo.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/include/cpuregs.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/include/db_machdep.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/include/intr_machdep.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/include/kdb.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/include/param.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/include/pmap.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/include/pmc_mdep.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/include/smp.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/include/trap.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/include/ucontext.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/malta/gtreg.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/busdma_machdep.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/cpu.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/db_trace.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/exception.S#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/locore.S#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/mp_machdep.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/mpboot.S#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/nexus.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/pm_machdep.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/pmap.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/support.S#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/swtch.S#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/tick.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/trap.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/vm_machdep.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/rmi/board.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/rmi/bus_space_rmi.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/rmi/bus_space_rmi_pci.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/mips/rmi/ehcireg.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/rmi/ehcivar.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/rmi/files.xlr#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/rmi/interrupt.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/rmi/intr_machdep.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/rmi/iodi.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/rmi/pcibus.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/rmi/xlr_pci.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/rmi/xls_ehci.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/sibyte/sb_asm.S#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/sibyte/sb_machdep.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/sibyte/sb_scd.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/sibyte/sb_scd.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/modules/Makefile#10 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/modules/acpi/acpi/Makefile#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/modules/ath/Makefile#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/modules/bios/smbios/Makefile#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/modules/bios/vpd/Makefile#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/modules/cpufreq/Makefile#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/modules/cxgb/cxgb/Makefile#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/modules/dummynet/Makefile#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/modules/em/Makefile#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/modules/ixgbe/Makefile#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/modules/linux/Makefile#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/modules/procfs/Makefile#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/modules/zfs/Makefile#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/bpf.c#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/flowtable.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/flowtable.h#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/if.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/if.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/if_bridge.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/if_epair.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/if_ethersubr.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/if_gre.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/if_gre.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/if_lagg.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/if_llatbl.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/if_llatbl.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/if_loop.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/if_media.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/if_tap.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/if_tun.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/if_var.h#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/if_vlan.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/netisr.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/netisr.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/netisr_internal.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/net/radix.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/radix.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/radix_mpath.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/route.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/route.h#9 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/vnet.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/vnet.h#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/zlib.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/zutil.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_adhoc.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_hostap.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_ht.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_mesh.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_proto.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_sta.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_tdma.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_var.h#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netgraph/netflow/ng_netflow.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_socket.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_socketvar.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/in.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/in_pcb.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/in_pcb.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/in_proto.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ip_divert.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ip_dummynet.h#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ip_fw.h#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ip_gre.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ip_gre.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ip_input.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ip_ipsec.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ip_output.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ip_var.h#8 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/dn_heap.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/dn_heap.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/dn_sched.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/dn_sched_fifo.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/dn_sched_prio.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/dn_sched_qfq.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/dn_sched_rr.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/dn_sched_wf2q.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/dummynet.txt#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/ip_dn_glue.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/ip_dn_io.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/ip_dn_private.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/ip_dummynet.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/ip_fw2.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/ip_fw_dynamic.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/ip_fw_log.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/ip_fw_pfil.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/ip_fw_private.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/ip_fw_sockopt.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/ip_fw_table.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/test/Makefile#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/test/dn_test.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/test/main.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/test/mylist.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/test/test_dn_heap.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/test/test_dn_sched.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/raw_ip.c#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_crc32.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_crc32.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_indata.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_input.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_output.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_output.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_pcb.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_pcb.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_sysctl.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_uio.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_usrreq.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctputil.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctputil.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/tcp_input.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/tcp_reass.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/tcp_subr.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/tcp_syncache.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/tcp_timer.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/tcp_timewait.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/tcp_usrreq.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/tcp_var.h#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/udp_usrreq.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/ip6_output.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#24 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netipsec/key.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/nfsserver/nfs_srvsubs.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/pc98/cbus/clock.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/pc98/conf/GENERIC#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/pc98/pc98/machdep.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/aim/interrupt.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/aim/machdep.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/aim/mmu_oea.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/aim/mmu_oea64.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/aim/nexus.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/aim/ofw_machdep.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/aim/ofwmagic.S#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/aim/trap.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/aim/uma_machdep.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/booke/copyinout.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/booke/interrupt.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/booke/machdep.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/booke/trap_subr.S#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/conf/GENERIC#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/fpu/fpu_extern.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/include/_inttypes.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/include/intr.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/include/pte.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/include/spr.h#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/include/sr.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/include/vmparam.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/mpc85xx/ocpbus.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/mpc85xx/ocpbus.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/mpc85xx/pci_ocp.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/ofw/ofw_real.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/ofw/ofw_syscons.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/powermac/cuda.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/powermac/cudavar.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/powermac/pmu.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/powermac/smu.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/powermac/uninorth.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/powerpc/cpu.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/powerpc/mem.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/rpc/svc.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/security/mac_biba/mac_biba.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/security/mac_lomac/mac_lomac.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/security/mac_mls/mac_mls.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/conf/GENERIC#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/include/_inttypes.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/include/cache.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/include/cpu.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/include/dcr.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/include/md_var.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/include/pcpu.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/include/pmap.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/include/smp.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/include/tick.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/include/tlb.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/include/tte.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/include/ver.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/include/wstate.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/pci/schizo.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/pci/schizovar.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sbus/lsi64854reg.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sbus/lsi64854var.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sbus/ofw_sbus.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/cache.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/cheetah.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/exception.S#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/genassym.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/identcpu.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/iommu.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/locore.S#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/machdep.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/mp_locore.S#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/mp_machdep.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/nexus.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/pmap.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/spitfire.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/support.S#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/swtch.S#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/tick.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/trap.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sun4v/conf/GENERIC#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sun4v/include/_inttypes.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sun4v/sun4v/machdep.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/_timespec.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/ata.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/clock.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/eventhandler.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/fbio.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/imgact.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/imgact_aout.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/imgact_elf.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/param.h#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/pcpu.h#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/pioctl.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/pmc.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/ptrace.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/queue.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/stat.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/sysctl.h#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/sysent.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/systm.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/timeb.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/timespec.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/vtoc.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/vm/uma_int.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_init.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_mmap.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_page.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/vm/vnode_pager.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/x86/bios/smbios.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/x86/bios/vpd.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/x86/cpufreq/est.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/x86/cpufreq/hwpstate.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/x86/cpufreq/p4tcc.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/x86/cpufreq/powernow.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/x86/cpufreq/smist.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/x86/isa/atpic.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/x86/isa/atrtc.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/x86/isa/clock.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/x86/isa/elcr.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/x86/isa/icu.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/x86/isa/isa.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/x86/isa/isa.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/x86/isa/isa_dma.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/x86/isa/nmi.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/x86/isa/orm.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/xen/evtchn/evtchn_dev.c#2 integrate

Differences ...

==== //depot/projects/soc2009/anchie_send/src/sys/amd64/acpica/acpi_machdep.c#4 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.24 2009/10/08 17:41:53 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.25 2010/03/19 12:43:18 jhb Exp $");
 
 #include 
 #include 
@@ -627,8 +627,10 @@
 	if (ACPI_FAILURE(AcpiTbChecksum(table, length))) {
 		if (bootverbose)
 			printf("ACPI: Failed checksum for table %s\n", sig);
+#if (ACPI_CHECKSUM_ABORT)
 		table_unmap(table, length);
 		return (NULL);
+#endif
 	}
 	return (table);
 }

==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/apic_vector.S#2 (text+ko) ====

@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.112 2009/04/01 13:09:26 kib Exp $
+ * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.113 2010/03/29 19:13:34 jhb Exp $
  */
 
 /*
@@ -104,6 +104,18 @@
 	MEXITCOUNT
 	jmp	doreti
 
+/*
+ * Local APIC error interrupt handler.
+ */
+	.text
+	SUPERALIGN_TEXT
+IDTVEC(errorint)
+	PUSH_FRAME
+	FAKE_MCOUNT(TF_RIP(%rsp))
+	call	lapic_handle_error
+	MEXITCOUNT
+	jmp	doreti
+
 #ifdef SMP
 /*
  * Global address space TLB shootdown.

==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/busdma_machdep.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.91 2009/04/23 20:24:19 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.92 2010/02/22 17:03:45 gibbs Exp $");
 
 #include 
 #include 
@@ -239,8 +239,7 @@

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

From owner-p4-projects@FreeBSD.ORG  Wed Mar 31 02:47:20 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3E1B31065673; Wed, 31 Mar 2010 02:47: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 029B8106566B
	for ; Wed, 31 Mar 2010 02:47:20 +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 E3A928FC14
	for ; Wed, 31 Mar 2010 02:47:19 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2V2lJpH068512
	for ; Wed, 31 Mar 2010 02:47:19 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2V2lJPa068510
	for perforce@freebsd.org; Wed, 31 Mar 2010 02:47:19 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Wed, 31 Mar 2010 02:47:19 GMT
Message-Id: <201003310247.o2V2lJPa068510@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 176333 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 31 Mar 2010 02:47:20 -0000

http://p4web.freebsd.org/chv.cgi?CH=176333

Change 176333 by anchie@anchie_malimis on 2010/03/31 02:46:53

	Cleanup.	

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#34 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#25 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#13 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/raw_ip6.c#8 edit

Differences ...

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#34 (text+ko) ====

@@ -779,7 +779,7 @@
 			/* give up local */
 
 			/* Send incoming SeND-protected/ND packet to user space. */
-			if (send_input_hook != NULL) {
+			if (send_sendso_input_hook != NULL) {
 				IP6_EXTHDR_CHECK(m, off, icmp6len, IPPROTO_DONE);
 				printf("send_sendso_input_hook\n");
 				send_sendso_input_hook(V_send_so, m, SND_IN, ip6len);
@@ -790,7 +790,7 @@
 			m = NULL;
 			goto freeit;
 		}
-		if (send_input_hook != NULL) {
+		if (send_sendso_input_hook != NULL) {
 			IP6_EXTHDR_CHECK(m, off, icmp6len, IPPROTO_DONE);
                         printf("send_sendso_input_hook\n");
                         send_sendso_input_hook(V_send_so, n, SND_IN, ip6len);
@@ -809,7 +809,7 @@
 		if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
 
 			/* Send incoming SeND-protected/ND packet to user space. */
-			if (send_input_hook != NULL) {
+			if (send_sendso_input_hook != NULL) {
 
 				send_sendso_input_hook(V_send_so, m, SND_IN, ip6len);	
 				return (IPPROTO_DONE);
@@ -818,7 +818,7 @@
 			m = NULL;
 			goto freeit;
 		}
-		if (send_input_hook != NULL) {
+		if (send_sendso_input_hook != NULL) {
 			send_sendso_input_hook(V_send_so, n, SND_IN, ip6len);	
 			return (IPPROTO_DONE);
 		} else
@@ -833,9 +833,9 @@
 		if (icmp6len < sizeof(struct nd_neighbor_solicit))
 			goto badlen;
 		if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
-			if (send_input_hook != NULL) {
+			if (send_sendso_input_hook != NULL) {
 				/* Send incoming SeND/ND packet to user space. */
-				printf("%s: send_input_hook m=%p\n", __func__, m);
+				printf("%s: send_sendso_input_hook m=%p\n", __func__, m);
 				send_sendso_input_hook(V_send_so, m, SND_IN, ip6len);	
 			} else {
 				/* give up local */
@@ -844,9 +844,9 @@
 			m = NULL;
 			goto freeit;
 		}
-		if (send_input_hook != NULL) {
+		if (send_sendso_input_hook != NULL) {
 			/* Send incoming SeND/ND packet to user space. */
-			printf("%s: send_input_hook n=%p\n", __func__, n);
+			printf("%s: send_sendso_input_hook n=%p\n", __func__, n);
 			send_sendso_input_hook(V_send_so, n, SND_IN, ip6len);
 		} else 
 			nd6_ns_input(n, off, icmp6len);
@@ -862,7 +862,7 @@
 		if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
 
 			/* Send incoming SeND-protected/ND packet to user space. */
-			if (send_input_hook != NULL) {
+			if (send_sendso_input_hook != NULL) {
 				send_sendso_input_hook(V_send_so, m, SND_IN, ip6len);
 				return (IPPROTO_DONE);
 			} else {
@@ -872,7 +872,7 @@
 			m = NULL;
 			goto freeit;
 		}
-		if (send_input_hook != NULL)
+		if (send_sendso_input_hook != NULL)
 			send_sendso_input_hook(V_send_so, n, SND_IN, ip6len);
 		else
 			nd6_na_input(n, off, icmp6len);
@@ -888,7 +888,7 @@
 		if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
 
 			/* Send incoming SeND-protected/ND packet to user space. */
-			if (send_input_hook != NULL) {
+			if (send_sendso_input_hook != NULL) {
 				send_sendso_input_hook(V_send_so, m, SND_IN, ip6len);	
 				return (IPPROTO_DONE);
 			} else {
@@ -898,7 +898,7 @@
 			m = NULL;
 			goto freeit;
 		}
-		if (send_input_hook != NULL) {
+		if (send_sendso_input_hook != NULL) {
 			send_sendso_input_hook(V_send_so, n, SND_IN, ip6len);
 			return (IPPROTO_DONE);
 		} else
@@ -2804,7 +2804,7 @@
 	nd_rd->nd_rd_cksum = in6_cksum(m, IPPROTO_ICMPV6,
 	    sizeof(*ip6), ntohs(ip6->ip6_plen));
 
-        if (send_input_hook != NULL) {
+        if (send_sendso_input_hook != NULL) {
 		mtag = m_tag_get(PACKET_TAG_ND_OUTGOING, sizeof(unsigned short), 
 			M_NOWAIT);
 		if (mtag == NULL)

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#25 (text+ko) ====

@@ -1987,7 +1987,7 @@
 #endif
 
 	/* send outgoing NS/NA/REDIRECT packet to sendd. */
-	if (send_input_hook != NULL) {
+	if (send_sendso_input_hook != NULL) {
 		mtag = m_tag_find(m, PACKET_TAG_ND_OUTGOING, NULL);
 		if (mtag != NULL) {
 			skip = 1;

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#13 (text+ko) ====

@@ -399,6 +399,8 @@
 	caddr_t mac;
 	struct route_in6 ro;
 
+printf("nd6_ns_output \n");
+
 	bzero(&ro, sizeof(ro));
 
 	if (IN6_IS_ADDR_MULTICAST(taddr6))
@@ -568,7 +570,7 @@
 	nd_ns->nd_ns_cksum =
 	    in6_cksum(m, IPPROTO_ICMPV6, sizeof(*ip6), icmp6len);
 
-	if (send_input_hook != NULL) {
+	if (send_sendso_input_hook != NULL) {
 		mtag = m_tag_get(PACKET_TAG_ND_OUTGOING, sizeof(unsigned short), 
 			M_NOWAIT);
 		if (mtag == NULL)
@@ -895,7 +897,7 @@
 			 * the 2nd argument as the 1st one.
 			 */
 
-			if (send_input_hook != NULL) {
+			if (send_sendso_input_hook != NULL) {
 				mtag = m_tag_get(PACKET_TAG_ND_OUTGOING, 
 					sizeof(unsigned short), M_NOWAIT);
 				if (mtag == NULL)
@@ -1090,7 +1092,7 @@
 	nd_na->nd_na_cksum =
 	    in6_cksum(m, IPPROTO_ICMPV6, sizeof(struct ip6_hdr), icmp6len);
 
-	if (send_input_hook != NULL) {
+	if (send_sendso_input_hook != NULL) {
 		mtag = m_tag_get(PACKET_TAG_ND_OUTGOING, sizeof(unsigned short), 
 			M_NOWAIT);
 		if (mtag == NULL)

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/raw_ip6.c#8 (text+ko) ====

@@ -534,7 +534,7 @@
 	 * Send RA/RS messages to user land for protection, before sending 
 	 * them to rtadvd/rtsol.
 	 */
-	if (send_input_hook != NULL && 
+	if (send_sendso_input_hook != NULL && 
 		so->so_proto->pr_protocol == IPPROTO_ICMPV6) {
 		switch (type) {
 		case ND_ROUTER_ADVERT:

From owner-p4-projects@FreeBSD.ORG  Wed Mar 31 07:54:16 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AF3A71065673; Wed, 31 Mar 2010 07:54:16 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3E1A8106566C
	for ; Wed, 31 Mar 2010 07:54:16 +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 2B9478FC1E
	for ; Wed, 31 Mar 2010 07:54:16 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2V7sGQd007127
	for ; Wed, 31 Mar 2010 07:54:16 GMT
	(envelope-from raj@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2V7sGBw007125
	for perforce@freebsd.org; Wed, 31 Mar 2010 07:54:16 GMT
	(envelope-from raj@freebsd.org)
Date: Wed, 31 Mar 2010 07:54:16 GMT
Message-Id: <201003310754.o2V7sGBw007125@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 176342 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 31 Mar 2010 07:54:16 -0000

http://p4web.freebsd.org/chv.cgi?CH=176342

Change 176342 by raj@raj_fdt on 2010/03/31 07:53:54

	Make ofw_pcibus.c common. This will be used on ARM as well.

Affected files ...

.. //depot/projects/fdt/sys/conf/files.arm#6 edit
.. //depot/projects/fdt/sys/conf/files.powerpc#19 edit
.. //depot/projects/fdt/sys/dev/ofw/ofw_pcibus.c#1 branch
.. //depot/projects/fdt/sys/powerpc/ofw/ofw_pcibus.c#2 delete

Differences ...

==== //depot/projects/fdt/sys/conf/files.arm#6 (text+ko) ====

@@ -55,6 +55,7 @@
 dev/ofw/ofw_if.m		optional	fdt
 dev/ofw/ofw_bus_subr.c		optional	fdt
 dev/ofw/ofw_fdt.c		optional	fdt
+dev/ofw/ofw_pcibus.c		optional	pci fdt
 geom/geom_bsd.c			optional	geom_bsd
 geom/geom_bsd_enc.c		optional	geom_bsd
 geom/geom_mbr.c			optional	geom_mbr

==== //depot/projects/fdt/sys/conf/files.powerpc#19 (text+ko) ====

@@ -36,6 +36,7 @@
 dev/ofw/ofw_disk.c		optional	ofwd aim
 dev/ofw/ofw_fdt.c		optional	fdt
 dev/ofw/ofw_iicbus.c		optional	iicbus aim
+dev/ofw/ofw_pcibus.c		optional	pci aim | pci fdt
 dev/ofw/ofw_standard.c		optional	aim
 dev/powermac_nvram/powermac_nvram.c optional	powermac_nvram powermac
 dev/quicc/quicc_bfe_ocp.c	optional	quicc mpc85xx
@@ -120,7 +121,6 @@
 powerpc/mpc85xx/openpic_fdt.c	optional	fdt
 powerpc/mpc85xx/pci_ocp.c	optional	pci mpc85xx
 powerpc/ofw/ofw_cpu.c		optional	aim
-powerpc/ofw/ofw_pcibus.c	optional	pci aim
 powerpc/ofw/ofw_pcib_pci.c	optional	pci aim
 powerpc/ofw/ofw_real.c		optional	aim
 powerpc/ofw/ofw_syscons.c	optional	sc aim

From owner-p4-projects@FreeBSD.ORG  Wed Mar 31 08:16:39 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1CD441065677; Wed, 31 Mar 2010 08:16: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 D509C1065675
	for ; Wed, 31 Mar 2010 08:16:38 +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 C23388FC13
	for ; Wed, 31 Mar 2010 08:16:38 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2V8GcEI009844
	for ; Wed, 31 Mar 2010 08:16:38 GMT
	(envelope-from raj@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2V8Gctt009842
	for perforce@freebsd.org; Wed, 31 Mar 2010 08:16:38 GMT
	(envelope-from raj@freebsd.org)
Date: Wed, 31 Mar 2010 08:16:38 GMT
Message-Id: <201003310816.o2V8Gctt009842@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 176344 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 31 Mar 2010 08:16:39 -0000

http://p4web.freebsd.org/chv.cgi?CH=176344

Change 176344 by raj@raj_fdt on 2010/03/31 08:15:52

	Reorg and make FDT support in loader truly conditional.
	
	Compiling the support in depends on WITH_FDT.

Affected files ...

.. //depot/projects/fdt/sys/boot/Makefile#4 edit
.. //depot/projects/fdt/sys/boot/arm/uboot/Makefile#3 edit
.. //depot/projects/fdt/sys/boot/fdt/Makefile#3 edit
.. //depot/projects/fdt/sys/boot/fdt/fdt_loader_cmd.c#1 add
.. //depot/projects/fdt/sys/boot/powerpc/uboot/Makefile#4 edit
.. //depot/projects/fdt/sys/boot/uboot/common/main.c#5 edit
.. //depot/projects/fdt/sys/boot/uboot/common/metadata.c#4 edit
.. //depot/projects/fdt/sys/boot/uboot/lib/Makefile#4 edit
.. //depot/projects/fdt/sys/boot/uboot/lib/fdt.c#5 delete

Differences ...

==== //depot/projects/fdt/sys/boot/Makefile#4 (text+ko) ====

@@ -26,7 +26,9 @@
 SUBDIR+=		zfs
 .endif
 
+.if ${MK_FDT} != "no"
 SUBDIR+=		fdt
+.endif
 
 # Pick the machine-dependent subdir based on the target architecture.
 ADIR=			${MACHINE:S/amd64/i386/:S/sun4v/sparc64/}

==== //depot/projects/fdt/sys/boot/arm/uboot/Makefile#3 (text+ko) ====

@@ -18,7 +18,11 @@
 LOADER_TFTP_SUPPORT?=	no
 LOADER_GZIP_SUPPORT?=	no
 LOADER_BZIP2_SUPPORT?=	no
-LOADER_FDT_SUPPORT?=	yes
+.if !defined(WITHOUT_FDT)
+LOADER_FDT_SUPPORT=	yes
+.else
+LOADER_FDT_SUPPORT=	no
+.endif
 
 .if ${LOADER_DISK_SUPPORT} == "yes"
 CFLAGS+=	-DLOADER_DISK_SUPPORT
@@ -48,7 +52,10 @@
 CFLAGS+=	-DLOADER_TFTP_SUPPORT
 .endif
 .if ${LOADER_FDT_SUPPORT} == "yes"
+CFLAGS+=	-I${.CURDIR}/../../fdt
+CFLAGS+=	-I${.OBJDIR}/../../fdt
 CFLAGS+=	-DLOADER_FDT_SUPPORT
+LIBFDT=		${.OBJDIR}/../../fdt/libfdt.a
 .endif
 
 .if !defined(NO_FORTH)
@@ -64,11 +71,6 @@
 CFLAGS+=	-I${.CURDIR}/../../common
 CFLAGS+=	-I.
 
-# FDT support library
-LIBFDT=	${.OBJDIR}/../../fdt/libfdt.a
-CFLAGS+=	-I${.CURDIR}/../../fdt
-CFLAGS+=	-I${.OBJDIR}/../../fdt
-
 CLEANFILES+=	vers.c loader.help
 
 CFLAGS+=	-ffreestanding

==== //depot/projects/fdt/sys/boot/fdt/Makefile#3 (text+ko) ====

@@ -5,11 +5,14 @@
 LIB=		fdt
 INTERNALLIB=
 
+# Vendor sources of libfdt.
 SRCS+=		fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c
 
-#CFLAGS+=	-I${.CURDIR}/../common -I${.CURDIR}/../.. -I.
-#CFLAGS+=	-I${.CURDIR}/../../../lib/libstand
-CFLAGS+=	-I${.CURDIR}/../../contrib/libfdt/
+# Loader's FDT commands.
+SRCS+=		fdt_loader_cmd.c
+
+CFLAGS+=	-I${.CURDIR}/../../contrib/libfdt/ -I${.CURDIR}/../common/ \
+		-I${.CURDIR}/../uboot/lib
 
 CFLAGS+=	-ffreestanding
 

==== //depot/projects/fdt/sys/boot/powerpc/uboot/Makefile#4 (text+ko) ====

@@ -18,8 +18,11 @@
 LOADER_TFTP_SUPPORT?=	no
 LOADER_GZIP_SUPPORT?=	no
 LOADER_BZIP2_SUPPORT?=	no
-
-LOADER_FDT_SUPPORT?=	yes
+.if !defined(WITHOUT_FDT)
+LOADER_FDT_SUPPORT=	yes
+.else
+LOADER_FDT_SUPPORT=	no
+.endif
 
 .if ${LOADER_DISK_SUPPORT} == "yes"
 CFLAGS+=	-DLOADER_DISK_SUPPORT
@@ -49,7 +52,10 @@
 CFLAGS+=	-DLOADER_TFTP_SUPPORT
 .endif
 .if ${LOADER_FDT_SUPPORT} == "yes"
+CFLAGS+=	-I${.CURDIR}/../../fdt
+CFLAGS+=	-I${.OBJDIR}/../../fdt
 CFLAGS+=	-DLOADER_FDT_SUPPORT
+LIBFDT=		${.OBJDIR}/../../fdt/libfdt.a
 .endif
 
 .if !defined(NO_FORTH)
@@ -76,11 +82,6 @@
 .include	"${.CURDIR}/../../uboot/common/Makefile.inc"
 CFLAGS+=	-I${.CURDIR}/../../uboot/common
 
-# FDT support library
-LIBFDT=	${.OBJDIR}/../../fdt/libfdt.a
-CFLAGS+=	-I${.CURDIR}/../../fdt
-CFLAGS+=	-I${.OBJDIR}/../../fdt
-
 # U-Boot standalone support library
 LIBUBOOT=	${.OBJDIR}/../../uboot/lib/libuboot.a
 CFLAGS+=	-I${.CURDIR}/../../uboot/lib

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

@@ -53,7 +53,9 @@
 extern unsigned char __sbss_end[];
 extern unsigned char _end[];
 
+#ifdef LOADER_FDT_SUPPORT
 extern int command_fdt_internal(int argc, char *argv[]);
+#endif
 
 static void
 dump_sig(struct api_signature *sig)
@@ -272,9 +274,10 @@
 	return (CMD_OK);
 }
 
+#ifdef LOADER_FDT_SUPPORT
 /*
- * Since proper fdt command handling function is defined in fdt.c, and
- * declaring it as extern is in contradiction with COMMAND_SET() macro
+ * Since proper fdt command handling function is defined in fdt_loader_cmd.c,
+ * and declaring it as extern is in contradiction with COMMAND_SET() macro
  * (which uses static pointer), we're defining wrapper function, which
  * calls the proper fdt handling routine.
  */
@@ -286,3 +289,4 @@
 }
 
 COMMAND_SET(fdt, "fdt", "flattened device tree handling", command_fdt);
+#endif

==== //depot/projects/fdt/sys/boot/uboot/common/metadata.c#4 (text+ko) ====

@@ -42,7 +42,9 @@
 #include "bootstrap.h"
 #include "glue.h"
 
+#if defined(LOADER_FDT_SUPPORT)
 extern int fdt_fixup(void);
+#endif
 
 /*
  * Return a 'boothowto' value corresponding to the kernel arguments in
@@ -438,10 +440,11 @@
 	file_addmetadata(kfp, MODINFOMD_BOOTINFO, bisize, bip);
 	file_addmetadata(kfp, MODINFOMD_ENVP, sizeof envp, &envp);
 
-	/* XXX This should be conditional: whether FDT support is enabled */
+#if defined(LOADER_FDT_SUPPORT)
 	/* Handle device tree blob */
 	fdt_fixup();
 	bfp = file_findfile(NULL, "dtb");
+#endif
 	dtbp = bfp == NULL ? 0 : bfp->f_addr;
 	file_addmetadata(kfp, MODINFOMD_DTBP, sizeof dtbp, &dtbp);
 	file_addmetadata(kfp, MODINFOMD_KERNEND, sizeof kernend, &kernend);

==== //depot/projects/fdt/sys/boot/uboot/lib/Makefile#4 (text+ko) ====

@@ -7,8 +7,6 @@
 SRCS=	devicename.c elf_freebsd.c console.c copy.c disk.c \
 	module.c net.c reboot.c time.c glue.c
 
-SRCS+=	fdt.c
-
 CFLAGS+=	-ffreestanding -msoft-float
 
 CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand/

From owner-p4-projects@FreeBSD.ORG  Wed Mar 31 08:18:41 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 456CD1065676; Wed, 31 Mar 2010 08:18:41 +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 0A1D6106566B
	for ; Wed, 31 Mar 2010 08:18:41 +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 EC03F8FC08
	for ; Wed, 31 Mar 2010 08:18:40 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2V8IeiF010028
	for ; Wed, 31 Mar 2010 08:18:40 GMT
	(envelope-from raj@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2V8Iehm010026
	for perforce@freebsd.org; Wed, 31 Mar 2010 08:18:40 GMT
	(envelope-from raj@freebsd.org)
Date: Wed, 31 Mar 2010 08:18:40 GMT
Message-Id: <201003310818.o2V8Iehm010026@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 176345 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 31 Mar 2010 08:18:41 -0000

http://p4web.freebsd.org/chv.cgi?CH=176345

Change 176345 by raj@raj_fdt on 2010/03/31 08:17:59

	Provide initial PCIE device tree node for DB-88F6XXX DTS.
	
	Other minor corrections and adjustments in ARM DTS files.

Affected files ...

.. //depot/projects/fdt/sys/boot/fdt/dts/db88f6281.dts#7 edit
.. //depot/projects/fdt/sys/boot/fdt/dts/sheevaplug.dts#5 edit

Differences ...

==== //depot/projects/fdt/sys/boot/fdt/dts/db88f6281.dts#7 (text+ko) ====

@@ -41,9 +41,12 @@
 
 	aliases {
 		ethernet0 = &enet0;
+		mpp = &MPP;
+		pci0 = &pci0;
 		serial0 = &serial0;
 		serial1 = &serial1;
-		mpp = &MPP;
+		soc = &SOC;
+		sram = &SRAM;
 	};
 
 	cpus {
@@ -114,7 +117,7 @@
 		};
 	};
 
-	soc88f6281@f1000000 {
+	SOC: soc88f6281@f1000000 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "simple-bus";
@@ -263,8 +266,44 @@
 		};
 	};
 
-	sram@fd000000 {
+	SRAM: sram@fd000000 {
 		compatible = "mrvl,cesa-sram";
 		reg = <0xfd000000 0x00100000>;
 	};
+
+	pci0: pcie@f1040000 {
+		compatible = "mrvl,pcie";
+		device_type = "pci";
+		#interrupt-cells = <1>;
+		#size-cells = <2>;
+		#address-cells = <3>;
+		reg = <0xf1040000 0x2000>;
+		bus-range = <0 255>;
+		ranges = <0x02000000 0x0 0xf1300000 0xf1300000 0x0 0x04000000
+			  0x01000000 0x0 0x00000000 0xf1100000 0x0 0x00100000>;
+		clock-frequency = <33333333>;
+		interrupt-parent = <&PIC>;
+		interrupts = <44>;
+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+		interrupt-map = <
+			/* IDSEL 0x1 */
+			0x0800 0x0 0x0 0x1 &PIC 0x9
+			0x0800 0x0 0x0 0x2 &PIC 0x9
+			0x0800 0x0 0x0 0x3 &PIC 0x9
+			0x0800 0x0 0x0 0x4 &PIC 0x9
+			>;
+		pcie@0 {
+			reg = <0x0 0x0 0x0 0x0 0x0>;
+			#size-cells = <2>;
+			#address-cells = <3>;
+			device_type = "pci";
+			ranges = <0x02000000 0x0 0xf1300000
+				  0x02000000 0x0 0xf1300000
+				  0x0 0x04000000
+
+				  0x01000000 0x0 0x0
+				  0x01000000 0x0 0x0
+				  0x0 0x00100000>;
+		};
+	};
 };

==== //depot/projects/fdt/sys/boot/fdt/dts/sheevaplug.dts#5 (text+ko) ====

@@ -41,9 +41,11 @@
 
 	aliases {
 		ethernet0 = &enet0;
+		mpp = &MPP;
 		serial0 = &serial0;
 		serial1 = &serial1;
-		mpp = &MPP;
+		soc = &SOC;
+		sram = &SRAM;
 	};
 
 	cpus {
@@ -114,7 +116,7 @@
 		};
 	};
 
-	soc88f6281@f1000000 {
+	SOC: soc88f6281@f1000000 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "simple-bus";
@@ -254,7 +256,7 @@
 		};
 	};
 
-	sram@fd000000 {
+	SRAM: sram@fd000000 {
 		compatible = "mrvl,cesa-sram";
 		reg = <0xfd000000 0x00100000>;
 	};

From owner-p4-projects@FreeBSD.ORG  Wed Mar 31 08:40:03 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0AADD1065673; Wed, 31 Mar 2010 08:40: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 C0CB61065680
	for ; Wed, 31 Mar 2010 08:40:02 +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 A86AC8FC25
	for ; Wed, 31 Mar 2010 08:40:02 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2V8e2xj011726
	for ; Wed, 31 Mar 2010 08:40:02 GMT
	(envelope-from raj@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2V8e2In011724
	for perforce@freebsd.org; Wed, 31 Mar 2010 08:40:02 GMT
	(envelope-from raj@freebsd.org)
Date: Wed, 31 Mar 2010 08:40:02 GMT
Message-Id: <201003310840.o2V8e2In011724@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 176348 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 31 Mar 2010 08:40:03 -0000

http://p4web.freebsd.org/chv.cgi?CH=176348

Change 176348 by raj@raj_fdt on 2010/03/31 08:39:37

	Initial support for PCI / PCI-Express nodes.
	
	- Retrieve IMMR data from the DT at very early stage, reduce direct
	  usage of FDT_IMMR_VA.
	
	- Improve retrieving CESA SRAM range data.
	
	- Rework MV PCI driver to use DT-provided config data and parameters.
	
	- Collapse shared (platform) MV code.
	
	- Bring a number of other smaller fixes, corrections, renamings and
	  clean-up
	
	Tested with PCI-Express network card (em(4)) on DB-88F6281.

Affected files ...

.. //depot/projects/fdt/sys/arm/include/fdt.h#3 edit
.. //depot/projects/fdt/sys/arm/mv/common.c#8 edit
.. //depot/projects/fdt/sys/arm/mv/discovery/discovery.c#3 edit
.. //depot/projects/fdt/sys/arm/mv/discovery/files.db78xxx#2 edit
.. //depot/projects/fdt/sys/arm/mv/gpio.c#4 edit
.. //depot/projects/fdt/sys/arm/mv/kirkwood/db88f6xxx.c#4 delete
.. //depot/projects/fdt/sys/arm/mv/kirkwood/files.db88f6xxx#2 delete
.. //depot/projects/fdt/sys/arm/mv/kirkwood/kirkwood.c#9 edit
.. //depot/projects/fdt/sys/arm/mv/kirkwood/sheevaplug.c#3 edit
.. //depot/projects/fdt/sys/arm/mv/kirkwood/std.db88f6xxx#2 edit
.. //depot/projects/fdt/sys/arm/mv/mv_machdep.c#11 edit
.. //depot/projects/fdt/sys/arm/mv/mv_pci.c#2 edit
.. //depot/projects/fdt/sys/arm/mv/mvvar.h#6 edit
.. //depot/projects/fdt/sys/arm/mv/mvwin.h#4 edit
.. //depot/projects/fdt/sys/arm/mv/orion/db88f5xxx.c#3 edit
.. //depot/projects/fdt/sys/arm/mv/orion/orion.c#4 edit
.. //depot/projects/fdt/sys/conf/files#20 edit
.. //depot/projects/fdt/sys/dev/fdt/fdt_arm.c#5 edit
.. //depot/projects/fdt/sys/dev/fdt/fdt_common.c#12 edit
.. //depot/projects/fdt/sys/dev/fdt/fdt_common.h#10 edit
.. //depot/projects/fdt/sys/dev/fdt/fdt_pci.c#1 add
.. //depot/projects/fdt/sys/dev/fdt/fdtbus.c#6 edit
.. //depot/projects/fdt/sys/dev/fdt/simplebus.c#8 edit
.. //depot/projects/fdt/sys/dev/ofw/ofw_bus_subr.c#4 edit
.. //depot/projects/fdt/sys/dev/uart/uart_bus_fdt.c#7 edit
.. //depot/projects/fdt/sys/powerpc/mpc85xx/lbc.c#6 edit

Differences ...

==== //depot/projects/fdt/sys/arm/include/fdt.h#3 (text+ko) ====

@@ -31,6 +31,12 @@
 
 #ifndef _MACHINE_FDT_H_
 
+#include 
+
+#include 
+#include 
+
+#include 
 #include 
 
 #include 
@@ -50,4 +56,7 @@
  */
 #define fdtbus_bs_tag	obio_tag
 
+int fdt_pci_devmap(phandle_t, struct pmap_devmap *devmap, vm_offset_t,
+    vm_offset_t);
+
 #endif /* _MACHINE_FDT_H_ */

==== //depot/projects/fdt/sys/arm/mv/common.c#8 (text+ko) ====

@@ -274,7 +274,7 @@
 	*rev = bus_space_read_4(fdtbus_bs_tag, MV_PCIE_BASE, 8) & 0xff;
 }
 
-void
+static void
 soc_identify(void)
 {
 	uint32_t d, r;
@@ -336,6 +336,20 @@
 	/* TODO add info on currently set endianess */
 }
 
+static void
+platform_identify(void *dummy)
+{
+
+	soc_identify();
+
+	/*
+	 * XXX Board identification e.g. read out from FPGA or similar should
+	 * go here
+	 */
+}
+SYSINIT(platform_identify, SI_SUB_CPU, SI_ORDER_SECOND, platform_identify,
+    NULL);
+
 #define MV_USB0_BASE	(FDT_IMMR_VA + usb0_base)
 #define MV_CESA_BASE	(FDT_IMMR_VA + cesa_base)
 #define MV_ETH0_BASE	(FDT_IMMR_VA + eth0_base)
@@ -1735,7 +1749,7 @@
 			if (soc_node->base == NULL)
 				continue;
 
-			err = fdt_get_regsize(child, soc_node->base, &size);
+			err = fdt_regsize(child, soc_node->base, &size);
 			if (err != 0)
 				return (err);
 		}
@@ -1779,12 +1793,19 @@
 	/*
 	 * Retrieve CESA SRAM data.
 	 */
-	if ((node = OF_finddevice("/sram")) == 0)
+	if ((node = OF_finddevice("sram")) != 0)
+		if (fdt_is_compatible(node, "mrvl,cesa-sram"))
+			goto moveon;
+
+	if ((node = OF_finddevice("/")) == 0)
+		return (ENXIO);
+
+	if ((node = fdt_find_compatible(node, "mrvl,cesa-sram", 0)) == 0)
 		/* SRAM block is not always present. */
 		return (0);
-
+moveon:
 	sram_base = sram_size = 0;
-	if (fdt_get_regsize(node, &sram_base, &sram_size) != 0)
+	if (fdt_regsize(node, &sram_base, &sram_size) != 0)
 		return (EINVAL);
 
 	cpu_win_tbl[++t].target = MV_WIN_CESA_TARGET;
@@ -1792,7 +1813,7 @@
 	cpu_win_tbl[t].base = sram_base;
 	cpu_win_tbl[t].size = sram_size;
 	cpu_win_tbl[t].remap = -1;
-	debugf("/sram: base = 0x%0lx size = 0x%0lx\n", sram_base, sram_size);
+	debugf("sram: base = 0x%0lx size = 0x%0lx\n", sram_base, sram_size);
 
 	return (0);
 }

==== //depot/projects/fdt/sys/arm/mv/discovery/discovery.c#3 (text+ko) ====

@@ -53,6 +53,7 @@
 #define	_MV_PCIE_IO_PHYS(n)	(MV_PCIE_IO_PHYS_BASE + ((n) * _MV_PCIE_IO_SIZE))
 #define	_MV_PCIE_MEM_PHYS(n)	(MV_PCIE_MEM_PHYS_BASE + ((n) * _MV_PCIE_MEM_SIZE))
 
+#if 0
 /*
  * Note the 'pcib' devices are not declared in the obio_devices[]: due to the
  * much more complex configuration schemes allowed, specifically of the
@@ -114,6 +115,7 @@
 
 	{ 0, 0, 0 }
 };
+#endif
 
 struct resource_spec mv_gpio_res[] = {
 	{ SYS_RES_MEMORY,	0,	RF_ACTIVE },

==== //depot/projects/fdt/sys/arm/mv/discovery/files.db78xxx#2 (text+ko) ====

@@ -1,4 +1,3 @@
 # $FreeBSD: src/sys/arm/mv/discovery/files.db78xxx,v 1.1 2008/10/13 20:07:13 raj Exp $
 
 arm/mv/discovery/discovery.c	standard
-arm/mv/discovery/db78xxx.c	standard

==== //depot/projects/fdt/sys/arm/mv/gpio.c#4 (text+ko) ====

@@ -566,7 +566,7 @@
 	tuple_size = gpio_cells * sizeof(pcell_t) + sizeof(phandle_t);
 	tuples = len / tuple_size;
 
-	if (fdt_get_regsize(ctrl, &gpio_ctrl, &size))
+	if (fdt_regsize(ctrl, &gpio_ctrl, &size))
 		return (ENXIO);
 	/*
 	 * Since to set up GPIO we use the same functions as GPIO driver, and
@@ -578,7 +578,7 @@
 	mv_gpio_softc = ≻
 
 	sc.bst = fdtbus_bs_tag;
-	gpio_ctrl += FDT_IMMR_VA;
+	gpio_ctrl += fdt_immr_va;
 
 	if (bus_space_map(sc.bst, gpio_ctrl, size, 0, &sc.bsh) != 0)
 		return (ENXIO);
@@ -588,7 +588,7 @@
 	sc.pin_num = fdt32_to_cpu(pincnt);
 
 	/*
-	 * Skip controller reference, since contoller's phandle is given
+	 * Skip controller reference, since controller's phandle is given
 	 * explicitly (in a function argument).
 	 */
 	inc = sizeof(ihandle_t) / sizeof(pcell_t);

==== //depot/projects/fdt/sys/arm/mv/kirkwood/kirkwood.c#9 (text+ko) ====

@@ -42,17 +42,6 @@
 #include 
 #include 
 
-const struct obio_pci mv_pci_info[] = {
-	{ MV_TYPE_PCIE,
-		MV_PCIE_BASE, MV_PCIE_SIZE,
-		MV_PCIE_IO_BASE, MV_PCIE_IO_SIZE,	4, 0xE0,
-		MV_PCIE_MEM_BASE, MV_PCIE_MEM_SIZE,	4, 0xE8,
-		NULL, MV_INT_PEX0
-	},
-
-	{ 0, 0, 0 }
-};
-
 struct resource_spec mv_gpio_res[] = {
 	{ SYS_RES_MEMORY,	0,	RF_ACTIVE },
 	{ SYS_RES_IRQ,		0,	RF_ACTIVE },

==== //depot/projects/fdt/sys/arm/mv/kirkwood/sheevaplug.c#3 (text+ko) ====

@@ -1,8 +1,10 @@
 /*-
- * Copyright (C) 2008 MARVELL INTERNATIONAL LTD.
- * Copyright (C) 2009 Semihalf
+ * Copyright (c) 2010 The FreeBSD Foundation
  * All rights reserved.
  *
+ * This software was developed by Semihalf under sponsorship from
+ * the FreeBSD Foundation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -11,14 +13,11 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of MARVELL nor the names of contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
@@ -29,80 +28,17 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/mv/kirkwood/sheevaplug.c,v 1.1 2009/08/25 10:09:25 raj Exp $");
+__FBSDID("$FreeBSD$");
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
 
-#include 
-#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-
-/*
- * Virtual address space layout:
- * -----------------------------
- * 0x0000_0000 - 0x7FFF_FFFF	: User Process (2 GB)
- * 0x8000_0000 - 0xBBFF_FFFF	: Unused (960 MB)
- * 0xBC00_0000 - 0xBDFF_FFFF	: Device Bus: CS1 (32 MB)
- * 0xBE00_0000 - 0xBECF_FFFF	: Unused (13 MB)
- * 0xBED0_0000 - 0xBEDF_FFFF	: Device Bus: CS2 (1 MB)
- * 0xBEE0_0000 - 0xBEEF_FFFF	: Device Bus: CS0 (1 MB)
- * 0xBEF0_0000 - 0xBEFF_FFFF	: Device Bus: BOOT (1 MB)
- * 0xBF00_0000 - 0xBFFF_FFFF	: Unused (16 MB)
- * 0xC000_0000 - virtual_avail	: Kernel Reserved (text, data, page tables,
- * 				: stack etc.)
- * virtual-avail - 0xEFFF_FFFF	: KVA (virtual_avail is typically < 0xc0a0_0000)
- * 0xF000_0000 - 0xF0FF_FFFF	: No-Cache allocation area (16 MB)
- * 0xF100_0000 - 0xF10F_FFFF	: SoC Integrated devices registers range (1 MB)
- * 0xF110_0000 - 0xF11F_FFFF	: CESA SRAM (1 MB)
- * 0xF120_0000 - 0xFFFE_FFFF	: Unused (237 MB + 960 kB)
- * 0xFFFF_0000 - 0xFFFF_0FFF	: 'High' vectors page (4 kB)
- * 0xFFFF_1000 - 0xFFFF_1FFF	: ARM_TP_ADDRESS/RAS page (4 kB)
- * 0xFFFF_2000 - 0xFFFF_FFFF	: Unused (56 kB)
- */
-
-/* Static device mappings. */
-const struct pmap_devmap pmap_devmap[] = {
-	/*
-	 * Map the on-board devices VA == PA so that we can access them
-	 * with the MMU on or off.
-	 */
-	{ /* SoC integrated peripherals registers range */
-		MV_BASE,
-		MV_PHYS_BASE,
-		MV_SIZE,
-		VM_PROT_READ | VM_PROT_WRITE,
-		PTE_NOCACHE,
-	},
-	{ /* CESA SRAM */
-		MV_CESA_SRAM_BASE,
-		MV_CESA_SRAM_PHYS_BASE,
-		MV_CESA_SRAM_SIZE,
-		VM_PROT_READ | VM_PROT_WRITE,
-		PTE_NOCACHE,
-	},
-	{ 0, 0, 0, 0, 0, }
-};
-
-static void
-platform_identify(void *dummy)
+int
+fdt_pci_devmap(phandle_t node, struct pmap_devmap *devmap, vm_offset_t io_va,
+    vm_offset_t mem_va)
 {
 
-	soc_identify();
-
-	/*
-	 * XXX Board identification e.g. read out from FPGA or similar should
-	 * go here
-	 */
+	return (0);
 }
-SYSINIT(platform_identify, SI_SUB_CPU, SI_ORDER_SECOND, platform_identify, NULL);

==== //depot/projects/fdt/sys/arm/mv/kirkwood/std.db88f6xxx#2 (text+ko) ====

@@ -2,7 +2,6 @@
 
 include	"../mv/std.mv"
 include "../mv/kirkwood/std.kirkwood"
-files	"../mv/kirkwood/files.db88f6xxx"
-
+files	"../mv/kirkwood/files.kirkwood"
 
 options		PHYSMEM_SIZE=0x20000000

==== //depot/projects/fdt/sys/arm/mv/mv_machdep.c#11 (text+ko) ====

@@ -124,13 +124,10 @@
 extern u_int prefetch_abort_handler_address;
 extern u_int undefined_handler_address;
 
-extern const struct pmap_devmap *pmap_devmap_bootstrap_table;
 extern vm_offset_t pmap_bootstrap_lastaddr;
+extern int *end;
 
 struct pv_addr kernel_pt_table[KERNEL_PT_MAX];
-
-extern int *end;
-
 struct pcpu __pcpu;
 struct pcpu *pcpup = &__pcpu;
 
@@ -166,6 +163,7 @@
 static void print_bootinfo(void);
 
 static void physmap_init(int);
+static int platform_devmap_init(void);
 static int platform_mpp_init(void);
 
 static char *
@@ -396,12 +394,13 @@
 		kmdp = preload_search_by_type("elf kernel");
 		if (kmdp != NULL) {
 			bootinfo = (struct bootinfo *)preload_search_info(kmdp,
-			    MODINFO_METADATA|MODINFOMD_BOOTINFO);
+			    MODINFO_METADATA | MODINFOMD_BOOTINFO);
 
 			boothowto = MD_FETCH(kmdp, MODINFOMD_HOWTO, int);
 			kern_envp = MD_FETCH(kmdp, MODINFOMD_ENVP, char *);
 			dtbp = MD_FETCH(kmdp, MODINFOMD_DTBP, vm_offset_t);
-			lastaddr = MD_FETCH(kmdp, MODINFOMD_KERNEND, vm_offset_t);
+			lastaddr = MD_FETCH(kmdp, MODINFOMD_KERNEND,
+			    vm_offset_t);
 		}
 
 		/* Initialize memory regions table */
@@ -415,7 +414,8 @@
 		}
 		availmem_regions_sz = i;
 	} else {
-		/* Fall back to hardcoded metadata. */
+		/* Fall back to hardcoded boothowto flags and metadata. */
+		boothowto = RB_VERBOSE | RB_SINGLE;
 		lastaddr = fake_preload_metadata();
 
 		/*
@@ -447,9 +447,11 @@
 	if (OF_init((void *)dtbp) != 0)
 		while (1);
 
+	if (fdt_immr_addr() != 0)
+		while (1);
+
 	/* Platform-specific initialisation */
-	pmap_bootstrap_lastaddr = MV_BASE - ARM_NOCACHE_KVA_SIZE;
-	pmap_devmap_bootstrap_table = &pmap_devmap[0];
+	pmap_bootstrap_lastaddr = fdt_immr_va - ARM_NOCACHE_KVA_SIZE;
 
 	pcpu_init(pcpup, 0, sizeof(struct pcpu));
 	PCPU_SET(curthread, &thread0);
@@ -564,7 +566,11 @@
 	pmap_map_entry(l1pagetable, ARM_VECTORS_HIGH, systempage.pv_pa,
 	    VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
 
+	/* Map pmap_devmap[] entries */
+	if (platform_devmap_init() != 0)
+		while (1);
 	pmap_devmap_bootstrap(l1pagetable, pmap_devmap_bootstrap_table);
+
 	cpu_domains((DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL * 2)) |
 	    DOMAIN_CLIENT);
 	setttb(kernel_l1pt.pv_pa);
@@ -688,7 +694,6 @@
 {
 	pcell_t pinmap[MPP_PIN_MAX * MPP_PIN_CELLS];
 	int mpp[MPP_PIN_MAX];
-	char buf[64];
 	uint32_t ctrl_val, ctrl_offset;
 	pcell_t reg[4];
 	u_long start, size;
@@ -702,15 +707,9 @@
 	/*
 	 * Try to access the MPP node directly i.e. through /aliases/mpp.
 	 */
-	if ((node = OF_finddevice("/aliases")) != 0)
-		if (OF_getprop(node, "mpp", buf, sizeof(buf)) > 0) {
-			if ((node = OF_finddevice(buf)) == 0)
-				return (ENXIO);
-			if (!fdt_is_compatible(node, "mrvl,mpp"))
-				return (ENXIO);
+	if ((node = OF_finddevice("mpp")) != 0)
+		if (fdt_is_compatible(node, "mrvl,mpp"))
 			goto moveon;
-		}
-
 	/*
 	 * Find the node the long way.
 	 */
@@ -722,7 +721,6 @@
 
 	if ((node = fdt_find_compatible(node, "mrvl,mpp", 0)) == 0)
 		return (ENXIO);
-
 moveon:
 	/*
 	 * Process 'reg' prop.
@@ -744,7 +742,7 @@
 	    &start, &size);
 	if (rv != 0)
 		return (rv);
-	start += FDT_IMMR_VA;
+	start += fdt_immr_va;
 
 	/*
 	 * Process 'pin-count' and 'pin-map' props.
@@ -810,6 +808,87 @@
 	return (0);
 }
 
+#define FDT_DEVMAP_MAX	(1 + 2 + 1 + 1)
+static struct pmap_devmap fdt_devmap[FDT_DEVMAP_MAX] = {
+	{ 0, 0, 0, 0, 0, }
+};
+
+/*
+ * Construct pmap_devmap[] with DT-derived config data.
+ */
+static int
+platform_devmap_init(void)
+{
+	phandle_t root, child;
+	u_long base, size;
+	int i;
+
+	/*
+	 * IMMR range.
+	 */
+	i = 0;
+	fdt_devmap[i].pd_va = fdt_immr_va;
+	fdt_devmap[i].pd_pa = fdt_immr_pa;
+	fdt_devmap[i].pd_size = fdt_immr_size;
+	fdt_devmap[i].pd_prot = VM_PROT_READ | VM_PROT_WRITE;
+	fdt_devmap[i].pd_cache = PTE_NOCACHE;
+	i++;
+
+	/*
+	 * PCI range(s).
+	 */
+	if ((root = OF_finddevice("/")) == 0)
+		return (ENXIO);
+
+	for (child = OF_child(root); child != 0; child = OF_peer(child))
+		if (fdt_is_type(child, "pci")) {
+			/*
+			 * Check space: each PCI node will consume 2 devmap
+			 * entries.
+			 */
+			if (i + 1 >= FDT_DEVMAP_MAX) {
+				return (ENOMEM);
+				break;
+			}
+
+			/*
+			 * XXX this should account for PCI and multiple ranges
+			 * of a given kind.
+			 */
+			if (fdt_pci_devmap(child, &fdt_devmap[i],
+			    MV_PCIE_IO_BASE, MV_PCIE_MEM_BASE) != 0)
+				return (ENXIO);
+			i += 2;
+		}
+
+	/*
+	 * CESA SRAM range.
+	 */
+	if ((child = OF_finddevice("sram")) != 0)
+		if (fdt_is_compatible(child, "mrvl,cesa-sram"))
+			goto moveon;
+
+	if ((child = fdt_find_compatible(root, "mrvl,cesa-sram", 0)) == 0)
+		/* No CESA SRAM node. */
+		goto out;
+moveon:
+	if (i >= FDT_DEVMAP_MAX)
+		return (ENOMEM);
+
+	if (fdt_regsize(child, &base, &size) != 0)
+		return (EINVAL);
+
+	fdt_devmap[i].pd_va = MV_CESA_SRAM_BASE; /* XXX */
+	fdt_devmap[i].pd_pa = base;
+	fdt_devmap[i].pd_size = size;
+	fdt_devmap[i].pd_prot = VM_PROT_READ | VM_PROT_WRITE;
+	fdt_devmap[i].pd_cache = PTE_NOCACHE;
+
+out:
+	pmap_devmap_bootstrap_table = &fdt_devmap[0];
+	return (0);
+}
+
 struct arm32_dma_range *
 bus_dma_get_range(void)
 {

==== //depot/projects/fdt/sys/arm/mv/mv_pci.c#2 (text+ko) ====

@@ -1,9 +1,13 @@
 /*-
- * Copyright (C) 2008 MARVELL INTERNATIONAL LTD.
+ * Copyright (c) 2008 MARVELL INTERNATIONAL LTD.
+ * Copyright (c) 2010 The FreeBSD Foundation
  * All rights reserved.
  *
  * Developed by Semihalf.
  *
+ * Portions of this software were developed by Semihalf
+ * under sponsorship from the FreeBSD Foundation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -51,10 +55,14 @@
 #include 
 #include 
 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
 
+#include "ofw_bus_if.h"
 #include "pcib_if.h"
 
 #include 
@@ -62,6 +70,7 @@
 
 #include 
 #include 
+#include 
 
 #define PCI_CFG_ENA		(1 << 31)
 #define PCI_CFG_BUS(bus)	(((bus) & 0xff) << 16)
@@ -93,18 +102,22 @@
 
 #define PCI_VENDORID_MRVL	0x11AB
 
-struct pcib_mbus_softc {
+struct mv_pcib_softc {
 	device_t	sc_dev;
 
-	struct rman	sc_iomem_rman;
-	bus_addr_t	sc_iomem_base;
-	bus_addr_t	sc_iomem_size;
-	bus_addr_t	sc_iomem_alloc;		/* Next allocation. */
+	struct rman	sc_mem_rman;
+	bus_addr_t	sc_mem_base;
+	bus_addr_t	sc_mem_size;
+	bus_addr_t	sc_mem_alloc;		/* Next allocation. */
+	int		sc_mem_win_target;
+	int		sc_mem_win_attr;
 
-	struct rman	sc_ioport_rman;
-	bus_addr_t	sc_ioport_base;
-	bus_addr_t	sc_ioport_size;
-	bus_addr_t	sc_ioport_alloc;	/* Next allocation. */
+	struct rman	sc_io_rman;
+	bus_addr_t	sc_io_base;
+	bus_addr_t	sc_io_size;
+	bus_addr_t	sc_io_alloc;		/* Next allocation. */
+	int		sc_io_win_target;
+	int		sc_io_win_attr;
 
 	struct resource	*sc_res;
 	bus_space_handle_t sc_bsh;
@@ -113,452 +126,208 @@
 
 	int		sc_busnr;		/* Host bridge bus number */
 	int		sc_devnr;		/* Host bridge device number */
+	int		sc_type;
 
-	const struct obio_pci *sc_info;
+	struct fdt_pci_intr	sc_intr_info;
 };
 
-static void pcib_mbus_identify(driver_t *driver, device_t parent);
-static int pcib_mbus_probe(device_t);
-static int pcib_mbus_attach(device_t);
+/* Local forward prototypes */
+static int mv_pcib_decode_win(phandle_t, struct mv_pcib_softc *);
+static void mv_pcib_hw_cfginit(void);
+static uint32_t mv_pcib_hw_cfgread(struct mv_pcib_softc *, u_int, u_int,
+    u_int, u_int, int);
+static void mv_pcib_hw_cfgwrite(struct mv_pcib_softc *, u_int, u_int,
+    u_int, u_int, uint32_t, int);
+static int mv_pcib_init(struct mv_pcib_softc *, int, int);
+static int mv_pcib_init_all_bars(struct mv_pcib_softc *, int, int, int, int);
+static void mv_pcib_init_bridge(struct mv_pcib_softc *, int, int, int);
+static int mv_pcib_intr_info(phandle_t, struct mv_pcib_softc *);
+static inline void pcib_write_irq_mask(struct mv_pcib_softc *, uint32_t);
+
+
+/* Forward prototypes */
+static int mv_pcib_probe(device_t);
+static int mv_pcib_attach(device_t);
 
-static struct resource *pcib_mbus_alloc_resource(device_t, device_t, int, int *,
+static struct resource *mv_pcib_alloc_resource(device_t, device_t, int, int *,
     u_long, u_long, u_long, u_int);
-static int pcib_mbus_release_resource(device_t, device_t, int, int,
+static int mv_pcib_release_resource(device_t, device_t, int, int,
     struct resource *);
-static int pcib_mbus_read_ivar(device_t, device_t, int, uintptr_t *);
-static int pcib_mbus_write_ivar(device_t, device_t, int, uintptr_t);
+static int mv_pcib_read_ivar(device_t, device_t, int, uintptr_t *);
+static int mv_pcib_write_ivar(device_t, device_t, int, uintptr_t);
 
-static int pcib_mbus_maxslots(device_t);
-static uint32_t pcib_mbus_read_config(device_t, u_int, u_int, u_int, u_int,
-    int);
-static void pcib_mbus_write_config(device_t, u_int, u_int, u_int, u_int,
+static int mv_pcib_maxslots(device_t);
+static uint32_t mv_pcib_read_config(device_t, u_int, u_int, u_int, u_int, int);
+static void mv_pcib_write_config(device_t, u_int, u_int, u_int, u_int,
     uint32_t, int);
-static int pcib_mbus_init(struct pcib_mbus_softc *sc, int bus, int maxslot);
-static int pcib_mbus_init_bar(struct pcib_mbus_softc *sc, int bus, int slot,
-    int func, int barno);
-static void pcib_mbus_init_bridge(struct pcib_mbus_softc *sc, int bus, int slot,
-    int func);
-static int pcib_mbus_init_resources(struct pcib_mbus_softc *sc, int bus,
-    int slot, int func, int hdrtype);
+static int mv_pcib_route_interrupt(device_t, device_t, int);
 
 /*
  * Bus interface definitions.
  */
-static device_method_t pcib_mbus_methods[] = {
+static device_method_t mv_pcib_methods[] = {
 	/* Device interface */
-	DEVMETHOD(device_identify,		pcib_mbus_identify),
-	DEVMETHOD(device_probe,			pcib_mbus_probe),
-	DEVMETHOD(device_attach,		pcib_mbus_attach),
+	DEVMETHOD(device_probe,			mv_pcib_probe),
+	DEVMETHOD(device_attach,		mv_pcib_attach),
 
 	/* Bus interface */
 	DEVMETHOD(bus_print_child,		bus_generic_print_child),
-	DEVMETHOD(bus_read_ivar,		pcib_mbus_read_ivar),
-	DEVMETHOD(bus_write_ivar,		pcib_mbus_write_ivar),
-	DEVMETHOD(bus_alloc_resource,		pcib_mbus_alloc_resource),
-	DEVMETHOD(bus_release_resource,		pcib_mbus_release_resource),
+	DEVMETHOD(bus_read_ivar,		mv_pcib_read_ivar),
+	DEVMETHOD(bus_write_ivar,		mv_pcib_write_ivar),
+	DEVMETHOD(bus_alloc_resource,		mv_pcib_alloc_resource),
+	DEVMETHOD(bus_release_resource,		mv_pcib_release_resource),
 	DEVMETHOD(bus_activate_resource,	bus_generic_activate_resource),
 	DEVMETHOD(bus_deactivate_resource,	bus_generic_deactivate_resource),
 	DEVMETHOD(bus_setup_intr,		bus_generic_setup_intr),
 	DEVMETHOD(bus_teardown_intr,		bus_generic_teardown_intr),
 
 	/* pcib interface */
-	DEVMETHOD(pcib_maxslots,		pcib_mbus_maxslots),
-	DEVMETHOD(pcib_read_config,		pcib_mbus_read_config),
-	DEVMETHOD(pcib_write_config,		pcib_mbus_write_config),
-	DEVMETHOD(pcib_route_interrupt,		pcib_route_interrupt),
+	DEVMETHOD(pcib_maxslots,		mv_pcib_maxslots),
+	DEVMETHOD(pcib_read_config,		mv_pcib_read_config),
+	DEVMETHOD(pcib_write_config,		mv_pcib_write_config),
+	DEVMETHOD(pcib_route_interrupt,		mv_pcib_route_interrupt),
+
+	/* OFW bus interface */
+	DEVMETHOD(ofw_bus_get_compat,   ofw_bus_gen_get_compat),
+	DEVMETHOD(ofw_bus_get_model,    ofw_bus_gen_get_model),
+	DEVMETHOD(ofw_bus_get_name,     ofw_bus_gen_get_name),
+	DEVMETHOD(ofw_bus_get_node,     ofw_bus_gen_get_node),
+	DEVMETHOD(ofw_bus_get_type,     ofw_bus_gen_get_type),
 
 	{ 0, 0 }
 };
 
-static driver_t pcib_mbus_driver = {
+static driver_t mv_pcib_driver = {
 	"pcib",
-	pcib_mbus_methods,
-	sizeof(struct pcib_mbus_softc),
+	mv_pcib_methods,
+	sizeof(struct mv_pcib_softc),
 };
 
 devclass_t pcib_devclass;
 
-DRIVER_MODULE(pcib, mbus, pcib_mbus_driver, pcib_devclass, 0, 0);
+DRIVER_MODULE(pcib, fdtbus, mv_pcib_driver, pcib_devclass, 0, 0);
 
 static struct mtx pcicfg_mtx;
 
-static inline void
-pcib_write_irq_mask(struct pcib_mbus_softc *sc, uint32_t mask)
-{
-
-	if (!sc->sc_info->op_type != MV_TYPE_PCI)
-		return;
-
-	bus_space_write_4(sc->sc_bst, sc->sc_bsh,
-	    PCIE_REG_IRQ_MASK, mask);
-}
-
-static void
-pcib_mbus_hw_cfginit(void)
-{
-	static int opened = 0;
-
-	if (opened)
-		return;
-
-	mtx_init(&pcicfg_mtx, "pcicfg", NULL, MTX_SPIN);
-	opened = 1;
-}
-
-static uint32_t
-pcib_mbus_hw_cfgread(struct pcib_mbus_softc *sc, u_int bus, u_int slot,
-    u_int func, u_int reg, int bytes)
-{
-	uint32_t addr, data, ca, cd;
-
-	ca = (sc->sc_info->op_type != MV_TYPE_PCI) ?
-	    PCIE_REG_CFG_ADDR : PCI_REG_CFG_ADDR;
-	cd = (sc->sc_info->op_type != MV_TYPE_PCI) ?
-	    PCIE_REG_CFG_DATA : PCI_REG_CFG_DATA;
-	addr = PCI_CFG_ENA | PCI_CFG_BUS(bus) | PCI_CFG_DEV(slot) |
-	    PCI_CFG_FUN(func) | PCI_CFG_PCIE_REG(reg);
-
-	mtx_lock_spin(&pcicfg_mtx);
-	bus_space_write_4(sc->sc_bst, sc->sc_bsh, ca, addr);
-
-	data = ~0;
-	switch (bytes) {
-	case 1:
-		data = bus_space_read_1(sc->sc_bst, sc->sc_bsh,
-		    cd + (reg & 3));
-		break;
-	case 2:
-		data = le16toh(bus_space_read_2(sc->sc_bst, sc->sc_bsh,
-		    cd + (reg & 2)));
-		break;
-	case 4:
-		data = le32toh(bus_space_read_4(sc->sc_bst, sc->sc_bsh,
-		    cd));
-		break;
-	}
-	mtx_unlock_spin(&pcicfg_mtx);
-	return (data);
-}
-
-static void
-pcib_mbus_hw_cfgwrite(struct pcib_mbus_softc *sc, u_int bus, u_int slot,
-    u_int func, u_int reg, uint32_t data, int bytes)
-{
-	uint32_t addr, ca, cd;
-
-	ca = (sc->sc_info->op_type != MV_TYPE_PCI) ?
-	    PCIE_REG_CFG_ADDR : PCI_REG_CFG_ADDR;
-	cd = (sc->sc_info->op_type != MV_TYPE_PCI) ?
-	    PCIE_REG_CFG_DATA : PCI_REG_CFG_DATA;
-	addr = PCI_CFG_ENA | PCI_CFG_BUS(bus) | PCI_CFG_DEV(slot) |
-	    PCI_CFG_FUN(func) | PCI_CFG_PCIE_REG(reg);
-
-	mtx_lock_spin(&pcicfg_mtx);
-	bus_space_write_4(sc->sc_bst, sc->sc_bsh, ca, addr);
-
-	switch (bytes) {
-	case 1:
-		bus_space_write_1(sc->sc_bst, sc->sc_bsh,
-		    cd + (reg & 3), data);
-		break;
-	case 2:
-		bus_space_write_2(sc->sc_bst, sc->sc_bsh,
-		    cd + (reg & 2), htole16(data));
-		break;
-	case 4:
-		bus_space_write_4(sc->sc_bst, sc->sc_bsh,
-		    cd, htole32(data));
-		break;
-	}
-	mtx_unlock_spin(&pcicfg_mtx);
-}
-
 static int
-pcib_mbus_maxslots(device_t dev)
+mv_pcib_probe(device_t self)
 {
-	struct pcib_mbus_softc *sc = device_get_softc(dev);
+	phandle_t parnode;
 
-	return ((sc->sc_info->op_type != MV_TYPE_PCI) ? 1 : PCI_SLOTMAX);
-}
+	/*
+	 * The PCI subnode does not have the 'compatible' property, so we need
+	 * to check in the parent PCI node. However the parent is not
+	 * represented by a separate ofw_bus child, and therefore
+	 * ofw_bus_is_compatible() cannot be used, but direct fdt equivalent.
+	 */
+	parnode = OF_parent(ofw_bus_get_node(self));
+	if (parnode == 0)
+		return (ENXIO);
+	if (!(fdt_is_compatible(parnode, "mrvl,pcie") ||
+	    fdt_is_compatible(parnode, "mrvl,pci")))
+		return (ENXIO);
 
-static uint32_t
-pcib_mbus_read_config(device_t dev, u_int bus, u_int slot, u_int func,
-    u_int reg, int bytes)
-{
-	struct pcib_mbus_softc *sc = device_get_softc(dev);
+	device_set_desc(self, "Marvell Integrated PCI/PCI-E Controller");
 
-	/* Skip self */
-	if (bus == sc->sc_busnr && slot == sc->sc_devnr)
-		return (~0U);
-
-	return (pcib_mbus_hw_cfgread(sc, bus, slot, func, reg, bytes));
-}
-
-static void
-pcib_mbus_write_config(device_t dev, u_int bus, u_int slot, u_int func,
-    u_int reg, uint32_t val, int bytes)
-{
-	struct pcib_mbus_softc *sc = device_get_softc(dev);
-
-	/* Skip self */
-	if (bus == sc->sc_busnr && slot == sc->sc_devnr)
-		return;
-
-	pcib_mbus_hw_cfgwrite(sc, bus, slot, func, reg, val, bytes);
-}
-
-static void
-pcib_mbus_add_child(driver_t *driver, device_t parent, struct pcib_mbus_softc *sc)
-{
-	device_t child;
-	int error;
-
-	/* Configure CPU decoding windows */
-	error = decode_win_cpu_set(sc->sc_info->op_io_win_target,
-	    sc->sc_info->op_io_win_attr, sc->sc_info->op_io_base,
-	    sc->sc_info->op_io_size, -1);
-	if (error < 0) {
-		device_printf(parent, "Could not set up CPU decode "
-		    "window for PCI IO\n");
-		return;
-	}
-	error = decode_win_cpu_set(sc->sc_info->op_mem_win_target,
-	    sc->sc_info->op_mem_win_attr, sc->sc_info->op_mem_base,
-	    sc->sc_info->op_mem_size, -1);
-	if (error < 0) {
-		device_printf(parent, "Could not set up CPU decode "
-		    "windows for PCI MEM\n");
-		return;
-	}
-
-	/* Create driver instance */
-	child = BUS_ADD_CHILD(parent, 0, driver->name, -1);
-	bus_set_resource(child, SYS_RES_MEMORY, 0,
-	    sc->sc_info->op_base, sc->sc_info->op_size);
-	device_set_softc(child, sc);
-}
-
-static void
-pcib_mbus_identify(driver_t *driver, device_t parent)
-{
-	const struct obio_pci *info = mv_pci_info;
-	struct pcib_mbus_softc *sc;
-	uint32_t control;
-
-	while (info->op_base) {
-		sc = malloc(driver->size, M_DEVBUF, M_NOWAIT | M_ZERO);
-		if (sc == NULL) {
-			device_printf(parent, "Could not allocate pcib "
-			    "memory\n");
-			break;
-		}
-		sc->sc_info = info++;
-
-		/*
-		 * PCI bridge objects are instantiated immediately. PCI-Express
-		 * bridges require more complicated handling depending on
-		 * platform configuration.
-		 */
-		if (sc->sc_info->op_type == MV_TYPE_PCI) {
-			pcib_mbus_add_child(driver, parent, sc);
-			continue;
-		}
-
-		/*
-		 * Read link configuration
-		 */
-		sc->sc_rid = 0;
-		sc->sc_res = BUS_ALLOC_RESOURCE(parent, parent, SYS_RES_MEMORY,
-		    &sc->sc_rid, sc->sc_info->op_base, sc->sc_info->op_base +
-		    sc->sc_info->op_size - 1, sc->sc_info->op_size,
-		    RF_ACTIVE);
-		if (sc->sc_res == NULL) {
-			device_printf(parent, "Could not map pcib memory\n");
-			break;
-		}
-
-		sc->sc_bst = rman_get_bustag(sc->sc_res);
-		sc->sc_bsh = rman_get_bushandle(sc->sc_res);
-
-		control = bus_space_read_4(sc->sc_bst, sc->sc_bsh,
-		    PCIE_REG_CONTROL);
-
-		BUS_RELEASE_RESOURCE(parent, parent, SYS_RES_MEMORY, sc->sc_rid,
-		    sc->sc_res);
-
-		/*
-		 * If this PCI-E port (controller) is configured (by the
-		 * underlying firmware) with lane width other than 1x, there
-		 * are auxiliary resources defined for aggregating more width
-		 * on our lane. Skip all such entries as they are not
-		 * standalone ports and must not have a device object
-		 * instantiated.
-		 */
-		if ((control & PCIE_CTRL_LINK1X) == 0)
-			while (info->op_base &&
-			    info->op_type == MV_TYPE_PCIE_AGGR_LANE)
-				info++;
-
-		pcib_mbus_add_child(driver, parent, sc);
-	}
+	return (BUS_PROBE_DEFAULT);
 }
 
 static int

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

From owner-p4-projects@FreeBSD.ORG  Thu Apr  1 06:31:02 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BA2CE1065672; Thu,  1 Apr 2010 06:31:02 +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 7219D106564A
	for ; Thu,  1 Apr 2010 06:31:02 +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 5DE168FC12
	for ; Thu,  1 Apr 2010 06:31:02 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o316V2rB097618
	for ; Thu, 1 Apr 2010 06:31:02 GMT
	(envelope-from raj@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o316V0r8097610
	for perforce@freebsd.org; Thu, 1 Apr 2010 06:31:00 GMT
	(envelope-from raj@freebsd.org)
Date: Thu, 1 Apr 2010 06:31:00 GMT
Message-Id: <201004010631.o316V0r8097610@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 176393 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 01 Apr 2010 06:31:03 -0000

http://p4web.freebsd.org/chv.cgi?CH=176393

Change 176393 by raj@raj_fdt on 2010/04/01 06:30:08

	IFC @176349

Affected files ...

.. //depot/projects/fdt/MAINTAINERS#5 integrate
.. //depot/projects/fdt/Makefile#7 integrate
.. //depot/projects/fdt/Makefile.inc1#13 integrate
.. //depot/projects/fdt/ObsoleteFiles.inc#11 integrate
.. //depot/projects/fdt/bin/cp/utils.c#3 integrate
.. //depot/projects/fdt/bin/ls/cmp.c#2 integrate
.. //depot/projects/fdt/bin/pax/Makefile#3 integrate
.. //depot/projects/fdt/bin/pax/cpio.1#2 delete
.. //depot/projects/fdt/bin/pax/getoldopt.c#2 integrate
.. //depot/projects/fdt/bin/pax/tar.1#2 delete
.. //depot/projects/fdt/bin/ps/extern.h#2 integrate
.. //depot/projects/fdt/bin/ps/keyword.c#4 integrate
.. //depot/projects/fdt/bin/ps/print.c#2 integrate
.. //depot/projects/fdt/bin/ps/ps.1#3 integrate
.. //depot/projects/fdt/bin/rcp/rcp.c#2 integrate
.. //depot/projects/fdt/bin/test/test.c#2 integrate
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/zpool/zpool.8#2 integrate
.. //depot/projects/fdt/contrib/bind9/CHANGES#5 integrate
.. //depot/projects/fdt/contrib/bind9/bin/named/server.c#3 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/Bv9ARM.pdf#4 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/man.dig.html#3 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html#3 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html#3 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/man.dnssec-keygen.html#3 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/man.dnssec-signzone.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/man.host.html#3 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/man.named-checkconf.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/man.named-checkzone.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/man.named.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/man.nsupdate.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/man.rndc-confgen.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/man.rndc.conf.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/man.rndc.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/api#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/include/dns/resolver.h#2 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/include/dns/result.h#2 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/ncache.c#2 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/rbtdb.c#5 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/rdatalist.c#2 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/rdataset.c#2 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/rdataslab.c#2 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/resolver.c#5 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/result.c#2 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/sdb.c#3 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/sdlz.c#3 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/validator.c#5 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/view.c#3 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_buffer.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_config.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_context.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_gabn.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_gethostent.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_getipnode.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_gnba.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_inetntop.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_noop.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_packet.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_resutil.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/version#5 integrate
.. //depot/projects/fdt/contrib/bsnmp/gensnmpdef/gensnmpdef.c#2 integrate
.. //depot/projects/fdt/contrib/bsnmp/snmpd/config.c#2 integrate
.. //depot/projects/fdt/contrib/cpio/ABOUT-NLS#2 delete
.. //depot/projects/fdt/contrib/cpio/AUTHORS#2 delete
.. //depot/projects/fdt/contrib/cpio/COPYING#2 delete
.. //depot/projects/fdt/contrib/cpio/ChangeLog#2 delete
.. //depot/projects/fdt/contrib/cpio/FREEBSD-upgrade#2 delete
.. //depot/projects/fdt/contrib/cpio/INSTALL#2 delete
.. //depot/projects/fdt/contrib/cpio/NEWS#2 delete
.. //depot/projects/fdt/contrib/cpio/README#2 delete
.. //depot/projects/fdt/contrib/cpio/THANKS#2 delete
.. //depot/projects/fdt/contrib/cpio/TODO#2 delete
.. //depot/projects/fdt/contrib/cpio/doc/cpio.1#2 delete
.. //depot/projects/fdt/contrib/cpio/doc/cpio.texi#2 delete
.. //depot/projects/fdt/contrib/cpio/doc/version.texi#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/alloca_.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/argp-ba.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/argp-eexst.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/argp-fmtstream.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/argp-fmtstream.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/argp-fs-xinl.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/argp-help.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/argp-namefrob.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/argp-parse.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/argp-pin.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/argp-pv.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/argp-pvh.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/argp-xinl.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/argp.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/basename.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/dirname.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/dirname.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/error.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/error.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/exitfail.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/exitfail.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/fatal.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/full-write.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/full-write.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/getopt.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/getopt1.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/getopt_.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/getopt_int.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/gettext.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/hash.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/hash.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/intprops.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/inttostr.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/inttostr.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/mempcpy.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/paxerror.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/paxexit.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/paxlib.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/paxnames.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/quote.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/quote.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/quotearg.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/quotearg.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/rmt-command.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/rmt.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/rtapelib.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/safe-read.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/safe-read.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/safe-write.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/safe-write.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/savedir.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/savedir.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/strchrnul.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/stripslash.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/strndup.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/strnlen.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/system-ioctl.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/system.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/umaxtostr.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/unlocked-io.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/utimens.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/utimens.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/xalloc-die.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/xalloc.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/xmalloc.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/xstrndup.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/xstrndup.h#2 delete
.. //depot/projects/fdt/contrib/cpio/src/copyin.c#2 delete
.. //depot/projects/fdt/contrib/cpio/src/copyout.c#2 delete
.. //depot/projects/fdt/contrib/cpio/src/copypass.c#2 delete
.. //depot/projects/fdt/contrib/cpio/src/cpio.h#2 delete
.. //depot/projects/fdt/contrib/cpio/src/cpiohdr.h#2 delete
.. //depot/projects/fdt/contrib/cpio/src/defer.c#2 delete
.. //depot/projects/fdt/contrib/cpio/src/defer.h#2 delete
.. //depot/projects/fdt/contrib/cpio/src/dstring.c#2 delete
.. //depot/projects/fdt/contrib/cpio/src/dstring.h#2 delete
.. //depot/projects/fdt/contrib/cpio/src/extern.h#2 delete
.. //depot/projects/fdt/contrib/cpio/src/filemode.c#2 delete
.. //depot/projects/fdt/contrib/cpio/src/filetypes.h#2 delete
.. //depot/projects/fdt/contrib/cpio/src/global.c#2 delete
.. //depot/projects/fdt/contrib/cpio/src/idcache.c#2 delete
.. //depot/projects/fdt/contrib/cpio/src/main.c#2 delete
.. //depot/projects/fdt/contrib/cpio/src/makepath.c#2 delete
.. //depot/projects/fdt/contrib/cpio/src/safe-stat.h#2 delete
.. //depot/projects/fdt/contrib/cpio/src/tar.c#2 delete
.. //depot/projects/fdt/contrib/cpio/src/tar.h#2 delete
.. //depot/projects/fdt/contrib/cpio/src/tarhdr.h#2 delete
.. //depot/projects/fdt/contrib/cpio/src/userspec.c#2 delete
.. //depot/projects/fdt/contrib/cpio/src/util.c#2 delete
.. //depot/projects/fdt/contrib/netcat/FREEBSD-upgrade#2 integrate
.. //depot/projects/fdt/contrib/netcat/FREEBSD-vendor#4 integrate
.. //depot/projects/fdt/contrib/netcat/nc.1#3 integrate
.. //depot/projects/fdt/contrib/netcat/netcat.c#3 integrate
.. //depot/projects/fdt/contrib/openpam/include/security/pam_appl.h#2 integrate
.. //depot/projects/fdt/contrib/tzdata/antarctica#2 integrate
.. //depot/projects/fdt/contrib/tzdata/asia#3 integrate
.. //depot/projects/fdt/contrib/tzdata/australasia#3 integrate
.. //depot/projects/fdt/contrib/tzdata/zone.tab#2 integrate
.. //depot/projects/fdt/etc/Makefile#5 integrate
.. //depot/projects/fdt/etc/defaults/periodic.conf#2 integrate
.. //depot/projects/fdt/gnu/usr.bin/Makefile#5 integrate
.. //depot/projects/fdt/gnu/usr.bin/cpio/Makefile#2 delete
.. //depot/projects/fdt/gnu/usr.bin/cpio/config.h#2 delete
.. //depot/projects/fdt/gnu/usr.bin/cpio/doc/Makefile#2 delete
.. //depot/projects/fdt/gnu/usr.bin/diff/context.c.diff#2 integrate
.. //depot/projects/fdt/gnu/usr.bin/diff/diff.c.diff#2 integrate
.. //depot/projects/fdt/gnu/usr.bin/gdb/Makefile#3 integrate
.. //depot/projects/fdt/gnu/usr.bin/gdb/Makefile.inc#2 integrate
.. //depot/projects/fdt/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h#2 integrate
.. //depot/projects/fdt/gnu/usr.bin/gdb/kgdb/trgt_ia64.c#2 integrate
.. //depot/projects/fdt/include/dlfcn.h#3 integrate
.. //depot/projects/fdt/include/inttypes.h#2 integrate
.. //depot/projects/fdt/lib/bind/config.h#4 integrate
.. //depot/projects/fdt/lib/csu/i386-elf/Makefile#4 integrate
.. //depot/projects/fdt/lib/libc/gen/dlfcn.c#2 integrate
.. //depot/projects/fdt/lib/libc/gen/dlopen.3#2 integrate
.. //depot/projects/fdt/lib/libc/gen/opendir.c#4 integrate
.. //depot/projects/fdt/lib/libc/posix1e/acl_to_text_nfs4.c#2 integrate
.. //depot/projects/fdt/lib/libc/sparc64/fpu/fpu.c#3 integrate
.. //depot/projects/fdt/lib/libc/sparc64/fpu/fpu_div.c#2 integrate
.. //depot/projects/fdt/lib/libc/sparc64/fpu/fpu_explode.c#2 integrate
.. //depot/projects/fdt/lib/libc/sparc64/fpu/fpu_extern.h#3 integrate
.. //depot/projects/fdt/lib/libc/sparc64/fpu/fpu_implode.c#2 integrate
.. //depot/projects/fdt/lib/libc/sys/mmap.2#3 integrate
.. //depot/projects/fdt/lib/libc/sys/open.2#2 integrate
.. //depot/projects/fdt/lib/libc/sys/stat.2#2 integrate
.. //depot/projects/fdt/lib/libpmc/pmc.xscale.3#2 integrate
.. //depot/projects/fdt/lib/libstand/assert.c#2 integrate
.. //depot/projects/fdt/lib/libstand/bzipfs.c#4 integrate
.. //depot/projects/fdt/lib/libstand/gzipfs.c#3 integrate
.. //depot/projects/fdt/lib/libusbhid/data.c#2 integrate
.. //depot/projects/fdt/lib/libusbhid/descr.c#2 integrate
.. //depot/projects/fdt/lib/libusbhid/parse.c#2 integrate
.. //depot/projects/fdt/lib/libusbhid/usage.c#2 integrate
.. //depot/projects/fdt/lib/libusbhid/usbhid.h#2 integrate
.. //depot/projects/fdt/lib/libusbhid/usbvar.h#2 integrate
.. //depot/projects/fdt/lib/libz/ChangeLog#2 integrate
.. //depot/projects/fdt/lib/libz/FAQ#2 integrate
.. //depot/projects/fdt/lib/libz/Makefile#3 integrate
.. //depot/projects/fdt/lib/libz/README#2 integrate
.. //depot/projects/fdt/lib/libz/Symbol.map#1 branch
.. //depot/projects/fdt/lib/libz/Versions.def#1 branch
.. //depot/projects/fdt/lib/libz/adler32.c#2 integrate
.. //depot/projects/fdt/lib/libz/algorithm.txt#2 delete
.. //depot/projects/fdt/lib/libz/compress.c#2 integrate
.. //depot/projects/fdt/lib/libz/contrib/README.contrib#1 branch
.. //depot/projects/fdt/lib/libz/contrib/asm686/README.686#1 branch
.. //depot/projects/fdt/lib/libz/contrib/asm686/match.S#1 branch
.. //depot/projects/fdt/lib/libz/contrib/gcc_gvmat64/gvmat64.S#1 branch
.. //depot/projects/fdt/lib/libz/crc32.c#2 integrate
.. //depot/projects/fdt/lib/libz/deflate.c#2 integrate
.. //depot/projects/fdt/lib/libz/deflate.h#2 integrate
.. //depot/projects/fdt/lib/libz/doc/algorithm.txt#1 branch
.. //depot/projects/fdt/lib/libz/doc/rfc1950.txt#1 branch
.. //depot/projects/fdt/lib/libz/doc/rfc1951.txt#1 branch
.. //depot/projects/fdt/lib/libz/doc/rfc1952.txt#1 branch
.. //depot/projects/fdt/lib/libz/doc/txtvsbin.txt#1 branch
.. //depot/projects/fdt/lib/libz/example.c#2 integrate
.. //depot/projects/fdt/lib/libz/gzclose.c#1 branch
.. //depot/projects/fdt/lib/libz/gzguts.h#1 branch
.. //depot/projects/fdt/lib/libz/gzio.c#2 delete
.. //depot/projects/fdt/lib/libz/gzlib.c#1 branch
.. //depot/projects/fdt/lib/libz/gzread.c#1 branch
.. //depot/projects/fdt/lib/libz/gzwrite.c#1 branch
.. //depot/projects/fdt/lib/libz/infback.c#2 integrate
.. //depot/projects/fdt/lib/libz/inffast.c#2 integrate
.. //depot/projects/fdt/lib/libz/inflate.c#2 integrate
.. //depot/projects/fdt/lib/libz/inflate.h#2 integrate
.. //depot/projects/fdt/lib/libz/inftrees.c#2 integrate
.. //depot/projects/fdt/lib/libz/inftrees.h#2 integrate
.. //depot/projects/fdt/lib/libz/minigzip.c#2 integrate
.. //depot/projects/fdt/lib/libz/trees.c#2 integrate
.. //depot/projects/fdt/lib/libz/uncompr.c#2 integrate
.. //depot/projects/fdt/lib/libz/zconf.h#2 integrate
.. //depot/projects/fdt/lib/libz/zlib.3#2 integrate
.. //depot/projects/fdt/lib/libz/zlib.h#2 integrate
.. //depot/projects/fdt/lib/libz/zutil.c#2 integrate
.. //depot/projects/fdt/lib/libz/zutil.h#2 integrate
.. //depot/projects/fdt/libexec/ftpd/popen.c#2 integrate
.. //depot/projects/fdt/libexec/rtld-elf/rtld.c#6 integrate
.. //depot/projects/fdt/sbin/geom/class/multipath/geom_multipath.c#3 integrate
.. //depot/projects/fdt/sbin/hastd/primary.c#2 integrate
.. //depot/projects/fdt/sbin/ifconfig/ifieee80211.c#4 integrate
.. //depot/projects/fdt/sbin/ipfw/ipfw.8#5 integrate
.. //depot/projects/fdt/sbin/ipfw/ipfw2.c#5 integrate
.. //depot/projects/fdt/sbin/setkey/setkey.8#3 integrate
.. //depot/projects/fdt/share/dict/web2#2 integrate
.. //depot/projects/fdt/share/man/man3/pthread_affinity_np.3#3 integrate
.. //depot/projects/fdt/share/man/man4/ath.4#3 integrate
.. //depot/projects/fdt/share/man/man5/src.conf.5#3 integrate
.. //depot/projects/fdt/share/man/man9/ieee80211.9#2 integrate
.. //depot/projects/fdt/share/man/man9/ieee80211_crypto.9#2 integrate
.. //depot/projects/fdt/share/man/man9/ieee80211_node.9#2 integrate
.. //depot/projects/fdt/share/man/man9/ieee80211_output.9#2 integrate
.. //depot/projects/fdt/share/man/man9/ieee80211_scan.9#3 integrate
.. //depot/projects/fdt/share/man/man9/uio.9#2 integrate
.. //depot/projects/fdt/share/man/man9/vfs_mount.9#2 integrate
.. //depot/projects/fdt/share/misc/bsd-family-tree#4 integrate
.. //depot/projects/fdt/share/mk/bsd.own.mk#6 integrate
.. //depot/projects/fdt/sys/amd64/acpica/acpi_machdep.c#2 integrate
.. //depot/projects/fdt/sys/amd64/amd64/apic_vector.S#2 integrate
.. //depot/projects/fdt/sys/amd64/amd64/local_apic.c#4 integrate
.. //depot/projects/fdt/sys/amd64/amd64/machdep.c#5 integrate
.. //depot/projects/fdt/sys/amd64/amd64/mca.c#5 integrate
.. //depot/projects/fdt/sys/amd64/amd64/pmap.c#8 integrate
.. //depot/projects/fdt/sys/amd64/ia32/ia32_signal.c#2 integrate
.. //depot/projects/fdt/sys/amd64/include/apicvar.h#4 integrate
.. //depot/projects/fdt/sys/amd64/include/reg.h#3 integrate
.. //depot/projects/fdt/sys/amd64/include/specialreg.h#4 integrate
.. //depot/projects/fdt/sys/amd64/linux32/linux.h#2 integrate
.. //depot/projects/fdt/sys/amd64/linux32/linux32_sysvec.c#3 integrate
.. //depot/projects/fdt/sys/arm/arm/machdep.c#3 integrate
.. //depot/projects/fdt/sys/arm/arm/pmap.c#3 integrate
.. //depot/projects/fdt/sys/arm/conf/KB920X#4 integrate
.. //depot/projects/fdt/sys/arm/conf/LN2410SBC#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/board_ln2410sbc.c#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/files.s3c2xx0#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/s3c2410reg.h#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/s3c2410var.h#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/s3c2440reg.h#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/s3c24x0.c#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/s3c24x0_clk.c#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/s3c24x0_machdep.c#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/s3c24x0reg.h#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/s3c24x0var.h#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/s3c2xx0_space.c#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/s3c2xx0board.h#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/s3c2xx0reg.h#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/s3c2xx0var.h#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/std.ln2410sbc#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/std.s3c2410#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/uart_bus_s3c2410.c#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/uart_cpu_s3c2410.c#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/uart_dev_s3c2410.c#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/uart_dev_s3c2410.h#1 branch
.. //depot/projects/fdt/sys/arm/xscale/ixp425/cambria_fled.c#4 integrate
.. //depot/projects/fdt/sys/boot/i386/boot2/boot2.c#2 integrate
.. //depot/projects/fdt/sys/boot/i386/gptboot/gptboot.c#3 integrate
.. //depot/projects/fdt/sys/boot/i386/zfsboot/zfsboot.c#4 integrate
.. //depot/projects/fdt/sys/cam/scsi/scsi_sg.c#3 integrate
.. //depot/projects/fdt/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate
.. //depot/projects/fdt/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 integrate
.. //depot/projects/fdt/sys/compat/freebsd32/freebsd32.h#3 integrate
.. //depot/projects/fdt/sys/compat/freebsd32/freebsd32_ipc.h#2 integrate
.. //depot/projects/fdt/sys/compat/freebsd32/freebsd32_misc.c#3 integrate
.. //depot/projects/fdt/sys/compat/freebsd32/freebsd32_proto.h#5 integrate
.. //depot/projects/fdt/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate
.. //depot/projects/fdt/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate
.. //depot/projects/fdt/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate
.. //depot/projects/fdt/sys/compat/freebsd32/freebsd32_util.h#3 integrate
.. //depot/projects/fdt/sys/compat/freebsd32/syscalls.master#5 integrate
.. //depot/projects/fdt/sys/compat/ia32/ia32_signal.h#2 integrate
.. //depot/projects/fdt/sys/compat/linprocfs/linprocfs.c#3 integrate
.. //depot/projects/fdt/sys/compat/linux/linux_file.c#3 integrate
.. //depot/projects/fdt/sys/compat/linux/linux_ioctl.c#5 integrate
.. //depot/projects/fdt/sys/compat/linux/linux_stats.c#3 integrate
.. //depot/projects/fdt/sys/compat/svr4/svr4_stat.c#2 integrate
.. //depot/projects/fdt/sys/compat/x86bios/x86bios.c#3 integrate
.. //depot/projects/fdt/sys/conf/NOTES#13 integrate
.. //depot/projects/fdt/sys/conf/files#21 integrate
.. //depot/projects/fdt/sys/conf/kern.post.mk#2 integrate
.. //depot/projects/fdt/sys/conf/kmod.mk#3 integrate
.. //depot/projects/fdt/sys/conf/options#9 integrate
.. //depot/projects/fdt/sys/dev/ahci/ahci.c#11 integrate
.. //depot/projects/fdt/sys/dev/ata/ata-all.h#5 integrate
.. //depot/projects/fdt/sys/dev/ata/ata-raid.c#5 integrate
.. //depot/projects/fdt/sys/dev/bce/if_bce.c#4 integrate
.. //depot/projects/fdt/sys/dev/bce/if_bcefw.h#2 integrate
.. //depot/projects/fdt/sys/dev/bce/if_bcereg.h#3 integrate
.. //depot/projects/fdt/sys/dev/bge/if_bge.c#12 integrate
.. //depot/projects/fdt/sys/dev/bktr/ioctl_bt848.h#2 integrate
.. //depot/projects/fdt/sys/dev/bktr/ioctl_meteor.h#2 integrate
.. //depot/projects/fdt/sys/dev/cxgb/common/cxgb_ael1002.c#4 integrate
.. //depot/projects/fdt/sys/dev/cxgb/common/cxgb_common.h#4 integrate
.. //depot/projects/fdt/sys/dev/cxgb/common/cxgb_t3_hw.c#4 integrate
.. //depot/projects/fdt/sys/dev/cxgb/cxgb_adapter.h#4 integrate
.. //depot/projects/fdt/sys/dev/cxgb/cxgb_main.c#7 integrate
.. //depot/projects/fdt/sys/dev/cxgb/cxgb_sge.c#6 integrate
.. //depot/projects/fdt/sys/dev/e1000/e1000_80003es2lan.c#4 integrate
.. //depot/projects/fdt/sys/dev/e1000/e1000_82571.c#4 integrate
.. //depot/projects/fdt/sys/dev/e1000/e1000_82575.c#4 integrate
.. //depot/projects/fdt/sys/dev/e1000/e1000_82575.h#4 integrate
.. //depot/projects/fdt/sys/dev/e1000/e1000_defines.h#4 integrate
.. //depot/projects/fdt/sys/dev/e1000/e1000_hw.h#4 integrate
.. //depot/projects/fdt/sys/dev/e1000/e1000_ich8lan.c#4 integrate
.. //depot/projects/fdt/sys/dev/e1000/e1000_ich8lan.h#4 integrate
.. //depot/projects/fdt/sys/dev/e1000/e1000_mac.c#4 integrate
.. //depot/projects/fdt/sys/dev/e1000/e1000_manage.c#4 integrate
.. //depot/projects/fdt/sys/dev/e1000/e1000_phy.c#4 integrate
.. //depot/projects/fdt/sys/dev/e1000/e1000_regs.h#4 integrate
.. //depot/projects/fdt/sys/dev/e1000/if_em.c#7 integrate
.. //depot/projects/fdt/sys/dev/e1000/if_em.h#4 integrate
.. //depot/projects/fdt/sys/dev/e1000/if_igb.c#8 integrate
.. //depot/projects/fdt/sys/dev/e1000/if_igb.h#4 integrate
.. //depot/projects/fdt/sys/dev/e1000/if_lem.c#1 branch
.. //depot/projects/fdt/sys/dev/e1000/if_lem.h#1 branch
.. //depot/projects/fdt/sys/dev/fb/vesa.c#8 integrate
.. //depot/projects/fdt/sys/dev/fb/vga.c#3 integrate
.. //depot/projects/fdt/sys/dev/firewire/sbp.c#3 integrate
.. //depot/projects/fdt/sys/dev/hwpmc/hwpmc_logging.c#4 integrate
.. //depot/projects/fdt/sys/dev/isp/isp.c#7 integrate
.. //depot/projects/fdt/sys/dev/isp/isp_freebsd.c#5 integrate
.. //depot/projects/fdt/sys/dev/isp/isp_freebsd.h#3 integrate
.. //depot/projects/fdt/sys/dev/isp/isp_library.c#6 integrate
.. //depot/projects/fdt/sys/dev/isp/isp_pci.c#4 integrate
.. //depot/projects/fdt/sys/dev/isp/isp_sbus.c#4 integrate
.. //depot/projects/fdt/sys/dev/isp/ispvar.h#3 integrate
.. //depot/projects/fdt/sys/dev/ixgbe/LICENSE#2 integrate
.. //depot/projects/fdt/sys/dev/ixgbe/ixgbe.c#6 integrate
.. //depot/projects/fdt/sys/dev/ixgbe/ixgbe.h#3 integrate
.. //depot/projects/fdt/sys/dev/ixgbe/ixgbe_82598.c#3 integrate
.. //depot/projects/fdt/sys/dev/ixgbe/ixgbe_82599.c#3 integrate
.. //depot/projects/fdt/sys/dev/ixgbe/ixgbe_api.c#3 integrate
.. //depot/projects/fdt/sys/dev/ixgbe/ixgbe_api.h#3 integrate
.. //depot/projects/fdt/sys/dev/ixgbe/ixgbe_common.c#3 integrate
.. //depot/projects/fdt/sys/dev/ixgbe/ixgbe_phy.c#3 integrate
.. //depot/projects/fdt/sys/dev/ixgbe/ixgbe_phy.h#3 integrate
.. //depot/projects/fdt/sys/dev/ixgbe/ixgbe_type.h#3 integrate
.. //depot/projects/fdt/sys/dev/malo/if_malo.c#4 integrate
.. //depot/projects/fdt/sys/dev/mii/brgphy.c#6 integrate
.. //depot/projects/fdt/sys/dev/mii/brgphyreg.h#2 integrate
.. //depot/projects/fdt/sys/dev/mii/mii.c#3 integrate
.. //depot/projects/fdt/sys/dev/mii/miidevs#6 integrate
.. //depot/projects/fdt/sys/dev/mpt/mpt_cam.c#3 integrate
.. //depot/projects/fdt/sys/dev/mxge/if_mxge.c#7 integrate
.. //depot/projects/fdt/sys/dev/ofw/ofw_standard.c#3 integrate
.. //depot/projects/fdt/sys/dev/ppc/ppc_pci.c#2 integrate
.. //depot/projects/fdt/sys/dev/siis/siis.c#10 integrate
.. //depot/projects/fdt/sys/dev/sound/pci/envy24.c#2 integrate
.. //depot/projects/fdt/sys/dev/sound/pci/envy24.h#2 integrate
.. //depot/projects/fdt/sys/dev/sound/pci/envy24ht.c#2 integrate
.. //depot/projects/fdt/sys/dev/sound/pci/envy24ht.h#2 integrate
.. //depot/projects/fdt/sys/dev/sound/pci/hda/hdac.c#8 integrate
.. //depot/projects/fdt/sys/dev/sound/pci/spicds.c#2 integrate
.. //depot/projects/fdt/sys/dev/sound/pci/spicds.h#2 integrate
.. //depot/projects/fdt/sys/dev/sound/pcm/dsp.c#4 integrate
.. //depot/projects/fdt/sys/dev/syscons/scvgarndr.c#2 integrate
.. //depot/projects/fdt/sys/dev/syscons/scvidctl.c#4 integrate
.. //depot/projects/fdt/sys/dev/syscons/syscons.c#5 integrate
.. //depot/projects/fdt/sys/dev/ubsec/ubsec.c#2 integrate
.. //depot/projects/fdt/sys/dev/usb/controller/ehci_pci.c#7 integrate
.. //depot/projects/fdt/sys/dev/usb/controller/ohci_pci.c#4 integrate
.. //depot/projects/fdt/sys/dev/usb/controller/ohci_s3c24x0.c#1 branch
.. //depot/projects/fdt/sys/dev/usb/input/ukbd.c#7 integrate
.. //depot/projects/fdt/sys/dev/usb/quirk/usb_quirk.c#7 integrate
.. //depot/projects/fdt/sys/dev/usb/usb_compat_linux.c#3 integrate
.. //depot/projects/fdt/sys/dev/usb/usbdevs#12 integrate
.. //depot/projects/fdt/sys/fs/nfs/nfs_commonport.c#3 integrate
.. //depot/projects/fdt/sys/fs/nfs/nfs_commonsubs.c#3 integrate
.. //depot/projects/fdt/sys/fs/nfs/nfs_var.h#5 integrate
.. //depot/projects/fdt/sys/fs/nfs/nfsport.h#3 integrate
.. //depot/projects/fdt/sys/fs/nfs/nfsrvstate.h#2 integrate
.. //depot/projects/fdt/sys/fs/nfsserver/nfs_nfsdport.c#5 integrate
.. //depot/projects/fdt/sys/fs/nfsserver/nfs_nfsdstate.c#4 integrate
.. //depot/projects/fdt/sys/geom/gate/g_gate.c#4 integrate
.. //depot/projects/fdt/sys/geom/geom_dump.c#3 integrate
.. //depot/projects/fdt/sys/geom/geom_io.c#3 integrate
.. //depot/projects/fdt/sys/geom/geom_vfs.c#2 integrate
.. //depot/projects/fdt/sys/geom/multipath/g_multipath.c#3 integrate
.. //depot/projects/fdt/sys/i386/acpica/acpi_machdep.c#2 integrate
.. //depot/projects/fdt/sys/i386/conf/GENERIC#7 integrate
.. //depot/projects/fdt/sys/i386/i386/apic_vector.s#2 integrate
.. //depot/projects/fdt/sys/i386/i386/local_apic.c#4 integrate
.. //depot/projects/fdt/sys/i386/i386/machdep.c#4 integrate
.. //depot/projects/fdt/sys/i386/i386/mca.c#5 integrate
.. //depot/projects/fdt/sys/i386/i386/pmap.c#10 integrate
.. //depot/projects/fdt/sys/i386/i386/trap.c#5 integrate
.. //depot/projects/fdt/sys/i386/ibcs2/ibcs2_stat.c#2 integrate
.. //depot/projects/fdt/sys/i386/include/apicvar.h#4 integrate
.. //depot/projects/fdt/sys/i386/include/md_var.h#2 integrate
.. //depot/projects/fdt/sys/i386/include/specialreg.h#4 integrate
.. //depot/projects/fdt/sys/i386/linux/linux.h#2 integrate
.. //depot/projects/fdt/sys/i386/linux/linux_sysvec.c#2 integrate
.. //depot/projects/fdt/sys/ia64/conf/GENERIC#6 integrate
.. //depot/projects/fdt/sys/ia64/ia32/ia32_signal.c#2 integrate
.. //depot/projects/fdt/sys/ia64/ia64/autoconf.c#2 integrate
.. //depot/projects/fdt/sys/ia64/ia64/clock.c#4 integrate
.. //depot/projects/fdt/sys/ia64/ia64/db_machdep.c#3 integrate
.. //depot/projects/fdt/sys/ia64/ia64/exception.S#7 integrate
.. //depot/projects/fdt/sys/ia64/ia64/highfp.c#2 integrate
.. //depot/projects/fdt/sys/ia64/ia64/interrupt.c#8 integrate
.. //depot/projects/fdt/sys/ia64/ia64/locore.S#3 integrate
.. //depot/projects/fdt/sys/ia64/ia64/machdep.c#9 integrate
.. //depot/projects/fdt/sys/ia64/ia64/mp_machdep.c#5 integrate
.. //depot/projects/fdt/sys/ia64/ia64/nexus.c#5 integrate
.. //depot/projects/fdt/sys/ia64/ia64/pmap.c#5 integrate
.. //depot/projects/fdt/sys/ia64/ia64/sal.c#2 integrate
.. //depot/projects/fdt/sys/ia64/ia64/sapic.c#4 integrate
.. //depot/projects/fdt/sys/ia64/ia64/trap.c#6 integrate
.. //depot/projects/fdt/sys/ia64/include/acpica_machdep.h#2 integrate
.. //depot/projects/fdt/sys/ia64/include/clock.h#3 integrate
.. //depot/projects/fdt/sys/ia64/include/cpufunc.h#4 integrate
.. //depot/projects/fdt/sys/ia64/include/frame.h#2 integrate
.. //depot/projects/fdt/sys/ia64/include/intr.h#4 integrate
.. //depot/projects/fdt/sys/ia64/include/intrcnt.h#2 integrate
.. //depot/projects/fdt/sys/ia64/include/nexusvar.h#2 delete
.. //depot/projects/fdt/sys/ia64/include/pcb.h#2 integrate
.. //depot/projects/fdt/sys/ia64/include/pcpu.h#4 integrate
.. //depot/projects/fdt/sys/ia64/include/smp.h#2 integrate
.. //depot/projects/fdt/sys/ia64/pci/pci_cfgreg.c#3 integrate
.. //depot/projects/fdt/sys/kern/imgact_elf.c#4 integrate
.. //depot/projects/fdt/sys/kern/kern_alq.c#2 integrate
.. //depot/projects/fdt/sys/kern/kern_event.c#4 integrate
.. //depot/projects/fdt/sys/kern/kern_exec.c#2 integrate
.. //depot/projects/fdt/sys/kern/kern_rwlock.c#2 integrate
.. //depot/projects/fdt/sys/kern/kern_syscalls.c#2 integrate
.. //depot/projects/fdt/sys/kern/subr_eventhandler.c#3 integrate
.. //depot/projects/fdt/sys/kern/sys_pipe.c#2 integrate
.. //depot/projects/fdt/sys/kern/sysv_ipc.c#2 integrate
.. //depot/projects/fdt/sys/kern/sysv_msg.c#2 integrate
.. //depot/projects/fdt/sys/kern/sysv_sem.c#2 integrate
.. //depot/projects/fdt/sys/kern/sysv_shm.c#2 integrate
.. //depot/projects/fdt/sys/kern/tty_pts.c#4 integrate
.. //depot/projects/fdt/sys/kern/uipc_mqueue.c#2 integrate
.. //depot/projects/fdt/sys/kern/uipc_sem.c#3 integrate
.. //depot/projects/fdt/sys/kern/uipc_shm.c#2 integrate
.. //depot/projects/fdt/sys/kern/uipc_syscalls.c#5 integrate
.. //depot/projects/fdt/sys/kern/vfs_aio.c#3 integrate
.. //depot/projects/fdt/sys/kern/vfs_lookup.c#4 integrate
.. //depot/projects/fdt/sys/kern/vfs_syscalls.c#7 integrate
.. //depot/projects/fdt/sys/kern/vfs_vnops.c#4 integrate
.. //depot/projects/fdt/sys/mips/conf/AR71XX#5 integrate
.. //depot/projects/fdt/sys/mips/include/clock.h#2 integrate
.. //depot/projects/fdt/sys/mips/include/cpufunc.h#4 integrate
.. //depot/projects/fdt/sys/mips/include/db_machdep.h#3 integrate
.. //depot/projects/fdt/sys/mips/include/trap.h#4 integrate
.. //depot/projects/fdt/sys/mips/mips/db_trace.c#5 integrate
.. //depot/projects/fdt/sys/mips/mips/exception.S#8 integrate
.. //depot/projects/fdt/sys/mips/mips/nexus.c#4 integrate
.. //depot/projects/fdt/sys/mips/mips/pm_machdep.c#3 integrate
.. //depot/projects/fdt/sys/mips/mips/pmap.c#8 integrate
.. //depot/projects/fdt/sys/mips/mips/support.S#4 integrate
.. //depot/projects/fdt/sys/mips/mips/tick.c#5 integrate
.. //depot/projects/fdt/sys/mips/mips/trap.c#6 integrate
.. //depot/projects/fdt/sys/mips/sibyte/sb_asm.S#3 integrate
.. //depot/projects/fdt/sys/mips/sibyte/sb_machdep.c#5 integrate
.. //depot/projects/fdt/sys/mips/sibyte/sb_scd.c#3 integrate
.. //depot/projects/fdt/sys/mips/sibyte/sb_scd.h#3 integrate
.. //depot/projects/fdt/sys/modules/Makefile#8 integrate
.. //depot/projects/fdt/sys/modules/alq/Makefile#1 branch
.. //depot/projects/fdt/sys/modules/dummynet/Makefile#2 integrate
.. //depot/projects/fdt/sys/modules/em/Makefile#2 integrate
.. //depot/projects/fdt/sys/modules/ixgbe/Makefile#2 integrate
.. //depot/projects/fdt/sys/net/bpf.c#4 integrate
.. //depot/projects/fdt/sys/net/flowtable.c#4 integrate
.. //depot/projects/fdt/sys/net/if_llatbl.c#4 integrate
.. //depot/projects/fdt/sys/net/if_media.h#2 integrate
.. //depot/projects/fdt/sys/net/if_vlan.c#5 integrate
.. //depot/projects/fdt/sys/net/vnet.c#3 integrate
.. //depot/projects/fdt/sys/net/vnet.h#3 integrate
.. //depot/projects/fdt/sys/net80211/ieee80211.c#4 integrate
.. //depot/projects/fdt/sys/net80211/ieee80211_adhoc.c#3 integrate
.. //depot/projects/fdt/sys/net80211/ieee80211_hostap.c#4 integrate
.. //depot/projects/fdt/sys/net80211/ieee80211_ht.c#2 integrate
.. //depot/projects/fdt/sys/net80211/ieee80211_mesh.c#4 integrate
.. //depot/projects/fdt/sys/net80211/ieee80211_sta.c#5 integrate
.. //depot/projects/fdt/sys/net80211/ieee80211_var.h#4 integrate
.. //depot/projects/fdt/sys/netgraph/netflow/ng_netflow.c#2 integrate
.. //depot/projects/fdt/sys/netinet/ip_divert.c#6 integrate
.. //depot/projects/fdt/sys/netinet/ip_input.c#4 integrate
.. //depot/projects/fdt/sys/netinet/ipfw/dn_sched.h#2 integrate
.. //depot/projects/fdt/sys/netinet/ipfw/dn_sched_prio.c#1 branch
.. //depot/projects/fdt/sys/netinet/ipfw/ip_dn_io.c#3 integrate
.. //depot/projects/fdt/sys/netinet/ipfw/ip_fw_private.h#7 integrate
.. //depot/projects/fdt/sys/netinet/ipfw/ip_fw_sockopt.c#8 integrate
.. //depot/projects/fdt/sys/netinet/ipfw/ip_fw_table.c#7 integrate
.. //depot/projects/fdt/sys/netinet/ipfw/test/Makefile#2 integrate
.. //depot/projects/fdt/sys/netinet/raw_ip.c#7 integrate
.. //depot/projects/fdt/sys/netinet/sctp_indata.c#4 integrate
.. //depot/projects/fdt/sys/netinet/sctp_input.c#6 integrate
.. //depot/projects/fdt/sys/netinet/sctp_output.c#6 integrate
.. //depot/projects/fdt/sys/netinet/sctp_pcb.c#5 integrate
.. //depot/projects/fdt/sys/netinet/sctp_pcb.h#2 integrate
.. //depot/projects/fdt/sys/netinet/sctp_sysctl.c#3 integrate
.. //depot/projects/fdt/sys/netinet/sctp_uio.h#3 integrate
.. //depot/projects/fdt/sys/netinet/sctputil.c#6 integrate
.. //depot/projects/fdt/sys/netinet/sctputil.h#2 integrate
.. //depot/projects/fdt/sys/netinet/tcp_subr.c#3 integrate
.. //depot/projects/fdt/sys/netinet/tcp_timer.c#3 integrate
.. //depot/projects/fdt/sys/netinet/udp_usrreq.c#3 integrate
.. //depot/projects/fdt/sys/netinet6/nd6.c#6 integrate
.. //depot/projects/fdt/sys/netipsec/key.c#3 integrate
.. //depot/projects/fdt/sys/nfsserver/nfs_srvsubs.c#3 integrate
.. //depot/projects/fdt/sys/pc98/pc98/machdep.c#3 integrate
.. //depot/projects/fdt/sys/powerpc/aim/machdep.c#5 integrate
.. //depot/projects/fdt/sys/powerpc/aim/mmu_oea64.c#9 integrate
.. //depot/projects/fdt/sys/powerpc/aim/nexus.c#2 integrate
.. //depot/projects/fdt/sys/powerpc/aim/ofw_machdep.c#3 integrate
.. //depot/projects/fdt/sys/powerpc/booke/interrupt.c#3 integrate
.. //depot/projects/fdt/sys/powerpc/booke/machdep.c#8 integrate
.. //depot/projects/fdt/sys/powerpc/booke/trap_subr.S#2 integrate
.. //depot/projects/fdt/sys/powerpc/mpc85xx/ocpbus.c#3 integrate
.. //depot/projects/fdt/sys/powerpc/mpc85xx/ocpbus.h#2 integrate
.. //depot/projects/fdt/sys/powerpc/mpc85xx/pci_ocp.c#4 integrate
.. //depot/projects/fdt/sys/powerpc/ofw/ofw_real.c#3 integrate
.. //depot/projects/fdt/sys/powerpc/ofw/ofw_syscons.c#3 integrate
.. //depot/projects/fdt/sys/powerpc/powermac/cuda.c#2 integrate
.. //depot/projects/fdt/sys/powerpc/powermac/cudavar.h#2 integrate
.. //depot/projects/fdt/sys/powerpc/powermac/pmu.c#2 integrate
.. //depot/projects/fdt/sys/powerpc/powermac/smu.c#4 integrate
.. //depot/projects/fdt/sys/powerpc/powermac/uninorth.c#2 integrate
.. //depot/projects/fdt/sys/powerpc/powerpc/cpu.c#6 integrate
.. //depot/projects/fdt/sys/rpc/svc.c#2 integrate
.. //depot/projects/fdt/sys/sparc64/include/dcr.h#2 integrate
.. //depot/projects/fdt/sys/sparc64/include/tlb.h#2 integrate
.. //depot/projects/fdt/sys/sparc64/include/tte.h#2 integrate
.. //depot/projects/fdt/sys/sparc64/include/ver.h#3 integrate
.. //depot/projects/fdt/sys/sparc64/include/wstate.h#2 integrate
.. //depot/projects/fdt/sys/sparc64/pci/schizo.c#3 integrate
.. //depot/projects/fdt/sys/sparc64/pci/schizovar.h#3 integrate
.. //depot/projects/fdt/sys/sparc64/sparc64/cheetah.c#3 integrate
.. //depot/projects/fdt/sys/sparc64/sparc64/exception.S#2 integrate
.. //depot/projects/fdt/sys/sparc64/sparc64/genassym.c#3 integrate
.. //depot/projects/fdt/sys/sparc64/sparc64/locore.S#3 integrate
.. //depot/projects/fdt/sys/sparc64/sparc64/machdep.c#6 integrate
.. //depot/projects/fdt/sys/sparc64/sparc64/pmap.c#4 integrate
.. //depot/projects/fdt/sys/sparc64/sparc64/support.S#2 integrate
.. //depot/projects/fdt/sys/sparc64/sparc64/swtch.S#3 integrate
.. //depot/projects/fdt/sys/sun4v/sun4v/machdep.c#2 integrate
.. //depot/projects/fdt/sys/sys/_timespec.h#2 integrate
.. //depot/projects/fdt/sys/sys/eventhandler.h#3 integrate
.. //depot/projects/fdt/sys/sys/imgact.h#3 integrate
.. //depot/projects/fdt/sys/sys/param.h#10 integrate
.. //depot/projects/fdt/sys/sys/pcpu.h#3 integrate
.. //depot/projects/fdt/sys/sys/stat.h#2 integrate
.. //depot/projects/fdt/sys/sys/sysent.h#3 integrate
.. //depot/projects/fdt/sys/sys/timespec.h#2 integrate
.. //depot/projects/fdt/sys/sys/vtoc.h#2 integrate
.. //depot/projects/fdt/sys/vm/uma_int.h#3 integrate
.. //depot/projects/fdt/sys/vm/vm_mmap.c#2 integrate
.. //depot/projects/fdt/tools/build/mk/OptionalObsoleteFiles.inc#7 integrate
.. //depot/projects/fdt/tools/build/options/WITH_GNU_CPIO#2 delete
.. //depot/projects/fdt/tools/regression/usr.bin/ncal/regress.sh#2 integrate
.. //depot/projects/fdt/tools/tools/nanobsd/Files/root/updatep1#2 integrate
.. //depot/projects/fdt/tools/tools/nanobsd/Files/root/updatep2#2 integrate
.. //depot/projects/fdt/usr.bin/biff/biff.1#2 integrate
.. //depot/projects/fdt/usr.bin/calendar/Makefile#3 integrate
.. //depot/projects/fdt/usr.bin/calendar/calendar.1#2 integrate
.. //depot/projects/fdt/usr.bin/calendar/calendar.c#3 integrate
.. //depot/projects/fdt/usr.bin/calendar/calendar.h#2 integrate
.. //depot/projects/fdt/usr.bin/calendar/calendars/calendar.australia#2 integrate
.. //depot/projects/fdt/usr.bin/calendar/calendars/calendar.dutch#3 integrate
.. //depot/projects/fdt/usr.bin/calendar/calendars/calendar.freebsd#5 integrate
.. //depot/projects/fdt/usr.bin/calendar/dates.c#1 branch
.. //depot/projects/fdt/usr.bin/calendar/day.c#3 integrate
.. //depot/projects/fdt/usr.bin/calendar/events.c#1 branch
.. //depot/projects/fdt/usr.bin/calendar/io.c#3 integrate
.. //depot/projects/fdt/usr.bin/calendar/locale.c#1 branch
.. //depot/projects/fdt/usr.bin/calendar/ostern.c#4 integrate
.. //depot/projects/fdt/usr.bin/calendar/parsedata.c#1 branch
.. //depot/projects/fdt/usr.bin/calendar/paskha.c#3 integrate
.. //depot/projects/fdt/usr.bin/calendar/pathnames.h#2 integrate
.. //depot/projects/fdt/usr.bin/calendar/pom.c#1 branch
.. //depot/projects/fdt/usr.bin/calendar/sunpos.c#1 branch
.. //depot/projects/fdt/usr.bin/compress/compress.c#2 integrate
.. //depot/projects/fdt/usr.bin/cpio/Makefile#4 integrate
.. //depot/projects/fdt/usr.bin/find/find.1#2 integrate
.. //depot/projects/fdt/usr.bin/gzip/gzip.c#2 integrate
.. //depot/projects/fdt/usr.bin/kdump/kdump.c#6 integrate
.. //depot/projects/fdt/usr.bin/mail/util.c#2 integrate
.. //depot/projects/fdt/usr.bin/minigzip/Makefile#3 integrate
.. //depot/projects/fdt/usr.bin/ncal/ncal.1#4 integrate
.. //depot/projects/fdt/usr.bin/ncal/ncal.c#5 integrate
.. //depot/projects/fdt/usr.bin/sockstat/sockstat.c#3 integrate
.. //depot/projects/fdt/usr.bin/touch/touch.c#2 integrate
.. //depot/projects/fdt/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt#2 integrate
.. //depot/projects/fdt/usr.sbin/bsnmpd/modules/snmp_pf/Makefile#3 integrate
.. //depot/projects/fdt/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c#3 integrate
.. //depot/projects/fdt/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def#2 integrate
.. //depot/projects/fdt/usr.sbin/config/config.y#2 integrate
.. //depot/projects/fdt/usr.sbin/config/lang.l#3 integrate
.. //depot/projects/fdt/usr.sbin/config/main.c#2 integrate
.. //depot/projects/fdt/usr.sbin/config/mkmakefile.c#2 integrate
.. //depot/projects/fdt/usr.sbin/config/mkoptions.c#2 integrate
.. //depot/projects/fdt/usr.sbin/jls/jls.c#3 integrate
.. //depot/projects/fdt/usr.sbin/lastlogin/lastlogin.c#6 integrate
.. //depot/projects/fdt/usr.sbin/mailwrapper/mailwrapper.8#2 integrate
.. //depot/projects/fdt/usr.sbin/mailwrapper/mailwrapper.c#2 integrate
.. //depot/projects/fdt/usr.sbin/mtree/compare.c#2 integrate
.. //depot/projects/fdt/usr.sbin/mtree/create.c#2 integrate
.. //depot/projects/fdt/usr.sbin/mtree/mtree.8#2 integrate
.. //depot/projects/fdt/usr.sbin/pmcstat/pmcpl_calltree.c#3 integrate
.. //depot/projects/fdt/usr.sbin/pmcstat/pmcstat_log.c#5 integrate
.. //depot/projects/fdt/usr.sbin/ppp/arp.c#2 integrate
.. //depot/projects/fdt/usr.sbin/sysinstall/sysinstall.8#3 integrate
.. //depot/projects/fdt/usr.sbin/vidcontrol/vidcontrol.c#3 integrate
.. //depot/projects/fdt/usr.sbin/zic/Makefile#2 integrate

Differences ...

==== //depot/projects/fdt/MAINTAINERS#5 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.157 2010/02/18 21:14:29 edwin Exp $
+$FreeBSD: src/MAINTAINERS,v 1.160 2010/03/26 12:59:15 des Exp $
 
 Please note that the content of this file is strictly advisory.
 No locks listed here are valid.  The only strict review requirements
@@ -36,8 +36,6 @@
 cdboot		jhb	Pre-commit review requested.
 pxeboot		jhb	Pre-commit review requested.
 witness		jhb	Pre-commit review requested.
-twe		aradford@amcc.com	Pre-commit review requested
-twa		aradford@amcc.com	Pre-commit review requested
 CAM		gibbs,
 		ken	Pre-commit review requested. send to scsi@freebsd.org
 devstat(9)	ken	Pre-commit review requested.
@@ -59,15 +57,12 @@
 fetch		des	Advance notification requested.
 libpam		des	Pre-commit review requested.
 openssh		des	Pre-commit review requested.
-pseudofs	des	Advance notification requested.
-procfs		des	Advance notification requested.
-linprocfs	des	Advance notification requested.
+pseudofs	des	Pre-commit review requested.
+procfs		des	Pre-commit review requested.
+linprocfs	des	Pre-commit review requested.
 lpr		gad	Pre-commit review requested, particularly for
 			lpd/recvjob.c and lpd/printjob.c.
 newsyslog(8)	gad	Heads-up appreciated.  I'm going thru the PR's for it.
-pkill		gad	Heads-up appreciated.
-ps		gad	I am working on a number of changes to this.  Would
-			like advance notice of major changes planned to it.
 cvs		peter	Heads-up appreciated, try not to break it.
 nvi		peter	Try not to break it.
 libz		peter	Try not to break it.
@@ -76,9 +71,6 @@
 			offer a pre-commit review for anything non-trivial.
 ipfw		ipfw	Pre-commit review preferred. send to ipfw@freebsd.org
 drm		rnoland	Just keep me informed of changes, try not to break it.
-libufs		jmallett	Willing to handle problems, help with work.
-fdc(4)		joerg	Just keep me informed of changes, try not to break it.
-sppp(4)		joerg	Just keep me informed of changes, try not to break it.
 unifdef(1)	fanf	Pre-commit review requested.
 ntp         	roberto	Pre-commit review requested.
 inetd		dwmalone	Recommends pre-commit review.
@@ -144,4 +136,3 @@
 sys/modules/3dfx/Makefile:MAINTAINER=	cokane@FreeBSD.org
 sys/modules/urio/Makefile:MAINTAINER=	Iwasa Kazmi 
 tools/tools/sysdoc/Makefile:MAINTAINER=	trhodes@FreeBSD.org
-usr.sbin/zic/Makefile:MAINTAINER=	wollman@FreeBSD.org

==== //depot/projects/fdt/Makefile#7 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile,v 1.364 2010/03/03 21:08:44 imp Exp $
+# $FreeBSD: src/Makefile,v 1.365 2010/03/18 18:58:17 dougb Exp $
 #
 # The user-driven targets are:
 #
@@ -312,6 +312,7 @@
 	    "check _.${target}.buildworld for details" | ${MAKEFAIL}))
 	@echo ">> ${target} buildworld completed on `LC_ALL=C date`"
 .endif
+.if !defined(MAKE_JUST_WORLDS)
 .if exists(${.CURDIR}/sys/${target}/conf/NOTES)
 	@(cd ${.CURDIR}/sys/${target}/conf && env __MAKE_CONF=/dev/null \
 	    ${MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \
@@ -320,6 +321,7 @@
 .endif
 	@cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} TARGET=${target} \
 	    universe_kernels
+.endif
 	@echo ">> ${target} completed on `LC_ALL=C date`"
 .endfor
 universe_kernels: universe_kernconfs

==== //depot/projects/fdt/Makefile.inc1#13 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.641 2010/03/07 14:55:43 antoine Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.642 2010/03/24 18:40:57 delphij Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -283,6 +283,7 @@
 		VERSION="${VERSION}" \
 		MACHINE=i386 \
 		MACHINE_ARCH=i386 \
+		MACHINE_CPU="i686 mmx sse sse2" \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH} \
 		CC="${CC} ${LIB32FLAGS}" \

==== //depot/projects/fdt/ObsoleteFiles.inc#11 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.229 2010/03/14 10:18:58 ed Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.232 2010/03/27 03:17:39 marcel Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,19 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20100326: [ia64] removed 
+.if ${TARGET_ARCH} == "ia64"
+OLD_FILES+=usr/include/machine/nexusvar.h
+.endif
+# 20100326: gcpio removal
+OLD_FILES+=usr/bin/gcpio
+OLD_FILES+=usr/share/info/cpio.info.gz
+OLD_FILES+=usr/share/man/man1/gcpio.1.gz
+# 20100322: libz update
+OLD_LIBS+=lib/libz.so.5
+.if ${TARGET_ARCH} == "amd64"
+OLD_LIBS+=usr/lib32/libz.so.5
+.endif
 # 20100314: removal of regexp.h
 OLD_FILES+=usr/include/regexp.h
 OLD_FILES+=usr/share/man/man3/regexp.3.gz

==== //depot/projects/fdt/bin/cp/utils.c#3 (text+ko) ====

@@ -33,7 +33,7 @@
 #endif
 #endif /* not lint */
 #include 
-__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.60 2010/01/17 09:37:31 gavin Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.61 2010/03/28 13:16:08 ed Exp $");
 
 #include 
 #include 
@@ -323,8 +323,8 @@
 	fs->st_mode &= S_ISUID | S_ISGID | S_ISVTX |
 		       S_IRWXU | S_IRWXG | S_IRWXO;
 
-	TIMESPEC_TO_TIMEVAL(&tv[0], &fs->st_atimespec);
-	TIMESPEC_TO_TIMEVAL(&tv[1], &fs->st_mtimespec);
+	TIMESPEC_TO_TIMEVAL(&tv[0], &fs->st_atim);
+	TIMESPEC_TO_TIMEVAL(&tv[1], &fs->st_mtim);
 	if (islink ? lutimes(to.p_path, tv) : utimes(to.p_path, tv)) {
 		warn("%sutimes: %s", islink ? "l" : "", to.p_path);
 		rval = 1;

==== //depot/projects/fdt/bin/ls/cmp.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif /* not lint */
 #endif
 #include 
-__FBSDID("$FreeBSD: src/bin/ls/cmp.c,v 1.18 2006/03/24 16:38:02 jhb Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/cmp.c,v 1.19 2010/03/28 13:16:08 ed Exp $");
 
 
 #include 
@@ -66,17 +66,17 @@
 modcmp(const FTSENT *a, const FTSENT *b)
 {
 
-	if (b->fts_statp->st_mtimespec.tv_sec >
-	    a->fts_statp->st_mtimespec.tv_sec)
+	if (b->fts_statp->st_mtim.tv_sec >
+	    a->fts_statp->st_mtim.tv_sec)
 		return (1);
-	if (b->fts_statp->st_mtimespec.tv_sec <
-	    a->fts_statp->st_mtimespec.tv_sec)
+	if (b->fts_statp->st_mtim.tv_sec <
+	    a->fts_statp->st_mtim.tv_sec)
 		return (-1);
-	if (b->fts_statp->st_mtimespec.tv_nsec >
-	    a->fts_statp->st_mtimespec.tv_nsec)
+	if (b->fts_statp->st_mtim.tv_nsec >
+	    a->fts_statp->st_mtim.tv_nsec)
 		return (1);
-	if (b->fts_statp->st_mtimespec.tv_nsec <
-	    a->fts_statp->st_mtimespec.tv_nsec)
+	if (b->fts_statp->st_mtim.tv_nsec <
+	    a->fts_statp->st_mtim.tv_nsec)
 		return (-1);
 	return (strcoll(a->fts_name, b->fts_name));
 }
@@ -92,17 +92,17 @@
 acccmp(const FTSENT *a, const FTSENT *b)
 {
 
-	if (b->fts_statp->st_atimespec.tv_sec >
-	    a->fts_statp->st_atimespec.tv_sec)
+	if (b->fts_statp->st_atim.tv_sec >
+	    a->fts_statp->st_atim.tv_sec)
 		return (1);
-	if (b->fts_statp->st_atimespec.tv_sec <
-	    a->fts_statp->st_atimespec.tv_sec)
+	if (b->fts_statp->st_atim.tv_sec <
+	    a->fts_statp->st_atim.tv_sec)
 		return (-1);
-	if (b->fts_statp->st_atimespec.tv_nsec >
-	    a->fts_statp->st_atimespec.tv_nsec)
+	if (b->fts_statp->st_atim.tv_nsec >
+	    a->fts_statp->st_atim.tv_nsec)
 		return (1);
-	if (b->fts_statp->st_atimespec.tv_nsec <
-	    a->fts_statp->st_atimespec.tv_nsec)
+	if (b->fts_statp->st_atim.tv_nsec <
+	    a->fts_statp->st_atim.tv_nsec)
 		return (-1);
 	return (strcoll(a->fts_name, b->fts_name));
 }
@@ -118,17 +118,17 @@
 birthcmp(const FTSENT *a, const FTSENT *b)
 {
 
-	if (b->fts_statp->st_birthtimespec.tv_sec >
-	    a->fts_statp->st_birthtimespec.tv_sec)
+	if (b->fts_statp->st_birthtim.tv_sec >
+	    a->fts_statp->st_birthtim.tv_sec)
 		return (1);
-	if (b->fts_statp->st_birthtimespec.tv_sec <
-	    a->fts_statp->st_birthtimespec.tv_sec)
+	if (b->fts_statp->st_birthtim.tv_sec <
+	    a->fts_statp->st_birthtim.tv_sec)
 		return (-1);
-	if (b->fts_statp->st_birthtimespec.tv_nsec >
-	    a->fts_statp->st_birthtimespec.tv_nsec)
+	if (b->fts_statp->st_birthtim.tv_nsec >
+	    a->fts_statp->st_birthtim.tv_nsec)
 		return (1);
-	if (b->fts_statp->st_birthtimespec.tv_nsec <
-	    a->fts_statp->st_birthtimespec.tv_nsec)
+	if (b->fts_statp->st_birthtim.tv_nsec <
+	    a->fts_statp->st_birthtim.tv_nsec)
 		return (-1);
 	return (strcoll(a->fts_name, b->fts_name));
 }
@@ -144,17 +144,17 @@
 statcmp(const FTSENT *a, const FTSENT *b)
 {
 
-	if (b->fts_statp->st_ctimespec.tv_sec >
-	    a->fts_statp->st_ctimespec.tv_sec)
+	if (b->fts_statp->st_ctim.tv_sec >
+	    a->fts_statp->st_ctim.tv_sec)
 		return (1);
-	if (b->fts_statp->st_ctimespec.tv_sec <
-	    a->fts_statp->st_ctimespec.tv_sec)
+	if (b->fts_statp->st_ctim.tv_sec <
+	    a->fts_statp->st_ctim.tv_sec)
 		return (-1);
-	if (b->fts_statp->st_ctimespec.tv_nsec >
-	    a->fts_statp->st_ctimespec.tv_nsec)
+	if (b->fts_statp->st_ctim.tv_nsec >
+	    a->fts_statp->st_ctim.tv_nsec)
 		return (1);
-	if (b->fts_statp->st_ctimespec.tv_nsec <
-	    a->fts_statp->st_ctimespec.tv_nsec)
+	if (b->fts_statp->st_ctim.tv_nsec <
+	    a->fts_statp->st_ctim.tv_nsec)
 		return (-1);
 	return (strcoll(a->fts_name, b->fts_name));
 }

==== //depot/projects/fdt/bin/pax/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #       @(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/pax/Makefile,v 1.14 2010/02/07 17:05:22 imp Exp $
+# $FreeBSD: src/bin/pax/Makefile,v 1.15 2010/03/30 23:10:56 delphij Exp $
 
 # To install on versions prior to BSD 4.4 the following may have to be
 # defined with CFLAGS +=
@@ -29,8 +29,5 @@
 SRCS=	ar_io.c ar_subs.c buf_subs.c cache.c cpio.c file_subs.c ftree.c \
 	gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c \
 	tables.c tar.c tty_subs.c
-#XXX NOTYET
-#MAN=	pax.1 tar.1 cpio.1
-#LINKS=	${BINDIR}/pax ${BINDIR}/tar ${BINDIR}/pax ${BINDIR}/cpio
 
 .include 

==== //depot/projects/fdt/bin/pax/getoldopt.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$OpenBSD: getoldopt.c,v 1.4 2000/01/22 20:24:51 deraadt Exp $	*/
+/*	$OpenBSD: getoldopt.c,v 1.9 2009/10/27 23:59:22 deraadt Exp $	*/
 /*	$NetBSD: getoldopt.c,v 1.3 1995/03/21 09:07:28 cgd Exp $	*/
 
 /*-
@@ -7,11 +7,11 @@
  * otherwise, it uses the old rules used by tar, dump, and ps.
  *
  * Written 25 August 1985 by John Gilmore (ihnp4!hoptoad!gnu) and placed
- * in the Pubic Domain for your edification and enjoyment.
+ * in the Public Domain for your edification and enjoyment.
  */
 
 #include 
-__FBSDID("$FreeBSD: src/bin/pax/getoldopt.c,v 1.5 2005/01/10 08:39:24 imp Exp $");
+__FBSDID("$FreeBSD: src/bin/pax/getoldopt.c,v 1.6 2010/03/30 23:14:35 delphij Exp $");
 
 #include 
 #include 
@@ -33,7 +33,8 @@
 	optarg = NULL;
 
 	if (key == NULL) {		/* First time */
-		if (argc < 2) return EOF;
+		if (argc < 2)
+			return (-1);
 		key = argv[1];
 		if (*key == '-')

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

From owner-p4-projects@FreeBSD.ORG  Thu Apr  1 07:20:56 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8E3031065674; Thu,  1 Apr 2010 07:20: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 507131065673
	for ; Thu,  1 Apr 2010 07:20:56 +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 3C2638FC22
	for ; Thu,  1 Apr 2010 07:20:56 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o317Ku4k002715
	for ; Thu, 1 Apr 2010 07:20:56 GMT
	(envelope-from raj@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o317KqVr002709
	for perforce@freebsd.org; Thu, 1 Apr 2010 07:20:52 GMT
	(envelope-from raj@freebsd.org)
Date: Thu, 1 Apr 2010 07:20:52 GMT
Message-Id: <201004010720.o317KqVr002709@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 176394 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 01 Apr 2010 07:20:56 -0000

http://p4web.freebsd.org/chv.cgi?CH=176394

Change 176394 by raj@raj_nand on 2010/04/01 07:20:48

	IFC @176392

Affected files ...

.. //depot/projects/nand2/MAINTAINERS#2 integrate
.. //depot/projects/nand2/Makefile#2 integrate
.. //depot/projects/nand2/Makefile.inc1#2 integrate
.. //depot/projects/nand2/ObsoleteFiles.inc#2 integrate
.. //depot/projects/nand2/UPDATING#2 integrate
.. //depot/projects/nand2/bin/cp/utils.c#2 integrate
.. //depot/projects/nand2/bin/ls/cmp.c#2 integrate
.. //depot/projects/nand2/bin/pax/Makefile#2 integrate
.. //depot/projects/nand2/bin/pax/cpio.1#2 delete
.. //depot/projects/nand2/bin/pax/getoldopt.c#2 integrate
.. //depot/projects/nand2/bin/pax/tar.1#2 delete
.. //depot/projects/nand2/bin/ps/extern.h#2 integrate
.. //depot/projects/nand2/bin/ps/keyword.c#2 integrate
.. //depot/projects/nand2/bin/ps/print.c#2 integrate
.. //depot/projects/nand2/bin/ps/ps.1#2 integrate
.. //depot/projects/nand2/bin/rcp/rcp.c#2 integrate
.. //depot/projects/nand2/bin/setfacl/file.c#2 integrate
.. //depot/projects/nand2/bin/setfacl/mask.c#2 integrate
.. //depot/projects/nand2/bin/setfacl/merge.c#2 integrate
.. //depot/projects/nand2/bin/setfacl/remove.c#2 integrate
.. //depot/projects/nand2/bin/setfacl/setfacl.1#2 integrate
.. //depot/projects/nand2/bin/setfacl/setfacl.c#2 integrate
.. //depot/projects/nand2/bin/setfacl/setfacl.h#2 integrate
.. //depot/projects/nand2/bin/setfacl/util.c#2 integrate
.. //depot/projects/nand2/bin/sh/eval.c#2 integrate
.. //depot/projects/nand2/bin/sh/exec.c#2 integrate
.. //depot/projects/nand2/bin/sh/exec.h#2 integrate
.. //depot/projects/nand2/bin/sh/parser.c#2 integrate
.. //depot/projects/nand2/bin/sh/sh.1#2 integrate
.. //depot/projects/nand2/bin/test/test.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/zpool/zpool.8#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 integrate
.. //depot/projects/nand2/contrib/bind9/CHANGES#2 integrate
.. //depot/projects/nand2/contrib/bind9/bin/named/server.c#2 integrate
.. //depot/projects/nand2/contrib/bind9/doc/arm/Bv9ARM-book.xml#2 integrate
.. //depot/projects/nand2/contrib/bind9/doc/arm/Bv9ARM.ch06.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/doc/arm/Bv9ARM.pdf#2 integrate
.. //depot/projects/nand2/contrib/bind9/doc/arm/man.dig.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/doc/arm/man.dnssec-keygen.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/doc/arm/man.dnssec-signzone.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/doc/arm/man.host.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/doc/arm/man.named-checkconf.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/doc/arm/man.named-checkzone.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/doc/arm/man.named.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/doc/arm/man.nsupdate.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/doc/arm/man.rndc-confgen.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/doc/arm/man.rndc.conf.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/doc/arm/man.rndc.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/dns/api#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/dns/include/dns/resolver.h#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/dns/include/dns/result.h#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/dns/ncache.c#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/dns/rbtdb.c#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/dns/rdatalist.c#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/dns/rdataset.c#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/dns/rdataslab.c#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/dns/resolver.c#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/dns/result.c#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/dns/sdb.c#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/dns/sdlz.c#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/dns/validator.c#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/dns/view.c#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/lwres/man/lwres.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate
.. //depot/projects/nand2/contrib/bind9/version#2 integrate
.. //depot/projects/nand2/contrib/bsnmp/gensnmpdef/gensnmpdef.c#2 integrate
.. //depot/projects/nand2/contrib/bsnmp/gensnmptree/gensnmptree.1#2 integrate
.. //depot/projects/nand2/contrib/bsnmp/snmpd/config.c#2 integrate
.. //depot/projects/nand2/contrib/bsnmp/snmpd/snmpmod.3#2 integrate
.. //depot/projects/nand2/contrib/cpio/ABOUT-NLS#2 delete
.. //depot/projects/nand2/contrib/cpio/AUTHORS#2 delete
.. //depot/projects/nand2/contrib/cpio/COPYING#2 delete
.. //depot/projects/nand2/contrib/cpio/ChangeLog#2 delete
.. //depot/projects/nand2/contrib/cpio/FREEBSD-upgrade#2 delete
.. //depot/projects/nand2/contrib/cpio/INSTALL#2 delete
.. //depot/projects/nand2/contrib/cpio/NEWS#2 delete
.. //depot/projects/nand2/contrib/cpio/README#2 delete
.. //depot/projects/nand2/contrib/cpio/THANKS#2 delete
.. //depot/projects/nand2/contrib/cpio/TODO#2 delete
.. //depot/projects/nand2/contrib/cpio/doc/cpio.1#2 delete
.. //depot/projects/nand2/contrib/cpio/doc/cpio.texi#2 delete
.. //depot/projects/nand2/contrib/cpio/doc/version.texi#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/alloca_.h#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/argp-ba.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/argp-eexst.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/argp-fmtstream.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/argp-fmtstream.h#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/argp-fs-xinl.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/argp-help.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/argp-namefrob.h#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/argp-parse.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/argp-pin.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/argp-pv.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/argp-pvh.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/argp-xinl.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/argp.h#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/basename.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/dirname.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/dirname.h#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/error.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/error.h#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/exitfail.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/exitfail.h#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/fatal.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/full-write.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/full-write.h#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/getopt.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/getopt1.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/getopt_.h#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/getopt_int.h#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/gettext.h#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/hash.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/hash.h#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/intprops.h#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/inttostr.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/inttostr.h#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/mempcpy.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/paxerror.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/paxexit.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/paxlib.h#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/paxnames.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/quote.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/quote.h#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/quotearg.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/quotearg.h#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/rmt-command.h#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/rmt.h#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/rtapelib.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/safe-read.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/safe-read.h#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/safe-write.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/safe-write.h#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/savedir.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/savedir.h#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/strchrnul.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/stripslash.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/strndup.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/strnlen.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/system-ioctl.h#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/system.h#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/umaxtostr.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/unlocked-io.h#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/utimens.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/utimens.h#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/xalloc-die.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/xalloc.h#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/xmalloc.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/xstrndup.c#2 delete
.. //depot/projects/nand2/contrib/cpio/lib/xstrndup.h#2 delete
.. //depot/projects/nand2/contrib/cpio/src/copyin.c#2 delete
.. //depot/projects/nand2/contrib/cpio/src/copyout.c#2 delete
.. //depot/projects/nand2/contrib/cpio/src/copypass.c#2 delete
.. //depot/projects/nand2/contrib/cpio/src/cpio.h#2 delete
.. //depot/projects/nand2/contrib/cpio/src/cpiohdr.h#2 delete
.. //depot/projects/nand2/contrib/cpio/src/defer.c#2 delete
.. //depot/projects/nand2/contrib/cpio/src/defer.h#2 delete
.. //depot/projects/nand2/contrib/cpio/src/dstring.c#2 delete
.. //depot/projects/nand2/contrib/cpio/src/dstring.h#2 delete
.. //depot/projects/nand2/contrib/cpio/src/extern.h#2 delete
.. //depot/projects/nand2/contrib/cpio/src/filemode.c#2 delete
.. //depot/projects/nand2/contrib/cpio/src/filetypes.h#2 delete
.. //depot/projects/nand2/contrib/cpio/src/global.c#2 delete
.. //depot/projects/nand2/contrib/cpio/src/idcache.c#2 delete
.. //depot/projects/nand2/contrib/cpio/src/main.c#2 delete
.. //depot/projects/nand2/contrib/cpio/src/makepath.c#2 delete
.. //depot/projects/nand2/contrib/cpio/src/safe-stat.h#2 delete
.. //depot/projects/nand2/contrib/cpio/src/tar.c#2 delete
.. //depot/projects/nand2/contrib/cpio/src/tar.h#2 delete
.. //depot/projects/nand2/contrib/cpio/src/tarhdr.h#2 delete
.. //depot/projects/nand2/contrib/cpio/src/userspec.c#2 delete
.. //depot/projects/nand2/contrib/cpio/src/util.c#2 delete
.. //depot/projects/nand2/contrib/ipfilter/ipsend/sbpf.c#2 integrate
.. //depot/projects/nand2/contrib/netcat/FREEBSD-upgrade#2 integrate
.. //depot/projects/nand2/contrib/netcat/FREEBSD-vendor#2 integrate
.. //depot/projects/nand2/contrib/netcat/nc.1#2 integrate
.. //depot/projects/nand2/contrib/netcat/netcat.c#2 integrate
.. //depot/projects/nand2/contrib/openpam/include/security/pam_appl.h#2 integrate
.. //depot/projects/nand2/contrib/top/utils.c#2 integrate
.. //depot/projects/nand2/contrib/tzdata/antarctica#2 integrate
.. //depot/projects/nand2/contrib/tzdata/asia#2 integrate
.. //depot/projects/nand2/contrib/tzdata/australasia#2 integrate
.. //depot/projects/nand2/contrib/tzdata/southamerica#2 integrate
.. //depot/projects/nand2/contrib/tzdata/zone.tab#2 integrate
.. //depot/projects/nand2/crypto/openssh/ChangeLog#2 integrate
.. //depot/projects/nand2/crypto/openssh/INSTALL#2 integrate
.. //depot/projects/nand2/crypto/openssh/PROTOCOL#2 integrate
.. //depot/projects/nand2/crypto/openssh/PROTOCOL.agent#2 integrate
.. //depot/projects/nand2/crypto/openssh/PROTOCOL.certkeys#1 branch
.. //depot/projects/nand2/crypto/openssh/PROTOCOL.mux#1 branch
.. //depot/projects/nand2/crypto/openssh/README#2 integrate
.. //depot/projects/nand2/crypto/openssh/README.smartcard#2 delete
.. //depot/projects/nand2/crypto/openssh/addrmatch.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/auth-krb5.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/auth-options.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/auth-options.h#2 integrate
.. //depot/projects/nand2/crypto/openssh/auth-rh-rsa.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/auth-rhosts.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/auth-rsa.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/auth.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/auth.h#2 integrate
.. //depot/projects/nand2/crypto/openssh/auth2-hostbased.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/auth2-pubkey.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/authfd.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/authfd.h#2 integrate
.. //depot/projects/nand2/crypto/openssh/authfile.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/authfile.h#2 integrate
.. //depot/projects/nand2/crypto/openssh/bufaux.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/buffer.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/buffer.h#2 integrate
.. //depot/projects/nand2/crypto/openssh/canohost.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/channels.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/channels.h#2 integrate
.. //depot/projects/nand2/crypto/openssh/clientloop.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/clientloop.h#2 integrate
.. //depot/projects/nand2/crypto/openssh/config.guess#2 integrate
.. //depot/projects/nand2/crypto/openssh/config.h#2 integrate
.. //depot/projects/nand2/crypto/openssh/config.h.in#2 integrate
.. //depot/projects/nand2/crypto/openssh/defines.h#2 integrate
.. //depot/projects/nand2/crypto/openssh/dh.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/dns.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/dns.h#2 integrate
.. //depot/projects/nand2/crypto/openssh/hostfile.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/hostfile.h#2 integrate
.. //depot/projects/nand2/crypto/openssh/kex.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/kex.h#2 integrate
.. //depot/projects/nand2/crypto/openssh/kexdhs.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/kexgexs.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/key.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/key.h#2 integrate
.. //depot/projects/nand2/crypto/openssh/loginrec.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/match.h#2 integrate
.. //depot/projects/nand2/crypto/openssh/misc.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/misc.h#2 integrate
.. //depot/projects/nand2/crypto/openssh/monitor.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/monitor_fdpass.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/monitor_wrap.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/mux.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/myproposal.h#2 integrate
.. //depot/projects/nand2/crypto/openssh/nchan.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/openbsd-compat/openbsd-compat.h#2 integrate
.. //depot/projects/nand2/crypto/openssh/openbsd-compat/openssl-compat.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/openbsd-compat/port-aix.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/openbsd-compat/port-aix.h#2 integrate
.. //depot/projects/nand2/crypto/openssh/openbsd-compat/port-linux.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/openbsd-compat/port-linux.h#2 integrate
.. //depot/projects/nand2/crypto/openssh/openbsd-compat/pwcache.c#1 branch
.. //depot/projects/nand2/crypto/openssh/openbsd-compat/readpassphrase.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/pathnames.h#2 integrate
.. //depot/projects/nand2/crypto/openssh/pkcs11.h#1 branch
.. //depot/projects/nand2/crypto/openssh/platform.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/platform.h#2 integrate
.. //depot/projects/nand2/crypto/openssh/readconf.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/readconf.h#2 integrate
.. //depot/projects/nand2/crypto/openssh/roaming.h#2 integrate
.. //depot/projects/nand2/crypto/openssh/roaming_client.c#1 branch
.. //depot/projects/nand2/crypto/openssh/roaming_common.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/roaming_serv.c#1 branch
.. //depot/projects/nand2/crypto/openssh/scard-opensc.c#2 delete
.. //depot/projects/nand2/crypto/openssh/scard.c#2 delete
.. //depot/projects/nand2/crypto/openssh/scard.h#2 delete
.. //depot/projects/nand2/crypto/openssh/scp.1#2 integrate
.. //depot/projects/nand2/crypto/openssh/scp.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/servconf.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/servconf.h#2 integrate
.. //depot/projects/nand2/crypto/openssh/session.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/sftp-client.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/sftp-client.h#2 integrate
.. //depot/projects/nand2/crypto/openssh/sftp-common.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/sftp-common.h#2 integrate
.. //depot/projects/nand2/crypto/openssh/sftp-server.8#2 integrate
.. //depot/projects/nand2/crypto/openssh/sftp-server.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/sftp.1#2 integrate
.. //depot/projects/nand2/crypto/openssh/sftp.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/ssh-add.1#2 integrate
.. //depot/projects/nand2/crypto/openssh/ssh-add.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/ssh-agent.1#2 integrate
.. //depot/projects/nand2/crypto/openssh/ssh-agent.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/ssh-dss.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/ssh-keygen.1#2 integrate
.. //depot/projects/nand2/crypto/openssh/ssh-keygen.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/ssh-keyscan.1#2 integrate
.. //depot/projects/nand2/crypto/openssh/ssh-keyscan.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/ssh-keysign.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/ssh-pkcs11-client.c#1 branch
.. //depot/projects/nand2/crypto/openssh/ssh-pkcs11-helper.0#1 branch
.. //depot/projects/nand2/crypto/openssh/ssh-pkcs11-helper.8#1 branch
.. //depot/projects/nand2/crypto/openssh/ssh-pkcs11-helper.c#1 branch
.. //depot/projects/nand2/crypto/openssh/ssh-pkcs11.c#1 branch
.. //depot/projects/nand2/crypto/openssh/ssh-pkcs11.h#1 branch
.. //depot/projects/nand2/crypto/openssh/ssh-rand-helper.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/ssh-rsa.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/ssh.1#2 integrate
.. //depot/projects/nand2/crypto/openssh/ssh.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/ssh2.h#2 integrate
.. //depot/projects/nand2/crypto/openssh/ssh_config#2 integrate
.. //depot/projects/nand2/crypto/openssh/ssh_config.5#2 integrate
.. //depot/projects/nand2/crypto/openssh/ssh_namespace.h#2 integrate
.. //depot/projects/nand2/crypto/openssh/sshconnect.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/sshconnect2.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/sshd.8#2 integrate
.. //depot/projects/nand2/crypto/openssh/sshd.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/sshd_config#2 integrate
.. //depot/projects/nand2/crypto/openssh/sshd_config.5#2 integrate
.. //depot/projects/nand2/crypto/openssh/sshpty.h#2 integrate
.. //depot/projects/nand2/crypto/openssh/sshtty.c#2 integrate
.. //depot/projects/nand2/crypto/openssh/version.h#2 integrate
.. //depot/projects/nand2/crypto/openssl/CHANGES#2 integrate
.. //depot/projects/nand2/crypto/openssl/Configure#2 integrate
.. //depot/projects/nand2/crypto/openssl/FAQ#2 integrate
.. //depot/projects/nand2/crypto/openssl/Makefile#2 integrate
.. //depot/projects/nand2/crypto/openssl/Makefile.org#2 integrate
.. //depot/projects/nand2/crypto/openssl/NEWS#2 integrate
.. //depot/projects/nand2/crypto/openssl/README#2 integrate
.. //depot/projects/nand2/crypto/openssl/apps/CA.sh#2 integrate
.. //depot/projects/nand2/crypto/openssl/apps/Makefile#2 integrate
.. //depot/projects/nand2/crypto/openssl/apps/apps.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/apps/ca.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/apps/dsa.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/apps/dsaparam.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/apps/enc.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/apps/gendsa.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/apps/genpkey.c#2 delete
.. //depot/projects/nand2/crypto/openssl/apps/genrsa.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/apps/openssl.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/apps/openssl.cnf#2 integrate
.. //depot/projects/nand2/crypto/openssl/apps/pkcs12.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/apps/pkey.c#2 delete
.. //depot/projects/nand2/crypto/openssl/apps/pkeyparam.c#2 delete
.. //depot/projects/nand2/crypto/openssl/apps/pkeyutl.c#2 delete
.. //depot/projects/nand2/crypto/openssl/apps/req.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/apps/s_apps.h#2 integrate
.. //depot/projects/nand2/crypto/openssl/apps/s_cb.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/apps/s_client.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/apps/s_server.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/apps/s_socket.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/apps/speed.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/apps/ts.c#2 delete
.. //depot/projects/nand2/crypto/openssl/apps/tsget#2 delete
.. //depot/projects/nand2/crypto/openssl/apps/x509.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/config#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/aes/aes_cfb.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/aes/aes_x86core.c#2 delete
.. //depot/projects/nand2/crypto/openssl/crypto/aes/asm/aes-armv4.pl#2 delete
.. //depot/projects/nand2/crypto/openssl/crypto/aes/asm/aes-ppc.pl#2 delete
.. //depot/projects/nand2/crypto/openssl/crypto/aes/asm/aes-s390x.pl#2 delete
.. //depot/projects/nand2/crypto/openssl/crypto/aes/asm/aes-sparcv9.pl#2 delete
.. //depot/projects/nand2/crypto/openssl/crypto/aes/asm/aes-x86_64.pl#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/asn1/a_mbstr.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/asn1/a_object.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/asn1/ameth_lib.c#2 delete
.. //depot/projects/nand2/crypto/openssl/crypto/asn1/asn1.h#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/asn1/asn1_err.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/asn1/asn1_gen.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/asn1/asn1_locl.h#2 delete
.. //depot/projects/nand2/crypto/openssl/crypto/asn1/asn1_par.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/asn1/bio_asn1.c#2 delete
.. //depot/projects/nand2/crypto/openssl/crypto/asn1/bio_ndef.c#2 delete
.. //depot/projects/nand2/crypto/openssl/crypto/asn1/t_x509.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/asn1/x_nx509.c#2 delete
.. //depot/projects/nand2/crypto/openssl/crypto/bio/bio.h#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/bio/bss_dgram.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/bio/bss_file.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/bn/asm/alpha-mont.pl#2 delete
.. //depot/projects/nand2/crypto/openssl/crypto/bn/asm/armv4-mont.pl#2 delete
.. //depot/projects/nand2/crypto/openssl/crypto/bn/asm/mips3-mont.pl#2 delete
.. //depot/projects/nand2/crypto/openssl/crypto/bn/asm/ppc-mont.pl#2 delete
.. //depot/projects/nand2/crypto/openssl/crypto/bn/asm/ppc64-mont.pl#2 delete
.. //depot/projects/nand2/crypto/openssl/crypto/bn/asm/s390x-mont.pl#2 delete
.. //depot/projects/nand2/crypto/openssl/crypto/bn/asm/s390x.S#2 delete
.. //depot/projects/nand2/crypto/openssl/crypto/bn/asm/sparcv9-mont.pl#2 delete
.. //depot/projects/nand2/crypto/openssl/crypto/bn/asm/sparcv9a-mont.pl#2 delete
.. //depot/projects/nand2/crypto/openssl/crypto/bn/asm/via-mont.pl#2 delete
.. //depot/projects/nand2/crypto/openssl/crypto/bn/asm/x86-mont.pl#2 delete
.. //depot/projects/nand2/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/bn/bn_div.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/bn/bn_exp.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/bn/bn_gf2m.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/bn/bn_mul.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/bn/bntest.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/camellia/Makefile#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/camellia/asm/cmll-x86.pl#2 delete
.. //depot/projects/nand2/crypto/openssl/crypto/camellia/asm/cmll-x86_64.pl#2 delete
.. //depot/projects/nand2/crypto/openssl/crypto/cast/c_cfb64.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/cast/c_ecb.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/cast/c_enc.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/cast/c_ofb64.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/cast/cast.h#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/cms/cms_ess.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/cms/cms_lib.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/comp/c_zlib.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/cryptlib.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/dsa/Makefile#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/dsa/dsa_asn1.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/dsa/dsa_lib.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/dso/dso_dlfcn.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/ec/ec2_smpl.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/ecdsa/Makefile#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/ecdsa/ecs_ossl.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/ecdsa/ecs_sign.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/engine/Makefile#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/engine/eng_cnf.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/engine/eng_cryptodev.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/engine/eng_ctrl.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/engine/eng_err.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/engine/eng_table.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/engine/engine.h#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/err/Makefile#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/err/err_all.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/evp/c_allc.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/evp/c_alld.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/evp/digest.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/evp/evp_lib.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/evp/evp_locl.h#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/lhash/lhash.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/md5/asm/md5-x86_64.pl#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/o_init.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/o_str.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/objects/obj_dat.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/objects/obj_dat.h#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/objects/obj_mac.h#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/objects/obj_mac.num#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/objects/objects.txt#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/ocsp/ocsp_prn.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/opensslv.h#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/pem/pem_seal.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/perlasm/x86_64-xlate.pl#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/pkcs12/p12_attr.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/pkcs12/p12_key.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/pkcs12/p12_utl.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/pkcs12/pkcs12.h#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/pkcs7/pk7_mime.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/ppccpuid.pl#2 delete
.. //depot/projects/nand2/crypto/openssl/crypto/rand/rand_win.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/rand/randfile.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/rsa/rsa.h#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/rsa/rsa_eay.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/rsa/rsa_eng.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/rsa/rsa_oaep.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/rsa/rsa_pss.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/rsa/rsa_sign.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/s390xcpuid.S#2 delete
.. //depot/projects/nand2/crypto/openssl/crypto/sha/sha512.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/sparcv9cap.c#2 delete
.. //depot/projects/nand2/crypto/openssl/crypto/stack/safestack.h#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/symhacks.h#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/ui/ui_openssl.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/x509/by_dir.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/x509/x509.h#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/x509/x509_lu.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/x509/x509_vfy.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/x509/x509_vfy.h#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/x509/x509_vpm.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/x509v3/pcy_tree.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/x509v3/v3_alt.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/crypto/x509v3/v3_ocsp.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/demos/x509/mkcert.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/demos/x509/mkreq.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/doc/apps/enc.pod#2 integrate
.. //depot/projects/nand2/crypto/openssl/doc/apps/verify.pod#2 integrate
.. //depot/projects/nand2/crypto/openssl/doc/crypto/ASN1_generate_nconf.pod#2 integrate
.. //depot/projects/nand2/crypto/openssl/doc/crypto/EVP_DigestInit.pod#2 integrate
.. //depot/projects/nand2/crypto/openssl/doc/crypto/PKCS12_parse.pod#2 integrate
.. //depot/projects/nand2/crypto/openssl/doc/crypto/bn_internal.pod#2 integrate
.. //depot/projects/nand2/crypto/openssl/doc/crypto/d2i_X509.pod#2 integrate
.. //depot/projects/nand2/crypto/openssl/doc/crypto/d2i_X509_CRL.pod#2 integrate
.. //depot/projects/nand2/crypto/openssl/doc/crypto/d2i_X509_REQ.pod#2 integrate
.. //depot/projects/nand2/crypto/openssl/doc/crypto/hmac.pod#2 integrate
.. //depot/projects/nand2/crypto/openssl/doc/crypto/pem.pod#2 integrate
.. //depot/projects/nand2/crypto/openssl/doc/ssl/SSL_CIPHER_get_name.pod#2 integrate
.. //depot/projects/nand2/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod#2 integrate
.. //depot/projects/nand2/crypto/openssl/engines/Makefile#2 integrate
.. //depot/projects/nand2/crypto/openssl/engines/alpha.opt#1 branch
.. //depot/projects/nand2/crypto/openssl/engines/axp.opt#2 delete
.. //depot/projects/nand2/crypto/openssl/engines/e_capi.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/engines/e_capi_err.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/engines/e_capi_err.h#2 integrate
.. //depot/projects/nand2/crypto/openssl/engines/e_ubsec.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/engines/ia64.opt#1 branch
.. //depot/projects/nand2/crypto/openssl/fips/Makefile#2 integrate
.. //depot/projects/nand2/crypto/openssl/fips/aes/fips_aesavs.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/fips/des/fips_desmovs.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/fips/dsa/fips_dsa_key.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/fips/dsa/fips_dsa_sign.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/fips/dsa/fips_dsatest.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/fips/dsa/fips_dssvs.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/fips/fips_locl.h#2 integrate
.. //depot/projects/nand2/crypto/openssl/fips/fips_test_suite.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/fips/fips_utl.h#2 integrate
.. //depot/projects/nand2/crypto/openssl/fips/fipsalgtest.pl#2 integrate
.. //depot/projects/nand2/crypto/openssl/fips/fipsld#2 integrate
.. //depot/projects/nand2/crypto/openssl/fips/hmac/fips_hmac.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/fips/hmac/fips_hmac_selftest.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/fips/rand/fips_rand.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/fips/rand/fips_rngvs.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/fips/rsa/fips_rsagtest.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/fips/rsa/fips_rsastest.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/fips/rsa/fips_rsavtest.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/fips/sha/Makefile#2 integrate
.. //depot/projects/nand2/crypto/openssl/fips/sha/fips_sha1_selftest.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/openssl.spec#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/Makefile#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/d1_both.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/d1_clnt.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/d1_enc.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/d1_lib.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/d1_pkt.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/d1_srvr.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/dtls1.h#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/kssl.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/s23_clnt.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/s23_srvr.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/s2_srvr.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/s3_both.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/s3_clnt.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/s3_lib.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/s3_pkt.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/s3_srvr.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/ssl.h#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/ssl3.h#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/ssl_algs.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/ssl_asn1.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/ssl_cert.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/ssl_ciph.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/ssl_err.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/ssl_lib.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/ssl_locl.h#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/ssl_rsa.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/ssl_sess.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/ssl_stat.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/ssl_txt.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/t1_enc.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/t1_lib.c#2 integrate
.. //depot/projects/nand2/crypto/openssl/ssl/t1_reneg.c#1 branch
.. //depot/projects/nand2/crypto/openssl/ssl/tls1.h#2 integrate
.. //depot/projects/nand2/crypto/openssl/test/Makefile#2 integrate
.. //depot/projects/nand2/crypto/openssl/test/cms-test.pl#2 integrate
.. //depot/projects/nand2/crypto/openssl/util/domd#2 integrate
.. //depot/projects/nand2/crypto/openssl/util/libeay.num#2 integrate
.. //depot/projects/nand2/crypto/openssl/util/mk1mf.pl#2 integrate
.. //depot/projects/nand2/crypto/openssl/util/mkdef.pl#2 integrate
.. //depot/projects/nand2/crypto/openssl/util/mkerr.pl#2 integrate
.. //depot/projects/nand2/crypto/openssl/util/pl/Mingw32.pl#2 integrate
.. //depot/projects/nand2/crypto/openssl/util/pl/VC-32.pl#2 integrate
.. //depot/projects/nand2/crypto/openssl/util/pod2man.pl#2 integrate
.. //depot/projects/nand2/crypto/openssl/util/shlib_wrap.sh#2 integrate
.. //depot/projects/nand2/etc/Makefile#2 integrate
.. //depot/projects/nand2/etc/defaults/periodic.conf#2 integrate
.. //depot/projects/nand2/etc/rc.d/jail#2 integrate
.. //depot/projects/nand2/etc/rc.d/tmp#2 integrate
.. //depot/projects/nand2/etc/termcap.small#2 integrate
.. //depot/projects/nand2/games/fortune/Notes#2 integrate
.. //depot/projects/nand2/games/fortune/datfiles/fortunes#2 integrate
.. //depot/projects/nand2/games/fortune/datfiles/fortunes-o.real#2 integrate
.. //depot/projects/nand2/games/fortune/datfiles/fortunes.sp.ok#2 integrate
.. //depot/projects/nand2/games/fortune/datfiles/limerick#2 integrate
.. //depot/projects/nand2/games/fortune/datfiles/startrek#2 integrate
.. //depot/projects/nand2/games/fortune/datfiles/zippy#2 integrate
.. //depot/projects/nand2/games/pom/pom.6#2 integrate
.. //depot/projects/nand2/gnu/usr.bin/Makefile#2 integrate
.. //depot/projects/nand2/gnu/usr.bin/cpio/Makefile#2 delete
.. //depot/projects/nand2/gnu/usr.bin/cpio/config.h#2 delete
.. //depot/projects/nand2/gnu/usr.bin/cpio/doc/Makefile#2 delete
.. //depot/projects/nand2/gnu/usr.bin/diff/context.c.diff#2 integrate
.. //depot/projects/nand2/gnu/usr.bin/diff/diff.c.diff#2 integrate
.. //depot/projects/nand2/gnu/usr.bin/gdb/Makefile#2 integrate
.. //depot/projects/nand2/gnu/usr.bin/gdb/Makefile.inc#2 integrate
.. //depot/projects/nand2/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h#2 integrate
.. //depot/projects/nand2/gnu/usr.bin/gdb/kgdb/trgt_ia64.c#2 integrate
.. //depot/projects/nand2/include/Makefile#3 integrate
.. //depot/projects/nand2/include/dlfcn.h#2 integrate
.. //depot/projects/nand2/include/inttypes.h#2 integrate
.. //depot/projects/nand2/include/regexp.h#2 delete
.. //depot/projects/nand2/lib/Makefile#2 integrate
.. //depot/projects/nand2/lib/bind/config.h#2 integrate
.. //depot/projects/nand2/lib/csu/i386-elf/Makefile#2 integrate
.. //depot/projects/nand2/lib/csu/mips/crti.S#2 integrate
.. //depot/projects/nand2/lib/libc/compat-43/sigpause.2#2 integrate
.. //depot/projects/nand2/lib/libc/gen/__getosreldate.c#2 integrate
.. //depot/projects/nand2/lib/libc/gen/_spinlock_stub.c#2 integrate
.. //depot/projects/nand2/lib/libc/gen/_thread_init.c#2 integrate
.. //depot/projects/nand2/lib/libc/gen/daemon.c#2 integrate
.. //depot/projects/nand2/lib/libc/gen/dlfcn.c#2 integrate
.. //depot/projects/nand2/lib/libc/gen/dlopen.3#2 integrate
.. //depot/projects/nand2/lib/libc/gen/opendir.c#2 integrate
.. //depot/projects/nand2/lib/libc/posix1e/acl_strip.c#2 integrate
.. //depot/projects/nand2/lib/libc/posix1e/acl_to_text_nfs4.c#2 integrate
.. //depot/projects/nand2/lib/libc/rpc/Symbol.map#2 integrate
.. //depot/projects/nand2/lib/libc/rpc/clnt_simple.c#2 integrate
.. //depot/projects/nand2/lib/libc/rpc/getnetconfig.c#2 integrate
.. //depot/projects/nand2/lib/libc/rpc/key_call.c#2 integrate
.. //depot/projects/nand2/lib/libc/rpc/mt_misc.c#2 integrate
.. //depot/projects/nand2/lib/libc/rpc/mt_misc.h#2 integrate
.. //depot/projects/nand2/lib/libc/rpc/rpc_generic.c#2 integrate
.. //depot/projects/nand2/lib/libc/rpc/rpc_soc.c#2 integrate
.. //depot/projects/nand2/lib/libc/sparc64/fpu/fpu.c#2 integrate
.. //depot/projects/nand2/lib/libc/sparc64/fpu/fpu_div.c#2 integrate
.. //depot/projects/nand2/lib/libc/sparc64/fpu/fpu_emu.h#2 integrate
.. //depot/projects/nand2/lib/libc/sparc64/fpu/fpu_explode.c#2 integrate
.. //depot/projects/nand2/lib/libc/sparc64/fpu/fpu_extern.h#2 integrate
.. //depot/projects/nand2/lib/libc/sparc64/fpu/fpu_implode.c#2 integrate
.. //depot/projects/nand2/lib/libc/stdio/findfp.c#2 integrate
.. //depot/projects/nand2/lib/libc/stdio/local.h#2 integrate
.. //depot/projects/nand2/lib/libc/stdio/snprintf.c#2 integrate
.. //depot/projects/nand2/lib/libc/stdio/vasprintf.c#2 integrate
.. //depot/projects/nand2/lib/libc/stdio/vdprintf.c#2 integrate
.. //depot/projects/nand2/lib/libc/stdio/vfprintf.c#2 integrate
.. //depot/projects/nand2/lib/libc/stdio/vsnprintf.c#2 integrate
.. //depot/projects/nand2/lib/libc/stdio/vsprintf.c#2 integrate
.. //depot/projects/nand2/lib/libc/stdio/vsscanf.c#2 integrate
.. //depot/projects/nand2/lib/libc/stdio/vswprintf.c#2 integrate
.. //depot/projects/nand2/lib/libc/stdio/vswscanf.c#2 integrate
.. //depot/projects/nand2/lib/libc/stdio/xprintf.c#2 integrate
.. //depot/projects/nand2/lib/libc/string/strlen.c#2 integrate
.. //depot/projects/nand2/lib/libc/sys/mmap.2#2 integrate
.. //depot/projects/nand2/lib/libc/sys/open.2#2 integrate
.. //depot/projects/nand2/lib/libc/sys/stat.2#2 integrate
.. //depot/projects/nand2/lib/libcompat/4.1/ascftime.c#2 integrate
.. //depot/projects/nand2/lib/libcompat/4.1/cftime.c#2 integrate
.. //depot/projects/nand2/lib/libcompat/4.1/ftime.c#2 integrate
.. //depot/projects/nand2/lib/libcompat/4.1/getpw.c#2 integrate
.. //depot/projects/nand2/lib/libcompat/4.3/cfree.c#2 integrate
.. //depot/projects/nand2/lib/libcompat/4.3/re_comp.3#2 integrate
.. //depot/projects/nand2/lib/libcompat/4.3/re_comp.c#1 branch
.. //depot/projects/nand2/lib/libcompat/4.3/regex.c#2 delete
.. //depot/projects/nand2/lib/libcompat/Makefile#2 integrate
.. //depot/projects/nand2/lib/libcompat/regexp/COPYRIGHT#2 delete
.. //depot/projects/nand2/lib/libcompat/regexp/README#2 delete
.. //depot/projects/nand2/lib/libcompat/regexp/regerror.c#2 delete
.. //depot/projects/nand2/lib/libcompat/regexp/regexp.3#2 delete
.. //depot/projects/nand2/lib/libcompat/regexp/regexp.c#2 delete
.. //depot/projects/nand2/lib/libcompat/regexp/regmagic.h#2 delete
.. //depot/projects/nand2/lib/libcompat/regexp/regsub.c#2 delete
.. //depot/projects/nand2/lib/libgssapi/gss_init_sec_context.3#2 integrate
.. //depot/projects/nand2/lib/libgssapi/gss_unwrap.3#2 integrate
.. //depot/projects/nand2/lib/libkvm/kvm_getpcpu.3#2 integrate
.. //depot/projects/nand2/lib/libpam/modules/pam_ssh/pam_ssh.c#2 integrate
.. //depot/projects/nand2/lib/libpmc/pmc.xscale.3#2 integrate
.. //depot/projects/nand2/lib/librpcsec_gss/rpcsec_gss.3#2 integrate
.. //depot/projects/nand2/lib/libstand/assert.c#2 integrate
.. //depot/projects/nand2/lib/libstand/bzipfs.c#2 integrate
.. //depot/projects/nand2/lib/libstand/gzipfs.c#2 integrate
.. //depot/projects/nand2/lib/libusbhid/data.c#2 integrate
.. //depot/projects/nand2/lib/libusbhid/descr.c#2 integrate
.. //depot/projects/nand2/lib/libusbhid/parse.c#2 integrate
.. //depot/projects/nand2/lib/libusbhid/usage.c#2 integrate
.. //depot/projects/nand2/lib/libusbhid/usbhid.h#2 integrate
.. //depot/projects/nand2/lib/libusbhid/usbvar.h#2 integrate
.. //depot/projects/nand2/lib/libz/ChangeLog#2 integrate
.. //depot/projects/nand2/lib/libz/FAQ#2 integrate
.. //depot/projects/nand2/lib/libz/Makefile#2 integrate
.. //depot/projects/nand2/lib/libz/README#2 integrate
.. //depot/projects/nand2/lib/libz/Symbol.map#1 branch
.. //depot/projects/nand2/lib/libz/Versions.def#1 branch
.. //depot/projects/nand2/lib/libz/adler32.c#2 integrate
.. //depot/projects/nand2/lib/libz/algorithm.txt#2 delete
.. //depot/projects/nand2/lib/libz/compress.c#2 integrate
.. //depot/projects/nand2/lib/libz/contrib/README.contrib#1 branch
.. //depot/projects/nand2/lib/libz/contrib/asm686/README.686#1 branch
.. //depot/projects/nand2/lib/libz/contrib/asm686/match.S#1 branch
.. //depot/projects/nand2/lib/libz/contrib/gcc_gvmat64/gvmat64.S#1 branch
.. //depot/projects/nand2/lib/libz/crc32.c#2 integrate
.. //depot/projects/nand2/lib/libz/deflate.c#2 integrate
.. //depot/projects/nand2/lib/libz/deflate.h#2 integrate
.. //depot/projects/nand2/lib/libz/doc/algorithm.txt#1 branch
.. //depot/projects/nand2/lib/libz/doc/rfc1950.txt#1 branch
.. //depot/projects/nand2/lib/libz/doc/rfc1951.txt#1 branch
.. //depot/projects/nand2/lib/libz/doc/rfc1952.txt#1 branch
.. //depot/projects/nand2/lib/libz/doc/txtvsbin.txt#1 branch
.. //depot/projects/nand2/lib/libz/example.c#2 integrate
.. //depot/projects/nand2/lib/libz/gzclose.c#1 branch
.. //depot/projects/nand2/lib/libz/gzguts.h#1 branch
.. //depot/projects/nand2/lib/libz/gzio.c#2 delete
.. //depot/projects/nand2/lib/libz/gzlib.c#1 branch
.. //depot/projects/nand2/lib/libz/gzread.c#1 branch
.. //depot/projects/nand2/lib/libz/gzwrite.c#1 branch
.. //depot/projects/nand2/lib/libz/infback.c#2 integrate
.. //depot/projects/nand2/lib/libz/inffast.c#2 integrate
.. //depot/projects/nand2/lib/libz/inflate.c#2 integrate
.. //depot/projects/nand2/lib/libz/inflate.h#2 integrate
.. //depot/projects/nand2/lib/libz/inftrees.c#2 integrate
.. //depot/projects/nand2/lib/libz/inftrees.h#2 integrate
.. //depot/projects/nand2/lib/libz/minigzip.c#2 integrate
.. //depot/projects/nand2/lib/libz/trees.c#2 integrate
.. //depot/projects/nand2/lib/libz/uncompr.c#2 integrate
.. //depot/projects/nand2/lib/libz/zconf.h#2 integrate
.. //depot/projects/nand2/lib/libz/zlib.3#2 integrate
.. //depot/projects/nand2/lib/libz/zlib.h#2 integrate
.. //depot/projects/nand2/lib/libz/zutil.c#2 integrate
.. //depot/projects/nand2/lib/libz/zutil.h#2 integrate
.. //depot/projects/nand2/lib/msun/man/cimag.3#2 integrate
.. //depot/projects/nand2/libexec/ftpd/popen.c#2 integrate
.. //depot/projects/nand2/libexec/rtld-elf/rtld.c#2 integrate
.. //depot/projects/nand2/libexec/tftpd/tftpd.8#2 integrate
.. //depot/projects/nand2/sbin/geom/class/multipath/geom_multipath.c#2 integrate
.. //depot/projects/nand2/sbin/hastd/primary.c#2 integrate
.. //depot/projects/nand2/sbin/ifconfig/ifconfig.c#2 integrate
.. //depot/projects/nand2/sbin/ifconfig/ifieee80211.c#2 integrate
.. //depot/projects/nand2/sbin/ipfw/Makefile#2 integrate
.. //depot/projects/nand2/sbin/ipfw/dummynet.c#2 integrate
.. //depot/projects/nand2/sbin/ipfw/ipfw.8#2 integrate
.. //depot/projects/nand2/sbin/ipfw/ipfw2.c#2 integrate
.. //depot/projects/nand2/sbin/ipfw/ipfw2.h#2 integrate
.. //depot/projects/nand2/sbin/mount/mount.c#2 integrate
.. //depot/projects/nand2/sbin/newfs/mkfs.c#2 integrate
.. //depot/projects/nand2/sbin/newfs/newfs.8#2 integrate
.. //depot/projects/nand2/sbin/newfs/newfs.c#2 integrate
.. //depot/projects/nand2/sbin/newfs/newfs.h#2 integrate
.. //depot/projects/nand2/sbin/nos-tun/Makefile#2 integrate
.. //depot/projects/nand2/sbin/nos-tun/nos-tun.c#2 integrate
.. //depot/projects/nand2/sbin/quotacheck/quotacheck.8#2 integrate
.. //depot/projects/nand2/sbin/setkey/setkey.8#2 integrate
.. //depot/projects/nand2/sbin/sysctl/sysctl.c#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/Makefile.inc#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/Makefile.man#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/ASN1_OBJECT_new.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/ASN1_STRING_length.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/ASN1_STRING_new.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/ASN1_generate_nconf.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BIO_ctrl.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BIO_f_base64.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BIO_f_buffer.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BIO_f_cipher.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BIO_f_md.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BIO_f_null.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BIO_f_ssl.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BIO_find_type.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BIO_new.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BIO_push.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BIO_read.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BIO_s_accept.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BIO_s_bio.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BIO_s_connect.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BIO_s_fd.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BIO_s_file.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BIO_s_mem.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BIO_s_null.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BIO_s_socket.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BIO_set_callback.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BIO_should_retry.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BN_BLINDING_new.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BN_CTX_new.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BN_CTX_start.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BN_add.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BN_add_word.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BN_bn2bin.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BN_cmp.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BN_copy.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BN_generate_prime.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BN_mod_inverse.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BN_new.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BN_num_bytes.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BN_rand.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BN_set_bit.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BN_swap.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/BN_zero.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/CONF_modules_free.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/CONF_modules_load_file.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/DH_generate_key.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/DH_generate_parameters.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/DH_get_ex_new_index.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/DH_new.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/DH_set_method.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/DH_size.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/DSA_SIG_new.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/DSA_do_sign.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/DSA_dup_DH.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/DSA_generate_key.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/DSA_generate_parameters.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/DSA_get_ex_new_index.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/DSA_new.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/DSA_set_method.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/DSA_sign.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/DSA_size.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/ERR_GET_LIB.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/ERR_clear_error.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/ERR_error_string.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/ERR_get_error.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/ERR_load_crypto_strings.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/ERR_load_strings.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/ERR_print_errors.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/ERR_put_error.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/ERR_remove_state.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/ERR_set_mark.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/EVP_BytesToKey.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/EVP_DigestInit.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/EVP_EncryptInit.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/EVP_OpenInit.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/EVP_PKEY_new.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/EVP_SealInit.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/EVP_SignInit.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/EVP_VerifyInit.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/OBJ_nid2obj.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/OPENSSL_Applink.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/OPENSSL_config.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/OPENSSL_ia32cap.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/PKCS12_create.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/PKCS12_parse.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/PKCS7_decrypt.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/PKCS7_encrypt.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/PKCS7_sign.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/PKCS7_verify.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/RAND_add.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/RAND_bytes.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/RAND_cleanup.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/RAND_egd.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/RAND_load_file.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/RAND_set_rand_method.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/RSA_blinding_on.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/RSA_check_key.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/RSA_generate_key.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/RSA_get_ex_new_index.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/RSA_new.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/RSA_print.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/RSA_private_encrypt.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/RSA_public_encrypt.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/RSA_set_method.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/RSA_sign.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/RSA_size.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/SMIME_read_PKCS7.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/SMIME_write_PKCS7.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/X509_NAME_print_ex.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/X509_new.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/bio.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/blowfish.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/bn.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/bn_internal.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/buffer.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/crypto.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/d2i_DHparams.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/d2i_DSAPublicKey.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/d2i_RSAPublicKey.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/d2i_X509.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/d2i_X509_ALGOR.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/d2i_X509_CRL.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/d2i_X509_NAME.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/d2i_X509_REQ.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/d2i_X509_SIG.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/des.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/dh.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/dsa.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/ecdsa.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/engine.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/err.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/evp.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/hmac.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/lh_stats.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/lhash.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/md5.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/mdc2.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/pem.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/rand.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/rc4.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/ripemd.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/rsa.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/sha.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/threads.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/ui.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/ui_compat.3#2 integrate
.. //depot/projects/nand2/secure/lib/libcrypto/man/x509.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssh/Makefile#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/Makefile#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/Makefile.man#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CIPHER_get_name.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_COMP_add_compression_method.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_add_session.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_ctrl.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_flush_sessions.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_free.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_new.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_sess_number.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_sessions.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_set_cert_store.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_set_info_callback.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_set_mode.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_set_options.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_set_timeout.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_set_verify.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_CTX_use_certificate.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_SESSION_free.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_SESSION_get_time.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_accept.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_alert_type_string.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_clear.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_connect.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_do_handshake.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_free.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_get_SSL_CTX.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_get_ciphers.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_get_client_CA_list.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_get_current_cipher.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_get_default_timeout.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_get_error.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_get_ex_new_index.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_get_fd.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_get_peer_cert_chain.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_get_peer_certificate.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_get_rbio.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_get_session.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_get_verify_result.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_get_version.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_library_init.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_load_client_CA_file.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_new.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_pending.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_read.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_rstate_string.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_session_reused.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_set_bio.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_set_connect_state.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_set_fd.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_set_session.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_set_shutdown.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_set_verify_result.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_shutdown.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_state_string.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_want.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/SSL_write.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/d2i_SSL_SESSION.3#2 integrate
.. //depot/projects/nand2/secure/lib/libssl/man/ssl.3#2 integrate
.. //depot/projects/nand2/secure/libexec/Makefile#2 integrate
.. //depot/projects/nand2/secure/libexec/ssh-pkcs11-helper/Makefile#1 branch
.. //depot/projects/nand2/secure/usr.bin/openssl/man/CA.pl.1#2 integrate
.. //depot/projects/nand2/secure/usr.bin/openssl/man/asn1parse.1#2 integrate
.. //depot/projects/nand2/secure/usr.bin/openssl/man/ca.1#2 integrate
.. //depot/projects/nand2/secure/usr.bin/openssl/man/ciphers.1#2 integrate
.. //depot/projects/nand2/secure/usr.bin/openssl/man/crl.1#2 integrate
.. //depot/projects/nand2/secure/usr.bin/openssl/man/crl2pkcs7.1#2 integrate

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

From owner-p4-projects@FreeBSD.ORG  Thu Apr  1 08:18:54 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 91F891065673; Thu,  1 Apr 2010 08:18:54 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 54A961065686
	for ; Thu,  1 Apr 2010 08:18:54 +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 341418FC23
	for ; Thu,  1 Apr 2010 08:18:54 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o318IsNS007956
	for ; Thu, 1 Apr 2010 08:18:54 GMT
	(envelope-from raj@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o318IsKp007954
	for perforce@freebsd.org; Thu, 1 Apr 2010 08:18:54 GMT
	(envelope-from raj@freebsd.org)
Date: Thu, 1 Apr 2010 08:18:54 GMT
Message-Id: <201004010818.o318IsKp007954@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 176395 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 01 Apr 2010 08:18:54 -0000

http://p4web.freebsd.org/chv.cgi?CH=176395

Change 176395 by raj@raj_fdt on 2010/04/01 08:18:24

	Convert QUICC (CPM) attachment to the FDT convention.

Affected files ...

.. //depot/projects/fdt/sys/boot/fdt/dts/mpc8555cds.dts#3 edit
.. //depot/projects/fdt/sys/conf/files.powerpc#20 edit
.. //depot/projects/fdt/sys/dev/quicc/quicc_bfe_fdt.c#1 add
.. //depot/projects/fdt/sys/dev/quicc/quicc_bfe_ocp.c#2 delete

Differences ...

==== //depot/projects/fdt/sys/boot/fdt/dts/mpc8555cds.dts#3 (text+ko) ====

@@ -335,40 +335,12 @@
 			device_type = "open-pic";
 		};
 
-		cpm@919c0 {
+		cpm@80000 {
 			#address-cells = <1>;
 			#size-cells = <1>;
 			compatible = "fsl,mpc8555-cpm", "fsl,cpm2";
-			reg = <0x919c0 0x30>;
-			ranges;
-
-			muram@80000 {
-				#address-cells = <1>;
-				#size-cells = <1>;
-				ranges = <0x0 0x80000 0x10000>;
-
-				data@0 {
-					compatible = "fsl,cpm-muram-data";
-					reg = <0x0 0x2000 0x9000 0x1000>;
-				};
-			};
-
-			brg@919f0 {
-				compatible = "fsl,mpc8555-brg",
-				             "fsl,cpm2-brg",
-				             "fsl,cpm-brg";
-				reg = <0x919f0 0x10 0x915f0 0x10>;
-			};
-
-			cpmpic: pic@90c00 {
-				interrupt-controller;
-				#address-cells = <0>;
-				#interrupt-cells = <2>;
-				interrupts = <46 2>;
-				interrupt-parent = <&mpic>;
-				reg = <0x90c00 0x80>;
-				compatible = "fsl,mpc8555-cpm-pic", "fsl,cpm2-pic";
-			};
+			reg = <0x80000 0x20000>;
+			interrupts = <46 2>;
 		};
 	};
 

==== //depot/projects/fdt/sys/conf/files.powerpc#20 (text+ko) ====

@@ -39,7 +39,7 @@
 dev/ofw/ofw_pcibus.c		optional	pci aim | pci fdt
 dev/ofw/ofw_standard.c		optional	aim
 dev/powermac_nvram/powermac_nvram.c optional	powermac_nvram powermac
-dev/quicc/quicc_bfe_ocp.c	optional	quicc mpc85xx
+dev/quicc/quicc_bfe_fdt.c	optional	quicc mpc85xx
 dev/scc/scc_bfe_macio.c		optional	scc powermac
 dev/sec/sec.c			optional	sec mpc85xx
 dev/sound/macio/aoa.c		optional	snd_davbus | snd_ai2s powermac

From owner-p4-projects@FreeBSD.ORG  Thu Apr  1 11:34:10 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3B2EB106564A; Thu,  1 Apr 2010 11:34: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 F3B851065673
	for ; Thu,  1 Apr 2010 11:34:09 +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 C723F8FC12
	for ; Thu,  1 Apr 2010 11:34:09 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o31BY9TJ036382
	for ; Thu, 1 Apr 2010 11:34:09 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o31BY9l0036380
	for perforce@freebsd.org; Thu, 1 Apr 2010 11:34:09 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Thu, 1 Apr 2010 11:34:09 GMT
Message-Id: <201004011134.o31BY9l0036380@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 176401 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 01 Apr 2010 11:34:10 -0000

http://p4web.freebsd.org/chv.cgi?CH=176401

Change 176401 by anchie@anchie_malimis on 2010/04/01 11:33:21

	Got rid of the bug in netinet6/nd6.c: nd_option() -- NDP option len was 
	not set properly. Now, both basic scenarion and router scenario work
	well.
	
	The code with the native SEND socket is still partially mixed with the 
	the code with the routing socket.	
	
	There might be also some mem leakages (netinet6/send.c when copying and
	moving new mbuf header to the old mbuf chain, etc..).

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#39 edit

Differences ...

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#39 (text+ko) ====

@@ -162,7 +162,7 @@
 		return (EEXIST);
 
 	/* XXX: Revisit this, hardocoded! */
-	//so->so_snd.sb_hiwat = 8192;
+	/* so->so_snd.sb_hiwat = 8192; */
 
 	V_send_so = so;
  
@@ -176,10 +176,12 @@
 	struct ifnet *ifp;
 	struct snd_hdr *snd_hdr;
 
-	printf("sosend_rcv, mbuf len: %d \n", m->m_len);
+printf("sosend_rcv, mbuf len: %d \n", m->m_len);
 
 	snd_hdr = mtod(m, struct snd_hdr *);
-	printf("direction: %d, ifidx: %d \n", snd_hdr->direction, snd_hdr->ifidx);
+
+	int mlen = m->m_len;
+	int mpkthdrlen = m->m_pkthdr.len;
 
 	struct mbuf *m0;
 	m0 = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
@@ -189,8 +191,12 @@
 	}
 	m_move_pkthdr(m, m0);
 
+	m->m_len = mlen;
+	m->m_pkthdr.len = mpkthdrlen;
+
 	ifp = ifnet_byindex_ref(snd_hdr->ifidx);
 	m_adj(m, SEND_HDR_LEN);
+	m_fixhdr(m);
 	if (ifp) {
 		int error = send_output(m, ifp, snd_hdr->direction);
 		printf("error: %d\n", error);
@@ -224,7 +230,7 @@
         len = m_length(m, NULL);
         if (len != msglen)
                 printf("XXX-BZ %s: (m)len=%u (ip6)msglen=%d", __func__, len, msglen);
-                        
+
 	m = m_prepend(m, SEND_HDR_LEN, M_PKTHDR|M_DONTWAIT);
 	if (m == NULL) {
 		printf("m_prepend() failed!\n");
@@ -255,17 +261,17 @@
 send_close(struct socket *so)
 {
 	if (V_send_so)
-	V_send_so = NULL;
+		V_send_so = NULL;
 }
 
 struct pr_usrreqs send_usrreqs = {
 	.pru_attach =		send_uattach,
-	.pru_send =			sosend_rcv,
+	.pru_send =		sosend_rcv,
 	.pru_detach =		send_close
 };
 
 struct protosw send_protosw = {
-	.pr_type =			SOCK_RAW,
+	.pr_type =		SOCK_RAW,
 	.pr_protocol =		IPPROTO_SEND,
 	.pr_usrreqs =		&send_usrreqs
 };
@@ -282,20 +288,12 @@
 		error = pf_proto_register(PF_INET, &send_protosw);
 		if (error != 0)
 			break;
-
-		send_output_hook = send_output;
-		send_input_hook = send_input;
-
 		send_sendso_input_hook = send_sendso_input;
 		break;
-
 	case MOD_UNLOAD:
 		if (V_send_so != NULL)
 			return (EINVAL);
 		error = pf_proto_unregister(PF_INET, IPPROTO_SEND, SOCK_RAW);
-		send_input_hook = NULL;
-		send_output_hook = NULL;
-
 		send_sendso_input_hook = NULL;
 		break;
 

From owner-p4-projects@FreeBSD.ORG  Thu Apr  1 11:56:32 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B3F70106566C; Thu,  1 Apr 2010 11:56:32 +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 7862A106564A
	for ; Thu,  1 Apr 2010 11:56:32 +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 653748FC18
	for ; Thu,  1 Apr 2010 11:56:32 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o31BuWSr038072
	for ; Thu, 1 Apr 2010 11:56:32 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o31BuWWY038070
	for perforce@freebsd.org; Thu, 1 Apr 2010 11:56:32 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Thu, 1 Apr 2010 11:56:32 GMT
Message-Id: <201004011156.o31BuWWY038070@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 176403 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 01 Apr 2010 11:56:32 -0000

http://p4web.freebsd.org/chv.cgi?CH=176403

Change 176403 by anchie@anchie_malimis on 2010/04/01 11:56:27

	Code cleanup: removing old routing socket related code.	

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/net/rtsock.c#23 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#40 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.h#19 edit

Differences ...

==== //depot/projects/soc2009/anchie_send/src/sys/net/rtsock.c#23 (text+ko) ====

@@ -106,7 +106,6 @@
 static struct mbuf *rt_msg1(int type, struct rt_addrinfo *rtinfo);
 static int	rt_msg2(int type, struct rt_addrinfo *rtinfo,
 			caddr_t cp, struct walkarg *w);
-static void	rt_msg3(struct mbuf *, void *, size_t);
 static int	rt_xaddrs(caddr_t cp, caddr_t cplim,
 			struct rt_addrinfo *rtinfo);
 static int	sysctl_dumpentry(struct radix_node *rn, void *vw);
@@ -502,14 +501,12 @@
 		senderr(EINVAL);
 	}
 	info.rti_flags = rtm->rtm_flags;
-	if (rtm->rtm_type != RTM_SND) {
 		if (info.rti_info[RTAX_DST] == NULL ||
 	    		info.rti_info[RTAX_DST]->sa_family >= AF_MAX ||
 	    		(info.rti_info[RTAX_GATEWAY] != NULL &&
 	     		info.rti_info[RTAX_GATEWAY]->sa_family >= AF_MAX)) {
 			senderr(EINVAL);
 		}
-	}
 	/*
 	 * Verify that the caller has the appropriate privilege; RTM_GET
 	 * is the only operation the non-superuser is allowed.
@@ -556,44 +553,6 @@
 	switch (rtm->rtm_type) {
 		struct rtentry *saved_nrt;
 
-	case RTM_SND:
-		switch (rtm->rtm_seq) {
-			struct mbuf *n;
-
-		case RTM_SND_IN: 
-			ifp = ifnet_byindex(rtm->rtm_index);
-			if (!ifp)
-				senderr(EINVAL);
-
-			if ((n = m_dup(m, M_DONTWAIT)) == NULL)
-				senderr(ENOBUFS);
-			m_adj(n, sizeof(struct rt_msghdr));
-
-			printf("%s: RTM_SND_IN ifp=%p(%s), mbuf=%p\n",
-			    __func__, ifp, ifp->if_xname, n);
-			error = send_output_hook(n, ifp, SND_IN);
-			if (error)
-				senderr(error);
-			goto flush;
-		case RTM_SND_OUT:
-			ifp = ifnet_byindex(rtm->rtm_index);
-			if (!ifp)
-				senderr(EINVAL);
-
-			if ((n = m_dup(m, M_DONTWAIT)) == NULL)
-				senderr(ENOBUFS);
-			m_adj(n, sizeof(struct rt_msghdr));
-
-			printf("%s: RTM_SND_OUT ifp=%p(%s), mbuf=%p\n",
-			    __func__, ifp, ifp->if_xname, n);
-			error = send_output_hook(n, ifp, SND_OUT);
-			if (error)
-				senderr(error);
-			goto flush;
-		default:
-			senderr(EOPNOTSUPP);
-		}
-
 	case RTM_ADD:
 		if (info.rti_info[RTAX_GATEWAY] == NULL)
 			senderr(EINVAL);
@@ -988,7 +947,6 @@
 
 	case RTM_IFANNOUNCE:
 	case RTM_IEEE80211:
-	case RTM_SND:
 		len = sizeof(struct if_announcemsghdr);
 		break;
 
@@ -1281,66 +1239,6 @@
 }
 
 /*
- * Generation of the routing socket message indicating SeND event.
- */
-void
-rt_securendmsg(struct ifnet *ifp, int direction, void *data, size_t data_len)
-{
-	struct mbuf *m = NULL;
-	struct rt_addrinfo info;
-
-	switch (direction) {
-	case SND_IN:
-		/* Incoming traffic sent to userspace for SeND validation. */
-		m = rt_makeifannouncemsg(ifp, RTM_SND, RTM_SND_IN, &info);
-		break;
-	case SND_OUT:	
-		/* Outgoing traffic sent to userspace for SeND protection. */
-		m = rt_makeifannouncemsg(ifp, RTM_SND, RTM_SND_OUT, &info);
-		break;
-	}
-
-	rt_msg3(m, data, data_len);
-}
-
-void
-rt_msg3(struct mbuf *m, void *data, size_t data_len)
-{
-
-	if (m != NULL) {
-		/*
-		 * Append the ieee80211 or ND/SEND data. Try to stick it in the
-		 * mbuf containing the ifannounce msg; otherwise allocate
-		 * a new mbuf and append.
-		 *
-		 * NB: we assume m is a single mbuf.
-		 */
-
-		m_copyback(m, m->m_len, data_len, data);
-#if 0
-		if (data_len > M_TRAILINGSPACE(m)) {
-			struct mbuf *n = m_get(M_NOWAIT, MT_DATA);
-			if (n == NULL) {
-				m_freem(m);
-				return;
-			}
-			bcopy(data, mtod(n, void *), data_len);
-			printf("rtsock.c: rt_msg3(), nakon bcopy!\n");
-			n->m_len = data_len;
-			m->m_next = n;
-		} else if (data_len > 0) {
-			bcopy(data, mtod(m, u_int8_t *) + m->m_len, data_len);
-			m->m_len += data_len;
-		}
-		if (m->m_flags & M_PKTHDR)
-			m->m_pkthdr.len += data_len;
-#endif
-		mtod(m, struct if_announcemsghdr *)->ifan_msglen += data_len;
-		rt_dispatch(m, NULL);
-	}
-}
-
-/*
  * This is called to generate routing socket messages indicating
  * IEEE80211 wireless events.
  * XXX we piggyback on the RTM_IFANNOUNCE msg format in a clumsy way.
@@ -1352,10 +1250,6 @@
 	struct rt_addrinfo info;
 
 	m = rt_makeifannouncemsg(ifp, RTM_IEEE80211, what, &info);
-
-	rt_msg3(m, data, data_len);
-
-#if 0
 	if (m != NULL) {
 		/*
 		 * Append the ieee80211 data.  Try to stick it in the
@@ -1382,7 +1276,6 @@
 		mtod(m, struct if_announcemsghdr *)->ifan_msglen += data_len;
 		rt_dispatch(m, NULL);
 	}
-#endif
 }
 
 /*

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#40 (text+ko) ====

@@ -161,7 +161,7 @@
 	if (V_send_so != NULL)
 		return (EEXIST);
 
-	/* XXX: Revisit this, hardocoded! */
+	/* XXX: Revisit this, hardocoded! This was a hack for PR_ATOMIC. */
 	/* so->so_snd.sb_hiwat = 8192; */
 
 	V_send_so = so;
@@ -180,9 +180,6 @@
 
 	snd_hdr = mtod(m, struct snd_hdr *);
 
-	int mlen = m->m_len;
-	int mpkthdrlen = m->m_pkthdr.len;
-
 	struct mbuf *m0;
 	m0 = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m0 == NULL) {
@@ -191,9 +188,6 @@
 	}
 	m_move_pkthdr(m, m0);
 
-	m->m_len = mlen;
-	m->m_pkthdr.len = mpkthdrlen;
-
 	ifp = ifnet_byindex_ref(snd_hdr->ifidx);
 	m_adj(m, SEND_HDR_LEN);
 	m_fixhdr(m);

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.h#19 (text+ko) ====

@@ -27,9 +27,6 @@
 #define	SND_OUT		0	/* Outgoing traffic */ 
 #define	SND_IN		1	/* Incoming traffic. */
 
-#define RTM_SND_OUT	0	/* Outgoing RTM SeND packet sent to user space */
-#define RTM_SND_IN	1	/* Incoming RTM SeND packet sent to user space */
-
 #define SEND_HDR_LEN	sizeof(struct snd_hdr)
 
 struct snd_hdr {
@@ -37,7 +34,4 @@
         int             ifidx;
 };
 
-extern int      (*send_input_hook)(struct mbuf *, struct ifnet *, int, int);
-extern int      (*send_output_hook)(struct mbuf *, struct ifnet *, int);
-
 extern int      (*send_sendso_input_hook)(struct socket *, struct mbuf *, int, int);

From owner-p4-projects@FreeBSD.ORG  Thu Apr  1 12:17:54 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2D4501065670; Thu,  1 Apr 2010 12:17:54 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E5F05106566B
	for ; Thu,  1 Apr 2010 12:17:53 +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 D2F468FC0A
	for ; Thu,  1 Apr 2010 12:17:53 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o31CHrQv040576
	for ; Thu, 1 Apr 2010 12:17:53 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o31CHrtL040574
	for perforce@freebsd.org; Thu, 1 Apr 2010 12:17:53 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Thu, 1 Apr 2010 12:17:53 GMT
Message-Id: <201004011217.o31CHrtL040574@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 176404 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 01 Apr 2010 12:17:54 -0000

http://p4web.freebsd.org/chv.cgi?CH=176404

Change 176404 by anchie@anchie_malimis on 2010/04/01 12:17:03

	Apply the send_sendso_input hook only in case that SEND application is still running.
	If SEND application crashes, kernel will fail back to pure Neighbor Discovery.

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#35 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#26 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#14 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/raw_ip6.c#9 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#41 edit

Differences ...

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#35 (text+ko) ====

@@ -779,7 +779,7 @@
 			/* give up local */
 
 			/* Send incoming SeND-protected/ND packet to user space. */
-			if (send_sendso_input_hook != NULL) {
+			if (send_sendso_input_hook != NULL && V_send_so != NULL) {
 				IP6_EXTHDR_CHECK(m, off, icmp6len, IPPROTO_DONE);
 				printf("send_sendso_input_hook\n");
 				send_sendso_input_hook(V_send_so, m, SND_IN, ip6len);
@@ -790,7 +790,7 @@
 			m = NULL;
 			goto freeit;
 		}
-		if (send_sendso_input_hook != NULL) {
+		if (send_sendso_input_hook != NULL && V_send_so != NULL) {
 			IP6_EXTHDR_CHECK(m, off, icmp6len, IPPROTO_DONE);
                         printf("send_sendso_input_hook\n");
                         send_sendso_input_hook(V_send_so, n, SND_IN, ip6len);
@@ -809,7 +809,7 @@
 		if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
 
 			/* Send incoming SeND-protected/ND packet to user space. */
-			if (send_sendso_input_hook != NULL) {
+			if (send_sendso_input_hook != NULL && V_send_so != NULL) {
 
 				send_sendso_input_hook(V_send_so, m, SND_IN, ip6len);	
 				return (IPPROTO_DONE);
@@ -818,7 +818,7 @@
 			m = NULL;
 			goto freeit;
 		}
-		if (send_sendso_input_hook != NULL) {
+		if (send_sendso_input_hook != NULL && V_send_so != NULL) {
 			send_sendso_input_hook(V_send_so, n, SND_IN, ip6len);	
 			return (IPPROTO_DONE);
 		} else
@@ -833,7 +833,7 @@
 		if (icmp6len < sizeof(struct nd_neighbor_solicit))
 			goto badlen;
 		if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
-			if (send_sendso_input_hook != NULL) {
+			if (send_sendso_input_hook != NULL && V_send_so != NULL) {
 				/* Send incoming SeND/ND packet to user space. */
 				printf("%s: send_sendso_input_hook m=%p\n", __func__, m);
 				send_sendso_input_hook(V_send_so, m, SND_IN, ip6len);	
@@ -844,7 +844,7 @@
 			m = NULL;
 			goto freeit;
 		}
-		if (send_sendso_input_hook != NULL) {
+		if (send_sendso_input_hook != NULL && V_send_so != NULL) {
 			/* Send incoming SeND/ND packet to user space. */
 			printf("%s: send_sendso_input_hook n=%p\n", __func__, n);
 			send_sendso_input_hook(V_send_so, n, SND_IN, ip6len);
@@ -862,7 +862,7 @@
 		if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
 
 			/* Send incoming SeND-protected/ND packet to user space. */
-			if (send_sendso_input_hook != NULL) {
+			if (send_sendso_input_hook != NULL && V_send_so != NULL) {
 				send_sendso_input_hook(V_send_so, m, SND_IN, ip6len);
 				return (IPPROTO_DONE);
 			} else {
@@ -888,7 +888,7 @@
 		if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
 
 			/* Send incoming SeND-protected/ND packet to user space. */
-			if (send_sendso_input_hook != NULL) {
+			if (send_sendso_input_hook != NULL && V_send_so != NULL) {
 				send_sendso_input_hook(V_send_so, m, SND_IN, ip6len);	
 				return (IPPROTO_DONE);
 			} else {
@@ -898,7 +898,7 @@
 			m = NULL;
 			goto freeit;
 		}
-		if (send_sendso_input_hook != NULL) {
+		if (send_sendso_input_hook != NULL && V_send_so != NULL) {
 			send_sendso_input_hook(V_send_so, n, SND_IN, ip6len);
 			return (IPPROTO_DONE);
 		} else
@@ -2804,7 +2804,7 @@
 	nd_rd->nd_rd_cksum = in6_cksum(m, IPPROTO_ICMPV6,
 	    sizeof(*ip6), ntohs(ip6->ip6_plen));
 
-        if (send_sendso_input_hook != NULL) {
+        if (send_sendso_input_hook != NULL && V_send_so != NULL) {
 		mtag = m_tag_get(PACKET_TAG_ND_OUTGOING, sizeof(unsigned short), 
 			M_NOWAIT);
 		if (mtag == NULL)

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#26 (text+ko) ====

@@ -113,8 +113,6 @@
 
 static struct sockaddr_in6 all1_sa;
 
-int	(*send_input_hook)(struct mbuf *, struct ifnet *, int, int);
-int	(*send_output_hook)(struct mbuf *, struct ifnet *, int);
 int	(*send_sendso_input_hook)(struct socket *, struct mbuf *, int, int);
 
 static int nd6_is_new_addr_neighbor __P((struct sockaddr_in6 *,
@@ -298,6 +296,8 @@
 nd6_option_init(void *opt, int icmp6len, union nd_opts *ndopts)
 {
 
+printf("XXX-AK: nd6.c: nd6_option_init(), icmp6len = %d\n", icmp6len);
+
 	bzero(ndopts, sizeof(*ndopts));
 	ndopts->nd_opts_search = (struct nd_opt_hdr *)opt;
 	ndopts->nd_opts_last
@@ -330,7 +330,9 @@
 	nd_opt = ndopts->nd_opts_search;
 
 	/* make sure nd_opt_len is inside the buffer */
+printf("nd6.c: nd6_option(), nd_opt->nd_opt_len: %d\n", nd_opt->nd_opt_len);
 	if ((caddr_t)&nd_opt->nd_opt_len >= (caddr_t)ndopts->nd_opts_last) {
+printf("nd_opt->nd_opt_len >= ndopts->nd_opts_last\n");
 		bzero(ndopts, sizeof(*ndopts));
 		return NULL;
 	}
@@ -1987,15 +1989,11 @@
 #endif
 
 	/* send outgoing NS/NA/REDIRECT packet to sendd. */
-	if (send_sendso_input_hook != NULL) {
+	if (send_sendso_input_hook != NULL && V_send_so != NULL) {
 		mtag = m_tag_find(m, PACKET_TAG_ND_OUTGOING, NULL);
 		if (mtag != NULL) {
 			skip = 1;
 			nd_type = (unsigned short *)(mtag + 1);
-#if 0
-			XXX-AK: 
-			send_input_hook(m, ifp, SND_OUT, ip6len);
-#endif
 			/* Use the SEND socket */
 			printf("send_sendso_input_hook\n");
 			error = send_sendso_input_hook(V_send_so, m, SND_OUT, ip6len); 

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#14 (text+ko) ====

@@ -64,6 +64,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #define	L3_ADDR_SIN6(le)	((struct sockaddr_in6 *) L3_ADDR(le))
 #include 
@@ -570,7 +571,7 @@
 	nd_ns->nd_ns_cksum =
 	    in6_cksum(m, IPPROTO_ICMPV6, sizeof(*ip6), icmp6len);
 
-	if (send_sendso_input_hook != NULL) {
+	if (send_sendso_input_hook != NULL && V_send_so != NULL) {
 		mtag = m_tag_get(PACKET_TAG_ND_OUTGOING, sizeof(unsigned short), 
 			M_NOWAIT);
 		if (mtag == NULL)
@@ -897,7 +898,7 @@
 			 * the 2nd argument as the 1st one.
 			 */
 
-			if (send_sendso_input_hook != NULL) {
+			if (send_sendso_input_hook != NULL && V_send_so != NULL) {
 				mtag = m_tag_get(PACKET_TAG_ND_OUTGOING, 
 					sizeof(unsigned short), M_NOWAIT);
 				if (mtag == NULL)
@@ -1092,7 +1093,7 @@
 	nd_na->nd_na_cksum =
 	    in6_cksum(m, IPPROTO_ICMPV6, sizeof(struct ip6_hdr), icmp6len);
 
-	if (send_sendso_input_hook != NULL) {
+	if (send_sendso_input_hook != NULL && V_send_so != NULL) {
 		mtag = m_tag_get(PACKET_TAG_ND_OUTGOING, sizeof(unsigned short), 
 			M_NOWAIT);
 		if (mtag == NULL)

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/raw_ip6.c#9 (text+ko) ====

@@ -92,6 +92,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -535,6 +536,7 @@
 	 * them to rtadvd/rtsol.
 	 */
 	if (send_sendso_input_hook != NULL && 
+		V_send_so != NULL &&
 		so->so_proto->pr_protocol == IPPROTO_ICMPV6) {
 		switch (type) {
 		case ND_ROUTER_ADVERT:

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#41 (text+ko) ====

@@ -254,6 +254,7 @@
 static void
 send_close(struct socket *so)
 {
+
 	if (V_send_so)
 		V_send_so = NULL;
 }

From owner-p4-projects@FreeBSD.ORG  Thu Apr  1 15:25:09 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2CDC51065676; Thu,  1 Apr 2010 15:25:09 +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 D842E1065674
	for ; Thu,  1 Apr 2010 15:25:08 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C59C98FC15
	for ; Thu,  1 Apr 2010 15:25:08 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o31FP83Q068447
	for ; Thu, 1 Apr 2010 15:25:08 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o31FP81k068445
	for perforce@freebsd.org; Thu, 1 Apr 2010 15:25:08 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Thu, 1 Apr 2010 15:25:08 GMT
Message-Id: <201004011525.o31FP81k068445@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 176415 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 01 Apr 2010 15:25:09 -0000

http://p4web.freebsd.org/chv.cgi?CH=176415

Change 176415 by hselasky@hselasky_laptop001 on 2010/04/01 15:24:20

	USB quirk:
		- add new MSC quirk
	
	PR:		usb/145265

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#27 edit
.. //depot/projects/usb/src/sys/dev/usb/usbdevs#117 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#27 (text+ko) ====

@@ -185,6 +185,7 @@
 	USB_QUIRK(FEIYA, 5IN1, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB,
 	    UQ_MSC_FORCE_PROTO_SCSI),
 	USB_QUIRK(FREECOM, DVD, 0x0000, 0xffff, UQ_MSC_FORCE_PROTO_SCSI),
+	USB_QUIRK(FREECOM, HDD, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE),
 	USB_QUIRK(FUJIPHOTO, MASS0100, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_CBI_I,
 	    UQ_MSC_FORCE_PROTO_ATAPI, UQ_MSC_NO_RS_CLEAR_UA),
 	USB_QUIRK(GENESYS, GL641USB2IDE, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB,

==== //depot/projects/usb/src/sys/dev/usb/usbdevs#117 (text+ko) ====

@@ -1482,6 +1482,7 @@
 
 /* Freecom products */
 product FREECOM DVD		0xfc01	DVD drive
+product FREECOM HDD		0xfc05	Classic SL Hard Drive
 
 /* Fujitsu Siemens Computers products */
 product FSC E5400		0x1009	PrismGT USB 2.0 WLAN

From owner-p4-projects@FreeBSD.ORG  Thu Apr  1 22:22:10 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D44BB106566C; Thu,  1 Apr 2010 22:22:09 +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 97B9E106564A
	for ; Thu,  1 Apr 2010 22:22:09 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 839AD8FC1A
	for ; Thu,  1 Apr 2010 22:22:09 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o31MM9BG028166
	for ; Thu, 1 Apr 2010 22:22:09 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o31MM8gh028163
	for perforce@freebsd.org; Thu, 1 Apr 2010 22:22:08 GMT
	(envelope-from mav@freebsd.org)
Date: Thu, 1 Apr 2010 22:22:08 GMT
Message-Id: <201004012222.o31MM8gh028163@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 176430 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 01 Apr 2010 22:22:10 -0000

http://p4web.freebsd.org/chv.cgi?CH=176430

Change 176430 by mav@mav_mavbook on 2010/04/01 22:21:21

	IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/bin/pax/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/bin/pax/cpio.1#2 delete
.. //depot/projects/scottl-camlock/src/bin/pax/getoldopt.c#2 integrate
.. //depot/projects/scottl-camlock/src/bin/pax/tar.1#2 delete
.. //depot/projects/scottl-camlock/src/contrib/top/utils.h#2 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/CHANGES#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/FAQ#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/NEWS#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/README#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/apps/req.c#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/apps/speed.c#5 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/config#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/crypto/asn1/a_object.c#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/crypto/bio/bss_file.c#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/crypto/bn/asm/ppc.pl#2 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/crypto/bn/bn_div.c#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/crypto/engine/eng_all.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/crypto/engine/eng_cryptodev.c#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/crypto/evp/digest.c#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/crypto/evp/evp_locl.h#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/crypto/evp/names.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/crypto/md32_common.h#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/crypto/ocsp/ocsp_prn.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/crypto/opensslv.h#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/crypto/rand/rand_win.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/engines/e_capi.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/engines/e_chil.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/fips/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/openssl.spec#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/ssl/kssl.c#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/ssl/s3_pkt.c#5 integrate
.. //depot/projects/scottl-camlock/src/etc/inetd.conf#4 integrate
.. //depot/projects/scottl-camlock/src/games/fortune/Notes#2 integrate
.. //depot/projects/scottl-camlock/src/games/fortune/datfiles/fortunes#11 integrate
.. //depot/projects/scottl-camlock/src/games/fortune/datfiles/fortunes-o.real#9 integrate
.. //depot/projects/scottl-camlock/src/games/fortune/datfiles/fortunes.sp.ok#4 integrate
.. //depot/projects/scottl-camlock/src/games/fortune/datfiles/limerick#3 integrate
.. //depot/projects/scottl-camlock/src/games/fortune/datfiles/startrek#3 integrate
.. //depot/projects/scottl-camlock/src/games/fortune/datfiles/zippy#3 integrate
.. //depot/projects/scottl-camlock/src/include/inttypes.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/__getosreldate.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/_spinlock_stub.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/_thread_init.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libstand/assert.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/ChangeLog#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/README#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/crc32.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/deflate.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/gzguts.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/gzlib.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/gzread.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/inftrees.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/minigzip.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/zconf.h#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/zlib.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/zlib.h#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/zutil.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/zutil.h#3 integrate
.. //depot/projects/scottl-camlock/src/libexec/fingerd/fingerd.8#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/fingerd/fingerd.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/geom/class/multipath/geom_multipath.c#5 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/Makefile.inc#5 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ASN1_OBJECT_new.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ASN1_STRING_length.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ASN1_STRING_new.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ASN1_generate_nconf.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_ctrl.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_f_base64.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_f_buffer.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_f_cipher.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_f_md.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_f_null.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_f_ssl.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_find_type.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_new.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_push.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_read.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_s_accept.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_s_bio.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_s_connect.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_s_fd.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_s_file.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_s_mem.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_s_null.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_s_socket.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_set_callback.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_should_retry.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_BLINDING_new.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_CTX_new.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_CTX_start.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_add.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_add_word.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_bn2bin.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_cmp.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_copy.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_generate_prime.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_mod_inverse.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_new.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_num_bytes.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_rand.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_set_bit.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_swap.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_zero.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/CONF_modules_free.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/CONF_modules_load_file.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DH_generate_key.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DH_generate_parameters.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DH_get_ex_new_index.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DH_new.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DH_set_method.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DH_size.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DSA_SIG_new.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DSA_do_sign.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DSA_dup_DH.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DSA_generate_key.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DSA_generate_parameters.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DSA_get_ex_new_index.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DSA_new.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DSA_set_method.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DSA_sign.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DSA_size.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ERR_GET_LIB.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ERR_clear_error.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ERR_error_string.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ERR_get_error.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ERR_load_crypto_strings.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ERR_load_strings.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ERR_print_errors.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ERR_put_error.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ERR_remove_state.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ERR_set_mark.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/EVP_BytesToKey.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/EVP_DigestInit.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/EVP_EncryptInit.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/EVP_OpenInit.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/EVP_PKEY_new.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/EVP_SealInit.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/EVP_SignInit.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/EVP_VerifyInit.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/OBJ_nid2obj.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/OPENSSL_Applink.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/OPENSSL_config.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/OPENSSL_ia32cap.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/PKCS12_create.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/PKCS12_parse.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/PKCS7_decrypt.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/PKCS7_encrypt.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/PKCS7_sign.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/PKCS7_verify.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RAND_add.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RAND_bytes.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RAND_cleanup.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RAND_egd.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RAND_load_file.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RAND_set_rand_method.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RSA_blinding_on.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RSA_check_key.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RSA_generate_key.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RSA_get_ex_new_index.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RSA_new.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RSA_print.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RSA_private_encrypt.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RSA_public_encrypt.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RSA_set_method.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RSA_sign.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RSA_size.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/SMIME_read_PKCS7.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/SMIME_write_PKCS7.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/X509_NAME_print_ex.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/X509_new.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/bio.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/blowfish.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/bn.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/bn_internal.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/buffer.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/crypto.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/d2i_DHparams.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/d2i_DSAPublicKey.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/d2i_RSAPublicKey.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/d2i_X509.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/d2i_X509_ALGOR.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/d2i_X509_CRL.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/d2i_X509_NAME.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/d2i_X509_REQ.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/d2i_X509_SIG.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/des.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/dh.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/dsa.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ecdsa.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/engine.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/err.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/evp.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/hmac.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/lh_stats.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/lhash.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/md5.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/mdc2.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/pem.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/rand.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/rc4.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ripemd.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/rsa.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/sha.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/threads.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ui.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ui_compat.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/x509.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CIPHER_get_name.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_COMP_add_compression_method.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_add_session.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_ctrl.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_flush_sessions.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_free.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_new.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_sess_number.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_sessions.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_cert_store.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_info_callback.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_mode.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_options.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_timeout.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_verify.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_use_certificate.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_SESSION_free.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_SESSION_get_time.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_accept.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_alert_type_string.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_clear.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_connect.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_do_handshake.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_free.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_get_SSL_CTX.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_get_ciphers.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_get_client_CA_list.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_get_current_cipher.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_get_default_timeout.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_get_error.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_get_ex_new_index.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_get_fd.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_get_peer_cert_chain.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_get_peer_certificate.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_get_rbio.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_get_session.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_get_verify_result.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_get_version.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_library_init.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_load_client_CA_file.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_new.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_pending.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_read.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_rstate_string.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_session_reused.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_set_bio.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_set_connect_state.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_set_fd.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_set_session.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_set_shutdown.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_set_verify_result.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_shutdown.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_state_string.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_want.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_write.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/d2i_SSL_SESSION.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/ssl.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/CA.pl.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/asn1parse.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/ca.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/ciphers.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/crl.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/crl2pkcs7.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/dgst.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/dhparam.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/dsa.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/dsaparam.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/ec.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/ecparam.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/enc.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/errstr.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/gendsa.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/genrsa.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/nseq.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/ocsp.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/openssl.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/passwd.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/pkcs12.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/pkcs7.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/pkcs8.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/rand.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/req.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/rsa.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/rsautl.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/s_client.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/s_server.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/s_time.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/sess_id.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/smime.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/speed.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/spkac.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/verify.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/version.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/x509.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/x509v3_config.1#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man7/build.7#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/ieee80211.9#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/ieee80211_crypto.9#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/ieee80211_node.9#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/ieee80211_output.9#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/ieee80211_scan.9#4 integrate
.. //depot/projects/scottl-camlock/src/share/misc/committers-ports.dot#9 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/apic_vector.S#11 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/local_apic.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/apicvar.h#20 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/reg.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/KB920X#15 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/mv_sata.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#154 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_all.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/NOTES#54 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files#69 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#31 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_ael1002.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_common.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_t3_hw.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_adapter.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_main.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_sge.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_80003es2lan.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82571.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82575.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82575.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_defines.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_hw.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_ich8lan.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_ich8lan.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_mac.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_manage.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_phy.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_regs.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_em.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_em.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_lem.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_lem.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/firewire/sbp.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_mod.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/malo/if_malo.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.c#33 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/envy24.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/envy24.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/envy24ht.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/envy24ht.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/es137x.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/spicds.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/spicds.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/scvidctl.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/syscons.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ubsec/ubsec.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonport.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonsubs.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_var.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfsport.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfsrvstate.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdstate.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/geom_vfs.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/multipath/g_multipath.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/apic_vector.s#8 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/local_apic.c#28 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/apicvar.h#20 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_alq.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_event.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/conf/AR71XX#5 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/Makefile#48 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/alq/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/modules/em/Makefile#7 integrate
.. //depot/projects/scottl-camlock/src/sys/net/bpf.c#29 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_input.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_var.h#22 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_deflate.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ksocket.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_l2tp.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_mppc.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ppp.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_pptpgre.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_tcpmss.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in.h#18 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_sockopt.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/fhc/fhc.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/apb.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/psycho.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/schizo.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sbus/sbus.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/ioccom.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/pcpu.h#17 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/vtoc.h#3 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/gateworks/common#2 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/nanobsd.sh#6 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendar.1#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendar.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendar.h#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendars/calendar.australia#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendars/calendar.freebsd#10 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/dates.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/day.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/events.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/io.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/locale.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/parsedata.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/pathnames.h#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/pom.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/sunpos.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/indent/args.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/indent/indent.1#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/indent/indent.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/indent/indent_globs.h#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/indent/lexi.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/sed/main.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/sed/sed.1#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/sockstat/sockstat.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/Makefile#11 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/config/config.y#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/config/lang.l#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/config/main.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/config/mkmakefile.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/config/mkoptions.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/mailwrapper/mailwrapper.8#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/mailwrapper/mailwrapper.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/mtree/mtree.8#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/add/futil.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/add/perform.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/delete/perform.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/file.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/lib.h#7 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/match.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/pen.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/url.c#6 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/version/perform.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/vidcontrol/vidcontrol.c#3 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/bin/pax/Makefile#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #       @(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/pax/Makefile,v 1.14 2010/02/07 17:05:22 imp Exp $
+# $FreeBSD: src/bin/pax/Makefile,v 1.15 2010/03/30 23:10:56 delphij Exp $
 
 # To install on versions prior to BSD 4.4 the following may have to be
 # defined with CFLAGS +=
@@ -29,8 +29,5 @@
 SRCS=	ar_io.c ar_subs.c buf_subs.c cache.c cpio.c file_subs.c ftree.c \
 	gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c \
 	tables.c tar.c tty_subs.c
-#XXX NOTYET
-#MAN=	pax.1 tar.1 cpio.1
-#LINKS=	${BINDIR}/pax ${BINDIR}/tar ${BINDIR}/pax ${BINDIR}/cpio
 
 .include 

==== //depot/projects/scottl-camlock/src/bin/pax/getoldopt.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$OpenBSD: getoldopt.c,v 1.4 2000/01/22 20:24:51 deraadt Exp $	*/
+/*	$OpenBSD: getoldopt.c,v 1.9 2009/10/27 23:59:22 deraadt Exp $	*/
 /*	$NetBSD: getoldopt.c,v 1.3 1995/03/21 09:07:28 cgd Exp $	*/
 
 /*-
@@ -7,11 +7,11 @@
  * otherwise, it uses the old rules used by tar, dump, and ps.
  *
  * Written 25 August 1985 by John Gilmore (ihnp4!hoptoad!gnu) and placed
- * in the Pubic Domain for your edification and enjoyment.
+ * in the Public Domain for your edification and enjoyment.
  */
 
 #include 
-__FBSDID("$FreeBSD: src/bin/pax/getoldopt.c,v 1.5 2005/01/10 08:39:24 imp Exp $");
+__FBSDID("$FreeBSD: src/bin/pax/getoldopt.c,v 1.6 2010/03/30 23:14:35 delphij Exp $");
 
 #include 
 #include 
@@ -33,7 +33,8 @@
 	optarg = NULL;
 
 	if (key == NULL) {		/* First time */
-		if (argc < 2) return EOF;
+		if (argc < 2)
+			return (-1);
 		key = argv[1];
 		if (*key == '-')
 			use_getopt++;
@@ -42,18 +43,18 @@
 	}
 
 	if (use_getopt)
-		return getopt(argc, argv, optstring);
+		return (getopt(argc, argv, optstring));
 
 	c = *key++;
 	if (c == '\0') {
 		key--;
-		return EOF;
+		return (-1);
 	}
 	place = strchr(optstring, c);
 
 	if (place == NULL || c == ':') {
 		fprintf(stderr, "%s: unknown option %c\n", argv[0], c);
-		return('?');
+		return ('?');
 	}
 
 	place++;
@@ -64,9 +65,9 @@
 		} else {
 			fprintf(stderr, "%s: %c argument missing\n",
 				argv[0], c);
-			return('?');
+			return ('?');
 		}
 	}
 
-	return(c);
+	return (c);
 }

==== //depot/projects/scottl-camlock/src/contrib/top/utils.h#2 (text+ko) ====

@@ -21,4 +21,4 @@
 char *errmsg();
 char *format_time();
 char *format_k();
-char *format_k2();
+char *format_k2(unsigned long long);

==== //depot/projects/scottl-camlock/src/crypto/openssl/CHANGES#4 (text+ko) ====

@@ -2,6 +2,21 @@
  OpenSSL CHANGES
  _______________
 
+ Changes between 0.9.8m and 0.9.8n [24 Mar 2010]
+
+  *) When rejecting SSL/TLS records due to an incorrect version number, never
+     update s->server with a new major version number.  As of
+     - OpenSSL 0.9.8m if 'short' is a 16-bit type,
+     - OpenSSL 0.9.8f if 'short' is longer than 16 bits,
+     the previous behavior could result in a read attempt at NULL when
+     receiving specific incorrect SSL/TLS records once record payload
+     protection is active.  (CVE-2010-0740)
+     [Bodo Moeller, Adam Langley ]
+
+  *) Fix for CVE-2010-0433 where some kerberos enabled versions of OpenSSL 
+     could be crashed if the relevant tables were not present (e.g. chrooted).
+     [Tomas Hoger ]
+
  Changes between 0.9.8l and 0.9.8m [25 Feb 2010]
 
   *) Always check bn_wexpend() return values for failure.  (CVE-2009-3245)

==== //depot/projects/scottl-camlock/src/crypto/openssl/FAQ#4 (text+ko) ====

@@ -78,7 +78,7 @@
 * Which is the current version of OpenSSL?
 
 The current version is available from .
-OpenSSL 0.9.8m was released on Feb 25th, 2010.
+OpenSSL 0.9.8n was released on Mar 24th, 2010.
 
 In addition to the current stable release, you can also access daily
 snapshots of the OpenSSL development version at value,def,value,nid,n_min,n_max, chtype))

==== //depot/projects/scottl-camlock/src/crypto/openssl/apps/speed.c#5 (text+ko) ====

@@ -254,12 +254,18 @@
 # endif
 #endif
 
-#if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MACINTOSH_CLASSIC) || defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_NETWARE)
-# define NO_FORK 1
-#elif HAVE_FORK
+#ifndef HAVE_FORK
+# if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MACINTOSH_CLASSIC) || defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_NETWARE)
+#  define HAVE_FORK 0
+# else
+#  define HAVE_FORK 1
+# endif
+#endif
+
+#if HAVE_FORK
 # undef NO_FORK
 #else
-# define NO_FORK 1
+# define NO_FORK
 #endif
 
 #undef BUFSIZE

==== //depot/projects/scottl-camlock/src/crypto/openssl/config#4 (text+ko) ====

@@ -741,6 +741,10 @@
 	OBJECT_MODE=${OBJECT_MODE:-32}
 	if [ "$CC" = "gcc" ]; then
 	    OUT="aix-gcc"
+          if [ $OBJECT_MODE -eq 64 ]; then
+            echo 'Your $OBJECT_MODE was found to be set to 64'
+            OUT="aix64-gcc"
+          fi
 	elif [ $OBJECT_MODE -eq 64 ]; then
 	    echo 'Your $OBJECT_MODE was found to be set to 64' 
 	    OUT="aix64-cc"

==== //depot/projects/scottl-camlock/src/crypto/openssl/crypto/asn1/a_object.c#4 (text+ko) ====

@@ -291,12 +291,12 @@
 	ASN1_OBJECT *ret=NULL;
 	const unsigned char *p;
 	int i;
-	/* Sanity check OID encoding: can't have 0x80 in subidentifiers, see:
-	 * X.690 8.19.2
+	/* Sanity check OID encoding: can't have leading 0x80 in
+	 * subidentifiers, see: X.690 8.19.2
 	 */
 	for (i = 0, p = *pp + 1; i < len - 1; i++, p++)
 		{
-		if (*p == 0x80)
+		if (*p == 0x80 && (!i || !(p[-1] & 0x80)))
 			{
 			ASN1err(ASN1_F_C2I_ASN1_OBJECT,ASN1_R_INVALID_OBJECT_ENCODING);
 			return NULL;

==== //depot/projects/scottl-camlock/src/crypto/openssl/crypto/bio/bss_file.c#4 (text+ko) ====

@@ -272,9 +272,9 @@
 			BIO_clear_flags(b,BIO_FLAGS_UPLINK);
 #endif
 #endif
-#ifdef UP_fsetmode
+#ifdef UP_fsetmod
 		if (b->flags&BIO_FLAGS_UPLINK)
-			UP_fsetmode(b->ptr,num&BIO_FP_TEXT?'t':'b');
+			UP_fsetmod(b->ptr,(char)((num&BIO_FP_TEXT)?'t':'b'));
 		else
 #endif
 		{

==== //depot/projects/scottl-camlock/src/crypto/openssl/crypto/bn/asm/ppc.pl#2 (text+ko) ====

@@ -2074,5 +2074,7 @@
 	$data =~ s/^(\s*)cmplw(\s+)([^,]+),(.*)/$1cmpl$2$3,0,$4/gm;
 	# assembler X doesn't accept li, load immediate value
 	#$data =~ s/^(\s*)li(\s+)([^,]+),(.*)/$1addi$2$3,0,$4/gm;
+	# assembler Y chokes on apostrophes in comments
+	$data =~ s/'//gm;
 	return($data);
 }

==== //depot/projects/scottl-camlock/src/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#3 (text+ko) ====

@@ -59,6 +59,7 @@
 
 #undef mul
 #undef mul_add
+#undef sqr
 
 /*
  * "m"(a), "+m"(r)	is the way to favor DirectPath µ-code;

==== //depot/projects/scottl-camlock/src/crypto/openssl/crypto/bn/bn_div.c#4 (text+ko) ====

@@ -337,7 +337,10 @@
 				t2 -= d1;
 				}
 #else /* !BN_LLONG */
-			BN_ULONG t2l,t2h,ql,qh;
+			BN_ULONG t2l,t2h;
+#if !defined(BN_UMULT_LOHI) && !defined(BN_UMULT_HIGH)
+			BN_ULONG ql,qh;
+#endif
 
 			q=bn_div_words(n0,n1,d0);
 #ifdef BN_DEBUG_LEVITTE
@@ -561,7 +564,10 @@
 				t2 -= d1;
 				}
 #else /* !BN_LLONG */
-			BN_ULONG t2l,t2h,ql,qh;
+			BN_ULONG t2l,t2h;
+#if !defined(BN_UMULT_LOHI) && !defined(BN_UMULT_HIGH)
+			BN_ULONG ql,qh;
+#endif
 
 			q=bn_div_words(n0,n1,d0);
 #ifdef BN_DEBUG_LEVITTE

==== //depot/projects/scottl-camlock/src/crypto/openssl/crypto/engine/eng_all.c#3 (text+ko) ====

@@ -104,7 +104,7 @@
 #endif
 #endif
 #ifndef OPENSSL_NO_HW
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
 	ENGINE_load_cryptodev();
 #endif
 #if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)

==== //depot/projects/scottl-camlock/src/crypto/openssl/crypto/engine/eng_cryptodev.c#4 (text+ko) ====

@@ -755,10 +755,18 @@
 		goto err;
 	kop.crk_iparams = 3;
 
-	if (cryptodev_asym(&kop, BN_num_bytes(m), r, 0, NULL) == -1) {
+	if (cryptodev_asym(&kop, BN_num_bytes(m), r, 0, NULL)) {
+		const RSA_METHOD *meth = RSA_PKCS1_SSLeay();
+		printf("OCF asym process failed, Running in software\n");
+		ret = meth->bn_mod_exp(r, a, p, m, ctx, in_mont);
+
+	} else if (ECANCELED == kop.crk_status) {
 		const RSA_METHOD *meth = RSA_PKCS1_SSLeay();
+		printf("OCF hardware operation cancelled. Running in Software\n");
 		ret = meth->bn_mod_exp(r, a, p, m, ctx, in_mont);
 	}
+	/* else cryptodev operation worked ok ==> ret = 1*/
+
 err:
 	zapparams(&kop);
 	return (ret);
@@ -801,10 +809,18 @@
 		goto err;
 	kop.crk_iparams = 6;
 
-	if (cryptodev_asym(&kop, BN_num_bytes(rsa->n), r0, 0, NULL) == -1) {
+	if (cryptodev_asym(&kop, BN_num_bytes(rsa->n), r0, 0, NULL)) {
+		const RSA_METHOD *meth = RSA_PKCS1_SSLeay();
+		printf("OCF asym process failed, running in Software\n");
+		ret = (*meth->rsa_mod_exp)(r0, I, rsa, ctx);
+
+	} else if (ECANCELED == kop.crk_status) {
 		const RSA_METHOD *meth = RSA_PKCS1_SSLeay();
+		printf("OCF hardware operation cancelled. Running in Software\n");
 		ret = (*meth->rsa_mod_exp)(r0, I, rsa, ctx);
 	}
+	/* else cryptodev operation worked ok ==> ret = 1*/
+
 err:
 	zapparams(&kop);
 	return (ret);
@@ -940,7 +956,8 @@
 	kop.crk_iparams = 7;
 
 	if (cryptodev_asym(&kop, 0, NULL, 0, NULL) == 0) {
-		dsaret = kop.crk_status;
+/*OCF success value is 0, if not zero, change dsaret to fail*/
+		if(0 != kop.crk_status) dsaret  = 0;
 	} else {
 		const DSA_METHOD *meth = DSA_OpenSSL();
 

==== //depot/projects/scottl-camlock/src/crypto/openssl/crypto/evp/digest.c#4 (text+ko) ====

@@ -235,6 +235,7 @@
 				{
 				/* Same comment from evp_enc.c */
 				EVPerr(EVP_F_DO_EVP_MD_ENGINE,EVP_R_INITIALIZATION_ERROR);
+				ENGINE_finish(impl);
 				return 0;
 				}
 			/* We'll use the ENGINE's private digest definition */

==== //depot/projects/scottl-camlock/src/crypto/openssl/crypto/evp/evp_locl.h#4 (text+ko) ====

@@ -127,9 +127,9 @@
 #define BLOCK_CIPHER_def_cfb(cname, kstruct, nid, key_len, \
 			     iv_len, cbits, flags, init_key, cleanup, \
 			     set_asn1, get_asn1, ctrl) \
-BLOCK_CIPHER_def1(cname, cfb##cbits, cfb##cbits, CFB, kstruct, nid, \
-			(cbits + 7)/8, key_len, iv_len, \
-		flags, init_key, cleanup, set_asn1, get_asn1, ctrl)
+BLOCK_CIPHER_def1(cname, cfb##cbits, cfb##cbits, CFB, kstruct, nid, 1, \
+		  key_len, iv_len, flags, init_key, cleanup, set_asn1, \
+		  get_asn1, ctrl)
 
 #define BLOCK_CIPHER_def_ofb(cname, kstruct, nid, key_len, \
 			     iv_len, cbits, flags, init_key, cleanup, \

==== //depot/projects/scottl-camlock/src/crypto/openssl/crypto/evp/names.c#3 (text+ko) ====

@@ -90,7 +90,7 @@
 	r=OBJ_NAME_add(OBJ_nid2ln(md->type),OBJ_NAME_TYPE_MD_METH,(const char *)md);
 	if (r == 0) return(0);
 
-	if (md->type != md->pkey_type)
+	if (md->pkey_type && md->type != md->pkey_type)
 		{
 		r=OBJ_NAME_add(OBJ_nid2sn(md->pkey_type),
 			OBJ_NAME_TYPE_MD_METH|OBJ_NAME_ALIAS,name);

==== //depot/projects/scottl-camlock/src/crypto/openssl/crypto/md32_common.h#3 (text+ko) ====

@@ -241,11 +241,11 @@
 #ifndef PEDANTIC
 # if defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
 #  if defined(__s390x__)
-#   define HOST_c2l(c,l)	({ asm ("lrv	%0,0(%1)"		\
-					:"=r"(l) : "r"(c));		\
+#   define HOST_c2l(c,l)	({ asm ("lrv	%0,%1"			\
+				   :"=d"(l) :"m"(*(const unsigned int *)(c));\
 				   (c)+=4; (l);				})
-#   define HOST_l2c(l,c)	({ asm ("strv	%0,0(%1)"		\
-					: : "r"(l),"r"(c) : "memory");	\
+#   define HOST_l2c(l,c)	({ asm ("strv	%1,%0"			\
+				   :"=m"(*(unsigned int *)(c)) :"d"(l));\
 				   (c)+=4; (l);				})
 #  endif
 # endif

==== //depot/projects/scottl-camlock/src/crypto/openssl/crypto/ocsp/ocsp_prn.c#3 (text+ko) ====

@@ -275,6 +275,7 @@
 		}
 	if (!X509V3_extensions_print(bp, "Response Extensions",
 					rd->responseExtensions, flags, 4))
+							goto err;
 	if(X509_signature_print(bp, br->signatureAlgorithm, br->signature) <= 0)
 							goto err;
 

==== //depot/projects/scottl-camlock/src/crypto/openssl/crypto/opensslv.h#4 (text+ko) ====

@@ -25,11 +25,11 @@
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-#define OPENSSL_VERSION_NUMBER	0x009080dfL
+#define OPENSSL_VERSION_NUMBER	0x009080efL
 #ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8m-fips 25 Feb 2010"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8n-fips 24 Mar 2010"
 #else
-#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8m 25 Feb 2010"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8n 24 Mar 2010"
 #endif
 #define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT
 

==== //depot/projects/scottl-camlock/src/crypto/openssl/crypto/rand/rand_win.c#3 (text+ko) ====

@@ -750,7 +750,7 @@
   int		y;		/* y-coordinate of screen lines to grab */
   int		n = 16;		/* number of screen lines to grab at a time */
 
-  if (GetVersion() >= 0x80000000 || !OPENSSL_isservice())
+  if (GetVersion() < 0x80000000 && OPENSSL_isservice()>0)
     return;
 
   /* Create a screen DC and a memory DC compatible to screen DC */

==== //depot/projects/scottl-camlock/src/crypto/openssl/engines/e_capi.c#3 (text+ko) ====

@@ -83,6 +83,10 @@
 #define CERT_STORE_CREATE_NEW_FLAG                      0x00002000
 #endif
 
+#ifndef CERT_SYSTEM_STORE_CURRENT_USER
+#define CERT_SYSTEM_STORE_CURRENT_USER			0x00010000
+#endif 
+
 #include 
 #include 
 #include 

==== //depot/projects/scottl-camlock/src/crypto/openssl/engines/e_chil.c#3 (text+ko) ====

@@ -1204,6 +1204,11 @@
 	pem_password_cb *callback = NULL;
 	void *callback_data = NULL;
         UI_METHOD *ui_method = NULL;
+	/* Despite what the documentation says prompt_info can be
+	 * an empty string.
+	 */
+	if (prompt_info && !*prompt_info)
+		prompt_info = NULL;
 
         if (cactx)
                 {
@@ -1305,8 +1310,10 @@
 		{
 		char answer;
 		char buf[BUFSIZ];
-
-		if (wrong_info)
+		/* Despite what the documentation says wrong_info can be

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

From owner-p4-projects@FreeBSD.ORG  Fri Apr  2 07:13:46 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A21431065673; Fri,  2 Apr 2010 07:13: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 3F310106566B
	for ; Fri,  2 Apr 2010 07:13:46 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2A2EC8FC13
	for ; Fri,  2 Apr 2010 07:13:46 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o327DkAv098122
	for ; Fri, 2 Apr 2010 07:13:46 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o327Dibr098116
	for perforce@freebsd.org; Fri, 2 Apr 2010 07:13:44 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Fri, 2 Apr 2010 07:13:44 GMT
Message-Id: <201004020713.o327Dibr098116@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gcooper@FreeBSD.org using -f
From: Garrett Cooper 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 176439 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Apr 2010 07:13:47 -0000

http://p4web.freebsd.org/chv.cgi?CH=176439

Change 176439 by gcooper@gcooper-bayonetta on 2010/04/02 07:13:41

	IFC.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/jails/chapter.sgml#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/greek-language-support/article.sgml#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/mirrors/chapter.sgml#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/share/sgml/authors.ent#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.sgml#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/ja_JP.eucJP/books/handbook/x11/chapter.sgml#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.sgml#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/mn_MN.UTF-8/books/handbook/mirrors/chapter.sgml#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/articles/releng/branches-releng7.pic#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/corp-net-guide/08-05.eps#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/corp-net-guide/08-06.eps#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/design-44bsd/fig1.eps#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/design-44bsd/fig2.eps#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/dev-model/branches.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/dev-model/branches.sla#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/dev-model/freebsd-code-model.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/dev-model/hats-overview.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/dev-model/maintenance.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/dev-model/orghierarchy.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/dev-model/orghierarchy.sla#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/dev-model/orghierarchy2.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/dev-model/portsstatus.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/dev-model/proc-add-committer.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/dev-model/proc-add-cvsup.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/dev-model/proc-commit.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/dev-model/proc-contrib.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/dev-model/proc-elections.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/dev-model/proc-pr.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/dev-model/proc-releng.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/dev-model/proc-rm-committer.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/developers-handbook/sockets/layers.eps#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/developers-handbook/sockets/sain.eps#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/developers-handbook/sockets/sainfill.eps#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/developers-handbook/sockets/sainlsb.eps#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/developers-handbook/sockets/sainmsb.eps#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/developers-handbook/sockets/sainserv.eps#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/developers-handbook/sockets/serv.eps#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/developers-handbook/sockets/serv2.eps#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/developers-handbook/sockets/slayers.eps#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/advanced-networking/isdn-bus.eps#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/advanced-networking/isdn-twisted-pair.eps#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/advanced-networking/natd.eps#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/advanced-networking/net-routing.pic#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/advanced-networking/static-routes.pic#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/geom/striping.pic#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/adduser1.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/adduser2.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/adduser3.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/boot-loader-menu.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/boot-mgr.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/config-country.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/console-saver1.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/console-saver2.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/console-saver3.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/console-saver4.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/desktop.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/disk-layout.eps#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/disklabel-auto.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/disklabel-ed1.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/disklabel-ed2.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/disklabel-fs.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/disklabel-root1.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/disklabel-root2.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/disklabel-root3.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/dist-set.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/dist-set2.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/docmenu1.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/ed0-conf.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/ed0-conf2.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/edit-inetd-conf.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/example-dir1.eps#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/example-dir2.eps#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/example-dir3.eps#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/example-dir4.eps#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/example-dir5.eps#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/fdisk-drive1.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/fdisk-drive2.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/fdisk-edit1.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/fdisk-edit2.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/ftp-anon1.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/ftp-anon2.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/hdwrconf.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/keymap.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/main-doc.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/main-keymap.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/main-options.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/main-std.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/main1.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/mainexit.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/media.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/mouse1.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/mouse2.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/mouse3.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/mouse4.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/mouse5.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/mouse6.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/mta-main.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/net-config-menu1.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/net-config-menu2.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/nfs-server-edit.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/ntp-config.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/options.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/pkg-cat.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/pkg-confirm.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/pkg-install.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/pkg-sel.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/probstart.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/routed.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/security.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/sysinstall-exit.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/timezone1.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/timezone2.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/timezone3.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/userconfig.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/userconfig2.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/install/xf86setup.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/mail/mutt1.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/mail/mutt2.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/mail/mutt3.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/mail/pine1.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/mail/pine2.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/mail/pine3.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/mail/pine4.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/mail/pine5.scr#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/security/ipsec-crypt-pkt.pic#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/security/ipsec-encap-pkt.pic#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/security/ipsec-network.pic#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/security/ipsec-out-pkt.pic#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/vinum/vinum-concat.pic#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/vinum/vinum-mirrored-vol.pic#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/vinum/vinum-raid10-vol.pic#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/vinum/vinum-raid5-org.pic#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/vinum/vinum-simple-vol.pic#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/vinum/vinum-striped-vol.pic#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/vinum/vinum-striped.pic#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/parallels-freebsd1.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/parallels-freebsd10.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/parallels-freebsd11.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/parallels-freebsd12.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/parallels-freebsd13.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/parallels-freebsd2.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/parallels-freebsd3.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/parallels-freebsd4.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/parallels-freebsd5.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/parallels-freebsd6.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/parallels-freebsd7.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/parallels-freebsd8.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/parallels-freebsd9.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/virtualpc-freebsd1.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/virtualpc-freebsd10.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/virtualpc-freebsd11.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/virtualpc-freebsd12.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/virtualpc-freebsd13.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/virtualpc-freebsd2.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/virtualpc-freebsd3.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/virtualpc-freebsd4.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/virtualpc-freebsd5.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/virtualpc-freebsd6.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/virtualpc-freebsd7.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/virtualpc-freebsd8.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/virtualpc-freebsd9.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/vmware-freebsd01.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/vmware-freebsd02.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/vmware-freebsd03.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/vmware-freebsd04.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/vmware-freebsd05.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/vmware-freebsd06.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/vmware-freebsd07.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/vmware-freebsd08.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/vmware-freebsd09.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/vmware-freebsd10.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/vmware-freebsd11.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/books/handbook/virtualization/vmware-freebsd12.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/callouts/1.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/callouts/10.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/callouts/11.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/callouts/12.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/callouts/13.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/callouts/14.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/callouts/15.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/callouts/2.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/callouts/3.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/callouts/4.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/callouts/5.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/callouts/6.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/callouts/7.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/callouts/8.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/callouts/9.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/flyer/beastie.eps#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/images/flyer/logo-full.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/misc/docbook.css#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/misc/epsgeom#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/misc/indexreport.pl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/mk/doc.common.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/mk/doc.docbook.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/mk/doc.html.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/mk/doc.images.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/mk/doc.install.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/mk/doc.project.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/mk/doc.slides.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/mk/doc.subdir.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/mk/doc.xml.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/openoffice/BSDi.xsl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/openoffice/BSDi/META-INF/manifest.xml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/openoffice/BSDi/Pictures/10000000000004220000031AEAC840AF.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/openoffice/BSDi/meta.xml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/openoffice/BSDi/mimetype#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/openoffice/BSDi/settings.xml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/openoffice/BSDi/styles.xml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/openoffice/include.xsl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/README#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/aaron.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/ache.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/acm.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/adamw.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/addkey.sh#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/ahze.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/ale.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/alepulver.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/alex.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/alexbl.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/amdmi3.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/anders.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/andreas.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/anholt.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/anray.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/antoine.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/araujo.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/ariff.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/arun.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/arved.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/asami.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/avatar.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/avg.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/avilla.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/avl.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/bakul.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/barner.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/bcr.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/beat.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/beech.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/ben.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/benjsc.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/benno.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/billf.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/blackend.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/bland.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/bmah.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/bms.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/brd.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/brian.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/brix.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/brooks.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/brucec.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/brueffer.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/bruno.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/bsam.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/bschmidt.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/bsd.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/bushman.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/bvs.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/bz.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/cel.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/ceri.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/chinsan.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/cjc.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/cjh.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/clement.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/clive.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/clsung.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/cokane.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/core-secretary.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/cperciva.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/cshumway.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/csjp.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/daichi.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/damien.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/danfe.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/danger.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/dannyboy.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/das.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/davidxu.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/db.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/dchagin.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/dcs.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/dd.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/delphij.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/demon.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/den.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/des.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/dfr.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/dhartmei.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/dhn.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/dinoex.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/dougb.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/dryice.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/dwmalone.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/ed.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/ehaupt.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/emax.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/erwin.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/fabient.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/fanf.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/farrokhi.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/fjoe.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/fluffy.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/flz.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/foxfair.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/gabor.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/gahr.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/ganbold.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/garga.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/garys.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/gavin.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/gerald.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/ghelmer.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/gioria.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/glarkin.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/glebius.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/glewis.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/gnn.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/gordon.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/green.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/grehan.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/gshapiro.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/gsutter.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/guido.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/harti.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/hmp.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/hq.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/hrs.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/ijliao.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/imp.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/itetcu.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/ivoras.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/jadawin.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/jamie.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/jcamou.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/jdp.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/jedgar.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/jesper.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/jh.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/jhay.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/jhb.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/jilles.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/jim.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/jinmei.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/jkh.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/jkim.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/jkois.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/jkoshy.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/jmb.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/jmelo.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/jmg.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/joe.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/joerg.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/johans.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/jon.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/josef.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/jpaetzel.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/jylefort.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/kaiw.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/ken.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/kensmith.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/keramida.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/keyring.pl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/kib.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/kmoore.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/knu.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/koitsu.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/krion.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/kris.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/kuriyama.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/kwm.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/laszlof.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/lawrance.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/lbr.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/le.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/leeym.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/lesi.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/linimon.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/lioux.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/lippe.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/lme.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/loader.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/lofi.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/lth.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/lulf.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/luoqi.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/lwhsu.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/lx.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/maho.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/makc.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/mandree.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/manolis.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/marcel.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/marck.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/marcus.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/marius.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/markp.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/marks.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/markus.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/mat.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/matteo.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/matusita.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/mav.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/max.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/maxim.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/mbr.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/metal.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/mheinen.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/mi.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/mich.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/mikeh.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/miwi.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/mlaier.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/mm.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/mnag.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/mp.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/mtm.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/murray.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/mux.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/mva.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/nate.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/nectar.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/nemoliu.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/netchild.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/niels.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/nik.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/niklas.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/nivit.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/njl.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/nork.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/novel.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/nox.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/np.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/nsouch.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/nwhitehorn.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/nyan.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/obraun.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/obrien.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/oleg.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/patrick.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/paul.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/pav.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/peadar.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/perky.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/petef.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/peter.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/pgj.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/pgollucci.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/pgpkeys-core.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/pgpkeys-developers.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/pgpkeys-officers.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/pgpkeys.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/phantom.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/philip.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/phk.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/pho.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/pirzyk.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/pjd.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/portmgr-secretary.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/rafan.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/rdivacky.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/rees.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/remko.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/rene.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/rich.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/rik.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/rink.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/rmacklem.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/rnoland.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/roam.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/roberto.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/rodrigc.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/rpaulo.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/rrs.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/ru.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/rushani.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/ryusuke.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/sam.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/sanpei.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/sat.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/schweikh.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/scop.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/scottl.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/seanc.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/security-officer.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/sem.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/sephe.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/sepotvin.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/sergei.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/shaun.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/sheldonh.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/simon.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/skreuzer.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/snb.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/sobomax.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/sson.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/ssouhlal.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/stas.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/stefan.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/stefanf.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/stephane.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/sylvio.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/syrinx.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/tabthorpe.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/tdb.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/thierry.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/thomas.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/thompsa.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/timur.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/tmclaugh.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/tmm.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/tobez.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/tota.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/trasz.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/trevor.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/trhodes.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/tuexen.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/twinterg.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/ue.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/ume.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/ups.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/uqs.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/vanilla.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/vd.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/versus.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/viny.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/vkashyap.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/vs.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/vsevolod.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/weongyo.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/wes.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/wilko.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/will.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/wkoszek.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/wollman.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/wosch.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/wxs.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/xride.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/yar.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/yoichi.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/yzlin.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/zml.key#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/sgml/README.mirrors#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/sgml/articles.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/sgml/bibliography.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/sgml/books.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/sgml/catalog#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/sgml/default.dsl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/sgml/freebsd-common.dsl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/sgml/freebsd-html.dsl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/sgml/freebsd-print.dsl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/sgml/freebsd.dsl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/sgml/freebsd.dtd#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/sgml/freebsd.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/sgml/freebsd41.dtd#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/sgml/l10n.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/sgml/man-refs.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/sgml/man-refs.pl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/sgml/mirrors-local.xsl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/sgml/mirrors-master.xsl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/sgml/mirrors.xml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/sgml/pgp.dsl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/sgml/spellcheck.dsl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/sgml/trademarks.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/sgml/transtable-common.xsl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/sgml/transtable-local.xsl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/sgml/transtable-master.xsl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/sgml/transtable.xml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/sgml/urls.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/web2c/pdftex.def#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/xsl/default.xsl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/xsl/freebsd-common.xsl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/xsl/freebsd-fo.xsl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/xsl/freebsd-html-chunk.xsl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/xsl/freebsd-html.xsl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/xsl/freebsd.xsl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/sr_YU.ISO8859-2/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/sr_YU.ISO8859-2/articles/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/sr_YU.ISO8859-2/articles/Makefile.inc#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/sr_YU.ISO8859-2/articles/dialup-firewall/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/sr_YU.ISO8859-2/articles/dialup-firewall/article.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/sr_YU.ISO8859-2/articles/diskless-x/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/sr_YU.ISO8859-2/articles/diskless-x/article.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/sr_YU.ISO8859-2/books/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/sr_YU.ISO8859-2/books/Makefile.inc#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/sr_YU.ISO8859-2/books/faq/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/sr_YU.ISO8859-2/share/images/callouts/1.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/sr_YU.ISO8859-2/share/images/callouts/10.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/sr_YU.ISO8859-2/share/images/callouts/2.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/sr_YU.ISO8859-2/share/images/callouts/3.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/sr_YU.ISO8859-2/share/images/callouts/4.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/sr_YU.ISO8859-2/share/images/callouts/5.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/sr_YU.ISO8859-2/share/images/callouts/6.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/sr_YU.ISO8859-2/share/images/callouts/7.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/sr_YU.ISO8859-2/share/images/callouts/8.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/sr_YU.ISO8859-2/share/images/callouts/9.png#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/sr_YU.ISO8859-2/share/mk/doc.local.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/sr_YU.ISO8859-2/share/sgml/bookinfo.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/sr_YU.ISO8859-2/share/sgml/catalog#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/sr_YU.ISO8859-2/share/sgml/freebsd.dsl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/sr_YU.ISO8859-2/share/sgml/l10n.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/sr_YU.ISO8859-2/share/sgml/legalnotice.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/tr_TR.ISO8859-9/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/tr_TR.ISO8859-9/articles/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/tr_TR.ISO8859-9/articles/Makefile.inc#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/tr_TR.ISO8859-9/articles/explaining-bsd/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/tr_TR.ISO8859-9/articles/explaining-bsd/article.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/articles/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/articles/Makefile.inc#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/articles/contributing/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/articles/contributing/article.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/articles/cvs-freebsd/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/articles/cvs-freebsd/article.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/articles/linux-users/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/articles/linux-users/article.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/articles/nanobsd/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/articles/nanobsd/article.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/articles/rc-scripting/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/articles/rc-scripting/article.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/articles/remote-install/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/articles/remote-install/article.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/Makefile.inc#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/arch-handbook/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/arch-handbook/book.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/arch-handbook/boot/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/arch-handbook/chapters.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/arch-handbook/isa/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/arch-handbook/jail/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/arch-handbook/kobj/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/arch-handbook/locking/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/arch-handbook/mac.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/arch-handbook/mac/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/arch-handbook/newbus/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/arch-handbook/pccard/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/arch-handbook/pci/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/arch-handbook/scsi/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/arch-handbook/smp/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/arch-handbook/sound/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/arch-handbook/sysinit/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/arch-handbook/usb/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/arch-handbook/vm/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/advanced-networking/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/appendix.decl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/audit/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/audit/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/basics/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/basics/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/bibliography/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/bibliography/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/book.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/boot/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/boot/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/chapter.decl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/chapters.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/colophon.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/config/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/config/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/cutting-edge/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/cutting-edge/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/desktop/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/desktop/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/disks/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/disks/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/dtrace/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/dtrace/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/eresources/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/eresources/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/filesystems/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/filesystems/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/firewalls/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/geom/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/geom/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/install/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/install/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/introduction/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/introduction/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/jails/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/kernelconfig/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/l10n/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/l10n/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/linuxemu/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/linuxemu/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/mac/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/mac/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/mail/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/mail/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/mirrors/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/multimedia/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/multimedia/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/network-servers/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/network-servers/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/pgpkeys/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/pgpkeys/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/ports/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/ports/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/ppp-and-slip/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/preface/preface.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/printing/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/printing/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/security/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/security/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/serialcomms/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/serialcomms/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/txtfiles.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/updating/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/updating/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/users/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/users/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/vinum/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/vinum/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/virtualization/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/virtualization/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/x11/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/handbook/x11/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/porters-handbook/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/books/porters-handbook/freebsd.dsl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/share/mk/doc.local.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/share/sgml/authors-in-author-tag.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/share/sgml/authors.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/share/sgml/bookinfo.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/share/sgml/catalog#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/share/sgml/freebsd.dsl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/share/sgml/glossary/freebsd-glossary.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/share/sgml/l10n.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/share/sgml/legalnotice.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/share/sgml/mailing-lists.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/share/sgml/mirrors-local.xsl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/share/sgml/teams.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/share/sgml/trademarks.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/share/sgml/trademarks.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/share/sgml/transtable-local.xsl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_CN.GB2312/share/sgml/transtable.xml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/FAQ/FAQ.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/FAQ/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/FAQ/acknowledgments.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/FAQ/admin.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/FAQ/applications.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/FAQ/commercial.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/FAQ/hackers.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/FAQ/hardware.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/FAQ/includes.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/FAQ/install.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/FAQ/kernelconfig.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/FAQ/misc.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/FAQ/network.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/FAQ/preface.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/FAQ/serial.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/FAQ/troubleshoot.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/FAQ/x.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/articles/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/articles/Makefile.inc#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/articles/contributing/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/articles/contributing/article.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/articles/cvs-freebsd/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/articles/cvs-freebsd/article.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/articles/freebsd-questions/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/articles/freebsd-questions/article.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/articles/hubs/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/articles/hubs/article.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/articles/mailing-list-faq/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/articles/mailing-list-faq/article.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/articles/nanobsd/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/articles/nanobsd/article.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/articles/pr-guidelines/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/articles/pr-guidelines/article.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/articles/problem-reports/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/articles/problem-reports/article.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/articles/remote-install/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/articles/remote-install/article.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/Makefile.inc#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/developers-handbook/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/developers-handbook/book.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/developers-handbook/chapters.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/developers-handbook/dma/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/developers-handbook/introduction/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/developers-handbook/ipv6/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/developers-handbook/kerneldebug/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/developers-handbook/kerneldebug/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/developers-handbook/l10n/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/developers-handbook/policies/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/developers-handbook/policies/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/developers-handbook/secure/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/developers-handbook/sockets/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/developers-handbook/testing/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/developers-handbook/tools/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/developers-handbook/x86/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/faq/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/faq/book.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/fdp-primer/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/fdp-primer/book.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/fdp-primer/chapter.decl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/fdp-primer/chapters.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/fdp-primer/doc-build/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/fdp-primer/examples/appendix.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/fdp-primer/overview/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/fdp-primer/psgml-mode/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/fdp-primer/see-also/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/fdp-primer/structure/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/fdp-primer/stylesheets/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/fdp-primer/the-website/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/fdp-primer/tools/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/fdp-primer/translations/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/fdp-primer/writing-style/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/advanced-networking/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/advanced-networking/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/appendix.decl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/audit/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/audit/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/basics/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/basics/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/basics/example-dir1.dot#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/basics/example-dir2.dot#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/basics/example-dir3.dot#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/basics/example-dir4.dot#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/basics/example-dir5.dot#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/bibliography/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/bibliography/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/book.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/boot/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/boot/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/chapter.decl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/chapters.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/colophon.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/config/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/config/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/cutting-edge/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/cutting-edge/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/desktop/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/desktop/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/disks/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/disks/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/eresources/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/eresources/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/firewalls/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/firewalls/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/geom/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/geom/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/install/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/install/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/install/example-dir1.dot#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/install/example-dir2.dot#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/install/example-dir3.dot#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/install/example-dir4.dot#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/install/example-dir5.dot#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/introduction/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/introduction/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/jails/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/kernelconfig/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/kernelconfig/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/l10n/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/l10n/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/linuxemu/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/linuxemu/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/mac/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/mac/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/mail/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/mail/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/mirrors/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/mirrors/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/multimedia/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/multimedia/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/network-servers/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/network-servers/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/pgpkeys/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/pgpkeys/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/ports/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/ports/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/ppp-and-slip/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/ppp-and-slip/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/preface/preface.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/printing/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/printing/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/security/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/security/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/serialcomms/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/serialcomms/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/txtfiles.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/users/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/users/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/vinum/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/vinum/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/virtualization/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/virtualization/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/x11/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/handbook/x11/chapter.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/porters-handbook/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/porters-handbook/book.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/books/porters-handbook/freebsd.dsl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/share/mk/doc.local.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/share/sgml/authors.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/share/sgml/bookinfo.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/share/sgml/catalog#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/share/sgml/freebsd.dsl#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/share/sgml/glossary/freebsd-glossary.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/share/sgml/l10n.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/share/sgml/legalnotice.sgml#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/share/sgml/mailing-lists.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/share/sgml/trademarks.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/zh_TW.Big5/share/sgml/urls.ent#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/.cvsignore#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/CHANGES#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/COPYRIGHT#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/GIDs#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/KNOBS#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/LEGAL#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/MOVED#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.apache.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.autotools.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.cmake.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.commands.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.database.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.destdir.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.efl.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.emacs.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.fpc.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.gcc.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.gecko.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.gnome.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.gnustep.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.gstreamer.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.java.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.kde.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.kde4.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.ldap.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.linux-apps.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.linux-rpm.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.local.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.lua.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.mail.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.ocaml.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.octave.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.openssl.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.perl.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.php.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.port.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.port.options.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.port.post.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.port.pre.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.port.subdir.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.python.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.qt.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.ruby.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.scons.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.sdl.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.sites.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.tcl.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.wx.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.xfce.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.xorg.mk#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/README#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Templates/BSD.local.dist#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Templates/README.category#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Templates/README.port#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Templates/README.top#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Templates/config.guess#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Templates/config.sub#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/make_index#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/make_readmes#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/4/bindist/README#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/4/bindist/delete#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/4/bindist/dirlist#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/4/bindist/files/usr/bin/uname#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/4/mkbindist.conf#1 branch

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

From owner-p4-projects@FreeBSD.ORG  Fri Apr  2 13:02:26 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9FACA1065678; Fri,  2 Apr 2010 13:02: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 63EC91065676
	for ; Fri,  2 Apr 2010 13:02:26 +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 504758FC08
	for ; Fri,  2 Apr 2010 13:02:26 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o32D2Qgw049286
	for ; Fri, 2 Apr 2010 13:02:26 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o32D2QUF049284
	for perforce@freebsd.org; Fri, 2 Apr 2010 13:02:26 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Fri, 2 Apr 2010 13:02:26 GMT
Message-Id: <201004021302.o32D2QUF049284@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 176448 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Apr 2010 13:02:26 -0000

http://p4web.freebsd.org/chv.cgi?CH=176448

Change 176448 by pgj@Binturong on 2010/04/02 13:01:27

	IFC

Affected files ...

.. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#46 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#40 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#47 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#30 integrate
.. //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/errata/article.sgml#10 integrate
.. //depot/projects/docproj_hu/www/en/developers.sgml#41 integrate
.. //depot/projects/docproj_hu/www/en/donations/donors.sgml#29 integrate
.. //depot/projects/docproj_hu/www/en/donations/wantlist.sgml#18 integrate
.. //depot/projects/docproj_hu/www/en/multimedia/multimedia-input.xml#10 integrate
.. //depot/projects/docproj_hu/www/en/projects/ideas/ideas.xml#16 integrate
.. //depot/projects/docproj_hu/www/en/releases/7.3R/errata.html#3 integrate
.. //depot/projects/docproj_hu/www/en/releng/index.sgml#39 integrate
.. //depot/projects/docproj_hu/www/share/sgml/news.xml#90 integrate
.. //depot/projects/docproj_hu/www/share/sgml/usergroups.xml#12 integrate

Differences ...

==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#46 (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.499 2010/03/04 02:08:02 neel Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.500 2010/03/31 10:12:09 decke Exp $
 -->
 
 aaron@FreeBSD.org">
@@ -264,6 +264,8 @@
 
 dec@FreeBSD.org">
 
+decke@FreeBSD.org">
+
 deischen@FreeBSD.org">
 
 delphij@FreeBSD.org">

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#40 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
 
 
@@ -134,6 +134,7 @@
 
 
 
+
 
 
 

==== //depot/projects/docproj_hu/www/en/donations/donors.sgml#29 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
  %developers;
@@ -2701,6 +2701,21 @@
      Received 
   
 
+  
+     sson 
+     PowerMac G4 
+     stas 
+     Received 
+  
+
+  
+     sson 
+     PowerMac G4 
+     rnoland 
+     Received 
+  
+
+
 
 
 &footer;

==== //depot/projects/docproj_hu/www/en/donations/wantlist.sgml#18 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
 
@@ -411,15 +411,6 @@
       
 
       
-	thomas
-	France
-	UDMA controller, ATAPI floppy drive, ATAPI tape drive
-	Ensure these ATAPI devices work with ATAPI/CAM with the
-	  same level of functionality currently available with the
-	  afd/ast drivers.
-      
-
-      
 	tabthorpe
 	Canada
 	AMD64 machine, minimum 256 M memory, any size hard drive.

==== //depot/projects/docproj_hu/www/en/multimedia/multimedia-input.xml#10 (text+ko) ====

@@ -4678,27 +4678,13 @@
 		http://Constantine.SU/
 	    ]]>
 	    http://2008.eurobsdcon.org/talks.html
-	    eurobsdcon,eurobsdcon2008,openbsd,hardware sensors,constantine murenin
+	    eurobsdcon,eurobsdcon2008,presentation,openbsd,hardware sensors,constantine murenin
 	    
 		
-		    http://audiovideocours.u-strasbg.fr/avc/courseaccess?id=2825&type=ogg
-		    OGG
-		    1 byte
-		    47 minutes
-		    ogg
-		
-		
-		    http://audiovideocours.u-strasbg.fr/avc/courseaccess?id=2825&type=mp3
-		    MP3
-		    1 byte
-		    47 minutes
-		    mp3
-		
-		
-		    http://audiovideocours.u-strasbg.fr/avc/courseaccess?id=2825&type=pdf
+		    http://www.openbsd.org/papers/eurobsdcon2008-sensors.pdf
 		    PDF
-		    1 byte
-		    n pages
+		    539395 bytes
+		    38 pages
 		    pdf
 		
 	    
@@ -6055,7 +6041,7 @@
 		    abc2009-P2A-paper.pdf
 		    401 Kb
 		    6 pages
-		    OpenBGPD - Bringing full views to OpenBSD since by 2004 Claudio Jeker
+		    OpenBGPD - Bringing full views to OpenBSD since 2004 by Claudio Jeker
 		    pdf,paper,openbgpd,openbsd,claudio jeker
 		
 		
@@ -6077,7 +6063,7 @@
 		    245 Kb
 		    14 pages
 		    OpenBSD Hardware Sensors Framework by Constantine A. Murenin
-		    pdf,paper,openbsd,hardware sensors framework,constantine murenin
+		    pdf,paper,openbsd,hardware sensors,constantine murenin
 		
 		
 		    abc2009-P4A-paper.pdf
@@ -9937,7 +9923,7 @@
 		
    
 		
    
 	    ]]>
-	    bsdcan,bsdcan2009,presentation,bsd,hardware monitors,canstantine murenin
+	    bsdcan,bsdcan2009,presentation,openbsd,hardware sensors,constantine murenin
 	    
 		
 		    http://www.bsdcan.org/2009/schedule/attachments/95_BSDCan2009.cnst-fanctl.slides.pdf

==== //depot/projects/docproj_hu/www/en/projects/ideas/ideas.xml#16 (text+ko) ====

@@ -15,7 +15,7 @@
 
   
     
-      $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.159 2010/03/27 17:56:58 ganbold Exp $
+      $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.162 2010/04/02 09:28:32 pav Exp $
     
   
 
@@ -596,6 +596,7 @@
 
 	
 
    Technical contact: Stacey Son, Robert Watson
    
 
    URL: Perforce
@@ -1241,31 +1242,6 @@
 
   
     Ports
-      
-	Add .db support to pkg_tools
-
-	
-
    pkg_create(1) and friends use flat databases (aka ordinary
-  files and directories in /var/db/pkg) to maintain their data.  This
-  makes it cumbersome and/or impossible to do efficient lookups of data
-  on installed packages and makes certain operations very slow.
-  portupgrade has the right idea of hashing this into a berkeley db
-  file, but it uses tools that are not in the base system (ruby).
    
-
    A self-contained project would be to add similar (preferably
-  compatible) code into pkg_tools directly, possibly also extending
-  the data that is stored and allowing for more flexible querying with
-  tools like pkg_info (e.g. replicating the pkg_which utility of
-  portupgrade).  Adding mutual exclusion to protect concurrent
-  pkg_add/delete operations from corrupting database state is also
-  important.
    
-
    Requirements:
    
-
      
-  
    • Knowledge of C.
      • 
-  
    • Basic understanding of the use of berkeley db.
      • 
-
    
-	    
-      
-
       
 	Package tools improvements
 
@@ -1282,38 +1258,6 @@
 	
       
 
-      
-	Parallelization in the Ports Collection
-
-	
-	  
    Add locking of write access to PKG_DBDIR (/var/db/pkg), to allow
-	    several port builds run in parallel without clobbering the package
-	    data.  Should be done both in makefiles and in C tools like
-	    pkg_install and pkg_delete.  A simple flock(2) approach over the
-	    whole database comes to mind.
    
-
-	  
    The next step is the parallelization of dependency building.  Have
-	    the port build it's dependencies in parallel, automatically
-	    depending on number of CPUs in the machine, or manually specified
-	    by user (make -j3 install clean).  Some kind of split screen should
-	    be devised, so user can easily watch the process and interact with
-	    it (make config screens, for example).  Attention must be paid to
-	    prevent deadlocks.
    
-
-	  
    Allow for situation when two ports want to build and install
-	    common dependency.  One of the ports have to wait on the other to
-	    install it before proceeding.
    
-
-	  
    Requirements:
    
-
-	  
      
-	    
    • Strong knowledge of make and shell code.
      • 
-	    
    • Strong knowledge of C code.
      • 
-	    
    • Good understanding of the inner design of the Ports Collection.
      • 
-	  
    
-	    
-          
-
       
 	Complete (a.k.a. Fat) packages
 	
@@ -1653,6 +1597,32 @@
 	
       
 
+      
+	New kernel privilege model
+
+	
+	  
    Technical contact: Robert Watson
    
+
+	  
    FreeBSD uses a largely standard UNIX privilege model, granting
+	    special OS rights to processes with an effective uid of 0.
+	    Exceptional behavior lies in securelevel (restricting root based
+	    on a global or per-jail level), Jail (limiting certain rights to
+	    ensure safe containment for a jailed root user), and the ability
+	    for the MAC Framework to augment privilege decisions.  However,
+	    as of FreeBSD 7.0, privilege decisions internal to the kernel
+	    have been made with respect to a large set of named privileges
+	    (priv.h).  This project idea is to create a new privilege model,
+	    similar perhaps to POSIX.1e or the Solaris privilege model,
+	    allowing masks of privileges to be associated with process
+	    credentials and managed with system calls.  Of particular
+	    interest is supporting the assignment of privileges to users or
+	    roles -- such as the right to bind low port numbers, use DTrace,
+	    etc.
+	  
    
+	
+      
+
   
 
   

==== //depot/projects/docproj_hu/www/en/releases/7.3R/errata.html#3 (text+ko) ====

@@ -19,7 +19,7 @@
 
    Copyright © 2010 The FreeBSD Documentation Project
    
 
 
    $FreeBSD: stable/7/release/doc/en_US.ISO8859-1/errata/article.sgml
-205521 2010-03-23 18:36:45Z hrs $
    
+205916 2010-03-30 19:41:43Z hrs $
    
 
    
 
 
    
@@ -102,6 +102,24 @@
 
    4 Late-Breaking News and
 Corrections
    
 
+
    [20100330] The libc of FreeBSD 7.3-RELEASE has the 
+fdopendir(3)
+function but <dirent.h> header file does not contain the
+function prototype. This could cause programs compiled on the system to crash on
+platforms such as FreeBSD/amd64, where sizeof(void *) is greater
+than sizeof(int). This problem has been fixed in r205265 (RELENG_7).
+An Errata Notice for 7.3-RELEASE is planned.
    
+
+
    [20100330] It turns out that the zfsloader in 7.3-RELEASE, a
+new boot loader similar to 
+loader(8) but it
+supports ZFS, does not work properly. This problem has been fixed in r205539 (RELENG_7).
+An Errata Notice for 7.3-RELEASE is planned.
    
+
 
    [20100323] The FreeBSD 7.3-RELEASE Release Notes incorrectly mentioned that the
 hwpmc(4) driver has been added though this driver has already been added in 7.0-RELEASE.
 The changes in 7.3-RELEASE are that pmcannotate(8) utility and support for Intel Core 2

==== //depot/projects/docproj_hu/www/en/releng/index.sgml#39 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
 
@@ -102,8 +102,8 @@
     
       RELENG_7_3
       Frozen
-      &contact.re;
-      Frozen in preparation for 7.3-RELEASE.
+      &contact.so;
+      FreeBSD 7.3 supported errata fix branch.
     
 
     

==== //depot/projects/docproj_hu/www/share/sgml/news.xml#90 (text+ko) ====

@@ -25,7 +25,7 @@
 
   
     
-      $FreeBSD: www/share/sgml/news.xml,v 1.304 2010/03/23 18:45:59 hrs Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.305 2010/03/31 11:36:32 decke Exp $
     
   
 
@@ -36,6 +36,15 @@
       3
 
       
+        31
+
+        
+          
    New committer: Bernhard
+	    Fröhlich (ports)
    
+        
+      
+
+      
 	23
 
 	

==== //depot/projects/docproj_hu/www/share/sgml/usergroups.xml#12 (text+ko) ====

@@ -5,7 +5,7 @@
 
   
     
-      $FreeBSD: www/share/sgml/usergroups.xml,v 1.83 2010/01/21 21:48:07 jkois Exp $
+      $FreeBSD: www/share/sgml/usergroups.xml,v 1.88 2010/03/30 17:36:27 jkois Exp $
     
   
 
@@ -181,26 +181,6 @@
       
     
 
-    
-      The Aachener BSD Stammtisch
-      http://foldr.org/mailman/listinfo/bsd-ac/
-      The Aachener BSD Stammtisch is meeting infrequently
-        to discuss BSD and related matters over a glass of beer.
-        Meetings are coordinated through our mailing
-        list.  Located in Germany, Aachen.
-      
-    
-
-    
-      BSD-Crew Dresden
-      http://www.bsd-crew.de/
-      BSD-Crew Dresden is a User Group who has some projects
-        related in bringing the BSD to the desktop and electronic
-        communication.  Located in Germany, Dresden.
-      
-    
-
     
       The Cosmo-Project
       http://www.cosmo-project.de/
@@ -213,12 +193,12 @@
 
     
       BSD User Group Hamburg (BSDHH)
-      http://www.bsdhh.org/bsdhh-de-faq.html
+      http://www.bsdhh.org/bsdhh-de-index.html
 
       The BSD User Group Hamburg (BSDHH) meets on the
-        first Wednesday of the month at 7.00pm in the Chinese
-        restaurant Lotosblute, Luwenstrasse 22 in
-        Hamburg-Eppendorf.  Most members are FreeBSD users, although
+        first Wednesday of the month at 7.00pm in the restaurant
+        Léon (Koppel 1, 20099 Hamburg).
+        Most members are FreeBSD users, although
         users of all BSD flavors are welcome.  Located in Germany,
         Hamburg.
       
@@ -335,17 +315,6 @@
   
 
   
-    
-      Russian UNIX Forums
-      http://unixforums.org.ru
-
-      Russian UNIX Forums provides a place for the
-        Russian Unix community to share knowledge.  There are some
-        articles and there is a maintained Unix Encyclopedia Project.
-        A specific *BSD section is available as well.
-      
-    
-
     
       Russian FreeBSD User Group (RFUG)
       http://bsdportal.ru
@@ -519,18 +488,6 @@
     
   
 
-
-  
-    
-      Swiss BSD User Group (SwissBUG)
-      http://www.swissbug.org
-
-      The Swiss BSD User Group (SwissBUG) caters for
-        users of BSD-based systems in Switzerland. Located in
-        Switzerland.
-      
-    
-  
   
     
       Ukrainian FreeBSD User Group (UAFUG)

From owner-p4-projects@FreeBSD.ORG  Fri Apr  2 13:14:39 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ED5A1106566C; Fri,  2 Apr 2010 13:14: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 B07001065673
	for ; Fri,  2 Apr 2010 13:14:38 +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 9E97F8FC1A
	for ; Fri,  2 Apr 2010 13:14:38 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o32DEcZK051291
	for ; Fri, 2 Apr 2010 13:14:38 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o32DEcfc051289
	for perforce@freebsd.org; Fri, 2 Apr 2010 13:14:38 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Fri, 2 Apr 2010 13:14:38 GMT
Message-Id: <201004021314.o32DEcfc051289@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 176449 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Apr 2010 13:14:39 -0000

http://p4web.freebsd.org/chv.cgi?CH=176449

Change 176449 by pgj@Binturong on 2010/04/02 13:13:43

	MFen (www):
		1.304      -> 1.305      hu/share/sgml/news.xml

Affected files ...

.. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#93 edit

Differences ...

==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#93 (text+ko) ====

@@ -5,7 +5,7 @@
 
 
 
@@ -22,6 +22,15 @@
       3
 
       
+	31
+
+	
+	  
    Új tag: Bernhard
+	    Fröhlich (ports)
    
+	    
+          
+
+      
 	23
 
 	

From owner-p4-projects@FreeBSD.ORG  Fri Apr  2 15:06:32 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EB06E1065678; Fri,  2 Apr 2010 15: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 8AAAB1065674
	for ; Fri,  2 Apr 2010 15:06:31 +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 76DCC8FC08
	for ; Fri,  2 Apr 2010 15:06:31 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o32F6VdU062865
	for ; Fri, 2 Apr 2010 15:06:31 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o32F6VMj062861
	for perforce@freebsd.org; Fri, 2 Apr 2010 15:06:31 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Fri, 2 Apr 2010 15:06:31 GMT
Message-Id: <201004021506.o32F6VMj062861@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 176456 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Apr 2010 15:06:32 -0000

http://p4web.freebsd.org/chv.cgi?CH=176456

Change 176456 by anchie@anchie_malimis on 2010/04/02 15:05:36

	IFC @176455	

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/pmc_mdep.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/mv_sata.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cam/cam_xpt.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cam/scsi/scsi_all.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/compat/linprocfs/linprocfs.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/files#8 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/files.amd64#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/files.i386#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/files.pc98#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/kern.mk#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/kern.post.mk#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/kern.pre.mk#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/kmod.mk#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ata/ata-all.h#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/common/cxgb_ael1002.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/common/cxgb_common.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/common/cxgb_t3_hw.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/cxgb_adapter.h#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/cxgb_main.c#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/cxgb_sge.c#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/if_em.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/if_em.h#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/if_igb.c#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/if_igb.h#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/if_lem.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/if_lem.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/hwpmc_core.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/hwpmc_core.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/hwpmc_intel.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/hwpmc_mod.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/hwpmc_uncore.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/hwpmc_uncore.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/pmc_events.h#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/sound/pci/es137x.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/deadfs/dead_vnops.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsserver/nfs_nfsdport.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsserver/nfs_nfsdserv.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/include/pmc_mdep.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_alq.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/vfs_default.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/vfs_subr.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/modules/Makefile#11 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/modules/alq/Makefile#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/modules/hwpmc/Makefile#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_input.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_var.h#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_deflate.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_ksocket.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_l2tp.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_mppc.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_ppp.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_pptpgre.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_tcpmss.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/in.h#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/ip_fw_sockopt.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/fhc/fhc.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/pci/apb.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/pci/psycho.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/pci/schizo.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sbus/sbus.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/trap.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/ioccom.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/pmc.h#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/vnode.h#5 integrate

Differences ...

==== //depot/projects/soc2009/anchie_send/src/sys/amd64/include/pmc_mdep.h#3 (text+ko) ====

@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/pmc_mdep.h,v 1.9 2009/08/14 21:05:08 jhb Exp $
+ * $FreeBSD: src/sys/amd64/include/pmc_mdep.h,v 1.10 2010/04/02 13:23:49 fabient Exp $
  */
 
 /* Machine dependent interfaces */
@@ -43,17 +43,20 @@
 #include 
 #include 
 #include 
+#include 
 
 /*
  * Intel processors implementing V2 and later of the Intel performance
  * measurement architecture have PMCs of the following classes: TSC,
- * IAF and IAP.
+ * IAF, IAP, UCF and UCP.
  */
 #define	PMC_MDEP_CLASS_INDEX_TSC	0
 #define	PMC_MDEP_CLASS_INDEX_K8		1
 #define	PMC_MDEP_CLASS_INDEX_P4		1
 #define	PMC_MDEP_CLASS_INDEX_IAP	1
 #define	PMC_MDEP_CLASS_INDEX_IAF	2
+#define	PMC_MDEP_CLASS_INDEX_UCP	3
+#define	PMC_MDEP_CLASS_INDEX_UCF	4
 
 /*
  * On the amd64 platform we support the following PMCs.
@@ -63,12 +66,16 @@
  * PIV		Intel P4/HTT and P4/EMT64
  * IAP		Intel Core/Core2/Atom CPUs in 64 bits mode.
  * IAF		Intel fixed-function PMCs in Core2 and later CPUs.
+ * UCP		Intel Uncore programmable PMCs.
+ * UCF		Intel Uncore fixed-function PMCs.
  */
 
 union pmc_md_op_pmcallocate  {
 	struct pmc_md_amd_op_pmcallocate	pm_amd;
 	struct pmc_md_iaf_op_pmcallocate	pm_iaf;
 	struct pmc_md_iap_op_pmcallocate	pm_iap;
+	struct pmc_md_ucf_op_pmcallocate	pm_ucf;
+	struct pmc_md_ucp_op_pmcallocate	pm_ucp;
 	struct pmc_md_p4_op_pmcallocate		pm_p4;
 	uint64_t				__pad[4];
 };
@@ -83,6 +90,8 @@
 	struct pmc_md_amd_pmc	pm_amd;
 	struct pmc_md_iaf_pmc	pm_iaf;
 	struct pmc_md_iap_pmc	pm_iap;
+	struct pmc_md_ucf_pmc	pm_ucf;
+	struct pmc_md_ucp_pmc	pm_ucp;
 	struct pmc_md_p4_pmc	pm_p4;
 };
 

==== //depot/projects/soc2009/anchie_send/src/sys/arm/mv/mv_sata.c#3 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/mv/mv_sata.c,v 1.4 2009/12/08 21:42:04 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/mv/mv_sata.c,v 1.6 2010/04/01 19:05:43 mav Exp $");
 
 #include 
 #include 
@@ -600,7 +600,12 @@
 	crqb->crqb_ata_lba_mid = request->u.ata.lba >> 8;
 	crqb->crqb_ata_lba_high = request->u.ata.lba >> 16;
 	crqb->crqb_ata_device = ((request->u.ata.lba >> 24) & 0x0F) | (1 << 6);
+	crqb->crqb_ata_lba_low_p = request->u.ata.lba >> 24;
+	crqb->crqb_ata_lba_mid_p = request->u.ata.lba >> 32;
+	crqb->crqb_ata_lba_high_p = request->u.ata.lba >> 40;
+	crqb->crqb_ata_feature_p = request->u.ata.feature >> 8;
 	crqb->crqb_ata_count = request->u.ata.count;
+	crqb->crqb_ata_count_p = request->u.ata.count >> 8;
 
 	bus_dmamap_sync(ch->dma.work_tag, ch->dma.work_map,
 	    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);

==== //depot/projects/soc2009/anchie_send/src/sys/cam/cam_xpt.c#6 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.245 2010/02/26 10:33:48 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.246 2010/03/31 17:47:57 mjacob Exp $");
 
 #include 
 #include 
@@ -2380,6 +2380,7 @@
 		if (start_ccb->ccb_h.func_code == XPT_ATA_IO) {
 			start_ccb->ataio.resid = 0;
 		}
+		/* FALLTHROUGH */
 	case XPT_RESET_DEV:
 	case XPT_ENG_EXEC:
 	{
@@ -2888,6 +2889,9 @@
 	case XPT_ENG_INQ:
 		/* XXX Implement */
 		start_ccb->ccb_h.status = CAM_PROVIDE_FAIL;
+		if (start_ccb->ccb_h.func_code & XPT_FC_DEV_QUEUED) {
+			xpt_done(start_ccb);
+		}
 		break;
 	}
 }
@@ -3930,7 +3934,7 @@
 		      struct cam_et *target, struct cam_ed *device,
 		      void *async_arg)
 {
-	printf("xpt_dev_async called\n");
+	printf("%s called\n", __func__);
 }
 
 u_int32_t
@@ -4919,4 +4923,3 @@
 		(*ccb_h->cbfcnp)(ccb_h->path->periph, (union ccb *)ccb_h);
 	}
 }
-

==== //depot/projects/soc2009/anchie_send/src/sys/cam/scsi/scsi_all.h#2 (text+ko) ====

@@ -14,7 +14,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.31 2008/08/07 17:25:05 jkim Exp $
+ * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.32 2010/04/01 01:49:43 mjacob Exp $
  */
 
 /*
@@ -170,6 +170,8 @@
 #define	SMS_PAGE_CODE 			0x3F
 #define SMS_VENDOR_SPECIFIC_PAGE	0x00
 #define SMS_DISCONNECT_RECONNECT_PAGE	0x02
+#define SMS_FORMAT_DEVICE_PAGE		0x03
+#define SMS_GEOMETRY_PAGE		0x04
 #define SMS_CACHE_PAGE			0x08
 #define SMS_PERIPHERAL_DEVICE_PAGE	0x09
 #define SMS_CONTROL_MODE_PAGE		0x0A

==== //depot/projects/soc2009/anchie_send/src/sys/compat/linprocfs/linprocfs.c#6 (text+ko) ====

@@ -42,7 +42,7 @@
 #include "opt_compat.h"
 
 #include 
-__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.148 2010/03/26 14:36:16 netchild Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.149 2010/04/02 06:50:28 netchild Exp $");
 
 #include 
 #include 
@@ -110,12 +110,14 @@
 /*
  * Various conversion macros
  */
-#define T2J(x) (((x) * 100UL) / (stathz ? stathz : hz))	/* ticks to jiffies */
+#define T2J(x) ((long)(((x) * 100ULL) / (stathz ? stathz : hz)))	/* ticks to jiffies */
+#define T2CS(x) ((unsigned long)(((x) * 100ULL) / (stathz ? stathz : hz)))	/* ticks to centiseconds */
 #define T2S(x) ((x) / (stathz ? stathz : hz))		/* ticks to seconds */
 #define B2K(x) ((x) >> 10)				/* bytes to kbytes */
 #define B2P(x) ((x) >> PAGE_SHIFT)			/* bytes to pages */
 #define P2B(x) ((x) << PAGE_SHIFT)			/* pages to bytes */
 #define P2K(x) ((x) << (PAGE_SHIFT - 10))		/* pages to kbytes */
+#define TV2J(x)	((x)->tv_sec * 100UL + (x)->tv_usec / 10000)
 
 /**
  * @brief Mapping of ki_stat in struct kinfo_proc to the linux state
@@ -505,9 +507,10 @@
 
 	getmicrouptime(&tv);
 	read_cpu_time(cp_time);
-	sbuf_printf(sb, "%lld.%02ld %ld.%02ld\n",
+	sbuf_printf(sb, "%lld.%02ld %ld.%02lu\n",
 	    (long long)tv.tv_sec, tv.tv_usec / 10000,
-	    T2S(cp_time[CP_IDLE]), T2J(cp_time[CP_IDLE]) % 100);
+	    T2S(cp_time[CP_IDLE] / mp_ncpus),
+	    T2CS(cp_time[CP_IDLE] / mp_ncpus) % 100);
 	return (0);
 }
 
@@ -613,9 +616,17 @@
 	struct kinfo_proc kp;
 	char state;
 	static int ratelimit = 0;
+	vm_offset_t startcode, startdata;
 
 	PROC_LOCK(p);
 	fill_kinfo_proc(p, &kp);
+	if (p->p_vmspace) {
+	   startcode = (vm_offset_t)p->p_vmspace->vm_taddr;
+	   startdata = (vm_offset_t)p->p_vmspace->vm_daddr;
+	} else {
+	   startcode = 0;
+	   startdata = 0;
+	};
 	sbuf_printf(sb, "%d", p->p_pid);
 #define PS_ADD(name, fmt, arg) sbuf_printf(sb, " " fmt, arg)
 	PS_ADD("comm",		"(%s)",	p->p_comm);
@@ -634,30 +645,27 @@
 	PS_ADD("pgrp",		"%d",	p->p_pgid);
 	PS_ADD("session",	"%d",	p->p_session->s_sid);
 	PROC_UNLOCK(p);
-	PS_ADD("tty",		"%d",	0); /* XXX */
+	PS_ADD("tty",		"%d",	kp.ki_tdev);
 	PS_ADD("tpgid",		"%d",	kp.ki_tpgid);
 	PS_ADD("flags",		"%u",	0); /* XXX */
 	PS_ADD("minflt",	"%lu",	kp.ki_rusage.ru_minflt);
 	PS_ADD("cminflt",	"%lu",	kp.ki_rusage_ch.ru_minflt);
 	PS_ADD("majflt",	"%lu",	kp.ki_rusage.ru_majflt);
 	PS_ADD("cmajflt",	"%lu",	kp.ki_rusage_ch.ru_majflt);
-	PS_ADD("utime",		"%ld",	T2J(tvtohz(&kp.ki_rusage.ru_utime)));
-	PS_ADD("stime",		"%ld",	T2J(tvtohz(&kp.ki_rusage.ru_stime)));
-	PS_ADD("cutime",	"%ld",	T2J(tvtohz(&kp.ki_rusage_ch.ru_utime)));
-	PS_ADD("cstime",	"%ld",	T2J(tvtohz(&kp.ki_rusage_ch.ru_stime)));
+	PS_ADD("utime",		"%ld",	TV2J(&kp.ki_rusage.ru_utime));
+	PS_ADD("stime",		"%ld",	TV2J(&kp.ki_rusage.ru_stime));
+	PS_ADD("cutime",	"%ld",	TV2J(&kp.ki_rusage_ch.ru_utime));
+	PS_ADD("cstime",	"%ld",	TV2J(&kp.ki_rusage_ch.ru_stime));
 	PS_ADD("priority",	"%d",	kp.ki_pri.pri_user);
 	PS_ADD("nice",		"%d",	kp.ki_nice); /* 19 (nicest) to -19 */
 	PS_ADD("0",		"%d",	0); /* removed field */
 	PS_ADD("itrealvalue",	"%d",	0); /* XXX */
-	/* XXX: starttime is not right, it is the _same_ for _every_ process.
-	   It should be the number of jiffies between system boot and process
-	   start. */
-	PS_ADD("starttime",	"%lu",	T2J(tvtohz(&kp.ki_start)));
+	PS_ADD("starttime",	"%lu",	TV2J(&kp.ki_start) - TV2J(&boottime));
 	PS_ADD("vsize",		"%ju",	P2K((uintmax_t)kp.ki_size));
 	PS_ADD("rss",		"%ju",	(uintmax_t)kp.ki_rssize);
 	PS_ADD("rlim",		"%lu",	kp.ki_rusage.ru_maxrss);
-	PS_ADD("startcode",	"%u",	(unsigned)0);
-	PS_ADD("endcode",	"%u",	0); /* XXX */
+	PS_ADD("startcode",	"%ju",	(uintmax_t)startcode);
+	PS_ADD("endcode",	"%ju",	(uintmax_t)startdata);
 	PS_ADD("startstack",	"%u",	0); /* XXX */
 	PS_ADD("kstkesp",	"%u",	0); /* XXX */
 	PS_ADD("kstkeip",	"%u",	0); /* XXX */
@@ -800,7 +808,7 @@
 	 */
 	sbuf_printf(sb, "VmSize:\t%8ju kB\n",	B2K((uintmax_t)kp.ki_size));
 	sbuf_printf(sb, "VmLck:\t%8u kB\n",	P2K(0)); /* XXX */
-	sbuf_printf(sb, "VmRss:\t%8ju kB\n",	P2K((uintmax_t)kp.ki_rssize));
+	sbuf_printf(sb, "VmRSS:\t%8ju kB\n",	P2K((uintmax_t)kp.ki_rssize));
 	sbuf_printf(sb, "VmData:\t%8ju kB\n",	P2K((uintmax_t)kp.ki_dsize));
 	sbuf_printf(sb, "VmStk:\t%8ju kB\n",	P2K((uintmax_t)kp.ki_ssize));
 	sbuf_printf(sb, "VmExe:\t%8ju kB\n",	P2K((uintmax_t)kp.ki_tsize));

==== //depot/projects/soc2009/anchie_send/src/sys/conf/files#8 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1508 2010/03/29 23:36:34 jfv Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1509 2010/03/31 20:15:20 mav Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -2322,7 +2322,7 @@
 net/if_faith.c			optional faith
 net/if_fddisubr.c		optional fddi
 net/if_fwsubr.c			optional fwip
-net/if_gif.c			optional gif
+net/if_gif.c			optional gif | netgraph_gif
 net/if_gre.c			optional gre inet
 net/if_iso88025subr.c		optional token
 net/if_lagg.c			optional lagg
@@ -2485,7 +2485,7 @@
 netinet/igmp.c			optional inet
 netinet/in.c			optional inet
 netinet/ip_carp.c		optional inet carp | inet6 carp
-netinet/in_gif.c		optional gif inet
+netinet/in_gif.c		optional gif inet | netgraph_gif inet
 netinet/ip_gre.c		optional gre inet
 netinet/ip_id.c			optional inet
 netinet/in_mcast.c		optional inet
@@ -2560,7 +2560,7 @@
 netinet6/icmp6.c		optional inet6
 netinet6/in6.c			optional inet6
 netinet6/in6_cksum.c		optional inet6
-netinet6/in6_gif.c		optional gif inet6
+netinet6/in6_gif.c		optional gif inet6 | netgraph_gif inet6
 netinet6/in6_ifattach.c		optional inet6
 netinet6/in6_mcast.c		optional inet6
 netinet6/in6_pcb.c		optional inet6

==== //depot/projects/soc2009/anchie_send/src/sys/conf/files.amd64#6 (text+ko) ====

@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD: src/sys/conf/files.amd64,v 1.154 2010/03/11 14:49:06 nwhitehorn Exp $
+# $FreeBSD: src/sys/conf/files.amd64,v 1.155 2010/04/02 13:23:49 fabient Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -198,6 +198,7 @@
 dev/hwpmc/hwpmc_amd.c		optional	hwpmc
 dev/hwpmc/hwpmc_intel.c		optional	hwpmc
 dev/hwpmc/hwpmc_core.c		optional	hwpmc
+dev/hwpmc/hwpmc_uncore.c	optional	hwpmc
 dev/hwpmc/hwpmc_piv.c		optional	hwpmc
 dev/hwpmc/hwpmc_tsc.c		optional	hwpmc
 dev/hwpmc/hwpmc_x86.c		optional	hwpmc

==== //depot/projects/soc2009/anchie_send/src/sys/conf/files.i386#6 (text+ko) ====

@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD: src/sys/conf/files.i386,v 1.638 2010/02/25 14:13:39 attilio Exp $
+# $FreeBSD: src/sys/conf/files.i386,v 1.639 2010/04/02 13:23:49 fabient Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -179,6 +179,7 @@
 dev/hwpmc/hwpmc_amd.c		optional hwpmc
 dev/hwpmc/hwpmc_intel.c		optional hwpmc
 dev/hwpmc/hwpmc_core.c		optional hwpmc
+dev/hwpmc/hwpmc_uncore.c	optional hwpmc
 dev/hwpmc/hwpmc_pentium.c	optional hwpmc
 dev/hwpmc/hwpmc_piv.c		optional hwpmc
 dev/hwpmc/hwpmc_ppro.c		optional hwpmc

==== //depot/projects/soc2009/anchie_send/src/sys/conf/files.pc98#4 (text+ko) ====

@@ -3,7 +3,7 @@
 #
 # modified for PC-9801/PC-9821
 #
-# $FreeBSD: src/sys/conf/files.pc98,v 1.381 2010/02/25 15:44:54 nyan Exp $
+# $FreeBSD: src/sys/conf/files.pc98,v 1.382 2010/04/02 13:23:49 fabient Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -99,6 +99,7 @@
 dev/hwpmc/hwpmc_amd.c		optional hwpmc
 dev/hwpmc/hwpmc_intel.c		optional hwpmc
 dev/hwpmc/hwpmc_core.c		optional hwpmc
+dev/hwpmc/hwpmc_uncore.c	optional hwpmc
 dev/hwpmc/hwpmc_pentium.c	optional hwpmc
 dev/hwpmc/hwpmc_piv.c		optional hwpmc
 dev/hwpmc/hwpmc_ppro.c		optional hwpmc

==== //depot/projects/soc2009/anchie_send/src/sys/conf/kern.mk#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.mk,v 1.62 2010/01/19 11:42:15 ru Exp $
+# $FreeBSD: src/sys/conf/kern.mk,v 1.63 2010/04/02 06:55:31 netchild Exp $
 
 #
 # Warning flags for compiling the kernel and components of the kernel.
@@ -108,3 +108,11 @@
 	${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "mips"
 CFLAGS+=	-fstack-protector
 .endif
+
+#
+# Enable CTF conversation on request.
+#
+.if defined(WITH_CTF)
+.undef NO_CTF
+.endif
+

==== //depot/projects/soc2009/anchie_send/src/sys/conf/kern.post.mk#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.post.mk,v 1.106 2010/03/25 13:47:21 netchild Exp $
+# $FreeBSD: src/sys/conf/kern.post.mk,v 1.107 2010/04/02 06:55:31 netchild Exp $
 
 # Part of a unified Makefile for building kernels.  This part includes all
 # the definitions that need to be after all the % directives except %RULES
@@ -19,6 +19,10 @@
 MKMODULESENV+=	CONF_CFLAGS="${CONF_CFLAGS}"
 .endif
 
+.if defined(WITH_CTF)
+MKMODULESENV+=	WITH_CTF="${WITH_CTF}"
+.endif
+
 .MAIN: all
 
 .for target in all clean cleandepend cleandir clobber depend install \
@@ -90,9 +94,7 @@
 	@rm -f ${.TARGET}
 	@echo linking ${.TARGET}
 	${SYSTEM_LD}
-.if defined(CTFMERGE)
-	${SYSTEM_CTFMERGE}
-.endif
+	@${SYSTEM_CTFMERGE}
 .if !defined(DEBUG)
 	${OBJCOPY} --strip-debug ${.TARGET}
 .endif
@@ -240,9 +242,7 @@
 
 config.o env.o hints.o vers.o vnode_if.o:
 	${NORMAL_C}
-.if defined(CTFCONVERT)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+	@[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 
 config.ln env.ln hints.ln vers.ln vnode_if.ln:
 	${NORMAL_LINT}

==== //depot/projects/soc2009/anchie_send/src/sys/conf/kern.pre.mk#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.107 2009/05/27 16:16:56 thompsa Exp $
+# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.108 2010/04/02 06:55:31 netchild Exp $
 
 # Part of a unified Makefile for building kernels.  This part contains all
 # of the definitions that need to be before %BEFORE_DEPEND.
@@ -128,11 +128,7 @@
 NORMAL_M= ${AWK} -f $S/tools/makeobjops.awk ${.IMPSRC} -c ; \
 	  ${CC} -c ${CFLAGS} ${WERROR} ${PROF} ${.PREFIX}.c
 
-.if defined(CTFCONVERT)
-NORMAL_CTFCONVERT= ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.else
-NORMAL_CTFCONVERT=
-.endif
+NORMAL_CTFCONVERT= [ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 
 NORMAL_LINT=	${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} ${.IMPSRC}
 
@@ -142,10 +138,7 @@
 SYSTEM_OBJS= locore.o ${MDOBJS} ${OBJS}
 SYSTEM_OBJS+= ${SYSTEM_CFILES:.c=.o}
 SYSTEM_OBJS+= hack.So
-.if defined(CTFMERGE)
-SYSTEM_CTFMERGE= ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SYSTEM_OBJS} vers.o
-LD+= -g
-.endif
+SYSTEM_CTFMERGE= [ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SYSTEM_OBJS} vers.o
 SYSTEM_LD= @${LD} -Bdynamic -T ${LDSCRIPT} \
 	-warn-common -export-dynamic -dynamic-linker /red/herring \
 	-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o

==== //depot/projects/soc2009/anchie_send/src/sys/conf/kmod.mk#5 (text+ko) ====

@@ -1,5 +1,5 @@
 #	From: @(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
-# $FreeBSD: src/sys/conf/kmod.mk,v 1.230 2010/03/26 08:47:07 netchild Exp $
+# $FreeBSD: src/sys/conf/kmod.mk,v 1.231 2010/04/02 06:55:31 netchild Exp $
 #
 # The include file  handles building and installing loadable
 # kernel modules.
@@ -69,6 +69,11 @@
 .error "Do not use KMODDEPS on 5.0+; use MODULE_VERSION/MODULE_DEPEND"
 .endif
 
+# Enable CTF conversion on request.
+.if defined(WITH_CTF)
+.undef NO_CTF
+.endif
+
 .include 
 
 .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S

==== //depot/projects/soc2009/anchie_send/src/sys/dev/ata/ata-all.h#5 (text+ko) ====

@@ -23,9 +23,11 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.152 2010/02/02 11:09:28 mav Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.153 2010/03/31 07:20:10 mav Exp $
  */
 
+#include "opt_ata.h"
+
 #if 0
 #define	ATA_LEGACY_SUPPORT		/* Enable obsolete features that break
 					 * some modern devices */

==== //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/common/cxgb_ael1002.c#4 (text+ko) ====

@@ -28,7 +28,7 @@
 ***************************************************************************/
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_ael1002.c,v 1.16 2010/03/09 19:57:44 np Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_ael1002.c,v 1.17 2010/03/31 00:21:56 np Exp $");
 
 #include 
 
@@ -1447,395 +1447,439 @@
 		0xd803, 0x40aa,
 		0xd804, 0x401c,
 		0xd805, 0x401e,
-		0xd806, 0x2ff4,
-		0xd807, 0x3dc4,
-		0xd808, 0x2035,
-		0xd809, 0x3035,
-		0xd80a, 0x6524,
-		0xd80b, 0x2cb2,
-		0xd80c, 0x3012,
-		0xd80d, 0x1002,
-		0xd80e, 0x26e2,
-		0xd80f, 0x3022,
-		0xd810, 0x1002,
-		0xd811, 0x27d2,
-		0xd812, 0x3022,
+		0xd806, 0x20c5,
+		0xd807, 0x3c05,
+		0xd808, 0x6536,
+		0xd809, 0x2fe4,
+		0xd80a, 0x3dc4,
+		0xd80b, 0x6624,
+		0xd80c, 0x2ff4,
+		0xd80d, 0x3dc4,
+		0xd80e, 0x2035,
+		0xd80f, 0x30a5,
+		0xd810, 0x6524,
+		0xd811, 0x2ca2,
+		0xd812, 0x3012,
 		0xd813, 0x1002,
-		0xd814, 0x2822,
-		0xd815, 0x3012,
+		0xd814, 0x27e2,
+		0xd815, 0x3022,
 		0xd816, 0x1002,
-		0xd817, 0x2492,
+		0xd817, 0x28d2,
 		0xd818, 0x3022,
 		0xd819, 0x1002,
-		0xd81a, 0x2772,
+		0xd81a, 0x2892,
 		0xd81b, 0x3012,
 		0xd81c, 0x1002,
-		0xd81d, 0x23d2,
+		0xd81d, 0x24e2,
 		0xd81e, 0x3022,
 		0xd81f, 0x1002,
-		0xd820, 0x22cd,
-		0xd821, 0x301d,
-		0xd822, 0x27f2,
-		0xd823, 0x3022,
-		0xd824, 0x1002,
-		0xd825, 0x5553,
-		0xd826, 0x0307,
-		0xd827, 0x2522,
-		0xd828, 0x3022,
-		0xd829, 0x1002,
-		0xd82a, 0x2142,
-		0xd82b, 0x3012,
-		0xd82c, 0x1002,
-		0xd82d, 0x4016,
-		0xd82e, 0x5e63,
-		0xd82f, 0x0344,
-		0xd830, 0x2142,
+		0xd820, 0x27e2,
+		0xd821, 0x3012,
+		0xd822, 0x1002,
+		0xd823, 0x2422,
+		0xd824, 0x3022,
+		0xd825, 0x1002,
+		0xd826, 0x22cd,
+		0xd827, 0x301d,
+		0xd828, 0x28f2,
+		0xd829, 0x3022,
+		0xd82a, 0x1002,
+		0xd82b, 0x5553,
+		0xd82c, 0x0307,
+		0xd82d, 0x2572,
+		0xd82e, 0x3022,
+		0xd82f, 0x1002,
+		0xd830, 0x21a2,
 		0xd831, 0x3012,
 		0xd832, 0x1002,
-		0xd833, 0x400e,
-		0xd834, 0x2522,
-		0xd835, 0x3022,
-		0xd836, 0x1002,
-		0xd837, 0x2b52,
-		0xd838, 0x3012,
-		0xd839, 0x1002,
-		0xd83a, 0x2742,
+		0xd833, 0x4016,
+		0xd834, 0x5e63,
+		0xd835, 0x0344,
+		0xd836, 0x21a2,
+		0xd837, 0x3012,
+		0xd838, 0x1002,
+		0xd839, 0x400e,
+		0xd83a, 0x2572,
 		0xd83b, 0x3022,
 		0xd83c, 0x1002,
-		0xd83d, 0x25e2,
-		0xd83e, 0x3022,
+		0xd83d, 0x2b22,
+		0xd83e, 0x3012,
 		0xd83f, 0x1002,
-		0xd840, 0x2fa4,
-		0xd841, 0x3dc4,
-		0xd842, 0x6624,
-		0xd843, 0x414b,
-		0xd844, 0x56b3,
-		0xd845, 0x03c6,
-		0xd846, 0x866b,
-		0xd847, 0x400c,
-		0xd848, 0x2712,
-		0xd849, 0x3012,
-		0xd84a, 0x1002,
-		0xd84b, 0x2c4b,
-		0xd84c, 0x309b,
-		0xd84d, 0x56b3,
-		0xd84e, 0x03c3,
-		0xd84f, 0x866b,
-		0xd850, 0x400c,
-		0xd851, 0x2272,
-		0xd852, 0x3022,
-		0xd853, 0x1002,
-		0xd854, 0x2742,
-		0xd855, 0x3022,
-		0xd856, 0x1002,
-		0xd857, 0x25e2,
-		0xd858, 0x3022,
-		0xd859, 0x1002,
-		0xd85a, 0x2fb4,
-		0xd85b, 0x3dc4,
-		0xd85c, 0x6624,
-		0xd85d, 0x56b3,
-		0xd85e, 0x03c3,
-		0xd85f, 0x866b,
-		0xd860, 0x401c,
-		0xd861, 0x2c45,
-		0xd862, 0x3095,
-		0xd863, 0x5b53,
-		0xd864, 0x2372,
-		0xd865, 0x3012,
-		0xd866, 0x13c2,
-		0xd867, 0x5cc3,
-		0xd868, 0x2712,
-		0xd869, 0x3012,
-		0xd86a, 0x1312,
-		0xd86b, 0x2b52,
+		0xd840, 0x2842,
+		0xd841, 0x3022,
+		0xd842, 0x1002,
+		0xd843, 0x26e2,
+		0xd844, 0x3022,
+		0xd845, 0x1002,
+		0xd846, 0x2fa4,
+		0xd847, 0x3dc4,
+		0xd848, 0x6624,
+		0xd849, 0x2e8b,
+		0xd84a, 0x303b,
+		0xd84b, 0x56b3,
+		0xd84c, 0x03c6,
+		0xd84d, 0x866b,
+		0xd84e, 0x400c,
+		0xd84f, 0x2782,
+		0xd850, 0x3012,
+		0xd851, 0x1002,
+		0xd852, 0x2c4b,
+		0xd853, 0x309b,
+		0xd854, 0x56b3,
+		0xd855, 0x03c3,
+		0xd856, 0x866b,
+		0xd857, 0x400c,
+		0xd858, 0x22a2,
+		0xd859, 0x3022,
+		0xd85a, 0x1002,
+		0xd85b, 0x2842,
+		0xd85c, 0x3022,
+		0xd85d, 0x1002,
+		0xd85e, 0x26e2,
+		0xd85f, 0x3022,
+		0xd860, 0x1002,
+		0xd861, 0x2fb4,
+		0xd862, 0x3dc4,
+		0xd863, 0x6624,
+		0xd864, 0x56b3,
+		0xd865, 0x03c3,
+		0xd866, 0x866b,
+		0xd867, 0x401c,
+		0xd868, 0x2c45,
+		0xd869, 0x3095,
+		0xd86a, 0x5b53,
+		0xd86b, 0x23d2,
 		0xd86c, 0x3012,
-		0xd86d, 0x1002,
-		0xd86e, 0x2742,
-		0xd86f, 0x3022,
-		0xd870, 0x1002,
-		0xd871, 0x2582,
-		0xd872, 0x3022,
-		0xd873, 0x1002,
-		0xd874, 0x2142,
-		0xd875, 0x3012,
-		0xd876, 0x1002,
-		0xd877, 0x628f,
-		0xd878, 0x2985,
-		0xd879, 0x33a5,
-		0xd87a, 0x25e2,
-		0xd87b, 0x3022,
-		0xd87c, 0x1002,
-		0xd87d, 0x5653,
-		0xd87e, 0x03d2,
-		0xd87f, 0x401e,
-		0xd880, 0x6f72,
-		0xd881, 0x1002,
-		0xd882, 0x628f,
-		0xd883, 0x2304,
-		0xd884, 0x3c84,
-		0xd885, 0x6436,
-		0xd886, 0xdff4,
-		0xd887, 0x6436,
-		0xd888, 0x2ff5,
-		0xd889, 0x3005,
-		0xd88a, 0x8656,
-		0xd88b, 0xdfba,
-		0xd88c, 0x56a3,
-		0xd88d, 0xd05a,
-		0xd88e, 0x2972,
-		0xd88f, 0x3012,
-		0xd890, 0x1392,
-		0xd891, 0xd05a,
-		0xd892, 0x56a3,
-		0xd893, 0xdfba,
-		0xd894, 0x0383,
-		0xd895, 0x6f72,
-		0xd896, 0x1002,
-		0xd897, 0x2b45,
-		0xd898, 0x3005,
-		0xd899, 0x4178,
-		0xd89a, 0x5653,
-		0xd89b, 0x0384,
-		0xd89c, 0x2a62,
-		0xd89d, 0x3012,
-		0xd89e, 0x1002,
-		0xd89f, 0x2f05,
-		0xd8a0, 0x3005,
-		0xd8a1, 0x41c8,
-		0xd8a2, 0x5653,
-		0xd8a3, 0x0382,
-		0xd8a4, 0x0002,
-		0xd8a5, 0x4218,
-		0xd8a6, 0x2474,
-		0xd8a7, 0x3c84,
-		0xd8a8, 0x6437,
-		0xd8a9, 0xdff4,
-		0xd8aa, 0x6437,
-		0xd8ab, 0x2ff5,
-		0xd8ac, 0x3c05,
-		0xd8ad, 0x8757,
-		0xd8ae, 0xb888,
-		0xd8af, 0x9787,
-		0xd8b0, 0xdff4,
-		0xd8b1, 0x6724,
-		0xd8b2, 0x866a,
-		0xd8b3, 0x6f72,
-		0xd8b4, 0x1002,
-		0xd8b5, 0x2641,
-		0xd8b6, 0x3021,
-		0xd8b7, 0x1001,
-		0xd8b8, 0xc620,
-		0xd8b9, 0x0000,
-		0xd8ba, 0xc621,
-		0xd8bb, 0x0000,
-		0xd8bc, 0xc622,
-		0xd8bd, 0x00ce,
-		0xd8be, 0xc623,
-		0xd8bf, 0x007f,
-		0xd8c0, 0xc624,
-		0xd8c1, 0x0032,
-		0xd8c2, 0xc625,
-		0xd8c3, 0x0000,
-		0xd8c4, 0xc627,
-		0xd8c5, 0x0000,
-		0xd8c6, 0xc628,
-		0xd8c7, 0x0000,
-		0xd8c8, 0xc62c,
+		0xd86d, 0x13c2,
+		0xd86e, 0x5cc3,
+		0xd86f, 0x2782,
+		0xd870, 0x3012,
+		0xd871, 0x1312,
+		0xd872, 0x2b22,
+		0xd873, 0x3012,
+		0xd874, 0x1002,
+		0xd875, 0x2842,
+		0xd876, 0x3022,
+		0xd877, 0x1002,
+		0xd878, 0x2622,
+		0xd879, 0x3022,
+		0xd87a, 0x1002,
+		0xd87b, 0x21a2,
+		0xd87c, 0x3012,
+		0xd87d, 0x1002,
+		0xd87e, 0x628f,
+		0xd87f, 0x2985,
+		0xd880, 0x33a5,
+		0xd881, 0x26e2,
+		0xd882, 0x3022,
+		0xd883, 0x1002,
+		0xd884, 0x5653,
+		0xd885, 0x03d2,
+		0xd886, 0x401e,
+		0xd887, 0x6f72,
+		0xd888, 0x1002,
+		0xd889, 0x628f,
+		0xd88a, 0x2304,
+		0xd88b, 0x3c84,
+		0xd88c, 0x6436,
+		0xd88d, 0xdff4,
+		0xd88e, 0x6436,
+		0xd88f, 0x2ff5,
+		0xd890, 0x3005,
+		0xd891, 0x8656,
+		0xd892, 0xdfba,
+		0xd893, 0x56a3,
+		0xd894, 0xd05a,
+		0xd895, 0x29e2,
+		0xd896, 0x3012,
+		0xd897, 0x1392,
+		0xd898, 0xd05a,
+		0xd899, 0x56a3,
+		0xd89a, 0xdfba,
+		0xd89b, 0x0383,
+		0xd89c, 0x6f72,
+		0xd89d, 0x1002,
+		0xd89e, 0x2a64,
+		0xd89f, 0x3014,
+		0xd8a0, 0x2005,
+		0xd8a1, 0x3d75,
+		0xd8a2, 0xc451,
+		0xd8a3, 0x29a2,
+		0xd8a4, 0x3022,
+		0xd8a5, 0x1002,
+		0xd8a6, 0x178c,
+		0xd8a7, 0x1898,
+		0xd8a8, 0x19a4,
+		0xd8a9, 0x1ab0,
+		0xd8aa, 0x1bbc,
+		0xd8ab, 0x1cc8,
+		0xd8ac, 0x1dd3,
+		0xd8ad, 0x1ede,
+		0xd8ae, 0x1fe9,
+		0xd8af, 0x20f4,
+		0xd8b0, 0x21ff,
+		0xd8b1, 0x0000,
+		0xd8b2, 0x2741,
+		0xd8b3, 0x3021,
+		0xd8b4, 0x1001,
+		0xd8b5, 0xc620,
+		0xd8b6, 0x0000,
+		0xd8b7, 0xc621,
+		0xd8b8, 0x0000,
+		0xd8b9, 0xc622,
+		0xd8ba, 0x00e2,
+		0xd8bb, 0xc623,
+		0xd8bc, 0x007f,
+		0xd8bd, 0xc624,
+		0xd8be, 0x00ce,
+		0xd8bf, 0xc625,
+		0xd8c0, 0x0000,
+		0xd8c1, 0xc627,
+		0xd8c2, 0x0000,
+		0xd8c3, 0xc628,
+		0xd8c4, 0x0000,
+		0xd8c5, 0xc90a,
+		0xd8c6, 0x3a7c,
+		0xd8c7, 0xc62c,
+		0xd8c8, 0x0000,
 		0xd8c9, 0x0000,
-		0xd8ca, 0x0000,
-		0xd8cb, 0x2641,
-		0xd8cc, 0x3021,
-		0xd8cd, 0x1001,
-		0xd8ce, 0xc502,
-		0xd8cf, 0x53ac,
-		0xd8d0, 0xc503,
-		0xd8d1, 0x2cd3,
-		0xd8d2, 0xc600,
-		0xd8d3, 0x2a6e,
-		0xd8d4, 0xc601,
-		0xd8d5, 0x2a2c,
-		0xd8d6, 0xc605,
-		0xd8d7, 0x5557,
-		0xd8d8, 0xc60c,
-		0xd8d9, 0x5400,
-		0xd8da, 0xc710,
-		0xd8db, 0x0700,
-		0xd8dc, 0xc711,
-		0xd8dd, 0x0f06,
-		0xd8de, 0xc718,
-		0xd8df, 0x0700,
-		0xd8e0, 0xc719,
-		0xd8e1, 0x0f06,
-		0xd8e2, 0xc720,
-		0xd8e3, 0x4700,
-		0xd8e4, 0xc721,
-		0xd8e5, 0x0f06,
-		0xd8e6, 0xc728,
-		0xd8e7, 0x0700,
-		0xd8e8, 0xc729,
-		0xd8e9, 0x1207,
-		0xd8ea, 0xc801,
-		0xd8eb, 0x7f50,
-		0xd8ec, 0xc802,
-		0xd8ed, 0x7760,
-		0xd8ee, 0xc803,
-		0xd8ef, 0x7fce,
-		0xd8f0, 0xc804,
-		0xd8f1, 0x520e,
-		0xd8f2, 0xc805,
-		0xd8f3, 0x5c11,
-		0xd8f4, 0xc806,
-		0xd8f5, 0x3c51,
-		0xd8f6, 0xc807,
-		0xd8f7, 0x4061,
-		0xd8f8, 0xc808,

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

From owner-p4-projects@FreeBSD.ORG  Fri Apr  2 20:56:49 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 560EC1065672; Fri,  2 Apr 2010 20:56: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 150D7106564A
	for ; Fri,  2 Apr 2010 20:56:49 +0000 (UTC)
	(envelope-from bz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 008528FC15
	for ; Fri,  2 Apr 2010 20:56:49 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o32KumKx017065
	for ; Fri, 2 Apr 2010 20:56:48 GMT
	(envelope-from bz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o32KuVfi017050
	for perforce@freebsd.org; Fri, 2 Apr 2010 20:56:31 GMT
	(envelope-from bz@freebsd.org)
Date: Fri, 2 Apr 2010 20:56:31 GMT
Message-Id: <201004022056.o32KuVfi017050@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bz@freebsd.org using -f
From: "Bjoern A. Zeeb" 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 176468 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Apr 2010 20:56:49 -0000

http://p4web.freebsd.org/chv.cgi?CH=176468

Change 176468 by bz@bz_dumpster on 2010/04/02 20:56:05

	IFC @176446

Affected files ...

.. //depot/projects/s390/MAINTAINERS#19 integrate
.. //depot/projects/s390/Makefile#19 integrate
.. //depot/projects/s390/Makefile.inc1#33 integrate
.. //depot/projects/s390/ObsoleteFiles.inc#13 integrate
.. //depot/projects/s390/UPDATING#25 integrate
.. //depot/projects/s390/bin/cp/cp.1#7 integrate
.. //depot/projects/s390/bin/cp/cp.c#10 integrate
.. //depot/projects/s390/bin/cp/utils.c#12 integrate
.. //depot/projects/s390/bin/csh/config.h#5 integrate
.. //depot/projects/s390/bin/csh/config_p.h#4 integrate
.. //depot/projects/s390/bin/date/Makefile#4 integrate
.. //depot/projects/s390/bin/date/date.1#8 integrate
.. //depot/projects/s390/bin/date/date.c#7 integrate
.. //depot/projects/s390/bin/ed/Makefile#7 integrate
.. //depot/projects/s390/bin/ed/main.c#6 integrate
.. //depot/projects/s390/bin/kill/kill.c#4 integrate
.. //depot/projects/s390/bin/ls/cmp.c#5 integrate
.. //depot/projects/s390/bin/ls/ls.c#12 integrate
.. //depot/projects/s390/bin/ls/ls.h#7 integrate
.. //depot/projects/s390/bin/ls/print.c#11 integrate
.. //depot/projects/s390/bin/pax/Makefile#5 integrate
.. //depot/projects/s390/bin/pax/cpio.1#3 delete
.. //depot/projects/s390/bin/pax/cpio.h#3 integrate
.. //depot/projects/s390/bin/pax/gen_subs.c#5 integrate
.. //depot/projects/s390/bin/pax/getoldopt.c#4 integrate
.. //depot/projects/s390/bin/pax/tar.1#5 delete
.. //depot/projects/s390/bin/pax/tar.h#3 integrate
.. //depot/projects/s390/bin/pkill/Makefile#2 integrate
.. //depot/projects/s390/bin/pkill/pkill.1#3 integrate
.. //depot/projects/s390/bin/pkill/pkill.c#4 integrate
.. //depot/projects/s390/bin/ps/extern.h#9 integrate
.. //depot/projects/s390/bin/ps/keyword.c#13 integrate
.. //depot/projects/s390/bin/ps/print.c#14 integrate
.. //depot/projects/s390/bin/ps/ps.1#11 integrate
.. //depot/projects/s390/bin/ps/ps.c#10 integrate
.. //depot/projects/s390/bin/rcp/rcp.c#8 integrate
.. //depot/projects/s390/bin/rmail/Makefile#4 integrate
.. //depot/projects/s390/bin/setfacl/file.c#3 integrate
.. //depot/projects/s390/bin/setfacl/mask.c#4 integrate
.. //depot/projects/s390/bin/setfacl/merge.c#5 integrate
.. //depot/projects/s390/bin/setfacl/remove.c#5 integrate
.. //depot/projects/s390/bin/setfacl/setfacl.1#8 integrate
.. //depot/projects/s390/bin/setfacl/setfacl.c#7 integrate
.. //depot/projects/s390/bin/setfacl/setfacl.h#6 integrate
.. //depot/projects/s390/bin/setfacl/util.c#4 integrate
.. //depot/projects/s390/bin/sh/eval.c#14 integrate
.. //depot/projects/s390/bin/sh/exec.c#13 integrate
.. //depot/projects/s390/bin/sh/exec.h#8 integrate
.. //depot/projects/s390/bin/sh/main.c#8 integrate
.. //depot/projects/s390/bin/sh/parser.c#11 integrate
.. //depot/projects/s390/bin/sh/sh.1#16 integrate
.. //depot/projects/s390/bin/sh/var.c#11 integrate
.. //depot/projects/s390/bin/test/test.c#5 integrate
.. //depot/projects/s390/cddl/Makefile.inc#4 integrate
.. //depot/projects/s390/cddl/contrib/opensolaris/cmd/zfs/zfs.8#4 integrate
.. //depot/projects/s390/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#3 integrate
.. //depot/projects/s390/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#3 integrate
.. //depot/projects/s390/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#4 integrate
.. //depot/projects/s390/cddl/contrib/opensolaris/cmd/zpool/zpool.8#3 integrate
.. //depot/projects/s390/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#4 integrate
.. //depot/projects/s390/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#4 integrate
.. //depot/projects/s390/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#3 integrate
.. //depot/projects/s390/cddl/lib/drti/Makefile#2 integrate
.. //depot/projects/s390/cddl/lib/libavl/Makefile#2 integrate
.. //depot/projects/s390/cddl/lib/libctf/Makefile#3 integrate
.. //depot/projects/s390/cddl/lib/libdtrace/Makefile#3 integrate
.. //depot/projects/s390/cddl/lib/libnvpair/Makefile#3 integrate
.. //depot/projects/s390/cddl/lib/libumem/Makefile#2 integrate
.. //depot/projects/s390/cddl/lib/libuutil/Makefile#2 integrate
.. //depot/projects/s390/cddl/lib/libzfs/Makefile#3 integrate
.. //depot/projects/s390/cddl/lib/libzpool/Makefile#6 integrate
.. //depot/projects/s390/cddl/sbin/zfs/Makefile#2 integrate
.. //depot/projects/s390/cddl/sbin/zpool/Makefile#3 integrate
.. //depot/projects/s390/cddl/usr.bin/ctfconvert/Makefile#2 integrate
.. //depot/projects/s390/cddl/usr.bin/ctfdump/Makefile#2 integrate
.. //depot/projects/s390/cddl/usr.bin/ctfmerge/Makefile#2 integrate
.. //depot/projects/s390/cddl/usr.bin/sgsmsg/Makefile#2 integrate
.. //depot/projects/s390/cddl/usr.bin/zinject/Makefile#2 integrate
.. //depot/projects/s390/cddl/usr.bin/ztest/Makefile#4 integrate
.. //depot/projects/s390/cddl/usr.sbin/dtrace/Makefile#2 integrate
.. //depot/projects/s390/cddl/usr.sbin/lockstat/Makefile#2 integrate
.. //depot/projects/s390/cddl/usr.sbin/zdb/Makefile#4 integrate
.. //depot/projects/s390/contrib/bc/AUTHORS#2 delete
.. //depot/projects/s390/contrib/bc/ChangeLog#2 delete
.. //depot/projects/s390/contrib/bc/Examples/ckbook.b#2 delete
.. //depot/projects/s390/contrib/bc/Examples/pi.b#2 delete
.. //depot/projects/s390/contrib/bc/Examples/primes.b#2 delete
.. //depot/projects/s390/contrib/bc/Examples/twins.b#2 delete
.. //depot/projects/s390/contrib/bc/FAQ#2 delete
.. //depot/projects/s390/contrib/bc/FREEBSD-upgrade#3 delete
.. //depot/projects/s390/contrib/bc/INSTALL#2 delete
.. //depot/projects/s390/contrib/bc/Makefile.am#2 delete
.. //depot/projects/s390/contrib/bc/Makefile.in#2 delete
.. //depot/projects/s390/contrib/bc/NEWS#2 delete
.. //depot/projects/s390/contrib/bc/README#2 delete
.. //depot/projects/s390/contrib/bc/Test/BUG.bc#2 delete
.. //depot/projects/s390/contrib/bc/Test/array.b#2 delete
.. //depot/projects/s390/contrib/bc/Test/arrayp.b#2 delete
.. //depot/projects/s390/contrib/bc/Test/aryprm.b#2 delete
.. //depot/projects/s390/contrib/bc/Test/atan.b#2 delete
.. //depot/projects/s390/contrib/bc/Test/checklib.b#2 delete
.. //depot/projects/s390/contrib/bc/Test/div.b#2 delete
.. //depot/projects/s390/contrib/bc/Test/exp.b#2 delete
.. //depot/projects/s390/contrib/bc/Test/fact.b#2 delete
.. //depot/projects/s390/contrib/bc/Test/jn.b#2 delete
.. //depot/projects/s390/contrib/bc/Test/ln.b#2 delete
.. //depot/projects/s390/contrib/bc/Test/mul.b#2 delete
.. //depot/projects/s390/contrib/bc/Test/raise.b#2 delete
.. //depot/projects/s390/contrib/bc/Test/signum#2 delete
.. //depot/projects/s390/contrib/bc/Test/sine.b#2 delete
.. //depot/projects/s390/contrib/bc/Test/sqrt.b#2 delete
.. //depot/projects/s390/contrib/bc/Test/sqrt1.b#2 delete
.. //depot/projects/s390/contrib/bc/Test/sqrt2.b#2 delete
.. //depot/projects/s390/contrib/bc/Test/testfn.b#2 delete
.. //depot/projects/s390/contrib/bc/Test/timetest#2 delete
.. //depot/projects/s390/contrib/bc/acconfig.h#2 delete
.. //depot/projects/s390/contrib/bc/aclocal.m4#2 delete
.. //depot/projects/s390/contrib/bc/bc/Makefile.am#2 delete
.. //depot/projects/s390/contrib/bc/bc/Makefile.in#2 delete
.. //depot/projects/s390/contrib/bc/bc/bc.y#2 delete
.. //depot/projects/s390/contrib/bc/bc/bcdefs.h#2 delete
.. //depot/projects/s390/contrib/bc/bc/const.h#2 delete
.. //depot/projects/s390/contrib/bc/bc/execute.c#2 delete
.. //depot/projects/s390/contrib/bc/bc/fix-libmath_h#2 delete
.. //depot/projects/s390/contrib/bc/bc/global.c#2 delete
.. //depot/projects/s390/contrib/bc/bc/global.h#2 delete
.. //depot/projects/s390/contrib/bc/bc/libmath.b#2 delete
.. //depot/projects/s390/contrib/bc/bc/libmath.h#2 delete
.. //depot/projects/s390/contrib/bc/bc/load.c#2 delete
.. //depot/projects/s390/contrib/bc/bc/main.c#5 delete
.. //depot/projects/s390/contrib/bc/bc/proto.h#2 delete
.. //depot/projects/s390/contrib/bc/bc/sbc.y#2 delete
.. //depot/projects/s390/contrib/bc/bc/scan.l#2 delete
.. //depot/projects/s390/contrib/bc/bc/storage.c#2 delete
.. //depot/projects/s390/contrib/bc/bc/util.c#2 delete
.. //depot/projects/s390/contrib/bc/config.h.in#2 delete
.. //depot/projects/s390/contrib/bc/configure#2 delete
.. //depot/projects/s390/contrib/bc/configure.in#2 delete
.. //depot/projects/s390/contrib/bc/dc/Makefile.am#2 delete
.. //depot/projects/s390/contrib/bc/dc/Makefile.in#2 delete
.. //depot/projects/s390/contrib/bc/dc/array.c#2 delete
.. //depot/projects/s390/contrib/bc/dc/dc-proto.h#2 delete
.. //depot/projects/s390/contrib/bc/dc/dc-regdef.h#2 delete
.. //depot/projects/s390/contrib/bc/dc/dc.c#2 delete
.. //depot/projects/s390/contrib/bc/dc/dc.h#2 delete
.. //depot/projects/s390/contrib/bc/dc/eval.c#2 delete
.. //depot/projects/s390/contrib/bc/dc/misc.c#2 delete
.. //depot/projects/s390/contrib/bc/dc/numeric.c#2 delete
.. //depot/projects/s390/contrib/bc/dc/stack.c#2 delete
.. //depot/projects/s390/contrib/bc/dc/string.c#2 delete
.. //depot/projects/s390/contrib/bc/doc/Makefile.am#2 delete
.. //depot/projects/s390/contrib/bc/doc/Makefile.in#2 delete
.. //depot/projects/s390/contrib/bc/doc/bc.1#2 delete
.. //depot/projects/s390/contrib/bc/doc/bc.texi#2 delete
.. //depot/projects/s390/contrib/bc/doc/dc.1#2 delete
.. //depot/projects/s390/contrib/bc/doc/dc.texi#2 delete
.. //depot/projects/s390/contrib/bc/h/number.h#2 delete
.. //depot/projects/s390/contrib/bc/install-sh#2 delete
.. //depot/projects/s390/contrib/bc/lib/Makefile.am#2 delete
.. //depot/projects/s390/contrib/bc/lib/Makefile.in#2 delete
.. //depot/projects/s390/contrib/bc/lib/number.c#2 delete
.. //depot/projects/s390/contrib/bc/lib/testmul.c#2 delete
.. //depot/projects/s390/contrib/bc/lib/vfprintf.c#2 delete
.. //depot/projects/s390/contrib/bc/missing#2 delete
.. //depot/projects/s390/contrib/bc/mkinstalldirs#2 delete
.. //depot/projects/s390/contrib/bc/stamp-h.in#2 delete
.. //depot/projects/s390/contrib/bind9/CHANGES#8 integrate
.. //depot/projects/s390/contrib/bind9/COPYRIGHT#5 integrate
.. //depot/projects/s390/contrib/bind9/FAQ#6 integrate
.. //depot/projects/s390/contrib/bind9/FAQ.xml#5 integrate
.. //depot/projects/s390/contrib/bind9/NSEC3-NOTES#2 integrate
.. //depot/projects/s390/contrib/bind9/README#6 integrate
.. //depot/projects/s390/contrib/bind9/bin/check/named-checkconf.8#5 integrate
.. //depot/projects/s390/contrib/bind9/bin/check/named-checkconf.html#5 integrate
.. //depot/projects/s390/contrib/bind9/bin/check/named-checkzone.8#5 integrate
.. //depot/projects/s390/contrib/bind9/bin/check/named-checkzone.c#5 integrate
.. //depot/projects/s390/contrib/bind9/bin/check/named-checkzone.docbook#5 integrate
.. //depot/projects/s390/contrib/bind9/bin/check/named-checkzone.html#5 integrate
.. //depot/projects/s390/contrib/bind9/bin/dig/dig.1#6 integrate
.. //depot/projects/s390/contrib/bind9/bin/dig/dig.html#6 integrate
.. //depot/projects/s390/contrib/bind9/bin/dig/dighost.c#7 integrate
.. //depot/projects/s390/contrib/bind9/bin/dig/host.1#6 integrate
.. //depot/projects/s390/contrib/bind9/bin/dig/host.c#5 integrate
.. //depot/projects/s390/contrib/bind9/bin/dig/host.html#6 integrate
.. //depot/projects/s390/contrib/bind9/bin/dig/nslookup.1#5 integrate
.. //depot/projects/s390/contrib/bind9/bin/dig/nslookup.c#5 integrate
.. //depot/projects/s390/contrib/bind9/bin/dig/nslookup.html#5 integrate
.. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c#2 integrate
.. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8#2 integrate
.. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c#2 integrate
.. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook#2 integrate
.. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html#2 integrate
.. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssec-keygen.8#6 integrate
.. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssec-keygen.c#4 integrate
.. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#6 integrate
.. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssec-keygen.html#6 integrate
.. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssec-signzone.8#6 integrate
.. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssec-signzone.c#6 integrate
.. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#6 integrate
.. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssec-signzone.html#6 integrate
.. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssectool.c#5 integrate
.. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssectool.h#4 integrate
.. //depot/projects/s390/contrib/bind9/bin/named/control.c#5 integrate
.. //depot/projects/s390/contrib/bind9/bin/named/include/named/server.h#4 integrate
.. //depot/projects/s390/contrib/bind9/bin/named/lwresd.8#6 integrate
.. //depot/projects/s390/contrib/bind9/bin/named/lwresd.html#6 integrate
.. //depot/projects/s390/contrib/bind9/bin/named/named.8#6 integrate
.. //depot/projects/s390/contrib/bind9/bin/named/named.conf.5#6 integrate
.. //depot/projects/s390/contrib/bind9/bin/named/named.conf.html#6 integrate
.. //depot/projects/s390/contrib/bind9/bin/named/named.docbook#6 integrate
.. //depot/projects/s390/contrib/bind9/bin/named/named.html#6 integrate
.. //depot/projects/s390/contrib/bind9/bin/named/query.c#7 integrate
.. //depot/projects/s390/contrib/bind9/bin/named/server.c#6 integrate
.. //depot/projects/s390/contrib/bind9/bin/named/statschannel.c#2 integrate
.. //depot/projects/s390/contrib/bind9/bin/named/update.c#6 integrate
.. //depot/projects/s390/contrib/bind9/bin/nsupdate/nsupdate.1#3 integrate
.. //depot/projects/s390/contrib/bind9/bin/nsupdate/nsupdate.html#6 integrate
.. //depot/projects/s390/contrib/bind9/bin/rndc/rndc-confgen.8#5 integrate
.. //depot/projects/s390/contrib/bind9/bin/rndc/rndc-confgen.html#5 integrate
.. //depot/projects/s390/contrib/bind9/bin/rndc/rndc.8#6 integrate
.. //depot/projects/s390/contrib/bind9/bin/rndc/rndc.conf.5#5 integrate
.. //depot/projects/s390/contrib/bind9/bin/rndc/rndc.conf.html#5 integrate
.. //depot/projects/s390/contrib/bind9/bin/rndc/rndc.html#6 integrate
.. //depot/projects/s390/contrib/bind9/config.h.in#3 integrate
.. //depot/projects/s390/contrib/bind9/configure.in#6 integrate
.. //depot/projects/s390/contrib/bind9/doc/arm/Bv9ARM-book.xml#6 integrate
.. //depot/projects/s390/contrib/bind9/doc/arm/Bv9ARM.ch01.html#6 integrate
.. //depot/projects/s390/contrib/bind9/doc/arm/Bv9ARM.ch02.html#6 integrate
.. //depot/projects/s390/contrib/bind9/doc/arm/Bv9ARM.ch03.html#6 integrate
.. //depot/projects/s390/contrib/bind9/doc/arm/Bv9ARM.ch04.html#6 integrate
.. //depot/projects/s390/contrib/bind9/doc/arm/Bv9ARM.ch05.html#6 integrate
.. //depot/projects/s390/contrib/bind9/doc/arm/Bv9ARM.ch06.html#6 integrate
.. //depot/projects/s390/contrib/bind9/doc/arm/Bv9ARM.ch07.html#6 integrate
.. //depot/projects/s390/contrib/bind9/doc/arm/Bv9ARM.ch08.html#6 integrate
.. //depot/projects/s390/contrib/bind9/doc/arm/Bv9ARM.ch09.html#6 integrate
.. //depot/projects/s390/contrib/bind9/doc/arm/Bv9ARM.ch10.html#4 integrate
.. //depot/projects/s390/contrib/bind9/doc/arm/Bv9ARM.html#6 integrate
.. //depot/projects/s390/contrib/bind9/doc/arm/Bv9ARM.pdf#5 integrate
.. //depot/projects/s390/contrib/bind9/doc/arm/man.dig.html#4 integrate
.. //depot/projects/s390/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html#2 integrate
.. //depot/projects/s390/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html#2 integrate
.. //depot/projects/s390/contrib/bind9/doc/arm/man.dnssec-keygen.html#4 integrate
.. //depot/projects/s390/contrib/bind9/doc/arm/man.dnssec-signzone.html#4 integrate
.. //depot/projects/s390/contrib/bind9/doc/arm/man.host.html#4 integrate
.. //depot/projects/s390/contrib/bind9/doc/arm/man.named-checkconf.html#4 integrate
.. //depot/projects/s390/contrib/bind9/doc/arm/man.named-checkzone.html#4 integrate
.. //depot/projects/s390/contrib/bind9/doc/arm/man.named.html#4 integrate
.. //depot/projects/s390/contrib/bind9/doc/arm/man.nsupdate.html#2 integrate
.. //depot/projects/s390/contrib/bind9/doc/arm/man.rndc-confgen.html#4 integrate
.. //depot/projects/s390/contrib/bind9/doc/arm/man.rndc.conf.html#4 integrate
.. //depot/projects/s390/contrib/bind9/doc/arm/man.rndc.html#4 integrate
.. //depot/projects/s390/contrib/bind9/doc/misc/Makefile.in#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/api#7 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/db.c#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/dispatch.c#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/dnssec.c#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/dst_api.c#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/dst_internal.h#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/dst_parse.c#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/include/dns/db.h#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/include/dns/dnssec.h#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/include/dns/journal.h#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/include/dns/keyvalues.h#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/include/dns/name.h#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/include/dns/ncache.h#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/include/dns/nsec3.h#2 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/include/dns/rbt.h#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/include/dns/rdataset.h#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/include/dns/resolver.h#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/include/dns/result.h#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/include/dns/types.h#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/include/dns/validator.h#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/include/dns/zone.h#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/include/dst/dst.h#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/journal.c#6 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/masterdump.c#6 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/message.c#6 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/ncache.c#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/nsec3.c#2 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/opensslrsa_link.c#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/rbt.c#6 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/rbtdb.c#7 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/rcode.c#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c#3 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/rdatalist.c#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/rdataset.c#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/rdataslab.c#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/resolver.c#7 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/result.c#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/sdb.c#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/sdlz.c#3 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/spnego.c#2 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/validator.c#8 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/view.c#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/dns/zone.c#6 integrate
.. //depot/projects/s390/contrib/bind9/lib/isc/api#6 integrate
.. //depot/projects/s390/contrib/bind9/lib/isc/base32.c#2 integrate
.. //depot/projects/s390/contrib/bind9/lib/isc/base64.c#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/isc/heap.c#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/isc/httpd.c#2 integrate
.. //depot/projects/s390/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/isc/include/isc/entropy.h#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/isc/include/isc/netscope.h#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/isc/include/isc/portset.h#3 integrate
.. //depot/projects/s390/contrib/bind9/lib/isc/include/isc/sha2.h#3 integrate
.. //depot/projects/s390/contrib/bind9/lib/isc/include/isc/util.h#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/isc/inet_ntop.c#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#3 integrate
.. //depot/projects/s390/contrib/bind9/lib/isc/random.c#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/isc/sha2.c#3 integrate
.. //depot/projects/s390/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/isc/unix/socket.c#6 integrate
.. //depot/projects/s390/contrib/bind9/lib/isccc/api#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/isccfg/aclconf.c#3 integrate
.. //depot/projects/s390/contrib/bind9/lib/isccfg/api#6 integrate
.. //depot/projects/s390/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/api#6 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/context.c#4 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/getipnode.c#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres.3#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres.html#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_buffer.3#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_buffer.html#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_config.3#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_config.html#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_context.3#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_context.html#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_gabn.3#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_gabn.html#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_gethostent.3#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_gethostent.html#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_getipnode.3#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_getipnode.html#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_gnba.3#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_gnba.html#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_inetntop.3#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_inetntop.html#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_noop.3#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_noop.html#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_packet.3#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_packet.html#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_resutil.3#5 integrate
.. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_resutil.html#5 integrate
.. //depot/projects/s390/contrib/bind9/version#8 integrate
.. //depot/projects/s390/contrib/bsnmp/gensnmpdef/gensnmpdef.c#3 integrate
.. //depot/projects/s390/contrib/bsnmp/gensnmptree/gensnmptree.1#5 integrate
.. //depot/projects/s390/contrib/bsnmp/snmpd/config.c#5 integrate
.. //depot/projects/s390/contrib/bsnmp/snmpd/snmpmod.3#4 integrate
.. //depot/projects/s390/contrib/cpio/ABOUT-NLS#3 delete
.. //depot/projects/s390/contrib/cpio/AUTHORS#2 delete
.. //depot/projects/s390/contrib/cpio/COPYING#4 delete
.. //depot/projects/s390/contrib/cpio/ChangeLog#4 delete
.. //depot/projects/s390/contrib/cpio/FREEBSD-upgrade#4 delete
.. //depot/projects/s390/contrib/cpio/INSTALL#3 delete
.. //depot/projects/s390/contrib/cpio/NEWS#4 delete
.. //depot/projects/s390/contrib/cpio/README#3 delete
.. //depot/projects/s390/contrib/cpio/THANKS#3 delete
.. //depot/projects/s390/contrib/cpio/TODO#3 delete
.. //depot/projects/s390/contrib/cpio/doc/cpio.1#3 delete
.. //depot/projects/s390/contrib/cpio/doc/cpio.texi#4 delete
.. //depot/projects/s390/contrib/cpio/doc/version.texi#2 delete
.. //depot/projects/s390/contrib/cpio/lib/alloca_.h#3 delete
.. //depot/projects/s390/contrib/cpio/lib/argp-ba.c#3 delete
.. //depot/projects/s390/contrib/cpio/lib/argp-eexst.c#3 delete
.. //depot/projects/s390/contrib/cpio/lib/argp-fmtstream.c#3 delete
.. //depot/projects/s390/contrib/cpio/lib/argp-fmtstream.h#3 delete
.. //depot/projects/s390/contrib/cpio/lib/argp-fs-xinl.c#3 delete
.. //depot/projects/s390/contrib/cpio/lib/argp-help.c#3 delete
.. //depot/projects/s390/contrib/cpio/lib/argp-namefrob.h#3 delete
.. //depot/projects/s390/contrib/cpio/lib/argp-parse.c#3 delete
.. //depot/projects/s390/contrib/cpio/lib/argp-pin.c#2 delete
.. //depot/projects/s390/contrib/cpio/lib/argp-pv.c#3 delete
.. //depot/projects/s390/contrib/cpio/lib/argp-pvh.c#3 delete
.. //depot/projects/s390/contrib/cpio/lib/argp-xinl.c#3 delete
.. //depot/projects/s390/contrib/cpio/lib/argp.h#3 delete
.. //depot/projects/s390/contrib/cpio/lib/basename.c#3 delete
.. //depot/projects/s390/contrib/cpio/lib/dirname.c#3 delete
.. //depot/projects/s390/contrib/cpio/lib/dirname.h#3 delete
.. //depot/projects/s390/contrib/cpio/lib/error.c#3 delete
.. //depot/projects/s390/contrib/cpio/lib/error.h#3 delete
.. //depot/projects/s390/contrib/cpio/lib/exitfail.c#3 delete
.. //depot/projects/s390/contrib/cpio/lib/exitfail.h#3 delete
.. //depot/projects/s390/contrib/cpio/lib/fatal.c#2 delete
.. //depot/projects/s390/contrib/cpio/lib/full-write.c#3 delete
.. //depot/projects/s390/contrib/cpio/lib/full-write.h#3 delete
.. //depot/projects/s390/contrib/cpio/lib/getopt.c#3 delete
.. //depot/projects/s390/contrib/cpio/lib/getopt1.c#3 delete
.. //depot/projects/s390/contrib/cpio/lib/getopt_.h#3 delete
.. //depot/projects/s390/contrib/cpio/lib/getopt_int.h#3 delete
.. //depot/projects/s390/contrib/cpio/lib/gettext.h#3 delete
.. //depot/projects/s390/contrib/cpio/lib/hash.c#2 delete
.. //depot/projects/s390/contrib/cpio/lib/hash.h#2 delete
.. //depot/projects/s390/contrib/cpio/lib/intprops.h#2 delete
.. //depot/projects/s390/contrib/cpio/lib/inttostr.c#2 delete
.. //depot/projects/s390/contrib/cpio/lib/inttostr.h#2 delete
.. //depot/projects/s390/contrib/cpio/lib/mempcpy.c#3 delete
.. //depot/projects/s390/contrib/cpio/lib/paxerror.c#2 delete
.. //depot/projects/s390/contrib/cpio/lib/paxexit.c#2 delete
.. //depot/projects/s390/contrib/cpio/lib/paxlib.h#2 delete
.. //depot/projects/s390/contrib/cpio/lib/paxnames.c#2 delete
.. //depot/projects/s390/contrib/cpio/lib/quote.c#2 delete
.. //depot/projects/s390/contrib/cpio/lib/quote.h#2 delete
.. //depot/projects/s390/contrib/cpio/lib/quotearg.c#2 delete
.. //depot/projects/s390/contrib/cpio/lib/quotearg.h#2 delete
.. //depot/projects/s390/contrib/cpio/lib/rmt-command.h#2 delete
.. //depot/projects/s390/contrib/cpio/lib/rmt.h#3 delete
.. //depot/projects/s390/contrib/cpio/lib/rtapelib.c#3 delete
.. //depot/projects/s390/contrib/cpio/lib/safe-read.c#3 delete
.. //depot/projects/s390/contrib/cpio/lib/safe-read.h#3 delete
.. //depot/projects/s390/contrib/cpio/lib/safe-write.c#3 delete
.. //depot/projects/s390/contrib/cpio/lib/safe-write.h#3 delete
.. //depot/projects/s390/contrib/cpio/lib/savedir.c#3 delete
.. //depot/projects/s390/contrib/cpio/lib/savedir.h#3 delete
.. //depot/projects/s390/contrib/cpio/lib/strchrnul.c#3 delete
.. //depot/projects/s390/contrib/cpio/lib/stripslash.c#3 delete
.. //depot/projects/s390/contrib/cpio/lib/strndup.c#3 delete
.. //depot/projects/s390/contrib/cpio/lib/strnlen.c#3 delete
.. //depot/projects/s390/contrib/cpio/lib/system-ioctl.h#2 delete
.. //depot/projects/s390/contrib/cpio/lib/system.h#3 delete
.. //depot/projects/s390/contrib/cpio/lib/umaxtostr.c#2 delete
.. //depot/projects/s390/contrib/cpio/lib/unlocked-io.h#3 delete
.. //depot/projects/s390/contrib/cpio/lib/utimens.c#2 delete
.. //depot/projects/s390/contrib/cpio/lib/utimens.h#2 delete
.. //depot/projects/s390/contrib/cpio/lib/xalloc-die.c#3 delete
.. //depot/projects/s390/contrib/cpio/lib/xalloc.h#3 delete
.. //depot/projects/s390/contrib/cpio/lib/xmalloc.c#3 delete
.. //depot/projects/s390/contrib/cpio/lib/xstrndup.c#2 delete
.. //depot/projects/s390/contrib/cpio/lib/xstrndup.h#2 delete
.. //depot/projects/s390/contrib/cpio/src/copyin.c#4 delete
.. //depot/projects/s390/contrib/cpio/src/copyout.c#4 delete
.. //depot/projects/s390/contrib/cpio/src/copypass.c#4 delete
.. //depot/projects/s390/contrib/cpio/src/cpio.h#3 delete
.. //depot/projects/s390/contrib/cpio/src/cpiohdr.h#3 delete
.. //depot/projects/s390/contrib/cpio/src/defer.c#3 delete
.. //depot/projects/s390/contrib/cpio/src/defer.h#3 delete
.. //depot/projects/s390/contrib/cpio/src/dstring.c#3 delete
.. //depot/projects/s390/contrib/cpio/src/dstring.h#3 delete
.. //depot/projects/s390/contrib/cpio/src/extern.h#4 delete
.. //depot/projects/s390/contrib/cpio/src/filemode.c#3 delete
.. //depot/projects/s390/contrib/cpio/src/filetypes.h#3 delete
.. //depot/projects/s390/contrib/cpio/src/global.c#4 delete
.. //depot/projects/s390/contrib/cpio/src/idcache.c#3 delete
.. //depot/projects/s390/contrib/cpio/src/main.c#4 delete
.. //depot/projects/s390/contrib/cpio/src/makepath.c#3 delete
.. //depot/projects/s390/contrib/cpio/src/safe-stat.h#2 delete
.. //depot/projects/s390/contrib/cpio/src/tar.c#3 delete
.. //depot/projects/s390/contrib/cpio/src/tar.h#3 delete
.. //depot/projects/s390/contrib/cpio/src/tarhdr.h#3 delete
.. //depot/projects/s390/contrib/cpio/src/userspec.c#3 delete
.. //depot/projects/s390/contrib/cpio/src/util.c#3 delete
.. //depot/projects/s390/contrib/csup/GNUmakefile#3 delete
.. //depot/projects/s390/contrib/csup/Makefile#3 delete
.. //depot/projects/s390/contrib/csup/README#2 delete
.. //depot/projects/s390/contrib/csup/TODO#3 delete
.. //depot/projects/s390/contrib/csup/attrstack.c#2 delete
.. //depot/projects/s390/contrib/csup/attrstack.h#2 delete
.. //depot/projects/s390/contrib/csup/config.c#3 delete
.. //depot/projects/s390/contrib/csup/config.h#2 delete
.. //depot/projects/s390/contrib/csup/csup.1#3 delete
.. //depot/projects/s390/contrib/csup/detailer.c#3 delete
.. //depot/projects/s390/contrib/csup/detailer.h#2 delete
.. //depot/projects/s390/contrib/csup/diff.c#3 delete
.. //depot/projects/s390/contrib/csup/diff.h#3 delete
.. //depot/projects/s390/contrib/csup/fattr.c#3 delete
.. //depot/projects/s390/contrib/csup/fattr.h#3 delete
.. //depot/projects/s390/contrib/csup/fattr_bsd.h#2 delete
.. //depot/projects/s390/contrib/csup/fattr_posix.h#2 delete
.. //depot/projects/s390/contrib/csup/fixups.c#2 delete
.. //depot/projects/s390/contrib/csup/fixups.h#2 delete
.. //depot/projects/s390/contrib/csup/fnmatch.c#2 delete
.. //depot/projects/s390/contrib/csup/fnmatch.h#2 delete
.. //depot/projects/s390/contrib/csup/globtree.c#2 delete
.. //depot/projects/s390/contrib/csup/globtree.h#2 delete
.. //depot/projects/s390/contrib/csup/idcache.c#2 delete
.. //depot/projects/s390/contrib/csup/idcache.h#2 delete
.. //depot/projects/s390/contrib/csup/keyword.c#3 delete
.. //depot/projects/s390/contrib/csup/keyword.h#3 delete
.. //depot/projects/s390/contrib/csup/lex.rcs.c#2 delete
.. //depot/projects/s390/contrib/csup/lister.c#3 delete
.. //depot/projects/s390/contrib/csup/lister.h#2 delete
.. //depot/projects/s390/contrib/csup/main.c#2 delete
.. //depot/projects/s390/contrib/csup/main.h#2 delete
.. //depot/projects/s390/contrib/csup/misc.c#3 delete
.. //depot/projects/s390/contrib/csup/misc.h#3 delete
.. //depot/projects/s390/contrib/csup/mux.c#4 delete
.. //depot/projects/s390/contrib/csup/mux.h#2 delete
.. //depot/projects/s390/contrib/csup/parse.y#2 delete
.. //depot/projects/s390/contrib/csup/pathcomp.c#2 delete
.. //depot/projects/s390/contrib/csup/pathcomp.h#2 delete
.. //depot/projects/s390/contrib/csup/proto.c#4 delete
.. //depot/projects/s390/contrib/csup/proto.h#3 delete
.. //depot/projects/s390/contrib/csup/queue.h#3 delete
.. //depot/projects/s390/contrib/csup/rcsfile.c#4 delete
.. //depot/projects/s390/contrib/csup/rcsfile.h#3 delete
.. //depot/projects/s390/contrib/csup/rcsparse.c#3 delete
.. //depot/projects/s390/contrib/csup/rcsparse.h#2 delete
.. //depot/projects/s390/contrib/csup/rcstokenizer.h#2 delete
.. //depot/projects/s390/contrib/csup/rcstokenizer.l#2 delete
.. //depot/projects/s390/contrib/csup/rsyncfile.c#2 delete
.. //depot/projects/s390/contrib/csup/rsyncfile.h#2 delete
.. //depot/projects/s390/contrib/csup/status.c#3 delete
.. //depot/projects/s390/contrib/csup/status.h#2 delete
.. //depot/projects/s390/contrib/csup/stream.c#3 delete
.. //depot/projects/s390/contrib/csup/stream.h#3 delete
.. //depot/projects/s390/contrib/csup/threads.c#2 delete
.. //depot/projects/s390/contrib/csup/threads.h#2 delete
.. //depot/projects/s390/contrib/csup/token.h#2 delete
.. //depot/projects/s390/contrib/csup/token.l#2 delete
.. //depot/projects/s390/contrib/csup/updater.c#5 delete
.. //depot/projects/s390/contrib/csup/updater.h#2 delete
.. //depot/projects/s390/contrib/dtc/Documentation/dtc-paper.bib#1 branch
.. //depot/projects/s390/contrib/dtc/Documentation/dtc-paper.tex#1 branch
.. //depot/projects/s390/contrib/dtc/Documentation/dts-format.txt#1 branch
.. //depot/projects/s390/contrib/dtc/Documentation/manual.txt#1 branch
.. //depot/projects/s390/contrib/dtc/GPL#1 branch
.. //depot/projects/s390/contrib/dtc/Makefile#1 branch
.. //depot/projects/s390/contrib/dtc/Makefile.convert-dtsv0#1 branch
.. //depot/projects/s390/contrib/dtc/Makefile.ftdump#1 branch
.. //depot/projects/s390/contrib/dtc/README.license#1 branch
.. //depot/projects/s390/contrib/dtc/TODO#1 branch
.. //depot/projects/s390/contrib/dtc/checks.c#1 branch
.. //depot/projects/s390/contrib/dtc/convert-dtsv0-lexer.l#1 branch
.. //depot/projects/s390/contrib/dtc/data.c#1 branch
.. //depot/projects/s390/contrib/dtc/dtc-lexer.l#1 branch
.. //depot/projects/s390/contrib/dtc/dtc-parser.y#1 branch
.. //depot/projects/s390/contrib/dtc/dtc.c#1 branch
.. //depot/projects/s390/contrib/dtc/dtc.h#1 branch
.. //depot/projects/s390/contrib/dtc/flattree.c#1 branch
.. //depot/projects/s390/contrib/dtc/fstree.c#1 branch
.. //depot/projects/s390/contrib/dtc/ftdump.c#1 branch
.. //depot/projects/s390/contrib/dtc/libfdt/Makefile.libfdt#1 branch
.. //depot/projects/s390/contrib/dtc/libfdt/TODO#1 branch
.. //depot/projects/s390/contrib/dtc/libfdt/fdt.c#1 branch
.. //depot/projects/s390/contrib/dtc/libfdt/fdt.h#1 branch
.. //depot/projects/s390/contrib/dtc/libfdt/fdt_ro.c#1 branch
.. //depot/projects/s390/contrib/dtc/libfdt/fdt_rw.c#1 branch
.. //depot/projects/s390/contrib/dtc/libfdt/fdt_strerror.c#1 branch
.. //depot/projects/s390/contrib/dtc/libfdt/fdt_sw.c#1 branch
.. //depot/projects/s390/contrib/dtc/libfdt/fdt_wip.c#1 branch
.. //depot/projects/s390/contrib/dtc/libfdt/libfdt.h#1 branch
.. //depot/projects/s390/contrib/dtc/libfdt/libfdt_env.h#1 branch
.. //depot/projects/s390/contrib/dtc/libfdt/libfdt_internal.h#1 branch
.. //depot/projects/s390/contrib/dtc/libfdt/version.lds#1 branch
.. //depot/projects/s390/contrib/dtc/livetree.c#1 branch
.. //depot/projects/s390/contrib/dtc/scripts/setlocalversion#1 branch
.. //depot/projects/s390/contrib/dtc/srcpos.c#1 branch
.. //depot/projects/s390/contrib/dtc/srcpos.h#1 branch
.. //depot/projects/s390/contrib/dtc/treesource.c#1 branch
.. //depot/projects/s390/contrib/dtc/util.c#1 branch
.. //depot/projects/s390/contrib/dtc/util.h#1 branch
.. //depot/projects/s390/contrib/gcc/config/mips/freebsd.h#2 integrate
.. //depot/projects/s390/contrib/gdb/gdb/config/mips/nm-fbsd.h#1 branch
.. //depot/projects/s390/contrib/gdb/gdb/config/mips/tm-fbsd.h#1 branch
.. //depot/projects/s390/contrib/gdb/gdb/mips-tdep.h#2 integrate
.. //depot/projects/s390/contrib/gdb/gdb/mipsfbsd-nat.c#1 branch
.. //depot/projects/s390/contrib/gdb/gdb/mipsfbsd-tdep.c#1 branch
.. //depot/projects/s390/contrib/gdb/gdb/mipsfbsd-tdep.h#1 branch
.. //depot/projects/s390/contrib/groff/font/devutf8/R.proto#6 integrate
.. //depot/projects/s390/contrib/groff/tmac/an-old.tmac#5 integrate
.. //depot/projects/s390/contrib/groff/tmac/doc-common#12 integrate
.. //depot/projects/s390/contrib/groff/tmac/doc-old.tmac#3 integrate
.. //depot/projects/s390/contrib/groff/tmac/doc-syms#9 integrate
.. //depot/projects/s390/contrib/groff/tmac/doc.tmac#8 integrate
.. //depot/projects/s390/contrib/groff/tmac/groff_mdoc.man#11 integrate
.. //depot/projects/s390/contrib/ipfilter/ipsend/sbpf.c#6 integrate
.. //depot/projects/s390/contrib/libpcap/inet.c#6 integrate
.. //depot/projects/s390/contrib/netcat/FREEBSD-upgrade#3 integrate
.. //depot/projects/s390/contrib/netcat/FREEBSD-vendor#5 integrate
.. //depot/projects/s390/contrib/netcat/nc.1#6 integrate
.. //depot/projects/s390/contrib/netcat/netcat.c#6 integrate
.. //depot/projects/s390/contrib/one-true-awk/FIXES#7 integrate
.. //depot/projects/s390/contrib/one-true-awk/b.c#7 integrate
.. //depot/projects/s390/contrib/one-true-awk/lib.c#6 integrate
.. //depot/projects/s390/contrib/one-true-awk/mac.code#3 delete
.. //depot/projects/s390/contrib/one-true-awk/main.c#7 integrate
.. //depot/projects/s390/contrib/one-true-awk/makefile#6 integrate
.. //depot/projects/s390/contrib/one-true-awk/maketab.c#4 integrate
.. //depot/projects/s390/contrib/one-true-awk/proctab.c#4 integrate
.. //depot/projects/s390/contrib/one-true-awk/proto.h#3 integrate
.. //depot/projects/s390/contrib/one-true-awk/run.c#7 integrate
.. //depot/projects/s390/contrib/openpam/include/security/pam_appl.h#6 integrate
.. //depot/projects/s390/contrib/opie/libopie/getutmpentry.c#2 integrate
.. //depot/projects/s390/contrib/opie/libopie/insecure.c#2 integrate
.. //depot/projects/s390/contrib/opie/libopie/login.c#2 integrate
.. //depot/projects/s390/contrib/sendmail/CACerts#3 integrate
.. //depot/projects/s390/contrib/sendmail/FREEBSD-upgrade#10 integrate
.. //depot/projects/s390/contrib/sendmail/LICENSE#4 integrate
.. //depot/projects/s390/contrib/sendmail/PGPKEYS#6 integrate
.. //depot/projects/s390/contrib/sendmail/README#6 integrate
.. //depot/projects/s390/contrib/sendmail/RELEASE_NOTES#10 integrate
.. //depot/projects/s390/contrib/sendmail/cf/README#10 integrate
.. //depot/projects/s390/contrib/sendmail/cf/cf/submit.cf#10 integrate
.. //depot/projects/s390/contrib/sendmail/cf/feature/ldap_routing.m4#4 integrate
.. //depot/projects/s390/contrib/sendmail/cf/m4/cfhead.m4#6 integrate
.. //depot/projects/s390/contrib/sendmail/cf/m4/proto.m4#9 integrate
.. //depot/projects/s390/contrib/sendmail/cf/m4/version.m4#10 integrate
.. //depot/projects/s390/contrib/sendmail/contrib/qtool.pl#4 integrate
.. //depot/projects/s390/contrib/sendmail/contrib/smcontrol.pl#2 integrate
.. //depot/projects/s390/contrib/sendmail/doc/op/op.me#10 integrate
.. //depot/projects/s390/contrib/sendmail/include/libmilter/mfapi.h#5 integrate
.. //depot/projects/s390/contrib/sendmail/include/libmilter/mfdef.h#6 integrate
.. //depot/projects/s390/contrib/sendmail/include/sm/conf.h#9 integrate
.. //depot/projects/s390/contrib/sendmail/include/sm/ldap.h#5 integrate
.. //depot/projects/s390/contrib/sendmail/include/sm/sem.h#2 integrate
.. //depot/projects/s390/contrib/sendmail/libmilter/Makefile.m4#4 integrate
.. //depot/projects/s390/contrib/sendmail/libmilter/comm.c#7 integrate
.. //depot/projects/s390/contrib/sendmail/libmilter/docs/api.html#5 integrate
.. //depot/projects/s390/contrib/sendmail/libmilter/docs/overview.html#5 integrate
.. //depot/projects/s390/contrib/sendmail/libmilter/docs/smfi_addheader.html#5 integrate
.. //depot/projects/s390/contrib/sendmail/libmilter/docs/smfi_chgheader.html#6 integrate
.. //depot/projects/s390/contrib/sendmail/libmilter/docs/smfi_insheader.html#3 integrate
.. //depot/projects/s390/contrib/sendmail/libmilter/engine.c#7 integrate
.. //depot/projects/s390/contrib/sendmail/libmilter/example.c#2 integrate
.. //depot/projects/s390/contrib/sendmail/libmilter/handler.c#6 integrate
.. //depot/projects/s390/contrib/sendmail/libmilter/libmilter.h#8 integrate
.. //depot/projects/s390/contrib/sendmail/libmilter/listener.c#9 integrate
.. //depot/projects/s390/contrib/sendmail/libmilter/main.c#6 integrate
.. //depot/projects/s390/contrib/sendmail/libmilter/worker.c#2 integrate
.. //depot/projects/s390/contrib/sendmail/libsm/debug.c#3 integrate
.. //depot/projects/s390/contrib/sendmail/libsm/ldap.c#7 integrate
.. //depot/projects/s390/contrib/sendmail/libsm/mbdb.c#4 integrate
.. //depot/projects/s390/contrib/sendmail/libsm/sem.c#3 integrate
.. //depot/projects/s390/contrib/sendmail/libsm/t-sem.c#4 integrate
.. //depot/projects/s390/contrib/sendmail/libsmdb/smdb1.c#3 integrate
.. //depot/projects/s390/contrib/sendmail/libsmdb/smdb2.c#6 integrate
.. //depot/projects/s390/contrib/sendmail/libsmutil/safefile.c#3 integrate
.. //depot/projects/s390/contrib/sendmail/praliases/praliases.8#2 integrate
.. //depot/projects/s390/contrib/sendmail/praliases/praliases.c#5 integrate
.. //depot/projects/s390/contrib/sendmail/src/Makefile.m4#6 integrate
.. //depot/projects/s390/contrib/sendmail/src/README#9 integrate
.. //depot/projects/s390/contrib/sendmail/src/TRACEFLAGS#8 integrate
.. //depot/projects/s390/contrib/sendmail/src/collect.c#9 integrate
.. //depot/projects/s390/contrib/sendmail/src/conf.c#12 integrate
.. //depot/projects/s390/contrib/sendmail/src/conf.h#8 integrate
.. //depot/projects/s390/contrib/sendmail/src/daemon.c#8 integrate
.. //depot/projects/s390/contrib/sendmail/src/deliver.c#10 integrate
.. //depot/projects/s390/contrib/sendmail/src/envelope.c#6 integrate
.. //depot/projects/s390/contrib/sendmail/src/headers.c#12 integrate
.. //depot/projects/s390/contrib/sendmail/src/main.c#10 integrate
.. //depot/projects/s390/contrib/sendmail/src/map.c#8 integrate
.. //depot/projects/s390/contrib/sendmail/src/milter.c#10 integrate
.. //depot/projects/s390/contrib/sendmail/src/queue.c#10 integrate
.. //depot/projects/s390/contrib/sendmail/src/ratectrl.c#4 integrate
.. //depot/projects/s390/contrib/sendmail/src/readcf.c#9 integrate
.. //depot/projects/s390/contrib/sendmail/src/savemail.c#8 integrate
.. //depot/projects/s390/contrib/sendmail/src/sendmail.8#6 integrate
.. //depot/projects/s390/contrib/sendmail/src/sendmail.h#11 integrate
.. //depot/projects/s390/contrib/sendmail/src/sfsasl.c#8 integrate
.. //depot/projects/s390/contrib/sendmail/src/srvrsmtp.c#10 integrate
.. //depot/projects/s390/contrib/sendmail/src/tls.c#8 integrate
.. //depot/projects/s390/contrib/sendmail/src/usersmtp.c#9 integrate
.. //depot/projects/s390/contrib/sendmail/src/util.c#7 integrate
.. //depot/projects/s390/contrib/sendmail/src/version.c#10 integrate
.. //depot/projects/s390/contrib/sendmail/vacation/vacation.c#6 integrate
.. //depot/projects/s390/contrib/smbfs/smbutil/view.c#4 integrate
.. //depot/projects/s390/contrib/telnet/telnetd/sys_term.c#5 integrate
.. //depot/projects/s390/contrib/telnet/telnetd/telnetd.c#4 integrate
.. //depot/projects/s390/contrib/top/utils.c#2 integrate
.. //depot/projects/s390/contrib/top/utils.h#2 integrate
.. //depot/projects/s390/contrib/tzcode/stdtime/asctime.c#1 branch
.. //depot/projects/s390/contrib/tzcode/stdtime/ctime.3#1 branch
.. //depot/projects/s390/contrib/tzcode/stdtime/difftime.c#1 branch
.. //depot/projects/s390/contrib/tzcode/stdtime/localtime.c#1 branch
.. //depot/projects/s390/contrib/tzcode/stdtime/private.h#1 branch
.. //depot/projects/s390/contrib/tzcode/stdtime/time2posix.3#1 branch
.. //depot/projects/s390/contrib/tzcode/stdtime/tzfile.5#1 branch
.. //depot/projects/s390/contrib/tzcode/stdtime/tzfile.h#1 branch
.. //depot/projects/s390/contrib/tzcode/zic/README#1 branch
.. //depot/projects/s390/contrib/tzcode/zic/Theory#1 branch
.. //depot/projects/s390/contrib/tzcode/zic/ialloc.c#1 branch
.. //depot/projects/s390/contrib/tzcode/zic/private.h#1 branch
.. //depot/projects/s390/contrib/tzcode/zic/scheck.c#1 branch
.. //depot/projects/s390/contrib/tzcode/zic/zdump.8#1 branch
.. //depot/projects/s390/contrib/tzcode/zic/zdump.c#1 branch
.. //depot/projects/s390/contrib/tzcode/zic/zdump/Makefile#1 branch
.. //depot/projects/s390/contrib/tzcode/zic/zic.8#1 branch
.. //depot/projects/s390/contrib/tzcode/zic/zic.c#1 branch
.. //depot/projects/s390/contrib/tzcode/zic/zic/Makefile#1 branch
.. //depot/projects/s390/contrib/tzdata/africa#1 branch
.. //depot/projects/s390/contrib/tzdata/antarctica#1 branch
.. //depot/projects/s390/contrib/tzdata/asia#1 branch
.. //depot/projects/s390/contrib/tzdata/australasia#1 branch
.. //depot/projects/s390/contrib/tzdata/backward#1 branch
.. //depot/projects/s390/contrib/tzdata/etcetera#1 branch
.. //depot/projects/s390/contrib/tzdata/europe#1 branch
.. //depot/projects/s390/contrib/tzdata/factory#1 branch
.. //depot/projects/s390/contrib/tzdata/leapseconds#1 branch
.. //depot/projects/s390/contrib/tzdata/northamerica#1 branch
.. //depot/projects/s390/contrib/tzdata/pacificnew#1 branch
.. //depot/projects/s390/contrib/tzdata/southamerica#1 branch
.. //depot/projects/s390/contrib/tzdata/systemv#1 branch
.. //depot/projects/s390/contrib/tzdata/yearistype.sh#1 branch
.. //depot/projects/s390/contrib/tzdata/zone.tab#1 branch
.. //depot/projects/s390/crypto/openssh/ChangeLog#10 integrate
.. //depot/projects/s390/crypto/openssh/INSTALL#5 integrate
.. //depot/projects/s390/crypto/openssh/PROTOCOL#3 integrate
.. //depot/projects/s390/crypto/openssh/PROTOCOL.agent#2 integrate
.. //depot/projects/s390/crypto/openssh/PROTOCOL.certkeys#1 branch
.. //depot/projects/s390/crypto/openssh/PROTOCOL.mux#1 branch
.. //depot/projects/s390/crypto/openssh/README#9 integrate
.. //depot/projects/s390/crypto/openssh/README.smartcard#3 delete
.. //depot/projects/s390/crypto/openssh/addrmatch.c#3 integrate
.. //depot/projects/s390/crypto/openssh/auth-krb5.c#8 integrate
.. //depot/projects/s390/crypto/openssh/auth-options.c#7 integrate
.. //depot/projects/s390/crypto/openssh/auth-options.h#5 integrate
.. //depot/projects/s390/crypto/openssh/auth-rh-rsa.c#5 integrate
.. //depot/projects/s390/crypto/openssh/auth-rhosts.c#5 integrate
.. //depot/projects/s390/crypto/openssh/auth-rsa.c#5 integrate
.. //depot/projects/s390/crypto/openssh/auth.c#9 integrate
.. //depot/projects/s390/crypto/openssh/auth.h#8 integrate
.. //depot/projects/s390/crypto/openssh/auth2-hostbased.c#4 integrate
.. //depot/projects/s390/crypto/openssh/auth2-pubkey.c#5 integrate
.. //depot/projects/s390/crypto/openssh/authfd.c#8 integrate
.. //depot/projects/s390/crypto/openssh/authfd.h#6 integrate
.. //depot/projects/s390/crypto/openssh/authfile.c#7 integrate
.. //depot/projects/s390/crypto/openssh/authfile.h#3 integrate
.. //depot/projects/s390/crypto/openssh/bufaux.c#7 integrate
.. //depot/projects/s390/crypto/openssh/buffer.c#5 integrate
.. //depot/projects/s390/crypto/openssh/buffer.h#4 integrate
.. //depot/projects/s390/crypto/openssh/canohost.c#11 integrate
.. //depot/projects/s390/crypto/openssh/channels.c#12 integrate
.. //depot/projects/s390/crypto/openssh/channels.h#9 integrate
.. //depot/projects/s390/crypto/openssh/clientloop.c#10 integrate
.. //depot/projects/s390/crypto/openssh/clientloop.h#5 integrate
.. //depot/projects/s390/crypto/openssh/config.guess#7 integrate
.. //depot/projects/s390/crypto/openssh/config.h#10 integrate
.. //depot/projects/s390/crypto/openssh/config.h.in#4 integrate
.. //depot/projects/s390/crypto/openssh/defines.h#10 integrate
.. //depot/projects/s390/crypto/openssh/dh.c#6 integrate
.. //depot/projects/s390/crypto/openssh/dns.c#5 integrate
.. //depot/projects/s390/crypto/openssh/dns.h#4 integrate
.. //depot/projects/s390/crypto/openssh/hostfile.c#8 integrate
.. //depot/projects/s390/crypto/openssh/hostfile.h#6 integrate
.. //depot/projects/s390/crypto/openssh/kex.c#9 integrate
.. //depot/projects/s390/crypto/openssh/kex.h#9 integrate
.. //depot/projects/s390/crypto/openssh/kexdhs.c#6 integrate
.. //depot/projects/s390/crypto/openssh/kexgexs.c#6 integrate
.. //depot/projects/s390/crypto/openssh/key.c#9 integrate
.. //depot/projects/s390/crypto/openssh/key.h#5 integrate
.. //depot/projects/s390/crypto/openssh/loginrec.c#10 integrate
.. //depot/projects/s390/crypto/openssh/match.h#3 integrate
.. //depot/projects/s390/crypto/openssh/misc.c#9 integrate
.. //depot/projects/s390/crypto/openssh/misc.h#6 integrate
.. //depot/projects/s390/crypto/openssh/monitor.c#12 integrate
.. //depot/projects/s390/crypto/openssh/monitor_fdpass.c#6 integrate
.. //depot/projects/s390/crypto/openssh/monitor_wrap.c#10 integrate
.. //depot/projects/s390/crypto/openssh/mux.c#2 integrate
.. //depot/projects/s390/crypto/openssh/myproposal.h#6 integrate
.. //depot/projects/s390/crypto/openssh/nchan.c#5 integrate
.. //depot/projects/s390/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#7 integrate
.. //depot/projects/s390/crypto/openssh/openbsd-compat/openbsd-compat.h#8 integrate
.. //depot/projects/s390/crypto/openssh/openbsd-compat/openssl-compat.c#4 integrate
.. //depot/projects/s390/crypto/openssh/openbsd-compat/port-aix.c#7 integrate
.. //depot/projects/s390/crypto/openssh/openbsd-compat/port-aix.h#8 integrate
.. //depot/projects/s390/crypto/openssh/openbsd-compat/port-linux.c#2 integrate
.. //depot/projects/s390/crypto/openssh/openbsd-compat/port-linux.h#2 integrate
.. //depot/projects/s390/crypto/openssh/openbsd-compat/pwcache.c#1 branch
.. //depot/projects/s390/crypto/openssh/openbsd-compat/readpassphrase.c#6 integrate
.. //depot/projects/s390/crypto/openssh/pathnames.h#5 integrate
.. //depot/projects/s390/crypto/openssh/pkcs11.h#1 branch
.. //depot/projects/s390/crypto/openssh/platform.c#2 integrate
.. //depot/projects/s390/crypto/openssh/platform.h#2 integrate
.. //depot/projects/s390/crypto/openssh/readconf.c#10 integrate
.. //depot/projects/s390/crypto/openssh/readconf.h#9 integrate
.. //depot/projects/s390/crypto/openssh/roaming.h#2 integrate
.. //depot/projects/s390/crypto/openssh/roaming_client.c#1 branch
.. //depot/projects/s390/crypto/openssh/roaming_common.c#2 integrate
.. //depot/projects/s390/crypto/openssh/roaming_serv.c#1 branch
.. //depot/projects/s390/crypto/openssh/scard-opensc.c#4 delete
.. //depot/projects/s390/crypto/openssh/scard.c#4 delete
.. //depot/projects/s390/crypto/openssh/scard.h#5 delete
.. //depot/projects/s390/crypto/openssh/scp.1#6 integrate
.. //depot/projects/s390/crypto/openssh/scp.c#10 integrate
.. //depot/projects/s390/crypto/openssh/servconf.c#10 integrate
.. //depot/projects/s390/crypto/openssh/servconf.h#8 integrate
.. //depot/projects/s390/crypto/openssh/session.c#13 integrate
.. //depot/projects/s390/crypto/openssh/sftp-client.c#9 integrate
.. //depot/projects/s390/crypto/openssh/sftp-client.h#6 integrate
.. //depot/projects/s390/crypto/openssh/sftp-common.c#6 integrate
.. //depot/projects/s390/crypto/openssh/sftp-common.h#6 integrate
.. //depot/projects/s390/crypto/openssh/sftp-server.8#5 integrate
.. //depot/projects/s390/crypto/openssh/sftp-server.c#9 integrate
.. //depot/projects/s390/crypto/openssh/sftp.1#8 integrate
.. //depot/projects/s390/crypto/openssh/sftp.c#9 integrate
.. //depot/projects/s390/crypto/openssh/ssh-add.1#6 integrate
.. //depot/projects/s390/crypto/openssh/ssh-add.c#9 integrate
.. //depot/projects/s390/crypto/openssh/ssh-agent.1#8 integrate
.. //depot/projects/s390/crypto/openssh/ssh-agent.c#11 integrate
.. //depot/projects/s390/crypto/openssh/ssh-dss.c#6 integrate
.. //depot/projects/s390/crypto/openssh/ssh-keygen.1#8 integrate
.. //depot/projects/s390/crypto/openssh/ssh-keygen.c#10 integrate
.. //depot/projects/s390/crypto/openssh/ssh-keyscan.1#7 integrate
.. //depot/projects/s390/crypto/openssh/ssh-keyscan.c#10 integrate
.. //depot/projects/s390/crypto/openssh/ssh-keysign.c#7 integrate
.. //depot/projects/s390/crypto/openssh/ssh-pkcs11-client.c#1 branch
.. //depot/projects/s390/crypto/openssh/ssh-pkcs11-helper.0#1 branch
.. //depot/projects/s390/crypto/openssh/ssh-pkcs11-helper.8#1 branch
.. //depot/projects/s390/crypto/openssh/ssh-pkcs11-helper.c#1 branch
.. //depot/projects/s390/crypto/openssh/ssh-pkcs11.c#1 branch
.. //depot/projects/s390/crypto/openssh/ssh-pkcs11.h#1 branch
.. //depot/projects/s390/crypto/openssh/ssh-rand-helper.c#7 integrate
.. //depot/projects/s390/crypto/openssh/ssh-rsa.c#7 integrate
.. //depot/projects/s390/crypto/openssh/ssh.1#10 integrate
.. //depot/projects/s390/crypto/openssh/ssh.c#10 integrate
.. //depot/projects/s390/crypto/openssh/ssh2.h#5 integrate
.. //depot/projects/s390/crypto/openssh/ssh_config#12 integrate
.. //depot/projects/s390/crypto/openssh/ssh_config.5#12 integrate
.. //depot/projects/s390/crypto/openssh/ssh_namespace.h#7 integrate
.. //depot/projects/s390/crypto/openssh/sshconnect.c#11 integrate
.. //depot/projects/s390/crypto/openssh/sshconnect2.c#11 integrate
.. //depot/projects/s390/crypto/openssh/sshd.8#12 integrate
.. //depot/projects/s390/crypto/openssh/sshd.c#14 integrate
.. //depot/projects/s390/crypto/openssh/sshd_config#13 integrate
.. //depot/projects/s390/crypto/openssh/sshd_config.5#12 integrate
.. //depot/projects/s390/crypto/openssh/sshpty.h#4 integrate
.. //depot/projects/s390/crypto/openssh/sshtty.c#4 integrate
.. //depot/projects/s390/crypto/openssh/version.h#12 integrate
.. //depot/projects/s390/crypto/openssl/CHANGES#8 integrate
.. //depot/projects/s390/crypto/openssl/Configure#8 integrate
.. //depot/projects/s390/crypto/openssl/FAQ#8 integrate
.. //depot/projects/s390/crypto/openssl/Makefile#4 integrate
.. //depot/projects/s390/crypto/openssl/Makefile.org#8 integrate
.. //depot/projects/s390/crypto/openssl/NEWS#8 integrate
.. //depot/projects/s390/crypto/openssl/README#8 integrate
.. //depot/projects/s390/crypto/openssl/apps/CA.sh#3 integrate
.. //depot/projects/s390/crypto/openssl/apps/Makefile#4 integrate
.. //depot/projects/s390/crypto/openssl/apps/apps.c#8 integrate
.. //depot/projects/s390/crypto/openssl/apps/ca.c#8 integrate
.. //depot/projects/s390/crypto/openssl/apps/dsa.c#6 integrate
.. //depot/projects/s390/crypto/openssl/apps/dsaparam.c#6 integrate
.. //depot/projects/s390/crypto/openssl/apps/enc.c#8 integrate
.. //depot/projects/s390/crypto/openssl/apps/gendsa.c#6 integrate
.. //depot/projects/s390/crypto/openssl/apps/genpkey.c#2 delete
.. //depot/projects/s390/crypto/openssl/apps/genrsa.c#6 integrate
.. //depot/projects/s390/crypto/openssl/apps/openssl.c#8 integrate
.. //depot/projects/s390/crypto/openssl/apps/openssl.cnf#5 integrate
.. //depot/projects/s390/crypto/openssl/apps/pkcs12.c#8 integrate
.. //depot/projects/s390/crypto/openssl/apps/pkey.c#2 delete
.. //depot/projects/s390/crypto/openssl/apps/pkeyparam.c#2 delete
.. //depot/projects/s390/crypto/openssl/apps/pkeyutl.c#2 delete
.. //depot/projects/s390/crypto/openssl/apps/req.c#8 integrate
.. //depot/projects/s390/crypto/openssl/apps/s_apps.h#6 integrate
.. //depot/projects/s390/crypto/openssl/apps/s_cb.c#5 integrate
.. //depot/projects/s390/crypto/openssl/apps/s_client.c#7 integrate
.. //depot/projects/s390/crypto/openssl/apps/s_server.c#7 integrate
.. //depot/projects/s390/crypto/openssl/apps/s_socket.c#5 integrate
.. //depot/projects/s390/crypto/openssl/apps/speed.c#9 integrate
.. //depot/projects/s390/crypto/openssl/apps/ts.c#2 delete
.. //depot/projects/s390/crypto/openssl/apps/tsget#2 delete
.. //depot/projects/s390/crypto/openssl/apps/x509.c#9 integrate
.. //depot/projects/s390/crypto/openssl/config#8 integrate
.. //depot/projects/s390/crypto/openssl/crypto/aes/aes_cfb.c#4 integrate
.. //depot/projects/s390/crypto/openssl/crypto/aes/aes_x86core.c#2 delete
.. //depot/projects/s390/crypto/openssl/crypto/aes/asm/aes-armv4.pl#2 delete
.. //depot/projects/s390/crypto/openssl/crypto/aes/asm/aes-ppc.pl#2 delete
.. //depot/projects/s390/crypto/openssl/crypto/aes/asm/aes-s390x.pl#2 delete
.. //depot/projects/s390/crypto/openssl/crypto/aes/asm/aes-sparcv9.pl#2 delete
.. //depot/projects/s390/crypto/openssl/crypto/aes/asm/aes-x86_64.pl#2 integrate
.. //depot/projects/s390/crypto/openssl/crypto/asn1/a_mbstr.c#5 integrate
.. //depot/projects/s390/crypto/openssl/crypto/asn1/a_object.c#5 integrate
.. //depot/projects/s390/crypto/openssl/crypto/asn1/ameth_lib.c#2 delete
.. //depot/projects/s390/crypto/openssl/crypto/asn1/asn1.h#8 integrate
.. //depot/projects/s390/crypto/openssl/crypto/asn1/asn1_err.c#7 integrate
.. //depot/projects/s390/crypto/openssl/crypto/asn1/asn1_gen.c#3 integrate
.. //depot/projects/s390/crypto/openssl/crypto/asn1/asn1_locl.h#2 delete
.. //depot/projects/s390/crypto/openssl/crypto/asn1/asn1_par.c#6 integrate
.. //depot/projects/s390/crypto/openssl/crypto/asn1/bio_asn1.c#2 delete
.. //depot/projects/s390/crypto/openssl/crypto/asn1/bio_ndef.c#2 delete
.. //depot/projects/s390/crypto/openssl/crypto/asn1/t_x509.c#5 integrate
.. //depot/projects/s390/crypto/openssl/crypto/asn1/x_nx509.c#2 delete
.. //depot/projects/s390/crypto/openssl/crypto/bio/bio.h#8 integrate
.. //depot/projects/s390/crypto/openssl/crypto/bio/bss_dgram.c#3 integrate
.. //depot/projects/s390/crypto/openssl/crypto/bio/bss_file.c#6 integrate
.. //depot/projects/s390/crypto/openssl/crypto/bn/asm/alpha-mont.pl#2 delete
.. //depot/projects/s390/crypto/openssl/crypto/bn/asm/armv4-mont.pl#2 delete
.. //depot/projects/s390/crypto/openssl/crypto/bn/asm/mips3-mont.pl#2 delete
.. //depot/projects/s390/crypto/openssl/crypto/bn/asm/ppc-mont.pl#2 delete
.. //depot/projects/s390/crypto/openssl/crypto/bn/asm/ppc.pl#2 integrate
.. //depot/projects/s390/crypto/openssl/crypto/bn/asm/ppc64-mont.pl#2 delete
.. //depot/projects/s390/crypto/openssl/crypto/bn/asm/s390x-mont.pl#2 delete
.. //depot/projects/s390/crypto/openssl/crypto/bn/asm/s390x.S#2 delete
.. //depot/projects/s390/crypto/openssl/crypto/bn/asm/sparcv9-mont.pl#2 delete
.. //depot/projects/s390/crypto/openssl/crypto/bn/asm/sparcv9a-mont.pl#2 delete
.. //depot/projects/s390/crypto/openssl/crypto/bn/asm/via-mont.pl#2 delete
.. //depot/projects/s390/crypto/openssl/crypto/bn/asm/x86-mont.pl#2 delete
.. //depot/projects/s390/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#4 integrate
.. //depot/projects/s390/crypto/openssl/crypto/bn/bn_div.c#6 integrate
.. //depot/projects/s390/crypto/openssl/crypto/bn/bn_exp.c#5 integrate
.. //depot/projects/s390/crypto/openssl/crypto/bn/bn_gf2m.c#3 integrate
.. //depot/projects/s390/crypto/openssl/crypto/bn/bn_mul.c#7 integrate
.. //depot/projects/s390/crypto/openssl/crypto/bn/bntest.c#6 integrate
.. //depot/projects/s390/crypto/openssl/crypto/camellia/Makefile#3 integrate
.. //depot/projects/s390/crypto/openssl/crypto/camellia/asm/cmll-x86.pl#2 delete
.. //depot/projects/s390/crypto/openssl/crypto/camellia/asm/cmll-x86_64.pl#2 delete
.. //depot/projects/s390/crypto/openssl/crypto/cast/c_cfb64.c#2 integrate
.. //depot/projects/s390/crypto/openssl/crypto/cast/c_ecb.c#3 integrate
.. //depot/projects/s390/crypto/openssl/crypto/cast/c_enc.c#2 integrate
.. //depot/projects/s390/crypto/openssl/crypto/cast/c_ofb64.c#2 integrate
.. //depot/projects/s390/crypto/openssl/crypto/cast/cast.h#5 integrate
.. //depot/projects/s390/crypto/openssl/crypto/cms/cms_ess.c#2 integrate
.. //depot/projects/s390/crypto/openssl/crypto/cms/cms_lib.c#2 integrate
.. //depot/projects/s390/crypto/openssl/crypto/comp/c_zlib.c#6 integrate
.. //depot/projects/s390/crypto/openssl/crypto/cryptlib.c#7 integrate
.. //depot/projects/s390/crypto/openssl/crypto/dsa/Makefile#4 integrate
.. //depot/projects/s390/crypto/openssl/crypto/dsa/dsa_asn1.c#5 integrate
.. //depot/projects/s390/crypto/openssl/crypto/dsa/dsa_lib.c#6 integrate
.. //depot/projects/s390/crypto/openssl/crypto/dso/dso_dlfcn.c#6 integrate
.. //depot/projects/s390/crypto/openssl/crypto/ec/ec2_smpl.c#2 integrate
.. //depot/projects/s390/crypto/openssl/crypto/ecdsa/Makefile#3 integrate
.. //depot/projects/s390/crypto/openssl/crypto/ecdsa/ecs_ossl.c#3 integrate
.. //depot/projects/s390/crypto/openssl/crypto/ecdsa/ecs_sign.c#2 integrate
.. //depot/projects/s390/crypto/openssl/crypto/engine/Makefile#4 integrate
.. //depot/projects/s390/crypto/openssl/crypto/engine/eng_all.c#5 integrate
.. //depot/projects/s390/crypto/openssl/crypto/engine/eng_cnf.c#4 integrate
.. //depot/projects/s390/crypto/openssl/crypto/engine/eng_cryptodev.c#2 integrate
.. //depot/projects/s390/crypto/openssl/crypto/engine/eng_ctrl.c#4 integrate
.. //depot/projects/s390/crypto/openssl/crypto/engine/eng_err.c#4 integrate
.. //depot/projects/s390/crypto/openssl/crypto/engine/eng_table.c#4 integrate
.. //depot/projects/s390/crypto/openssl/crypto/engine/engine.h#6 integrate
.. //depot/projects/s390/crypto/openssl/crypto/err/Makefile#4 integrate
.. //depot/projects/s390/crypto/openssl/crypto/err/err_all.c#7 integrate
.. //depot/projects/s390/crypto/openssl/crypto/evp/c_allc.c#7 integrate
.. //depot/projects/s390/crypto/openssl/crypto/evp/c_alld.c#5 integrate
.. //depot/projects/s390/crypto/openssl/crypto/evp/digest.c#7 integrate
.. //depot/projects/s390/crypto/openssl/crypto/evp/evp_lib.c#6 integrate
.. //depot/projects/s390/crypto/openssl/crypto/evp/evp_locl.h#6 integrate
.. //depot/projects/s390/crypto/openssl/crypto/evp/names.c#5 integrate
.. //depot/projects/s390/crypto/openssl/crypto/lhash/lhash.c#4 integrate
.. //depot/projects/s390/crypto/openssl/crypto/md32_common.h#6 integrate
.. //depot/projects/s390/crypto/openssl/crypto/md5/asm/md5-x86_64.pl#3 integrate
.. //depot/projects/s390/crypto/openssl/crypto/o_init.c#2 integrate
.. //depot/projects/s390/crypto/openssl/crypto/o_str.c#4 integrate
.. //depot/projects/s390/crypto/openssl/crypto/objects/obj_dat.c#7 integrate
.. //depot/projects/s390/crypto/openssl/crypto/objects/obj_dat.h#8 integrate
.. //depot/projects/s390/crypto/openssl/crypto/objects/obj_mac.h#8 integrate
.. //depot/projects/s390/crypto/openssl/crypto/objects/obj_mac.num#6 integrate
.. //depot/projects/s390/crypto/openssl/crypto/objects/objects.txt#8 integrate
.. //depot/projects/s390/crypto/openssl/crypto/ocsp/ocsp_prn.c#3 integrate
.. //depot/projects/s390/crypto/openssl/crypto/opensslv.h#8 integrate
.. //depot/projects/s390/crypto/openssl/crypto/pem/pem_seal.c#4 integrate
.. //depot/projects/s390/crypto/openssl/crypto/perlasm/x86_64-xlate.pl#3 integrate
.. //depot/projects/s390/crypto/openssl/crypto/pkcs12/p12_attr.c#4 integrate
.. //depot/projects/s390/crypto/openssl/crypto/pkcs12/p12_key.c#5 integrate
.. //depot/projects/s390/crypto/openssl/crypto/pkcs12/p12_utl.c#4 integrate
.. //depot/projects/s390/crypto/openssl/crypto/pkcs12/pkcs12.h#6 integrate
.. //depot/projects/s390/crypto/openssl/crypto/pkcs7/pk7_mime.c#5 integrate
.. //depot/projects/s390/crypto/openssl/crypto/ppccpuid.pl#2 delete
.. //depot/projects/s390/crypto/openssl/crypto/rand/rand_win.c#6 integrate
.. //depot/projects/s390/crypto/openssl/crypto/rand/randfile.c#6 integrate
.. //depot/projects/s390/crypto/openssl/crypto/rsa/rsa.h#7 integrate
.. //depot/projects/s390/crypto/openssl/crypto/rsa/rsa_eay.c#9 integrate
.. //depot/projects/s390/crypto/openssl/crypto/rsa/rsa_eng.c#2 integrate
.. //depot/projects/s390/crypto/openssl/crypto/rsa/rsa_oaep.c#6 integrate
.. //depot/projects/s390/crypto/openssl/crypto/rsa/rsa_pss.c#3 integrate
.. //depot/projects/s390/crypto/openssl/crypto/rsa/rsa_sign.c#7 integrate
.. //depot/projects/s390/crypto/openssl/crypto/s390xcpuid.S#2 delete
.. //depot/projects/s390/crypto/openssl/crypto/sha/sha512.c#3 integrate
.. //depot/projects/s390/crypto/openssl/crypto/sparcv9cap.c#2 delete
.. //depot/projects/s390/crypto/openssl/crypto/stack/safestack.h#6 integrate
.. //depot/projects/s390/crypto/openssl/crypto/symhacks.h#5 integrate
.. //depot/projects/s390/crypto/openssl/crypto/ui/ui_openssl.c#5 integrate
.. //depot/projects/s390/crypto/openssl/crypto/x509/by_dir.c#5 integrate
.. //depot/projects/s390/crypto/openssl/crypto/x509/x509.h#6 integrate
.. //depot/projects/s390/crypto/openssl/crypto/x509/x509_lu.c#4 integrate
.. //depot/projects/s390/crypto/openssl/crypto/x509/x509_vfy.c#6 integrate
.. //depot/projects/s390/crypto/openssl/crypto/x509/x509_vfy.h#5 integrate
.. //depot/projects/s390/crypto/openssl/crypto/x509/x509_vpm.c#3 integrate
.. //depot/projects/s390/crypto/openssl/crypto/x509v3/pcy_tree.c#3 integrate
.. //depot/projects/s390/crypto/openssl/crypto/x509v3/v3_alt.c#6 integrate
.. //depot/projects/s390/crypto/openssl/crypto/x509v3/v3_ocsp.c#5 integrate
.. //depot/projects/s390/crypto/openssl/demos/x509/mkcert.c#3 integrate
.. //depot/projects/s390/crypto/openssl/demos/x509/mkreq.c#3 integrate
.. //depot/projects/s390/crypto/openssl/doc/apps/enc.pod#6 integrate
.. //depot/projects/s390/crypto/openssl/doc/apps/verify.pod#3 integrate
.. //depot/projects/s390/crypto/openssl/doc/crypto/ASN1_generate_nconf.pod#3 integrate
.. //depot/projects/s390/crypto/openssl/doc/crypto/EVP_DigestInit.pod#6 integrate
.. //depot/projects/s390/crypto/openssl/doc/crypto/PKCS12_parse.pod#2 integrate
.. //depot/projects/s390/crypto/openssl/doc/crypto/bn_internal.pod#4 integrate
.. //depot/projects/s390/crypto/openssl/doc/crypto/d2i_X509.pod#3 integrate
.. //depot/projects/s390/crypto/openssl/doc/crypto/d2i_X509_CRL.pod#3 integrate
.. //depot/projects/s390/crypto/openssl/doc/crypto/d2i_X509_REQ.pod#3 integrate
.. //depot/projects/s390/crypto/openssl/doc/crypto/hmac.pod#4 integrate
.. //depot/projects/s390/crypto/openssl/doc/crypto/pem.pod#3 integrate
.. //depot/projects/s390/crypto/openssl/doc/ssl/SSL_CIPHER_get_name.pod#4 integrate

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